From 2c040ec7f50bc614b50185a77c3292f558a52b54 Mon Sep 17 00:00:00 2001 From: HenrikJannsen Date: Sun, 26 May 2024 19:02:37 +0700 Subject: [PATCH 1/2] Only show XMR subaddress recommendation if the user has a XMR account setup. Signed-off-by: HenrikJannsen --- .../java/bisq/desktop/main/account/AccountView.java | 9 --------- .../altcoinaccounts/AltCoinAccountsDataModel.java | 12 ++++++++++++ 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/desktop/src/main/java/bisq/desktop/main/account/AccountView.java b/desktop/src/main/java/bisq/desktop/main/account/AccountView.java index be031a1d26d..0a66c2e0feb 100644 --- a/desktop/src/main/java/bisq/desktop/main/account/AccountView.java +++ b/desktop/src/main/java/bisq/desktop/main/account/AccountView.java @@ -41,7 +41,6 @@ import bisq.core.locale.Res; import bisq.core.user.DontShowAgainLookup; -import bisq.common.app.DevEnv; import bisq.common.util.Utilities; import javax.inject.Inject; @@ -273,14 +272,6 @@ else if (root.getSelectionModel().getSelectedItem() == backupTab) .backgroundInfo(Res.get("account.info.msg")) .dontShowAgainId(key) .show(); - } else { - // news badge leads to the XMR subaddress info page (added in v1.9.2) - new Popup() - .headLine(Res.get("account.altcoin.popup.xmr.dataDirWarningHeadline")) - .backgroundInfo(Res.get("account.altcoin.popup.xmr.dataDirWarning")) - .dontShowAgainId("accountSubAddressInfo") - .width(700) - .show(); } } diff --git a/desktop/src/main/java/bisq/desktop/main/account/content/altcoinaccounts/AltCoinAccountsDataModel.java b/desktop/src/main/java/bisq/desktop/main/account/content/altcoinaccounts/AltCoinAccountsDataModel.java index a0f56008cd7..4dc8f2121e9 100644 --- a/desktop/src/main/java/bisq/desktop/main/account/content/altcoinaccounts/AltCoinAccountsDataModel.java +++ b/desktop/src/main/java/bisq/desktop/main/account/content/altcoinaccounts/AltCoinAccountsDataModel.java @@ -18,9 +18,11 @@ package bisq.desktop.main.account.content.altcoinaccounts; import bisq.desktop.common.model.ActivatableDataModel; +import bisq.desktop.main.overlays.popups.Popup; import bisq.desktop.util.GUIUtil; import bisq.core.locale.CryptoCurrency; +import bisq.core.locale.Res; import bisq.core.locale.TradeCurrency; import bisq.core.offer.OpenOfferManager; import bisq.core.payment.AssetAccount; @@ -76,6 +78,16 @@ public AltCoinAccountsDataModel(User user, protected void activate() { user.getPaymentAccountsAsObservable().addListener(setChangeListener); fillAndSortPaymentAccounts(); + + paymentAccounts.stream().filter(e -> e.getSingleTradeCurrency().getCode().equals("XMR")) + .findAny().ifPresent(e -> { + new Popup() + .headLine(Res.get("account.altcoin.popup.xmr.dataDirWarningHeadline")) + .backgroundInfo(Res.get("account.altcoin.popup.xmr.dataDirWarning")) + .dontShowAgainId("accountSubAddressInfo") + .width(700) + .show(); + }); } private void fillAndSortPaymentAccounts() { From 9defd482ef3e626df7a55ea175713d998e549b6e Mon Sep 17 00:00:00 2001 From: HenrikJannsen Date: Sun, 26 May 2024 19:19:42 +0700 Subject: [PATCH 2/2] Remove news badge from account Signed-off-by: HenrikJannsen --- .../presentation/AccountPresentation.java | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/desktop/src/main/java/bisq/desktop/main/presentation/AccountPresentation.java b/desktop/src/main/java/bisq/desktop/main/presentation/AccountPresentation.java index 3cf3a0ae868..86134f85ae1 100644 --- a/desktop/src/main/java/bisq/desktop/main/presentation/AccountPresentation.java +++ b/desktop/src/main/java/bisq/desktop/main/presentation/AccountPresentation.java @@ -50,7 +50,9 @@ public AccountPresentation(Preferences preferences) { preferences.getDontShowAgainMapAsObservable().addListener((MapChangeListener) change -> { if (change.getKey().equals(ACCOUNT_NEWS)) { - showNotification.set(!change.wasAdded()); + // devs enable this when a news badge is required + // showNotification.set(!change.wasAdded()); + showNotification.set(false); } }); } @@ -65,26 +67,26 @@ public BooleanProperty getShowAccountUpdatesNotification() { public void setup() { // devs enable this when a news badge is required - showNotification.set(preferences.showAgain(ACCOUNT_NEWS)); + //showNotification.set(preferences.showAgain(ACCOUNT_NEWS)); + showNotification.set(false); } - public void showOneTimeAccountSigningPopup(String key, String s) { - showOneTimeAccountSigningPopup(key, s, null); + public void showOneTimeAccountSigningPopup(String key, String message) { + showOneTimeAccountSigningPopup(key, message, null); } - public void showOneTimeAccountSigningPopup(String key, String s, String optionalParam) { + public void showOneTimeAccountSigningPopup(String key, String message, String optionalParam) { if (!DevEnv.isDevMode()) { DontShowAgainLookup.dontShowAgain(ACCOUNT_NEWS, false); showNotification.set(true); DontShowAgainLookup.dontShowAgain(key, true); - String message = optionalParam != null ? - Res.get(s, optionalParam, Res.get("popup.accountSigning.generalInformation")) : - Res.get(s, Res.get("popup.accountSigning.generalInformation")); + String information = optionalParam != null ? + Res.get(message, optionalParam, Res.get("popup.accountSigning.generalInformation")) : + Res.get(message, Res.get("popup.accountSigning.generalInformation")); - new Popup().information(message) - .show(); + new Popup().information(information).show(); } } }