diff --git a/app/src/main/java/com/tangem/tap/network/exchangeServices/mercuryo/MercuryoBlockchainMapping.kt b/app/src/main/java/com/tangem/tap/network/exchangeServices/mercuryo/MercuryoBlockchainMapping.kt index 9a930fdf76..5ee9a4ce7f 100644 --- a/app/src/main/java/com/tangem/tap/network/exchangeServices/mercuryo/MercuryoBlockchainMapping.kt +++ b/app/src/main/java/com/tangem/tap/network/exchangeServices/mercuryo/MercuryoBlockchainMapping.kt @@ -143,5 +143,6 @@ internal val Blockchain.mercuryoNetwork: String? Blockchain.Unknown -> null Blockchain.Xodex -> null Blockchain.Canxium -> null + Blockchain.Clore -> null } } \ No newline at end of file diff --git a/app/src/main/java/com/tangem/tap/network/exchangeServices/moonpay/MoonpayBlockchainMapping.kt b/app/src/main/java/com/tangem/tap/network/exchangeServices/moonpay/MoonpayBlockchainMapping.kt index bce26d7a6a..a4de7a4df9 100644 --- a/app/src/main/java/com/tangem/tap/network/exchangeServices/moonpay/MoonpayBlockchainMapping.kt +++ b/app/src/main/java/com/tangem/tap/network/exchangeServices/moonpay/MoonpayBlockchainMapping.kt @@ -144,4 +144,5 @@ internal val Blockchain.moonPaySupportedCurrency: MoonPaySupportedCurrency? Unknown -> null Xodex -> null Canxium -> null + Clore -> null } \ No newline at end of file diff --git a/core/config-toggles/src/main/assets/configs/excluded_blockchains_config.json b/core/config-toggles/src/main/assets/configs/excluded_blockchains_config.json index 4113610e04..8d520b49a3 100644 --- a/core/config-toggles/src/main/assets/configs/excluded_blockchains_config.json +++ b/core/config-toggles/src/main/assets/configs/excluded_blockchains_config.json @@ -6,5 +6,9 @@ { "name": "NEXA", "version": "undefined" + }, + { + "name": "clore-ai", + "version": "undefined" } ] \ No newline at end of file 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 5aa40111d8..0ec7a47466 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 @@ -83,6 +83,7 @@ fun getActiveIconRes(blockchainId: String): Int { "xodex" -> R.drawable.img_xodex_22 "canxium" -> R.drawable.img_canxium_22 "chiliz", "chiliz/test" -> R.drawable.img_chiliz_22 + "clore-ai" -> R.drawable.img_clore_22 else -> R.drawable.ic_alert_24 } } @@ -164,6 +165,7 @@ fun getActiveIconResByCoinId(coinId: String): Int { "xodex" -> R.drawable.img_xodex_22 "canxium" -> R.drawable.img_canxium_22 "chiliz", "chiliz/test" -> R.drawable.img_chiliz_22 + "clore-ai" -> R.drawable.img_clore_22 else -> R.drawable.ic_alert_24 } } @@ -248,6 +250,7 @@ fun getGreyedOutIconRes(blockchainId: String): Int { "xodex" -> R.drawable.ic_xodex_22 "canxium" -> R.drawable.ic_canxium_22 "chiliz", "chiliz/test" -> R.drawable.ic_chiliz_22 + "clore-ai" -> R.drawable.ic_clore_22 else -> R.drawable.ic_alert_24 } } \ No newline at end of file diff --git a/core/ui/src/main/res/drawable/ic_clore_22.xml b/core/ui/src/main/res/drawable/ic_clore_22.xml new file mode 100644 index 0000000000..b283f4461b --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_clore_22.xml @@ -0,0 +1,9 @@ + + + diff --git a/core/ui/src/main/res/drawable/img_clore_22.xml b/core/ui/src/main/res/drawable/img_clore_22.xml new file mode 100644 index 0000000000..ac3bcd98da --- /dev/null +++ b/core/ui/src/main/res/drawable/img_clore_22.xml @@ -0,0 +1,19 @@ + + + + + + + + diff --git a/data/common/src/main/kotlin/com/tangem/data/common/currency/NetworkOperations.kt b/data/common/src/main/kotlin/com/tangem/data/common/currency/NetworkOperations.kt index 23ba62d9fc..4b02448af9 100644 --- a/data/common/src/main/kotlin/com/tangem/data/common/currency/NetworkOperations.kt +++ b/data/common/src/main/kotlin/com/tangem/data/common/currency/NetworkOperations.kt @@ -218,6 +218,7 @@ private fun Blockchain.getSupportedTransactionExtras(): Network.TransactionExtra Blockchain.TelosTestnet, Blockchain.TONTestnet, Blockchain.Ravencoin, + Blockchain.Clore, Blockchain.RavencoinTestnet, Blockchain.Cronos, Blockchain.AlephZero, 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 9f48919bec..6ad0d0ff86 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 @@ -1049,6 +1049,7 @@ internal class SwapInteractorImpl @AssistedInject constructor( Canxium, Chiliz, ChilizTestnet, + Clore, -> Fee.Common(feeAmount) // endregion } diff --git a/gradle/dependencies.toml b/gradle/dependencies.toml index 64a90d4373..b1c1f80363 100644 --- a/gradle/dependencies.toml +++ b/gradle/dependencies.toml @@ -88,7 +88,7 @@ markdownComposeView = "0.5.4" # endregion Other libraries # region Tangem -tangemBlockchainSdk = "develop-876" +tangemBlockchainSdk = "develop-877" #tangemBlockchainSdk = "0.0.1" # Keep it! - used for local builds tangemCardSdk = "develop-410" #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 2d32f24015..ba2fab5f48 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 @@ -142,6 +142,7 @@ fun Blockchain.Companion.fromNetworkId(networkId: String): Blockchain? { "chiliz/test" -> Blockchain.ChilizTestnet "xodex" -> Blockchain.Xodex "canxium" -> Blockchain.Canxium + "clore-ai" -> Blockchain.Clore else -> null } } @@ -283,6 +284,7 @@ fun Blockchain.toNetworkId(): String { Blockchain.ChilizTestnet -> "chiliz/test" Blockchain.Xodex -> "xodex" Blockchain.Canxium -> "canxium" + Blockchain.Clore -> "clore-ai" } } @@ -375,6 +377,7 @@ fun Blockchain.toCoinId(): String { Blockchain.Chiliz, Blockchain.ChilizTestnet -> "chiliz" Blockchain.Xodex -> "xodex" Blockchain.Canxium -> "canxium" + Blockchain.Clore -> "clore-ai" } }