From 3e6691a1061858926335012e87878cd840ee9928 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Fri, 18 Aug 2023 17:28:15 +0300
Subject: [PATCH] Updated on 2026-08-14

---
 .../presentation/viewmodels/TokensListViewModel.kt   | 12 +++++++++++-
 .../com/tangem/domain/common/extensions/CardSdk.kt   |  4 ++++
 .../domain/common/extensions/WalletManagerFactory.kt |  1 +
 gradle/dependencies.toml                             |  2 +-
 4 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/viewmodels/TokensListViewModel.kt b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/viewmodels/TokensListViewModel.kt
index 1e74d442a8..ffb1de2c52 100644
--- a/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/viewmodels/TokensListViewModel.kt
+++ b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/viewmodels/TokensListViewModel.kt
@@ -14,6 +14,7 @@ import com.tangem.blockchain.common.Blockchain
 import com.tangem.core.analytics.api.AnalyticsEventHandler
 import com.tangem.core.ui.extensions.getActiveIconRes
 import com.tangem.domain.common.TapWorkarounds.useOldStyleDerivation
+import com.tangem.domain.common.extensions.canHandleBlockchain
 import com.tangem.domain.common.extensions.canHandleToken
 import com.tangem.domain.common.extensions.fromNetworkId
 import com.tangem.domain.common.util.cardTypesResolver
@@ -309,7 +310,7 @@ internal class TokensListViewModel @Inject constructor(
                     toggledNetwork.changeToggleState()
                 }
             } else {
-                if (isUnsupportedToken(blockchain)) {
+                if (isUnsupportedBlockchain(blockchain)) {
                     router.openUnsupportedNetworkAlert(blockchain)
                 } else {
                     analyticsSender.sendWhenBlockchainAdded(blockchain)
@@ -374,6 +375,15 @@ internal class TokensListViewModel @Inject constructor(
         return !canHandleToken
     }
 
+    private fun isUnsupportedBlockchain(blockchain: Blockchain): Boolean {
+        val scanResponse = reduxStateHolder.scanResponse
+        val canHandleToken = scanResponse?.card?.canHandleBlockchain(
+            blockchain = blockchain,
+            cardTypesResolver = scanResponse.cardTypesResolver,
+        ) ?: false
+        return !canHandleToken
+    }
+
     private companion object {
         const val MAIN_NETWORK_LABEL = "MAIN"
     }
diff --git a/domain/legacy/src/main/java/com/tangem/domain/common/extensions/CardSdk.kt b/domain/legacy/src/main/java/com/tangem/domain/common/extensions/CardSdk.kt
index f8e958583f..0f0c628689 100644
--- a/domain/legacy/src/main/java/com/tangem/domain/common/extensions/CardSdk.kt
+++ b/domain/legacy/src/main/java/com/tangem/domain/common/extensions/CardSdk.kt
@@ -53,4 +53,8 @@ fun CardDTO.supportedTokens(cardTypesResolver: CardTypesResolver): List<Blockcha
 
 fun CardDTO.canHandleToken(blockchain: Blockchain, cardTypesResolver: CardTypesResolver): Boolean {
     return this.supportedTokens(cardTypesResolver).contains(blockchain)
+}
+
+fun CardDTO.canHandleBlockchain(blockchain: Blockchain, cardTypesResolver: CardTypesResolver): Boolean {
+    return this.supportedBlockchains(cardTypesResolver).contains(blockchain)
 }
\ No newline at end of file
diff --git a/domain/legacy/src/main/java/com/tangem/domain/common/extensions/WalletManagerFactory.kt b/domain/legacy/src/main/java/com/tangem/domain/common/extensions/WalletManagerFactory.kt
index f65ca67b3e..2b202b94fd 100644
--- a/domain/legacy/src/main/java/com/tangem/domain/common/extensions/WalletManagerFactory.kt
+++ b/domain/legacy/src/main/java/com/tangem/domain/common/extensions/WalletManagerFactory.kt
@@ -57,6 +57,7 @@ fun WalletManagerFactory.makeWalletManagerForApp(
                 seedKey = wallet.publicKey,
                 derivedKey = derivedKey,
                 derivation = derivationParams,
+                curve = wallet.curve,
             )
         }
         else -> {
diff --git a/gradle/dependencies.toml b/gradle/dependencies.toml
index 3d58165539..fadee9849b 100644
--- a/gradle/dependencies.toml
+++ b/gradle/dependencies.toml
@@ -80,7 +80,7 @@ okHttp-prettyLogging = "3.1.0"
 # endregion Other libraries
 
 # region Tangem
-tangemBlockchainSdk = "release-app_4.10-321"
+tangemBlockchainSdk = "release-app_4.10-324"
 #tangemBlockchainSdk = "0.0.1" # Keep it! - used for local builds
 tangemCardSdk = "release-app_4.10-290"
 #tangemCardSdk = "0.0.1" # Keep it! - used for local builds