From 8882b38a519dde0f761e44fd48da2f26585ef95f Mon Sep 17 00:00:00 2001 From: Tangem Date: Wed, 26 Jun 2024 13:21:24 +0500 Subject: [PATCH] Updated on 2026-08-14 --- .../presentation/viewmodels/AddCustomTokenViewModel.kt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/viewmodels/AddCustomTokenViewModel.kt b/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/viewmodels/AddCustomTokenViewModel.kt index da59bdc238..11efe8bd1f 100644 --- a/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/viewmodels/AddCustomTokenViewModel.kt +++ b/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/viewmodels/AddCustomTokenViewModel.kt @@ -595,13 +595,15 @@ internal class AddCustomTokenViewModel @Inject constructor( } private fun isTokenAlreadyAdded(): Boolean { + val networkSelectorValue = uiState.form.networkSelectorField.selectedItem.blockchain + val networkId = Blockchain.fromNetworkId(networkSelectorValue.toNetworkId())?.id + val contractAddress = convertTokenAddress( + blockchain = networkSelectorValue, + address = uiState.form.contractAddressInputField.value, + ) return currentCryptoCurrencies .filterIsInstance() .any { token -> - val contractAddress = uiState.form.contractAddressInputField.value - val networkSelectorValue = uiState.form.networkSelectorField.selectedItem.blockchain - val networkId = Blockchain.fromNetworkId(networkSelectorValue.toNetworkId())?.id - val sameId = if (!token.isCustom) { // todo after move foundToken to CryptoCurrency model, use only id foundToken?.id == token.id.rawCurrencyId