diff --git a/app/src/main/assets/testnet_tokens.json b/app/src/main/assets/testnet_tokens.json index e6805136f2..3badefc007 100644 --- a/app/src/main/assets/testnet_tokens.json +++ b/app/src/main/assets/testnet_tokens.json @@ -738,6 +738,16 @@ "networkId": "energy-web-x/test" } ] + }, + { + "id": "core", + "name": "Core", + "symbol": "CORE", + "networks": [ + { + "networkId": "core/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 e468f9d237..9c460e02a1 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 @@ -78,6 +78,7 @@ fun getActiveIconRes(blockchainId: String): Int { "sui", "sui/test" -> R.drawable.img_sui_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 + "core", "core/test" -> R.drawable.img_core_22 else -> R.drawable.ic_alert_24 } } @@ -157,6 +158,7 @@ fun getActiveIconResByNetworkId(networkId: String): Int { "sui", "sui/test" -> R.drawable.img_sui_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 + "core", "core/test" -> R.drawable.img_core_22 else -> R.drawable.ic_alert_24 } } @@ -233,6 +235,7 @@ fun getActiveIconResByCoinId(coinId: String): Int { "sui", "sui/test" -> R.drawable.img_sui_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 + "core", "core/test" -> R.drawable.img_core_22 else -> R.drawable.ic_alert_24 } } @@ -312,6 +315,7 @@ fun getGreyedOutIconRes(blockchainId: String): Int { "sui", "sui/test" -> R.drawable.ic_sui_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 + "core", "core/test" -> R.drawable.ic_core_22 else -> R.drawable.ic_alert_24 } } @@ -391,6 +395,7 @@ fun getGreyedOutIconResByNetworkId(networkId: String): Int { "sui", "sui/test" -> R.drawable.ic_sui_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 + "core", "core/test" -> R.drawable.ic_core_22 else -> R.drawable.ic_alert_24 } } \ No newline at end of file diff --git a/core/ui/src/main/res/drawable/ic_core_22.xml b/core/ui/src/main/res/drawable/ic_core_22.xml new file mode 100644 index 0000000000..a2373aa078 --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_core_22.xml @@ -0,0 +1,10 @@ + + + diff --git a/core/ui/src/main/res/drawable/img_core_22.xml b/core/ui/src/main/res/drawable/img_core_22.xml new file mode 100644 index 0000000000..52964adf37 --- /dev/null +++ b/core/ui/src/main/res/drawable/img_core_22.xml @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/gradle/dependencies.toml b/gradle/dependencies.toml index a8df604cbf..cc50bc93ec 100644 --- a/gradle/dependencies.toml +++ b/gradle/dependencies.toml @@ -89,7 +89,7 @@ markdownComposeView = "0.5.4" # endregion Other libraries # region Tangem -tangemBlockchainSdk = "develop-814" +tangemBlockchainSdk = "develop-815" #tangemBlockchainSdk = "0.0.1" # Keep it! - used for local builds tangemCardSdk = "develop-387" #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 239018b6a9..126cc48617 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 @@ -134,6 +134,8 @@ fun Blockchain.Companion.fromNetworkId(networkId: String): Blockchain? { "energy-web-x/test" -> Blockchain.EnergyWebXTestnet "add_later" -> Blockchain.Casper "add_later_test" -> Blockchain.CasperTestnet + "core" -> Blockchain.Core + "core/test" -> Blockchain.CoreTestnet else -> null } } @@ -269,6 +271,8 @@ fun Blockchain.toNetworkId(): String { Blockchain.EnergyWebXTestnet -> "energy-web-x/test" Blockchain.Casper -> "add_later" Blockchain.CasperTestnet -> "add_later_test" + Blockchain.Core -> "core" + Blockchain.CoreTestnet -> "core/test" } } @@ -358,6 +362,7 @@ fun Blockchain.toCoinId(): String { Blockchain.EnergyWebX, Blockchain.EnergyWebXTestnet -> "energy-web-token" Blockchain.Casper -> "add_later" Blockchain.CasperTestnet -> "add_later_test" + Blockchain.Core, Blockchain.CoreTestnet -> "coredaoorg" } }