Updated on 2026-08-14

app/src/main/java/com/tangem/tap/domain/TapWalletManager.kt

@@ -26,7 +26,7 @@ import kotlinx.coroutines.withContext
 
 class TapWalletManager {
     val walletManagerFactory: WalletManagerFactory
-        by lazy { WalletManagerFactory(blockchainSdkConfig) }
+            by lazy { WalletManagerFactory(blockchainSdkConfig) }
 
     val rates: RatesRepository = RatesRepository()
 
@@ -34,10 +34,10 @@ class TapWalletManager {
         store.state.globalState.configManager?.config?.blockchainSdkConfig ?: BlockchainSdkConfig()
     }
 
-    private val walletManagersThrottler = ThrottlerWithValues<BlockchainNetwork, Result<Wallet>>(10000)
+    private val walletManagersThrottler =
+        ThrottlerWithValues<BlockchainNetwork, Result<Wallet>>(10000)
 
     suspend fun loadWalletData(walletManager: WalletManager) {
-        val blockchain = walletManager.wallet.blockchain
         val blockchainNetwork = BlockchainNetwork.fromWalletManager(walletManager)
         val result = if (walletManagersThrottler.isStillThrottled(blockchainNetwork)) {
             walletManagersThrottler.geValue(blockchainNetwork)!!
@@ -54,17 +54,21 @@ class TapWalletManager {
             is Result.Failure -> {
                 when (result.error) {
                     is TapError.WalletManager.NoAccountError -> {
-                        dispatchOnMain(WalletAction.LoadWallet.NoAccount(
-                            walletManager.wallet,
-                            blockchainNetwork,
-                            (result.error as TapError.WalletManager.NoAccountError).customMessage
-                        ))
+                        dispatchOnMain(
+                            WalletAction.LoadWallet.NoAccount(
+                                walletManager.wallet,
+                                blockchainNetwork,
+                                (result.error as TapError.WalletManager.NoAccountError).customMessage
+                            )
+                        )
                     }
                     else -> {
-                        dispatchOnMain(WalletAction.LoadWallet.Failure(
-                            walletManager.wallet,
-                            result.error.localizedMessage
-                        ))
+                        dispatchOnMain(
+                            WalletAction.LoadWallet.Failure(
+                                walletManager.wallet,
+                                result.error.localizedMessage
+                            )
+                        )
                     }
                 }
             }
@@ -109,6 +113,37 @@ class TapWalletManager {
             return
         }
 
+        if (data.card.isMultiwalletAllowed) {
+            loadMultiWalletData(data)
+        } else {
+            loadSingleWalletData(data)
+        }
+
+        dispatchOnMain(WalletAction.LoadWallet())
+        dispatchOnMain(WalletAction.LoadFiatRate())
+    }
+
+    private suspend fun loadMultiWalletData(
+        scanResponse: ScanResponse
+    ) {
+        val savedCurrencies = currenciesRepository.loadSavedCurrencies(
+            scanResponse.card.cardId, scanResponse.card.settings.isHDWalletAllowed
+        )
+        if (savedCurrencies.isEmpty()) return
+
+        val walletManagers =
+            walletManagerFactory.makeWalletManagersForApp(scanResponse, savedCurrencies)
+        dispatchOnMain(
+            WalletAction.MultiWallet.AddBlockchains(savedCurrencies, walletManagers),
+        )
+        savedCurrencies.map {
+            if (it.tokens.isNotEmpty()) {
+                dispatchOnMain(WalletAction.MultiWallet.AddTokens(it.tokens, it))
+            }
+        }
+    }
+
+    private suspend fun loadSingleWalletData(data: ScanResponse) {
         val blockchain = data.getBlockchain()
         val primaryWalletManager = walletManagerFactory.makePrimaryWalletManager(data)
 
@@ -120,87 +155,12 @@ class TapWalletManager {
                 primaryWalletManager.addToken(primaryToken)
                 dispatchOnMain(WalletAction.MultiWallet.SetPrimaryToken(primaryToken))
             }
-            if (data.card.isMultiwalletAllowed) {
-                loadMultiWalletData(data, blockchain, primaryWalletManager)
-            } else {
-                dispatchOnMain(WalletAction.MultiWallet.AddBlockchains(
+            dispatchOnMain(
+                WalletAction.MultiWallet.AddBlockchains(
                     listOf(BlockchainNetwork.fromWalletManager(primaryWalletManager)),
                     listOf(primaryWalletManager)
-                ))
-            }
-        } else {
-            if (data.card.isMultiwalletAllowed) {
-                loadMultiWalletData(data, blockchain, null)
-            }
-        }
-        dispatchOnMain(WalletAction.LoadWallet())
-        dispatchOnMain(WalletAction.LoadFiatRate())
-    }
-
-    private suspend fun loadMultiWalletData(
-        scanResponse: ScanResponse,
-        primaryBlockchain: Blockchain?,
-        primaryWalletManager: WalletManager?
-    ) {
-        val primaryTokens = primaryWalletManager?.cardTokens?.toList() ?: emptyList()
-        val savedCurrencies = currenciesRepository.loadSavedCurrencies(
-            scanResponse.card.cardId, scanResponse.card.settings.isHDWalletAllowed
-        )
-
-        if (savedCurrencies.isEmpty()) {
-            if (primaryBlockchain != null && primaryWalletManager != null) {
-                val blockchainNetwork = BlockchainNetwork.fromWalletManager(primaryWalletManager)
-                dispatchOnMain(
-                    WalletAction.MultiWallet.SaveCurrencies(listOf(blockchainNetwork)),
-                    WalletAction.MultiWallet.AddBlockchains(
-                        listOf(blockchainNetwork),
-                        listOf(primaryWalletManager)
-                    ),
-                    WalletAction.MultiWallet.AddTokens(primaryTokens.toList(), blockchainNetwork)
                 )
-
-            } else {
-                val blockchainNetworks = listOf(
-                    BlockchainNetwork(Blockchain.Bitcoin, scanResponse.card),
-                    BlockchainNetwork(Blockchain.Ethereum, scanResponse.card)
-                )
-
-                val walletManagers = walletManagerFactory.makeWalletManagersForApp(
-                    scanResponse,
-                    blockchainNetworks
-                )
-
-                dispatchOnMain(
-                    WalletAction.MultiWallet.SaveCurrencies(blockchainNetworks),
-                    WalletAction.MultiWallet.AddBlockchains(blockchainNetworks, walletManagers),
-                )
-            }
-//            dispatchOnMain(
-//                WalletAction.MultiWallet.FindBlockchainsInUse,
-//                WalletAction.MultiWallet.FindTokensInUse,
-//            )
-        } else {
-            val walletManagers = if (
-                primaryTokens.isNotEmpty() &&
-                primaryWalletManager != null &&
-                primaryBlockchain != null && primaryBlockchain != Blockchain.Unknown
-            ) {
-                val blockchainsWithoutPrimary = savedCurrencies.filterNot { it.blockchain == primaryBlockchain }
-                walletManagerFactory.makeWalletManagersForApp(
-                    scanResponse,
-                    blockchainsWithoutPrimary
-                ).plus(primaryWalletManager)
-            } else {
-                walletManagerFactory.makeWalletManagersForApp(scanResponse, savedCurrencies)
-            }
-            dispatchOnMain(
-                WalletAction.MultiWallet.AddBlockchains(savedCurrencies, walletManagers),
             )
-            savedCurrencies.map {
-                if (it.tokens.isNotEmpty()) {
-                    dispatchOnMain(WalletAction.MultiWallet.AddTokens(it.tokens, it))
-                }
-            }
         }
     }
 

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

@@ -1,5 +1,6 @@
 package com.tangem.tap.features.onboarding.products.otherCards.redux
 
+import com.tangem.blockchain.common.Blockchain
 import com.tangem.common.CompletionResult
 import com.tangem.domain.common.extensions.withMainContext
 import com.tangem.tap.DELAY_SDK_DIALOG_CLOSE
@@ -10,6 +11,8 @@ import com.tangem.tap.common.redux.global.GlobalAction
 import com.tangem.tap.common.redux.navigation.AppScreen
 import com.tangem.tap.common.redux.navigation.NavigationAction
 import com.tangem.tap.domain.extensions.hasWallets
+import com.tangem.tap.domain.tokens.models.BlockchainNetwork
+import com.tangem.tap.features.wallet.redux.WalletAction
 import com.tangem.tap.scope
 import com.tangem.tap.store
 import com.tangem.tap.tangemSdkManager
@@ -73,6 +76,21 @@ private fun handleOtherCardsAction(action: Action, dispatch: DispatchFunction) {
                             onboardingManager.scanResponse = updatedResponse
                             onboardingManager.activationStarted(updatedResponse.card.cardId)
 
+                            val primaryBlockchain = updatedResponse.getBlockchain()
+                            val blockchainNetworks = if (primaryBlockchain != Blockchain.Unknown) {
+                                val primaryToken = updatedResponse.getPrimaryToken()
+                                val blockchainNetwork = BlockchainNetwork(primaryBlockchain, updatedResponse.card).updateTokens(
+                                    listOfNotNull(primaryToken))
+                                listOf(blockchainNetwork)
+                            } else {
+                                listOf(
+                                    BlockchainNetwork(Blockchain.Bitcoin, updatedResponse.card),
+                                    BlockchainNetwork(Blockchain.Ethereum, updatedResponse.card)
+                                )
+                            }
+
+                            store.dispatch(WalletAction.MultiWallet.SaveCurrencies(blockchainNetworks))
+
                             delay(DELAY_SDK_DIALOG_CLOSE)
                             store.dispatch(OnboardingOtherCardsAction.SetStepOfScreen(OnboardingOtherCardsStep.Done))
                         }

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

@@ -1,5 +1,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.domain.common.ScanResponse
@@ -12,9 +13,11 @@ import com.tangem.tap.common.redux.global.GlobalAction
 import com.tangem.tap.common.redux.navigation.AppScreen
 import com.tangem.tap.common.redux.navigation.NavigationAction
 import com.tangem.tap.domain.extensions.hasWallets
+import com.tangem.tap.domain.tokens.models.BlockchainNetwork
 import com.tangem.tap.features.demo.DemoHelper
 import com.tangem.tap.features.home.redux.HomeAction
 import com.tangem.tap.features.wallet.redux.Artwork
+import com.tangem.tap.features.wallet.redux.WalletAction
 import kotlinx.coroutines.launch
 import org.rekotlin.Action
 import org.rekotlin.Middleware
@@ -84,6 +87,11 @@ private fun handleWalletAction(action: Action) {
                                     primaryCard = result.data.primaryCard
                                 )
                             onboardingManager.scanResponse = updatedResponse
+                            val blockchainNetworks = listOf(
+                                BlockchainNetwork(Blockchain.Bitcoin, result.data.card),
+                                BlockchainNetwork(Blockchain.Ethereum, result.data.card)
+                            )
+                            store.dispatchOnMain(WalletAction.MultiWallet.SaveCurrencies(blockchainNetworks))
                             onboardingManager.activationStarted(updatedResponse.card.cardId)
                             store.dispatch(OnboardingWalletAction.ProceedBackup)
                         }
@@ -260,6 +268,11 @@ private fun handleBackupAction(appState: () -> AppState?, action: BackupAction)
             backupService.proceedBackup { result ->
                 when (result) {
                     is CompletionResult.Success -> {
+                        val blockchainNetworks = listOf(
+                            BlockchainNetwork(Blockchain.Bitcoin, result.data),
+                            BlockchainNetwork(Blockchain.Ethereum, result.data)
+                        )
+                        store.dispatchOnMain(WalletAction.MultiWallet.SaveCurrencies(blockchainNetworks))
                         if (backupService.currentState == BackupService.State.Finished) {
                             store.dispatchOnMain(BackupAction.FinishBackup)
                         } else {