From 1e032aeb761ca7fe1f97f4d32e80bf514fe899a7 Mon Sep 17 00:00:00 2001 From: Tangem Date: Thu, 29 Jun 2023 13:07:33 +0300 Subject: [PATCH 1/3] Updated on 2026-08-14 --- app/src/main/assets/testnet_tokens.json | 11 +++++++++++ .../tangem/tap/common/extensions/Blockchain.kt | 1 + app/src/main/res/drawable/ic_telos_no_color.xml | 15 +++++++++++++++ .../tangem/core/ui/extensions/BlockchainIcons.kt | 2 ++ core/ui/src/main/res/drawable/img_telos_22.xml | 15 +++++++++++++++ .../tangem/domain/common/extensions/Blockchain.kt | 5 +++++ gradle/dependencies.toml | 4 ++-- 7 files changed, 51 insertions(+), 2 deletions(-) create mode 100644 app/src/main/res/drawable/ic_telos_no_color.xml create mode 100644 core/ui/src/main/res/drawable/img_telos_22.xml diff --git a/app/src/main/assets/testnet_tokens.json b/app/src/main/assets/testnet_tokens.json index b7f5b4f8e4..b39a86f330 100644 --- a/app/src/main/assets/testnet_tokens.json +++ b/app/src/main/assets/testnet_tokens.json @@ -474,6 +474,17 @@ } ] }, + { + "id": "telos", + "symbol": "TLOS", + "name": "Telos EVM", + "networks": + [ + { + "networkId": "telos/test" + } + ] + }, { "id": "ravencoin", "symbol": "RVN", 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 7ca3e575d4..06078c9488 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 @@ -43,6 +43,7 @@ fun Blockchain.getGreyedOutIconRes(): Int { Blockchain.TerraV1 -> R.drawable.ic_terra_no_color 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 else -> R.drawable.ic_tangem_logo } } diff --git a/app/src/main/res/drawable/ic_telos_no_color.xml b/app/src/main/res/drawable/ic_telos_no_color.xml new file mode 100644 index 0000000000..01aca1d2b2 --- /dev/null +++ b/app/src/main/res/drawable/ic_telos_no_color.xml @@ -0,0 +1,15 @@ + + + + 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 f18370422e..e0dcf1e7c8 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 @@ -40,6 +40,7 @@ fun getActiveIconRes(blockchainId: String): Int { "terra", "terra-luna" -> R.drawable.img_terra_22 "terra-2", "terra-luna-2" -> R.drawable.img_terra2_22 "cronos" -> R.drawable.img_cronos_22 + "TELOS", "TELOS/test" -> R.drawable.img_telos_22 else -> R.drawable.ic_alert_24 } } @@ -84,6 +85,7 @@ fun getActiveIconResByCoinId(coinId: String, networkId: String): Int { "ravencoin" -> R.drawable.img_ravencoin_22 "terra" -> R.drawable.img_terra_22 "terra-2" -> R.drawable.img_terra2_22 + "telos" -> R.drawable.img_telos_22 else -> R.drawable.ic_alert_24 } } \ No newline at end of file diff --git a/core/ui/src/main/res/drawable/img_telos_22.xml b/core/ui/src/main/res/drawable/img_telos_22.xml new file mode 100644 index 0000000000..3250c06998 --- /dev/null +++ b/core/ui/src/main/res/drawable/img_telos_22.xml @@ -0,0 +1,15 @@ + + + + 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 de6329b343..19828db7c1 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 @@ -59,6 +59,8 @@ fun Blockchain.Companion.fromNetworkId(networkId: String): Blockchain? { "terra" -> Blockchain.TerraV1 "terra-2" -> Blockchain.TerraV2 "cronos" -> Blockchain.Cronos + "telos" -> Blockchain.Telos + "telos/test" -> Blockchain.TelosTestnet else -> null } } @@ -122,6 +124,8 @@ fun Blockchain.toNetworkId(): String { Blockchain.TerraV1 -> "terra" Blockchain.TerraV2 -> "terra-2" Blockchain.Cronos -> "cronos" + Blockchain.Telos -> "telos" + Blockchain.TelosTestnet -> "telos/test" } } @@ -162,6 +166,7 @@ fun Blockchain.toCoinId(): String { Blockchain.TerraV1 -> "terra-luna" Blockchain.TerraV2 -> "terra-luna-2" Blockchain.Cronos -> "crypto-com-chain" + Blockchain.Telos, Blockchain.TelosTestnet -> "telos" } } diff --git a/gradle/dependencies.toml b/gradle/dependencies.toml index ff5b0202f3..58b9e2bdcc 100644 --- a/gradle/dependencies.toml +++ b/gradle/dependencies.toml @@ -78,9 +78,9 @@ walletConnectWeb3 = "1.8.0" # endregion Other libraries # region Tangem -tangemBlockchainSdk = "release-app_4.8-251" +tangemBlockchainSdk = "develop-253" #tangemBlockchainSdk = "0.0.1" # Keep it! - used for local builds -tangemCardSdk = "release-app_4.8-270" +tangemCardSdk = "develop-266" #tangemCardSdk = "0.0.1" # Keep it! - used for local builds # endregion Tangem From 721a136483ffab4d5770b82a708fdfdb6887c0a1 Mon Sep 17 00:00:00 2001 From: Tangem Date: Thu, 29 Jun 2023 14:00:49 +0300 Subject: [PATCH 2/3] Updated on 2026-08-14 --- .../java/com/tangem/domain/common/extensions/Blockchain.kt | 3 +++ 1 file changed, 3 insertions(+) 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 19828db7c1..ff47948268 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 @@ -126,6 +126,8 @@ fun Blockchain.toNetworkId(): String { Blockchain.Cronos -> "cronos" Blockchain.Telos -> "telos" Blockchain.TelosTestnet -> "telos/test" + Blockchain.AlephZero -> "azero" + Blockchain.AlephZeroTestnet -> "azero/test" } } @@ -167,6 +169,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" } } From d6a394a5eb837611c7852bd7a6139bb1c5beb2a6 Mon Sep 17 00:00:00 2001 From: Tangem Date: Thu, 29 Jun 2023 18:40:10 +0300 Subject: [PATCH 3/3] Updated on 2026-08-14 --- .../main/java/com/tangem/domain/common/extensions/Blockchain.kt | 2 ++ 1 file changed, 2 insertions(+) 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 ff47948268..1b5e32c734 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,6 +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 else -> null } }