From a90d606c01c0fd6a3861ebfa763ccdbe747061e1 Mon Sep 17 00:00:00 2001 From: jmacxx <47253594+jmacxx@users.noreply.github.com> Date: Mon, 18 Jan 2021 16:43:43 -0600 Subject: [PATCH 1/2] Reword trade started popups per @m52go suggestion --- .../resources/i18n/displayStrings.properties | 10 ++-- .../steps/buyer/BuyerStep2View.java | 47 +++---------------- 2 files changed, 10 insertions(+), 47 deletions(-) diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties index 07a756d1f08..1c06875883c 100644 --- a/core/src/main/resources/i18n/displayStrings.properties +++ b/core/src/main/resources/i18n/displayStrings.properties @@ -633,13 +633,11 @@ portfolio.pending.step1.openForDispute=The deposit transaction is still not conf You can wait longer or contact the mediator for assistance. # suppress inspection "TrailingSpacesInProperty" -portfolio.pending.step2.confReached=Your trade has reached at least one blockchain confirmation.\n(You can wait for more confirmations if you want - 6 confirmations are considered as very secure.)\n\n +portfolio.pending.step2.confReached=Your trade has reached at least one blockchain confirmation.\n\n -portfolio.pending.step2_buyer.copyPaste=(You can copy & paste the values from the main screen after closing that popup.) -portfolio.pending.step2_buyer.refTextWarn=Leave the \"reason for payment\" field empty. DO NOT put the trade ID or any other text like 'bitcoin', 'BTC', or 'Bisq'. +portfolio.pending.step2_buyer.refTextWarn=Important: when making the payment, leave the \"reason for payment\" field empty. DO NOT put the trade ID or any other text like 'bitcoin', 'BTC', or 'Bisq'. # suppress inspection "TrailingSpacesInProperty" -portfolio.pending.step2_buyer.accountDetails=Here are the trade account details of the BTC seller:\n -portfolio.pending.step2_buyer.fees=If your bank charges fees you have to cover those fees. +portfolio.pending.step2_buyer.fees=If your bank charges you any fees to make the transfer, you are responsible for paying those fees. # suppress inspection "TrailingSpacesInProperty" portfolio.pending.step2_buyer.altcoin=Please transfer from your external {0} wallet\n{1} to the BTC seller.\n\n # suppress inspection "TrailingSpacesInProperty" @@ -661,7 +659,7 @@ portfolio.pending.step2_buyer.amazonGiftCard=Please purchase an Amazon eGift Car # suppress inspection "TrailingSpacesInProperty" portfolio.pending.step2_buyer.postal=Please send {0} by \"US Postal Money Order\" to the BTC seller.\n\n # suppress inspection "TrailingSpacesInProperty" -portfolio.pending.step2_buyer.bank=Please go to your online banking web page and pay {0} to the BTC seller.\n\n +portfolio.pending.step2_buyer.pay=Please pay {0} via the specified payment method to the BTC seller. You'll find the seller's account details on the next screen.\n\n # suppress inspection "TrailingSpacesInProperty" portfolio.pending.step2_buyer.f2f=Please contact the BTC seller by the provided contact and arrange a meeting to pay {0}.\n\n portfolio.pending.step2_buyer.startPaymentUsing=Start payment using {0} diff --git a/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java b/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java index a63d03f2118..9e6d56d9fd6 100644 --- a/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java +++ b/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java @@ -527,27 +527,18 @@ private void confirmPaymentStarted() { private void showPopup() { PaymentAccountPayload paymentAccountPayload = model.dataModel.getSellersPaymentAccountPayload(); if (paymentAccountPayload != null) { - String paymentDetailsForTradePopup = paymentAccountPayload.getPaymentDetailsForTradePopup(); String message = Res.get("portfolio.pending.step2.confReached"); - String copyPaste = Res.get("portfolio.pending.step2_buyer.copyPaste"); String refTextWarn = Res.get("portfolio.pending.step2_buyer.refTextWarn"); - String accountDetails = Res.get("portfolio.pending.step2_buyer.accountDetails"); String fees = Res.get("portfolio.pending.step2_buyer.fees"); String id = trade.getShortId(); String amount = DisplayUtils.formatVolumeWithCode(trade.getTradeVolume()); if (paymentAccountPayload instanceof AssetsAccountPayload) { message += Res.get("portfolio.pending.step2_buyer.altcoin", getCurrencyName(trade), - amount) + - accountDetails + - paymentDetailsForTradePopup + "\n\n" + - copyPaste; + amount); } else if (paymentAccountPayload instanceof CashDepositAccountPayload) { message += Res.get("portfolio.pending.step2_buyer.cash", amount) + - accountDetails + - paymentDetailsForTradePopup + ".\n\n" + - copyPaste + "\n\n" + refTextWarn + "\n\n" + fees + "\n\n" + Res.get("portfolio.pending.step2_buyer.cash.extra"); @@ -556,54 +547,28 @@ private void showPopup() { final String extra = Res.get("portfolio.pending.step2_buyer.westernUnion.extra", email); message += Res.get("portfolio.pending.step2_buyer.westernUnion", amount) + - accountDetails + - paymentDetailsForTradePopup + ".\n\n" + - copyPaste + "\n\n" + extra; } else if (paymentAccountPayload instanceof MoneyGramAccountPayload) { final String email = ((MoneyGramAccountPayload) paymentAccountPayload).getEmail(); final String extra = Res.get("portfolio.pending.step2_buyer.moneyGram.extra", email); message += Res.get("portfolio.pending.step2_buyer.moneyGram", amount) + - accountDetails + - paymentDetailsForTradePopup + ".\n\n" + - copyPaste + "\n\n" + extra; } else if (paymentAccountPayload instanceof USPostalMoneyOrderAccountPayload) { message += Res.get("portfolio.pending.step2_buyer.postal", amount) + - accountDetails + - paymentDetailsForTradePopup + ".\n\n" + - copyPaste + "\n\n" + refTextWarn; } else if (paymentAccountPayload instanceof F2FAccountPayload) { - message += Res.get("portfolio.pending.step2_buyer.f2f", amount) + - accountDetails + - paymentDetailsForTradePopup + "\n\n" + - copyPaste; - } else if (paymentAccountPayload instanceof HalCashAccountPayload) { - message += Res.get("portfolio.pending.step2_buyer.bank", amount) + - accountDetails + - paymentDetailsForTradePopup + ".\n\n" + - copyPaste; + message += Res.get("portfolio.pending.step2_buyer.f2f", amount); } else if (paymentAccountPayload instanceof FasterPaymentsAccountPayload) { - message += Res.get("portfolio.pending.step2_buyer.bank", amount) + - accountDetails + - paymentDetailsForTradePopup + ".\n\n" + + message += Res.get("portfolio.pending.step2_buyer.pay", amount) + Res.get("portfolio.pending.step2_buyer.fasterPaymentsHolderNameInfo") + "\n\n" + - copyPaste + "\n\n" + refTextWarn + "\n\n" + fees; } else if (paymentAccountPayload instanceof AmazonGiftCardAccountPayload) { - message += Res.get("portfolio.pending.step2_buyer.amazonGiftCard", - amount) + - accountDetails + - paymentDetailsForTradePopup + ".\n\n" + - copyPaste; + message += Res.get("portfolio.pending.step2_buyer.amazonGiftCard", amount) + + refTextWarn; } else { - message += Res.get("portfolio.pending.step2_buyer.bank", amount) + - accountDetails + - paymentDetailsForTradePopup + ".\n\n" + - copyPaste + "\n\n" + + message += Res.get("portfolio.pending.step2_buyer.pay", amount) + refTextWarn + "\n\n" + fees; } From d7339196b7777b7d7fe522fa5349c31e58a73cbb Mon Sep 17 00:00:00 2001 From: jmacxx <47253594+jmacxx@users.noreply.github.com> Date: Mon, 18 Jan 2021 19:35:17 -0600 Subject: [PATCH 2/2] Fix apostrophe; add message about discussing reason for payment text. --- core/src/main/resources/i18n/displayStrings.properties | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties index 1c06875883c..a615f5c6d81 100644 --- a/core/src/main/resources/i18n/displayStrings.properties +++ b/core/src/main/resources/i18n/displayStrings.properties @@ -635,7 +635,9 @@ portfolio.pending.step1.openForDispute=The deposit transaction is still not conf # suppress inspection "TrailingSpacesInProperty" portfolio.pending.step2.confReached=Your trade has reached at least one blockchain confirmation.\n\n -portfolio.pending.step2_buyer.refTextWarn=Important: when making the payment, leave the \"reason for payment\" field empty. DO NOT put the trade ID or any other text like 'bitcoin', 'BTC', or 'Bisq'. +portfolio.pending.step2_buyer.refTextWarn=Important: when making the payment, leave the \"reason for payment\" field \ + empty. DO NOT put the trade ID or any other text like 'bitcoin', 'BTC', or 'Bisq'. \ + You are free to discuss via trader chat if an alternate \"reason for payment\" would be suitable to you both. # suppress inspection "TrailingSpacesInProperty" portfolio.pending.step2_buyer.fees=If your bank charges you any fees to make the transfer, you are responsible for paying those fees. # suppress inspection "TrailingSpacesInProperty" @@ -659,7 +661,7 @@ portfolio.pending.step2_buyer.amazonGiftCard=Please purchase an Amazon eGift Car # suppress inspection "TrailingSpacesInProperty" portfolio.pending.step2_buyer.postal=Please send {0} by \"US Postal Money Order\" to the BTC seller.\n\n # suppress inspection "TrailingSpacesInProperty" -portfolio.pending.step2_buyer.pay=Please pay {0} via the specified payment method to the BTC seller. You'll find the seller's account details on the next screen.\n\n +portfolio.pending.step2_buyer.pay=Please pay {0} via the specified payment method to the BTC seller. You''ll find the seller's account details on the next screen.\n\n # suppress inspection "TrailingSpacesInProperty" portfolio.pending.step2_buyer.f2f=Please contact the BTC seller by the provided contact and arrange a meeting to pay {0}.\n\n portfolio.pending.step2_buyer.startPaymentUsing=Start payment using {0}