From 2f1c8959175c10143839865e9a32313d718dba11 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Thu, 23 Sep 2021 12:51:05 +0300
Subject: [PATCH] Updated on 2026-08-14

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

diff --git a/app/src/main/java/com/tangem/tap/MainActivity.kt b/app/src/main/java/com/tangem/tap/MainActivity.kt
index 89ede4d80d..37682e2bc8 100644
--- a/app/src/main/java/com/tangem/tap/MainActivity.kt
+++ b/app/src/main/java/com/tangem/tap/MainActivity.kt
@@ -17,7 +17,6 @@ import com.tangem.tap.common.redux.navigation.AppScreen
 import com.tangem.tap.common.redux.navigation.NavigationAction
 import com.tangem.tap.domain.TangemSdkManager
 import com.tangem.tap.features.details.redux.walletconnect.WalletConnectAction
-import com.tangem.tap.features.home.redux.HomeAction
 import com.tangem.wallet.R
 import kotlinx.android.synthetic.main.activity_main.*
 import kotlinx.coroutines.CoroutineExceptionHandler
@@ -73,10 +72,11 @@ class MainActivity : AppCompatActivity(), SnackbarHandler {
     override fun onResume() {
         super.onResume()
         notificationsHandler = NotificationsHandler(fragment_container)
-        if (supportFragmentManager.backStackEntryCount == 0 ||
-            store.state.globalState.scanNoteResponse == null
-        ) {
-            store.dispatch(HomeAction.CheckIfFirstLaunch)
+
+        val backStackIsEmpty = supportFragmentManager.backStackEntryCount == 0
+        val isScannedBefore = store.state.globalState.scanNoteResponse != null
+        val isOnboardingStarted = store.state.onboardingState.onboardingData?.scanNoteResponse != null
+        if ((backStackIsEmpty || isScannedBefore) && !isOnboardingStarted) {
             store.dispatch(NavigationAction.NavigateTo(AppScreen.Home))
         }
         intentHandler.handleIntent(intent)
@@ -107,7 +107,7 @@ class MainActivity : AppCompatActivity(), SnackbarHandler {
         if (snackbar != null) return
 
         snackbar = Snackbar.make(
-            fragment_container, getString(text), Snackbar.LENGTH_INDEFINITE
+                fragment_container, getString(text), Snackbar.LENGTH_INDEFINITE
         )
         if (buttonTitle != null && action != null) {
             snackbar?.setAction(getString(buttonTitle), action)