From d25aa2c909146fd765e8b7b7cddc88225352cda2 Mon Sep 17 00:00:00 2001
From: Serhii <borodenko.sv@gmail.com>
Date: Sat, 20 Dec 2025 02:46:56 +0200
Subject: [PATCH] Cw 1258 fix buy sell flow issues (#2754)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* update quote sorting logic for sell action

* аix payment method selection
---
 lib/buy/onramper/onramper_buy_provider.dart | 2 +-
 lib/view_model/buy/buy_sell_view_model.dart | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/buy/onramper/onramper_buy_provider.dart b/lib/buy/onramper/onramper_buy_provider.dart
index 8d809a74f..353a01397 100644
--- a/lib/buy/onramper/onramper_buy_provider.dart
+++ b/lib/buy/onramper/onramper_buy_provider.dart
@@ -194,7 +194,7 @@ class OnRamperBuyProvider extends BuyProvider {
       String? countryCode}) async {
     String? paymentMethod;
 
-    if (paymentType == PaymentType.all && recommendedPaymentType != null) paymentMethod = recommendedPaymentType!;
+    if (paymentType == PaymentType.all ) paymentMethod = null;
     else if (paymentType == PaymentType.unknown) paymentMethod = customPaymentMethodType;
     else if (paymentType != null) paymentMethod = normalizePaymentMethod(paymentType);
 
diff --git a/lib/view_model/buy/buy_sell_view_model.dart b/lib/view_model/buy/buy_sell_view_model.dart
index 76e6e9edf..bb7cc5b8a 100644
--- a/lib/view_model/buy/buy_sell_view_model.dart
+++ b/lib/view_model/buy/buy_sell_view_model.dart
@@ -436,7 +436,12 @@ abstract class BuySellViewModelBase extends WalletChangeListenerViewModel with S
       return;
     }
 
-    validQuotes.sort((a, b) => a.rate.compareTo(b.rate));
+    if (isBuyAction) {
+      validQuotes.sort((a, b) => b.payout.compareTo(a.payout));
+    } else {
+      validQuotes.sort((a, b) => a.payout.compareTo(b.payout));
+    }
+
 
     final Set<String> addedProviders = {};
     final List<Quote> uniqueProviderQuotes = validQuotes.where((element) {