From e494de162d392725632bf34d8f2adbb8c8bf4844 Mon Sep 17 00:00:00 2001
From: BtcContributor <79100296+BtcContributor@users.noreply.github.com>
Date: Wed, 24 Feb 2021 23:08:27 +0100
Subject: [PATCH 1/2] fix bankid leak

---
 .../main/overlays/windows/OfferDetailsWindow.java   | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/OfferDetailsWindow.java b/desktop/src/main/java/bisq/desktop/main/overlays/windows/OfferDetailsWindow.java
index 64ecb798bb5..2468f6e1524 100644
--- a/desktop/src/main/java/bisq/desktop/main/overlays/windows/OfferDetailsWindow.java
+++ b/desktop/src/main/java/bisq/desktop/main/overlays/windows/OfferDetailsWindow.java
@@ -253,21 +253,20 @@ 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"),
-                            methodWithBankId);
+                            paymentMethodLabel,
+                            method);
                 else if (BankUtil.isBankNameRequired(countryCode))
                     addConfirmationLabelLabel(gridPane, ++rowIndex,
-                            paymentMethodLabel + " " + Res.get("offerDetailsWindow.offerersBankName"),
-                            methodWithBankId);
+                            paymentMethodLabel,
+                            method);
             } else if (paymentMethod.equals(PaymentMethod.CASH_DEPOSIT)) {
                 addConfirmationLabelLabel(gridPane, ++rowIndex,
-                        paymentMethodLabel + " " + Res.get("offerDetailsWindow.offererBankId"),
-                        methodWithBankId);
+                        paymentMethodLabel,
+                        method);
             } else {
                 addConfirmationLabelLabel(gridPane, ++rowIndex, Res.get("shared.paymentMethod"), method);
             }

From e1b9afa169e739f5999a50b6d178264ebfd19777 Mon Sep 17 00:00:00 2001
From: BtcContributor <79100296+BtcContributor@users.noreply.github.com>
Date: Fri, 12 Mar 2021 11:10:20 +0100
Subject: [PATCH 2/2] Code refactoring and delete translations

---
 .../resources/i18n/displayStrings.properties   |  2 --
 .../overlays/windows/OfferDetailsWindow.java   | 18 +-----------------
 2 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties
index 44097300bcc..40bcb8f0361 100644
--- a/core/src/main/resources/i18n/displayStrings.properties
+++ b/core/src/main/resources/i18n/displayStrings.properties
@@ -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
diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/OfferDetailsWindow.java b/desktop/src/main/java/bisq/desktop/main/overlays/windows/OfferDetailsWindow.java
index 2468f6e1524..64b0f9aa27e 100644
--- a/desktop/src/main/java/bisq/desktop/main/overlays/windows/OfferDetailsWindow.java
+++ b/desktop/src/main/java/bisq/desktop/main/overlays/windows/OfferDetailsWindow.java
@@ -253,23 +253,7 @@ private void addContent() {
             addConfirmationLabelLabel(gridPane, ++rowIndex, Res.get("offerDetailsWindow.myTradingAccount"), myPaymentAccount.getAccountName());
         } else {
             final String method = Res.get(paymentMethod.getId());
-            String paymentMethodLabel = Res.get("shared.paymentMethod");
-            if (countryCode != null && (isNationalBanks || isSpecificBanks || isSepa)) {
-                if (BankUtil.isBankIdRequired(countryCode))
-                    addConfirmationLabelLabel(gridPane, ++rowIndex,
-                            paymentMethodLabel,
-                            method);
-                else if (BankUtil.isBankNameRequired(countryCode))
-                    addConfirmationLabelLabel(gridPane, ++rowIndex,
-                            paymentMethodLabel,
-                            method);
-            } else if (paymentMethod.equals(PaymentMethod.CASH_DEPOSIT)) {
-                addConfirmationLabelLabel(gridPane, ++rowIndex,
-                        paymentMethodLabel,
-                        method);
-            } else {
-                addConfirmationLabelLabel(gridPane, ++rowIndex, Res.get("shared.paymentMethod"), method);
-            }
+            addConfirmationLabelLabel(gridPane, ++rowIndex, Res.get("shared.paymentMethod"), method);
         }
 
         if (showXmrAutoConf) {