From 2c040ec7f50bc614b50185a77c3292f558a52b54 Mon Sep 17 00:00:00 2001
From: HenrikJannsen <boilingfrog@gmx.com>
Date: Sun, 26 May 2024 19:02:37 +0700
Subject: [PATCH] Only show XMR subaddress recommendation if the user has a XMR
 account setup.

Signed-off-by: HenrikJannsen <boilingfrog@gmx.com>
---
 .../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() {