From 5e9de0105fed4e0486f198c8edf8cd63e9b33688 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Wed, 14 Dec 2022 18:53:56 +0300
Subject: [PATCH 1/2] Updated on 2026-08-14

---
 .../tap/common/redux/navigation/NavigationMiddleware.kt     | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/tangem/tap/common/redux/navigation/NavigationMiddleware.kt b/app/src/main/java/com/tangem/tap/common/redux/navigation/NavigationMiddleware.kt
index 90d6b880da..c8457793e5 100644
--- a/app/src/main/java/com/tangem/tap/common/redux/navigation/NavigationMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/common/redux/navigation/NavigationMiddleware.kt
@@ -32,10 +32,8 @@ val navigationMiddleware: Middleware<AppState> = { _, state ->
                             AppScreen.Home,
                             AppScreen.Welcome,
                             -> {
-                                navState?.activity?.get()?.popBackTo(screen, action.inclusive)
-                                if (navState?.backStack?.contains(screen) != true) {
-                                    store.dispatchOnMain(NavigationAction.NavigateTo(screen))
-                                }
+                                navState?.activity?.get()?.popBackTo(screen, inclusive = true)
+                                store.dispatchOnMain(NavigationAction.NavigateTo(screen))
                             }
                             else -> {
                                 navState?.activity?.get()?.popBackTo(screen, action.inclusive)

From 58e2c7345a8092856cb9fa7633d5c97f685ec5d7 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Wed, 14 Dec 2022 18:54:59 +0300
Subject: [PATCH 2/2] Updated on 2026-08-14

---
 .../com/tangem/tap/features/home/redux/HomeMiddleware.kt     | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/src/main/java/com/tangem/tap/features/home/redux/HomeMiddleware.kt b/app/src/main/java/com/tangem/tap/features/home/redux/HomeMiddleware.kt
index 8f4282fed9..c879e6ca04 100644
--- a/app/src/main/java/com/tangem/tap/features/home/redux/HomeMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/home/redux/HomeMiddleware.kt
@@ -93,9 +93,14 @@ private fun readCard() = scope.launch {
                     userWalletsListManager.save(userWallet)
                         .doOnFailure { error ->
                             Timber.e(error, "Unable to save user wallet")
+                            tangemSdkManager.setAccessCodeRequestPolicy(useBiometricsForAccessCode = false)
                             store.onCardScanned(scanResponse)
                         }
                         .doOnSuccess {
+                            tangemSdkManager.setAccessCodeRequestPolicy(
+                                useBiometricsForAccessCode = preferencesStorage.shouldSaveAccessCodes &&
+                                    userWallet.hasAccessCode,
+                            )
                             store.onUserWalletSelected(userWallet)
                         }
                         .doOnResult {