From 94a3d2bb2dc321b5b8bbe78760a6ffe50164a7be Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Mon, 2 Oct 2023 22:50:15 +0800
Subject: [PATCH] Updated on 2026-08-14

---
 .../wallet/viewmodels/WalletViewModel.kt        | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/viewmodels/WalletViewModel.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/viewmodels/WalletViewModel.kt
index f0c38778bf..d7176b704d 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/viewmodels/WalletViewModel.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/viewmodels/WalletViewModel.kt
@@ -323,7 +323,7 @@ internal class WalletViewModel @Inject constructor(
             .ifEmpty { return }
 
         viewModelScope.launch(dispatchers.io) {
-            derivePublicKeysUseCase(cardId = null, derivations = derivations)
+            derivePublicKeysUseCase(cardId = scanResponse.card.cardId, derivations = derivations)
                 .onRight {
                     val newDerivedKeys = it.entries
                     val oldDerivedKeys = scanResponse.derivedKeys
@@ -488,12 +488,23 @@ internal class WalletViewModel @Inject constructor(
         // Reset the job to avoid a redundant state updating
         onWalletChangeJobHolder.update(null)
 
+        /*
+         * When wallet is changed it's necessary to stop the last jobs.
+         * If jobs aren't stopped and wallet is changed then it will update state for the prev wallet.
+         */
+        tokensJobHolder.update(job = null)
+        marketPriceJobHolder.update(job = null)
+        buttonsJobHolder.update(job = null)
+        notificationsJobHolder.update(job = null)
+        refreshContentJobHolder.update(job = null)
+
         viewModelScope.launch(dispatchers.main) {
+            val userWalletId = state.walletsListConfig.wallets[index].id
             withContext(dispatchers.io) {
-                selectWalletUseCase(userWalletId = state.walletsListConfig.wallets[index].id)
+                selectWalletUseCase(userWalletId = userWalletId)
             }
 
-            val cacheState = WalletStateCache.getState(userWalletId = state.walletsListConfig.wallets[index].id)
+            val cacheState = WalletStateCache.getState(userWalletId = userWalletId)
             if (cacheState != null && cacheState !is WalletLockedState) {
                 uiState = cacheState.copySealed(
                     walletsListConfig = state.walletsListConfig.copy(