From 9cefe0b59664adc7f992290c964fe6d13c74b2ce Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Thu, 28 Dec 2023 17:15:25 +0400
Subject: [PATCH] Updated on 2026-08-14

---
 .../walletmanager/DefaultWalletManagersFacade.kt |  2 +-
 .../walletmanager/utils/WalletManagerFactory.kt  | 16 +++++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/domain/legacy/src/main/java/com/tangem/domain/walletmanager/DefaultWalletManagersFacade.kt b/domain/legacy/src/main/java/com/tangem/domain/walletmanager/DefaultWalletManagersFacade.kt
index 03cdd7a611..72290294eb 100644
--- a/domain/legacy/src/main/java/com/tangem/domain/walletmanager/DefaultWalletManagersFacade.kt
+++ b/domain/legacy/src/main/java/com/tangem/domain/walletmanager/DefaultWalletManagersFacade.kt
@@ -251,7 +251,7 @@ class DefaultWalletManagersFacade(
             derivationPath = derivationPath,
         )
         if (walletManager == null || blockchain == Blockchain.Unknown) {
-            Timber.w("Unable to get a wallet manager for blockchain: $blockchain")
+            Timber.w("Unable to create or find a wallet manager for $blockchain")
             return UpdateWalletManagerResult.Unreachable
         }
 
diff --git a/domain/legacy/src/main/java/com/tangem/domain/walletmanager/utils/WalletManagerFactory.kt b/domain/legacy/src/main/java/com/tangem/domain/walletmanager/utils/WalletManagerFactory.kt
index cd0b2a670b..9e83e20e3a 100644
--- a/domain/legacy/src/main/java/com/tangem/domain/walletmanager/utils/WalletManagerFactory.kt
+++ b/domain/legacy/src/main/java/com/tangem/domain/walletmanager/utils/WalletManagerFactory.kt
@@ -10,6 +10,7 @@ import com.tangem.domain.common.DerivationStyleProvider
 import com.tangem.domain.common.extensions.makeWalletManagerForApp
 import com.tangem.domain.common.util.derivationStyleProvider
 import com.tangem.domain.models.scan.ScanResponse
+import timber.log.Timber
 
 internal class WalletManagerFactory(
     private val configManager: ConfigManager,
@@ -26,11 +27,16 @@ internal class WalletManagerFactory(
     ): WalletManager? {
         val derivationParams = getDerivationParams(derivationPath, scanResponse.derivationStyleProvider)
 
-        return sdkWalletManagerFactory.makeWalletManagerForApp(
-            scanResponse = scanResponse,
-            blockchain = blockchain,
-            derivationParams = derivationParams,
-        )
+        return try {
+            sdkWalletManagerFactory.makeWalletManagerForApp(
+                scanResponse = scanResponse,
+                blockchain = blockchain,
+                derivationParams = derivationParams,
+            )
+        } catch (e: Throwable) {
+            Timber.w(e, "Failed to create wallet manager for $blockchain")
+            null
+        }
     }
 
     private fun getDerivationParams(