Updated on 2026-08-14

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

@@ -49,7 +49,7 @@ internal class SwapRepositoryImpl @Inject constructor(
 ) : SwapRepository {
 
     private val tokensConverter = TokensConverter()
-    private val swapConverter = SwapConverter()
+    private val expressDataConverter = ExpressDataConverter()
     private val leastTokenInfoConverter = LeastTokenInfoConverter()
     private val swapPairInfoConverter = SwapPairInfoConverter()
     private val cryptoCurrencyFactory = CryptoCurrencyFactory()
@@ -164,8 +164,8 @@ internal class SwapRepositoryImpl @Inject constructor(
                         toTokenAmount = createFromAmountWithOffset(response.toAmount, response.toDecimals),
                     ),
                 )
-            } catch (ex: OneIncResponseException) {
-                AggregatedSwapDataModel(null, mapErrors(ex.data.description))
+            } catch (ex: Exception) {
+                AggregatedSwapDataModel(null, mapErrors(ex.message))
             }
         }
     }
@@ -176,31 +176,33 @@ internal class SwapRepositoryImpl @Inject constructor(
         }
     }
 
-    override suspend fun prepareSwapTransaction(
-        networkId: String,
-        fromTokenAddress: String,
-        toTokenAddress: String,
-        amount: String,
-        fromWalletAddress: String,
-        slippage: Int,
+    override suspend fun getExchangeData(
+        fromContractAddress: String,
+        fromNetwork: String,
+        toContractAddress: String,
+        toNetwork: String,
+        fromAmount: String,
+        providerId: String,
+        rateType: RateType,
+        toAddress: String,
     ): AggregatedSwapDataModel<SwapDataModel> {
         return withContext(coroutineDispatcher.io) {
             try {
-                val swapResponse = oneInchErrorsHandler.handleOneInchResponse(
-                    getOneInchApi(networkId).swap(
-                        fromTokenAddress = fromTokenAddress,
-                        toTokenAddress = toTokenAddress,
-                        amount = amount,
-                        fromAddress = fromWalletAddress,
-                        slippage = slippage,
-                        referrerAddress = configManager.config.swapReferrerAccount?.address,
-                        fee = configManager.config.swapReferrerAccount?.fee,
-                    ),
+                val response = tangemExpressApi.getExchangeData(
+                    fromContractAddress = fromContractAddress,
+                    fromNetwork = fromNetwork,
+                    toContractAddress = toContractAddress,
+                    toNetwork = toNetwork,
+                    fromAmount = fromAmount,
+                    providerId = providerId,
+                    rateType = rateType.name.lowercase(),
+                    toAddress = toAddress
+                ).getOrThrow()
+                AggregatedSwapDataModel(
+                    dataModel = expressDataConverter.convert(response)
                 )
-
-                AggregatedSwapDataModel(swapConverter.convert(swapResponse))
-            } catch (ex: OneIncResponseException) {
-                AggregatedSwapDataModel(null, mapErrors(ex.data.description))
+            } catch (ex: Exception) {
+                AggregatedSwapDataModel(null, mapErrors(ex.message))
             }
         }
     }
@@ -280,31 +282,6 @@ internal class SwapRepositoryImpl @Inject constructor(
         return oneInchApiFactory.getApi(networkId)
     }
 
-    override suspend fun getExchangeQuote(
-        fromContractAddress: String,
-        fromNetwork: String,
-        toContractAddress: String,
-        toNetwork: String,
-        fromAmount: String,
-        providerId: String,
-        rateType: RateType,
-    ): ExchangeQuote {
-        val response = tangemExpressApi.getExchangeQuote(
-            fromContractAddress,
-            fromNetwork,
-            toContractAddress,
-            toNetwork,
-            fromAmount,
-            providerId,
-            rateType.name.lowercase(),
-        ).getOrThrow()
-
-        return ExchangeQuote(
-            toAmount = response.toAmount,
-            allowanceContract = response.allowanceContract,
-        )
-    }
-
     override fun getNativeTokenForNetwork(networkId: String): CryptoCurrency {
         val blockchain = requireNotNull(Blockchain.fromNetworkId(networkId)) { "blockchain not found" }
 

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

@@ -0,0 +1,41 @@
+package com.tangem.feature.swap.converters
+
+import com.tangem.datasource.api.express.models.response.ExchangeDataResponse
+import com.tangem.datasource.api.express.models.response.TxType
+import com.tangem.feature.swap.domain.models.createFromAmountWithOffset
+import com.tangem.feature.swap.domain.models.domain.ExpressTransactionModel
+import com.tangem.feature.swap.domain.models.domain.SwapDataModel
+import com.tangem.utils.converter.Converter
+
+class ExpressDataConverter : Converter<ExchangeDataResponse, SwapDataModel> {
+
+    override fun convert(value: ExchangeDataResponse): SwapDataModel {
+        return SwapDataModel(
+            toTokenAmount = createFromAmountWithOffset(value.toAmount, value.toDecimals),
+            transaction = convertTransaction(value),
+        )
+    }
+
+    private fun convertTransaction(transactionDto: ExchangeDataResponse): ExpressTransactionModel {
+        return if (transactionDto.txType == TxType.SWAP) {
+            ExpressTransactionModel.DEX(
+                fromAmount = createFromAmountWithOffset(transactionDto.fromAmount, transactionDto.fromDecimals),
+                toAmount = createFromAmountWithOffset(transactionDto.toAmount, transactionDto.toDecimals),
+                txId = transactionDto.txId,
+                txTo = transactionDto.txTo,
+                txFrom = requireNotNull(transactionDto.txFrom),
+                txData = requireNotNull(transactionDto.txData)
+            )
+        } else {
+            ExpressTransactionModel.CEX(
+                fromAmount = createFromAmountWithOffset(transactionDto.fromAmount, transactionDto.fromDecimals),
+                toAmount = createFromAmountWithOffset(transactionDto.toAmount, transactionDto.toDecimals),
+                txId = transactionDto.txId,
+                txTo = transactionDto.txTo,
+                externalTxId = requireNotNull(transactionDto.externalTxId),
+                externalTxUrl = requireNotNull(transactionDto.externalTxUrl),
+            )
+        }
+    }
+
+}

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

@@ -1,29 +0,0 @@
-package com.tangem.feature.swap.converters
-
-import com.tangem.datasource.api.oneinch.models.SwapResponse
-import com.tangem.datasource.api.oneinch.models.TransactionDto
-import com.tangem.feature.swap.domain.models.createFromAmountWithOffset
-import com.tangem.feature.swap.domain.models.domain.SwapDataModel
-import com.tangem.feature.swap.domain.models.domain.TransactionModel
-import com.tangem.utils.converter.Converter
-
-class SwapConverter : Converter<SwapResponse, SwapDataModel> {
-
-    override fun convert(value: SwapResponse): SwapDataModel {
-        return SwapDataModel(
-            toTokenAmount = createFromAmountWithOffset(value.toTokenAmount, value.toToken.decimals),
-            transaction = convertTransaction(value.transaction),
-        )
-    }
-
-    private fun convertTransaction(transactionDto: TransactionDto): TransactionModel {
-        return TransactionModel(
-            fromWalletAddress = transactionDto.fromAddress,
-            toWalletAddress = transactionDto.toAddress,
-            data = transactionDto.data,
-            value = transactionDto.value,
-            gasPrice = transactionDto.gasPrice,
-            gas = transactionDto.gas,
-        )
-    }
-}