Updated on 2026-08-14

app/src/main/java/com/tangem/tap/features/details/redux/DetailsMiddleware.kt

@@ -245,7 +245,7 @@ class DetailsMiddleware {
             deleteSavedAccessCodes()
             store.inject(DaggerGraphState::walletsRepository).saveShouldSaveUserWallets(item = false)
 
-            store.dispatchNavigationAction { popTo<AppRoute.Home>() }
+            store.dispatchNavigationAction { replaceAll(AppRoute.Home) }
 
             return CompletionResult.Success(Unit)
         }

app/src/main/java/com/tangem/tap/features/details/ui/cardsettings/CardSettingsViewModel.kt

@@ -109,7 +109,10 @@ internal class CardSettingsViewModel @Inject constructor(
 
             if (isResetCardAllowed) {
                 CardInfo.ResetToFactorySettings(
-                    description = getResetToFactoryDescription(card.backupStatus, cardTypesResolver),
+                    description = getResetToFactoryDescription(
+                        isActiveBackupStatus = card.backupStatus?.isActive == true,
+                        typesResolver = cardTypesResolver,
+                    ),
                 ).let(::add)
             }
         }
@@ -135,10 +138,15 @@ internal class CardSettingsViewModel @Inject constructor(
                     push(
                         route = AppRoute.ResetToFactory(
                             userWalletId = userWalletId,
-                            cardSpecificInfo = AppRoute.ResetToFactory.CardSpecificInfo(
-                                cardId = card.cardId,
-                                backupStatus = card.backupStatus,
-                            ),
+                            cardId = card.cardId,
+                            isActiveBackupStatus = card.backupStatus?.isActive == true,
+                            backupCardsCount = when (val status = card.backupStatus) {
+                                is CardDTO.BackupStatus.Active -> status.cardCount
+                                is CardDTO.BackupStatus.CardLinked,
+                                CardDTO.BackupStatus.NoBackup,
+                                null,
+                                -> 0
+                            },
                         ),
                     )
                 }

app/src/main/java/com/tangem/tap/features/details/ui/common/utils/ResetToFactory.kt

@@ -1,15 +1,14 @@
 package com.tangem.tap.features.details.ui.common.utils
 
 import com.tangem.domain.common.CardTypesResolver
