From cb9612ec4ec00cb5e1f602801a34a654af1709b8 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Tue, 19 Mar 2024 18:35:59 +0300
Subject: [PATCH] Updated on 2026-08-14

---
 .../BiometricUserWalletsListManager.kt         |  1 +
 .../saveWallet/redux/SaveWalletAction.kt       | 18 +++++++++---------
 .../saveWallet/redux/SaveWalletMiddleware.kt   |  5 +++++
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/tangem/tap/domain/userWalletList/implementation/BiometricUserWalletsListManager.kt b/app/src/main/java/com/tangem/tap/domain/userWalletList/implementation/BiometricUserWalletsListManager.kt
index daf1ce408b..160d433012 100644
--- a/app/src/main/java/com/tangem/tap/domain/userWalletList/implementation/BiometricUserWalletsListManager.kt
+++ b/app/src/main/java/com/tangem/tap/domain/userWalletList/implementation/BiometricUserWalletsListManager.kt
@@ -277,6 +277,7 @@ internal class BiometricUserWalletsListManager(
 
                     prevState.copy(
                         userWallets = newUserWallets,
+                        encryptionKeys = encryptionKeys,
                         isLocked = newUserWallets.any(UserWallet::isLocked),
                     )
                 } else {
diff --git a/app/src/main/java/com/tangem/tap/features/saveWallet/redux/SaveWalletAction.kt b/app/src/main/java/com/tangem/tap/features/saveWallet/redux/SaveWalletAction.kt
index 934f7e8880..e5625ad1d2 100644
--- a/app/src/main/java/com/tangem/tap/features/saveWallet/redux/SaveWalletAction.kt
+++ b/app/src/main/java/com/tangem/tap/features/saveWallet/redux/SaveWalletAction.kt
@@ -11,20 +11,20 @@ internal sealed interface SaveWalletAction : Action {
         val backupCardsIds: Set<String>?,
     ) : SaveWalletAction
 
-    object Save : SaveWalletAction {
-        object Success : SaveWalletAction
+    data object Save : SaveWalletAction {
+        data object Success : SaveWalletAction
         data class Error(val error: TangemError) : SaveWalletAction
     }
 
-    object AllowToUseBiometrics : SaveWalletAction
+    data object AllowToUseBiometrics : SaveWalletAction
 
-    object Dismiss : SaveWalletAction
+    data object Dismiss : SaveWalletAction
 
-    object CloseError : SaveWalletAction
-    object EnrollBiometrics : SaveWalletAction {
-        object Enroll : SaveWalletAction
-        object Cancel : SaveWalletAction
+    data object CloseError : SaveWalletAction
+    data object EnrollBiometrics : SaveWalletAction {
+        data object Enroll : SaveWalletAction
+        data object Cancel : SaveWalletAction
     }
 
-    object SaveWalletWasShown : SaveWalletAction
+    data object SaveWalletWasShown : SaveWalletAction
 }
\ No newline at end of file
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 ddf1c22d74..344a0909de 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
@@ -147,6 +147,11 @@ internal class SaveWalletMiddleware {
     }
 
     private fun allowToUseBiometrics(state: SaveWalletState) {
+        if (tangemSdkManager.needEnrollBiometrics) {
+            store.dispatchOnMain(SaveWalletAction.EnrollBiometrics)
+            return
+        }
+
         val scanResponse = state.backupInfo?.scanResponse
             ?: store.state.globalState.scanResponse
             ?: return