From 463e5b1d52bcf5981162fbe9da666e88a867f2da Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Thu, 18 Apr 2024 21:17:41 +0100
Subject: [PATCH] Updated on 2026-08-14

---
 .../com/tangem/datasource/api/express/TangemExpressApi.kt   | 1 +
 .../java/com/tangem/feature/swap/DefaultSwapRepository.kt   | 2 ++
 .../com/tangem/feature/swap/domain/api/SwapRepository.kt    | 1 +
 .../com/tangem/feature/swap/domain/SwapInteractorImpl.kt    | 6 ++++--
 4 files changed, 8 insertions(+), 2 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 b7055574a3..76c7dce8bd 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
@@ -42,6 +42,7 @@ interface TangemExpressApi {
         @Query("fromContractAddress") fromContractAddress: String,
         @Query("fromNetwork") fromNetwork: String,
         @Query("toContractAddress") toContractAddress: String,
+        @Query("fromAddress") fromAddress: String,
         @Query("toNetwork") toNetwork: String,
         @Query("fromAmount") fromAmount: String,
         @Query("fromDecimals") fromDecimals: Int,
diff --git a/features/swap/data/src/main/java/com/tangem/feature/swap/DefaultSwapRepository.kt b/features/swap/data/src/main/java/com/tangem/feature/swap/DefaultSwapRepository.kt
index 66ff152f20..68c61f2c71 100644
--- a/features/swap/data/src/main/java/com/tangem/feature/swap/DefaultSwapRepository.kt
+++ b/features/swap/data/src/main/java/com/tangem/feature/swap/DefaultSwapRepository.kt
@@ -249,6 +249,7 @@ internal class DefaultSwapRepository @Inject constructor(
         fromContractAddress: String,
         fromNetwork: String,
         toContractAddress: String,
+        fromAddress: String,
         toNetwork: String,
         fromAmount: String,
         fromDecimals: Int,
@@ -266,6 +267,7 @@ internal class DefaultSwapRepository @Inject constructor(
                     fromContractAddress = fromContractAddress,
                     fromNetwork = fromNetwork,
                     toContractAddress = toContractAddress,
+                    fromAddress = fromAddress,
                     toNetwork = toNetwork,
                     fromAmount = fromAmount,
                     fromDecimals = fromDecimals,
diff --git a/features/swap/domain/api/src/main/java/com/tangem/feature/swap/domain/api/SwapRepository.kt b/features/swap/domain/api/src/main/java/com/tangem/feature/swap/domain/api/SwapRepository.kt
index 0a04d8950f..6ae1d7e0d1 100644
--- a/features/swap/domain/api/src/main/java/com/tangem/feature/swap/domain/api/SwapRepository.kt
+++ b/features/swap/domain/api/src/main/java/com/tangem/feature/swap/domain/api/SwapRepository.kt
@@ -58,6 +58,7 @@ interface SwapRepository {
         fromContractAddress: String,
         fromNetwork: String,
         toContractAddress: String,
+        fromAddress: String,
         toNetwork: String,
         fromAmount: String,
         fromDecimals: Int,
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 6ab50afce3..bea16b1e5c 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
@@ -583,13 +583,14 @@ internal class SwapInteractorImpl @Inject constructor(
             fromContractAddress = currencyToSend.currency.getContractAddress(),
             fromNetwork = currencyToSend.currency.network.backendId,
             toContractAddress = currencyToGet.currency.getContractAddress(),
+            fromAddress = currencyToSend.value.networkAddress?.defaultAddress?.value.orEmpty(),
             toNetwork = currencyToGet.currency.network.backendId,
             fromAmount = amount.toStringWithRightOffset(),
             fromDecimals = amount.decimals,
             toDecimals = currencyToGet.currency.decimals,
             providerId = swapProvider.providerId,
             rateType = RateType.FLOAT,
-            toAddress = currencyToGet.value.networkAddress?.defaultAddress?.value ?: "",
+            toAddress = currencyToGet.value.networkAddress?.defaultAddress?.value.orEmpty(),
             refundAddress = currencyToSend.value.networkAddress?.defaultAddress?.value,
             refundExtraId = null, // currently always null
         ).getOrElse { return SwapTransactionState.ExpressError(it) }
@@ -1048,13 +1049,14 @@ internal class SwapInteractorImpl @Inject constructor(
             fromContractAddress = fromToken.currency.getContractAddress(),
             fromNetwork = fromToken.currency.network.backendId,
             toContractAddress = toToken.currency.getContractAddress(),
+            fromAddress = fromToken.value.networkAddress?.defaultAddress?.value.orEmpty(),
             toNetwork = toToken.currency.network.backendId,
             fromAmount = amount.toStringWithRightOffset(),
             fromDecimals = amount.decimals,
             toDecimals = toToken.currency.decimals,
             providerId = provider.providerId,
             rateType = RateType.FLOAT,
-            toAddress = toToken.value.networkAddress?.defaultAddress?.value ?: "",
+            toAddress = toToken.value.networkAddress?.defaultAddress?.value.orEmpty(),
         ).fold(
             ifRight = { swapData ->
                 val feeData = transactionManager.getFee(