diff --git a/app/src/main/assets/tangem-app-config b/app/src/main/assets/tangem-app-config index f1aa2f2cbf..1f1c301f4e 160000 --- a/app/src/main/assets/tangem-app-config +++ b/app/src/main/assets/tangem-app-config @@ -1 +1 @@ -Subproject commit f1aa2f2cbf374ecba5da753d9f51c9df81749ef2 +Subproject commit 1f1c301f4e0286cf6ab4cd8ee9323c85de3dfaab 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 5ee9a4ce7f..05bb11bac9 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 @@ -109,6 +109,7 @@ internal val Blockchain.mercuryoNetwork: String? Blockchain.PolygonZkEVM -> null Blockchain.PolygonZkEVMTestnet -> null Blockchain.Radiant -> null + Blockchain.Fact0rn -> null Blockchain.BaseTestnet -> null Blockchain.Moonriver -> null Blockchain.MoonriverTestnet -> null 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 a4de7a4df9..3db6ea0496 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 @@ -114,6 +114,7 @@ internal val Blockchain.moonPaySupportedCurrency: MoonPaySupportedCurrency? PolygonZkEVM -> null PolygonZkEVMTestnet -> null Radiant -> null + Fact0rn -> null BaseTestnet -> null Moonriver -> null MoonriverTestnet -> null 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 8d520b49a3..bb3b50f661 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 @@ -10,5 +10,9 @@ { "name": "clore-ai", "version": "undefined" + }, + { + "name": "fact0rn", + "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 0ec7a47466..d3d5ab0171 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 @@ -84,6 +84,7 @@ fun getActiveIconRes(blockchainId: String): Int { "canxium" -> R.drawable.img_canxium_22 "chiliz", "chiliz/test" -> R.drawable.img_chiliz_22 "clore-ai" -> R.drawable.img_clore_22 + "fact0rn" -> R.drawable.img_fact0rn_22 else -> R.drawable.ic_alert_24 } } @@ -166,6 +167,7 @@ fun getActiveIconResByCoinId(coinId: String): Int { "canxium" -> R.drawable.img_canxium_22 "chiliz", "chiliz/test" -> R.drawable.img_chiliz_22 "clore-ai" -> R.drawable.img_clore_22 + "fact0rn" -> R.drawable.img_fact0rn_22 else -> R.drawable.ic_alert_24 } } @@ -251,6 +253,7 @@ fun getGreyedOutIconRes(blockchainId: String): Int { "canxium" -> R.drawable.ic_canxium_22 "chiliz", "chiliz/test" -> R.drawable.ic_chiliz_22 "clore-ai" -> R.drawable.ic_clore_22 + "fact0rn" -> R.drawable.ic_fact0rn_22 else -> R.drawable.ic_alert_24 } } \ No newline at end of file diff --git a/core/ui/src/main/res/drawable/ic_fact0rn_22.xml b/core/ui/src/main/res/drawable/ic_fact0rn_22.xml new file mode 100644 index 0000000000..2c71132ba0 --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_fact0rn_22.xml @@ -0,0 +1,10 @@ + + + diff --git a/core/ui/src/main/res/drawable/img_fact0rn_22.xml b/core/ui/src/main/res/drawable/img_fact0rn_22.xml new file mode 100644 index 0000000000..db98cf00a7 --- /dev/null +++ b/core/ui/src/main/res/drawable/img_fact0rn_22.xml @@ -0,0 +1,20 @@ + + + + + + + + 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 4b02448af9..4da35da6b2 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 @@ -257,6 +257,7 @@ private fun Blockchain.getSupportedTransactionExtras(): Network.TransactionExtra Blockchain.PolygonZkEVM, Blockchain.PolygonZkEVMTestnet, Blockchain.Radiant, + Blockchain.Fact0rn, Blockchain.Base, Blockchain.BaseTestnet, Blockchain.Moonriver, 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 270b21d6bb..05beccce4e 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 @@ -900,6 +900,7 @@ internal class SwapInteractorImpl @AssistedInject constructor( PolygonZkEVM, PolygonZkEVMTestnet, Radiant, + Fact0rn, Base, BaseTestnet, Moonriver, diff --git a/gradle/dependencies.toml b/gradle/dependencies.toml index 02b79ae077..25d823c341 100644 --- a/gradle/dependencies.toml +++ b/gradle/dependencies.toml @@ -88,7 +88,7 @@ markdownComposeView = "0.5.4" # endregion Other libraries # region Tangem -tangemBlockchainSdk = "develop-884" +tangemBlockchainSdk = "develop-886" #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 952be8affd..fdc570b1fc 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 @@ -106,6 +106,7 @@ fun Blockchain.Companion.fromNetworkId(networkId: String): Blockchain? { "nexa" -> Blockchain.Nexa // FIXME "nexa/test" -> Blockchain.NexaTestnet // FIXME "radiant" -> Blockchain.Radiant + "fact0rn" -> Blockchain.Fact0rn "moonriver" -> Blockchain.Moonriver "moonriver/test" -> Blockchain.MoonriverTestnet "mantle" -> Blockchain.Mantle @@ -250,6 +251,7 @@ fun Blockchain.toNetworkId(): String { Blockchain.Nexa -> "nexa" // FIXME Blockchain.NexaTestnet -> "nexa/test" // FIXME Blockchain.Radiant -> "radiant" + Blockchain.Fact0rn -> "fact0rn" Blockchain.Moonriver -> "moonriver" Blockchain.MoonriverTestnet -> "moonriver/test" Blockchain.Mantle -> "mantle" @@ -358,6 +360,7 @@ fun Blockchain.toCoinId(): String { Blockchain.PolygonZkEVM, Blockchain.PolygonZkEVMTestnet -> "polygon-zkevm-ethereum" Blockchain.Nexa, Blockchain.NexaTestnet -> "nexa" // FIXME Blockchain.Radiant -> "radiant" + Blockchain.Fact0rn -> "fact0rn" Blockchain.Moonriver, Blockchain.MoonriverTestnet -> "moonriver" Blockchain.Mantle, Blockchain.MantleTestnet -> "mantle" Blockchain.Flare, Blockchain.FlareTestnet -> "flare-networks"