From 81203441bd2043082ba0342aeadfdc0f1c0c9b6b Mon Sep 17 00:00:00 2001 From: Tangem Date: Mon, 27 Feb 2023 10:47:39 +0300 Subject: [PATCH] Updated on 2026-08-14 --- .../com/tangem/datasource/config/ConfigManagerImpl.kt | 2 ++ .../tangem/feature/swap/domain/SwapInteractorImpl.kt | 10 +++------- .../tangem/feature/swap/viewmodels/SwapViewModel.kt | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/core/datasource/src/main/java/com/tangem/datasource/config/ConfigManagerImpl.kt b/core/datasource/src/main/java/com/tangem/datasource/config/ConfigManagerImpl.kt index 63e503173e..e438e85955 100644 --- a/core/datasource/src/main/java/com/tangem/datasource/config/ConfigManagerImpl.kt +++ b/core/datasource/src/main/java/com/tangem/datasource/config/ConfigManagerImpl.kt @@ -14,7 +14,9 @@ import com.tangem.datasource.config.models.ConfigModel import com.tangem.datasource.config.models.ConfigValueModel import com.tangem.datasource.config.models.FeatureModel import javax.inject.Inject +import javax.inject.Singleton +@Singleton internal class ConfigManagerImpl @Inject constructor() : ConfigManager { override var config: Config = Config() diff --git a/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/SwapInteractorImpl.kt b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/SwapInteractorImpl.kt index f7ba2f4a06..23b6c794b8 100644 --- a/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/SwapInteractorImpl.kt +++ b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/SwapInteractorImpl.kt @@ -52,7 +52,7 @@ internal class SwapInteractorImpl @Inject constructor( // replace tokens in wallet tokens list with loaded same val loadedOnWalletsMap = mutableSetOf() - val tokensInWallet = userWalletManager.getUserTokens(networkId, true) + val tokensInWallet = userWalletManager.getUserTokens(networkId = networkId, isExcludeCustom = true) .filter { it.symbol != initialCurrency.symbol } .map { token -> allLoadedTokens.firstOrNull { it.symbol == token.symbol }?.let { @@ -95,13 +95,9 @@ internal class SwapInteractorImpl @Inject constructor( it.token.name.lowercase().contains(searchQueryLowerCase) || it.token.symbol.lowercase().contains(searchQueryLowerCase) } - // val tokensBalance = userWalletManager.getCurrentWalletTokensBalance(networkId, emptyList()) - // .mapValues { SwapAmount(it.value.value, it.value.decimals) } - // val appCurrency = userWalletManager.getUserAppCurrency() - // val rates = repository.getRates(appCurrency.code, tokensInWallet.map { it.id }) return FoundTokensState( - tokensInWallet = tokensInWallet, // getTokensWithBalance(tokensInWallet, tokensBalance, rates, appCurrency), - loadedTokens = loadedTokens, // loadedTokens.map { TokenWithBalance(it) }, + tokensInWallet = tokensInWallet, + loadedTokens = loadedTokens, ) } diff --git a/features/swap/presentation/src/main/java/com/tangem/feature/swap/viewmodels/SwapViewModel.kt b/features/swap/presentation/src/main/java/com/tangem/feature/swap/viewmodels/SwapViewModel.kt index a8ca2afb08..ddf5f6876c 100644 --- a/features/swap/presentation/src/main/java/com/tangem/feature/swap/viewmodels/SwapViewModel.kt +++ b/features/swap/presentation/src/main/java/com/tangem/feature/swap/viewmodels/SwapViewModel.kt @@ -286,7 +286,7 @@ internal class SwapViewModel @Inject constructor( uiState = stateBuilder.loadingPermissionState(uiState) } is TxState.UserCancelled -> { - // do nothing + /* no-op */ } else -> { uiState = stateBuilder.createErrorTransaction(uiState, it) {