From b02e6e7d05073f75479e36fd1bbd9f0c0e1875ce Mon Sep 17 00:00:00 2001 From: Tangem Date: Tue, 24 Sep 2024 14:03:39 +0500 Subject: [PATCH] Updated on 2026-08-14 --- app/src/main/assets/tangem-app-config | 2 +- app/src/main/assets/testnet_tokens.json | 10 ++++++++++ .../com/tangem/core/ui/extensions/BlockchainIcons.kt | 5 +++++ gradle/dependencies.toml | 2 +- .../java/com/tangem/blockchainsdk/utils/Blockchain.kt | 6 ++++++ 5 files changed, 23 insertions(+), 2 deletions(-) diff --git a/app/src/main/assets/tangem-app-config b/app/src/main/assets/tangem-app-config index 328c13826f..5b216eeca7 160000 --- a/app/src/main/assets/tangem-app-config +++ b/app/src/main/assets/tangem-app-config @@ -1 +1 @@ -Subproject commit 328c13826f7e52ba783db1ba39de5b17b1b79bc5 +Subproject commit 5b216eeca70af8b9fa7b266d4d0c0f87f0c042c8 diff --git a/app/src/main/assets/testnet_tokens.json b/app/src/main/assets/testnet_tokens.json index bbac69e02e..e6805136f2 100644 --- a/app/src/main/assets/testnet_tokens.json +++ b/app/src/main/assets/testnet_tokens.json @@ -728,6 +728,16 @@ "networkId": "energy-web-chain/test" } ] + }, + { + "id": "energy-web-x", + "name": "Energy Web X", + "symbol": "EWT", + "networks": [ + { + "networkId": "energy-web-x/test" + } + ] } ] } diff --git a/core/ui/src/main/java/com/tangem/core/ui/extensions/BlockchainIcons.kt b/core/ui/src/main/java/com/tangem/core/ui/extensions/BlockchainIcons.kt index c36f4876be..89bffebf60 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/extensions/BlockchainIcons.kt +++ b/core/ui/src/main/java/com/tangem/core/ui/extensions/BlockchainIcons.kt @@ -76,6 +76,7 @@ fun getActiveIconRes(blockchainId: String): Int { "sei", "sei/test" -> R.drawable.img_sei_22 "internet-computer" -> R.drawable.img_icp_22 "energy-web-chain", "energy-web-chain/test" -> R.drawable.img_energy_web_22 + "energy-web-x", "energy-web-x/test" -> R.drawable.img_energy_web_22 else -> R.drawable.ic_alert_24 } } @@ -153,6 +154,7 @@ fun getActiveIconResByNetworkId(networkId: String): Int { "sei", "sei/test" -> R.drawable.img_sei_22 "internet-computer" -> R.drawable.img_icp_22 "energy-web-chain", "energy-web-chain/test" -> R.drawable.img_energy_web_22 + "energy-web-x", "energy-web-x/test" -> R.drawable.img_energy_web_22 else -> R.drawable.ic_alert_24 } } @@ -227,6 +229,7 @@ fun getActiveIconResByCoinId(coinId: String): Int { "sei", "sei/test" -> R.drawable.img_sei_22 "internet-computer" -> R.drawable.img_icp_22 "energy-web-chain", "energy-web-chain/test" -> R.drawable.img_energy_web_22 + "energy-web-x", "energy-web-x/test" -> R.drawable.img_energy_web_22 else -> R.drawable.ic_alert_24 } } @@ -304,6 +307,7 @@ fun getGreyedOutIconRes(blockchainId: String): Int { "sei", "sei/test" -> R.drawable.ic_sei_22 "internet-computer" -> R.drawable.ic_icp_22 "energy-web-chain", "energy-web-chain/test" -> R.drawable.ic_energy_web_22 + "energy-web-x", "energy-web-x/test" -> R.drawable.ic_energy_web_22 else -> R.drawable.ic_alert_24 } } @@ -381,6 +385,7 @@ fun getGreyedOutIconResByNetworkId(networkId: String): Int { "sei", "sei/test" -> R.drawable.ic_sei_22 "internet-computer" -> R.drawable.ic_icp_22 "energy-web-chain", "energy-web-chain/test" -> R.drawable.ic_energy_web_22 + "energy-web-x", "energy-web-x/test" -> R.drawable.ic_energy_web_22 else -> R.drawable.ic_alert_24 } } \ No newline at end of file diff --git a/gradle/dependencies.toml b/gradle/dependencies.toml index aaa056ecb4..7ca1da2b67 100644 --- a/gradle/dependencies.toml +++ b/gradle/dependencies.toml @@ -89,7 +89,7 @@ markdownComposeView = "0.5.4" # endregion Other libraries # region Tangem -tangemBlockchainSdk = "develop-785" +tangemBlockchainSdk = "develop-793" #tangemBlockchainSdk = "0.0.1" # Keep it! - used for local builds tangemCardSdk = "develop-381" #tangemCardSdk = "0.0.1" # Keep it! - used for local builds ^ diff --git a/libs/blockchain-sdk/src/main/java/com/tangem/blockchainsdk/utils/Blockchain.kt b/libs/blockchain-sdk/src/main/java/com/tangem/blockchainsdk/utils/Blockchain.kt index 8cc1adb2f6..ff9614ee2b 100644 --- a/libs/blockchain-sdk/src/main/java/com/tangem/blockchainsdk/utils/Blockchain.kt +++ b/libs/blockchain-sdk/src/main/java/com/tangem/blockchainsdk/utils/Blockchain.kt @@ -128,6 +128,8 @@ fun Blockchain.Companion.fromNetworkId(networkId: String): Blockchain? { "internet-computer" -> Blockchain.InternetComputer "energy-web-chain" -> Blockchain.EnergyWebChain "energy-web-chain/test" -> Blockchain.EnergyWebChainTestnet + "energy-web-x" -> Blockchain.EnergyWebX + "energy-web-x/test" -> Blockchain.EnergyWebXTestnet else -> null } } @@ -257,6 +259,8 @@ fun Blockchain.toNetworkId(): String { Blockchain.InternetComputer -> "internet-computer" Blockchain.EnergyWebChain -> "energy-web-chain" Blockchain.EnergyWebChainTestnet -> "energy-web-chain/test" + Blockchain.EnergyWebX -> "energy-web-x" + Blockchain.EnergyWebXTestnet -> "energy-web-x/test" } } @@ -342,6 +346,7 @@ fun Blockchain.toCoinId(): String { Blockchain.Sei, Blockchain.SeiTestnet -> "sei-network" Blockchain.InternetComputer -> "internet-computer" Blockchain.EnergyWebChain, Blockchain.EnergyWebChainTestnet -> "energy-web-chain" + Blockchain.EnergyWebX, Blockchain.EnergyWebXTestnet -> "energy-web-x" } } @@ -375,4 +380,5 @@ private val excludedBlockchains = listOf( Blockchain.Sei, Blockchain.InternetComputer, Blockchain.EnergyWebChain, + Blockchain.EnergyWebX, ) \ No newline at end of file