Updated on 2026-08-14

This commit is contained in:
Tangem 2026-01-18 14:31:04 +03:00
parent 96784ebd43
commit 2cfd260e31
3 changed files with 8 additions and 7 deletions

View file

@ -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()
}
}
}

View file

@ -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,
)
}

View file

@ -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 ^