From cfac93d7e1d54dcce3c3e69d7d3b46ce0107f39a Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Tue, 16 Jun 2026 20:18:06 +0100
Subject: [PATCH] Updated on 2026-08-14

---
 .../com/tangem/feature/swap/model/SwapModel.kt     | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/features/swap/impl/src/main/java/com/tangem/feature/swap/model/SwapModel.kt b/features/swap/impl/src/main/java/com/tangem/feature/swap/model/SwapModel.kt
index f91c5339ca..70b750fdd2 100644
--- a/features/swap/impl/src/main/java/com/tangem/feature/swap/model/SwapModel.kt
+++ b/features/swap/impl/src/main/java/com/tangem/feature/swap/model/SwapModel.kt
@@ -801,11 +801,13 @@ internal class SwapModel @Inject constructor(
                     feePaidCryptoCurrencyStatus = feePaidCryptoCurrency,
                     fee = selectedFee,
                 )
-                if (isTangemPayWithdrawal()) {
-                    refreshTransferUIStateIfNeeded()
-                } else {
-                    feeSelectorRepository.state.value = FeeSelectorUM.Loading
-                    feeSelectorReloadTrigger.triggerUpdate()
+                when {
+                    uiState.successState != null -> Unit
+                    isTangemPayWithdrawal() -> refreshTransferUIStateIfNeeded()
+                    else -> {
+                        feeSelectorRepository.state.value = FeeSelectorUM.Loading
+                        feeSelectorReloadTrigger.triggerUpdate()
+                    }
                 }
             }
             is SwapState.QuotesLoadedState, is SwapState.SwapError -> Unit
@@ -1652,7 +1654,7 @@ internal class SwapModel @Inject constructor(
                         ),
                     ),
                 )
-                startLoadingQuotesFromLastState(isSilent = true)
+                startLoadingQuotesFromLastState(isSilent = true) // here
             }.flowOn(dispatchers.main).launchIn(modelScope)
             .saveIn(if (isFromCurrency) fromTokenBalanceJobHolder else toTokenBalanceJobHolder)
     }