From 3eb39c322d1ebff5441d9b1c44d2feb3145d5a55 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Wed, 26 Oct 2022 18:05:46 +0500
Subject: [PATCH] Updated on 2026-08-14

---
 .../redux/OnboardingWalletMiddleware.kt       | 52 +++++++++++++------
 1 file changed, 37 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletMiddleware.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletMiddleware.kt
index 397eaf9a9e..48e9c32f2f 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletMiddleware.kt
@@ -3,7 +3,6 @@ package com.tangem.tap.features.onboarding.products.wallet.redux
 import com.tangem.blockchain.common.Blockchain
 import com.tangem.common.CompletionResult
 import com.tangem.common.card.Card
-import com.tangem.common.extensions.ifNotNull
 import com.tangem.domain.common.ScanResponse
 import com.tangem.domain.common.extensions.withMainContext
 import com.tangem.operations.backup.BackupService
@@ -91,10 +90,8 @@ private fun handleWalletAction(action: Action, state: () -> AppState?, dispatch:
         is OnboardingWalletAction.StartSaltPayCardActivation -> {
             // we need to do this because the standard activation happens in the OnboardingWalletAction.CreateWallet
             // step which is omitted for SaltPay cards
-            if (onboardingWalletState.isSaltPay) {
-                ifNotNull(onboardingManager, scanResponse?.card?.cardId) { manager, cardId ->
-                    manager.activationStarted(cardId)
-                }
+            if (onboardingWalletState.isSaltPay && scanResponse != null) {
+                startCardActivation(scanResponse)
             }
         }
         is OnboardingWalletAction.LoadArtwork -> {
@@ -132,7 +129,7 @@ private fun handleWalletAction(action: Action, state: () -> AppState?, dispatch:
                                     card = result.data.card,
                                 ),
                             )
-                            onboardingManager.activationStarted(updatedResponse.card.cardId)
+                            startCardActivation(updatedResponse)
                             store.dispatch(OnboardingWalletAction.ResumeBackup)
                         }
                         is CompletionResult.Failure -> {
@@ -145,13 +142,15 @@ private fun handleWalletAction(action: Action, state: () -> AppState?, dispatch:
         OnboardingWalletAction.FinishOnboarding -> {
             store.dispatch(GlobalAction.Onboarding.Stop)
 
-            //TODO: SaltPay: scanResponse
             if (scanResponse == null) {
                 store.dispatch(NavigationAction.PopBackTo())
                 store.dispatch(HomeAction.ReadCard)
             } else {
                 val backupState = store.state.onboardingWalletState.backupState
                 val updatedScanResponse = updateScanResponseAfterBackup(scanResponse, backupState)
+                if (onboardingWalletState.isSaltPay) {
+                    finishCardActivation(backupState, scanResponse.card)
+                }
                 scope.launch { globalState.tapWalletManager.onCardScanned(updatedScanResponse) }
                 store.dispatchOnMain(NavigationAction.NavigateTo(AppScreen.Wallet))
             }
@@ -313,19 +312,15 @@ private fun handleBackupAction(appState: () -> AppState?, action: BackupAction)
             }
         }
         is BackupAction.FinishBackup -> {
-            (listOf(backupState.primaryCardId, card?.cardId) + backupState.backupCardIds)
-                .distinct().filterNotNull()
-                .forEach { cardId ->
-                    preferencesStorage.usedCardsPrefStorage.activationFinished(cardId)
-                }
+            if (!onboardingWalletState.isSaltPay) {
+                finishCardActivation(backupState, card)
+            }
         }
         is BackupAction.DiscardBackup -> {
             backupService.discardSavedBackup()
         }
         is BackupAction.DiscardSavedBackup -> {
-            backupService.primaryCardId?.let {
-                preferencesStorage.usedCardsPrefStorage.activationFinished(it)
-            }
+            backupService.primaryCardId?.let { finishCardsActivationForDiscardedUnfinishedBackup(it) }
             backupService.discardSavedBackup()
         }
         is BackupAction.CheckForUnfinishedBackup -> {
@@ -344,6 +339,33 @@ private fun handleBackupAction(appState: () -> AppState?, action: BackupAction)
     }
 }
 
+/**
+ * Standard Wallet cards start activation at OnboardingWalletAction.CreateWallet
+ * SaltPay cards start activation at OnboardingWalletAction.StartSaltPayCardActivation
+ */
+private fun startCardActivation(scanResponse: ScanResponse) {
+    preferencesStorage.usedCardsPrefStorage.activationStarted(scanResponse.card.cardId)
+}
+
+/**
+ * Standard Wallet cards finish activation at BackupAction.FinishBackup
+ * SaltPay cards finish activation at OnboardingWalletAction.FinishOnboarding
+ */
+private fun finishCardActivation(backupState: BackupState, card: Card?) {
+    (listOf(backupState.primaryCardId, card?.cardId) + backupState.backupCardIds)
+        .distinct().filterNotNull()
+        .forEach { cardId ->
+            preferencesStorage.usedCardsPrefStorage.activationFinished(cardId)
+        }
+}
+
+/**
+ * Not used for SaltPay cards, because discarding unfinished backup is not possible
+ */
+private fun finishCardsActivationForDiscardedUnfinishedBackup(cardId: String) {
+    preferencesStorage.usedCardsPrefStorage.activationFinished(cardId)
+}
+
 /**
  * SaltPay state maybe not initialized if backup resumed from ResumeFoundUnfinishedBackup action
  */