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

Fix BankId leak #5234

Merged
merged 2 commits into from
Apr 13, 2021
Merged

Fix BankId leak #5234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e494de1
fix bankid leak
BtcContributor Feb 24, 2021
e1b9afa
Code refactoring and delete translations
BtcContributor Mar 12, 2021
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
2 changes: 0 additions & 2 deletions core/src/main/resources/i18n/displayStrings.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2647,8 +2647,6 @@ offerDetailsWindow.minBtcAmount=Min. BTC amount
offerDetailsWindow.min=(min. {0})
offerDetailsWindow.distance=(distance from market price: {0})
offerDetailsWindow.myTradingAccount=My trading account
offerDetailsWindow.offererBankId=(maker's bank ID/BIC/SWIFT)
offerDetailsWindow.offerersBankName=(maker's bank name)
offerDetailsWindow.bankId=Bank ID (e.g. BIC or SWIFT)
offerDetailsWindow.countryBank=Maker's country of bank
offerDetailsWindow.commitment=Commitment
Expand Down
19 changes: 1 addition & 18 deletions desktop/src/main/java/bisq/desktop/main/overlays/windows/OfferDetailsWindow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,24 +253,7 @@ private void addContent() {
addConfirmationLabelLabel(gridPane, ++rowIndex, Res.get("offerDetailsWindow.myTradingAccount"), myPaymentAccount.getAccountName());
} else {
final String method = Res.get(paymentMethod.getId());
String methodWithBankId = method + bankId;
String paymentMethodLabel = Res.get("shared.paymentMethod");
if (countryCode != null && (isNationalBanks || isSpecificBanks || isSepa)) {
if (BankUtil.isBankIdRequired(countryCode))
addConfirmationLabelLabel(gridPane, ++rowIndex,
paymentMethodLabel + " " + Res.get("offerDetailsWindow.offererBankId"),
BtcContributor marked this conversation as resolved.
Show resolved Hide resolved
methodWithBankId);
else if (BankUtil.isBankNameRequired(countryCode))
addConfirmationLabelLabel(gridPane, ++rowIndex,
paymentMethodLabel + " " + Res.get("offerDetailsWindow.offerersBankName"),
methodWithBankId);
} else if (paymentMethod.equals(PaymentMethod.CASH_DEPOSIT)) {
addConfirmationLabelLabel(gridPane, ++rowIndex,
paymentMethodLabel + " " + Res.get("offerDetailsWindow.offererBankId"),
methodWithBankId);
} else {
addConfirmationLabelLabel(gridPane, ++rowIndex, Res.get("shared.paymentMethod"), method);
}
addConfirmationLabelLabel(gridPane, ++rowIndex, Res.get("shared.paymentMethod"), method);
}

if (showXmrAutoConf) {
Expand Down