From 901bd78a9a5547331aec45b9e43530d9d0f5c9b2 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Tue, 19 Apr 2022 18:19:28 +0300
Subject: [PATCH] Updated on 2026-08-14

---
 .../middlewares/MultiWalletMiddleware.kt      | 19 +++++++-----------
 .../redux/middlewares/WalletMiddleware.kt     | 20 ++++++++-----------
 .../redux/middlewares/WarningsMiddleware.kt   |  3 ++-
 3 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/MultiWalletMiddleware.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/MultiWalletMiddleware.kt
index a5744bcfa7..193f133b26 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/MultiWalletMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/MultiWalletMiddleware.kt
@@ -1,6 +1,5 @@
 package com.tangem.tap.features.wallet.redux.middlewares
 
-import com.tangem.blockchain.blockchains.solana.SolanaWalletManager
 import com.tangem.blockchain.common.*
 import com.tangem.blockchain.extensions.Result
 import com.tangem.common.extensions.isZero
@@ -130,17 +129,13 @@ class MultiWalletMiddleware {
                                 scope.launch(Dispatchers.Main) {
                                     val blockchainNetwork = BlockchainNetwork.fromWalletManager(walletManager)
                                     if (walletState?.getWalletData(blockchainNetwork) == null) {
-                                        store.dispatch(
-                                            WalletAction.MultiWallet.AddBlockchain(
-                                                blockchainNetwork, walletManager
-                                            )
-                                        )
-                                        store.dispatch(
-                                            WalletAction.LoadWallet.Success(
-                                                wallet = wallet,
-                                                blockchain = blockchainNetwork
-                                            )
-                                        )
+                                        store.dispatch(WalletAction.MultiWallet.AddBlockchain(
+                                            blockchainNetwork, walletManager
+                                        ))
+                                        store.dispatch(WalletAction.LoadWallet.Success(
+                                            wallet = wallet,
+                                            blockchain = blockchainNetwork
+                                        ))
                                     }
                                 }
                             }
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WalletMiddleware.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WalletMiddleware.kt
index fb5468a689..c7528ad95f 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WalletMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WalletMiddleware.kt
@@ -80,18 +80,14 @@ class WalletMiddleware {
                 val coinAmount = action.wallet.amounts[AmountType.Coin]?.value
                 if (coinAmount != null && !coinAmount.isZero()) {
                     if (walletState.getWalletData(action.blockchain) == null) {
-                        store.dispatch(
-                            WalletAction.MultiWallet.AddBlockchain(
-                                action.blockchain,
-                                null
-                            )
-                        )
-                        store.dispatch(
-                            WalletAction.LoadWallet.Success(
-                                action.wallet,
-                                action.blockchain
-                            )
-                        )
+                        store.dispatch(WalletAction.MultiWallet.AddBlockchain(
+                            action.blockchain,
+                            null
+                        ))
+                        store.dispatch(WalletAction.LoadWallet.Success(
+                            action.wallet,
+                            action.blockchain
+                        ))
                     }
                 }
                 store.dispatch(WalletAction.Warnings.CheckHashesCount.CheckHashesCountOnline)
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WarningsMiddleware.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WarningsMiddleware.kt
index 94ee1e747e..7f6e57d265 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WarningsMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WarningsMiddleware.kt
@@ -9,6 +9,7 @@ import com.tangem.common.card.FirmwareVersion
 import com.tangem.domain.common.ScanResponse
 import com.tangem.domain.common.TapWorkarounds.isTestCard
 import com.tangem.tap.common.analytics.AnalyticsEvent
+import com.tangem.tap.common.extensions.dispatchOnMain
 import com.tangem.tap.common.extensions.isGreaterThan
 import com.tangem.tap.common.redux.global.GlobalState
 import com.tangem.tap.domain.configurable.warningMessage.WarningMessage
@@ -193,7 +194,7 @@ class WarningsMiddleware {
     }
 
     private fun setWarningMessages() {
-        store.dispatch(WalletAction.Warnings.Set(getWarnings()))
+        store.dispatchOnMain(WalletAction.Warnings.Set(getWarnings()))
     }
 
     private fun getWarnings(): List<WarningMessage> {