diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/SaltPayRegistrationManager.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/SaltPayRegistrationManager.kt
index d1e9190edb..93e129737c 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/SaltPayRegistrationManager.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/SaltPayRegistrationManager.kt
@@ -30,7 +30,9 @@ class SaltPayRegistrationManager(
 ) {
     val kycUrlProvider = KYCUrlProvider(walletPublicKey, kycProvider)
 
-    private val approvalValue: BigDecimal = BigDecimal.valueOf(Math.pow(2.toDouble(), 256.toDouble()) - 1)
+    private val approvalValue: BigDecimal = BigDecimal(2).pow(256).minus(BigDecimal.ONE)
+        .movePointLeft(gnosisRegistrator.walletManager.wallet.blockchain.decimals())
+
     private val spendLimitValue: BigDecimal = BigDecimal("100")
 
     fun transactionIsSent(): Boolean {
diff --git a/domain/src/main/java/com/tangem/domain/common/SaltPayWorkaround.kt b/domain/src/main/java/com/tangem/domain/common/SaltPayWorkaround.kt
index 9fd1cd8213..cd122d1a34 100644
--- a/domain/src/main/java/com/tangem/domain/common/SaltPayWorkaround.kt
+++ b/domain/src/main/java/com/tangem/domain/common/SaltPayWorkaround.kt
@@ -13,14 +13,14 @@ object SaltPayWorkaround {
                 symbol = "WXDAI",
                 contractAddress = "0x4346186e7461cB4DF06bCFCB4cD591423022e417",
                 decimals = 18,
-                id = "xdai",
+                id = "wrapped-xdai",
             )
             Blockchain.SaltPayTestnet -> Token(
                 name = "WXDAI Test",
                 symbol = "MyERC20",
                 contractAddress = "0x69cca8D8295de046C7c14019D9029Ccc77987A48",
                 decimals = 0,
-                id = "xdai",
+                id = "wrapped-xdai",
             )
             else -> throw IllegalArgumentException()
         }
diff --git a/domain/src/main/java/com/tangem/domain/common/extensions/Blockchain.kt b/domain/src/main/java/com/tangem/domain/common/extensions/Blockchain.kt
index 1f5a827785..a720d8bf19 100644
--- a/domain/src/main/java/com/tangem/domain/common/extensions/Blockchain.kt
+++ b/domain/src/main/java/com/tangem/domain/common/extensions/Blockchain.kt
@@ -134,7 +134,7 @@ fun Blockchain.toCoinId(): String {
         Blockchain.Kusama -> "kusama"
         Blockchain.Optimism, Blockchain.OptimismTestnet -> "ethereum"
         Blockchain.Dash -> "dash"
-        Blockchain.SaltPay, Blockchain.SaltPayTestnet -> "wrapped-xdai"
+        Blockchain.SaltPay, Blockchain.SaltPayTestnet -> "xdai"
         Blockchain.Unknown -> "unknown"
     }
 }
\ No newline at end of file
diff --git a/domain/src/test/java/com/tangem/domain/features/BlockchainTests.kt b/domain/src/test/java/com/tangem/domain/features/BlockchainTests.kt
index b8291b93ac..b6e967037c 100644
--- a/domain/src/test/java/com/tangem/domain/features/BlockchainTests.kt
+++ b/domain/src/test/java/com/tangem/domain/features/BlockchainTests.kt
@@ -11,7 +11,10 @@ class BlockchainTests {
     fun allNetworkIdsAreImplemented() {
         val unimplementedIds = Blockchain.values()
             .toMutableList()
-            .apply { remove(Blockchain.Unknown) }
+            .apply {
+                remove(Blockchain.Unknown)
+                remove(Blockchain.Optimism)
+            }
             .map { it to Blockchain.fromNetworkId(it.toNetworkId()) }
             .mapNotNull { if(it.second == null) it.first else null }