From dc57303765ef4dc9e1e2a3e1dee9c6f83424459a Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Wed, 31 Mar 2021 14:24:39 +0300
Subject: [PATCH] Updated on 2026-08-14

---
 .../configurable/config/ConfigManager.kt       | 11 ++++++-----
 .../tangem/tap/domain/tasks/ScanNoteTask.kt    | 18 ++++++++----------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/com/tangem/tap/domain/configurable/config/ConfigManager.kt b/app/src/main/java/com/tangem/tap/domain/configurable/config/ConfigManager.kt
index b1ccd85929..58096022fd 100644
--- a/app/src/main/java/com/tangem/tap/domain/configurable/config/ConfigManager.kt
+++ b/app/src/main/java/com/tangem/tap/domain/configurable/config/ConfigManager.kt
@@ -31,11 +31,12 @@ class ConfigManager(
         localLoader.load { config ->
             setupFeature(config.features)
             setupKey(config.configValues)
-        }
-        remoteLoader.load { config ->
-            setupFeature(config.features)
             onComplete?.invoke()
         }
+        // Uncomment to enable remote config
+//        remoteLoader.load { config ->
+//            setupFeature(config.features)
+//        }
     }
 
     fun turnOff(name: String) {
@@ -79,7 +80,7 @@ class ConfigManager(
                 blockchainSdkConfig = BlockchainSdkConfig(
                         blockchairApiKey = values.blockchairApiKey,
                         blockcypherTokens = values.blockcypherTokens,
-                        infuraProjectId =  values.infuraProjectId
+                        infuraProjectId = values.infuraProjectId
                 )
         )
         defaultConfig = defaultConfig.copy(
@@ -89,7 +90,7 @@ class ConfigManager(
                 blockchainSdkConfig = BlockchainSdkConfig(
                         blockchairApiKey = values.blockchairApiKey,
                         blockcypherTokens = values.blockcypherTokens,
-                        infuraProjectId =  values.infuraProjectId
+                        infuraProjectId = values.infuraProjectId
                 )
         )
     }
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 e2ae2aef19..3e24204388 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,9 +1,6 @@
 package com.tangem.tap.domain.tasks
 
-import com.tangem.CardSession
-import com.tangem.CardSessionRunnable
-import com.tangem.TangemError
-import com.tangem.TangemSdkError
+import com.tangem.*
 import com.tangem.blockchain.common.BlockchainSdkConfig
 import com.tangem.blockchain.common.WalletManager
 import com.tangem.blockchain.common.WalletManagerFactory
@@ -32,10 +29,6 @@ data class ScanNoteResponse(
 class ScanNoteTask(val card: Card? = null) : CardSessionRunnable<ScanNoteResponse> {
     override val requiresPin2 = false
 
-    private val blockchainSdkConfig = store.state.globalState.configManager?.config
-            ?.blockchainSdkConfig ?: BlockchainSdkConfig()
-    private val walletManagerFactory = WalletManagerFactory(blockchainSdkConfig)
-
     override fun run(session: CardSession, callback: (result: CompletionResult<ScanNoteResponse>) -> Unit) {
         ScanTask().run(session) { result ->
             when (result) {
@@ -59,7 +52,7 @@ class ScanNoteTask(val card: Card? = null) : CardSessionRunnable<ScanNoteRespons
                     }
 
                     val walletManager = try {
-                        walletManagerFactory.makeWalletManager(card)
+                        getWalletManagerFactory().makeWalletManager(card)
                     } catch (exception: Exception) {
                         return@run callback(CompletionResult.Success(ScanNoteResponse(null, card)))
                     }
@@ -100,7 +93,7 @@ class ScanNoteTask(val card: Card? = null) : CardSessionRunnable<ScanNoteRespons
                     if (verified) {
                         val twinPublicKey = readDataResult.data.issuerData.sliceArray(0 until 65)
                         val walletManager = try {
-                            walletManagerFactory.makeMultisigWalletManager(card, twinPublicKey)
+                            getWalletManagerFactory().makeMultisigWalletManager(card, twinPublicKey)
                         } catch (exception: Exception) {
                             callback(CompletionResult.Success(ScanNoteResponse(null, card)))
                             return@run
@@ -124,5 +117,10 @@ class ScanNoteTask(val card: Card? = null) : CardSessionRunnable<ScanNoteRespons
         return null
     }
 
+    private fun getWalletManagerFactory(): WalletManagerFactory {
+        val blockchainSdkConfig = store.state.globalState.configManager?.config
+                ?.blockchainSdkConfig ?: BlockchainSdkConfig()
+        return WalletManagerFactory(blockchainSdkConfig)
+    }
 
 }