diff --git a/app/src/main/java/com/tangem/tap/common/extensions/String.kt b/app/src/main/java/com/tangem/tap/common/extensions/String.kt deleted file mode 100644 index 0396cf84fc..0000000000 --- a/app/src/main/java/com/tangem/tap/common/extensions/String.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.tangem.tap.common.extensions - -fun String.removePrefixOrNull(prefix: String): String? = when { - startsWith(prefix) -> substring(prefix.length) - else -> null -} \ No newline at end of file diff --git a/app/src/main/java/com/tangem/tap/domain/tasks/visa/TangemPaySignWithdrawalHashTask.kt b/app/src/main/java/com/tangem/tap/domain/tasks/visa/TangemPaySignWithdrawalHashTask.kt index faf32983a0..d5bc3b64c1 100644 --- a/app/src/main/java/com/tangem/tap/domain/tasks/visa/TangemPaySignWithdrawalHashTask.kt +++ b/app/src/main/java/com/tangem/tap/domain/tasks/visa/TangemPaySignWithdrawalHashTask.kt @@ -15,7 +15,6 @@ import com.tangem.crypto.hdWallet.DerivationPath import com.tangem.crypto.hdWallet.bip32.ExtendedPublicKey import com.tangem.domain.card.common.visa.VisaUtilities import com.tangem.domain.visa.error.VisaActivationError -import com.tangem.operations.ScanTask import com.tangem.operations.derivation.DeriveWalletPublicKeyTask import com.tangem.operations.sign.SignHashCommand @@ -92,25 +91,7 @@ class TangemPaySignWithdrawalHashTask( ?: targetWalletPublicKey.toDecompressedPublicKey(), ).asRSVLegacyEVM().toHexString().lowercase() - scanCard( - session = session, - callback = callback, - signedData = rsvSignature, - ) - } - is CompletionResult.Failure -> { - callback(CompletionResult.Failure(result.error)) - } - } - } - } - - private fun scanCard(signedData: String, session: CardSession, callback: CompletionCallback) { - val scanTask = ScanTask() - scanTask.run(session) { result -> - when (result) { - is CompletionResult.Success -> { - callback(CompletionResult.Success(signedData)) + callback(CompletionResult.Success(rsvSignature)) } is CompletionResult.Failure -> { callback(CompletionResult.Failure(result.error)) diff --git a/core/utils/src/main/java/com/tangem/utils/extensions/StringExt.kt b/core/utils/src/main/java/com/tangem/utils/extensions/StringExt.kt index bba0975985..fd6c6e5846 100644 --- a/core/utils/src/main/java/com/tangem/utils/extensions/StringExt.kt +++ b/core/utils/src/main/java/com/tangem/utils/extensions/StringExt.kt @@ -9,4 +9,8 @@ fun String.uriValidate(): Boolean { val regex = DEEPLINK_VALIDATION_REGEX.toRegex() return !regex.containsMatchIn(this) +} + +fun String.addHexPrefix(): String { + return if (this.startsWith("0x")) this else "0x$this" } \ No newline at end of file diff --git a/data/visa/src/main/kotlin/com/tangem/data/pay/repository/DefaultTangemPaySwapRepository.kt b/data/visa/src/main/kotlin/com/tangem/data/pay/repository/DefaultTangemPaySwapRepository.kt index d1d72250d3..042686b6e7 100644 --- a/data/visa/src/main/kotlin/com/tangem/data/pay/repository/DefaultTangemPaySwapRepository.kt +++ b/data/visa/src/main/kotlin/com/tangem/data/pay/repository/DefaultTangemPaySwapRepository.kt @@ -18,6 +18,7 @@ import com.tangem.domain.pay.repository.TangemPaySwapRepository import com.tangem.domain.visa.error.VisaApiError import com.tangem.domain.wallets.legacy.UserWalletsListManager import com.tangem.features.hotwallet.HotWalletFeatureToggles +import com.tangem.utils.extensions.addHexPrefix import java.math.BigDecimal import java.math.RoundingMode import java.util.Currency @@ -66,7 +67,7 @@ internal class DefaultTangemPaySwapRepository @Inject constructor( recipientAddress = receiverAddress, adminSalt = result.salt, senderAddress = result.senderAddress, - adminSignature = signatureResult.signature, + adminSignature = signatureResult.signature.addHexPrefix(), ) tangemPayApi.withdraw(authHeader = authHeader, body = request) }