mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-24 23:18:17 +01:00
Code Issues Projects Releases Packages Wiki Activity

Sort payment methods by display string not by id.

Browse source 
Apply sorting in drop down boxes.
This commit is contained in:
chimp1984 2020-12-10 22:34:31 -05:00
parent 7d12b94c6a
commit 5c68ad0b47
No known key found for this signature in database
GPG key ID: 9801B4EC591F90E3
3 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/src/main/java/bisq/core/payment/payload/PaymentMethod.java
View file

@ -332,7 +332,7 @@ public final class PaymentMethod implements PersistablePayload, Comparable<Payme
@Override @Override
public int compareTo(@NotNull PaymentMethod other) { public int compareTo(@NotNull PaymentMethod other) {
return id.compareTo(other.id); return Res.get(id).compareTo(Res.get(other.id));
} }
public String getDisplayString() { public String getDisplayString() {

1
desktop/src/main/java/bisq/desktop/main/account/content/fiataccounts/FiatAccountsView.java
View file

@ -385,6 +385,7 @@ public class FiatAccountsView extends PaymentAccountsView<GridPane, FiatAccounts
paymentMethodComboBox.setPrefWidth(250); paymentMethodComboBox.setPrefWidth(250);
List<PaymentMethod> list = PaymentMethod.getPaymentMethods().stream() List<PaymentMethod> list = PaymentMethod.getPaymentMethods().stream()
.filter(paymentMethod -> !paymentMethod.isAsset()) .filter(paymentMethod -> !paymentMethod.isAsset())
.sorted()
.collect(Collectors.toList()); .collect(Collectors.toList());
paymentMethodComboBox.setItems(FXCollections.observableArrayList(list)); paymentMethodComboBox.setItems(FXCollections.observableArrayList(list));
paymentMethodComboBox.setConverter(new StringConverter<>() { paymentMethodComboBox.setConverter(new StringConverter<>() {

1
desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookViewModel.java
View file

@ -343,6 +343,7 @@ class OfferBookViewModel extends ActivatableViewModel {
ObservableList<PaymentMethod> getPaymentMethods() { ObservableList<PaymentMethod> getPaymentMethods() {
ObservableList<PaymentMethod> list = FXCollections.observableArrayList(PaymentMethod.getPaymentMethods()); ObservableList<PaymentMethod> list = FXCollections.observableArrayList(PaymentMethod.getPaymentMethods());
list.sort(Comparator.naturalOrder());
list.add(0, PaymentMethod.getDummyPaymentMethod(GUIUtil.SHOW_ALL_FLAG)); list.add(0, PaymentMethod.getDummyPaymentMethod(GUIUtil.SHOW_ALL_FLAG));
return list; return list;
} }