From 8e136078264357deba3d391c875f2f13e9562098 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Tue, 2 Jul 2024 12:39:38 +0400
Subject: [PATCH] Updated on 2026-08-14

---
 app/src/main/java/com/tangem/tap/MainActivity.kt | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/tangem/tap/MainActivity.kt b/app/src/main/java/com/tangem/tap/MainActivity.kt
index 874d03de60..4b65cf26cf 100644
--- a/app/src/main/java/com/tangem/tap/MainActivity.kt
+++ b/app/src/main/java/com/tangem/tap/MainActivity.kt
@@ -446,15 +446,16 @@ class MainActivity : AppCompatActivity(), SnackbarHandler, ActivityResultCallbac
     }
 
     private fun navigateToInitialScreenIfNeeded(intentWhichStartedActivity: Intent?) {
-        val backStackIsEmpty = supportFragmentManager.backStackEntryCount == 0
+        val backStack = store.state.navigationState.backStack
+        val isOnInitialScreen = backStack.all { it == AppScreen.Welcome || it == AppScreen.Home }
         val isNotScannedBefore = store.state.globalState.scanResponse == null
         val isOnboardingServiceNotActive = !store.state.globalState.onboardingState.onboardingStarted
 
         when {
-            !backStackIsEmpty && isNotScannedBefore && isOnboardingServiceNotActive -> {
+            !isOnInitialScreen && isNotScannedBefore && isOnboardingServiceNotActive -> {
                 navigateToInitialScreen(intentWhichStartedActivity)
             }
-            backStackIsEmpty -> {
+            backStack.isEmpty() -> {
                 navigateToInitialScreen(intentWhichStartedActivity)
             }
             else -> Unit