Merge pull request #7379 from alvasw/AltCoinAccountsDataModel_Handle_XMR_detection_NullPointerException

AltCoinAccountsDataModel: Handle XMR detection NullPointerException
This commit is contained in:
Alejandro García 2025-02-05 23:49:15 +00:00 committed by GitHub
commit 54b094fae5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -81,7 +81,7 @@ class AltCoinAccountsDataModel extends ActivatableDataModel {
fillAndSortPaymentAccounts();
paymentAccounts.stream()
.filter(e -> e.getSingleTradeCurrency().getCode().equals("XMR"))
.filter(this::isXmrPaymentAccount)
.forEach(e -> {
if (!xmrAccountUsesSubAddresses(e)) {
XmrForm.showXmrSubAddressPopup();
@ -98,6 +98,11 @@ class AltCoinAccountsDataModel extends ActivatableDataModel {
}
}
private boolean isXmrPaymentAccount(PaymentAccount paymentAccount) {
TradeCurrency tradeCurrency = paymentAccount.getSingleTradeCurrency();
return tradeCurrency != null && tradeCurrency.getCode().equals("XMR");
}
private boolean xmrAccountUsesSubAddresses(PaymentAccount paymentAccount) {
if (paymentAccount instanceof CryptoCurrencyAccount) {
CryptoCurrencyAccount account = (CryptoCurrencyAccount) paymentAccount;