diff --git a/features/swap/data/src/main/java/com/tangem/feature/swap/converters/ExchangeStatusConverter.kt b/features/swap/data/src/main/java/com/tangem/feature/swap/converters/ExchangeStatusConverter.kt
index 30ea8ec4cd..e3c5321be7 100644
--- a/features/swap/data/src/main/java/com/tangem/feature/swap/converters/ExchangeStatusConverter.kt
+++ b/features/swap/data/src/main/java/com/tangem/feature/swap/converters/ExchangeStatusConverter.kt
@@ -14,6 +14,7 @@ internal class ExchangeStatusConverter : Converter<ExchangeStatusResponse, Excha
             },
             txId = value.externalTxId,
             txExternalUrl = value.externalTxUrl,
+            txExternalId = value.externalTxId,
         )
     }
 }
\ No newline at end of file
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 c1a72132a4..90148abfc1 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
@@ -1480,7 +1480,16 @@ internal class SwapInteractorImpl @Inject constructor(
                     fromTokenStatus.currency.network.derivationPath.value,
                 )
                 nativeTokenBalance?.let { balance ->
-                    if (balance.value.minus(spendAmount.value) > fee.multiply(percentsToFeeIncrease)) {
+                    val balanceToCheck = when (fromTokenStatus.currency) {
+                        is CryptoCurrency.Token -> {
+                            balance.value
+                        }
+                        is CryptoCurrency.Coin -> {
+                            // need to check balance minus amount only if amount to swap in native token
+                            balance.value.minus(spendAmount.value)
+                        }
+                    }
+                    if (balanceToCheck > fee.multiply(percentsToFeeIncrease)) {
                         SwapFeeState.Enough
                     } else {
                         val nativeToken = getNativeToken(fromTokenStatus.currency.network.backendId)
@@ -1510,9 +1519,9 @@ internal class SwapInteractorImpl @Inject constructor(
                 } else {
                     val token = currenciesRepository
                         .getMultiCurrencyWalletCurrenciesSync(userWalletId)
+                        .filterIsInstance<CryptoCurrency.Token>()
                         .find {
-                            it is CryptoCurrency.Token &&
-                                it.contractAddress.equals(feePaidCurrency.contractAddress, ignoreCase = true) &&
+                            it.contractAddress.equals(feePaidCurrency.contractAddress, ignoreCase = true) &&
                                 it.network.derivationPath == fromTokenStatus.currency.network.derivationPath
                         }
                     SwapFeeState.NotEnough(