From 05138c8897241b5abc051eb4c25613c41e818d46 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Tue, 13 Dec 2022 20:33:19 +0300
Subject: [PATCH 1/2] Updated on 2026-08-14

---
 .../implementation/DefaultWalletStoresManager.kt          | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/src/main/java/com/tangem/tap/domain/walletStores/implementation/DefaultWalletStoresManager.kt b/app/src/main/java/com/tangem/tap/domain/walletStores/implementation/DefaultWalletStoresManager.kt
index 45a7f0e0f9..041ea91557 100644
--- a/app/src/main/java/com/tangem/tap/domain/walletStores/implementation/DefaultWalletStoresManager.kt
+++ b/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(

From de2d23d22d9074928eaf9cf531b7045e812849be Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Tue, 13 Dec 2022 20:34:21 +0300
Subject: [PATCH 2/2] Updated on 2026-08-14

---
 .../tap/features/walletSelector/redux/UserWalletModel.kt  | 2 +-
 .../walletSelector/redux/WalletSelectorMiddleware.kt      | 8 +-------
 .../walletSelector/redux/WalletSelectorReducer.kt         | 2 +-
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/tangem/tap/features/walletSelector/redux/UserWalletModel.kt b/app/src/main/java/com/tangem/tap/features/walletSelector/redux/UserWalletModel.kt
index e96c36b46d..e3a5a613ef 100644
--- a/app/src/main/java/com/tangem/tap/features/walletSelector/redux/UserWalletModel.kt
+++ b/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(
diff --git a/app/src/main/java/com/tangem/tap/features/walletSelector/redux/WalletSelectorMiddleware.kt b/app/src/main/java/com/tangem/tap/features/walletSelector/redux/WalletSelectorMiddleware.kt
index b2642b071c..6fcf6665c2 100644
--- a/app/src/main/java/com/tangem/tap/features/walletSelector/redux/WalletSelectorMiddleware.kt
+++ b/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,
diff --git a/app/src/main/java/com/tangem/tap/features/walletSelector/redux/WalletSelectorReducer.kt b/app/src/main/java/com/tangem/tap/features/walletSelector/redux/WalletSelectorReducer.kt
index e4fb11c3b3..565f81b165 100644
--- a/app/src/main/java/com/tangem/tap/features/walletSelector/redux/WalletSelectorReducer.kt
+++ b/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,
             )
         }
     }