Fix issue adding custom settlement methods

bisq-network · Aug 28, 2024 · a326bb0 · a326bb0
1 parent 802922d
commit a326bb0
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/...n/content/bisq_easy/trade_wizard/payment_methods/TradeWizardPaymentMethodsController.java b/...n/content/bisq_easy/trade_wizard/payment_methods/TradeWizardPaymentMethodsController.java
@@ -158,7 +158,7 @@ public void onActivate() {
                     boolean isCustomPaymentMethod = fiatPaymentMethod.isCustomPaymentMethod();
                     if (!isCustomPaymentMethod && isPredefinedPaymentMethodsContainName(name)) {
                         maybeAddFiatPaymentMethod(fiatPaymentMethod);
-                    } else {
+                    } else if (isCustomPaymentMethod) {
                         maybeAddCustomFiatPaymentMethod(fiatPaymentMethod);
                     }
                 }));
@@ -168,7 +168,10 @@ public void onActivate() {
                         return;
                     }
                     BitcoinPaymentMethod bitcoinPaymentMethod = BitcoinPaymentMethodUtil.getPaymentMethod(name);
-                    maybeAddBitcoinPaymentMethod(bitcoinPaymentMethod);
+                    boolean isCustomPaymentMethod = bitcoinPaymentMethod.isCustomPaymentMethod();
+                    if (!isCustomPaymentMethod) {
+                        maybeAddBitcoinPaymentMethod(bitcoinPaymentMethod);
+                    }
                 }));
         maybeAddOnChainPaymentMethodAsSelected();
     }
@@ -311,7 +314,7 @@ private void maybeRemoveCustomFiatPaymentMethods() {
         // To ensure backwards compatibility we need to drop custom fiat payment methods if the user has more than 3,
         // which is the max allowed number of custom fiat payment methods per market
         while (model.getAddedCustomFiatPaymentMethods().size() > MAX_ALLOWED_CUSTOM_FIAT_PAYMENTS) {
-            model.getAddedCustomFiatPaymentMethods().remove(model.getAddedCustomBitcoinPaymentMethods().size() - 1);
+            model.getAddedCustomFiatPaymentMethods().remove(model.getAddedCustomFiatPaymentMethods().size() - 1);
         }
     }