From ff129db7af3453b9b0dfd65bd73a51a6fb561ef2 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Fri, 9 Jun 2023 12:58:56 +0300
Subject: [PATCH] Updated on 2026-08-14

---
 .../walletSelector/redux/WalletSelectorMiddleware.kt      | 8 ++------
 .../tap/features/welcome/redux/WelcomeMiddleware.kt       | 7 +------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/com/tangem/tap/features/walletSelector/redux/WalletSelectorMiddleware.kt b/app/src/main/java/com/tangem/tap/features/walletSelector/redux/WalletSelectorMiddleware.kt
index f1c972ae02..3528a61c7a 100644
--- a/app/src/main/java/com/tangem/tap/features/walletSelector/redux/WalletSelectorMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/walletSelector/redux/WalletSelectorMiddleware.kt
@@ -71,7 +71,7 @@ internal class WalletSelectorMiddleware {
                 refreshUserWalletsAmounts()
             }
             is WalletSelectorAction.ClearUserWallets -> {
-                disableUserWalletsSaving()
+                clearUserWalletsAndCloseError()
             }
             is WalletSelectorAction.AddWallet.Success,
             is WalletSelectorAction.AddWallet.Error,
@@ -296,12 +296,8 @@ internal class WalletSelectorMiddleware {
         }
     }
 
-    private fun disableUserWalletsSaving() = scope.launch {
+    private fun clearUserWalletsAndCloseError() = scope.launch {
         clearUserWallets()
-            .map {
-                preferencesStorage.shouldSaveUserWallets = false
-                preferencesStorage.shouldSaveAccessCodes = false
-            }
             .doOnSuccess {
                 store.dispatchWithMain(WalletSelectorAction.CloseError)
                 popBackToHome()
diff --git a/app/src/main/java/com/tangem/tap/features/welcome/redux/WelcomeMiddleware.kt b/app/src/main/java/com/tangem/tap/features/welcome/redux/WelcomeMiddleware.kt
index 9f7143077a..8cc33eca6c 100644
--- a/app/src/main/java/com/tangem/tap/features/welcome/redux/WelcomeMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/welcome/redux/WelcomeMiddleware.kt
@@ -6,7 +6,6 @@ import com.tangem.common.doOnFailure
 import com.tangem.common.doOnResult
 import com.tangem.common.doOnSuccess
 import com.tangem.common.flatMap
-import com.tangem.common.map
 import com.tangem.domain.models.scan.ScanResponse
 import com.tangem.tap.*
 import com.tangem.tap.common.analytics.events.AnalyticsParam
@@ -63,16 +62,12 @@ internal class WelcomeMiddleware {
 
     private fun disableUserWalletsSaving() = scope.launch {
         userWalletsListManager.clear()
+            .flatMap { walletStoresManager.clear() }
             .flatMap { tangemSdkManager.clearSavedUserCodes() }
-            .map {
-                preferencesStorage.shouldSaveUserWallets = false
-                preferencesStorage.shouldSaveAccessCodes = false
-            }
             .doOnFailure { e ->
                 Timber.e(e, "Unable to clear user wallets")
             }
             .doOnResult {
-                // !!! Workaround !!!
                 store.dispatchWithMain(WelcomeAction.CloseError)
                 store.dispatchWithMain(NavigationAction.PopBackTo(AppScreen.Home))
             }