From 103a78782fd66bc1d0c29cd1cd9a44e82ba2f8cf Mon Sep 17 00:00:00 2001 From: Tangem Date: Fri, 7 Jul 2023 15:27:53 +0300 Subject: [PATCH] Updated on 2026-08-14 --- app/src/main/assets/testnet_tokens.json | 11 +++++++++++ .../com/tangem/tap/common/extensions/Blockchain.kt | 1 + app/src/main/res/drawable/ic_azero_no_color.xml | 12 ++++++++++++ .../com/tangem/core/ui/extensions/BlockchainIcons.kt | 1 + core/ui/src/main/res/drawable/img_azero_22.xml | 12 ++++++++++++ .../tangem/domain/common/extensions/Blockchain.kt | 10 +++++----- gradle/dependencies.toml | 2 +- 7 files changed, 43 insertions(+), 6 deletions(-) create mode 100644 app/src/main/res/drawable/ic_azero_no_color.xml create mode 100644 core/ui/src/main/res/drawable/img_azero_22.xml diff --git a/app/src/main/assets/testnet_tokens.json b/app/src/main/assets/testnet_tokens.json index b39a86f330..e10caf1e7f 100644 --- a/app/src/main/assets/testnet_tokens.json +++ b/app/src/main/assets/testnet_tokens.json @@ -506,6 +506,17 @@ "networkId": "cosmos/test" } ] + }, + { + "id": "aleph-zero", + "symbol": "AZERO", + "name": "Aleph Zero", + "networks": + [ + { + "networkId": "aleph-zero/test" + } + ] } ] } diff --git a/app/src/main/java/com/tangem/tap/common/extensions/Blockchain.kt b/app/src/main/java/com/tangem/tap/common/extensions/Blockchain.kt index 06078c9488..68aca58758 100644 --- a/app/src/main/java/com/tangem/tap/common/extensions/Blockchain.kt +++ b/app/src/main/java/com/tangem/tap/common/extensions/Blockchain.kt @@ -44,6 +44,7 @@ fun Blockchain.getGreyedOutIconRes(): Int { Blockchain.TerraV2 -> R.drawable.ic_terra2_no_color Blockchain.Cronos -> R.drawable.ic_cronos_no_color Blockchain.Telos, Blockchain.TelosTestnet -> R.drawable.ic_telos_no_color + Blockchain.AlephZero, Blockchain.AlephZeroTestnet -> R.drawable.ic_azero_no_color else -> R.drawable.ic_tangem_logo } } diff --git a/app/src/main/res/drawable/ic_azero_no_color.xml b/app/src/main/res/drawable/ic_azero_no_color.xml new file mode 100644 index 0000000000..da712895b3 --- /dev/null +++ b/app/src/main/res/drawable/ic_azero_no_color.xml @@ -0,0 +1,12 @@ + + + + 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 e0dcf1e7c8..c4eeba732a 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 @@ -41,6 +41,7 @@ fun getActiveIconRes(blockchainId: String): Int { "terra-2", "terra-luna-2" -> R.drawable.img_terra2_22 "cronos" -> R.drawable.img_cronos_22 "TELOS", "TELOS/test" -> R.drawable.img_telos_22 + "aleph-zero", "aleph-zero/test" -> R.drawable.img_azero_22 else -> R.drawable.ic_alert_24 } } diff --git a/core/ui/src/main/res/drawable/img_azero_22.xml b/core/ui/src/main/res/drawable/img_azero_22.xml new file mode 100644 index 0000000000..9a9fd4a2f1 --- /dev/null +++ b/core/ui/src/main/res/drawable/img_azero_22.xml @@ -0,0 +1,12 @@ + + + + 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 1b5e32c734..f4084f38df 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 @@ -61,8 +61,8 @@ fun Blockchain.Companion.fromNetworkId(networkId: String): Blockchain? { "cronos" -> Blockchain.Cronos "telos" -> Blockchain.Telos "telos/test" -> Blockchain.TelosTestnet - "azero" -> Blockchain.AlephZero - "azero/test" -> Blockchain.AlephZeroTestnet + "aleph-zero" -> Blockchain.AlephZero + "aleph-zero/test" -> Blockchain.AlephZeroTestnet else -> null } } @@ -128,8 +128,8 @@ fun Blockchain.toNetworkId(): String { Blockchain.Cronos -> "cronos" Blockchain.Telos -> "telos" Blockchain.TelosTestnet -> "telos/test" - Blockchain.AlephZero -> "azero" - Blockchain.AlephZeroTestnet -> "azero/test" + Blockchain.AlephZero -> "aleph-zero" + Blockchain.AlephZeroTestnet -> "aleph-zero/test" } } @@ -171,7 +171,7 @@ fun Blockchain.toCoinId(): String { Blockchain.TerraV2 -> "terra-luna-2" Blockchain.Cronos -> "crypto-com-chain" Blockchain.Telos, Blockchain.TelosTestnet -> "telos" - Blockchain.AlephZero, Blockchain.AlephZeroTestnet -> "azero" + Blockchain.AlephZero, Blockchain.AlephZeroTestnet -> "aleph-zero" } } diff --git a/gradle/dependencies.toml b/gradle/dependencies.toml index 5fb4bbfb94..b39d1e0b90 100644 --- a/gradle/dependencies.toml +++ b/gradle/dependencies.toml @@ -78,7 +78,7 @@ walletConnectWeb3 = "1.8.0" # endregion Other libraries # region Tangem -tangemBlockchainSdk = "develop-259" +tangemBlockchainSdk = "develop-264" #tangemBlockchainSdk = "0.0.1" # Keep it! - used for local builds tangemCardSdk = "develop-266" #tangemCardSdk = "0.0.1" # Keep it! - used for local builds