From 2ca25eaabed277a1acf3ed68f5a2bc07781d4517 Mon Sep 17 00:00:00 2001 From: Tangem Date: Fri, 28 Jun 2024 18:16:37 +0800 Subject: [PATCH] Updated on 2026-08-14 --- .../presentation/validators/ContractAddressValidator.kt | 2 +- .../presentation/viewmodels/AddCustomTokenViewModel.kt | 8 ++++++++ gradle/dependencies.toml | 4 ++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/validators/ContractAddressValidator.kt b/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/validators/ContractAddressValidator.kt index 6bb0c880af..966af2bd6a 100644 --- a/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/validators/ContractAddressValidator.kt +++ b/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/validators/ContractAddressValidator.kt @@ -26,8 +26,8 @@ object ContractAddressValidator { Blockchain.Unknown, Blockchain.Binance, Blockchain.BinanceTestnet, - Blockchain.Cardano, -> SuccessAddressValidator.validate(address) + Blockchain.Cardano -> blockchain.validateContractAddress(address) else -> blockchain.validateAddress(address) } } 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 11efe8bd1f..34944cf67a 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 @@ -10,6 +10,7 @@ import androidx.lifecycle.DefaultLifecycleObserver import androidx.lifecycle.LifecycleOwner import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope +import com.tangem.blockchain.blockchains.cardano.CardanoTokenAddressConverter import com.tangem.blockchain.blockchains.hedera.HederaTokenAddressConverter import com.tangem.blockchain.common.Blockchain import com.tangem.blockchain.common.Token @@ -79,6 +80,7 @@ internal class AddCustomTokenViewModel @Inject constructor( private val testActionsHandler = TestActionsHandler() private val formStateBuilder = FormStateBuilder() private val hederaAddressConverter = HederaTokenAddressConverter() + private val cardanoTokenAddressConverter = CardanoTokenAddressConverter() private var currentCryptoCurrencies: List = emptyList() @@ -898,6 +900,12 @@ internal class AddCustomTokenViewModel @Inject constructor( private fun convertTokenAddress(blockchain: Blockchain, address: String): String { return when (blockchain) { Blockchain.Hedera, Blockchain.HederaTestnet -> hederaAddressConverter.convertToTokenId(address) + Blockchain.Cardano -> { + cardanoTokenAddressConverter.convertToFingerprint( + address = address, + symbol = uiState.form.tokenSymbolInputField.value, + ) + } else -> address } } diff --git a/gradle/dependencies.toml b/gradle/dependencies.toml index e0d517abb2..88ac8d88ab 100644 --- a/gradle/dependencies.toml +++ b/gradle/dependencies.toml @@ -87,9 +87,9 @@ markdown = "0.7.2" # endregion Other libraries # region Tangem -tangemBlockchainSdk = "release-app_5.12-689" +tangemBlockchainSdk = "release-app_5.12-691" #tangemBlockchainSdk = "0.0.1" # Keep it! - used for local builds -tangemCardSdk = "release-app_5.12-364" +tangemCardSdk = "release-app_5.12-367" #tangemCardSdk = "0.0.1" # Keep it! - used for local builds ^ # endregion Tangem