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 8c2054bf91..7a95f9e98c 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 @@ -81,6 +81,7 @@ fun getActiveIconRes(blockchainId: String): Int { "core", "core/test" -> R.drawable.img_core_22 "casper", "casper/test" -> R.drawable.img_casper_22 "xodex" -> R.drawable.img_xodex_22 + "canxium" -> R.drawable.img_canxium_22 else -> R.drawable.ic_alert_24 } } @@ -160,6 +161,7 @@ fun getActiveIconResByCoinId(coinId: String): Int { "core", "core/test" -> R.drawable.img_core_22 "casper-network" -> R.drawable.img_casper_22 "xodex" -> R.drawable.img_xodex_22 + "canxium" -> R.drawable.img_canxium_22 else -> R.drawable.ic_alert_24 } } @@ -242,6 +244,7 @@ fun getGreyedOutIconRes(blockchainId: String): Int { "core", "core/test" -> R.drawable.ic_core_22 "casper", "casper/test" -> R.drawable.ic_casper_22 "xodex" -> R.drawable.ic_xodex_22 + "canxium" -> R.drawable.ic_canxium_22 else -> R.drawable.ic_alert_24 } } \ No newline at end of file diff --git a/core/ui/src/main/res/drawable/ic_canxium_22.xml b/core/ui/src/main/res/drawable/ic_canxium_22.xml new file mode 100644 index 0000000000..6ec1ea1096 --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_canxium_22.xml @@ -0,0 +1,12 @@ + + + + diff --git a/core/ui/src/main/res/drawable/img_canxium_22.xml b/core/ui/src/main/res/drawable/img_canxium_22.xml new file mode 100644 index 0000000000..7e2e3b0263 --- /dev/null +++ b/core/ui/src/main/res/drawable/img_canxium_22.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + diff --git a/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/SwapInteractorImpl.kt b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/SwapInteractorImpl.kt index 59e27766ec..77aa2d704c 100644 --- a/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/SwapInteractorImpl.kt +++ b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/SwapInteractorImpl.kt @@ -1046,6 +1046,7 @@ internal class SwapInteractorImpl @AssistedInject constructor( Blockchain.Core, Blockchain.CoreTestnet, Blockchain.Xodex, + Blockchain.Canxium, -> Fee.Common(feeAmount) // endregion } diff --git a/gradle/dependencies.toml b/gradle/dependencies.toml index 427f9a46be..85a683a170 100644 --- a/gradle/dependencies.toml +++ b/gradle/dependencies.toml @@ -88,7 +88,7 @@ markdownComposeView = "0.5.4" # endregion Other libraries # region Tangem -tangemBlockchainSdk = "develop-844" +tangemBlockchainSdk = "develop-845" #tangemBlockchainSdk = "0.0.1" # Keep it! - used for local builds tangemCardSdk = "develop-395" #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 2ae1e364a2..8a4ac6fc89 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 @@ -139,6 +139,7 @@ fun Blockchain.Companion.fromNetworkId(networkId: String): Blockchain? { "casper-network" -> Blockchain.Casper "casper-network/test" -> Blockchain.CasperTestnet "xodex" -> Blockchain.Xodex + "canxium" -> Blockchain.Canxium else -> null } } @@ -277,6 +278,7 @@ fun Blockchain.toNetworkId(): String { Blockchain.Core -> "core" Blockchain.CoreTestnet -> "core/test" Blockchain.Xodex -> "xodex" + Blockchain.Canxium -> "canxium" } } @@ -367,6 +369,7 @@ fun Blockchain.toCoinId(): String { Blockchain.Casper, Blockchain.CasperTestnet -> "casper-network" Blockchain.Core, Blockchain.CoreTestnet -> "coredaoorg" Blockchain.Xodex -> "xodex" + Blockchain.Canxium -> "canxium" } }