Updated on 2026-08-14

features/swap/domain/models/src/main/java/com/tangem/feature/swap/domain/models/ExpressDataError.kt

@@ -64,4 +64,9 @@ sealed class ExpressDataError {
         override val code: Int = -2
         override val message: String = "tooLargeSolanaTransaction"
     }
+
+    data object DexActiveSupplyError : ExpressDataError() {
+        override val code: Int = -3
+        override val message: String = "dexActiveSupplyError"
+    }
 }

features/swap/domain/src/main/java/com/tangem/feature/swap/domain/SwapInteractorImpl.kt

@@ -334,6 +334,14 @@ internal class SwapInteractorImpl @AssistedInject constructor(
         isBalanceWithoutFeeEnough: Boolean,
         expressOperationType: ExpressOperationType,
     ): Pair<SwapProvider, SwapState> {
+        if (fromToken.value.yieldSupplyStatus?.isActive == true) {
+            return provider to produceDexSwapDataError(
+                error = ExpressDataError.DexActiveSupplyError,
+                fromToken = fromToken,
+                amount = amount,
+            )
+        }
+
         val maybeQuotes = repository.findBestQuote(
             userWallet = userWallet,
             fromContractAddress = fromToken.currency.getContractAddress(),

features/swap/impl/src/main/java/com/tangem/feature/swap/model/SwapModel.kt

@@ -1267,16 +1267,7 @@ internal class SwapModel @Inject constructor(
             toToken.currency.id.value
         }
 
-        return groupToFind.available.find { idToFind == it.currencyStatus.currency.id.value }?.providers
-            ?.filter { provider ->
-                // !!!WARNING!!! Filter out dex provider if yield supply is active
-                val yieldSupplyStatus = fromToken.value.yieldSupplyStatus
-                if (yieldSupplyStatus != null && yieldSupplyStatus.isActive) {
-                    provider.type == ExchangeProviderType.CEX
-                } else {
-                    true
-                }
-            }.orEmpty()
+        return groupToFind.available.find { idToFind == it.currencyStatus.currency.id.value }?.providers.orEmpty()
     }
 
     private fun Map<SwapProvider, SwapState>.getLastLoadedSuccessStates(): SuccessLoadedSwapData {