mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-03-01 01:32:17 +01:00
Code Issues Projects Releases Packages Wiki Activity

Refactor duplicate XMR subaddress popup code

Browse source
This commit is contained in:
Alva Swanson 2025-02-05 19:53:09 +00:00
parent 5e04336c4d
commit 861f655ae7
No known key found for this signature in database
GPG key ID: 004760E77F753090
2 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
desktop/src/main/java/bisq/desktop/components/paymentmethods/XmrForm.java
View file

@ -204,12 +204,7 @@ public class XmrForm extends AssetsForm {
addLimitations(false); addLimitations(false);
addAccountNameTextFieldWithAutoFillToggleButton(); addAccountNameTextFieldWithAutoFillToggleButton();
new Popup() showXmrSubAddressPopup();
.headLine(Res.get("account.altcoin.popup.xmr.dataDirWarningHeadline"))
.backgroundInfo(Res.get("account.altcoin.popup.xmr.dataDirWarning"))
.dontShowAgainId("accountSubAddressInfo")
.width(700)
.show();
} }
void setFieldManagement(boolean useSubAddresses) { 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() { private void maybeShowXmrSubAddressInfo() {
String key = "xmrSubAddressInfo"; String key = "xmrSubAddressInfo";
if (DontShowAgainLookup.showAgain(key)) { if (DontShowAgainLookup.showAgain(key)) {

10
desktop/src/main/java/bisq/desktop/main/account/content/altcoinaccounts/AltCoinAccountsDataModel.java
View file

@ -18,11 +18,10 @@
package bisq.desktop.main.account.content.altcoinaccounts; package bisq.desktop.main.account.content.altcoinaccounts;
import bisq.desktop.common.model.ActivatableDataModel; 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.desktop.util.GUIUtil;
import bisq.core.locale.CryptoCurrency; import bisq.core.locale.CryptoCurrency;
import bisq.core.locale.Res;
import bisq.core.locale.TradeCurrency; import bisq.core.locale.TradeCurrency;
import bisq.core.offer.OpenOfferManager; import bisq.core.offer.OpenOfferManager;
import bisq.core.payment.AssetAccount; import bisq.core.payment.AssetAccount;
@ -85,12 +84,7 @@ class AltCoinAccountsDataModel extends ActivatableDataModel {
.filter(e -> e.getSingleTradeCurrency().getCode().equals("XMR")) .filter(e -> e.getSingleTradeCurrency().getCode().equals("XMR"))
.forEach(e -> { .forEach(e -> {
if (!xmrAccountUsesSubAddresses(e)) { if (!xmrAccountUsesSubAddresses(e)) {
new Popup() XmrForm.showXmrSubAddressPopup();
.headLine(Res.get("account.altcoin.popup.xmr.dataDirWarningHeadline"))
.backgroundInfo(Res.get("account.altcoin.popup.xmr.dataDirWarning"))
.dontShowAgainId("accountSubAddressInfo")
.width(700)
.show();
} }
}); });
} }