diff --git a/app/src/main/assets/tangem-app-config b/app/src/main/assets/tangem-app-config index 72d9d4b3c3..6f955d192f 160000 --- a/app/src/main/assets/tangem-app-config +++ b/app/src/main/assets/tangem-app-config @@ -1 +1 @@ -Subproject commit 72d9d4b3c3f8e6604078798c4b5567327ed9b48a +Subproject commit 6f955d192f7edd876b9f096a30431adeb1594aeb 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 4b83df8a90..c177292cea 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 @@ -150,5 +150,6 @@ internal val Blockchain.mercuryoNetwork: String? Blockchain.OdysseyChain, Blockchain.OdysseyChainTestnet -> null Blockchain.Bitrock, Blockchain.BitrockTestnet -> null Blockchain.Sonic, Blockchain.SonicTestnet -> null + Blockchain.ApeChain, Blockchain.ApeChainTestnet -> 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 61e8b77c1d..a3d9000b47 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 @@ -151,4 +151,5 @@ internal val Blockchain.moonPaySupportedCurrency: MoonPaySupportedCurrency? OdysseyChain, OdysseyChainTestnet -> null Bitrock, BitrockTestnet -> null Sonic, SonicTestnet -> null + ApeChain, ApeChainTestnet -> 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 59ed64b374..ad3ae9c4f6 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 @@ -30,5 +30,9 @@ { "name": "sonic", "version": "undefined" + }, + { + "name": "apechain", + "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 4baa930718..286a622caf 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 @@ -88,6 +88,7 @@ fun getActiveIconRes(blockchainId: String): Int { "odyssey", "odyssey/test" -> R.drawable.img_odyssey_chain_22 "bitrock", "bitrock/test" -> R.drawable.img_bitrock_22 "sonic", "sonic/test" -> R.drawable.ic_alert_24 // todo Sonic [REDACTED_TASK_KEY] + "apechain", "apechain/test" -> R.drawable.ic_alert_24 // todo ApeChain [REDACTED_TASK_KEY] else -> R.drawable.ic_alert_24 } } @@ -174,6 +175,7 @@ fun getActiveIconResByCoinId(coinId: String): Int { "odyssey", "odyssey/test" -> R.drawable.img_odyssey_chain_22 "bitrock", "bitrock/test" -> R.drawable.img_bitrock_22 "sonic", "sonic/test" -> R.drawable.ic_alert_24 // todo Sonic [REDACTED_TASK_KEY] + "apechain", "apechain/test" -> R.drawable.ic_alert_24 // todo ApeChain [REDACTED_TASK_KEY] else -> R.drawable.ic_alert_24 } } @@ -263,6 +265,7 @@ fun getGreyedOutIconRes(blockchainId: String): Int { "odyssey", "odyssey/test" -> R.drawable.ic_odyssey_chain_22 "bitrock", "bitrock/test" -> R.drawable.ic_bitrock_22 "sonic", "sonic/test" -> R.drawable.ic_alert_24 // todo Sonic [REDACTED_TASK_KEY] + "apechain", "apechain/test" -> R.drawable.ic_alert_24 // todo ApeChain [REDACTED_TASK_KEY] 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 5d8050b524..09a0186bf9 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 @@ -295,6 +295,7 @@ private fun Blockchain.getSupportedTransactionExtras(): Network.TransactionExtra Blockchain.OdysseyChain, Blockchain.OdysseyChainTestnet, Blockchain.Bitrock, Blockchain.BitrockTestnet, Blockchain.Sonic, Blockchain.SonicTestnet, + Blockchain.ApeChain, Blockchain.ApeChainTestnet, -> Network.TransactionExtrasType.NONE // endregion } diff --git a/domain/legacy/src/main/java/com/tangem/domain/common/configs/Wallet2CardConfig.kt b/domain/legacy/src/main/java/com/tangem/domain/common/configs/Wallet2CardConfig.kt index 5522fcda36..6da98d7aa9 100644 --- a/domain/legacy/src/main/java/com/tangem/domain/common/configs/Wallet2CardConfig.kt +++ b/domain/legacy/src/main/java/com/tangem/domain/common/configs/Wallet2CardConfig.kt @@ -196,6 +196,8 @@ data object Wallet2CardConfig : CardConfig { Blockchain.BitrockTestnet -> EllipticCurve.Secp256k1 Blockchain.Sonic -> EllipticCurve.Secp256k1 Blockchain.SonicTestnet -> EllipticCurve.Secp256k1 + Blockchain.ApeChain -> EllipticCurve.Secp256k1 + Blockchain.ApeChainTestnet -> EllipticCurve.Secp256k1 } } } \ No newline at end of file diff --git a/domain/legacy/src/test/java/com/tangem/domain/common/configs/Wallet2CardConfigTest.kt b/domain/legacy/src/test/java/com/tangem/domain/common/configs/Wallet2CardConfigTest.kt index f558fb0f9b..dc94df361a 100644 --- a/domain/legacy/src/test/java/com/tangem/domain/common/configs/Wallet2CardConfigTest.kt +++ b/domain/legacy/src/test/java/com/tangem/domain/common/configs/Wallet2CardConfigTest.kt @@ -153,6 +153,8 @@ class Wallet2CardConfigTest { Blockchain.BitrockTestnet to EllipticCurve.Secp256k1, Blockchain.Sonic to EllipticCurve.Secp256k1, Blockchain.SonicTestnet to EllipticCurve.Secp256k1, + Blockchain.ApeChain to EllipticCurve.Secp256k1, + Blockchain.ApeChainTestnet to EllipticCurve.Secp256k1, ) @Test 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 2b2b01a125..5d80f1ffdc 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 @@ -981,6 +981,7 @@ internal class SwapInteractorImpl @AssistedInject constructor( OdysseyChain, OdysseyChainTestnet, Bitrock, BitrockTestnet, Sonic, SonicTestnet, + ApeChain, ApeChainTestnet, -> Fee.Common(feeAmount) // endregion } diff --git a/gradle/dependencies.toml b/gradle/dependencies.toml index f78d65d4a1..baaa74a4d5 100644 --- a/gradle/dependencies.toml +++ b/gradle/dependencies.toml @@ -88,7 +88,7 @@ markdownComposeView = "0.5.4" # endregion Other libraries # region Tangem -tangemBlockchainSdk = "develop-911" +tangemBlockchainSdk = "develop-913" #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 fcadee5fda..e3e4cb47b3 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 @@ -154,6 +154,8 @@ fun Blockchain.Companion.fromNetworkId(networkId: String): Blockchain? { "bitrock/test" -> Blockchain.BitrockTestnet "sonic" -> Blockchain.Sonic "sonic/test" -> Blockchain.SonicTestnet + "apechain" -> Blockchain.ApeChain + "apechain/test" -> Blockchain.ApeChainTestnet else -> null } } @@ -305,6 +307,8 @@ fun Blockchain.toNetworkId(): String { Blockchain.BitrockTestnet -> "bitrock/test" Blockchain.Sonic -> "sonic" Blockchain.SonicTestnet -> "sonic/test" + Blockchain.ApeChain -> "apechain" + Blockchain.ApeChainTestnet -> "apechain/test" } } @@ -403,6 +407,7 @@ fun Blockchain.toCoinId(): String { Blockchain.OdysseyChain, Blockchain.OdysseyChainTestnet -> "dione" Blockchain.Bitrock, Blockchain.BitrockTestnet -> "bitrock" Blockchain.Sonic, Blockchain.SonicTestnet -> "sonic-3" + Blockchain.ApeChain, Blockchain.ApeChainTestnet -> "apecoin" } }