mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-24 15:10:44 +01:00
Code Issues Projects Releases Packages Wiki Activity

"Transfer Same Bank" & "Transfer Specific Banks" case-insentitive

Browse source 
Offers match these payment method types only if bank names entered
in the maker and taker accounts are the same. However, if the maker
entered, for example, "BANK OF AMERICA" as bank name in their Bisq
account but the taker entered "Bank of America", the offer account
mismatches without this fix to make the match case-insensitive.
This commit is contained in:
Chris Parker 2024-09-23 12:26:13 -04:00
parent c8c9251f2b
commit 8e32546f02
No known key found for this signature in database
GPG key ID: C924FE487A9DA755
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
core/src/main/java/bisq/core/payment/ReceiptPredicates.java
View file

@ -58,6 +58,10 @@ class ReceiptPredicates {
return (account instanceof BankAccount) && isSameOrSpecificBank;
}
private boolean containsCaseInsensitive(String str, List<String> list){
return list.stream().anyMatch(x -> x.equalsIgnoreCase(str));
}
boolean isMatchingBankId(Offer offer, PaymentAccount account) {
final List<String> acceptedBanksForOffer = offer.getAcceptedBankIds();
Preconditions.checkNotNull(acceptedBanksForOffer, "offer.getAcceptedBankIds() must not be null");
@ -66,14 +70,14 @@ class ReceiptPredicates {
if (account instanceof SpecificBanksAccount) {
// check if we have a matching bank
boolean offerSideMatchesBank = (accountBankId != null) && acceptedBanksForOffer.contains(accountBankId);
boolean offerSideMatchesBank = (accountBankId != null) && containsCaseInsensitive(accountBankId, acceptedBanksForOffer);
List<String> acceptedBanksForAccount = ((SpecificBanksAccount) account).getAcceptedBanks();
boolean paymentAccountSideMatchesBank = acceptedBanksForAccount.contains(offer.getBankId());
boolean paymentAccountSideMatchesBank = containsCaseInsensitive(offer.getBankId(), acceptedBanksForAccount);
return offerSideMatchesBank && paymentAccountSideMatchesBank;
} else {
// national or same bank
return (accountBankId != null) && acceptedBanksForOffer.contains(accountBankId);
return (accountBankId != null) && containsCaseInsensitive(accountBankId, acceptedBanksForOffer);
}
}