Move ARS blue rate popup code to new class

Author: alvasw

desktop/src/main/java/bisq/desktop/components/paymentmethods/ArsBlueRatePopup.java

@@ -0,0 +1,28 @@
+package bisq.desktop.components.paymentmethods;
+
+import bisq.desktop.main.overlays.popups.Popup;
+
+import bisq.core.locale.FiatCurrency;
+import bisq.core.locale.Res;
+import bisq.core.locale.TradeCurrency;
+import bisq.core.user.DontShowAgainLookup;
+
+public class ArsBlueRatePopup {
+    public static boolean isTradeCurrencyArgentinePesos(TradeCurrency tradeCurrency) {
+        FiatCurrency arsCurrency = new FiatCurrency("ARS");
+        return tradeCurrency.equals(arsCurrency);
+    }
+
+    public static void showMaybe() {
+        String key = "arsBlueMarketNotificationPopup";
+        if (DontShowAgainLookup.showAgain(key)) {
+            new Popup()
+                    .headLine(Res.get("popup.arsBlueMarket.title"))
+                    .information(Res.get("popup.arsBlueMarket.info"))
+                    .actionButtonText(Res.get("shared.iUnderstand"))
+                    .hideCloseButton()
+                    .dontShowAgainId(key)
+                    .show();
+        }
+    }
+}

desktop/src/main/java/bisq/desktop/components/paymentmethods/PaymentMethodForm.java

@@ -37,7 +37,6 @@
 import bisq.core.payment.AssetAccount;
 import bisq.core.payment.PaymentAccount;
 import bisq.core.payment.payload.PaymentMethod;
-import bisq.core.user.DontShowAgainLookup;
 import bisq.core.util.coin.CoinFormatter;
 import bisq.core.util.validation.InputValidator;
 
@@ -68,7 +67,6 @@
 import javafx.util.StringConverter;
 
 import java.util.Date;
-import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 import lombok.extern.slf4j.Slf4j;
@@ -124,8 +122,8 @@ public TradeCurrency fromString(String s) {
             paymentAccount.setSingleTradeCurrency(selectedCurrency);
             updateFromInputs();
 
-            if (isArgentinePesos(selectedCurrency)) {
-                maybeShowArgentinePesosBlueRatePopup();
+            if (ArsBlueRatePopup.isTradeCurrencyArgentinePesos(selectedCurrency)) {
+                ArsBlueRatePopup.showMaybe();
             }
         });
     }
@@ -317,8 +315,8 @@ void fillUpFlowPaneWithCurrencies(boolean isEditable, FlowPane flowPane,
             if (checkBox.isSelected()) {
                 paymentAccount.addCurrency(e);
 
-                if (isArgentinePesos(e)) {
-                    maybeShowArgentinePesosBlueRatePopup();
+                if (ArsBlueRatePopup.isTradeCurrencyArgentinePesos(e)) {
+                    ArsBlueRatePopup.showMaybe();
                 }
 
             } else {
@@ -329,8 +327,8 @@ void fillUpFlowPaneWithCurrencies(boolean isEditable, FlowPane flowPane,
         });
         flowPane.getChildren().add(checkBox);
 
-        if (isCurrencySelected && isArgentinePesos(e)) {
-            maybeShowArgentinePesosBlueRatePopup();
+        if (isCurrencySelected && ArsBlueRatePopup.isTradeCurrencyArgentinePesos(e)) {
+            ArsBlueRatePopup.showMaybe();
         }
     }
 
@@ -372,22 +370,4 @@ void removeAcceptedCountry(String countryCode) {
 
     void addAcceptedCountry(String countryCode) {
     }
-
-    public static boolean isArgentinePesos(TradeCurrency tradeCurrency) {
-        FiatCurrency arsCurrency = new FiatCurrency("ARS");
-        return tradeCurrency.equals(arsCurrency);
-    }
-
-    public static void maybeShowArgentinePesosBlueRatePopup() {
-        String key = "arsBlueMarketNotificationPopup";
-        if (DontShowAgainLookup.showAgain(key)) {
-            new Popup()
-                    .headLine(Res.get("popup.arsBlueMarket.title"))
-                    .information(Res.get("popup.arsBlueMarket.info"))
-                    .actionButtonText(Res.get("shared.iUnderstand"))
-                    .hideCloseButton()
-                    .dontShowAgainId(key)
-                    .show();
-        }
-    }
 }

desktop/src/main/java/bisq/desktop/util/GUIUtil.java

@@ -24,7 +24,7 @@
 import bisq.desktop.components.BisqTextArea;
 import bisq.desktop.components.InfoAutoTooltipLabel;
 import bisq.desktop.components.indicator.TxConfidenceIndicator;
-import bisq.desktop.components.paymentmethods.PaymentMethodForm;
+import bisq.desktop.components.paymentmethods.ArsBlueRatePopup;
 import bisq.desktop.main.MainView;
 import bisq.desktop.main.account.AccountView;
 import bisq.desktop.main.account.content.fiataccounts.FiatAccountsView;
@@ -1108,8 +1108,8 @@ public TradeCurrency fromString(String string) {
             TradeCurrency selectedCurrency = currencyComboBox.getSelectionModel().getSelectedItem();
             onTradeCurrencySelectedHandler.accept(selectedCurrency);
 
-            if (PaymentMethodForm.isArgentinePesos(selectedCurrency)) {
-                PaymentMethodForm.maybeShowArgentinePesosBlueRatePopup();
+            if (ArsBlueRatePopup.isTradeCurrencyArgentinePesos(selectedCurrency)) {
+                ArsBlueRatePopup.showMaybe();
             }
         });