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 ee09df73c4..27b0d03e63 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 @@ -430,8 +430,9 @@ internal class SwapViewModel @Inject constructor( if (currentSelected != null && consideredProviders.keys.contains(currentSelected)) { currentSelected } else { - findBestQuoteProvider(consideredProviders.getLastLoadedSuccessStates()) - ?: consideredProviders.keys.first() + val successLoadedData = consideredProviders.getLastLoadedSuccessStates() + val recommendedProvider = successLoadedData.keys.firstOrNull { it.isRecommended } + recommendedProvider ?: findBestQuoteProvider(successLoadedData) ?: consideredProviders.keys.first() } } else { state.keys.first()