Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix NPE on edition of CBM FasterPayments and USPostal accounts #6177

Merged
merged 1 commit into from Apr 28, 2022
Merged

Fix NPE on edition of CBM FasterPayments and USPostal accounts #6177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion desktop/src/main/java/bisq/desktop/components/paymentmethods/CashByMailForm.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ public void addFormForEditAccount() {
@Override
public void updateAllInputsValid() {
allInputsValid.set(isAccountNameValid()
&& !postalAddressTextArea.getText().isEmpty()
&& !cashByMailAccount.getPostalAddress().isEmpty()
&& inputValidator.validate(cashByMailAccount.getContact()).isValid
&& paymentAccount.getSingleTradeCurrency() != null);
}
Expand Down
14 changes: 9 additions & 5 deletions desktop/src/main/java/bisq/desktop/components/paymentmethods/FasterPaymentsForm.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ public static int addFormForBuyer(GridPane gridPane, int gridRow,
private InputTextField holderNameInputTextField;
private InputTextField accountNrInputTextField;
private InputTextField sortCodeInputTextField;
private final BranchIdValidator branchIdValidator;
private final AccountNrValidator accountNrValidator;

public FasterPaymentsForm(PaymentAccount paymentAccount,
AccountAgeWitnessService accountAgeWitnessService,
Expand All @@ -69,6 +71,8 @@ public FasterPaymentsForm(PaymentAccount paymentAccount,
CoinFormatter formatter) {
super(paymentAccount, accountAgeWitnessService, inputValidator, gridPane, gridRow, formatter);
this.fasterPaymentsAccount = (FasterPaymentsAccount) paymentAccount;
this.branchIdValidator = new BranchIdValidator("GB");
this.accountNrValidator = new AccountNrValidator("GB");
}

@Override
Expand All @@ -84,14 +88,14 @@ public void addFormForAddAccount() {
// do not translate as it is used in English only
sortCodeInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow, UK_SORT_CODE);
sortCodeInputTextField.setValidator(inputValidator);
sortCodeInputTextField.setValidator(new BranchIdValidator("GB"));
sortCodeInputTextField.setValidator(branchIdValidator);
sortCodeInputTextField.textProperty().addListener((ov, oldValue, newValue) -> {
fasterPaymentsAccount.setSortCode(newValue);
updateFromInputs();
});

accountNrInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow, Res.get("payment.accountNr"));
accountNrInputTextField.setValidator(new AccountNrValidator("GB"));
accountNrInputTextField.setValidator(accountNrValidator);
accountNrInputTextField.textProperty().addListener((ov, oldValue, newValue) -> {
fasterPaymentsAccount.setAccountNr(newValue);
updateFromInputs();
Expand Down Expand Up @@ -134,9 +138,9 @@ public void addFormForEditAccount() {
@Override
public void updateAllInputsValid() {
allInputsValid.set(isAccountNameValid()
&& holderNameInputTextField.getValidator().validate(fasterPaymentsAccount.getHolderName()).isValid
&& sortCodeInputTextField.getValidator().validate(fasterPaymentsAccount.getSortCode()).isValid
&& accountNrInputTextField.getValidator().validate(fasterPaymentsAccount.getAccountNr()).isValid
&& inputValidator.validate(fasterPaymentsAccount.getHolderName()).isValid
&& branchIdValidator.validate(fasterPaymentsAccount.getSortCode()).isValid
&& accountNrValidator.validate(fasterPaymentsAccount.getAccountNr()).isValid
&& fasterPaymentsAccount.getTradeCurrencies().size() > 0);
}
}
2 changes: 1 addition & 1 deletion desktop/src/main/java/bisq/desktop/components/paymentmethods/USPostalMoneyOrderForm.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ public void addFormForEditAccount() {
public void updateAllInputsValid() {
allInputsValid.set(isAccountNameValid()
&& usPostalMoneyOrderValidator.validate(usPostalMoneyOrderAccount.getPostalAddress()).isValid
&& !postalAddressTextArea.getText().isEmpty()
&& !usPostalMoneyOrderAccount.getPostalAddress().isEmpty()
&& inputValidator.validate(usPostalMoneyOrderAccount.getHolderName()).isValid
&& usPostalMoneyOrderAccount.getTradeCurrencies().size() > 0);
}
Expand Down