From 228c0c8af40db539ebe0caeab46137fe5ee05d3d Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Mon, 22 Dec 2025 14:52:24 +0300
Subject: [PATCH] Updated on 2026-08-14

---
 .../java/com/tangem/tap/domain/TapWalletManager.kt    |  3 +++
 .../com/tangem/tap/features/main/MainViewModel.kt     | 11 ++++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/tangem/tap/domain/TapWalletManager.kt b/app/src/main/java/com/tangem/tap/domain/TapWalletManager.kt
index 72762cb7a0..f486cce85c 100644
--- a/app/src/main/java/com/tangem/tap/domain/TapWalletManager.kt
+++ b/app/src/main/java/com/tangem/tap/domain/TapWalletManager.kt
@@ -33,6 +33,9 @@ class TapWalletManager(
             .apply { join() }
     }
 
+    /**
+     * [REDACTED_TODO_COMMENT]
+     */
     private suspend fun loadUserWalletData(userWallet: UserWallet) {
         val trackingContextProxy = store.inject(DaggerGraphState::trackingContextProxy)
         trackingContextProxy.setContext(userWallet)
diff --git a/app/src/main/java/com/tangem/tap/features/main/MainViewModel.kt b/app/src/main/java/com/tangem/tap/features/main/MainViewModel.kt
index d70fc8ae08..9ea074747f 100644
--- a/app/src/main/java/com/tangem/tap/features/main/MainViewModel.kt
+++ b/app/src/main/java/com/tangem/tap/features/main/MainViewModel.kt
@@ -6,7 +6,6 @@ import com.tangem.blockchainsdk.BlockchainSDKFactory
 import com.tangem.common.keyboard.KeyboardValidator
 import com.tangem.core.analytics.api.AnalyticsEventHandler
 import com.tangem.core.analytics.models.event.TechAnalyticsEvent
-import com.tangem.core.analytics.utils.TrackingContextProxy
 import com.tangem.core.decompose.di.GlobalUiMessageSender
 import com.tangem.core.decompose.ui.UiMessageSender
 import com.tangem.core.ui.R
@@ -81,7 +80,6 @@ internal class MainViewModel @Inject constructor(
     private val getSelectedWalletUseCase: GetSelectedWalletUseCase,
     private val appRouterConfig: AppRouterConfig,
     private val sellService: SellService,
-    private val trackingContextProxy: TrackingContextProxy,
     getBalanceHidingSettingsUseCase: GetBalanceHidingSettingsUseCase,
 ) : ViewModel() {
 
@@ -143,7 +141,7 @@ internal class MainViewModel @Inject constructor(
                 }
             }
 
-            prepareSelectedWalletFeedback()
+            subscribeToSelectedWallet()
 
             // await while initial route stack is initialized
             appRouterConfig.initializedState.first { it }
@@ -172,12 +170,15 @@ internal class MainViewModel @Inject constructor(
         }
     }
 
-    private fun prepareSelectedWalletFeedback() {
+    private fun subscribeToSelectedWallet() {
         getSelectedWalletUseCase.invoke()
             .mapLeft { emptyFlow<UserWallet>() }
             .onRight { wallet ->
                 wallet.distinctUntilChanged()
-                    .onEach { trackingContextProxy.setContext(it) }
+                    .onEach {
+                        // FIXME Do not remove this call without checking implications !!!
+                        appStateHolder.onUserWalletSelected(it)
+                    }
                     .flowOn(dispatchers.io)
                     .launchIn(viewModelScope)
             }