From 033b8fb4e40b1397b9d1fdce1d90ccf042f63deb Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Wed, 21 Apr 2021 14:57:56 +0300
Subject: [PATCH] Updated on 2026-08-14

---
 .../main/java/com/tangem/tap/domain/TapWorkarounds.kt |  9 +++++----
 .../java/com/tangem/tap/domain/tasks/ScanNoteTask.kt  | 11 ++++++++++-
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/tangem/tap/domain/TapWorkarounds.kt b/app/src/main/java/com/tangem/tap/domain/TapWorkarounds.kt
index 48526204e8..eb1e716da7 100644
--- a/app/src/main/java/com/tangem/tap/domain/TapWorkarounds.kt
+++ b/app/src/main/java/com/tangem/tap/domain/TapWorkarounds.kt
@@ -28,10 +28,11 @@ object TapWorkarounds {
     private const val START_2_COIN_ISSUER = "start2coin"
 
     private val excludedBatches = listOf(
-                "0027",
-                "0030",
-                "0031",
-        ) // Tangem tags
+            "0027",
+            "0030",
+            "0031",
+            "0035"
+    ) // Tangem tags
 
     private val excludedIssuers = listOf(
             "TTM BANK"
diff --git a/app/src/main/java/com/tangem/tap/domain/tasks/ScanNoteTask.kt b/app/src/main/java/com/tangem/tap/domain/tasks/ScanNoteTask.kt
index 3e24204388..0c6e990dc3 100644
--- a/app/src/main/java/com/tangem/tap/domain/tasks/ScanNoteTask.kt
+++ b/app/src/main/java/com/tangem/tap/domain/tasks/ScanNoteTask.kt
@@ -1,6 +1,7 @@
 package com.tangem.tap.domain.tasks
 
 import com.tangem.*
+import com.tangem.blockchain.common.Blockchain
 import com.tangem.blockchain.common.BlockchainSdkConfig
 import com.tangem.blockchain.common.WalletManager
 import com.tangem.blockchain.common.WalletManagerFactory
@@ -14,6 +15,7 @@ import com.tangem.common.CompletionResult
 import com.tangem.common.extensions.toHexString
 import com.tangem.tap.domain.TapSdkError
 import com.tangem.tap.domain.TapWorkarounds.isExcluded
+import com.tangem.tap.domain.isMultiwalletAllowed
 import com.tangem.tap.domain.twins.TwinCardsManager
 import com.tangem.tap.domain.twins.isTwinCard
 import com.tangem.tap.store
@@ -54,7 +56,14 @@ class ScanNoteTask(val card: Card? = null) : CardSessionRunnable<ScanNoteRespons
                     val walletManager = try {
                         getWalletManagerFactory().makeWalletManager(card)
                     } catch (exception: Exception) {
-                        return@run callback(CompletionResult.Success(ScanNoteResponse(null, card)))
+                        if (card.isMultiwalletAllowed) {
+                            // Create default Bitcoin WalletManager
+                            getWalletManagerFactory().makeWalletManager(card, Blockchain.Bitcoin)
+                        } else {
+                            return@run callback(CompletionResult.Success(
+                                    ScanNoteResponse(null, card)
+                            ))
+                        }
                     }
                     verifyCard(walletManager, card, null, session, callback)
                 }