Updated on 2026-08-14

app/src/main/java/com/tangem/tap/MainActivity.kt

@@ -96,8 +96,8 @@ class MainActivity : AppCompatActivity(), SnackbarHandler {
 
         val backStackIsEmpty = supportFragmentManager.backStackEntryCount == 0
         val isScannedBefore = store.state.globalState.scanResponse != null
-        val isOnboardingServiceActive = store.state.globalState.onboardingManager != null
-        if (backStackIsEmpty && (!isOnboardingServiceActive && !isScannedBefore)) {
+        val isOnboardingServiceActive = store.state.globalState.onboardingState.onboardingStarted
+        if (backStackIsEmpty || (!isOnboardingServiceActive && !isScannedBefore)) {
             store.dispatch(NavigationAction.NavigateTo(AppScreen.Home))
         }
         intentHandler.handleIntent(intent)

app/src/main/java/com/tangem/tap/common/redux/global/GlobalAction.kt

@@ -31,7 +31,7 @@ sealed class GlobalAction : Action {
     object HideDialog : GlobalAction()
 
     sealed class Onboarding {
-        data class Start(val scanResponse: ScanResponse, val fromHomeScreen: Boolean = true) : GlobalAction()
+        data class Start(val scanResponse: ScanResponse?, val fromHomeScreen: Boolean = true) : GlobalAction()
         object Stop : GlobalAction()
     }
 

app/src/main/java/com/tangem/tap/common/redux/global/GlobalReducer.kt

@@ -17,12 +17,16 @@ fun globalReducer(action: Action, state: AppState): GlobalState {
             globalState.copy(resources = action.resources)
         }
         is GlobalAction.Onboarding.Start -> {
-            val usedCardsPrefStorage = preferencesStorage.usedCardsPrefStorage
-            val onboardingState = OnboardingManager(action.scanResponse, usedCardsPrefStorage)
-            globalState.copy(onboardingManager = onboardingState)
+            val onboardingManager = if (action.scanResponse != null) {
+                val usedCardsPrefStorage = preferencesStorage.usedCardsPrefStorage
+                 OnboardingManager(action.scanResponse, usedCardsPrefStorage)
+            } else {
+                null
+            }
+            globalState.copy(onboardingState = OnboardingState(true, onboardingManager))
         }
         is GlobalAction.Onboarding.Stop -> {
-            globalState.copy(onboardingManager = null)
+            globalState.copy(onboardingState = OnboardingState(false))
         }
         is GlobalAction.ScanFailsCounter.Increment -> {
             globalState.copy(scanCardFailsCounter = globalState.scanCardFailsCounter + 1)

app/src/main/java/com/tangem/tap/common/redux/global/GlobalState.kt

@@ -15,7 +15,7 @@ import org.rekotlin.StateType
 
 data class GlobalState(
     val scanResponse: ScanResponse? = null,
-    val onboardingManager: OnboardingManager? = null,
+    val onboardingState: OnboardingState = OnboardingState(),
     val cardVerifiedOnline: Boolean = false,
     val tapWalletManager: TapWalletManager = TapWalletManager(),
     val payIdManager: PayIdManager = PayIdManager(),
@@ -32,12 +32,17 @@ data class GlobalState(
 
 
 data class AndroidResources(
-    val strings: RString = RString()
+    val strings: RString = RString(),
 ) {
     data class RString(
         val addressWasCopied: Int = -1,
-        val walletIsNotEmpty: Int = -1
+        val walletIsNotEmpty: Int = -1,
     )
 }
 typealias CryptoCurrencyName = String
-typealias FiatCurrencyName = String
+typealias FiatCurrencyName = String
+
+data class OnboardingState(
+    val onboardingStarted: Boolean = false,
+    val onboardingManager: OnboardingManager? = null,
+)

app/src/main/java/com/tangem/tap/domain/tasks/product/CreateProductWalletTask.kt

@@ -113,7 +113,7 @@ private class CreateWalletTangemWallet : ProductCommandProcessor<CreateWalletRes
 
 //TODO: updating derived wallet public keys - make it better later
 private fun updateDerivedKeys(wallet: CardWallet, derivedKeys: ExtendedPublicKeyList) {
-    val onboardingManager = store.state.globalState.onboardingManager ?: return
+    val onboardingManager = store.state.globalState.onboardingState.onboardingManager ?: return
     onboardingManager.scanResponse = onboardingManager.scanResponse.copy(
         derivedKeys = mapOf(wallet.publicKey.toMapKey() to derivedKeys)
     )

app/src/main/java/com/tangem/tap/features/onboarding/products/note/redux/OnboardingNoteMiddleware.kt

@@ -42,7 +42,7 @@ private val onboardingNoteMiddleware: Middleware<AppState> = { dispatch, state -
 private fun handleNoteAction(action: Action, dispatch: DispatchFunction) {
     if (action !is OnboardingNoteAction) return
     val globalState = store.state.globalState
-    val onboardingManager = globalState.onboardingManager ?: return
+    val onboardingManager = globalState.onboardingState.onboardingManager ?: return
 
     val scanResponse = onboardingManager.scanResponse
     val card = onboardingManager.scanResponse.card

app/src/main/java/com/tangem/tap/features/onboarding/products/otherCards/redux/OnboardingOtherCardsMiddleware.kt

@@ -37,7 +37,7 @@ private val onboardingOtherCardsMiddleware: Middleware<AppState> = { dispatch, s
 private fun handleOtherCardsAction(action: Action, dispatch: DispatchFunction) {
     if (action !is OnboardingOtherCardsAction) return
     val globalState = store.state.globalState
-    val onboardingManager = globalState.onboardingManager ?: return
+    val onboardingManager = globalState.onboardingState.onboardingManager ?: return
 
     val card = onboardingManager.scanResponse.card
 

app/src/main/java/com/tangem/tap/features/onboarding/products/twins/redux/TwinCardsMiddleware.kt

@@ -45,7 +45,7 @@ private fun handle(action: Action, dispatch: DispatchFunction) {
     val action = action as? TwinCardsAction ?: return
 
     val globalState = store.state.globalState
-    val onboardingManager = globalState.onboardingManager
+    val onboardingManager = globalState.onboardingState.onboardingManager
     val twinCardsState = store.state.twinCardsState
 
     fun getScanResponse(): ScanResponse {

app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletMiddleware.kt

@@ -38,7 +38,7 @@ private val onboardingWalletMiddleware: Middleware<AppState> = { dispatch, state
 private fun handleWalletAction(action: Action) {
     if (action !is OnboardingWalletAction) return
     val globalState = store.state.globalState
-    val onboardingManager = globalState.onboardingManager
+    val onboardingManager = globalState.onboardingState.onboardingManager
 
     val scanResponse = onboardingManager?.scanResponse
     val card = scanResponse?.card
@@ -73,7 +73,8 @@ private fun handleWalletAction(action: Action) {
                     when (result) {
                         is CompletionResult.Success -> {
                             //here we must use updated scanResponse after createWallet & derivation
-                            val updatedResponse = globalState.onboardingManager.scanResponse.copy(card = result.data)
+                            val updatedResponse =
+                                globalState.onboardingState.onboardingManager.scanResponse.copy(card = result.data)
                             onboardingManager.scanResponse = updatedResponse
                             onboardingManager.activationStarted(updatedResponse.card.cardId)
                             store.dispatch(OnboardingWalletAction.ProceedBackup)
@@ -134,7 +135,7 @@ private fun updateScanResponseAfterBackup(
     scanResponse: ScanResponse, backupState: BackupState
 ): ScanResponse {
     val card = if (backupState.backupStep == BackupStep.Finished) {
-        val cardsCount = backupState.backupCardsNumber + 1
+        val cardsCount = backupState.backupCardsNumber
         scanResponse.card.copy(
             backupStatus = Card.BackupStatus.Active(cardCount = cardsCount),
             isAccessCodeSet = true
@@ -250,6 +251,7 @@ class BackupMiddleware {
                         }
                     }
                     is BackupAction.ResumeBackup -> {
+                        store.dispatch(GlobalAction.Onboarding.Start(null, true))
                         store.dispatch(OnboardingWalletAction.ProceedBackup)
                         store.dispatch(NavigationAction.NavigateTo(AppScreen.OnboardingWallet))
                     }

app/src/main/res/drawable/shape_chip.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape android:shape="rectangle"
     xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/twins_dark" />
+    <solid android:color="@color/darkGray1" />
     <corners
         android:bottomLeftRadius="30dp"
         android:bottomRightRadius="30dp"