From 0b00f8f2771a03e3677b5432fe7b9d5c4989d433 Mon Sep 17 00:00:00 2001 From: Tangem Date: Tue, 16 Jan 2024 14:56:40 +0100 Subject: [PATCH] Updated on 2026-08-14 --- .../tap/features/send/redux/reducers/SendScreenReducer.kt | 4 +++- .../com/tangem/datasource/config/ConfigManagerImpl.kt | 1 - .../com/tangem/datasource/config/models/JsonModels.kt | 1 - .../com/tangem/domain/common/extensions/Blockchain.kt | 8 ++++++++ .../com/tangem/feature/swap/domain/SwapInteractorImpl.kt | 1 + gradle/dependencies.toml | 2 +- 6 files changed, 13 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/tangem/tap/features/send/redux/reducers/SendScreenReducer.kt b/app/src/main/java/com/tangem/tap/features/send/redux/reducers/SendScreenReducer.kt index f2d05ab0c2..b8afccf494 100644 --- a/app/src/main/java/com/tangem/tap/features/send/redux/reducers/SendScreenReducer.kt +++ b/app/src/main/java/com/tangem/tap/features/send/redux/reducers/SendScreenReducer.kt @@ -2,6 +2,7 @@ package com.tangem.tap.features.send.redux.reducers import com.tangem.blockchain.common.AmountType import com.tangem.blockchain.common.Blockchain +import com.tangem.blockchain.common.FeePaidCurrency import com.tangem.tap.common.CurrencyConverter import com.tangem.tap.common.entities.IndeterminateProgressButton import com.tangem.tap.features.send.redux.* @@ -109,7 +110,8 @@ private class PrepareSendScreenStatesReducer : SendInternalReducer { } private fun isFeePaidInNetworkCurrency(blockchain: Blockchain): Boolean = - blockchain.tokenTransactionFeePaidInNetworkCurrency() + // blockchain.tokenTransactionFeePaidInNetworkCurrency() + blockchain.feePaidCurrency() == FeePaidCurrency.SameCurrency // TODO [REDACTED_TASK_KEY] private fun isCoinAmount(typeOfAmount: AmountType): Boolean = typeOfAmount == AmountType.Coin } 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 4ac0edf918..6b25bae61d 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 @@ -129,7 +129,6 @@ internal class ConfigManagerImpl @Inject constructor() : ConfigManager { tron = GetBlockAccessToken(rest = accessTokens.tron?.rest), cosmos = GetBlockAccessToken(rest = accessTokens.cosmos?.rest), near = GetBlockAccessToken(jsonRpc = accessTokens.near?.jsonRPC), - luna = GetBlockAccessToken(rest = accessTokens.luna?.rest), dogecoin = GetBlockAccessToken( jsonRpc = accessTokens.dogecoin?.jsonRPC, blockBookRest = accessTokens.dogecoin?.blockBookRest, diff --git a/core/datasource/src/main/java/com/tangem/datasource/config/models/JsonModels.kt b/core/datasource/src/main/java/com/tangem/datasource/config/models/JsonModels.kt index e953742589..ea21e05104 100644 --- a/core/datasource/src/main/java/com/tangem/datasource/config/models/JsonModels.kt +++ b/core/datasource/src/main/java/com/tangem/datasource/config/models/JsonModels.kt @@ -62,7 +62,6 @@ data class GetBlockAccessTokens( @Json(name = "tron") val tron: GetBlockToken?, @Json(name = "cosmos-hub") val cosmos: GetBlockToken?, @Json(name = "near") val near: GetBlockToken?, - @Json(name = "terra-2") val luna: GetBlockToken?, @Json(name = "dogecoin") val dogecoin: GetBlockToken?, @Json(name = "litecoin") val litecoin: GetBlockToken?, @Json(name = "dash") val dash: GetBlockToken?, diff --git a/domain/legacy/src/main/java/com/tangem/domain/common/extensions/Blockchain.kt b/domain/legacy/src/main/java/com/tangem/domain/common/extensions/Blockchain.kt index e4fb4f23a1..347cab9149 100644 --- a/domain/legacy/src/main/java/com/tangem/domain/common/extensions/Blockchain.kt +++ b/domain/legacy/src/main/java/com/tangem/domain/common/extensions/Blockchain.kt @@ -74,6 +74,8 @@ fun Blockchain.Companion.fromNetworkId(networkId: String): Blockchain? { "near-protocol/test" -> Blockchain.NearTestnet "decimal" -> Blockchain.Decimal "decimal/test" -> Blockchain.DecimalTestnet + "TODO" -> Blockchain.Vechain // TODO [REDACTED_TASK_KEY] + "TODO/test" -> Blockchain.VechainTestnet // TODO [REDACTED_TASK_KEY] else -> null } } @@ -149,6 +151,8 @@ fun Blockchain.toNetworkId(): String { Blockchain.NearTestnet -> "near-protocol/test" Blockchain.Decimal -> "decimal" Blockchain.DecimalTestnet -> "decimal/test" + Blockchain.Vechain -> "TODO" // TODO [REDACTED_TASK_KEY] + Blockchain.VechainTestnet -> "TODO/test" // TODO [REDACTED_TASK_KEY] } } @@ -196,6 +200,8 @@ fun Blockchain.toCoinId(): String { Blockchain.Near -> "near" Blockchain.NearTestnet -> "near/test" Blockchain.Decimal, Blockchain.DecimalTestnet -> "decimal" + Blockchain.Vechain -> "TODO" // TODO [REDACTED_TASK_KEY] + Blockchain.VechainTestnet -> "TODO/test" // TODO [REDACTED_TASK_KEY] Blockchain.Unknown -> "unknown" } } @@ -223,4 +229,6 @@ private const val NODL_AMOUNT_TO_CREATE_ACCOUNT = 1.5 private val excludedBlockchains = listOf( Blockchain.Unknown, Blockchain.Ducatus, + Blockchain.Vechain, // TODO [REDACTED_TASK_KEY] + Blockchain.VechainTestnet, // TODO [REDACTED_TASK_KEY] ) \ No newline at end of file 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 b4d1266899..2fa5c4a500 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 @@ -1299,6 +1299,7 @@ internal class SwapInteractorImpl @Inject constructor( return when (this) { is Fee.Common -> 0 is Fee.Ethereum -> this.gasLimit.toInt() + is Fee.Vechain -> TODO() // TODO [REDACTED_TASK_KEY] } } diff --git a/gradle/dependencies.toml b/gradle/dependencies.toml index 947f136e3c..73b302dd05 100644 --- a/gradle/dependencies.toml +++ b/gradle/dependencies.toml @@ -85,7 +85,7 @@ spr-client = "3.6.2" # endregion Other libraries # region Tangem -tangemBlockchainSdk = "develop-440" +tangemBlockchainSdk = "develop-444" #tangemBlockchainSdk = "0.0.1" # Keep it! - used for local builds tangemCardSdk = "develop-317" #tangemCardSdk = "0.0.1" # Keep it! - used for local builds ^