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 problems with editing account names #6167

Merged
merged 3 commits into from Apr 27, 2022
Merged

Fix problems with editing account names #6167

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d7859ac
Fix NPE when editing same bank account name
Apr 26, 2022
3619278
Fix NPE when switching to not use a custom account name
Apr 26, 2022
a696a24
Refactor autoFillNameTextField in GeneralBankForm
Apr 26, 2022
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
5 changes: 0 additions & 5 deletions desktop/src/main/java/bisq/desktop/components/paymentmethods/BankForm.java
View file
Open in desktop
Expand Up @@ -396,11 +396,6 @@ private void addHolderNameAndId() {
});
}

@Override
protected void autoFillNameTextField() {
autoFillAccountTextFields(bankAccountPayload);
}

@Override
public void updateAllInputsValid() {
boolean result = isAccountNameValid()
Expand Down
26 changes: 21 additions & 5 deletions desktop/src/main/java/bisq/desktop/components/paymentmethods/CashDepositForm.java
View file
Open in desktop
Expand Up @@ -31,6 +31,7 @@
import bisq.core.locale.TradeCurrency;
import bisq.core.payment.CountryBasedPaymentAccount;
import bisq.core.payment.PaymentAccount;
import bisq.core.payment.payload.BankAccountPayload;
import bisq.core.payment.payload.CashDepositAccountPayload;
import bisq.core.payment.payload.PaymentAccountPayload;
import bisq.core.util.coin.CoinFormatter;
Expand Down Expand Up @@ -444,11 +445,6 @@ private void addHolderNameAndId() {
});
}

@Override
protected void autoFillNameTextField() {
autoFillAccountTextFields(cashDepositAccountPayload);
}

@Override
public void updateAllInputsValid() {
boolean result = isAccountNameValid()
Expand Down Expand Up @@ -483,4 +479,24 @@ private void addHolderNameAndIdForDisplayAccount() {
cashDepositAccountPayload.getHolderName());
}
}

@Override
protected String getBankId() {
return ((CashDepositAccountPayload) paymentAccount.paymentAccountPayload).getBankId();
}

@Override
protected String getBranchId() {
return ((CashDepositAccountPayload) paymentAccount.paymentAccountPayload).getBranchId();
}

@Override
protected String getBankName() {
return ((CashDepositAccountPayload) paymentAccount.paymentAccountPayload).getBankName();
}

@Override
protected String getAccountNr() {
return ((CashDepositAccountPayload) paymentAccount.paymentAccountPayload).getAccountNr();
}
}
68 changes: 27 additions & 41 deletions desktop/src/main/java/bisq/desktop/components/paymentmethods/GeneralBankForm.java
View file
Open in desktop
Expand Up @@ -137,62 +137,28 @@ void updateHolderIDInput(String countryCode, boolean requiresHolderId) {
}
}

void autoFillAccountTextFields(CountryBasedPaymentAccountPayload paymentAccountPayload) {


BankAccountPayload bankAccountPayload = null;
CashDepositAccountPayload cashDepositAccountPayload = null;
if (paymentAccountPayload instanceof BankAccountPayload) {
bankAccountPayload = (BankAccountPayload) paymentAccountPayload;
} else if (paymentAccountPayload instanceof CashDepositAccountPayload) {
cashDepositAccountPayload = (CashDepositAccountPayload) paymentAccountPayload;
}

@Override
protected void autoFillNameTextField() {
if (useCustomAccountNameToggleButton != null && !useCustomAccountNameToggleButton.isSelected()) {
String bankId = null;
String countryCode = paymentAccountPayload.getCountryCode();
String countryCode = getCountryCode();
if (countryCode == null)
countryCode = "";
if (BankUtil.isBankIdRequired(countryCode)) {
if (bankAccountPayload != null) {
bankId = bankAccountPayload.getBankId();
} else if (cashDepositAccountPayload != null) {
bankId = cashDepositAccountPayload.getBankId();
} else {
bankId = bankIdInputTextField.getText().trim();
}
bankId = getBankId();
if (bankId.length() > 9)
bankId = StringUtils.abbreviate(bankId, 9);
} else if (BankUtil.isBranchIdRequired(countryCode)) {
if (bankAccountPayload != null) {
bankId = bankAccountPayload.getBranchId();
} else if (cashDepositAccountPayload != null) {
bankId = cashDepositAccountPayload.getBranchId();
} else {
bankId = branchIdInputTextField.getText().trim();
}
bankId = getBranchId();
if (bankId.length() > 9)
bankId = StringUtils.abbreviate(bankId, 9);
} else if (BankUtil.isBankNameRequired(countryCode)) {
if (bankAccountPayload != null) {
bankId = bankAccountPayload.getBankName();
} else if (cashDepositAccountPayload != null) {
bankId = cashDepositAccountPayload.getBankName();
} else {
bankId = bankNameInputTextField.getText().trim();
}
bankId = getBankName();
if (bankId.length() > 9)
bankId = StringUtils.abbreviate(bankId, 9);
}

String accountNr;
if (bankAccountPayload != null) {
accountNr = bankAccountPayload.getAccountNr();
} else if (cashDepositAccountPayload != null) {
accountNr = cashDepositAccountPayload.getAccountNr();
} else {
accountNr = accountNrInputTextField.getText().trim();
}
String accountNr = getAccountNr();
if (accountNr.length() > 9)
accountNr = StringUtils.abbreviate(accountNr, 9);

Expand Down Expand Up @@ -243,4 +209,24 @@ boolean getValidationResult(boolean result, String countryCode, String bankName,

return result;
}

protected String getBankId() {
return ((BankAccountPayload) paymentAccount.paymentAccountPayload).getBankId();
}

protected String getBranchId() {
return ((BankAccountPayload) paymentAccount.paymentAccountPayload).getBranchId();
}

protected String getBankName() {
return ((BankAccountPayload) paymentAccount.paymentAccountPayload).getBankName();
}

protected String getAccountNr() {
return ((BankAccountPayload) paymentAccount.paymentAccountPayload).getAccountNr();
}

protected String getCountryCode() {
return ((CountryBasedPaymentAccountPayload) paymentAccount.paymentAccountPayload).getCountryCode();
}
}
6 changes: 0 additions & 6 deletions desktop/src/main/java/bisq/desktop/components/paymentmethods/GeneralUsBankForm.java
View file
Open in desktop
Expand Up @@ -30,7 +30,6 @@
import bisq.core.payment.CountryBasedPaymentAccount;
import bisq.core.payment.PaymentAccount;
import bisq.core.payment.payload.BankAccountPayload;
import bisq.core.payment.payload.CountryBasedPaymentAccountPayload;
import bisq.core.payment.payload.PaymentAccountPayload;
import bisq.core.util.coin.CoinFormatter;
import bisq.core.util.validation.InputValidator;
Expand Down Expand Up @@ -162,9 +161,4 @@ protected void onCountrySelected(Country country) {
paymentAccount.setSingleTradeCurrency(currency);
}
}

@Override
protected void autoFillNameTextField() {
autoFillAccountTextFields((BankAccountPayload) paymentAccount.getPaymentAccountPayload());
}
}