Updated on 2026-08-14

features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/amount/model/SwapAmountModel.kt

@@ -551,9 +551,6 @@ internal class SwapAmountModel @Inject constructor(
                         initPairs(data.swapCurrencies, data.cryptoCurrency)
                         amountUM.copy(
                             isPrimaryButtonEnabled = false,
-                            secondaryAmount = SwapAmountFieldUM.Loading(
-                                amountType = SwapAmountType.To,
-                            ),
                         )
                     } else {
                         amountUM

features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/amount/model/transformers/SwapAmountValueChangeTransformer.kt

@@ -2,6 +2,9 @@ package com.tangem.features.swap.v2.impl.amount.model.transformers
 
 import com.tangem.common.ui.amountScreen.converters.field.AmountFieldChangeTransformer
 import com.tangem.common.ui.amountScreen.models.EnterAmountBoundary
+import com.tangem.domain.swap.models.SwapAmountType
+import com.tangem.domain.swap.models.SwapDirection
+import com.tangem.features.swap.v2.impl.amount.entity.SwapAmountFieldUM
 import com.tangem.features.swap.v2.impl.amount.entity.SwapAmountUM
 import com.tangem.features.swap.v2.impl.amount.model.SwapAmountQuoteUtils.updateAmount
 import com.tangem.features.swap.v2.impl.common.entity.SwapQuoteUM
@@ -44,13 +47,53 @@ internal class SwapAmountValueChangeTransformer(
             },
         )
 
-        return (updatedState as? SwapAmountUM.Content)?.copy(
+        val contentState = updatedState as? SwapAmountUM.Content ?: return updatedState
+
+        val newState = if (value.isEmpty()) {
+            contentState.clearOppositeField(prevState)
+        } else {
+            contentState
+        }
+
+        return newState.copy(
             isPrimaryButtonEnabled = false,
-            selectedQuote = if (updatedState.isPrimaryButtonEnabled) {
+            selectedQuote = if (value.isEmpty()) {
                 SwapQuoteUM.Empty
             } else {
                 SwapQuoteUM.Loading
             },
-        ) ?: updatedState
+        )
+    }
+
+    private fun SwapAmountUM.Content.clearOppositeField(prevState: SwapAmountUM.Content): SwapAmountUM.Content {
+        val isPrimaryFieldEdited =
+            selectedAmountType == SwapAmountType.From && swapDirection == SwapDirection.Direct
+
+        return if (isPrimaryFieldEdited) {
+            val secondaryStatus = secondaryCryptoCurrencyStatus ?: return this
+            val secondaryContent = secondaryAmount as? SwapAmountFieldUM.Content ?: return this
+            copy(
+                secondaryAmount = secondaryContent.copy(
+                    amountField = AmountFieldChangeTransformer(
+                        cryptoCurrencyStatus = secondaryStatus,
+                        maxEnterAmount = secondaryMaximumAmountBoundary ?: return this,
+                        minimumTransactionAmount = secondaryMinimumAmountBoundary,
+                        value = "",
+                    ).transform(prevState.secondaryAmount.amountField),
+                ),
+            )
+        } else {
+            val primaryContent = primaryAmount as? SwapAmountFieldUM.Content ?: return this
+            copy(
+                primaryAmount = primaryContent.copy(
+                    amountField = AmountFieldChangeTransformer(
+                        cryptoCurrencyStatus = primaryCryptoCurrencyStatus,
+                        maxEnterAmount = primaryMaximumAmountBoundary,
+                        minimumTransactionAmount = primaryMinimumAmountBoundary,
+                        value = "",
+                    ).transform(prevState.primaryAmount.amountField),
+                ),
+            )
+        }
     }
 }