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

Merge pull request #7378 from alvasw/Improve_XMR_subaddress_popup_behaviour

Browse source 
Improve XMR subaddress popup behaviour
This commit is contained in:
Alejandro García 2025-02-05 23:48:38 +00:00 • committed by GitHub
commit b8fcb90e8c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 35 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -203,6 +203,8 @@ public class XmrForm extends AssetsForm {
setFieldManagement(xmrAccountDelegate.isUsingSubAddresses()); setFieldManagement(xmrAccountDelegate.isUsingSubAddresses());
addLimitations(false); addLimitations(false);
addAccountNameTextFieldWithAutoFillToggleButton(); addAccountNameTextFieldWithAutoFillToggleButton();
showXmrSubAddressPopup();
} }
void setFieldManagement(boolean useSubAddresses) { void setFieldManagement(boolean useSubAddresses) {
@ -362,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)) {

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

@ -18,14 +18,14 @@
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;
import bisq.core.payment.CryptoCurrencyAccount;
import bisq.core.payment.PaymentAccount; import bisq.core.payment.PaymentAccount;
import bisq.core.trade.TradeManager; import bisq.core.trade.TradeManager;
import bisq.core.user.Preferences; import bisq.core.user.Preferences;
@ -44,6 +44,7 @@ import javafx.collections.SetChangeListener;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Comparator; import java.util.Comparator;
import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
class AltCoinAccountsDataModel extends ActivatableDataModel { class AltCoinAccountsDataModel extends ActivatableDataModel {
@ -79,14 +80,12 @@ class AltCoinAccountsDataModel extends ActivatableDataModel {
user.getPaymentAccountsAsObservable().addListener(setChangeListener); user.getPaymentAccountsAsObservable().addListener(setChangeListener);
fillAndSortPaymentAccounts(); fillAndSortPaymentAccounts();
paymentAccounts.stream().filter(e -> e.getSingleTradeCurrency().getCode().equals("XMR")) paymentAccounts.stream()
.findAny().ifPresent(e -> { .filter(e -> e.getSingleTradeCurrency().getCode().equals("XMR"))
new Popup() .forEach(e -> {
.headLine(Res.get("account.altcoin.popup.xmr.dataDirWarningHeadline")) if (!xmrAccountUsesSubAddresses(e)) {
.backgroundInfo(Res.get("account.altcoin.popup.xmr.dataDirWarning")) XmrForm.showXmrSubAddressPopup();
.dontShowAgainId("accountSubAddressInfo") }
.width(700)
.show();
}); });
} }
@ -99,6 +98,21 @@ class AltCoinAccountsDataModel extends ActivatableDataModel {
} }
} }
private boolean xmrAccountUsesSubAddresses(PaymentAccount paymentAccount) {
if (paymentAccount instanceof CryptoCurrencyAccount) {
CryptoCurrencyAccount account = (CryptoCurrencyAccount) paymentAccount;
Map<String, String> extraData = account.getExtraData();
if (extraData == null) {
return false;
}
String useXMmrSubAddresses = extraData.get("UseXMmrSubAddresses");
return useXMmrSubAddresses != null && useXMmrSubAddresses.equals("1");
}
return false;
}
@Override @Override
protected void deactivate() { protected void deactivate() {
user.getPaymentAccountsAsObservable().removeListener(setChangeListener); user.getPaymentAccountsAsObservable().removeListener(setChangeListener);