Merge pull request bisq-network#7122 from HenrikJannsen/remove-ARS-Bl…

…ueMarke-warning-at-startup Don't show ARS blue market price warning at startup
HenrikJannsen · May 29, 2024 · e9b1a68 · e9b1a68
2 parents 2185bcb + a3acd4f
commit e9b1a68
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 15 deletions.
diff --git a/desktop/src/main/java/bisq/desktop/main/MainViewModel.java b/desktop/src/main/java/bisq/desktop/main/MainViewModel.java
@@ -320,7 +320,6 @@ public void onSetupComplete() {
             setupDevDummyPaymentAccounts();
         }
 
-        maybeAddArsBlueMarketNotificationToQueue();
         getShowAppScreen().set(true);
     }
 
@@ -904,20 +903,6 @@ public BooleanProperty getShowSettingsUpdatesNotification() {
         return settingsPresentation.getShowSettingsUpdatesNotification();
     }
 
-    private void maybeAddArsBlueMarketNotificationToQueue() {
-        String key = "arsBlueMarketNotificationPopup";
-        if (DontShowAgainLookup.showAgain(key)) {
-            Popup popup = new Popup()
-                    .headLine(Res.get("popup.arsBlueMarket.title"))
-                    .information(Res.get("popup.arsBlueMarket.info"))
-                    .actionButtonText(Res.get("shared.iUnderstand"))
-                    .hideCloseButton()
-                    .dontShowAgainId(key);
-            popup.setDisplayOrderPriority(1);
-            popupQueue.add(popup);
-        }
-    }
-
     private void maybeShowPopupsFromQueue() {
         if (!popupQueue.isEmpty()) {
             Overlay<?> overlay = popupQueue.poll();

diff --git a/...p/src/main/java/bisq/desktop/main/account/content/fiataccounts/FiatAccountsDataModel.java b/...p/src/main/java/bisq/desktop/main/account/content/fiataccounts/FiatAccountsDataModel.java
@@ -18,16 +18,19 @@
 package bisq.desktop.main.account.content.fiataccounts;
 
 import bisq.desktop.common.model.ActivatableDataModel;
+import bisq.desktop.main.overlays.popups.Popup;
 import bisq.desktop.util.GUIUtil;
 
 import bisq.core.account.witness.AccountAgeWitnessService;
 import bisq.core.locale.CurrencyUtil;
 import bisq.core.locale.FiatCurrency;
+import bisq.core.locale.Res;
 import bisq.core.locale.TradeCurrency;
 import bisq.core.offer.OpenOfferManager;
 import bisq.core.payment.AssetAccount;
 import bisq.core.payment.PaymentAccount;
 import bisq.core.trade.TradeManager;
+import bisq.core.user.DontShowAgainLookup;
 import bisq.core.user.Preferences;
 import bisq.core.user.User;
 
@@ -123,6 +126,19 @@ public void onSaveNewAccount(PaymentAccount paymentAccount) {
 
         accountAgeWitnessService.publishMyAccountAgeWitness(paymentAccount.getPaymentAccountPayload());
         accountAgeWitnessService.signAndPublishSameNameAccounts();
+
+        if (paymentAccount.getSingleTradeCurrency().getCode().equals("ARS")) {
+            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 void onUpdateAccount(PaymentAccount paymentAccount) {