From 709d56c34d52caeb4a727ff6314f062917bb8536 Mon Sep 17 00:00:00 2001 From: Tangem Date: Thu, 24 Mar 2022 19:31:05 +0300 Subject: [PATCH] Updated on 2026-08-14 --- .../java/com/tangem/tap/domain/TapWalletManager.kt | 10 +--------- .../wallet/redux/middlewares/WalletMiddleware.kt | 10 ++++++---- 2 files changed, 7 insertions(+), 13 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 15ac94f6ac..c4b3579743 100644 --- a/app/src/main/java/com/tangem/tap/domain/TapWalletManager.kt +++ b/app/src/main/java/com/tangem/tap/domain/TapWalletManager.kt @@ -26,10 +26,7 @@ import com.tangem.tap.network.NetworkConnectivity import com.tangem.tap.network.coinmarketcap.CoinMarketCapService import com.tangem.tap.scope import com.tangem.tap.store -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.delay -import kotlinx.coroutines.launch -import kotlinx.coroutines.withContext +import kotlinx.coroutines.* import java.math.BigDecimal @@ -88,11 +85,6 @@ class TapWalletManager { loadFiatRate(fiatCurrency, currencies) } - suspend fun loadFiatRate(fiatCurrency: FiatCurrencyName, currency: Currency) { - val currencies = listOf(currency) - loadFiatRate(fiatCurrency, currencies) - } - suspend fun loadFiatRate(fiatCurrency: FiatCurrencyName, currencies: List) { val results = mutableListOf?>>() currencies.forEach { 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 dc17653642..8c9a06c2e2 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 @@ -88,18 +88,20 @@ class WalletMiddleware { when { action.wallet != null -> { globalState.tapWalletManager.loadFiatRate( - globalState.appCurrency, action.wallet + fiatCurrency = globalState.appCurrency, + wallet = action.wallet, ) } - action.currency != null -> { + action.currencyList != null -> { globalState.tapWalletManager.loadFiatRate( - globalState.appCurrency, action.currency + fiatCurrency = globalState.appCurrency, + currencies = action.currencyList, ) } else -> { globalState.tapWalletManager.loadFiatRate( fiatCurrency = globalState.appCurrency, - currencies = walletState.wallets.map { it.currency } + currencies = walletState.wallets.map { it.currency }, ) } }