show SWIFT helper popup before new account form filled in

bisq-network · Aug 24, 2021 · 53bc2b2 · 53bc2b2
1 parent a69a746
commit 53bc2b2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/SwiftForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/SwiftForm.java
@@ -18,6 +18,7 @@
 
 import bisq.desktop.components.AutoTooltipButton;
 import bisq.desktop.components.InputTextField;
+import bisq.desktop.main.overlays.popups.Popup;
 import bisq.desktop.main.overlays.windows.SwiftPaymentDetails;
 import bisq.desktop.util.GUIUtil;
 import bisq.desktop.util.Layout;
@@ -80,6 +81,10 @@ public SwiftForm(PaymentAccount paymentAccount,
 
     @Override
     public void addFormForAddAccount() {
+        new Popup().information(Res.get("payment.swift.info"))
+                .width(900)
+                .closeButtonText(Res.get("shared.iUnderstand"))
+                .show();
         gridRowFrom = gridRow + 1;
         addFieldsForBankEdit(true, this::setBankSwiftCode, this::setBankName, this::setBankBranch, this::setBankAddress);
         addFieldsForBankEdit(false, this::setIntermediarySwiftCode, this::setIntermediaryName, this::setIntermediaryBranch, this::setIntermediaryAddress);

diff --git a/desktop/src/main/java/bisq/desktop/main/account/content/fiataccounts/FiatAccountsView.java b/desktop/src/main/java/bisq/desktop/main/account/content/fiataccounts/FiatAccountsView.java
@@ -95,7 +95,6 @@
 import bisq.core.payment.PaymentAccount;
 import bisq.core.payment.PaymentAccountFactory;
 import bisq.core.payment.RevolutAccount;
-import bisq.core.payment.SwiftAccount;
 import bisq.core.payment.USPostalMoneyOrderAccount;
 import bisq.core.payment.WesternUnionAccount;
 import bisq.core.payment.payload.PaymentMethod;
@@ -346,13 +345,6 @@ private void onSaveNewAccount(PaymentAccount paymentAccount) {
                                     .actionButtonText(Res.get("shared.iUnderstand"))
                                     .onAction(() -> doSaveNewAccount(paymentAccount))
                                     .show();
-                        } else if (paymentAccount instanceof SwiftAccount) {
-                            new Popup().information(Res.get("payment.swift.info", currencyName, currencyName))
-                                    .width(900)
-                                    .closeButtonText(Res.get("shared.cancel"))
-                                    .actionButtonText(Res.get("shared.iUnderstand"))
-                                    .onAction(() -> doSaveNewAccount(paymentAccount))
-                                    .show();
                         } else {
                             doSaveNewAccount(paymentAccount);
                         }