From ca89626d270052ead9c3b6f99d67147d8fd3e7ec Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Fri, 24 Nov 2023 16:25:24 +0200
Subject: [PATCH] Updated on 2026-08-14

---
 .../tangem/datasource/api/express/TangemExpressApi.kt    | 1 +
 .../java/com/tangem/feature/swap/SwapRepositoryImpl.kt   | 4 +++-
 .../com/tangem/feature/swap/domain/SwapInteractorImpl.kt | 9 ++-------
 .../com/tangem/feature/swap/domain/SwapRepository.kt     | 1 +
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/express/TangemExpressApi.kt b/core/datasource/src/main/java/com/tangem/datasource/api/express/TangemExpressApi.kt
index 6144d6ad9e..8fff666e26 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/api/express/TangemExpressApi.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/express/TangemExpressApi.kt
@@ -46,6 +46,7 @@ interface TangemExpressApi {
         @Query("providerId") providerId: String,
         @Query("rateType") rateType: String,
         @Query("toAddress") toAddress: String,
+        @Query("refundAddress") refundAddress: String,
     ): ApiResponse<ExchangeDataResponse>
 
     @GET("exchange-result")
diff --git a/features/swap/data/src/main/java/com/tangem/feature/swap/SwapRepositoryImpl.kt b/features/swap/data/src/main/java/com/tangem/feature/swap/SwapRepositoryImpl.kt
index 3571784929..b143fcf4d4 100644
--- a/features/swap/data/src/main/java/com/tangem/feature/swap/SwapRepositoryImpl.kt
+++ b/features/swap/data/src/main/java/com/tangem/feature/swap/SwapRepositoryImpl.kt
@@ -185,6 +185,7 @@ internal class SwapRepositoryImpl @Inject constructor(
         providerId: String,
         rateType: RateType,
         toAddress: String,
+        refundAddress: String
     ): AggregatedSwapDataModel<SwapDataModel> {
         return withContext(coroutineDispatcher.io) {
             try {
@@ -196,7 +197,8 @@ internal class SwapRepositoryImpl @Inject constructor(
                     fromAmount = fromAmount,
                     providerId = providerId,
                     rateType = rateType.name.lowercase(),
-                    toAddress = toAddress
+                    toAddress = toAddress,
+                    refundAddress = refundAddress
                 ).getOrThrow()
                 AggregatedSwapDataModel(
                     dataModel = expressDataConverter.convert(response)
diff --git a/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/SwapInteractorImpl.kt b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/SwapInteractorImpl.kt
index bda5b8c320..be2096f0c4 100644
--- a/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/SwapInteractorImpl.kt
+++ b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/SwapInteractorImpl.kt
@@ -589,13 +589,8 @@ internal class SwapInteractorImpl @Inject constructor(
             fromAmount = amount.toStringWithRightOffset(),
             providerId = provider.providerId,
             rateType = RateType.FLOAT,
-            toAddress = toToken.value.networkAddress?.defaultAddress ?: ""
-            // networkId = networkId,
-            // fromTokenAddress = fromTokenAddress,
-            // toTokenAddress = toTokenAddress,
-            // amount = amount.toStringWithRightOffset(),
-            // slippage = DEFAULT_SLIPPAGE,
-            // fromWalletAddress = getWalletAddress(networkId),
+            toAddress = toToken.value.networkAddress?.defaultAddress ?: "",
+            refundAddress = fromToken.value.networkAddress?.defaultAddress ?: "",
         ).let {
             val swapData = it.dataModel
             if (swapData != null) {
diff --git a/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/SwapRepository.kt b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/SwapRepository.kt
index d919661845..86d54285e5 100644
--- a/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/SwapRepository.kt
+++ b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/SwapRepository.kt
@@ -66,6 +66,7 @@ interface SwapRepository {
         providerId: String,
         rateType: RateType,
         toAddress: String,
+        refundAddress: String,
     ): AggregatedSwapDataModel<SwapDataModel>
 
     fun getNativeTokenForNetwork(networkId: String): CryptoCurrency