From d8e756e7b71541b82860b3d3b24622a3d80b6e32 Mon Sep 17 00:00:00 2001 From: Tangem Date: Tue, 30 Jan 2024 17:40:33 +0500 Subject: [PATCH] Updated on 2026-08-14 --- app/src/main/assets/testnet_tokens.json | 4 ++-- .../com/tangem/domain/common/extensions/Blockchain.kt | 10 +++++----- .../tangem/feature/swap/domain/SwapInteractorImpl.kt | 6 +++--- gradle/dependencies.toml | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/src/main/assets/testnet_tokens.json b/app/src/main/assets/testnet_tokens.json index cbc9238746..6be450bd32 100644 --- a/app/src/main/assets/testnet_tokens.json +++ b/app/src/main/assets/testnet_tokens.json @@ -405,7 +405,7 @@ { "id" : "vechain", "symbol" : "VET", - "name" : "Vechain", + "name" : "VeChain", "networks" : [ { "networkId" : "vechain/test" @@ -419,7 +419,7 @@ "networks": [ { "networkId": "vechain/test", - "contractAddress": "0x0000000000000000000000000000456E65726779", + "contractAddress": "0x0000000000000000000000000000456e65726779", "decimalCount": 18 } ] 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 7d235349dc..b6f3d8aba6 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 @@ -76,8 +76,8 @@ fun Blockchain.Companion.fromNetworkId(networkId: String): Blockchain? { "decimal/test" -> Blockchain.DecimalTestnet "xdc-network" -> Blockchain.XDC "xdc-network/test" -> Blockchain.XDCTestnet - "vechain" -> Blockchain.Vechain - "vechain/test" -> Blockchain.VechainTestnet + "vechain" -> Blockchain.VeChain + "vechain/test" -> Blockchain.VeChainTestnet "aptos" -> Blockchain.Aptos "aptos/test" -> Blockchain.AptosTestnet else -> null @@ -157,8 +157,8 @@ fun Blockchain.toNetworkId(): String { Blockchain.DecimalTestnet -> "decimal/test" Blockchain.XDC -> "xdc-network" Blockchain.XDCTestnet -> "xdc-network/test" - Blockchain.Vechain -> "vechain" - Blockchain.VechainTestnet -> "vechain/test" + Blockchain.VeChain -> "vechain" + Blockchain.VeChainTestnet -> "vechain/test" Blockchain.Aptos -> "aptos" Blockchain.AptosTestnet -> "aptos/test" } @@ -209,7 +209,7 @@ fun Blockchain.toCoinId(): String { Blockchain.NearTestnet -> "near/test" Blockchain.Decimal, Blockchain.DecimalTestnet -> "decimal" Blockchain.XDC, Blockchain.XDCTestnet -> "xdce-crowd-sale" - Blockchain.Vechain, Blockchain.VechainTestnet -> "vechain" + Blockchain.VeChain, Blockchain.VeChainTestnet -> "vechain" Blockchain.Aptos -> "aptos" Blockchain.AptosTestnet -> "aptos/test" Blockchain.Unknown -> "unknown" 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 7078bd5b1a..0928f9385a 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 @@ -655,9 +655,9 @@ internal class SwapInteractorImpl @Inject constructor( gasPrice = (feeAmountWithDecimals / fee.gasLimit.toBigDecimal()).toBigInteger(), ) } - blockchain == Blockchain.Vechain -> Fee.Vechain( + blockchain == Blockchain.VeChain -> Fee.VeChain( amount = feeAmount, - gasPriceCoef = Fee.Vechain.getGasPriceCoef(fee.gasLimit.toLong(), fee.feeValue), + gasPriceCoef = Fee.VeChain.getGasPriceCoef(fee.gasLimit.toLong(), fee.feeValue), gasLimit = fee.gasLimit.toLong(), ) blockchain == Blockchain.Aptos -> { @@ -1354,7 +1354,7 @@ internal class SwapInteractorImpl @Inject constructor( return when (this) { is Fee.Common -> 0 is Fee.Ethereum -> gasLimit.toInt() - is Fee.Vechain -> gasLimit.toInt() + is Fee.VeChain -> gasLimit.toInt() is Fee.Aptos -> amount.longValue?.div(gasUnitPrice)?.toInt() ?: 0 } } diff --git a/gradle/dependencies.toml b/gradle/dependencies.toml index b839fda708..11552dabef 100644 --- a/gradle/dependencies.toml +++ b/gradle/dependencies.toml @@ -85,7 +85,7 @@ spr-client = "3.6.2" # endregion Other libraries # region Tangem -tangemBlockchainSdk = "release-app_5.5-466" +tangemBlockchainSdk = "release-app_5.5-469" #tangemBlockchainSdk = "0.0.1" # Keep it! - used for local builds tangemCardSdk = "release-app_5.5-323" #tangemCardSdk = "0.0.1" # Keep it! - used for local builds ^