From d0f4b46a5b91c97fe9a729d0391b00dfd15fe49d Mon Sep 17 00:00:00 2001 From: Alva Swanson Date: Wed, 1 Jan 2025 20:12:41 +0000 Subject: [PATCH] Always show ARS blue rate popup We show the ARS blue rate popup whenever the user creates a payment method and ARS is selected. Therefore, it makes sense to always show the ARS blue rate popup. --- .../paymentmethods/ArsBlueRatePopup.java | 19 +++++++------------ .../paymentmethods/PaymentMethodForm.java | 6 +++--- .../main/java/bisq/desktop/util/GUIUtil.java | 2 +- 3 files changed, 11 insertions(+), 16 deletions(-) diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/ArsBlueRatePopup.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/ArsBlueRatePopup.java index 586a5bde18..7bfae3cf14 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/ArsBlueRatePopup.java +++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/ArsBlueRatePopup.java @@ -5,7 +5,6 @@ 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) { @@ -13,16 +12,12 @@ public class ArsBlueRatePopup { 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(); - } + public static void show() { + new Popup() + .headLine(Res.get("popup.arsBlueMarket.title")) + .information(Res.get("popup.arsBlueMarket.info")) + .actionButtonText(Res.get("shared.iUnderstand")) + .hideCloseButton() + .show(); } } diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/PaymentMethodForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/PaymentMethodForm.java index 30e0087f8a..c3b310ec1a 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/PaymentMethodForm.java +++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/PaymentMethodForm.java @@ -123,7 +123,7 @@ public abstract class PaymentMethodForm { updateFromInputs(); if (ArsBlueRatePopup.isTradeCurrencyArgentinePesos(selectedCurrency)) { - ArsBlueRatePopup.showMaybe(); + ArsBlueRatePopup.show(); } }); } @@ -316,7 +316,7 @@ public abstract class PaymentMethodForm { paymentAccount.addCurrency(e); if (ArsBlueRatePopup.isTradeCurrencyArgentinePesos(e)) { - ArsBlueRatePopup.showMaybe(); + ArsBlueRatePopup.show(); } } else { @@ -328,7 +328,7 @@ public abstract class PaymentMethodForm { flowPane.getChildren().add(checkBox); if (isCurrencySelected && ArsBlueRatePopup.isTradeCurrencyArgentinePesos(e)) { - ArsBlueRatePopup.showMaybe(); + ArsBlueRatePopup.show(); } } diff --git a/desktop/src/main/java/bisq/desktop/util/GUIUtil.java b/desktop/src/main/java/bisq/desktop/util/GUIUtil.java index 6b2bab5994..2ba010455e 100644 --- a/desktop/src/main/java/bisq/desktop/util/GUIUtil.java +++ b/desktop/src/main/java/bisq/desktop/util/GUIUtil.java @@ -1109,7 +1109,7 @@ public class GUIUtil { onTradeCurrencySelectedHandler.accept(selectedCurrency); if (ArsBlueRatePopup.isTradeCurrencyArgentinePesos(selectedCurrency)) { - ArsBlueRatePopup.showMaybe(); + ArsBlueRatePopup.show(); } });