From a1943321d9d97d7de0d82fe4e76ed6864f3ef542 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Mon, 25 Dec 2023 18:25:48 +0300
Subject: [PATCH] Updated on 2026-08-14

---
 .../tangem/feature/swap/viewmodels/SwapViewModel.kt | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/features/swap/presentation/src/main/java/com/tangem/feature/swap/viewmodels/SwapViewModel.kt b/features/swap/presentation/src/main/java/com/tangem/feature/swap/viewmodels/SwapViewModel.kt
index 34f4e0f818..23f24834f8 100644
--- a/features/swap/presentation/src/main/java/com/tangem/feature/swap/viewmodels/SwapViewModel.kt
+++ b/features/swap/presentation/src/main/java/com/tangem/feature/swap/viewmodels/SwapViewModel.kt
@@ -420,16 +420,21 @@ internal class SwapViewModel @Inject constructor(
         } else {
             dataState.copy(
                 swapDataModel = swapDataModel,
-                selectedFee = selectDefaultFee(state),
+                selectedFee = updateOrSelectFee(state),
             )
         }
     }
 
-    private fun selectDefaultFee(state: SwapState.QuotesLoadedState): TxFee? {
-        return dataState.selectedFee ?: when (val txFee = state.txFee) {
+    private fun updateOrSelectFee(state: SwapState.QuotesLoadedState): TxFee? {
+        val selectedFeeType = dataState.selectedFee?.feeType ?: FeeType.NORMAL
+        return when (val txFee = state.txFee) {
             TxFeeState.Empty -> null
             is TxFeeState.MultipleFeeState -> {
-                txFee.normalFee
+                if (selectedFeeType == FeeType.NORMAL) {
+                    txFee.normalFee
+                } else {
+                    txFee.priorityFee
+                }
             }
             is TxFeeState.SingleFeeState -> {
                 txFee.fee