From 861f655ae7de9d42196aa6deb696c78b57fa5266 Mon Sep 17 00:00:00 2001
From: Alva Swanson <alvasw@protonmail.com>
Date: Wed, 5 Feb 2025 19:53:09 +0000
Subject: [PATCH] Refactor duplicate XMR subaddress popup code

---
 .../components/paymentmethods/XmrForm.java       | 16 ++++++++++------
 .../AltCoinAccountsDataModel.java                | 10 ++--------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/XmrForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/XmrForm.java
index 29f7f127e3..e0375b8806 100644
--- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/XmrForm.java
+++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/XmrForm.java
@@ -204,12 +204,7 @@ public class XmrForm extends AssetsForm {
         addLimitations(false);
         addAccountNameTextFieldWithAutoFillToggleButton();
 
-        new Popup()
-                .headLine(Res.get("account.altcoin.popup.xmr.dataDirWarningHeadline"))
-                .backgroundInfo(Res.get("account.altcoin.popup.xmr.dataDirWarning"))
-                .dontShowAgainId("accountSubAddressInfo")
-                .width(700)
-                .show();
+        showXmrSubAddressPopup();
     }
 
     void setFieldManagement(boolean useSubAddresses) {
@@ -369,6 +364,15 @@ public class XmrForm extends AssetsForm {
         }
     }
 
+    public static void showXmrSubAddressPopup() {
+        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 maybeShowXmrSubAddressInfo() {
         String key = "xmrSubAddressInfo";
         if (DontShowAgainLookup.showAgain(key)) {
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 4a493ee836..4792521100 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,11 +18,10 @@
 package bisq.desktop.main.account.content.altcoinaccounts;
 
 import bisq.desktop.common.model.ActivatableDataModel;
-import bisq.desktop.main.overlays.popups.Popup;
+import bisq.desktop.components.paymentmethods.XmrForm;
 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;
@@ -85,12 +84,7 @@ class AltCoinAccountsDataModel extends ActivatableDataModel {
                 .filter(e -> e.getSingleTradeCurrency().getCode().equals("XMR"))
                 .forEach(e -> {
                     if (!xmrAccountUsesSubAddresses(e)) {
-                        new Popup()
-                                .headLine(Res.get("account.altcoin.popup.xmr.dataDirWarningHeadline"))
-                                .backgroundInfo(Res.get("account.altcoin.popup.xmr.dataDirWarning"))
-                                .dontShowAgainId("accountSubAddressInfo")
-                                .width(700)
-                                .show();
+                        XmrForm.showXmrSubAddressPopup();
                     }
                 });
     }