Updated on 2026-08-14

app/src/main/java/com/tangem/tap/features/saveWallet/redux/SaveWalletAction.kt

@@ -5,7 +5,7 @@ import com.tangem.domain.common.ScanResponse
 import org.rekotlin.Action
 
 internal sealed interface SaveWalletAction : Action {
-    data class ProvideAdditionalInfo(
+    data class ProvideBackupInfo(
         val scanResponse: ScanResponse,
         val accessCode: String?,
         val backupCardsIds: Set<String>?,

app/src/main/java/com/tangem/tap/features/saveWallet/redux/SaveWalletMiddleware.kt

@@ -7,6 +7,7 @@ import com.tangem.common.flatMap
 import com.tangem.tap.common.extensions.dispatchOnMain
 import com.tangem.tap.common.extensions.onUserWalletSelected
 import com.tangem.tap.common.redux.AppState
+import com.tangem.tap.common.redux.navigation.AppScreen
 import com.tangem.tap.common.redux.navigation.NavigationAction
 import com.tangem.tap.domain.model.UserWallet
 import com.tangem.tap.domain.model.builders.UserWalletBuilder
@@ -34,10 +35,10 @@ internal class SaveWalletMiddleware {
     private fun handleAction(action: SaveWalletAction, state: SaveWalletState) {
         when (action) {
             is SaveWalletAction.Save -> saveWalletIfBiometricsEnrolled(state)
-            is SaveWalletAction.Save.Success -> popBack()
             is SaveWalletAction.EnrollBiometrics.Enroll -> enrollBiometrics()
             is SaveWalletAction.SaveWalletWasShown -> saveWalletWasShown()
-            is SaveWalletAction.ProvideAdditionalInfo,
+            is SaveWalletAction.Save.Success,
+            is SaveWalletAction.ProvideBackupInfo,
             is SaveWalletAction.Dismiss,
             is SaveWalletAction.CloseError,
             is SaveWalletAction.Save.Error,
@@ -60,52 +61,56 @@ internal class SaveWalletMiddleware {
     }
 
     private fun saveWallet(state: SaveWalletState) {
-        val scanResponse = state.additionalInfo?.scanResponse
+        val scanResponse = state.backupInfo?.scanResponse
             ?: store.state.globalState.scanResponse
             ?: return
 
         scope.launch {
             val userWallet = UserWalletBuilder(scanResponse)
-                .setBackupCardsIds(backupCardsIds = state.additionalInfo?.backupCardsIds)
+                .setBackupCardsIds(backupCardsIds = state.backupInfo?.backupCardsIds)
                 .build()
 
-            userWalletsListManager.save(userWallet)
-                .flatMap {
-                    trySaveAccessCode(
-                        userWallet = userWallet,
-                        additionalInfo = state.additionalInfo,
-                    )
-                }
+            saveAccessCodeIfNeeded(state.backupInfo?.accessCode, userWallet.cardsInWallet)
+                .flatMap { userWalletsListManager.save(userWallet) }
                 .doOnFailure { error ->
                     store.dispatchOnMain(SaveWalletAction.Save.Error(error))
                 }
                 .doOnSuccess {
                     preferencesStorage.shouldSaveUserWallets = true
                     preferencesStorage.shouldSaveAccessCodes = true
+
+                    val isSavedWalletSelected =
+                        userWalletsListManager.selectedUserWalletSync?.walletId == userWallet.walletId
+
+                    if (isSavedWalletSelected) {
+                        store.dispatchOnMain(NavigationAction.PopBackTo())
+                    } else {
+                        store.dispatchOnMain(NavigationAction.NavigateTo(AppScreen.WalletSelector))
+                    }
+
                     store.dispatchOnMain(SaveWalletAction.Save.Success)
                     store.onUserWalletSelected(userWallet)
                 }
         }
     }
 
-    private fun popBack() {
-        store.dispatchOnMain(NavigationAction.PopBackTo())
-    }
-
     private fun saveWalletWasShown() {
         preferencesStorage.shouldShowSaveWallet = false
     }
 
-    private suspend fun trySaveAccessCode(
-        userWallet: UserWallet,
-        additionalInfo: SaveWalletState.WalletAdditionalInfo?,
+    private suspend fun saveAccessCodeIfNeeded(
+        accessCode: String?,
+        cardsInWallet: Set<String>,
     ): CompletionResult<Unit> {
         return when {
-            additionalInfo?.accessCode != null -> {
-                tangemSdkManager.saveAccessCode(
-                    accessCode = additionalInfo.accessCode,
-                    cardsIds = userWallet.cardsInWallet,
-                )
+            accessCode != null -> {
+                tangemSdkManager.unlockBiometricKeys()
+                    .flatMap {
+                        tangemSdkManager.saveAccessCode(
+                            accessCode = accessCode,
+                            cardsIds = cardsInWallet,
+                        )
+                    }
             }
             else -> {
                 CompletionResult.Success(Unit)

app/src/main/java/com/tangem/tap/features/saveWallet/redux/SaveWalletReducer.kt

@@ -12,8 +12,8 @@ internal object SaveWalletReducer {
 
     private fun internalReduce(action: SaveWalletAction, state: SaveWalletState): SaveWalletState {
         return when (action) {
-            is SaveWalletAction.ProvideAdditionalInfo -> state.copy(
-                additionalInfo = SaveWalletState.WalletAdditionalInfo(
+            is SaveWalletAction.ProvideBackupInfo -> state.copy(
+                backupInfo = SaveWalletState.WalletBackupInfo(
                     scanResponse = action.scanResponse,
                     accessCode = action.accessCode,
                     backupCardsIds = action.backupCardsIds,
@@ -27,11 +27,11 @@ internal object SaveWalletReducer {
                 isSaveInProgress = false,
             )
             is SaveWalletAction.Save.Success -> state.copy(
-                additionalInfo = null,
+                backupInfo = null,
                 isSaveInProgress = false,
             )
             is SaveWalletAction.Dismiss -> state.copy(
-                additionalInfo = null,
+                backupInfo = null,
             )
             is SaveWalletAction.CloseError -> state.copy(
                 error = null,

app/src/main/java/com/tangem/tap/features/saveWallet/redux/SaveWalletState.kt

@@ -5,12 +5,12 @@ import com.tangem.domain.common.ScanResponse
 import org.rekotlin.StateType
 
 data class SaveWalletState(
-    val additionalInfo: WalletAdditionalInfo? = null,
+    val backupInfo: WalletBackupInfo? = null,
     val isSaveInProgress: Boolean = false,
     val needEnrollBiometrics: Boolean = false,
     val error: TangemError? = null,
 ) : StateType {
-    data class WalletAdditionalInfo(
+    data class WalletBackupInfo(
         val scanResponse: ScanResponse,
         val accessCode: String?,
         val backupCardsIds: Set<String>?,

app/src/main/java/com/tangem/tap/features/saveWallet/ui/SaveWalletBottomSheetFragment.kt

@@ -6,13 +6,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.SnackbarHost
 import androidx.compose.material.SnackbarHostState
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.State
-import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberUpdatedState
+import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.fragment.app.viewModels