From 69d3afcfdbed666a4802a08a34a0e00ab07ec34f Mon Sep 17 00:00:00 2001 From: Tangem Date: Fri, 14 Feb 2025 18:48:58 +0700 Subject: [PATCH] Updated on 2026-08-14 --- .../state/fee/custom/BitcoinCustomFeeConverter.kt | 4 ++-- gradle/dependencies.toml | 2 +- .../src/main/java/com/tangem/lib/crypto/BlockchainUtils.kt | 6 ++++++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/state/fee/custom/BitcoinCustomFeeConverter.kt b/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/state/fee/custom/BitcoinCustomFeeConverter.kt index 2d5e5999e3..99865323ca 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/state/fee/custom/BitcoinCustomFeeConverter.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/state/fee/custom/BitcoinCustomFeeConverter.kt @@ -16,7 +16,7 @@ import com.tangem.features.send.impl.presentation.state.StateRouter import com.tangem.features.send.impl.presentation.state.fee.checkExceedBalance import com.tangem.features.send.impl.presentation.state.fields.SendTextField import com.tangem.features.send.impl.presentation.viewmodel.SendClickIntents -import com.tangem.lib.crypto.BlockchainUtils.isBitcoin +import com.tangem.lib.crypto.BlockchainUtils.isUseBitcoinFeeConverter import com.tangem.utils.Provider import kotlinx.collections.immutable.ImmutableList import kotlinx.collections.immutable.persistentListOf @@ -35,7 +35,7 @@ internal class BitcoinCustomFeeConverter( val feeValue = value.amount.value val feeCurrency = feeCryptoCurrencyStatusProvider()?.value val network = feeCryptoCurrencyStatusProvider()?.currency?.network?.id?.value - return if (network != null && isBitcoin(network)) { + return if (network != null && (isUseBitcoinFeeConverter(network))) { persistentListOf( SendTextField.CustomFee( value = feeValue?.parseBigDecimal(value.amount.decimals).orEmpty(), diff --git a/gradle/dependencies.toml b/gradle/dependencies.toml index 8fdcf065b1..535afc2fe4 100644 --- a/gradle/dependencies.toml +++ b/gradle/dependencies.toml @@ -89,7 +89,7 @@ markdownComposeView = "0.5.4" # endregion Other libraries # region Tangem -tangemBlockchainSdk = "develop-951" +tangemBlockchainSdk = "develop-952" #tangemBlockchainSdk = "0.0.1" # Keep it! - used for local builds tangemCardSdk = "develop-434" #tangemCardSdk = "0.0.1" # Keep it! - used for local builds ^ diff --git a/libs/crypto/src/main/java/com/tangem/lib/crypto/BlockchainUtils.kt b/libs/crypto/src/main/java/com/tangem/lib/crypto/BlockchainUtils.kt index 85abd3906e..d34ef3b532 100644 --- a/libs/crypto/src/main/java/com/tangem/lib/crypto/BlockchainUtils.kt +++ b/libs/crypto/src/main/java/com/tangem/lib/crypto/BlockchainUtils.kt @@ -38,6 +38,12 @@ object BlockchainUtils { return blockchain == Blockchain.Bitcoin || blockchain == Blockchain.BitcoinTestnet } + /** If current [networkId] is use custom fee */ + fun isUseBitcoinFeeConverter(blockchainId: String): Boolean { + val blockchain = Blockchain.fromId(blockchainId) + return isBitcoin(blockchainId) || blockchain == Blockchain.Fact0rn + } + /** If current [blockchainId] is Tezos */ fun isTezos(blockchainId: String): Boolean { val blockchain = Blockchain.fromId(blockchainId)