sort traditional currencies after fiat currencies in combined pull down

Author: woodser

core/src/main/java/haveno/core/locale/CurrencyUtil.java

@@ -93,7 +93,7 @@ public static void setBaseCurrencyCode(String baseCurrencyCode) {
     public static Collection<TraditionalCurrency> getAllSortedFiatCurrencies(Comparator comparator) {
         return getAllSortedTraditionalCurrencies(comparator).stream()
                 .filter(currency -> CurrencyUtil.isFiatCurrency(currency.getCode()))
-                .collect(Collectors.toList());  // sorted by currency name
+                .collect(Collectors.toList()); // sorted by currency name
     }
 
     public static List<TradeCurrency> getAllFiatCurrencies() {
@@ -105,11 +105,11 @@ public static List<TradeCurrency> getAllFiatCurrencies() {
     public static List<TradeCurrency> getAllSortedFiatCurrencies() {
         return getAllSortedTraditionalCurrencies().stream()
                 .filter(currency -> CurrencyUtil.isFiatCurrency(currency.getCode()))
-                .collect(Collectors.toList());  // sorted by currency name
+                .collect(Collectors.toList()); // sorted by currency name
     }
 
     public static Collection<TraditionalCurrency> getAllSortedTraditionalCurrencies() {
-        return traditionalCurrencyMapSupplier.get().values();  // sorted by currency name
+        return traditionalCurrencyMapSupplier.get().values(); // sorted by currency name
     }
 
     public static List<TradeCurrency> getAllTraditionalCurrencies() {

desktop/src/main/java/haveno/desktop/util/CurrencyList.java

@@ -65,6 +65,7 @@ public void updateWithCurrencies(List<TradeCurrency> currencies, @Nullable Curre
 
     private List<CurrencyListItem> getPartitionedSortedItems(List<TradeCurrency> currencies) {
         Map<TradeCurrency, Integer> tradesPerCurrency = countTrades(currencies);
+        List<CurrencyListItem> fiatCurrencies = new ArrayList<>();
         List<CurrencyListItem> traditionalCurrencies = new ArrayList<>();
         List<CurrencyListItem> cryptoCurrencies = new ArrayList<>();
 
@@ -73,7 +74,9 @@ private List<CurrencyListItem> getPartitionedSortedItems(List<TradeCurrency> cur
             Integer count = entry.getValue();
             CurrencyListItem item = new CurrencyListItem(currency, count);
 
-            if (predicates.isTraditionalCurrency(currency)) {
+            if (predicates.isFiatCurrency(currency)) {
+                fiatCurrencies.add(item);
+            } else if (predicates.isTraditionalCurrency(currency)) {
                 traditionalCurrencies.add(item);
             }
 
@@ -83,10 +86,12 @@ private List<CurrencyListItem> getPartitionedSortedItems(List<TradeCurrency> cur
         }
 
         Comparator<CurrencyListItem> comparator = getComparator();
+        fiatCurrencies.sort(comparator);
         traditionalCurrencies.sort(comparator);
         cryptoCurrencies.sort(comparator);
 
         List<CurrencyListItem> result = new ArrayList<>();
+        result.addAll(fiatCurrencies);
         result.addAll(traditionalCurrencies);
         result.addAll(cryptoCurrencies);
 

desktop/src/main/java/haveno/desktop/util/CurrencyPredicates.java

@@ -25,6 +25,10 @@ boolean isCryptoCurrency(TradeCurrency currency) {
         return CurrencyUtil.isCryptoCurrency(currency.getCode());
     }
 
+    boolean isFiatCurrency(TradeCurrency currency) {
+        return CurrencyUtil.isFiatCurrency(currency.getCode());
+    }
+
     boolean isTraditionalCurrency(TradeCurrency currency) {
         return CurrencyUtil.isTraditionalCurrency(currency.getCode());
     }