diff --git a/app/src/main/assets/testnet_tokens.json b/app/src/main/assets/testnet_tokens.json index dd90c8b04c..140b02a645 100644 --- a/app/src/main/assets/testnet_tokens.json +++ b/app/src/main/assets/testnet_tokens.json @@ -511,8 +511,7 @@ "id": "aleph-zero", "symbol": "AZERO", "name": "Aleph Zero", - "networks": - [ + "networks": [ { "networkId": "aleph-zero/test" } @@ -522,12 +521,21 @@ "id": "near", "symbol": "NEAR", "name": "NEAR", - "networks": - [ + "networks": [ { "networkId": "near-protocol/test" } ] + }, + { + "id": "decimal", + "name": "Decimal", + "symbol": "tDEL", + "networks": [ + { + "networkId": "decimal/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 8b6efaed02..3c29a58544 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 @@ -45,6 +45,7 @@ fun getActiveIconRes(blockchainId: String): Int { "aleph-zero", "aleph-zero/test" -> R.drawable.img_azero_22 "octaspace", "octaspace/test" -> R.drawable.img_octaspace_22 "chia", "chia/test" -> R.drawable.img_chia_22 + "decimal", "decimal/testnet" -> R.drawable.img_decimal_22 else -> R.drawable.ic_alert_24 } } @@ -88,6 +89,7 @@ fun getActiveIconResByCoinId(coinId: String): Int { "octaspace" -> R.drawable.img_octaspace_22 "chia" -> R.drawable.img_chia_22 "near" -> R.drawable.img_near_22 + "decimal" -> R.drawable.img_decimal_22 else -> R.drawable.ic_alert_24 } } @@ -133,6 +135,7 @@ fun getGreyedOutIconRes(blockchainId: String): Int { "aleph-zero", "aleph-zero/test" -> R.drawable.ic_azero_22 "octaspace", "octaspace/test" -> R.drawable.ic_octaspace_22 "chia", "chia/test" -> R.drawable.ic_chia_22 + "decimal", "decimal/test" -> R.drawable.ic_decimal_22 else -> R.drawable.ic_alert_24 } } \ No newline at end of file diff --git a/core/ui/src/main/res/drawable/ic_decimal_22.xml b/core/ui/src/main/res/drawable/ic_decimal_22.xml new file mode 100644 index 0000000000..c4fc972f09 --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_decimal_22.xml @@ -0,0 +1,10 @@ + + + diff --git a/core/ui/src/main/res/drawable/img_decimal_22.xml b/core/ui/src/main/res/drawable/img_decimal_22.xml new file mode 100644 index 0000000000..02241418d2 --- /dev/null +++ b/core/ui/src/main/res/drawable/img_decimal_22.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + 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 e5c093146e..91b87a46fd 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 @@ -72,6 +72,8 @@ fun Blockchain.Companion.fromNetworkId(networkId: String): Blockchain? { "chia/test" -> Blockchain.ChiaTestnet "near-protocol" -> Blockchain.Near "near-protocol/test" -> Blockchain.NearTestnet + "decimal" -> Blockchain.Decimal + "decimal/test" -> Blockchain.DecimalTestnet else -> null } } @@ -145,6 +147,8 @@ fun Blockchain.toNetworkId(): String { Blockchain.ChiaTestnet -> "chia/test" Blockchain.Near -> "near-protocol" Blockchain.NearTestnet -> "near-protocol/test" + Blockchain.Decimal -> "decimal" + Blockchain.DecimalTestnet -> "decimal/test" } } @@ -191,6 +195,8 @@ fun Blockchain.toCoinId(): String { Blockchain.Chia, Blockchain.ChiaTestnet -> "chia" Blockchain.Near -> "near" Blockchain.NearTestnet -> "near/test" + Blockchain.Decimal -> "decimal" + Blockchain.DecimalTestnet -> "decimal/test" Blockchain.Unknown -> "unknown" } } diff --git a/gradle/dependencies.toml b/gradle/dependencies.toml index 89e3ccc82d..e44a2e00dd 100644 --- a/gradle/dependencies.toml +++ b/gradle/dependencies.toml @@ -82,7 +82,7 @@ spr-client = "3.6.2" # endregion Other libraries # region Tangem -tangemBlockchainSdk = "develop-375" +tangemBlockchainSdk = "develop-377" #tangemBlockchainSdk = "0.0.1" # Keep it! - used for local builds tangemCardSdk = "develop-310" #tangemCardSdk = "0.0.1" # Keep it! - used for local builds