Skip to content

Commit

Permalink
Merge pull request #5091 from jmacxx/test2
Browse files Browse the repository at this point in the history 
Reword "trade started" popup messages per suggestion
  • Loading branch information
@ripcurlx
ripcurlx authored Jan 19, 2021
2 parents 88c4272 + d733919 commit 3f5c455
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 47 deletions.
12 changes: 6 additions & 6 deletions core/src/main/resources/i18n/displayStrings.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -633,13 +633,13 @@ 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'. \
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.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"
Expand All @@ -661,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.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}
Expand Down
47 changes: 6 additions & 41 deletions ...p/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand All @@ -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;
}
Expand Down

0 comments on commit 3f5c455

Please sign in to comment.