boldsuck/haveno
1
0
Fork 0
mirror of https://github.com/boldsuck/haveno.git synced 2024-12-23 12:39:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix npe in offer payment account selection

Browse source
This commit is contained in:
woodser 2023-05-20 10:00:22 -04:00
parent 5aba26ff82
commit 02eb2fb005
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
desktop/src/main/java/haveno/desktop/main/offer/MutableOfferDataModel.java
View file

@ -255,10 +255,10 @@ public abstract class MutableOfferDataModel extends OfferDataModel {
@NotNull @NotNull
private Optional<PaymentAccount> getAnyPaymentAccount() { private Optional<PaymentAccount> getAnyPaymentAccount() {
if (CurrencyUtil.isTraditionalCurrency(tradeCurrency.getCode())) { if (CurrencyUtil.isFiatCurrency(tradeCurrency.getCode())) {
return paymentAccounts.stream().filter(paymentAccount1 -> !paymentAccount1.getPaymentMethod().isCrypto()).findAny(); return paymentAccounts.stream().filter(paymentAccount1 -> paymentAccount1.isFiat()).findAny();
} else { } else {
return paymentAccounts.stream().filter(paymentAccount1 -> paymentAccount1.getPaymentMethod().isCrypto() && return paymentAccounts.stream().filter(paymentAccount1 -> !paymentAccount1.isFiat() &&
paymentAccount1.getTradeCurrency().isPresent() && paymentAccount1.getTradeCurrency().isPresent() &&
!Objects.equals(paymentAccount1.getTradeCurrency().get().getCode(), GUIUtil.TOP_CRYPTO.getCode())).findAny(); !Objects.equals(paymentAccount1.getTradeCurrency().get().getCode(), GUIUtil.TOP_CRYPTO.getCode())).findAny();
} }