From 085ffaf2c5d0be5d5b8be04613eb719d4da0df72 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Sun, 30 Oct 2022 20:43:48 +0500
Subject: [PATCH] Updated on 2026-08-14

---
 .../tap/domain/tasks/product/ScanProductTask.kt    | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/tangem/tap/domain/tasks/product/ScanProductTask.kt b/app/src/main/java/com/tangem/tap/domain/tasks/product/ScanProductTask.kt
index a5d9fc3932..459191b260 100644
--- a/app/src/main/java/com/tangem/tap/domain/tasks/product/ScanProductTask.kt
+++ b/app/src/main/java/com/tangem/tap/domain/tasks/product/ScanProductTask.kt
@@ -73,7 +73,7 @@ class ScanProductTask(
                             // it need because processorResult.data.card doesn't contains attestation result
                             // and CardWallet.derivedKeys
                             val processorScanResponseWithNewCard = processorResult.data.copy(
-                                card = scanTaskResult.data
+                                card = scanTaskResult.data,
                             )
                             callback(CompletionResult.Success(processorScanResponseWithNewCard))
                         }
@@ -96,7 +96,7 @@ private class ScanNoteProcessor : ProductCommandProcessor<ScanResponse> {
     override fun proceed(
         card: Card,
         session: CardSession,
-        callback: (result: CompletionResult<ScanResponse>) -> Unit
+        callback: (result: CompletionResult<ScanResponse>) -> Unit,
     ) {
         callback(
             CompletionResult.Success(
@@ -145,7 +145,7 @@ private class ScanWalletProcessor(
                 is CompletionResult.Success -> {
                     PreflightReadTask(
                         readMode = PreflightReadMode.FullCardRead,
-                        cardId = card.cardId
+                        cardId = card.cardId,
                     ).run(session) { readResult ->
                         when (readResult) {
                             is CompletionResult.Success -> startLinkingForBackupIfNeeded(card, session, callback)
@@ -157,6 +157,7 @@ private class ScanWalletProcessor(
             }
         }
     }
+
     private fun startLinkingForBackupIfNeeded(
         card: Card,
         session: CardSession,
@@ -164,7 +165,9 @@ private class ScanWalletProcessor(
     ) {
         val activationInProgress = preferencesStorage.usedCardsPrefStorage.isActivationInProgress(card.cardId)
 
-        if (card.backupStatus == Card.BackupStatus.NoBackup && activationInProgress && card.wallets.isNotEmpty()) {
+        if ((card.backupStatus == Card.BackupStatus.NoBackup && card.wallets.isNotEmpty())
+            && (activationInProgress || card.isSaltPay)
+        ) {
             StartPrimaryCardLinkingTask().run(session) { linkingResult ->
                 when (linkingResult) {
                     is CompletionResult.Success -> {
@@ -180,6 +183,7 @@ private class ScanWalletProcessor(
             deriveKeysIfNeeded(card, session, callback)
         }
     }
+
     private fun deriveKeysIfNeeded(
         card: Card,
         session: CardSession,
@@ -251,7 +255,7 @@ private class ScanWalletProcessor(
                     Blockchain.RSK,
                     Blockchain.Fantom, Blockchain.FantomTestnet,
                     Blockchain.Avalanche, Blockchain.AvalancheTestnet,
-                ).map { BlockchainNetwork(it, card) }
+                ).map { BlockchainNetwork(it, card) },
             )
         }
         return blockchainsToDerive.distinct()