Updated on 2026-08-14

app/src/main/java/com/tangem/tap/common/extensions/Store.kt

@@ -28,8 +28,8 @@ fun Store<*>.dispatchNotification(resId: Int) {
 }
 
 @Suppress("unused") // receiver type
-fun Store<*>.onUserWalletSelected(userWallet: UserWallet, refresh: Boolean = false) {
-    // TODO: Load tokens for selected user wallet. Will be created in further MRs
+suspend fun Store<*>.onUserWalletSelected(userWallet: UserWallet, refresh: Boolean = false) {
+    store.state.globalState.tapWalletManager.onWalletSelected(userWallet, refresh)
 }
 
 fun Store<*>.dispatchToastNotification(resId: Int) {
@@ -77,7 +77,6 @@ suspend fun Store<*>.onCardScanned(scanResponse: ScanResponse) {
 fun Store<*>.dispatchOpenUrl(url: String) {
     store.dispatch(NavigationAction.OpenUrl(url))
 }
-
 fun Store<*>.dispatchShare(url: String) {
     store.dispatch(NavigationAction.Share(url))
 }

app/src/main/java/com/tangem/tap/common/redux/AppState.kt

@@ -71,7 +71,9 @@ data class AppState(
     companion object {
         fun getMiddleware(): List<Middleware<AppState>> {
             return listOf(
-                logMiddleware, navigationMiddleware, notificationsMiddleware,
+                logMiddleware,
+                navigationMiddleware,
+                notificationsMiddleware,
                 GlobalMiddleware.handler,
                 HomeMiddleware.handler,
                 OnboardingNoteMiddleware.handler,
@@ -90,6 +92,7 @@ data class AppState(
                 WelcomeMiddleware().middleware,
                 SaveWalletMiddleware().middleware,
                 WalletSelectorMiddleware().middleware,
+                LockUserWalletsTimerMiddleware().middleware,
             )
         }
     }

app/src/main/java/com/tangem/tap/common/redux/LockUserWalletsTimerMiddleware.kt

@@ -0,0 +1,15 @@
+package com.tangem.tap.common.redux
+
+import com.tangem.tap.lockUserWalletsTimer
+import org.rekotlin.Middleware
+
+class LockUserWalletsTimerMiddleware {
+    val middleware: Middleware<AppState> = { _, _ ->
+        { nextDispatch ->
+            { action ->
+                lockUserWalletsTimer?.restart()
+                nextDispatch(action)
+            }
+        }
+    }
+}

app/src/main/java/com/tangem/tap/common/redux/global/GlobalMidlleware.kt

@@ -167,9 +167,9 @@ private fun handleAction(action: Action, appState: () -> AppState?, dispatch: Di
             scope.launch {
                 tangemSdkManager.changeDisplayedCardIdNumbersCount(null)
                 val result = tangemSdkManager.scanProduct(
-                    userTokensRepository,
-                    action.additionalBlockchainsToDerive,
-                    action.messageResId,
+                    userTokensRepository = userTokensRepository,
+                    additionalBlockchainsToDerive = action.additionalBlockchainsToDerive,
+                    messageRes = action.messageResId,
                 )
                 withMainContext {
                     store.dispatch(GlobalAction.ScanFailsCounter.ChooseBehavior(result))