diff --git a/app/src/main/assets/tangem-app-config b/app/src/main/assets/tangem-app-config index 4098c0311e..e91a299285 160000 --- a/app/src/main/assets/tangem-app-config +++ b/app/src/main/assets/tangem-app-config @@ -1 +1 @@ -Subproject commit 4098c0311e1bc9deec592bcf1f34f4f7ed2d94f9 +Subproject commit e91a2992857afa5cefce05c2750daf175b783603 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 b1ce83c287..0d72c8158a 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 @@ -148,5 +148,6 @@ internal val Blockchain.mercuryoNetwork: String? Blockchain.Canxium -> null Blockchain.Clore -> null Blockchain.OdysseyChain, Blockchain.OdysseyChainTestnet -> null + Blockchain.Bitrock, Blockchain.BitrockTestnet -> 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 bb7bfb5047..729a87b31f 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 @@ -149,4 +149,5 @@ internal val Blockchain.moonPaySupportedCurrency: MoonPaySupportedCurrency? VanarChain -> null VanarChainTestnet -> null OdysseyChain, OdysseyChainTestnet -> null + Bitrock, BitrockTestnet -> 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 a2862f948e..b499f67490 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 @@ -18,5 +18,9 @@ { "name": "vanar-chain", "version": "undefined" + }, + { + "name": "bitrock", + "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 44921bbd2c..edd097a43d 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 @@ -86,6 +86,7 @@ fun getActiveIconRes(blockchainId: String): Int { "clore-ai" -> R.drawable.img_clore_22 "fact0rn" -> R.drawable.img_fact0rn_22 "odyssey", "odyssey/test" -> R.drawable.img_odyssey_chain_22 + "bitrock", "bitrock/test" -> R.drawable.ic_alert_24 // todo else -> R.drawable.ic_alert_24 } } @@ -170,6 +171,7 @@ fun getActiveIconResByCoinId(coinId: String): Int { "clore-ai" -> R.drawable.img_clore_22 "fact0rn" -> R.drawable.img_fact0rn_22 "odyssey", "odyssey/test" -> R.drawable.img_odyssey_chain_22 + "bitrock", "bitrock/test" -> R.drawable.ic_alert_24 // todo else -> R.drawable.ic_alert_24 } } @@ -257,6 +259,7 @@ fun getGreyedOutIconRes(blockchainId: String): Int { "clore-ai" -> R.drawable.ic_clore_22 "fact0rn" -> R.drawable.ic_fact0rn_22 "odyssey", "odyssey/test" -> R.drawable.ic_odyssey_chain_22 + "bitrock", "bitrock/test" -> R.drawable.ic_alert_24 // todo else -> R.drawable.ic_alert_24 } } \ No newline at end of file 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 4c31c8f08d..594efd38f4 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 @@ -293,6 +293,7 @@ private fun Blockchain.getSupportedTransactionExtras(): Network.TransactionExtra Blockchain.VanarChain, Blockchain.VanarChainTestnet, Blockchain.OdysseyChain, Blockchain.OdysseyChainTestnet, + Blockchain.Bitrock, Blockchain.BitrockTestnet, -> Network.TransactionExtrasType.NONE // endregion } 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 bfc8208097..ad0e992a73 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 @@ -979,6 +979,7 @@ internal class SwapInteractorImpl @AssistedInject constructor( VanarChain, VanarChainTestnet, OdysseyChain, OdysseyChainTestnet, + Bitrock, BitrockTestnet, -> Fee.Common(feeAmount) // endregion } diff --git a/gradle/dependencies.toml b/gradle/dependencies.toml index ca80ab43c0..8b1c1d4237 100644 --- a/gradle/dependencies.toml +++ b/gradle/dependencies.toml @@ -88,7 +88,7 @@ markdownComposeView = "0.5.4" # endregion Other libraries # region Tangem -tangemBlockchainSdk = "develop-900" +tangemBlockchainSdk = "develop-902" #tangemBlockchainSdk = "0.0.1" # Keep it! - used for local builds tangemCardSdk = "develop-421" #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 a111bdadbe..a0d9c16d6f 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 @@ -150,6 +150,8 @@ fun Blockchain.Companion.fromNetworkId(networkId: String): Blockchain? { "clore-ai" -> Blockchain.Clore "dione" -> Blockchain.OdysseyChain "dione/test" -> Blockchain.OdysseyChainTestnet + "bitrock" -> Blockchain.Bitrock + "bitrock/test" -> Blockchain.BitrockTestnet else -> null } } @@ -297,6 +299,8 @@ fun Blockchain.toNetworkId(): String { Blockchain.Clore -> "clore-ai" Blockchain.OdysseyChain -> "dione" Blockchain.OdysseyChainTestnet -> "dione/test" + Blockchain.Bitrock -> "bitrock" + Blockchain.BitrockTestnet -> "bitrock/test" } } @@ -393,6 +397,7 @@ fun Blockchain.toCoinId(): String { Blockchain.Canxium -> "canxium" Blockchain.Clore -> "clore-ai" Blockchain.OdysseyChain, Blockchain.OdysseyChainTestnet -> "dione" + Blockchain.Bitrock, Blockchain.BitrockTestnet -> "bitrock" } }