From 81562fc4f9c8233b12161e84092709d8b46784b4 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Wed, 14 Aug 2024 15:31:53 +0400
Subject: [PATCH] Updated on 2026-08-14

---
 .../tangem/tap/features/onboarding/OnboardingHelper.kt    | 4 ++--
 .../tap/features/saveWallet/redux/SaveWalletMiddleware.kt | 8 +++++---
 .../tap/features/welcome/redux/WelcomeMiddleware.kt       | 4 ++--
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/OnboardingHelper.kt b/app/src/main/java/com/tangem/tap/features/onboarding/OnboardingHelper.kt
index 404a469233..bc085c6dca 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/OnboardingHelper.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/OnboardingHelper.kt
@@ -112,14 +112,14 @@ object OnboardingHelper {
                             backupCardsIds = backupCardsIds?.toSet(),
                         ),
                     )
-                    store.dispatchNavigationAction { push(AppRoute.Wallet) }
+                    store.dispatchNavigationAction { replaceAll(AppRoute.Wallet) }
                     delay(timeMillis = 1_800)
                     store.dispatchNavigationAction { push(AppRoute.SaveWallet) }
                 }
                 // If device has no biometry and save wallet screen has been shown, then go through old scenario
                 else -> {
                     proceedWithScanResponse(scanResponse, backupCardsIds, hasBackupError)
-                    store.dispatchNavigationAction { push(AppRoute.Wallet) }
+                    store.dispatchNavigationAction { replaceAll(AppRoute.Wallet) }
                 }
             }
         }
diff --git a/app/src/main/java/com/tangem/tap/features/saveWallet/redux/SaveWalletMiddleware.kt b/app/src/main/java/com/tangem/tap/features/saveWallet/redux/SaveWalletMiddleware.kt
index f1b43ae123..7cb2506f8e 100644
--- a/app/src/main/java/com/tangem/tap/features/saveWallet/redux/SaveWalletMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/saveWallet/redux/SaveWalletMiddleware.kt
@@ -4,7 +4,6 @@ import com.tangem.common.*
 import com.tangem.common.core.TangemSdkError
 import com.tangem.common.extensions.guard
 import com.tangem.common.routing.AppRoute
-import com.tangem.common.routing.utils.popTo
 import com.tangem.core.analytics.Analytics
 import com.tangem.domain.wallets.builder.UserWalletBuilder
 import com.tangem.domain.wallets.models.UserWallet
@@ -12,7 +11,10 @@ import com.tangem.tap.*
 import com.tangem.tap.common.analytics.events.AnalyticsParam
 import com.tangem.tap.common.analytics.events.MainScreen
 import com.tangem.tap.common.analytics.events.Onboarding
-import com.tangem.tap.common.extensions.*
+import com.tangem.tap.common.extensions.dispatchNavigationAction
+import com.tangem.tap.common.extensions.dispatchWithMain
+import com.tangem.tap.common.extensions.inject
+import com.tangem.tap.common.extensions.onUserWalletSelected
 import com.tangem.tap.common.redux.AppState
 import com.tangem.tap.proxy.redux.DaggerGraphState
 import com.tangem.utils.coroutines.JobHolder
@@ -124,7 +126,7 @@ internal class SaveWalletMiddleware {
         )
 
         store.dispatchWithMain(SaveWalletAction.AllowToUseBiometrics.Success)
-        store.dispatchNavigationAction { popTo<AppRoute.Wallet>() }
+        store.dispatchNavigationAction { replaceAll(AppRoute.Wallet) }
     }
 
     private fun dismiss(state: SaveWalletState) {
diff --git a/app/src/main/java/com/tangem/tap/features/welcome/redux/WelcomeMiddleware.kt b/app/src/main/java/com/tangem/tap/features/welcome/redux/WelcomeMiddleware.kt
index 2a564e8a0d..8bd3ee34fc 100644
--- a/app/src/main/java/com/tangem/tap/features/welcome/redux/WelcomeMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/welcome/redux/WelcomeMiddleware.kt
@@ -99,7 +99,7 @@ internal class WelcomeMiddleware {
                     signInType = Basic.SignedIn.SignInType.Biometric,
                 )
 
-                store.dispatchNavigationAction { push(AppRoute.Wallet) }
+                store.dispatchNavigationAction { replaceAll(AppRoute.Wallet) }
                 store.dispatchWithMain(WelcomeAction.ProceedWithBiometrics.Success)
                 store.onUserWalletSelected(userWallet = selectedUserWallet)
 
@@ -131,7 +131,7 @@ internal class WelcomeMiddleware {
                 .doOnSuccess {
                     sendSignedInAnalyticsEvent(scanResponse = scanResponse, signInType = Basic.SignedIn.SignInType.Card)
 
-                    store.dispatchNavigationAction { push(AppRoute.Wallet) }
+                    store.dispatchNavigationAction { replaceAll(AppRoute.Wallet) }
                     store.dispatchWithMain(WelcomeAction.ProceedWithCard.Success)
                     store.onUserWalletSelected(userWallet = userWallet)