From 2cfd260e318b6e0568ee5a2933118a7a81e6cd04 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Sun, 18 Jan 2026 14:31:04 +0300
Subject: [PATCH] Updated on 2026-08-14

---
 .../gasless/CreateAndSendGaslessTransactionUseCase.kt  | 10 +++++-----
 .../confirm/model/SendWithSwapConfirmModel.kt          |  3 ++-
 gradle/tangem_dependencies.toml                        |  2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/domain/transaction/src/main/java/com/tangem/domain/transaction/usecase/gasless/CreateAndSendGaslessTransactionUseCase.kt b/domain/transaction/src/main/java/com/tangem/domain/transaction/usecase/gasless/CreateAndSendGaslessTransactionUseCase.kt
index 27cbc7cd31..853e9b55e2 100644
--- a/domain/transaction/src/main/java/com/tangem/domain/transaction/usecase/gasless/CreateAndSendGaslessTransactionUseCase.kt
+++ b/domain/transaction/src/main/java/com/tangem/domain/transaction/usecase/gasless/CreateAndSendGaslessTransactionUseCase.kt
@@ -11,7 +11,7 @@ import com.tangem.blockchain.common.*
 import com.tangem.blockchain.common.transaction.Fee
 import com.tangem.blockchain.extensions.Result
 import com.tangem.blockchain.extensions.formatHex
-import com.tangem.blockchain.extensions.removeLeadingZero
+import com.tangem.blockchain.extensions.normalizeByteArray
 import com.tangem.blockchain.yieldsupply.providers.ethereum.yield.EthereumYieldSupplySendCallData
 import com.tangem.common.CompletionResult
 import com.tangem.common.extensions.toDecompressedPublicKey
@@ -172,8 +172,8 @@ class CreateAndSendGaslessTransactionUseCase(
             address = eip7702Data.executorAddress,
             nonce = eip7702Data.nonce,
             yParity = extendedEip7702Data.recId,
-            r = extendedEip7702Data.r.toFormattedHex(),
-            s = extendedEip7702Data.s.toFormattedHex(),
+            r = extendedEip7702Data.r.toFormattedHex(bytes = 32),
+            s = extendedEip7702Data.s.toFormattedHex(bytes = 32),
         )
 
         return SignedGaslessData(
@@ -361,8 +361,8 @@ class CreateAndSendGaslessTransactionUseCase(
     }
 
     private companion object {
-        fun BigInteger.toFormattedHex(): String {
-            return toByteArray().removeLeadingZero().toHexString().formatHex()
+        fun BigInteger.toFormattedHex(bytes: Int): String {
+            return toByteArray().normalizeByteArray(bytes).toHexString().formatHex()
         }
     }
 }
\ No newline at end of file
diff --git a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/confirm/model/SendWithSwapConfirmModel.kt b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/confirm/model/SendWithSwapConfirmModel.kt
index 6ad374ecef..47225aeb2e 100644
--- a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/confirm/model/SendWithSwapConfirmModel.kt
+++ b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/confirm/model/SendWithSwapConfirmModel.kt
@@ -426,9 +426,10 @@ internal class SendWithSwapConfirmModel @Inject constructor(
             val hasError = hasSendError || hasSwapError
             uiState.update { state ->
                 val feeUM = state.feeSelectorUM as? FeeSelectorUM.Content
+                val isTransactionInProcess = (state.confirmUM as? ConfirmUM.Content)?.isTransactionInProcess == true
                 state.copy(
                     confirmUM = (state.confirmUM as? ConfirmUM.Content)?.copy(
-                        isPrimaryButtonEnabled = !hasError && feeUM != null,
+                        isPrimaryButtonEnabled = !hasError && feeUM != null && !isTransactionInProcess,
                     ) ?: state.confirmUM,
                 )
             }
diff --git a/gradle/tangem_dependencies.toml b/gradle/tangem_dependencies.toml
index eef0c9e1fc..be628ea2c1 100644
--- a/gradle/tangem_dependencies.toml
+++ b/gradle/tangem_dependencies.toml
@@ -5,7 +5,7 @@
 # https://github.com/tangem/tangem-sdk-android/
 # https://github.com/tangem/vico
 
-tangemBlockchainSdk = "develop-1370"
+tangemBlockchainSdk = "develop-1371"
 #tangemBlockchainSdk = "0.0.1" # Keep it! - used for local builds
 tangemCardSdk = "develop-573"
 #tangemCardSdk = "0.0.1" # Keep it! - used for local builds ^