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 1270dd2741..ec74fa9c24 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 @@ -80,6 +80,7 @@ fun getActiveIconRes(blockchainId: String): Int { "energy-web-x", "energy-web-x/test" -> R.drawable.img_energy_web_22 "core", "core/test" -> R.drawable.img_core_22 "casper-network", "casper-network/test" -> R.drawable.img_casper_22 + "xodex" -> R.drawable.img_xodex_22 else -> R.drawable.ic_alert_24 } } @@ -161,6 +162,7 @@ fun getActiveIconResByNetworkId(networkId: String): Int { "energy-web-x", "energy-web-x/test" -> R.drawable.img_energy_web_22 "core", "core/test" -> R.drawable.img_core_22 "casper-network", "casper-network/test" -> R.drawable.img_casper_22 + "xodex" -> R.drawable.img_xodex_22 else -> R.drawable.ic_alert_24 } } @@ -239,6 +241,7 @@ fun getActiveIconResByCoinId(coinId: String): Int { "energy-web-x", "energy-web-x/test" -> R.drawable.img_energy_web_22 "core", "core/test" -> R.drawable.img_core_22 "casper-network" -> R.drawable.img_casper_22 + "xodex" -> R.drawable.img_xodex_22 else -> R.drawable.ic_alert_24 } } @@ -320,6 +323,7 @@ fun getGreyedOutIconRes(blockchainId: String): Int { "energy-web-x", "energy-web-x/test" -> R.drawable.ic_energy_web_22 "core", "core/test" -> R.drawable.ic_core_22 "casper-network", "casper-network/test" -> R.drawable.ic_casper_22 + "xodex" -> R.drawable.ic_xodex_22 else -> R.drawable.ic_alert_24 } } @@ -401,6 +405,7 @@ fun getGreyedOutIconResByNetworkId(networkId: String): Int { "energy-web-x", "energy-web-x/test" -> R.drawable.ic_energy_web_22 "core", "core/test" -> R.drawable.ic_core_22 "casper-network", "casper-network/test" -> R.drawable.ic_casper_22 + "xodex" -> R.drawable.ic_xodex_22 else -> R.drawable.ic_alert_24 } } \ No newline at end of file diff --git a/core/ui/src/main/res/drawable/ic_xodex_22.xml b/core/ui/src/main/res/drawable/ic_xodex_22.xml new file mode 100644 index 0000000000..bb8c9d880d --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_xodex_22.xml @@ -0,0 +1,9 @@ + + + diff --git a/core/ui/src/main/res/drawable/img_xodex_22.xml b/core/ui/src/main/res/drawable/img_xodex_22.xml new file mode 100644 index 0000000000..878bf9187f --- /dev/null +++ b/core/ui/src/main/res/drawable/img_xodex_22.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + 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 63b9c43970..59e27766ec 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 @@ -1045,6 +1045,7 @@ internal class SwapInteractorImpl @AssistedInject constructor( Blockchain.CasperTestnet, Blockchain.Core, Blockchain.CoreTestnet, + Blockchain.Xodex, -> Fee.Common(feeAmount) // endregion } diff --git a/gradle/dependencies.toml b/gradle/dependencies.toml index 34eb2d3fc5..427f9a46be 100644 --- a/gradle/dependencies.toml +++ b/gradle/dependencies.toml @@ -88,7 +88,7 @@ markdownComposeView = "0.5.4" # endregion Other libraries # region Tangem -tangemBlockchainSdk = "develop-843" +tangemBlockchainSdk = "develop-844" #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 3132bfa610..2ae1e364a2 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 @@ -138,6 +138,7 @@ fun Blockchain.Companion.fromNetworkId(networkId: String): Blockchain? { "core/test" -> Blockchain.CoreTestnet "casper-network" -> Blockchain.Casper "casper-network/test" -> Blockchain.CasperTestnet + "xodex" -> Blockchain.Xodex else -> null } } @@ -275,6 +276,7 @@ fun Blockchain.toNetworkId(): String { Blockchain.CasperTestnet -> "casper-network/test" Blockchain.Core -> "core" Blockchain.CoreTestnet -> "core/test" + Blockchain.Xodex -> "xodex" } } @@ -364,6 +366,7 @@ fun Blockchain.toCoinId(): String { Blockchain.EnergyWebX, Blockchain.EnergyWebXTestnet -> "energy-web-token" Blockchain.Casper, Blockchain.CasperTestnet -> "casper-network" Blockchain.Core, Blockchain.CoreTestnet -> "coredaoorg" + Blockchain.Xodex -> "xodex" } }