From 0f3186b54ec0053ff49eb3885527995e26c05c72 Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Wed, 28 Nov 2018 12:31:54 +0100 Subject: [PATCH 1/6] Add info labels on top where necessary --- .../main/overlays/windows/FilterWindow.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/FilterWindow.java b/desktop/src/main/java/bisq/desktop/main/overlays/windows/FilterWindow.java index b81fa91b79..ab884bc062 100644 --- a/desktop/src/main/java/bisq/desktop/main/overlays/windows/FilterWindow.java +++ b/desktop/src/main/java/bisq/desktop/main/overlays/windows/FilterWindow.java @@ -21,7 +21,6 @@ import bisq.desktop.components.AutoTooltipButton; import bisq.desktop.components.InputTextField; import bisq.desktop.main.overlays.Overlay; import bisq.desktop.main.overlays.popups.Popup; -import bisq.desktop.util.FormBuilder; import bisq.core.filter.Filter; import bisq.core.filter.FilterManager; @@ -49,6 +48,7 @@ import java.util.stream.Collectors; import static bisq.desktop.util.FormBuilder.addInputTextField; import static bisq.desktop.util.FormBuilder.addLabelCheckBox; +import static bisq.desktop.util.FormBuilder.addTopLabelInputTextField; public class FilterWindow extends Overlay { private SendFilterMessageHandler sendFilterMessageHandler; @@ -126,19 +126,19 @@ public class FilterWindow extends Overlay { if (useDevPrivilegeKeys) keyInputTextField.setText(DevEnv.DEV_PRIVILEGE_PRIV_KEY); - InputTextField offerIdsInputTextField = FormBuilder.addInputTextField(gridPane, ++rowIndex, Res.get("filterWindow.offers")); - InputTextField nodesInputTextField = FormBuilder.addInputTextField(gridPane, ++rowIndex, Res.get("filterWindow.onions")); + InputTextField offerIdsInputTextField = addInputTextField(gridPane, ++rowIndex, Res.get("filterWindow.offers")); + InputTextField nodesInputTextField = addTopLabelInputTextField(gridPane, ++rowIndex, Res.get("filterWindow.onions")).second; nodesInputTextField.setPromptText("E.g. zqnzx6o3nifef5df.onion:9999"); // Do not translate - InputTextField paymentAccountFilterInputTextField = FormBuilder.addInputTextField(gridPane, ++rowIndex, Res.get("filterWindow.accounts")); + InputTextField paymentAccountFilterInputTextField = addTopLabelInputTextField(gridPane, ++rowIndex, Res.get("filterWindow.accounts")).second; GridPane.setHalignment(paymentAccountFilterInputTextField, HPos.RIGHT); paymentAccountFilterInputTextField.setPromptText("E.g. PERFECT_MONEY|getAccountNr|12345"); // Do not translate - InputTextField bannedCurrenciesInputTextField = FormBuilder.addInputTextField(gridPane, ++rowIndex, Res.get("filterWindow.bannedCurrencies")); - InputTextField bannedPaymentMethodsInputTextField = FormBuilder.addInputTextField(gridPane, ++rowIndex, Res.get("filterWindow.bannedPaymentMethods")); + InputTextField bannedCurrenciesInputTextField = addInputTextField(gridPane, ++rowIndex, Res.get("filterWindow.bannedCurrencies")); + InputTextField bannedPaymentMethodsInputTextField = addTopLabelInputTextField(gridPane, ++rowIndex, Res.get("filterWindow.bannedPaymentMethods")).second; bannedPaymentMethodsInputTextField.setPromptText("E.g. PERFECT_MONEY"); // Do not translate - InputTextField arbitratorsInputTextField = FormBuilder.addInputTextField(gridPane, ++rowIndex, Res.get("filterWindow.arbitrators")); - InputTextField seedNodesInputTextField = FormBuilder.addInputTextField(gridPane, ++rowIndex, Res.get("filterWindow.seedNode")); - InputTextField priceRelayNodesInputTextField = FormBuilder.addInputTextField(gridPane, ++rowIndex, Res.get("filterWindow.priceRelayNode")); - InputTextField btcNodesInputTextField = FormBuilder.addInputTextField(gridPane, ++rowIndex, Res.get("filterWindow.btcNode")); + InputTextField arbitratorsInputTextField = addInputTextField(gridPane, ++rowIndex, Res.get("filterWindow.arbitrators")); + InputTextField seedNodesInputTextField = addInputTextField(gridPane, ++rowIndex, Res.get("filterWindow.seedNode")); + InputTextField priceRelayNodesInputTextField = addInputTextField(gridPane, ++rowIndex, Res.get("filterWindow.priceRelayNode")); + InputTextField btcNodesInputTextField = addInputTextField(gridPane, ++rowIndex, Res.get("filterWindow.btcNode")); CheckBox preventPublicBtcNetworkCheckBox = addLabelCheckBox(gridPane, ++rowIndex, Res.get("filterWindow.preventPublicBtcNetwork")); final Filter filter = filterManager.getDevelopersFilter(); From 888e4f5bc5b646622e758e8e01f67ee92ba197c8 Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Wed, 28 Nov 2018 12:53:10 +0100 Subject: [PATCH 2/6] Fix wrong paddings for bank accounts with holder id --- .../components/paymentmethods/BankForm.java | 2 +- .../paymentmethods/CashDepositForm.java | 27 +++++++++---------- .../java/bisq/desktop/util/FormBuilder.java | 16 +++++------ 3 files changed, 22 insertions(+), 23 deletions(-) diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/BankForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/BankForm.java index cb4cd8430b..a52deac8ed 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/BankForm.java +++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/BankForm.java @@ -419,7 +419,7 @@ abstract class BankForm extends GeneralBankForm { private void addHolderNameAndIdForDisplayAccount() { String countryCode = bankAccountPayload.getCountryCode(); if (BankUtil.isHolderIdRequired(countryCode)) { - Tuple4 tuple = addLabelTextFieldLabelTextField(gridPane, ++gridRow, + Tuple4 tuple = addCompactTopLabelTextFieldTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner"), BankUtil.getHolderIdLabel(countryCode)); TextField holderNameTextField = tuple.second; holderNameTextField.setText(bankAccountPayload.getHolderName()); diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/CashDepositForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/CashDepositForm.java index ace51f1dfb..0132812aa3 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/CashDepositForm.java +++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/CashDepositForm.java @@ -18,7 +18,6 @@ package bisq.desktop.components.paymentmethods; import bisq.desktop.components.InputTextField; -import bisq.desktop.util.FormBuilder; import bisq.desktop.util.GUIUtil; import bisq.desktop.util.Layout; import bisq.desktop.util.validation.EmailValidator; @@ -196,46 +195,46 @@ public class CashDepositForm extends GeneralBankForm { String countryCode = cashDepositAccountPayload.getCountryCode(); addTopLabelTextField(gridPane, gridRow, Res.get("payment.account.name"), paymentAccount.getAccountName(), Layout.FIRST_ROW_AND_GROUP_DISTANCE); - FormBuilder.addTopLabelTextField(gridPane, ++gridRow, Res.get("shared.paymentMethod"), + addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.paymentMethod"), Res.get(paymentAccount.getPaymentMethod().getId())); - FormBuilder.addTopLabelTextField(gridPane, ++gridRow, Res.get("payment.country"), + addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.country"), getCountryBasedPaymentAccount().getCountry() != null ? getCountryBasedPaymentAccount().getCountry().name : ""); TradeCurrency singleTradeCurrency = paymentAccount.getSingleTradeCurrency(); String nameAndCode = singleTradeCurrency != null ? singleTradeCurrency.getNameAndCode() : "null"; - FormBuilder.addTopLabelTextField(gridPane, ++gridRow, Res.get("shared.currency"), + addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.currency"), nameAndCode); addHolderNameAndIdForDisplayAccount(); - FormBuilder.addTopLabelTextField(gridPane, ++gridRow, Res.get("payment.email"), + addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.email"), cashDepositAccountPayload.getHolderEmail()); if (BankUtil.isBankNameRequired(countryCode)) - FormBuilder.addTopLabelTextField(gridPane, ++gridRow, Res.get("payment.bank.name"), + addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.bank.name"), cashDepositAccountPayload.getBankName()).second.setMouseTransparent(false); if (BankUtil.isBankIdRequired(countryCode)) - FormBuilder.addTopLabelTextField(gridPane, ++gridRow, BankUtil.getBankIdLabel(countryCode), + addCompactTopLabelTextField(gridPane, ++gridRow, BankUtil.getBankIdLabel(countryCode), cashDepositAccountPayload.getBankId()).second.setMouseTransparent(false); if (BankUtil.isBranchIdRequired(countryCode)) - FormBuilder.addTopLabelTextField(gridPane, ++gridRow, BankUtil.getBranchIdLabel(countryCode), + addCompactTopLabelTextField(gridPane, ++gridRow, BankUtil.getBranchIdLabel(countryCode), cashDepositAccountPayload.getBranchId()).second.setMouseTransparent(false); if (BankUtil.isNationalAccountIdRequired(countryCode)) - FormBuilder.addTopLabelTextField(gridPane, ++gridRow, BankUtil.getNationalAccountIdLabel(countryCode), + addCompactTopLabelTextField(gridPane, ++gridRow, BankUtil.getNationalAccountIdLabel(countryCode), cashDepositAccountPayload.getNationalAccountId()).second.setMouseTransparent(false); if (BankUtil.isAccountNrRequired(countryCode)) - FormBuilder.addTopLabelTextField(gridPane, ++gridRow, BankUtil.getAccountNrLabel(countryCode), + addCompactTopLabelTextField(gridPane, ++gridRow, BankUtil.getAccountNrLabel(countryCode), cashDepositAccountPayload.getAccountNr()).second.setMouseTransparent(false); if (BankUtil.isAccountTypeRequired(countryCode)) - FormBuilder.addTopLabelTextField(gridPane, ++gridRow, BankUtil.getAccountTypeLabel(countryCode), + addCompactTopLabelTextField(gridPane, ++gridRow, BankUtil.getAccountTypeLabel(countryCode), cashDepositAccountPayload.getAccountType()).second.setMouseTransparent(false); String requirements = cashDepositAccountPayload.getRequirements(); boolean showRequirements = requirements != null && !requirements.isEmpty(); if (showRequirements) { - TextArea textArea = addTopLabelTextArea(gridPane, ++gridRow, Res.get("payment.extras"), "").second; + TextArea textArea = addCompactTopLabelTextArea(gridPane, ++gridRow, Res.get("payment.extras"), "").second; textArea.setMinHeight(30); textArea.setMaxHeight(30); textArea.setEditable(false); @@ -466,14 +465,14 @@ public class CashDepositForm extends GeneralBankForm { private void addHolderNameAndIdForDisplayAccount() { String countryCode = cashDepositAccountPayload.getCountryCode(); if (BankUtil.isHolderIdRequired(countryCode)) { - Tuple4 tuple = FormBuilder.addLabelTextFieldLabelTextField(gridPane, ++gridRow, + Tuple4 tuple = addCompactTopLabelTextFieldTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner"), BankUtil.getHolderIdLabel(countryCode)); TextField holderNameTextField = tuple.second; holderNameTextField.setText(cashDepositAccountPayload.getHolderName()); holderNameTextField.setMinWidth(300); tuple.forth.setText(cashDepositAccountPayload.getHolderTaxId()); } else { - FormBuilder.addTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner"), + addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner"), cashDepositAccountPayload.getHolderName()); } } diff --git a/desktop/src/main/java/bisq/desktop/util/FormBuilder.java b/desktop/src/main/java/bisq/desktop/util/FormBuilder.java index 9947e320b5..06a435856e 100644 --- a/desktop/src/main/java/bisq/desktop/util/FormBuilder.java +++ b/desktop/src/main/java/bisq/desktop/util/FormBuilder.java @@ -656,28 +656,28 @@ public class FormBuilder { // Label + TextField + Label + TextField /////////////////////////////////////////////////////////////////////////////////////////// - public static Tuple4 addLabelTextFieldLabelTextField(GridPane gridPane, int rowIndex, String title1, String title2) { - Label label1 = addLabel(gridPane, rowIndex, title1, 0); - + public static Tuple4 addCompactTopLabelTextFieldTopLabelTextField(GridPane gridPane, int rowIndex, String title1, String title2) { TextField textField1 = new BisqTextField(); textField1.setEditable(false); textField1.setMouseTransparent(true); textField1.setFocusTraversable(false); - Label label2 = new AutoTooltipLabel(title2); - HBox.setMargin(label2, new Insets(5, 0, 0, 0)); + + final Tuple2 topLabelWithVBox1 = getTopLabelWithVBox(title1, textField1); + TextField textField2 = new BisqTextField(); textField2.setEditable(false); textField2.setMouseTransparent(true); textField2.setFocusTraversable(false); + final Tuple2 topLabelWithVBox2 = getTopLabelWithVBox(title2, textField2); + HBox hBox = new HBox(); hBox.setSpacing(10); - hBox.getChildren().addAll(textField1, label2, textField2); + hBox.getChildren().addAll(topLabelWithVBox1.second, topLabelWithVBox2.second); GridPane.setRowIndex(hBox, rowIndex); - GridPane.setColumnIndex(hBox, 1); gridPane.getChildren().add(hBox); - return new Tuple4<>(label1, textField1, label2, textField2); + return new Tuple4<>(topLabelWithVBox1.first, textField1, topLabelWithVBox2.first, textField2); } From 18cda37846632f6f43014058b036d1ef4ca9ff1c Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Wed, 28 Nov 2018 15:03:32 +0100 Subject: [PATCH 3/6] Increase postal address text area to fit three lines without scrolling --- .../components/paymentmethods/USPostalMoneyOrderForm.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/USPostalMoneyOrderForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/USPostalMoneyOrderForm.java index 41420a6368..d344e496bf 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/USPostalMoneyOrderForm.java +++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/USPostalMoneyOrderForm.java @@ -76,7 +76,7 @@ public class USPostalMoneyOrderForm extends PaymentMethodForm { postalAddressTextArea = addTopLabelTextArea(gridPane, ++gridRow, Res.get("payment.postal.address"), "").second; - postalAddressTextArea.setPrefHeight(60); + postalAddressTextArea.setPrefHeight(70); //postalAddressTextArea.setValidator(usPostalMoneyOrderValidator); postalAddressTextArea.textProperty().addListener((ov, oldValue, newValue) -> { usPostalMoneyOrderAccount.setPostalAddress(newValue); @@ -108,7 +108,7 @@ public class USPostalMoneyOrderForm extends PaymentMethodForm { usPostalMoneyOrderAccount.getHolderName()); TextArea textArea = addCompactTopLabelTextArea(gridPane, ++gridRow, Res.get("payment.postal.address"), "").second; textArea.setText(usPostalMoneyOrderAccount.getPostalAddress()); - textArea.setPrefHeight(60); + textArea.setPrefHeight(70); textArea.setEditable(false); TradeCurrency singleTradeCurrency = usPostalMoneyOrderAccount.getSingleTradeCurrency(); String nameAndCode = singleTradeCurrency != null ? singleTradeCurrency.getNameAndCode() : "null"; From b0d337bae5cbc6b8aecc6dfe74dad9c321d6a4e6 Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Wed, 28 Nov 2018 16:00:43 +0100 Subject: [PATCH 4/6] Align offer count in trade currency combobox --- desktop/src/main/java/bisq/desktop/util/GUIUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop/src/main/java/bisq/desktop/util/GUIUtil.java b/desktop/src/main/java/bisq/desktop/util/GUIUtil.java index f38b4d9816..9f8ce6a25d 100644 --- a/desktop/src/main/java/bisq/desktop/util/GUIUtil.java +++ b/desktop/src/main/java/bisq/desktop/util/GUIUtil.java @@ -404,7 +404,7 @@ public class GUIUtil { (offerCountOptional.get() == 1 ? postFixSingle : postFixMulti)); numberOfOffers.getStyleClass().add("offer-label-small"); AnchorPane.setRightAnchor(numberOfOffers, 0.0); - AnchorPane.setBottomAnchor(numberOfOffers, 0.0); + AnchorPane.setBottomAnchor(numberOfOffers, 2.0); pane.getChildren().add(numberOfOffers); } } From 5c804018abab700aa6332b7796de9daebafc11e1 Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Wed, 28 Nov 2018 16:37:01 +0100 Subject: [PATCH 5/6] Align offer count in trade currency combobox --- .../payload/CashDepositAccountPayload.java | 22 +++++++++---------- .../resources/i18n/displayStrings.properties | 2 +- .../paymentmethods/CashDepositForm.java | 10 ++++----- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/core/src/main/java/bisq/core/payment/payload/CashDepositAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/CashDepositAccountPayload.java index ce4d2702fa..943ffe9a25 100644 --- a/core/src/main/java/bisq/core/payment/payload/CashDepositAccountPayload.java +++ b/core/src/main/java/bisq/core/payment/payload/CashDepositAccountPayload.java @@ -164,25 +164,25 @@ public class CashDepositAccountPayload extends CountryBasedPaymentAccountPayload @Override public String getPaymentDetailsForTradePopup() { String bankName = BankUtil.isBankNameRequired(countryCode) ? - BankUtil.getBankNameLabel(countryCode) + " " + this.bankName + "\n" : ""; + BankUtil.getBankNameLabel(countryCode) + ": " + this.bankName + "\n" : ""; String bankId = BankUtil.isBankIdRequired(countryCode) ? - BankUtil.getBankIdLabel(countryCode) + " " + this.bankId + "\n" : ""; + BankUtil.getBankIdLabel(countryCode) + ": " + this.bankId + "\n" : ""; String branchId = BankUtil.isBranchIdRequired(countryCode) ? - BankUtil.getBranchIdLabel(countryCode) + " " + this.branchId + "\n" : ""; + BankUtil.getBranchIdLabel(countryCode) + ": " + this.branchId + "\n" : ""; String nationalAccountId = BankUtil.isNationalAccountIdRequired(countryCode) ? - BankUtil.getNationalAccountIdLabel(countryCode) + " " + this.nationalAccountId + "\n" : ""; + BankUtil.getNationalAccountIdLabel(countryCode) + ": " + this.nationalAccountId + "\n" : ""; String accountNr = BankUtil.isAccountNrRequired(countryCode) ? - BankUtil.getAccountNrLabel(countryCode) + " " + this.accountNr + "\n" : ""; + BankUtil.getAccountNrLabel(countryCode) + ": " + this.accountNr + "\n" : ""; String accountType = BankUtil.isAccountTypeRequired(countryCode) ? - BankUtil.getAccountTypeLabel(countryCode) + " " + this.accountType + "\n" : ""; + BankUtil.getAccountTypeLabel(countryCode) + ": " + this.accountType + "\n" : ""; String holderTaxIdString = BankUtil.isHolderIdRequired(countryCode) ? - (BankUtil.getHolderIdLabel(countryCode) + " " + holderTaxId + "\n") : ""; + (BankUtil.getHolderIdLabel(countryCode) + ": " + holderTaxId + "\n") : ""; String requirementsString = requirements != null && !requirements.isEmpty() ? - ("Extra requirements: " + requirements + "\n") : ""; + (Res.getWithCol("payment.extras") + " " + requirements + "\n") : ""; String emailString = holderEmail != null ? - (Res.get("payment.email") + " " + holderEmail + "\n") : ""; + (Res.getWithCol("payment.email") + " " + holderEmail + "\n") : ""; - return "Holder name: " + holderName + "\n" + + return Res.getWithCol("payment.account.owner") + " " + holderName + "\n" + emailString + bankName + bankId + @@ -192,7 +192,7 @@ public class CashDepositAccountPayload extends CountryBasedPaymentAccountPayload accountType + holderTaxIdString + requirementsString + - "Country of bank: " + CountryUtil.getNameByCode(countryCode); + Res.getWithCol("payment.bank.country") + " " + CountryUtil.getNameByCode(countryCode); } public String getHolderIdLabel() { diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties index ea7063a377..2a1a208a9a 100644 --- a/core/src/main/resources/i18n/displayStrings.properties +++ b/core/src/main/resources/i18n/displayStrings.properties @@ -589,7 +589,7 @@ The trade ID (\"reason for payment\" text) of the transaction is: \"{2}\" portfolio.pending.step3_seller.bank=Your trading partner has confirmed that he initiated the {0} payment.\n\n\ Please go to your online banking web page and check if you have received {1} from the BTC buyer.\n\n\ The trade ID (\"reason for payment\" text) of the transaction is: \"{2}\"\n\n -portfolio.pending.step3_seller.cash=\n\nBecause the payment is done via Cash Deposit the BTC buyer has to write \"NO REFUND\" on the paper receipt, tear it in 2 parts and send you a photo by email.\n\n\ +portfolio.pending.step3_seller.cash=Because the payment is done via Cash Deposit the BTC buyer has to write \"NO REFUND\" on the paper receipt, tear it in 2 parts and send you a photo by email.\n\n\ To avoid chargeback risk, only confirm if you received the email and if you are sure the paper receipt is valid.\n\ If you are not sure, {0} portfolio.pending.step3_seller.moneyGram=The buyer has to send you the Authorisation number and a photo of the receipt by email.\n\ diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/CashDepositForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/CashDepositForm.java index 0132812aa3..24595a66f9 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/CashDepositForm.java +++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/CashDepositForm.java @@ -70,7 +70,7 @@ public class CashDepositForm extends GeneralBankForm { data.getHolderName() + " / " + data.getHolderEmail()); if (!showRequirements) - addCompactTopLabelTextFieldWithCopyIcon(gridPane, getIndexOfColumn(colIndex) == 0 ? ++gridRow : gridRow, getIndexOfColumn(colIndex++), Res.get("payment.bank.country"), + addCompactTopLabelTextFieldWithCopyIcon(gridPane, getIndexOfColumn(colIndex) == 0 ? ++gridRow : gridRow, getIndexOfColumn(colIndex++), Res.getWithCol("payment.bank.country"), CountryUtil.getNameAndCode(countryCode)); else requirements += "\n" + Res.get("payment.bank.country") + " " + CountryUtil.getNameAndCode(countryCode); @@ -109,13 +109,13 @@ public class CashDepositForm extends GeneralBankForm { if (bankNameBankIdCombined) { addCompactTopLabelTextFieldWithCopyIcon(gridPane, getIndexOfColumn(colIndex) == 0 ? ++gridRow : gridRow, getIndexOfColumn(colIndex++), bankNameLabel + " / " + - bankIdLabel + ":", + bankIdLabel, data.getBankName() + " / " + data.getBankId()); } if (bankNameBranchIdCombined) { addCompactTopLabelTextFieldWithCopyIcon(gridPane, getIndexOfColumn(colIndex) == 0 ? ++gridRow : gridRow, getIndexOfColumn(colIndex++), bankNameLabel + " / " + - branchIdLabel + ":", + branchIdLabel, data.getBankName() + " / " + data.getBranchId()); } @@ -125,7 +125,7 @@ public class CashDepositForm extends GeneralBankForm { if (!bankNameBankIdCombined && !bankNameBranchIdCombined && !branchIdAccountNrCombined && bankIdBranchIdCombined) { addCompactTopLabelTextFieldWithCopyIcon(gridPane, getIndexOfColumn(colIndex) == 0 ? ++gridRow : gridRow, bankIdLabel + " / " + - branchIdLabel + ":", + branchIdLabel, data.getBankId() + " / " + data.getBranchId()); } @@ -135,7 +135,7 @@ public class CashDepositForm extends GeneralBankForm { if (!bankNameBranchIdCombined && !bankIdBranchIdCombined && branchIdAccountNrCombined) { addCompactTopLabelTextFieldWithCopyIcon(gridPane, getIndexOfColumn(colIndex) == 0 ? ++gridRow : gridRow, getIndexOfColumn(colIndex++), branchIdLabel + " / " + - accountNrLabel + ":", + accountNrLabel, data.getBranchId() + " / " + data.getAccountNr()); } From eb876576d7ed9cecf6b1456644e35b7d710ec49f Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Wed, 28 Nov 2018 17:39:14 +0100 Subject: [PATCH 6/6] Get rid of hard coded strings in account payloads --- .../payload/AdvancedCashAccountPayload.java | 4 +++- .../payment/payload/AliPayAccountPayload.java | 4 +++- .../payment/payload/BankAccountPayload.java | 19 ++++++++++--------- .../payload/CashAppAccountPayload.java | 4 +++- .../payload/ChaseQuickPayAccountPayload.java | 8 +++++--- .../payload/ClearXchangeAccountPayload.java | 8 +++++--- .../payload/CryptoCurrencyAccountPayload.java | 4 +++- .../payment/payload/F2FAccountPayload.java | 8 ++++++-- .../payload/FasterPaymentsAccountPayload.java | 6 ++++-- .../payload/HalCashAccountPayload.java | 6 ++++-- .../InteracETransferAccountPayload.java | 14 +++++++++----- .../payload/MoneyBeamAccountPayload.java | 4 +++- .../payload/MoneyGramAccountPayload.java | 12 +++++++----- .../payload/NationalBankAccountPayload.java | 4 +++- .../payment/payload/OKPayAccountPayload.java | 4 +++- .../payload/PerfectMoneyAccountPayload.java | 4 +++- .../payload/PopmoneyAccountPayload.java | 5 ++++- .../payload/PromptPayAccountPayload.java | 4 +++- .../payload/SameBankAccountPayload.java | 4 +++- .../payment/payload/SepaAccountPayload.java | 7 ++++--- .../payload/SepaInstantAccountPayload.java | 8 +++++--- .../payload/SpecificBanksAccountPayload.java | 6 ++++-- .../payment/payload/SwishAccountPayload.java | 9 ++++++--- .../USPostalMoneyOrderAccountPayload.java | 9 ++++++--- .../payment/payload/UpholdAccountPayload.java | 4 +++- .../payment/payload/VenmoAccountPayload.java | 5 ++++- .../payload/WeChatPayAccountPayload.java | 4 +++- .../payload/WesternUnionAccountPayload.java | 13 +++++++------ .../resources/i18n/displayStrings.properties | 1 + 29 files changed, 127 insertions(+), 65 deletions(-) diff --git a/core/src/main/java/bisq/core/payment/payload/AdvancedCashAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/AdvancedCashAccountPayload.java index ab680861ab..43ca9fce35 100644 --- a/core/src/main/java/bisq/core/payment/payload/AdvancedCashAccountPayload.java +++ b/core/src/main/java/bisq/core/payment/payload/AdvancedCashAccountPayload.java @@ -17,6 +17,8 @@ package bisq.core.payment.payload; +import bisq.core.locale.Res; + import io.bisq.generated.protobuffer.PB; import com.google.protobuf.Message; @@ -89,7 +91,7 @@ public final class AdvancedCashAccountPayload extends PaymentAccountPayload { @Override public String getPaymentDetails() { - return "Advanced Cash - Wallet ID: " + accountNr; + return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.wallet") + " " + accountNr; } @Override diff --git a/core/src/main/java/bisq/core/payment/payload/AliPayAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/AliPayAccountPayload.java index 1621bf8d36..1aacab3443 100644 --- a/core/src/main/java/bisq/core/payment/payload/AliPayAccountPayload.java +++ b/core/src/main/java/bisq/core/payment/payload/AliPayAccountPayload.java @@ -17,6 +17,8 @@ package bisq.core.payment.payload; +import bisq.core.locale.Res; + import io.bisq.generated.protobuffer.PB; import com.google.protobuf.Message; @@ -86,7 +88,7 @@ public final class AliPayAccountPayload extends PaymentAccountPayload { @Override public String getPaymentDetails() { - return "AliPay - Account no.: " + accountNr; + return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account.no") + " " + accountNr; } @Override diff --git a/core/src/main/java/bisq/core/payment/payload/BankAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/BankAccountPayload.java index 2eab0bee5f..f21f380108 100644 --- a/core/src/main/java/bisq/core/payment/payload/BankAccountPayload.java +++ b/core/src/main/java/bisq/core/payment/payload/BankAccountPayload.java @@ -19,6 +19,7 @@ package bisq.core.payment.payload; import bisq.core.locale.BankUtil; import bisq.core.locale.CountryUtil; +import bisq.core.locale.Res; import io.bisq.generated.protobuffer.PB; @@ -123,21 +124,21 @@ public abstract class BankAccountPayload extends CountryBasedPaymentAccountPaylo @Override public String getPaymentDetailsForTradePopup() { String bankName = BankUtil.isBankNameRequired(countryCode) ? - BankUtil.getBankNameLabel(countryCode) + " " + this.bankName + "\n" : ""; + BankUtil.getBankNameLabel(countryCode) + ": " + this.bankName + "\n" : ""; String bankId = BankUtil.isBankIdRequired(countryCode) ? - BankUtil.getBankIdLabel(countryCode) + " " + this.bankId + "\n" : ""; + BankUtil.getBankIdLabel(countryCode) + ": " + this.bankId + "\n" : ""; String branchId = BankUtil.isBranchIdRequired(countryCode) ? - BankUtil.getBranchIdLabel(countryCode) + " " + this.branchId + "\n" : ""; + BankUtil.getBranchIdLabel(countryCode) + ": " + this.branchId + "\n" : ""; String nationalAccountId = BankUtil.isNationalAccountIdRequired(countryCode) ? - BankUtil.getNationalAccountIdLabel(countryCode) + " " + this.nationalAccountId + "\n" : ""; + BankUtil.getNationalAccountIdLabel(countryCode) + ": " + this.nationalAccountId + "\n" : ""; String accountNr = BankUtil.isAccountNrRequired(countryCode) ? - BankUtil.getAccountNrLabel(countryCode) + " " + this.accountNr + "\n" : ""; + BankUtil.getAccountNrLabel(countryCode) + ": " + this.accountNr + "\n" : ""; String accountType = BankUtil.isAccountTypeRequired(countryCode) ? - BankUtil.getAccountTypeLabel(countryCode) + " " + this.accountType + "\n" : ""; + BankUtil.getAccountTypeLabel(countryCode) + ": " + this.accountType + "\n" : ""; String holderTaxIdString = BankUtil.isHolderIdRequired(countryCode) ? - (BankUtil.getHolderIdLabel(countryCode) + " " + holderTaxId + "\n") : ""; + (BankUtil.getHolderIdLabel(countryCode) + ": " + holderTaxId + "\n") : ""; - return "Holder name: " + holderName + "\n" + + return Res.getWithCol("payment.account.owner") + " " + holderName + "\n" + bankName + bankId + branchId + @@ -145,7 +146,7 @@ public abstract class BankAccountPayload extends CountryBasedPaymentAccountPaylo accountNr + accountType + holderTaxIdString + - "Country of bank: " + CountryUtil.getNameByCode(countryCode); + Res.getWithCol("payment.bank.country") + " " + CountryUtil.getNameByCode(countryCode); } protected String getHolderIdLabel() { diff --git a/core/src/main/java/bisq/core/payment/payload/CashAppAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/CashAppAccountPayload.java index cfeda8b1e3..19b005deb5 100644 --- a/core/src/main/java/bisq/core/payment/payload/CashAppAccountPayload.java +++ b/core/src/main/java/bisq/core/payment/payload/CashAppAccountPayload.java @@ -17,6 +17,8 @@ package bisq.core.payment.payload; +import bisq.core.locale.Res; + import io.bisq.generated.protobuffer.PB; import com.google.protobuf.Message; @@ -89,7 +91,7 @@ public final class CashAppAccountPayload extends PaymentAccountPayload { @Override public String getPaymentDetails() { - return "CashApp - Account: " + cashTag; + return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account") + " " + cashTag; } @Override diff --git a/core/src/main/java/bisq/core/payment/payload/ChaseQuickPayAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/ChaseQuickPayAccountPayload.java index e4cde96e63..3268d24cd3 100644 --- a/core/src/main/java/bisq/core/payment/payload/ChaseQuickPayAccountPayload.java +++ b/core/src/main/java/bisq/core/payment/payload/ChaseQuickPayAccountPayload.java @@ -17,6 +17,8 @@ package bisq.core.payment.payload; +import bisq.core.locale.Res; + import io.bisq.generated.protobuffer.PB; import com.google.protobuf.Message; @@ -94,13 +96,13 @@ public final class ChaseQuickPayAccountPayload extends PaymentAccountPayload { @Override public String getPaymentDetails() { - return "Chase QuickPay - Holder name: " + holderName + ", email: " + email; + return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account.owner") + " " + holderName + ", " + Res.get("payment.email") + " " + email; } @Override public String getPaymentDetailsForTradePopup() { - return "Holder name: " + holderName + "\n" + - "Email: " + email; + return Res.getWithCol("payment.account.owner") + " " + holderName + "\n" + + Res.getWithCol("payment.email") + " " + email; } @Override diff --git a/core/src/main/java/bisq/core/payment/payload/ClearXchangeAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/ClearXchangeAccountPayload.java index 9b317d7d8c..2e849b5718 100644 --- a/core/src/main/java/bisq/core/payment/payload/ClearXchangeAccountPayload.java +++ b/core/src/main/java/bisq/core/payment/payload/ClearXchangeAccountPayload.java @@ -17,6 +17,8 @@ package bisq.core.payment.payload; +import bisq.core.locale.Res; + import io.bisq.generated.protobuffer.PB; import com.google.protobuf.Message; @@ -94,13 +96,13 @@ public final class ClearXchangeAccountPayload extends PaymentAccountPayload { @Override public String getPaymentDetails() { - return "Zelle (ClearXchange) - Holder name: " + holderName + ", Email or mobile no.: " + emailOrMobileNr; + return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account.owner") + " " + holderName + ", " + Res.getWithCol("payment.emailOrMobile") + " " + emailOrMobileNr; } @Override public String getPaymentDetailsForTradePopup() { - return "Holder name: " + holderName + "\n" + - "Email or mobile no.: " + emailOrMobileNr; + return Res.getWithCol("payment.account.owner") + " " + holderName + "\n" + + Res.getWithCol("payment.emailOrMobile") + " " + emailOrMobileNr; } @Override diff --git a/core/src/main/java/bisq/core/payment/payload/CryptoCurrencyAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/CryptoCurrencyAccountPayload.java index c1d853548e..04dcbe94f9 100644 --- a/core/src/main/java/bisq/core/payment/payload/CryptoCurrencyAccountPayload.java +++ b/core/src/main/java/bisq/core/payment/payload/CryptoCurrencyAccountPayload.java @@ -17,6 +17,8 @@ package bisq.core.payment.payload; +import bisq.core.locale.Res; + import io.bisq.generated.protobuffer.PB; import com.google.protobuf.Message; @@ -88,7 +90,7 @@ public final class CryptoCurrencyAccountPayload extends PaymentAccountPayload { @Override public String getPaymentDetails() { - return "Receivers altcoin address: " + address; + return Res.getWithCol("payment.altcoin.receiver.address") + " " + address; } @Override diff --git a/core/src/main/java/bisq/core/payment/payload/F2FAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/F2FAccountPayload.java index f85bae23b2..e299fc58bf 100644 --- a/core/src/main/java/bisq/core/payment/payload/F2FAccountPayload.java +++ b/core/src/main/java/bisq/core/payment/payload/F2FAccountPayload.java @@ -17,6 +17,8 @@ package bisq.core.payment.payload; +import bisq.core.locale.Res; + import io.bisq.generated.protobuffer.PB; import com.google.protobuf.Message; @@ -109,7 +111,9 @@ public final class F2FAccountPayload extends CountryBasedPaymentAccountPayload { @Override public String getPaymentDetails() { - return "Face to Face - Contact: " + contact + ", city: " + city + ", additional information: " + extraInfo; + return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.f2f.contact") + " " + contact + ", " + + Res.getWithCol("payment.f2f.city") + " " + city + + ", " + Res.getWithCol("payment.f2f.extra") + " " + extraInfo; } @@ -117,7 +121,7 @@ public final class F2FAccountPayload extends CountryBasedPaymentAccountPayload { public String getPaymentDetailsForTradePopup() { // We don't show here more as the makers extra data are the relevant for the trade. City has to be anyway the // same for maker and taker. - return "Contact details: " + contact; + return Res.getWithCol("payment.f2f.contact") + " " + contact; } @Override diff --git a/core/src/main/java/bisq/core/payment/payload/FasterPaymentsAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/FasterPaymentsAccountPayload.java index 6c8d926954..59fc796741 100644 --- a/core/src/main/java/bisq/core/payment/payload/FasterPaymentsAccountPayload.java +++ b/core/src/main/java/bisq/core/payment/payload/FasterPaymentsAccountPayload.java @@ -17,6 +17,8 @@ package bisq.core.payment.payload; +import bisq.core.locale.Res; + import io.bisq.generated.protobuffer.PB; import com.google.protobuf.Message; @@ -101,13 +103,13 @@ public final class FasterPaymentsAccountPayload extends PaymentAccountPayload { @Override public String getPaymentDetails() { - return "FasterPayments - UK Sort code: " + sortCode + ", Account number: " + accountNr; + return Res.get(paymentMethodId) + " - UK Sort code: " + sortCode + ", " + Res.getWithCol("payment.accountNr") + " " + accountNr; } @Override public String getPaymentDetailsForTradePopup() { return "UK Sort code: " + sortCode + "\n" + - "Account number: " + accountNr; + Res.getWithCol("payment.accountNr") + " " + accountNr; } @Override diff --git a/core/src/main/java/bisq/core/payment/payload/HalCashAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/HalCashAccountPayload.java index 34b2d3c19f..b01f227258 100644 --- a/core/src/main/java/bisq/core/payment/payload/HalCashAccountPayload.java +++ b/core/src/main/java/bisq/core/payment/payload/HalCashAccountPayload.java @@ -17,6 +17,8 @@ package bisq.core.payment.payload; +import bisq.core.locale.Res; + import io.bisq.generated.protobuffer.PB; import com.google.protobuf.Message; @@ -87,12 +89,12 @@ public final class HalCashAccountPayload extends PaymentAccountPayload { @Override public String getPaymentDetails() { - return "HalCash - Mobile no.: " + mobileNr; + return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.mobile") + " " + mobileNr; } @Override public String getPaymentDetailsForTradePopup() { - return "Mobile no.: " + mobileNr; + return Res.getWithCol("payment.mobile") + " " + mobileNr; } @Override diff --git a/core/src/main/java/bisq/core/payment/payload/InteracETransferAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/InteracETransferAccountPayload.java index 09b86d278d..6afe647888 100644 --- a/core/src/main/java/bisq/core/payment/payload/InteracETransferAccountPayload.java +++ b/core/src/main/java/bisq/core/payment/payload/InteracETransferAccountPayload.java @@ -17,6 +17,8 @@ package bisq.core.payment.payload; +import bisq.core.locale.Res; + import io.bisq.generated.protobuffer.PB; import com.google.protobuf.Message; @@ -105,15 +107,17 @@ public final class InteracETransferAccountPayload extends PaymentAccountPayload @Override public String getPaymentDetails() { - return "Interac e-Transfer - Holder name: " + holderName + ", email: " + email + ", secret question: " + question + ", answer: " + answer; + return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account.owner") + " " + holderName + ", " + + Res.get("payment.email") + " " + email + ", " + Res.getWithCol("payment.secret") + " " + + question + ", " + Res.getWithCol("payment.answer") + " " + answer; } @Override public String getPaymentDetailsForTradePopup() { - return "Holder name: " + holderName + "\n" + - "Email: " + email + "\n" + - "Secret question: " + question + "\n" + - "Answer: " + answer; + return Res.getWithCol("payment.account.owner") + " " + holderName + "\n" + + Res.getWithCol("payment.email") + " " + email + "\n" + + Res.getWithCol("payment.secret") + " " + question + "\n" + + Res.getWithCol("payment.answer") + " " + answer; } @Override diff --git a/core/src/main/java/bisq/core/payment/payload/MoneyBeamAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/MoneyBeamAccountPayload.java index 020210b692..e999d9de97 100644 --- a/core/src/main/java/bisq/core/payment/payload/MoneyBeamAccountPayload.java +++ b/core/src/main/java/bisq/core/payment/payload/MoneyBeamAccountPayload.java @@ -17,6 +17,8 @@ package bisq.core.payment.payload; +import bisq.core.locale.Res; + import io.bisq.generated.protobuffer.PB; import com.google.protobuf.Message; @@ -87,7 +89,7 @@ public final class MoneyBeamAccountPayload extends PaymentAccountPayload { @Override public String getPaymentDetails() { - return "MoneyBeam - Account: " + accountId; + return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account") + " " + accountId; } @Override diff --git a/core/src/main/java/bisq/core/payment/payload/MoneyGramAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/MoneyGramAccountPayload.java index 233b6016b3..c75aa021ff 100644 --- a/core/src/main/java/bisq/core/payment/payload/MoneyGramAccountPayload.java +++ b/core/src/main/java/bisq/core/payment/payload/MoneyGramAccountPayload.java @@ -19,6 +19,7 @@ package bisq.core.payment.payload; import bisq.core.locale.BankUtil; import bisq.core.locale.CountryUtil; +import bisq.core.locale.Res; import io.bisq.generated.protobuffer.PB; @@ -110,16 +111,17 @@ public class MoneyGramAccountPayload extends PaymentAccountPayload { @Override public String getPaymentDetails() { - return "MoneyGram - " + getPaymentDetailsForTradePopup().replace("\n", ", "); + return Res.get(paymentMethodId) + " - " + getPaymentDetailsForTradePopup().replace("\n", ", "); } @Override public String getPaymentDetailsForTradePopup() { - String state = BankUtil.isStateRequired(countryCode) ? ("State: " + this.state + "\n") : ""; - return "Full name: " + holderName + "\n" + + String state = BankUtil.isStateRequired(countryCode) ? (Res.getWithCol("payment.account.state") + + " " + this.state + "\n") : ""; + return Res.getWithCol("payment.account.fullName") + " " + holderName + "\n" + state + - "Country: " + CountryUtil.getNameByCode(countryCode) + "\n" + - "Email: " + email; + Res.getWithCol("payment.account.country") + " " + CountryUtil.getNameByCode(countryCode) + "\n" + + Res.getWithCol("payment.email") + " " + email; } @Override diff --git a/core/src/main/java/bisq/core/payment/payload/NationalBankAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/NationalBankAccountPayload.java index 3ede9f0bc3..381d0fa9be 100644 --- a/core/src/main/java/bisq/core/payment/payload/NationalBankAccountPayload.java +++ b/core/src/main/java/bisq/core/payment/payload/NationalBankAccountPayload.java @@ -17,6 +17,8 @@ package bisq.core.payment.payload; +import bisq.core.locale.Res; + import io.bisq.generated.protobuffer.PB; import com.google.protobuf.Message; @@ -110,6 +112,6 @@ public final class NationalBankAccountPayload extends BankAccountPayload { @Override public String getPaymentDetails() { - return "National Bank transfer - " + getPaymentDetailsForTradePopup().replace("\n", ", "); + return Res.get(paymentMethodId) + " - " + getPaymentDetailsForTradePopup().replace("\n", ", "); } } diff --git a/core/src/main/java/bisq/core/payment/payload/OKPayAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/OKPayAccountPayload.java index 817f7f0cac..236a615949 100644 --- a/core/src/main/java/bisq/core/payment/payload/OKPayAccountPayload.java +++ b/core/src/main/java/bisq/core/payment/payload/OKPayAccountPayload.java @@ -17,6 +17,8 @@ package bisq.core.payment.payload; +import bisq.core.locale.Res; + import io.bisq.generated.protobuffer.PB; import com.google.protobuf.Message; @@ -88,7 +90,7 @@ public final class OKPayAccountPayload extends PaymentAccountPayload { @Override public String getPaymentDetails() { - return "OKPay - Account no.: " + accountNr; + return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account.no") + " " + accountNr; } @Override diff --git a/core/src/main/java/bisq/core/payment/payload/PerfectMoneyAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/PerfectMoneyAccountPayload.java index 0751fe95d2..2a5c80d1d5 100644 --- a/core/src/main/java/bisq/core/payment/payload/PerfectMoneyAccountPayload.java +++ b/core/src/main/java/bisq/core/payment/payload/PerfectMoneyAccountPayload.java @@ -17,6 +17,8 @@ package bisq.core.payment.payload; +import bisq.core.locale.Res; + import io.bisq.generated.protobuffer.PB; import com.google.protobuf.Message; @@ -89,7 +91,7 @@ public final class PerfectMoneyAccountPayload extends PaymentAccountPayload { @Override public String getPaymentDetails() { - return "PerfectMoney - Account no.: " + accountNr; + return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account.no") + " " + accountNr; } @Override diff --git a/core/src/main/java/bisq/core/payment/payload/PopmoneyAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/PopmoneyAccountPayload.java index b18343d29a..a27c3ac6a8 100644 --- a/core/src/main/java/bisq/core/payment/payload/PopmoneyAccountPayload.java +++ b/core/src/main/java/bisq/core/payment/payload/PopmoneyAccountPayload.java @@ -17,6 +17,8 @@ package bisq.core.payment.payload; +import bisq.core.locale.Res; + import io.bisq.generated.protobuffer.PB; import com.google.protobuf.Message; @@ -92,7 +94,8 @@ public final class PopmoneyAccountPayload extends PaymentAccountPayload { @Override public String getPaymentDetails() { - return "Popmoney - Holder name: " + holderName + ", email or phone no.: " + accountId; + return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account.owner") + " " + holderName + ", " + + Res.getWithCol("payment.popmoney.accountId") + " " + accountId; } @Override diff --git a/core/src/main/java/bisq/core/payment/payload/PromptPayAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/PromptPayAccountPayload.java index 37544654ab..1b52906c3b 100644 --- a/core/src/main/java/bisq/core/payment/payload/PromptPayAccountPayload.java +++ b/core/src/main/java/bisq/core/payment/payload/PromptPayAccountPayload.java @@ -17,6 +17,8 @@ package bisq.core.payment.payload; +import bisq.core.locale.Res; + import io.bisq.generated.protobuffer.PB; import com.google.protobuf.Message; @@ -88,7 +90,7 @@ public final class PromptPayAccountPayload extends PaymentAccountPayload { @Override public String getPaymentDetails() { - return "PromptPay ID: " + promptPayId; + return Res.getWithCol("payment.promptPay.promptPayId") + promptPayId; } @Override diff --git a/core/src/main/java/bisq/core/payment/payload/SameBankAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/SameBankAccountPayload.java index 47793a814c..c481bbef58 100644 --- a/core/src/main/java/bisq/core/payment/payload/SameBankAccountPayload.java +++ b/core/src/main/java/bisq/core/payment/payload/SameBankAccountPayload.java @@ -17,6 +17,8 @@ package bisq.core.payment.payload; +import bisq.core.locale.Res; + import io.bisq.generated.protobuffer.PB; import com.google.protobuf.Message; @@ -115,6 +117,6 @@ public final class SameBankAccountPayload extends BankAccountPayload { @Override public String getPaymentDetails() { - return "Transfer with same Bank - " + getPaymentDetailsForTradePopup().replace("\n", ", "); + return Res.get(paymentMethodId) + " - " + getPaymentDetailsForTradePopup().replace("\n", ", "); } } diff --git a/core/src/main/java/bisq/core/payment/payload/SepaAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/SepaAccountPayload.java index 43d7b0e9a1..a8fe37f1aa 100644 --- a/core/src/main/java/bisq/core/payment/payload/SepaAccountPayload.java +++ b/core/src/main/java/bisq/core/payment/payload/SepaAccountPayload.java @@ -19,6 +19,7 @@ package bisq.core.payment.payload; import bisq.core.locale.Country; import bisq.core.locale.CountryUtil; +import bisq.core.locale.Res; import io.bisq.generated.protobuffer.PB; @@ -146,15 +147,15 @@ public final class SepaAccountPayload extends CountryBasedPaymentAccountPayload @Override public String getPaymentDetails() { - return "SEPA - Holder name: " + holderName + ", IBAN: " + iban + ", BIC: " + bic + ", Country code: " + getCountryCode(); + return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account.owner") + " " + holderName + ", IBAN: " + iban + ", BIC: " + bic + ", " + Res.getWithCol("payment.bank.country") + " " + getCountryCode(); } @Override public String getPaymentDetailsForTradePopup() { - return "Holder name: " + holderName + "\n" + + return Res.getWithCol("payment.account.owner") + " " + holderName + "\n" + "IBAN: " + iban + "\n" + "BIC: " + bic + "\n" + - "Country of bank: " + CountryUtil.getNameByCode(countryCode); + Res.getWithCol("payment.bank.country") + " " + CountryUtil.getNameByCode(countryCode); } @Override diff --git a/core/src/main/java/bisq/core/payment/payload/SepaInstantAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/SepaInstantAccountPayload.java index 6aebc6db31..10e2e23951 100644 --- a/core/src/main/java/bisq/core/payment/payload/SepaInstantAccountPayload.java +++ b/core/src/main/java/bisq/core/payment/payload/SepaInstantAccountPayload.java @@ -19,6 +19,7 @@ package bisq.core.payment.payload; import bisq.core.locale.Country; import bisq.core.locale.CountryUtil; +import bisq.core.locale.Res; import io.bisq.generated.protobuffer.PB; @@ -141,15 +142,16 @@ public final class SepaInstantAccountPayload extends CountryBasedPaymentAccountP @Override public String getPaymentDetails() { - return "SEPA Instant - Holder name: " + holderName + ", IBAN: " + iban + ", BIC: " + bic + ", Country code: " + getCountryCode(); + return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account.owner") + " " + holderName + ", IBAN: " + + iban + ", BIC: " + bic + ", " + Res.getWithCol("payment.bank.country") + " " + getCountryCode(); } @Override public String getPaymentDetailsForTradePopup() { - return "Holder name: " + holderName + "\n" + + return Res.getWithCol("payment.account.owner") + " " + holderName + "\n" + "IBAN: " + iban + "\n" + "BIC: " + bic + "\n" + - "Country of bank: " + CountryUtil.getNameByCode(countryCode); + Res.getWithCol("payment.bank.country") + " " + CountryUtil.getNameByCode(countryCode); } @Override diff --git a/core/src/main/java/bisq/core/payment/payload/SpecificBanksAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/SpecificBanksAccountPayload.java index 24fa0b1e34..8d8be40da9 100644 --- a/core/src/main/java/bisq/core/payment/payload/SpecificBanksAccountPayload.java +++ b/core/src/main/java/bisq/core/payment/payload/SpecificBanksAccountPayload.java @@ -17,6 +17,8 @@ package bisq.core.payment.payload; +import bisq.core.locale.Res; + import io.bisq.generated.protobuffer.PB; import com.google.protobuf.Message; @@ -139,12 +141,12 @@ public final class SpecificBanksAccountPayload extends BankAccountPayload { @Override public String getPaymentDetails() { - return "Transfers with specific banks - " + getPaymentDetailsForTradePopup().replace("\n", ", "); + return Res.get(paymentMethodId) + " - " + getPaymentDetailsForTradePopup().replace("\n", ", "); } @Override public String getPaymentDetailsForTradePopup() { return super.getPaymentDetailsForTradePopup() + "\n" + - "Accepted banks: " + Joiner.on(", ").join(acceptedBanks); + Res.getWithCol("payment.accepted.banks") + " " + Joiner.on(", ").join(acceptedBanks); } } diff --git a/core/src/main/java/bisq/core/payment/payload/SwishAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/SwishAccountPayload.java index e2afac0990..ddc0e70b02 100644 --- a/core/src/main/java/bisq/core/payment/payload/SwishAccountPayload.java +++ b/core/src/main/java/bisq/core/payment/payload/SwishAccountPayload.java @@ -17,6 +17,8 @@ package bisq.core.payment.payload; +import bisq.core.locale.Res; + import io.bisq.generated.protobuffer.PB; import com.google.protobuf.Message; @@ -92,13 +94,14 @@ public final class SwishAccountPayload extends PaymentAccountPayload { @Override public String getPaymentDetails() { - return "Swish - Holder name: " + holderName + ", mobile no.: " + mobileNr; + return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account.owner") + " " + holderName + + ", " + Res.getWithCol("payment.mobile") + " " + mobileNr; } @Override public String getPaymentDetailsForTradePopup() { - return "Holder name: " + holderName + "\n" + - "Mobile no.: " + mobileNr; + return Res.getWithCol("payment.account.owner") + " " + holderName + "\n" + + Res.getWithCol("payment.mobile") + " " + mobileNr; } @Override diff --git a/core/src/main/java/bisq/core/payment/payload/USPostalMoneyOrderAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/USPostalMoneyOrderAccountPayload.java index 16f0bd27bd..94068c990a 100644 --- a/core/src/main/java/bisq/core/payment/payload/USPostalMoneyOrderAccountPayload.java +++ b/core/src/main/java/bisq/core/payment/payload/USPostalMoneyOrderAccountPayload.java @@ -17,6 +17,8 @@ package bisq.core.payment.payload; +import bisq.core.locale.Res; + import io.bisq.generated.protobuffer.PB; import com.google.protobuf.Message; @@ -94,14 +96,15 @@ public final class USPostalMoneyOrderAccountPayload extends PaymentAccountPayloa @Override public String getPaymentDetails() { - return "US Postal Money Order - Holder name: " + holderName + ", postal address: " + postalAddress; + return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account.owner") + " " + holderName + ", " + + Res.getWithCol("payment.postal.address") + " " + postalAddress; } @Override public String getPaymentDetailsForTradePopup() { - return "Holder name: " + holderName + "\n" + - "Postal address: " + postalAddress; + return Res.getWithCol("payment.account.owner") + " " + holderName + "\n" + + Res.getWithCol("payment.postal.address") + " " + postalAddress; } @Override diff --git a/core/src/main/java/bisq/core/payment/payload/UpholdAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/UpholdAccountPayload.java index 558a2129c1..44700ae32e 100644 --- a/core/src/main/java/bisq/core/payment/payload/UpholdAccountPayload.java +++ b/core/src/main/java/bisq/core/payment/payload/UpholdAccountPayload.java @@ -17,6 +17,8 @@ package bisq.core.payment.payload; +import bisq.core.locale.Res; + import io.bisq.generated.protobuffer.PB; import com.google.protobuf.Message; @@ -87,7 +89,7 @@ public final class UpholdAccountPayload extends PaymentAccountPayload { @Override public String getPaymentDetails() { - return "Uphold - Account: " + accountId; + return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account") + " " + accountId; } @Override diff --git a/core/src/main/java/bisq/core/payment/payload/VenmoAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/VenmoAccountPayload.java index 61df555ad8..949d13a003 100644 --- a/core/src/main/java/bisq/core/payment/payload/VenmoAccountPayload.java +++ b/core/src/main/java/bisq/core/payment/payload/VenmoAccountPayload.java @@ -17,6 +17,8 @@ package bisq.core.payment.payload; +import bisq.core.locale.Res; + import io.bisq.generated.protobuffer.PB; import com.google.protobuf.Message; @@ -94,7 +96,8 @@ public final class VenmoAccountPayload extends PaymentAccountPayload { @Override public String getPaymentDetails() { - return "Venmo - Holder name: " + holderName + ", Venmo username: " + venmoUserName; + return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account.owner") + " " + holderName + ", " + + Res.getWithCol("payment.venmo.venmoUserName") + " " + venmoUserName; } @Override diff --git a/core/src/main/java/bisq/core/payment/payload/WeChatPayAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/WeChatPayAccountPayload.java index 542739b240..9300fafd2d 100644 --- a/core/src/main/java/bisq/core/payment/payload/WeChatPayAccountPayload.java +++ b/core/src/main/java/bisq/core/payment/payload/WeChatPayAccountPayload.java @@ -17,6 +17,8 @@ package bisq.core.payment.payload; +import bisq.core.locale.Res; + import io.bisq.generated.protobuffer.PB; import com.google.protobuf.Message; @@ -86,7 +88,7 @@ public final class WeChatPayAccountPayload extends PaymentAccountPayload { @Override public String getPaymentDetails() { - return "WeChat Pay - Account no.: " + accountNr; + return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account.no") + " " + accountNr; } @Override diff --git a/core/src/main/java/bisq/core/payment/payload/WesternUnionAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/WesternUnionAccountPayload.java index efb5941fb3..7ffc131959 100644 --- a/core/src/main/java/bisq/core/payment/payload/WesternUnionAccountPayload.java +++ b/core/src/main/java/bisq/core/payment/payload/WesternUnionAccountPayload.java @@ -19,6 +19,7 @@ package bisq.core.payment.payload; import bisq.core.locale.BankUtil; import bisq.core.locale.CountryUtil; +import bisq.core.locale.Res; import io.bisq.generated.protobuffer.PB; @@ -117,17 +118,17 @@ public class WesternUnionAccountPayload extends CountryBasedPaymentAccountPayloa @Override public String getPaymentDetails() { - return "Western Union - " + getPaymentDetailsForTradePopup().replace("\n", ", "); + return Res.get(paymentMethodId) + " - " + getPaymentDetailsForTradePopup().replace("\n", ", "); } @Override public String getPaymentDetailsForTradePopup() { - String cityState = BankUtil.isStateRequired(countryCode) ? ("City / State: " + city + " / " + state + "\n") - : ("City: " + city + "\n"); - return "Full name: " + holderName + "\n" + + String cityState = BankUtil.isStateRequired(countryCode) ? (Res.get("payment.account.city") + " / " + Res.getWithCol("payment.account.state") + " " + city + " / " + state + "\n") + : (Res.getWithCol("payment.account.city") + " " + city + "\n"); + return Res.getWithCol("payment.account.fullName") + " " + holderName + "\n" + cityState + - "County: " + CountryUtil.getNameByCode(countryCode) + "\n" + - "Email: " + email; + Res.getWithCol("payment.country") + " " + CountryUtil.getNameByCode(countryCode) + "\n" + + Res.getWithCol("payment.email") + " " + email; } @Override diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties index 2a1a208a9a..928bd47939 100644 --- a/core/src/main/resources/i18n/displayStrings.properties +++ b/core/src/main/resources/i18n/displayStrings.properties @@ -2281,6 +2281,7 @@ payment.national.account.id.AR=CBU number #new payment.altcoin.address.dyn={0} address +payment.altcoin.receiver.address=Receiver's altcoin address payment.accountNr=Account number payment.emailOrMobile=Email or mobile nr payment.useCustomAccountName=Use custom account name