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

Remove validation for Argentinian account numbers and allow manual edit #1553

Merged
merged 1 commit into from
May 24, 2018
Merged

Remove validation for Argentinian account numbers and allow manual edit #1553

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion src/main/java/bisq/desktop/components/paymentmethods/BankForm.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,9 @@
import javafx.scene.control.TextField;
import javafx.scene.layout.GridPane;

import javafx.beans.value.ChangeListener;
import javafx.beans.value.ObservableValue;

import javafx.collections.FXCollections;

import javafx.util.StringConverter;
Expand Down Expand Up @@ -234,6 +237,7 @@ static int addFormForBuyer(GridPane gridPane, int gridRow, PaymentAccountPayload
private boolean useHolderID;
private final Runnable closeHandler;
private ComboBox<TradeCurrency> currencyComboBox;
private boolean accountNrInputTextFieldEdited;

BankForm(PaymentAccount paymentAccount, AccountAgeWitnessService accountAgeWitnessService, InputValidator inputValidator,
GridPane gridPane, int gridRow, BSFormatter formatter, Runnable closeHandler) {
Expand Down Expand Up @@ -288,6 +292,7 @@ public void addFormForDisplayAccount() {

@Override
public void addFormForAddAccount() {
accountNrInputTextFieldEdited = false;
gridRowFrom = gridRow + 1;

Tuple3<Label, ComboBox, ComboBox> tuple3 = addLabelComboBoxComboBox(gridPane, ++gridRow, Res.get("payment.country"));
Expand Down Expand Up @@ -346,6 +351,9 @@ public Country fromString(String s) {
branchIdInputTextField.setText("");
nationalAccountIdInputTextField.setText("");
accountNrInputTextField.setText("");
accountNrInputTextField.focusedProperty().addListener((observable, oldValue, newValue) -> {
if (newValue) accountNrInputTextFieldEdited = true;
});
accountTypeComboBox.getSelectionModel().clearSelection();
accountTypeComboBox.setItems(FXCollections.observableArrayList(BankUtil.getAccountTypeValues(countryCode)));

Expand Down Expand Up @@ -617,7 +625,7 @@ protected void autoFillNameTextField() {
if (BankUtil.isNationalAccountIdRequired(countryCode)) {
String nationalAccountId = nationalAccountIdInputTextField.getText();

if (countryCode.equals("AR") && nationalAccountId.length() == 22) {
if (countryCode.equals("AR") && nationalAccountId.length() == 22 && !accountNrInputTextFieldEdited) {
branchIdInputTextField.setText(nationalAccountId.substring(3,7));
accountNrInputTextField.setText(nationalAccountId.substring(8,21));
}
Expand Down
7 changes: 6 additions & 1 deletion src/main/java/bisq/desktop/components/paymentmethods/CashDepositForm.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,7 @@ public static int addFormForBuyer(GridPane gridPane, int gridRow, PaymentAccount
private boolean useHolderID;
private ComboBox<TradeCurrency> currencyComboBox;
private final EmailValidator emailValidator;
private boolean accountNrInputTextFieldEdited;


public CashDepositForm(PaymentAccount paymentAccount, AccountAgeWitnessService accountAgeWitnessService, InputValidator inputValidator,
Expand Down Expand Up @@ -318,6 +319,7 @@ public void addFormForDisplayAccount() {

@Override
public void addFormForAddAccount() {
accountNrInputTextFieldEdited = false;
gridRowFrom = gridRow + 1;

Tuple3<Label, ComboBox, ComboBox> tuple3 = FormBuilder.addLabelComboBoxComboBox(gridPane, ++gridRow, Res.get("payment.country"));
Expand Down Expand Up @@ -375,6 +377,9 @@ public Country fromString(String s) {
branchIdInputTextField.setText("");
nationalAccountIdInputTextField.setText("");
accountNrInputTextField.setText("");
accountNrInputTextField.focusedProperty().addListener((observable, oldValue, newValue) -> {
if (newValue) accountNrInputTextFieldEdited = true;
});
accountTypeComboBox.getSelectionModel().clearSelection();
accountTypeComboBox.setItems(FXCollections.observableArrayList(BankUtil.getAccountTypeValues(countryCode)));

Expand Down Expand Up @@ -662,7 +667,7 @@ protected void autoFillNameTextField() {
if (BankUtil.isNationalAccountIdRequired(countryCode)) {
String nationalAccountId = nationalAccountIdInputTextField.getText();

if (countryCode.equals("AR") && nationalAccountId.length() == 22) {
if (countryCode.equals("AR") && nationalAccountId.length() == 22 && !accountNrInputTextFieldEdited) {
branchIdInputTextField.setText(nationalAccountId.substring(3,7));
accountNrInputTextField.setText(nationalAccountId.substring(8,21));
}
Expand Down
6 changes: 0 additions & 6 deletions src/main/java/bisq/desktop/util/validation/AccountNrValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,12 +102,6 @@ public ValidationResult validate(String input) {
} else {
return super.validate(null);
}
case "AR":
length = 13;
if (isNumberWithFixedLength(input, length))
return super.validate(input);
else
return new ValidationResult(false, Res.get("validation.sortCodeNumber", getLabel(), length));
default:
return super.validate(input);
}
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/bisq/desktop/util/validation/AccountNrValidatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ public void testValidationForArgentina() {
AccountNrValidator validator = new AccountNrValidator("AR");

assertTrue(validator.validate("4009041813520").isValid);
assertFalse(validator.validate("40090418135201").isValid);
assertTrue(validator.validate("035-005198/5").isValid);
}
}