From 4d028cc8e4eece9e4e7c100ce2bbbb6a2bce5a93 Mon Sep 17 00:00:00 2001 From: Tangem Date: Mon, 20 May 2024 14:24:27 +0500 Subject: [PATCH] Updated on 2026-08-14 --- .../SdkTransactionHistoryItemConverter.kt | 4 ++- .../utils/SdkTransactionTypeConverter.kt | 27 ++++++++++--------- gradle/dependencies.toml | 2 +- 3 files changed, 19 insertions(+), 14 deletions(-) diff --git a/domain/legacy/src/main/java/com/tangem/domain/walletmanager/utils/SdkTransactionHistoryItemConverter.kt b/domain/legacy/src/main/java/com/tangem/domain/walletmanager/utils/SdkTransactionHistoryItemConverter.kt index ba58967107..2e1fba8fe9 100644 --- a/domain/legacy/src/main/java/com/tangem/domain/walletmanager/utils/SdkTransactionHistoryItemConverter.kt +++ b/domain/legacy/src/main/java/com/tangem/domain/walletmanager/utils/SdkTransactionHistoryItemConverter.kt @@ -58,7 +58,9 @@ internal class SdkTransactionHistoryItemConverter( } else { mapToInteractionAddressType(sourceType = sourceType) } - is SdkTransactionHistoryItem.TransactionType.ContractMethod -> mapToInteractionAddressType(destinationType) + is SdkTransactionHistoryItem.TransactionType.ContractMethod, + is SdkTransactionHistoryItem.TransactionType.ContractMethodName, + -> mapToInteractionAddressType(destinationType) } } diff --git a/domain/legacy/src/main/java/com/tangem/domain/walletmanager/utils/SdkTransactionTypeConverter.kt b/domain/legacy/src/main/java/com/tangem/domain/walletmanager/utils/SdkTransactionTypeConverter.kt index 29ea70a4cb..ac4402be26 100644 --- a/domain/legacy/src/main/java/com/tangem/domain/walletmanager/utils/SdkTransactionTypeConverter.kt +++ b/domain/legacy/src/main/java/com/tangem/domain/walletmanager/utils/SdkTransactionTypeConverter.kt @@ -9,7 +9,7 @@ import com.tangem.domain.txhistory.models.TxHistoryItem import com.tangem.domain.walletmanager.model.SmartContractMethod import com.tangem.utils.converter.Converter -class SdkTransactionTypeConverter( +internal class SdkTransactionTypeConverter( private val assetReader: AssetReader, private val moshi: Moshi, ) : Converter { @@ -27,20 +27,23 @@ class SdkTransactionTypeConverter( override fun convert(value: TransactionHistoryItem.TransactionType): TxHistoryItem.TransactionType { return when (value) { - TransactionHistoryItem.TransactionType.Transfer -> TxHistoryItem.TransactionType.Transfer - is TransactionHistoryItem.TransactionType.ContractMethod -> { - return when (val name = smartContractMethods[value.id]?.name) { - "transfer" -> TxHistoryItem.TransactionType.Transfer - "approve" -> TxHistoryItem.TransactionType.Approve - "swap" -> TxHistoryItem.TransactionType.Swap - null -> TxHistoryItem.TransactionType.UnknownOperation - else -> TxHistoryItem.TransactionType.Operation(name = name.replaceFirstChar { it.titlecase() }) - } - } + is TransactionHistoryItem.TransactionType.ContractMethod -> + getTransactionType(methodName = smartContractMethods[value.id]?.name) + is TransactionHistoryItem.TransactionType.ContractMethodName -> getTransactionType(methodName = value.name) + is TransactionHistoryItem.TransactionType.Transfer -> TxHistoryItem.TransactionType.Transfer + } + } + + private fun getTransactionType(methodName: String?): TxHistoryItem.TransactionType { + return when (methodName) { + "transfer" -> TxHistoryItem.TransactionType.Transfer + "approve" -> TxHistoryItem.TransactionType.Approve + "swap" -> TxHistoryItem.TransactionType.Swap + null -> TxHistoryItem.TransactionType.UnknownOperation + else -> TxHistoryItem.TransactionType.Operation(name = methodName.replaceFirstChar { it.titlecase() }) } } - @Deprecated(message = "Use AssetReader instead") private fun readSmartContractMethods(): Map { val json = assetReader.readJson("contract_methods") return adapter.fromJson(json) ?: emptyMap() diff --git a/gradle/dependencies.toml b/gradle/dependencies.toml index 7c24809756..ca1fe3ed21 100644 --- a/gradle/dependencies.toml +++ b/gradle/dependencies.toml @@ -87,7 +87,7 @@ markdown = "0.7.2" # endregion Other libraries # region Tangem -tangemBlockchainSdk = "develop-633" +tangemBlockchainSdk = "develop-635" #tangemBlockchainSdk = "0.0.1" # Keep it! - used for local builds tangemCardSdk = "develop-354" #tangemCardSdk = "0.0.1" # Keep it! - used for local builds ^