Updated on 2026-08-14

2024-12-18 15:13:35 +07:00 · 2024-12-18 15:13:35 +07:00 · ed589c8bfb
commit ed589c8bfb
parent 78c38ff089
11 changed files with 46 additions and 2 deletions
--- a/app/src/main/assets/tangem-app-config
+++ b/app/src/main/assets/tangem-app-config
@ -1 +1 @@
-Subproject commit f1aa2f2cbf374ecba5da753d9f51c9df81749ef2
+Subproject commit 1f1c301f4e0286cf6ab4cd8ee9323c85de3dfaab
--- 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
--- 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
--- 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"
    }
 ]
--- 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
    }
 }
--- a/core/ui/src/main/res/drawable/ic_fact0rn_22.xml
+++ b/core/ui/src/main/res/drawable/ic_fact0rn_22.xml
@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="22dp"
+    android:height="22dp"
+    android:viewportWidth="22"
+    android:viewportHeight="22">
+  <path
+      android:pathData="M11.573,4L11.591,9.381V14.813H11.146H10.701L10.726,9.412L10.752,4.01L11.174,4.003L11.573,4ZM9.691,9.412L9.666,4.01H9.271H8.876L8.85,9.412L8.825,14.813H9.271H9.717L9.691,9.412ZM3.889,15.807V14.411L4.308,14.633C5.114,15.059 6.309,14.861 6.919,14.2C7.477,13.597 7.7,12.428 7.43,11.52C7.174,10.66 6.32,10.034 5.403,10.034C4.852,10.034 4.325,10.182 4.062,10.412C3.904,10.549 3.889,10.543 3.889,10.348C3.889,10.16 3.834,10.134 3.444,10.134H3V13.602C3,15.509 3.03,17.1 3.066,17.136C3.102,17.173 3.302,17.203 3.51,17.203H3.889V15.807ZM13.985,11.801L14.011,8.789L16.035,11.799L18.059,14.807L18.53,14.81L19,14.813L18.974,11.104L18.944,7.331L18.539,7.342L18.112,7.334L18.086,10.383L18.059,13.431L16.023,10.413L13.987,7.396H13.555H13.122L13.096,11.104L13.07,14.813H13.514H13.958L13.985,11.801ZM4.556,13.86C3.936,13.521 3.674,12.232 4.086,11.551C4.631,10.65 5.943,10.598 6.5,11.455C6.914,12.092 6.768,13.21 6.205,13.709C5.909,13.97 5.78,14.016 5.342,14.013C5.059,14.01 4.705,13.942 4.556,13.86Z"
+      android:fillColor="#000000"
+      android:fillType="evenOdd"/>
+</vector>
--- a/core/ui/src/main/res/drawable/img_fact0rn_22.xml
+++ b/core/ui/src/main/res/drawable/img_fact0rn_22.xml
@ -0,0 +1,20 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="22dp"
+    android:height="22dp"
+    android:viewportWidth="22"
+    android:viewportHeight="22">
+  <group>
+    <clip-path
+        android:pathData="M11,0L11,0A11,11 0,0 1,22 11L22,11A11,11 0,0 1,11 22L11,22A11,11 0,0 1,0 11L0,11A11,11 0,0 1,11 0z"/>
+    <path
+        android:pathData="M11,0L11,0A11,11 0,0 1,22 11L22,11A11,11 0,0 1,11 22L11,22A11,11 0,0 1,0 11L0,11A11,11 0,0 1,11 0z"
+        android:fillColor="#ffffff"/>
+    <path
+        android:pathData="M0,0h22v22h-22z"
+        android:fillColor="#F8FBF8"/>
+    <path
+        android:pathData="M11.573,4L11.591,9.381V14.813H11.146H10.701L10.726,9.412L10.752,4.01L11.174,4.003L11.573,4ZM9.691,9.412L9.666,4.01H9.271H8.876L8.85,9.412L8.825,14.813H9.271H9.717L9.691,9.412ZM3.889,15.807V14.411L4.308,14.633C5.114,15.059 6.309,14.861 6.919,14.2C7.477,13.597 7.7,12.428 7.43,11.52C7.174,10.66 6.32,10.034 5.403,10.034C4.852,10.034 4.325,10.182 4.062,10.412C3.904,10.549 3.889,10.543 3.889,10.348C3.889,10.16 3.834,10.134 3.444,10.134H3V13.602C3,15.509 3.03,17.1 3.066,17.136C3.102,17.173 3.302,17.203 3.51,17.203H3.889V15.807ZM13.985,11.801L14.011,8.789L16.035,11.799L18.059,14.807L18.53,14.81L19,14.813L18.974,11.104L18.944,7.331L18.539,7.342L18.112,7.334L18.086,10.383L18.059,13.431L16.023,10.413L13.987,7.396H13.555H13.122L13.096,11.104L13.07,14.813H13.514H13.958L13.985,11.801ZM4.556,13.86C3.936,13.521 3.674,12.232 4.086,11.551C4.631,10.65 5.943,10.598 6.5,11.455C6.914,12.092 6.768,13.21 6.205,13.709C5.909,13.97 5.78,14.016 5.342,14.013C5.059,14.01 4.705,13.942 4.556,13.86Z"
+        android:fillColor="#0C090A"
+        android:fillType="evenOdd"/>
+  </group>
+</vector>
--- 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,
--- 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,
--- 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 ^
--- 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"