From 207dbeed3c679082ab5e6e9ab771b9561660b050 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Thu, 12 Feb 2026 11:01:01 +0300
Subject: [PATCH] Updated on 2026-08-14

---
 .../market/details/portfolio/add/impl/model/AddTokenModel.kt    | 2 +-
 .../com/tangem/features/managetokens/model/ManageTokensModel.kt | 2 +-
 .../features/managetokens/model/OnboardingManageTokensModel.kt  | 2 +-
 .../managetokens/utils/list/ManageTokensUseCasesFacade.kt       | 2 +-
 .../features/markets/portfolio/add/impl/model/AddTokenModel.kt  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/features/feed/impl/src/main/kotlin/com/tangem/features/feed/components/market/details/portfolio/add/impl/model/AddTokenModel.kt b/features/feed/impl/src/main/kotlin/com/tangem/features/feed/components/market/details/portfolio/add/impl/model/AddTokenModel.kt
index d616bf53be..cd16df3f04 100644
--- a/features/feed/impl/src/main/kotlin/com/tangem/features/feed/components/market/details/portfolio/add/impl/model/AddTokenModel.kt
+++ b/features/feed/impl/src/main/kotlin/com/tangem/features/feed/components/market/details/portfolio/add/impl/model/AddTokenModel.kt
@@ -52,7 +52,7 @@ internal class AddTokenModel @Inject constructor(
             flow = params.selectedNetwork.distinctUntilChanged(),
             flow2 = params.selectedPortfolio.distinctUntilChanged(),
             transform = { selectedNetwork, selectedPortfolio ->
-                addTokenJob.cancel()
+                addTokenJob.join()
                 val isTangemIconVisible = needColdWalletInteraction(selectedNetwork, selectedPortfolio)
                 uiBuilder.updateContent(
                     selectedPortfolio = selectedPortfolio,
diff --git a/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/model/ManageTokensModel.kt b/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/model/ManageTokensModel.kt
index 74ee2da6c5..7c5611d12e 100644
--- a/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/model/ManageTokensModel.kt
+++ b/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/model/ManageTokensModel.kt
@@ -298,7 +298,7 @@ internal class ManageTokensModel @Inject constructor(
             val networks = currenciesToAdd.values
                 .flatten()
                 .toSet()
-                .associate { it.backendId to null }
+                .associate { network -> network.backendId to network.derivationPath.value }
             val needToInteractWithColdWallet = useCasesFacade.needColdWalletInteraction(networks)
 
             state.update { state ->
diff --git a/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/model/OnboardingManageTokensModel.kt b/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/model/OnboardingManageTokensModel.kt
index 50267c156a..e2aaa97cca 100644
--- a/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/model/OnboardingManageTokensModel.kt
+++ b/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/model/OnboardingManageTokensModel.kt
@@ -222,7 +222,7 @@ internal class OnboardingManageTokensModel @Inject constructor(
             val network = currenciesToAdd.values
                 .flatten()
                 .toSet()
-                .associate { it.backendId to null }
+                .associate { network -> network.backendId to network.derivationPath.value }
             val showTangemIcon = useCasesFacade.needColdWalletInteraction(network = network)
             state.update { state ->
                 state.copy(
diff --git a/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/utils/list/ManageTokensUseCasesFacade.kt b/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/utils/list/ManageTokensUseCasesFacade.kt
index 7bf8e67db0..e692352aad 100644
--- a/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/utils/list/ManageTokensUseCasesFacade.kt
+++ b/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/utils/list/ManageTokensUseCasesFacade.kt
@@ -124,7 +124,7 @@ internal class ManageTokensUseCasesFacade @AssistedInject constructor(
         }
     }
 
-    suspend fun needColdWalletInteraction(network: Map<String, Nothing?>): Boolean = when (mode) {
+    suspend fun needColdWalletInteraction(network: Map<String, String?>): Boolean = when (mode) {
         is ManageTokensMode.Account -> coldWalletAndHasMissedDerivationsUseCase.invoke(
             userWalletId = mode.accountId.userWalletId,
             networksWithDerivationPath = network,
diff --git a/features/markets/impl/src/main/kotlin/com/tangem/features/markets/portfolio/add/impl/model/AddTokenModel.kt b/features/markets/impl/src/main/kotlin/com/tangem/features/markets/portfolio/add/impl/model/AddTokenModel.kt
index 7f8214d8fa..edc27eb65f 100644
--- a/features/markets/impl/src/main/kotlin/com/tangem/features/markets/portfolio/add/impl/model/AddTokenModel.kt
+++ b/features/markets/impl/src/main/kotlin/com/tangem/features/markets/portfolio/add/impl/model/AddTokenModel.kt
@@ -52,7 +52,7 @@ internal class AddTokenModel @Inject constructor(
             flow = params.selectedNetwork.distinctUntilChanged(),
             flow2 = params.selectedPortfolio.distinctUntilChanged(),
             transform = { selectedNetwork, selectedPortfolio ->
-                addTokenJob.cancel()
+                addTokenJob.join()
                 val isTangemIconVisible = needColdWalletInteraction(selectedNetwork, selectedPortfolio)
                 uiBuilder.updateContent(
                     selectedPortfolio = selectedPortfolio,