Updated on 2026-08-14

features/swap/data/src/main/java/com/tangem/feature/swap/DefaultSwapRepository.kt

@@ -344,47 +344,6 @@ internal class DefaultSwapRepository(
         )
     }
 
-    override suspend fun getApproveData(
-        userWalletId: UserWalletId,
-        networkId: String,
-        derivationPath: String?,
-        currency: CryptoCurrency,
-        amount: BigDecimal?,
-        spenderAddress: String,
-    ): String {
-        val blockchain =
-            requireNotNull(Blockchain.fromNetworkId(networkId)) { "blockchain not found" }
-        val walletManager = walletManagersFacade.getOrCreateWalletManager(
-            userWalletId = userWalletId,
-            blockchain = blockchain,
-            derivationPath = derivationPath,
-        )
-
-        return (walletManager as? Approver)?.getApproveData(
-            spenderAddress,
-            amount?.let { convertToAmount(it, currency) },
-        ) ?: error("Cannot cast to Approver")
-    }
-
-    private fun convertToAmount(amount: BigDecimal, currency: CryptoCurrency): Amount {
-        return Amount(
-            currencySymbol = currency.symbol,
-            value = amount,
-            decimals = currency.decimals,
-            type = if (currency is CryptoCurrency.Token) {
-                AmountType.Token(
-                    Token(
-                        symbol = currency.symbol,
-                        contractAddress = currency.contractAddress,
-                        decimals = currency.decimals,
-                    ),
-                )
-            } else {
-                AmountType.Coin
-            },
-        )
-    }
-
     override fun getNativeTokenForNetwork(networkId: String): CryptoCurrency {
         val blockchain = requireNotNull(Blockchain.fromNetworkId(networkId)) { "blockchain not found" }
 

features/swap/domain/api/src/main/java/com/tangem/feature/swap/domain/api/SwapRepository.kt

@@ -41,17 +41,6 @@ interface SwapRepository {
         spenderAddress: String,
     ): BigDecimal
 
-    @Suppress("LongParameterList")
-    @Throws(IllegalStateException::class)
-    suspend fun getApproveData(
-        userWalletId: UserWalletId,
-        networkId: String,
-        derivationPath: String?,
-        currency: CryptoCurrency,
-        amount: BigDecimal?,
-        spenderAddress: String,
-    ): String
-
     @Suppress("LongParameterList")
     suspend fun getExchangeData(
         fromContractAddress: String,

features/swap/domain/models/src/main/java/com/tangem/feature/swap/domain/models/ui/SwapState.kt

@@ -82,7 +82,6 @@ data class TokenSwapInfo(
 
 data class RequestApproveStateData(
     val fee: TxFeeState,
-    val approveData: String,
     val fromTokenAmount: SwapAmount,
     val spenderAddress: String,
 )

features/swap/domain/src/main/java/com/tangem/feature/swap/domain/SwapInteractorImpl.kt

@@ -7,10 +7,14 @@ import com.tangem.blockchain.common.AmountType
 import com.tangem.blockchain.common.Blockchain
 import com.tangem.blockchain.common.Blockchain.*
 import com.tangem.blockchain.common.TransactionExtras
+import com.tangem.blockchain.common.smartcontract.CompiledSmartContractCallData
+import com.tangem.blockchain.common.smartcontract.SmartContractCallDataProviderFactory
 import com.tangem.blockchain.common.transaction.Fee
 import com.tangem.blockchain.common.transaction.TransactionFee
 import com.tangem.blockchainsdk.utils.fromNetworkId
-import com.tangem.core.ui.utils.BigDecimalFormatter
+import com.tangem.common.extensions.hexToBytes
+import com.tangem.core.ui.format.bigdecimal.fiat
+import com.tangem.core.ui.format.bigdecimal.format
 import com.tangem.domain.appcurrency.GetSelectedAppCurrencyUseCase
 import com.tangem.domain.appcurrency.extenstions.unwrap
 import com.tangem.domain.appcurrency.repository.AppCurrencyRepository
@@ -25,7 +29,6 @@ import com.tangem.domain.tokens.repository.CurrenciesRepository
 import com.tangem.domain.tokens.repository.CurrencyChecksRepository
 import com.tangem.domain.tokens.repository.QuotesRepository
 import com.tangem.domain.transaction.error.GetFeeError
-import com.tangem.domain.transaction.models.TransactionType
 import com.tangem.domain.transaction.usecase.*
 import com.tangem.domain.utils.convertToSdkAmount
 import com.tangem.domain.wallets.models.UserWallet
@@ -61,7 +64,9 @@ internal class SwapInteractorImpl @AssistedInject constructor(
     private val getMultiCryptoCurrencyStatusUseCase: GetCryptoCurrencyStatusesSyncUseCase,
     private val sendTransactionUseCase: SendTransactionUseCase,
     private val createTransactionUseCase: CreateTransactionUseCase,
+    private val createTransferTransactionUseCase: CreateTransferTransactionUseCase,
     private val createTransactionExtrasUseCase: CreateTransactionDataExtrasUseCase,
+    private val createApprovalTransactionUseCase: CreateApprovalTransactionUseCase,
     private val isDemoCardUseCase: IsDemoCardUseCase,
     private val quotesRepository: QuotesRepository,
     private val quotesRepositoryV2: QuotesRepositoryV2,
@@ -202,32 +207,20 @@ internal class SwapInteractorImpl @AssistedInject constructor(
         networkId: String,
         permissionOptions: PermissionOptions,
     ): SwapTransactionState {
-        val derivationPath = permissionOptions.fromToken.network.derivationPath.value
-        val dataToSign = if (permissionOptions.approveType == SwapApproveType.UNLIMITED) {
-            getApproveData(
-                networkId = networkId,
-                derivationPath = derivationPath,
-                fromToken = permissionOptions.fromToken,
-                spenderAddress = permissionOptions.spenderAddress,
-            )
-        } else {
-            permissionOptions.approveData.approveData
+        val amount = permissionOptions.approveData.fromTokenAmount.takeIf {
+            permissionOptions.approveType == SwapApproveType.LIMITED
         }
-        val approveTransaction = createTransactionUseCase(
-            amount = BigDecimal.ZERO.convertToSdkAmount(permissionOptions.fromToken),
+
+        val approveTransaction = createApprovalTransactionUseCase(
             fee = getFeeForTransaction(
                 fee = permissionOptions.txFee,
                 blockchain = Blockchain.fromId(permissionOptions.fromToken.network.id.value),
             ),
-            memo = null,
-            destination = getTokenAddress(permissionOptions.fromToken),
-            network = permissionOptions.fromToken.network,
             userWalletId = userWalletId,
-            txExtras = createDexTxExtras(
-                dataToSign,
-                permissionOptions.fromToken.network,
-                permissionOptions.txFee.gasLimit,
-            ),
+            cryptoCurrency = permissionOptions.fromToken as CryptoCurrency.Token,
+            amount = amount?.value,
+            contractAddress = permissionOptions.forTokenContractAddress,
+            spenderAddress = permissionOptions.spenderAddress,
         ).getOrElse {
             Timber.e(it, "Failed to create approveTransaction")
             return SwapTransactionState.Error.UnknownError
@@ -613,7 +606,6 @@ internal class SwapInteractorImpl @AssistedInject constructor(
             userWalletId = userWalletId,
             network = currencyToSendStatus.currency.network,
             txExtras = createDexTxExtras(dataToSign, currencyToSendStatus.currency.network, fee.gasLimit),
-            hash = dataToSign,
         ).getOrElse {
             Timber.e(it, "Failed to create swap dex tx data")
             return SwapTransactionState.Error.UnknownError
@@ -669,7 +661,6 @@ internal class SwapInteractorImpl @AssistedInject constructor(
         return createTransactionExtrasUseCase(
             data = data,
             network = network,
-            transactionType = TransactionType.APPROVE,
             gasLimit = gasLimit?.toBigInteger(),
         ).getOrNull() ?: error("failed to create extras")
     }
@@ -705,7 +696,7 @@ internal class SwapInteractorImpl @AssistedInject constructor(
 
         if (isDemoCardUseCase(cardId)) return SwapTransactionState.Error.UnknownError
 
-        val txData = createTransactionUseCase(
+        val txData = createTransferTransactionUseCase(
             amount = amount.value.convertToSdkAmount(currencyToSend.currency),
             fee = getFeeForTransaction(
                 fee = txFee,
@@ -1087,11 +1078,12 @@ internal class SwapInteractorImpl @AssistedInject constructor(
     private suspend fun createEmptyAmountState(): SwapState {
         val appCurrency = getSelectedAppCurrencyUseCase.unwrap()
         return SwapState.EmptyAmountState(
-            zeroAmountEquivalent = BigDecimalFormatter.formatFiatAmount(
-                fiatAmount = BigDecimal.ZERO,
-                fiatCurrencyCode = appCurrency.code,
-                fiatCurrencySymbol = appCurrency.symbol,
-            ),
+            zeroAmountEquivalent = BigDecimal.ZERO.format {
+                fiat(
+                    fiatCurrencyCode = appCurrency.code,
+                    fiatCurrencySymbol = appCurrency.symbol,
+                )
+            },
         )
     }
 
@@ -1373,11 +1365,12 @@ internal class SwapInteractorImpl @AssistedInject constructor(
         val rates = getQuotes(feeCurrencyId)
         return rates[feeCurrencyId]?.fiatRate?.let { rate ->
             fees.map { fee ->
-                BigDecimalFormatter.formatFiatAmount(
-                    fiatAmount = rate.multiply(fee),
-                    fiatCurrencyCode = appCurrency.code,
-                    fiatCurrencySymbol = appCurrency.symbol,
-                )
+                rate.multiply(fee).format {
+                    fiat(
+                        fiatCurrencyCode = appCurrency.code,
+                        fiatCurrencySymbol = appCurrency.symbol,
+                    )
+                }
             }
         }.orEmpty()
     }
@@ -1513,7 +1506,7 @@ internal class SwapInteractorImpl @AssistedInject constructor(
                 currencyToSend = swapCurrencyConverter.convert(fromToken),
                 destinationAddress = transaction.txTo,
                 increaseBy = INCREASE_GAS_LIMIT_BY,
-                data = transaction.txData,
+                callData = CompiledSmartContractCallData(transaction.txData.hexToBytes()),
                 derivationPath = fromToken.network.derivationPath.value,
             )
         } catch (e: IllegalStateException) {
@@ -1617,12 +1610,10 @@ internal class SwapInteractorImpl @AssistedInject constructor(
         }
         val derivationPath = fromToken.network.derivationPath.value
         // setting up amount for approve with given amount for swap [SwapApproveType.Limited]
-        val transactionData = getApproveData(
-            networkId = networkId,
-            derivationPath = derivationPath,
-            fromToken = fromToken,
-            swapAmount = swapAmount,
+        val callData = SmartContractCallDataProviderFactory.getApprovalCallData(
             spenderAddress = requireNotNull(spenderAddress) { "Spender address is null" },
+            amount = swapAmount.value.convertToSdkAmount(fromToken),
+            blockchain = Blockchain.fromId(fromToken.network.id.value),
         )
         val cardId = userWallet.scanResponse.card.cardId
         val feeData = if (isDemoCardUseCase(cardId)) {
@@ -1635,7 +1626,7 @@ internal class SwapInteractorImpl @AssistedInject constructor(
                     currencyToSend = swapCurrencyConverter.convert(repository.getNativeTokenForNetwork(networkId)),
                     destinationAddress = fromToken.getContractAddress(),
                     increaseBy = INCREASE_GAS_LIMIT_BY,
-                    data = transactionData,
+                    callData = callData,
                     derivationPath = derivationPath,
                 )
             } catch (e: Exception) {
@@ -1672,7 +1663,6 @@ internal class SwapInteractorImpl @AssistedInject constructor(
                 spenderAddress = getTokenAddress(fromToken),
                 requestApproveData = RequestApproveStateData(
                     fee = feeState,
-                    approveData = transactionData,
                     fromTokenAmount = swapAmount,
                     spenderAddress = spenderAddress,
                 ),
@@ -2140,23 +2130,6 @@ internal class SwapInteractorImpl @AssistedInject constructor(
         return PriceImpact.Value(value)
     }
 
-    private suspend fun getApproveData(
-        networkId: String,
-        derivationPath: String?,
-        fromToken: CryptoCurrency,
-        swapAmount: SwapAmount? = null,
-        spenderAddress: String,
-    ): String {
-        return repository.getApproveData(
-            userWalletId = userWalletId,
-            networkId = networkId,
-            derivationPath = derivationPath,
-            currency = fromToken,
-            amount = swapAmount?.value,
-            spenderAddress = spenderAddress,
-        )
-    }
-
     private suspend fun getQuotes(vararg ids: CryptoCurrency.ID): Map<CryptoCurrency.ID, Quote.Value> {
         val set = ids.mapNotNull { it.rawCurrencyId }
             .toSet()