Updated on 2026-08-14

app/src/main/java/com/tangem/tap/domain/walletStores/implementation/DefaultWalletStoresManager.kt

@@ -165,6 +165,14 @@ internal class DefaultWalletStoresManager(
                         .build(),
                 )
             }
+            .flatMapOnFailure { error ->
+                when (error) {
+                    is WalletStoresError.WalletManagerNotCreated,
+                    is WalletStoresError.UpdateWalletManagerError,
+                    -> CompletionResult.Success(Unit)
+                    else -> CompletionResult.Failure(error)
+                }
+            }
     }
 
     internal data class State(

app/src/main/java/com/tangem/tap/features/walletSelector/redux/UserWalletModel.kt

@@ -11,7 +11,7 @@ data class UserWalletModel(
 ) {
     sealed interface Type {
         data class SingleCurrency(
-            val blockchainName: String?,
+            val blockchainName: String,
         ) : Type
 
         data class MultiCurrency(

app/src/main/java/com/tangem/tap/features/walletSelector/redux/WalletSelectorMiddleware.kt

@@ -240,13 +240,7 @@ internal class WalletSelectorMiddleware {
                 is UserWalletModel.Type.MultiCurrency -> type.copy(
                     tokensCount = walletStores.flatMap { it.walletsData }.size,
                 )
-                is UserWalletModel.Type.SingleCurrency -> type.copy(
-                    blockchainName = walletStores
-                        .firstOrNull()
-                        ?.blockchainNetwork
-                        ?.blockchain
-                        ?.fullName,
-                )
+                is UserWalletModel.Type.SingleCurrency -> type
             },
             fiatBalance = totalFiatBalanceCalculator.calculate(
                 prevAmount = fiatBalance.amount,

app/src/main/java/com/tangem/tap/features/walletSelector/redux/WalletSelectorReducer.kt

@@ -103,7 +103,7 @@ internal object WalletSelectorReducer {
             )
         } else {
             UserWalletModel.Type.SingleCurrency(
-                blockchainName = (prevType as? UserWalletModel.Type.SingleCurrency)?.blockchainName,
+                blockchainName = scanResponse.getBlockchain().fullName,
             )
         }
     }