-import com.tangem.domain.models.scan.CardDTO
 import com.tangem.tap.features.details.ui.cardsettings.TextReference
 import com.tangem.wallet.R
 
 internal fun getResetToFactoryDescription(
-    backupStatus: CardDTO.BackupStatus?,
+    isActiveBackupStatus: Boolean,
     typesResolver: CardTypesResolver,
 ): TextReference {
-    return if (backupStatus?.isActive != true || typesResolver.isTangemTwins()) {
+    return if (!isActiveBackupStatus || typesResolver.isTangemTwins()) {
         TextReference.Res(R.string.reset_card_without_backup_to_factory_message)
     } else {
         TextReference.Res(R.string.reset_card_with_backup_to_factory_message)

app/src/main/java/com/tangem/tap/features/details/ui/resetcard/ResetCardViewModel.kt

@@ -13,7 +13,6 @@ import com.tangem.domain.card.DeleteSavedAccessCodesUseCase
 import com.tangem.domain.card.ResetCardUseCase
 import com.tangem.domain.card.ResetCardUserCodeParams
 import com.tangem.domain.common.util.cardTypesResolver
-import com.tangem.domain.models.scan.CardDTO
 import com.tangem.domain.wallets.legacy.UserWalletsListManager
 import com.tangem.domain.wallets.legacy.asLockable
 import com.tangem.domain.wallets.models.UserWalletId
@@ -65,8 +64,15 @@ internal class ResetCardViewModel @Inject constructor(
     // endregion
 
     // region Data of card that was scanned on CardSettings
-    private val primaryCardId: String
-    private val primaryBackupStatus: CardDTO.BackupStatus?
+    private val primaryCardId: String = savedStateHandle.get<String>(AppRoute.ResetToFactory.CARD_ID)
+        ?: error("CardId must be provided for ResetCardViewModel")
+
+    private val isActiveBackupPrimaryCard =
+        savedStateHandle.get<Boolean>(AppRoute.ResetToFactory.IS_ACTIVE_BACKUP_STATUS)
+            ?: error("IsActiveBackupCard must be provided for ResetCardViewModel")
+
+    private val primaryBackupCardsCount = savedStateHandle.get<Int>(AppRoute.ResetToFactory.BACKUP_CARDS_COUNT)
+        ?: error("CardCount must be provided for ResetCardViewModel")
     // endregion
 
     // TODO: move logic to separate domain entity
@@ -76,15 +82,6 @@ internal class ResetCardViewModel @Inject constructor(
         value = getInitialState(),
     )
 
-    init {
-        val cardSpecificInfo = savedStateHandle.get<Bundle>(AppRoute.ResetToFactory.CARD_SPECIFIC_DATA)
-            ?.unbundle(AppRoute.ResetToFactory.CardSpecificInfo.serializer())
-            ?: error("CardSpecificData must be provided for ResetCardViewModel")
-
-        primaryCardId = cardSpecificInfo.cardId
-        primaryBackupStatus = cardSpecificInfo.backupStatus
-    }
-
     private fun getInitialState(): ResetCardScreenState {
         val shouldShowResetPasswordButton = shouldShowResetPasswordButton()
         val warningsToShow = buildList {
@@ -98,7 +95,7 @@ internal class ResetCardViewModel @Inject constructor(
         return ResetCardScreenState(
             resetButtonEnabled = false,
             descriptionText = getResetToFactoryDescription(
-                backupStatus = primaryBackupStatus,
+                isActiveBackupStatus = isActiveBackupPrimaryCard,
                 typesResolver = currentCardTypesResolver,
             ),
             warningsToShow = warningsToShow,
@@ -115,7 +112,7 @@ internal class ResetCardViewModel @Inject constructor(
     private fun shouldShowResetPasswordButton(): Boolean {
         val isTangemWallet = currentCardTypesResolver.isTangemWallet() || currentCardTypesResolver.isWallet2()
 
-        return isTangemWallet && primaryBackupStatus is CardDTO.BackupStatus.Active
+        return isTangemWallet && isActiveBackupPrimaryCard
     }
 
     private fun toggleFirstCondition(isAccepted: Boolean) {
@@ -283,12 +280,6 @@ internal class ResetCardViewModel @Inject constructor(
     private fun getBackupCardsCount(): Int {
         if (!currentCardTypesResolver.isMultiwalletAllowed()) return 0
 
-        return when (val status = primaryBackupStatus) {
-            is CardDTO.BackupStatus.Active -> status.cardCount
-            is CardDTO.BackupStatus.CardLinked,
-            is CardDTO.BackupStatus.NoBackup,
-            null,
-            -> 0
-        }
+        return primaryBackupCardsCount
     }
 }

app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/dialogs/AttestationFailedDialog.kt

@@ -13,7 +13,7 @@ internal object AttestationFailedDialog {
         return MaterialAlertDialogBuilder(context, R.style.CustomMaterialDialog).apply {
             setTitle(R.string.common_error)
             setMessage(R.string.issuer_signature_loading_failed)
-            setPositiveButton(R.string.ok) { dialog, _ ->
+            setPositiveButton(R.string.common_ok) { dialog, _ ->
                 dialog.dismiss()
             }
             setOnDismissListener {

app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/viewmodels/TokensListMigration.kt

@@ -135,6 +135,7 @@ internal class TokensListMigration(
         derivePublicKeysUseCase(userWalletId = currentUserWallet.walletId, currencies = currencyList)
             .onRight {
                 addCryptoCurrenciesUseCase(userWalletId = currentUserWallet.walletId, currencies = currencyList)
+                store.dispatchNavigationAction { popTo<AppRoute.Wallet>() }
             }
             .onLeft { Timber.e(it, "Failed to derive public keys") }
     }

app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/viewmodels/TokensListViewModel.kt

@@ -11,8 +11,6 @@ import androidx.lifecycle.viewModelScope
 import androidx.paging.*
 import com.tangem.blockchain.common.Blockchain
 import com.tangem.blockchainsdk.utils.fromNetworkId
-import com.tangem.common.routing.AppRoute
-import com.tangem.common.routing.utils.popTo
 import com.tangem.core.analytics.api.AnalyticsEventHandler
 import com.tangem.core.ui.extensions.getActiveIconRes
 import com.tangem.core.ui.extensions.getGreyedOutIconRes
@@ -26,7 +24,6 @@ import com.tangem.domain.tokens.AddCryptoCurrenciesUseCase
 import com.tangem.domain.tokens.GetCryptoCurrenciesUseCase
 import com.tangem.domain.tokens.TokenWithBlockchain
 import com.tangem.domain.wallets.usecase.GetSelectedWalletSyncUseCase
-import com.tangem.tap.common.extensions.dispatchNavigationAction
 import com.tangem.tap.common.extensions.fullNameWithoutTestnet
 import com.tangem.tap.common.extensions.getNetworkName
 import com.tangem.tap.features.customtoken.impl.presentation.models.SupportBlockchainType
@@ -326,7 +323,6 @@ internal class TokensListViewModel @Inject constructor(
                 )
 
                 uiState = state.copy(isSavingInProgress = false)
-                store.dispatchNavigationAction { popTo<AppRoute.Wallet>() }
             }
         }