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

Show XMR subaddress popup if user has non-subaddress account

Browse source 
Before PR #7123, we showed the XMR subaddress popup whenever the user
naviated to the account tab. After PR #7123, we show the XMR subaddress
popup if the user has an XMR account. However, it's better show the
popup if the user has a non-subaddress XMR account.
This commit is contained in:
Alva Swanson 2025-02-05 19:53:09 +00:00
parent 9f3e216fe1
commit 958661f25b
No known key found for this signature in database
GPG key ID: 004760E77F753090
1 changed files with 28 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -26,6 +26,7 @@ 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 +45,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 +81,17 @@ 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"))
.forEach(e -> {
if (!xmrAccountUsesSubAddresses(e)) {
new Popup() new Popup()
.headLine(Res.get("account.altcoin.popup.xmr.dataDirWarningHeadline")) .headLine(Res.get("account.altcoin.popup.xmr.dataDirWarningHeadline"))
.backgroundInfo(Res.get("account.altcoin.popup.xmr.dataDirWarning")) .backgroundInfo(Res.get("account.altcoin.popup.xmr.dataDirWarning"))
.dontShowAgainId("accountSubAddressInfo") .dontShowAgainId("accountSubAddressInfo")
.width(700) .width(700)
.show(); .show();
}
}); });
} }
@ -99,6 +104,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);