From 1257072211b3cbc9c6dd4117f811a261e10b93b9 Mon Sep 17 00:00:00 2001 From: woodser Date: Sun, 14 May 2023 11:51:21 -0400 Subject: [PATCH] change 'cash by mail' to 'pay by mail' --- .../main/java/haveno/core/offer/Offer.java | 4 +- .../java/haveno/core/offer/OfferPayload.java | 2 +- .../java/haveno/core/offer/OfferUtil.java | 8 ++-- ...MailAccount.java => PayByMailAccount.java} | 22 +++++----- .../core/payment/PaymentAccountFactory.java | 4 +- .../core/payment/PaymentAccountUtil.java | 6 +-- ...load.java => PayByMailAccountPayload.java} | 18 ++++----- .../core/payment/payload/PaymentMethod.java | 8 ++-- .../haveno/core/proto/CoreProtoResolver.java | 6 +-- .../trade/statistics/TradeStatistics3.java | 2 +- .../resources/i18n/displayStrings.properties | 34 ++++++++-------- .../i18n/displayStrings_cs.properties | 14 +++---- .../i18n/displayStrings_de.properties | 14 +++---- .../i18n/displayStrings_es.properties | 14 +++---- .../i18n/displayStrings_fa.properties | 14 +++---- .../i18n/displayStrings_fr.properties | 14 +++---- .../i18n/displayStrings_it.properties | 14 +++---- .../i18n/displayStrings_ja.properties | 14 +++---- .../i18n/displayStrings_pt-br.properties | 14 +++---- .../i18n/displayStrings_pt.properties | 14 +++---- .../i18n/displayStrings_ru.properties | 14 +++---- .../i18n/displayStrings_th.properties | 14 +++---- .../i18n/displayStrings_vi.properties | 14 +++---- .../i18n/displayStrings_zh-hans.properties | 14 +++---- .../i18n/displayStrings_zh-hant.properties | 14 +++---- ...CashByMailForm.java => PayByMailForm.java} | 40 +++++++++---------- .../TraditionalAccountsView.java | 14 +++---- .../main/offer/takeoffer/TakeOfferView.java | 14 +++---- .../overlays/windows/OfferDetailsWindow.java | 2 +- .../steps/buyer/BuyerStep2View.java | 10 ++--- .../steps/seller/SellerStep3View.java | 6 +-- proto/src/main/proto/pb.proto | 4 +- 32 files changed, 200 insertions(+), 200 deletions(-) rename core/src/main/java/haveno/core/payment/{CashByMailAccount.java => PayByMailAccount.java} (69%) rename core/src/main/java/haveno/core/payment/payload/{CashByMailAccountPayload.java => PayByMailAccountPayload.java} (84%) rename desktop/src/main/java/haveno/desktop/components/paymentmethods/{CashByMailForm.java => PayByMailForm.java} (81%) diff --git a/core/src/main/java/haveno/core/offer/Offer.java b/core/src/main/java/haveno/core/offer/Offer.java index efaf903029..e62fa51aed 100644 --- a/core/src/main/java/haveno/core/offer/Offer.java +++ b/core/src/main/java/haveno/core/offer/Offer.java @@ -372,8 +372,8 @@ public class Offer implements NetworkPayload, PersistablePayload { public String getExtraInfo() { if (getExtraDataMap() != null && getExtraDataMap().containsKey(OfferPayload.F2F_EXTRA_INFO)) return getExtraDataMap().get(OfferPayload.F2F_EXTRA_INFO); - else if (getExtraDataMap() != null && getExtraDataMap().containsKey(OfferPayload.CASH_BY_MAIL_EXTRA_INFO)) - return getExtraDataMap().get(OfferPayload.CASH_BY_MAIL_EXTRA_INFO); + else if (getExtraDataMap() != null && getExtraDataMap().containsKey(OfferPayload.PAY_BY_MAIL_EXTRA_INFO)) + return getExtraDataMap().get(OfferPayload.PAY_BY_MAIL_EXTRA_INFO); else return ""; } diff --git a/core/src/main/java/haveno/core/offer/OfferPayload.java b/core/src/main/java/haveno/core/offer/OfferPayload.java index 81ca2f0137..2db05fecc3 100644 --- a/core/src/main/java/haveno/core/offer/OfferPayload.java +++ b/core/src/main/java/haveno/core/offer/OfferPayload.java @@ -95,7 +95,7 @@ public final class OfferPayload implements ProtectedStoragePayload, ExpirablePay // Only used in payment method F2F public static final String F2F_CITY = "f2fCity"; public static final String F2F_EXTRA_INFO = "f2fExtraInfo"; - public static final String CASH_BY_MAIL_EXTRA_INFO = "cashByMailExtraInfo"; + public static final String PAY_BY_MAIL_EXTRA_INFO = "payByMailExtraInfo"; // Comma separated list of ordinal of a haveno.common.app.Capability. E.g. ordinal of // Capability.SIGNED_ACCOUNT_AGE_WITNESS is 11 and Capability.MEDIATION is 12 so if we want to signal that maker diff --git a/core/src/main/java/haveno/core/offer/OfferUtil.java b/core/src/main/java/haveno/core/offer/OfferUtil.java index e3455a6dd5..64e9f9b25c 100644 --- a/core/src/main/java/haveno/core/offer/OfferUtil.java +++ b/core/src/main/java/haveno/core/offer/OfferUtil.java @@ -28,7 +28,7 @@ import haveno.core.locale.Res; import haveno.core.monetary.Price; import haveno.core.monetary.TraditionalMoney; import haveno.core.monetary.Volume; -import haveno.core.payment.CashByMailAccount; +import haveno.core.payment.PayByMailAccount; import haveno.core.payment.F2FAccount; import haveno.core.payment.PaymentAccount; import haveno.core.provider.price.MarketPrice; @@ -58,7 +58,7 @@ import static haveno.common.util.MathUtils.roundDoubleToLong; import static haveno.common.util.MathUtils.scaleUpByPowerOf10; import static haveno.core.offer.OfferPayload.ACCOUNT_AGE_WITNESS_HASH; import static haveno.core.offer.OfferPayload.CAPABILITIES; -import static haveno.core.offer.OfferPayload.CASH_BY_MAIL_EXTRA_INFO; +import static haveno.core.offer.OfferPayload.PAY_BY_MAIL_EXTRA_INFO; import static haveno.core.offer.OfferPayload.F2F_CITY; import static haveno.core.offer.OfferPayload.F2F_EXTRA_INFO; import static haveno.core.offer.OfferPayload.REFERRAL_ID; @@ -199,8 +199,8 @@ public class OfferUtil { extraDataMap.put(F2F_EXTRA_INFO, ((F2FAccount) paymentAccount).getExtraInfo()); } - if (paymentAccount instanceof CashByMailAccount) { - extraDataMap.put(CASH_BY_MAIL_EXTRA_INFO, ((CashByMailAccount) paymentAccount).getExtraInfo()); + if (paymentAccount instanceof PayByMailAccount) { + extraDataMap.put(PAY_BY_MAIL_EXTRA_INFO, ((PayByMailAccount) paymentAccount).getExtraInfo()); } extraDataMap.put(CAPABILITIES, Capabilities.app.toStringList()); diff --git a/core/src/main/java/haveno/core/payment/CashByMailAccount.java b/core/src/main/java/haveno/core/payment/PayByMailAccount.java similarity index 69% rename from core/src/main/java/haveno/core/payment/CashByMailAccount.java rename to core/src/main/java/haveno/core/payment/PayByMailAccount.java index 5fa5c5bd2f..71e3871c32 100644 --- a/core/src/main/java/haveno/core/payment/CashByMailAccount.java +++ b/core/src/main/java/haveno/core/payment/PayByMailAccount.java @@ -20,24 +20,24 @@ package haveno.core.payment; import haveno.core.api.model.PaymentAccountFormField; import haveno.core.locale.CurrencyUtil; import haveno.core.locale.TradeCurrency; -import haveno.core.payment.payload.CashByMailAccountPayload; +import haveno.core.payment.payload.PayByMailAccountPayload; import haveno.core.payment.payload.PaymentAccountPayload; import haveno.core.payment.payload.PaymentMethod; import lombok.NonNull; import java.util.List; -public final class CashByMailAccount extends PaymentAccount { +public final class PayByMailAccount extends PaymentAccount { public static final List SUPPORTED_CURRENCIES = CurrencyUtil.getAllTraditionalCurrencies(); - public CashByMailAccount() { - super(PaymentMethod.CASH_BY_MAIL); + public PayByMailAccount() { + super(PaymentMethod.PAY_BY_MAIL); } @Override protected PaymentAccountPayload createPayload() { - return new CashByMailAccountPayload(paymentMethod.getId(), id); + return new PayByMailAccountPayload(paymentMethod.getId(), id); } @Override @@ -51,26 +51,26 @@ public final class CashByMailAccount extends PaymentAccount { } public void setPostalAddress(String postalAddress) { - ((CashByMailAccountPayload) paymentAccountPayload).setPostalAddress(postalAddress); + ((PayByMailAccountPayload) paymentAccountPayload).setPostalAddress(postalAddress); } public String getPostalAddress() { - return ((CashByMailAccountPayload) paymentAccountPayload).getPostalAddress(); + return ((PayByMailAccountPayload) paymentAccountPayload).getPostalAddress(); } public void setContact(String contact) { - ((CashByMailAccountPayload) paymentAccountPayload).setContact(contact); + ((PayByMailAccountPayload) paymentAccountPayload).setContact(contact); } public String getContact() { - return ((CashByMailAccountPayload) paymentAccountPayload).getContact(); + return ((PayByMailAccountPayload) paymentAccountPayload).getContact(); } public void setExtraInfo(String extraInfo) { - ((CashByMailAccountPayload) paymentAccountPayload).setExtraInfo(extraInfo); + ((PayByMailAccountPayload) paymentAccountPayload).setExtraInfo(extraInfo); } public String getExtraInfo() { - return ((CashByMailAccountPayload) paymentAccountPayload).getExtraInfo(); + return ((PayByMailAccountPayload) paymentAccountPayload).getExtraInfo(); } } diff --git a/core/src/main/java/haveno/core/payment/PaymentAccountFactory.java b/core/src/main/java/haveno/core/payment/PaymentAccountFactory.java index a6898552f4..be4a74d772 100644 --- a/core/src/main/java/haveno/core/payment/PaymentAccountFactory.java +++ b/core/src/main/java/haveno/core/payment/PaymentAccountFactory.java @@ -74,8 +74,8 @@ public class PaymentAccountFactory { return new HalCashAccount(); case PaymentMethod.F2F_ID: return new F2FAccount(); - case PaymentMethod.CASH_BY_MAIL_ID: - return new CashByMailAccount(); + case PaymentMethod.PAY_BY_MAIL_ID: + return new PayByMailAccount(); case PaymentMethod.PROMPT_PAY_ID: return new PromptPayAccount(); case PaymentMethod.ADVANCED_CASH_ID: diff --git a/core/src/main/java/haveno/core/payment/PaymentAccountUtil.java b/core/src/main/java/haveno/core/payment/PaymentAccountUtil.java index f186bc8ee8..d4c8fe8bda 100644 --- a/core/src/main/java/haveno/core/payment/PaymentAccountUtil.java +++ b/core/src/main/java/haveno/core/payment/PaymentAccountUtil.java @@ -47,7 +47,7 @@ import static haveno.core.payment.payload.PaymentMethod.BLOCK_CHAINS; import static haveno.core.payment.payload.PaymentMethod.BLOCK_CHAINS_INSTANT; import static haveno.core.payment.payload.PaymentMethod.CAPITUAL_ID; import static haveno.core.payment.payload.PaymentMethod.CASH_APP_ID; -import static haveno.core.payment.payload.PaymentMethod.CASH_BY_MAIL_ID; +import static haveno.core.payment.payload.PaymentMethod.PAY_BY_MAIL_ID; import static haveno.core.payment.payload.PaymentMethod.CASH_DEPOSIT_ID; import static haveno.core.payment.payload.PaymentMethod.CELPAY_ID; import static haveno.core.payment.payload.PaymentMethod.CHASE_QUICK_PAY_ID; @@ -238,8 +238,8 @@ public class PaymentAccountUtil { return SepaAccount.SUPPORTED_CURRENCIES; case SEPA_INSTANT_ID: return SepaInstantAccount.SUPPORTED_CURRENCIES; - case CASH_BY_MAIL_ID: - return CashByMailAccount.SUPPORTED_CURRENCIES; + case PAY_BY_MAIL_ID: + return PayByMailAccount.SUPPORTED_CURRENCIES; case F2F_ID: return F2FAccount.SUPPORTED_CURRENCIES; case NATIONAL_BANK_ID: diff --git a/core/src/main/java/haveno/core/payment/payload/CashByMailAccountPayload.java b/core/src/main/java/haveno/core/payment/payload/PayByMailAccountPayload.java similarity index 84% rename from core/src/main/java/haveno/core/payment/payload/CashByMailAccountPayload.java rename to core/src/main/java/haveno/core/payment/payload/PayByMailAccountPayload.java index 8a23039da4..49cd1b6dcc 100644 --- a/core/src/main/java/haveno/core/payment/payload/CashByMailAccountPayload.java +++ b/core/src/main/java/haveno/core/payment/payload/PayByMailAccountPayload.java @@ -35,12 +35,12 @@ import java.util.Map; @Setter @Getter @Slf4j -public final class CashByMailAccountPayload extends PaymentAccountPayload implements PayloadWithHolderName { +public final class PayByMailAccountPayload extends PaymentAccountPayload implements PayloadWithHolderName { private String postalAddress = ""; private String contact = ""; private String extraInfo = ""; - public CashByMailAccountPayload(String paymentMethod, String id) { + public PayByMailAccountPayload(String paymentMethod, String id) { super(paymentMethod, id); } @@ -49,7 +49,7 @@ public final class CashByMailAccountPayload extends PaymentAccountPayload implem // PROTO BUFFER /////////////////////////////////////////////////////////////////////////////////////////// - private CashByMailAccountPayload(String paymentMethod, String id, + private PayByMailAccountPayload(String paymentMethod, String id, String postalAddress, String contact, String extraInfo, @@ -67,19 +67,19 @@ public final class CashByMailAccountPayload extends PaymentAccountPayload implem @Override public Message toProtoMessage() { return getPaymentAccountPayloadBuilder() - .setCashByMailAccountPayload(protobuf.CashByMailAccountPayload.newBuilder() + .setPayByMailAccountPayload(protobuf.PayByMailAccountPayload.newBuilder() .setPostalAddress(postalAddress) .setContact(contact) .setExtraInfo(extraInfo)) .build(); } - public static CashByMailAccountPayload fromProto(protobuf.PaymentAccountPayload proto) { - return new CashByMailAccountPayload(proto.getPaymentMethodId(), + public static PayByMailAccountPayload fromProto(protobuf.PaymentAccountPayload proto) { + return new PayByMailAccountPayload(proto.getPaymentMethodId(), proto.getId(), - proto.getCashByMailAccountPayload().getPostalAddress(), - proto.getCashByMailAccountPayload().getContact(), - proto.getCashByMailAccountPayload().getExtraInfo(), + proto.getPayByMailAccountPayload().getPostalAddress(), + proto.getPayByMailAccountPayload().getContact(), + proto.getPayByMailAccountPayload().getExtraInfo(), proto.getMaxTradePeriod(), new HashMap<>(proto.getExcludeFromJsonDataMap())); } diff --git a/core/src/main/java/haveno/core/payment/payload/PaymentMethod.java b/core/src/main/java/haveno/core/payment/payload/PaymentMethod.java index 3b803d4cc8..503ff4ca62 100644 --- a/core/src/main/java/haveno/core/payment/payload/PaymentMethod.java +++ b/core/src/main/java/haveno/core/payment/payload/PaymentMethod.java @@ -31,7 +31,7 @@ import haveno.core.payment.AmazonGiftCardAccount; import haveno.core.payment.AustraliaPayidAccount; import haveno.core.payment.BizumAccount; import haveno.core.payment.CapitualAccount; -import haveno.core.payment.CashByMailAccount; +import haveno.core.payment.PayByMailAccount; import haveno.core.payment.CashDepositAccount; import haveno.core.payment.CelPayAccount; import haveno.core.payment.ZelleAccount; @@ -161,7 +161,7 @@ public final class PaymentMethod implements PersistablePayload, Comparable { - cashByMailAccount.setContact(newValue); + payByMailAccount.setContact(newValue); updateFromInputs(); }); @@ -91,16 +91,16 @@ public class CashByMailForm extends PaymentMethodForm { Res.get("payment.postal.address"), "").second; postalAddressTextArea.setMinHeight(70); postalAddressTextArea.textProperty().addListener((ov, oldValue, newValue) -> { - cashByMailAccount.setPostalAddress(newValue); + payByMailAccount.setPostalAddress(newValue); updateFromInputs(); }); TextArea extraTextArea = addTopLabelTextArea(gridPane, ++gridRow, - Res.get("payment.shared.optionalExtra"), Res.get("payment.cashByMail.extraInfo.prompt")).second; + Res.get("payment.shared.optionalExtra"), Res.get("payment.payByMail.extraInfo.prompt")).second; extraTextArea.setMinHeight(70); ((JFXTextArea) extraTextArea).setLabelFloat(false); extraTextArea.textProperty().addListener((ov, oldValue, newValue) -> { - cashByMailAccount.setExtraInfo(newValue); + payByMailAccount.setExtraInfo(newValue); updateFromInputs(); }); @@ -110,7 +110,7 @@ public class CashByMailForm extends PaymentMethodForm { @Override protected void autoFillNameTextField() { - setAccountNameWithString(cashByMailAccount.getContact()); + setAccountNameWithString(payByMailAccount.getContact()); } @Override @@ -118,21 +118,21 @@ public class CashByMailForm extends PaymentMethodForm { gridRowFrom = gridRow; addAccountNameTextFieldWithAutoFillToggleButton(); addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.paymentMethod"), - Res.get(cashByMailAccount.getPaymentMethod().getId())); + Res.get(payByMailAccount.getPaymentMethod().getId())); TradeCurrency tradeCurrency = paymentAccount.getSingleTradeCurrency(); String nameAndCode = tradeCurrency != null ? tradeCurrency.getNameAndCode() : ""; addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.currency"), nameAndCode); addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.f2f.contact"), - cashByMailAccount.getContact()); + payByMailAccount.getContact()); TextArea textArea = addCompactTopLabelTextArea(gridPane, ++gridRow, Res.get("payment.postal.address"), "").second; - textArea.setText(cashByMailAccount.getPostalAddress()); + textArea.setText(payByMailAccount.getPostalAddress()); textArea.setMinHeight(70); textArea.setEditable(false); TextArea textAreaExtra = addCompactTopLabelTextArea(gridPane, ++gridRow, Res.get("payment.shared.extraInfo"), "").second; - textAreaExtra.setText(cashByMailAccount.getExtraInfo()); + textAreaExtra.setText(payByMailAccount.getExtraInfo()); textAreaExtra.setMinHeight(70); textAreaExtra.setEditable(false); @@ -142,8 +142,8 @@ public class CashByMailForm extends PaymentMethodForm { @Override public void updateAllInputsValid() { allInputsValid.set(isAccountNameValid() - && !cashByMailAccount.getPostalAddress().isEmpty() - && inputValidator.validate(cashByMailAccount.getContact()).isValid + && !payByMailAccount.getPostalAddress().isEmpty() + && inputValidator.validate(payByMailAccount.getContact()).isValid && paymentAccount.getSingleTradeCurrency() != null); } } diff --git a/desktop/src/main/java/haveno/desktop/main/account/content/traditionalaccounts/TraditionalAccountsView.java b/desktop/src/main/java/haveno/desktop/main/account/content/traditionalaccounts/TraditionalAccountsView.java index 6cf19f230a..aef3d182fe 100644 --- a/desktop/src/main/java/haveno/desktop/main/account/content/traditionalaccounts/TraditionalAccountsView.java +++ b/desktop/src/main/java/haveno/desktop/main/account/content/traditionalaccounts/TraditionalAccountsView.java @@ -26,7 +26,7 @@ import haveno.core.locale.Res; import haveno.core.offer.OfferRestrictions; import haveno.core.payment.AmazonGiftCardAccount; import haveno.core.payment.AustraliaPayidAccount; -import haveno.core.payment.CashByMailAccount; +import haveno.core.payment.PayByMailAccount; import haveno.core.payment.CashDepositAccount; import haveno.core.payment.ZelleAccount; import haveno.core.payment.F2FAccount; @@ -72,7 +72,7 @@ import haveno.desktop.components.paymentmethods.AmazonGiftCardForm; import haveno.desktop.components.paymentmethods.AustraliaPayidForm; import haveno.desktop.components.paymentmethods.BizumForm; import haveno.desktop.components.paymentmethods.CapitualForm; -import haveno.desktop.components.paymentmethods.CashByMailForm; +import haveno.desktop.components.paymentmethods.PayByMailForm; import haveno.desktop.components.paymentmethods.CashDepositForm; import haveno.desktop.components.paymentmethods.CelPayForm; import haveno.desktop.components.paymentmethods.ChaseQuickPayForm; @@ -262,9 +262,9 @@ public class TraditionalAccountsView extends PaymentAccountsView doSaveNewAccount(paymentAccount)) .show(); - } else if (paymentAccount instanceof CashByMailAccount) { - // CashByMail has no chargeback risk so we don't show the text from payment.limits.info. - new Popup().information(Res.get("payment.cashByMail.info")) + } else if (paymentAccount instanceof PayByMailAccount) { + // PayByMail has no chargeback risk so we don't show the text from payment.limits.info. + new Popup().information(Res.get("payment.payByMail.info")) .width(850) .closeButtonText(Res.get("shared.cancel")) .actionButtonText(Res.get("shared.iUnderstand")) @@ -557,8 +557,8 @@ public class TraditionalAccountsView extends PaymentAccountsView paymentAccountWarningDisplayed = new HashMap<>(); private boolean offerDetailsWindowDisplayed, zelleWarningDisplayed, fasterPaymentsWarningDisplayed, - takeOfferFromUnsignedAccountWarningDisplayed, cashByMailWarningDisplayed; + takeOfferFromUnsignedAccountWarningDisplayed, payByMailWarningDisplayed; private SimpleBooleanProperty errorPopupDisplayed; private ChangeListener amountFocusedListener, getShowWalletFundedNotificationListener; @@ -267,7 +267,7 @@ public class TakeOfferView extends ActivatableViewAndModel { new GenericMessageWindow() - .preamble(Res.get("payment.cashByMail.tradingRestrictions")) + .preamble(Res.get("payment.payByMail.tradingRestrictions")) .instruction(offer.getExtraInfo()) .actionButtonText(Res.get("shared.iConfirm")) .closeButtonText(Res.get("shared.close")) diff --git a/desktop/src/main/java/haveno/desktop/main/overlays/windows/OfferDetailsWindow.java b/desktop/src/main/java/haveno/desktop/main/overlays/windows/OfferDetailsWindow.java index 11c69d257c..6d5f217718 100644 --- a/desktop/src/main/java/haveno/desktop/main/overlays/windows/OfferDetailsWindow.java +++ b/desktop/src/main/java/haveno/desktop/main/overlays/windows/OfferDetailsWindow.java @@ -174,7 +174,7 @@ public class OfferDetailsWindow extends Overlay { List acceptedCountryCodes = offer.getAcceptedCountryCodes(); boolean showAcceptedCountryCodes = acceptedCountryCodes != null && !acceptedCountryCodes.isEmpty(); boolean isF2F = offer.getPaymentMethod().equals(PaymentMethod.F2F); - boolean showExtraInfo = offer.getPaymentMethod().equals(PaymentMethod.F2F) || offer.getPaymentMethod().equals(PaymentMethod.CASH_BY_MAIL); + boolean showExtraInfo = offer.getPaymentMethod().equals(PaymentMethod.F2F) || offer.getPaymentMethod().equals(PaymentMethod.PAY_BY_MAIL); if (!takeOfferHandlerOptional.isPresent()) rows++; if (showAcceptedBanks) diff --git a/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java b/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java index a50f7d68f5..6c3182c0e0 100644 --- a/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java +++ b/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java @@ -27,12 +27,12 @@ import haveno.core.offer.Offer; import haveno.core.payment.PaymentAccount; import haveno.core.payment.PaymentAccountUtil; import haveno.core.payment.payload.AssetAccountPayload; -import haveno.core.payment.payload.CashByMailAccountPayload; import haveno.core.payment.payload.CashDepositAccountPayload; import haveno.core.payment.payload.F2FAccountPayload; import haveno.core.payment.payload.FasterPaymentsAccountPayload; import haveno.core.payment.payload.HalCashAccountPayload; import haveno.core.payment.payload.MoneyGramAccountPayload; +import haveno.core.payment.payload.PayByMailAccountPayload; import haveno.core.payment.payload.PaymentAccountPayload; import haveno.core.payment.payload.PaymentMethod; import haveno.core.payment.payload.SwiftAccountPayload; @@ -51,7 +51,7 @@ import haveno.desktop.components.paymentmethods.AmazonGiftCardForm; import haveno.desktop.components.paymentmethods.AssetsForm; import haveno.desktop.components.paymentmethods.BizumForm; import haveno.desktop.components.paymentmethods.CapitualForm; -import haveno.desktop.components.paymentmethods.CashByMailForm; +import haveno.desktop.components.paymentmethods.PayByMailForm; import haveno.desktop.components.paymentmethods.CashDepositForm; import haveno.desktop.components.paymentmethods.CelPayForm; import haveno.desktop.components.paymentmethods.ChaseQuickPayForm; @@ -292,8 +292,8 @@ public class BuyerStep2View extends TradeStepView { case PaymentMethod.CASH_DEPOSIT_ID: gridRow = CashDepositForm.addFormForBuyer(gridPane, gridRow, paymentAccountPayload); break; - case PaymentMethod.CASH_BY_MAIL_ID: - gridRow = CashByMailForm.addFormForBuyer(gridPane, gridRow, paymentAccountPayload); + case PaymentMethod.PAY_BY_MAIL_ID: + gridRow = PayByMailForm.addFormForBuyer(gridPane, gridRow, paymentAccountPayload); break; case PaymentMethod.MONEY_GRAM_ID: gridRow = MoneyGramForm.addFormForBuyer(gridPane, gridRow, paymentAccountPayload); @@ -617,7 +617,7 @@ public class BuyerStep2View extends TradeStepView { Res.get("portfolio.pending.step2_buyer.fasterPaymentsHolderNameInfo") + "\n\n" + refTextWarn + "\n\n" + fees; - } else if (paymentAccountPayload instanceof CashByMailAccountPayload || + } else if (paymentAccountPayload instanceof PayByMailAccountPayload || paymentAccountPayload instanceof HalCashAccountPayload) { message += Res.get("portfolio.pending.step2_buyer.pay", amount); } else if (paymentAccountPayload instanceof SwiftAccountPayload) { diff --git a/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java b/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java index 58d845b0ea..b28307f090 100644 --- a/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java +++ b/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java @@ -28,7 +28,7 @@ import haveno.core.payment.PaymentAccountUtil; import haveno.core.payment.payload.AmazonGiftCardAccountPayload; import haveno.core.payment.payload.AssetAccountPayload; import haveno.core.payment.payload.BankAccountPayload; -import haveno.core.payment.payload.CashByMailAccountPayload; +import haveno.core.payment.payload.PayByMailAccountPayload; import haveno.core.payment.payload.CashDepositAccountPayload; import haveno.core.payment.payload.F2FAccountPayload; import haveno.core.payment.payload.HalCashAccountPayload; @@ -400,8 +400,8 @@ public class SellerStep3View extends TradeStepView { } else { if (paymentAccountPayload instanceof USPostalMoneyOrderAccountPayload) { message = Res.get("portfolio.pending.step3_seller.postal", part1, tradeVolumeWithCode); - } else if (paymentAccountPayload instanceof CashByMailAccountPayload) { - message = Res.get("portfolio.pending.step3_seller.cashByMail", part1, tradeVolumeWithCode); + } else if (paymentAccountPayload instanceof PayByMailAccountPayload) { + message = Res.get("portfolio.pending.step3_seller.payByMail", part1, tradeVolumeWithCode); } else if (!(paymentAccountPayload instanceof WesternUnionAccountPayload) && !(paymentAccountPayload instanceof HalCashAccountPayload) && !(paymentAccountPayload instanceof F2FAccountPayload) && diff --git a/proto/src/main/proto/pb.proto b/proto/src/main/proto/pb.proto index da71e8b0e0..cddf8be050 100644 --- a/proto/src/main/proto/pb.proto +++ b/proto/src/main/proto/pb.proto @@ -848,7 +848,7 @@ message PaymentAccountPayload { TransferwiseAccountPayload Transferwise_account_payload = 29; AustraliaPayidPayload australia_payid_payload = 30; AmazonGiftCardAccountPayload amazon_gift_card_account_payload = 31; - CashByMailAccountPayload cash_by_mail_account_payload = 32; + PayByMailAccountPayload pay_by_mail_account_payload = 32; CapitualAccountPayload capitual_account_payload = 33; PayseraAccountPayload Paysera_account_payload = 34; PaxumAccountPayload Paxum_account_payload = 35; @@ -1106,7 +1106,7 @@ message PaytmAccountPayload { string email_or_mobile_nr = 1; } -message CashByMailAccountPayload { +message PayByMailAccountPayload { string postal_address = 1; string contact = 2; string extra_info = 3;