From d8a05732ee85fd71ad9a295570ed1f66b8c5fcf4 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Tue, 11 Feb 2025 15:51:52 +0300
Subject: [PATCH] Updated on 2026-08-14

---
 .../main/java/com/tangem/tap/features/home/HomeViewModel.kt  | 3 ++-
 .../com/tangem/tap/features/home/redux/HomeMiddleware.kt     | 2 +-
 .../com/tangem/tap/features/onboarding/OnboardingHelper.kt   | 2 +-
 .../tap/features/saveWallet/redux/SaveWalletMiddleware.kt    | 5 ++---
 .../src/main/assets/configs/feature_toggles_config.json      | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/tangem/tap/features/home/HomeViewModel.kt b/app/src/main/java/com/tangem/tap/features/home/HomeViewModel.kt
index 9827fc5dbe..f0b0d760e6 100644
--- a/app/src/main/java/com/tangem/tap/features/home/HomeViewModel.kt
+++ b/app/src/main/java/com/tangem/tap/features/home/HomeViewModel.kt
@@ -24,6 +24,7 @@ import com.tangem.tap.common.analytics.converters.ParamCardCurrencyConverter
 import com.tangem.tap.common.analytics.events.IntroductionProcess
 import com.tangem.tap.common.analytics.events.Shop
 import com.tangem.tap.common.extensions.dispatchNavigationAction
+import com.tangem.tap.common.extensions.dispatchWithMain
 import com.tangem.tap.common.extensions.onUserWalletSelected
 import com.tangem.tap.features.home.redux.HIDE_PROGRESS_DELAY
 import com.tangem.tap.features.home.redux.HomeAction
@@ -114,7 +115,7 @@ internal class HomeViewModel @Inject constructor(
             },
         )
 
-        store.dispatch(HomeAction.ScanInProgress(scanInProgress = false))
+        store.dispatchWithMain(HomeAction.ScanInProgress(scanInProgress = false))
         delay(HIDE_PROGRESS_DELAY)
 
         store.dispatchNavigationAction { push(AppRoute.Wallet) }
diff --git a/app/src/main/java/com/tangem/tap/features/home/redux/HomeMiddleware.kt b/app/src/main/java/com/tangem/tap/features/home/redux/HomeMiddleware.kt
index ffe384bee5..b16af4eab3 100644
--- a/app/src/main/java/com/tangem/tap/features/home/redux/HomeMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/home/redux/HomeMiddleware.kt
@@ -104,7 +104,7 @@ private fun proceedWithScanResponse(scanResponse: ScanResponse) = scope.launch {
         }
         .doOnSuccess {
             sendSignedInCardAnalyticsEvent(scanResponse)
-            scope.launch { store.onUserWalletSelected(userWallet = userWallet) }
+            store.onUserWalletSelected(userWallet = userWallet)
         }
         .doOnResult {
             navigateTo(AppRoute.Wallet)
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/OnboardingHelper.kt b/app/src/main/java/com/tangem/tap/features/onboarding/OnboardingHelper.kt
index a1605112fc..502e216db1 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/OnboardingHelper.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/OnboardingHelper.kt
@@ -263,7 +263,7 @@ object OnboardingHelper {
             }
             .doOnSuccess {
                 mainScope.launch { store.onUserWalletSelected(userWallet) }
-                store.dispatch(OnboardingWalletAction.WalletSaved(userWallet.walletId))
+                store.dispatchWithMain(OnboardingWalletAction.WalletSaved(userWallet.walletId))
             }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/saveWallet/redux/SaveWalletMiddleware.kt b/app/src/main/java/com/tangem/tap/features/saveWallet/redux/SaveWalletMiddleware.kt
index cc39db075a..02fb7c271c 100644
--- a/app/src/main/java/com/tangem/tap/features/saveWallet/redux/SaveWalletMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/saveWallet/redux/SaveWalletMiddleware.kt
@@ -16,7 +16,6 @@ import com.tangem.tap.common.extensions.inject
 import com.tangem.tap.common.extensions.onUserWalletSelected
 import com.tangem.tap.common.redux.AppState
 import com.tangem.tap.features.onboarding.products.wallet.redux.OnboardingWalletAction
-import com.tangem.tap.mainScope
 import com.tangem.tap.proxy.redux.DaggerGraphState
 import com.tangem.tap.scope
 import com.tangem.tap.store
@@ -90,9 +89,9 @@ internal class SaveWalletMiddleware {
                     Timber.e(error, "Unable to save user wallet")
                 }
                 .doOnSuccess {
-                    mainScope.launch { store.onUserWalletSelected(userWallet) }
+                    store.onUserWalletSelected(userWallet)
                     if (!shouldNavigateToWallet) {
-                        store.dispatch(OnboardingWalletAction.WalletSaved(userWallet.walletId))
+                        store.dispatchWithMain(OnboardingWalletAction.WalletSaved(userWallet.walletId))
                     }
                 }
                 .doOnResult { if (shouldNavigateToWallet) navigateToWallet() }
diff --git a/core/config-toggles/src/main/assets/configs/feature_toggles_config.json b/core/config-toggles/src/main/assets/configs/feature_toggles_config.json
index dab1120565..6f8b718c63 100644
--- a/core/config-toggles/src/main/assets/configs/feature_toggles_config.json
+++ b/core/config-toggles/src/main/assets/configs/feature_toggles_config.json
@@ -21,7 +21,7 @@
     },
     {
         "name": "ONBOARDING_CODE_REFACTORING_ENABLED",
-        "version": "5.21.0"
+        "version": "5.22.0"
     },
     {
         "name": "NAVIGATION_REFACTORING",