Updated on 2026-08-14

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

@@ -16,6 +16,8 @@ internal sealed interface SaveWalletAction : Action {
         data class Error(val error: TangemError) : SaveWalletAction
     }
 
+    object AllowToUseBiometrics : SaveWalletAction
+
     object Dismiss : SaveWalletAction
 
     object CloseError : SaveWalletAction

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

@@ -18,6 +18,7 @@ import com.tangem.tap.common.analytics.events.MainScreen
 import com.tangem.tap.common.analytics.events.Onboarding
 import com.tangem.tap.common.extensions.dispatchOnMain
 import com.tangem.tap.common.extensions.dispatchWithMain
+import com.tangem.tap.common.extensions.inject
 import com.tangem.tap.common.redux.AppState
 import com.tangem.tap.common.redux.global.GlobalAction
 import com.tangem.tap.domain.userWalletList.di.provideBiometricImplementation
@@ -42,6 +43,7 @@ internal class SaveWalletMiddleware {
     private fun handleAction(action: SaveWalletAction, state: SaveWalletState) {
         when (action) {
             is SaveWalletAction.Save -> saveWalletIfBiometricsEnrolled(state)
+            is SaveWalletAction.AllowToUseBiometrics -> allowToUseBiometrics(state)
             is SaveWalletAction.EnrollBiometrics.Enroll -> enrollBiometrics()
             is SaveWalletAction.SaveWalletWasShown -> saveWalletWasShown()
             is SaveWalletAction.Dismiss -> dismiss(state)
@@ -96,11 +98,16 @@ internal class SaveWalletMiddleware {
                     .build()
                 ?: return@launch
 
-            provideLockableUserWalletsListManagerIfNot()
+            val featureToggles = store.inject(DaggerGraphState::userWalletsListManagerFeatureToggles)
+            if (featureToggles.isGeneralManagerEnabled) {
+                store.inject(DaggerGraphState::walletsRepository).saveShouldSaveUserWallets(item = true)
+            } else {
+                provideLockableUserWalletsListManagerIfNot()
+            }
 
             val isFirstSavedWallet = !userWalletsListManager.hasUserWallets
 
-            saveAccessCodeIfNeeded(state.backupInfo?.accessCode, userWallet.cardsInWallet)
+            saveAccessCodeIfNeeded(accessCode = state.backupInfo?.accessCode, cardsInWallet = userWallet.cardsInWallet)
                 .flatMap {
                     // Save wallet only at first time (SaveWalletBottomSheet).
                     // Otherwise (Example, add new wallet in Details) userWalletsListManager.wallets subscribers will
@@ -116,16 +123,14 @@ internal class SaveWalletMiddleware {
                     store.dispatchWithMain(SaveWalletAction.Save.Error(error))
                 }
                 .doOnSuccess {
-                    store.state.daggerGraphState.get(DaggerGraphState::walletsRepository)
-                        .saveShouldSaveUserWallets(item = true)
+                    store.inject(DaggerGraphState::walletsRepository).saveShouldSaveUserWallets(item = true)
 
                     // Enable saving access codes only if this is the first time user save the wallet
                     if (isFirstSavedWallet) {
                         preferencesStorage.shouldSaveAccessCodes = true
-                        store.state.daggerGraphState.get(DaggerGraphState::cardSdkConfigRepository)
-                            .setAccessCodeRequestPolicy(
-                                isBiometricsRequestPolicy = userWallet.hasAccessCode,
-                            )
+                        store.inject(DaggerGraphState::cardSdkConfigRepository).setAccessCodeRequestPolicy(
+                            isBiometricsRequestPolicy = userWallet.hasAccessCode,
+                        )
                     }
 
                     store.dispatchOnMain(SaveWalletAction.Save.Success)
@@ -141,6 +146,46 @@ internal class SaveWalletMiddleware {
         }
     }
 
+    private fun allowToUseBiometrics(state: SaveWalletState) {
+        val scanResponse = state.backupInfo?.scanResponse
+            ?: store.state.globalState.scanResponse
+            ?: return
+
+        if (state.backupInfo != null) {
+            // TODO: Remove after onboarding refactoring
+            Analytics.send(Onboarding.EnableBiometrics(AnalyticsParam.OnOffState.On))
+        } else {
+            Analytics.send(MainScreen.EnableBiometrics(AnalyticsParam.OnOffState.On))
+        }
+
+        scope.launch {
+            val userWallet = userWalletsListManager.selectedUserWalletSync
+                ?: UserWalletBuilder(scanResponse)
+                    .backupCardsIds(state.backupInfo?.backupCardsIds)
+                    .build()
+                ?: return@launch
+
+            store.inject(DaggerGraphState::walletsRepository).saveShouldSaveUserWallets(item = true)
+
+            saveAccessCodeIfNeeded(accessCode = state.backupInfo?.accessCode, cardsInWallet = userWallet.cardsInWallet)
+                .flatMap {
+                    userWalletsListManager.save(userWallet, canOverride = true)
+                }
+                .doOnFailure { error ->
+                    store.dispatchWithMain(SaveWalletAction.Save.Error(error))
+                }
+                .doOnSuccess {
+                    preferencesStorage.shouldSaveAccessCodes = true
+                    store.inject(DaggerGraphState::cardSdkConfigRepository).setAccessCodeRequestPolicy(
+                        isBiometricsRequestPolicy = userWallet.hasAccessCode,
+                    )
+
+                    store.dispatchOnMain(SaveWalletAction.Save.Success)
+                    store.dispatchOnMain(NavigationAction.PopBackTo(AppScreen.Wallet))
+                }
+        }
+    }
+
     private suspend fun provideLockableUserWalletsListManagerIfNot() {
         if (store.state.globalState.userWalletsListManager?.isLockable == true) return
 

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

@@ -21,9 +21,9 @@ internal object SaveWalletReducer {
                     backupCardsIds = action.backupCardsIds,
                 ),
             )
-            is SaveWalletAction.Save -> state.copy(
-                isSaveInProgress = true,
-            )
+            is SaveWalletAction.Save,
+            is SaveWalletAction.AllowToUseBiometrics,
+            -> state.copy(isSaveInProgress = true)
             is SaveWalletAction.Save.Error -> state.copy(
                 error = action.error,
                 isSaveInProgress = false,

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

@@ -3,6 +3,7 @@ package com.tangem.tap.features.saveWallet.ui
 import androidx.lifecycle.ViewModel
 import com.tangem.core.analytics.api.AnalyticsEventHandler
 import com.tangem.core.analytics.models.AnalyticsParam
+import com.tangem.domain.wallets.legacy.UserWalletsListManagerFeatureToggles
 import com.tangem.feature.wallet.presentation.wallet.analytics.WalletScreenAnalyticsEvent
 import com.tangem.tap.common.extensions.dispatchOnMain
 import com.tangem.tap.features.details.ui.cardsettings.TextReference
@@ -19,6 +20,7 @@ import javax.inject.Inject
 
 @HiltViewModel
 internal class SaveWalletViewModel @Inject constructor(
+    private val userWalletsListManagerFeatureToggles: UserWalletsListManagerFeatureToggles,
     private val analyticsEventHandler: AnalyticsEventHandler,
 ) : ViewModel(), StoreSubscriber<SaveWalletState> {
     private val stateInternal = MutableStateFlow(SaveWalletScreenState())
@@ -31,7 +33,12 @@ internal class SaveWalletViewModel @Inject constructor(
 
     fun saveWallet() {
         analyticsEventHandler.send(WalletScreenAnalyticsEvent.MainScreen.EnableBiometrics(AnalyticsParam.OnOffState.On))
-        store.dispatch(SaveWalletAction.Save)
+
+        if (userWalletsListManagerFeatureToggles.isGeneralManagerEnabled) {
+            store.dispatch(SaveWalletAction.AllowToUseBiometrics)
+        } else {
+            store.dispatch(SaveWalletAction.Save)
+        }
     }
 
     fun cancelOrClose() {