From 86086c1e099d83c604403c4d61de0ca57dd0da23 Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Mon, 24 Sep 2018 13:01:33 -0500 Subject: [PATCH] Adjust trade popup text for XMR Fixes https://github.com/bisq-network/bisq/issues/1555 --- core/src/main/resources/i18n/displayStrings.properties | 4 +++- .../pendingtrades/steps/seller/SellerStep3View.java | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties index 5422566c0e1..f8f18768e10 100644 --- a/core/src/main/resources/i18n/displayStrings.properties +++ b/core/src/main/resources/i18n/displayStrings.properties @@ -566,7 +566,9 @@ portfolio.pending.step3_buyer.warn.part2=The BTC seller still has not confirmed portfolio.pending.step3_buyer.openForDispute=The BTC seller has not confirmed your payment!\nThe max. period for the trade has elapsed.\nYou can wait longer and give the trading peer more time or contact the arbitrator for opening a dispute. # suppress inspection "TrailingSpacesInProperty" portfolio.pending.step3_seller.part=Your trading partner has confirmed that he initiated the {0} payment.\n\n -portfolio.pending.step3_seller.altcoin={0}Please check on your favorite {1} blockchain explorer if the transaction to your receiving address\n\ +portfolio.pending.step3_seller.altcoin.explorer=on your favorite {0} blockchain explorer +portfolio.pending.step3_seller.altcoin.wallet=at your {0} wallet +portfolio.pending.step3_seller.altcoin={0}Please check {1} if the transaction to your receiving address\n\ {2}\n\ has already sufficient blockchain confirmations.\nThe payment amount has to be {3}\n\n\ You can copy & paste your {4} address from the main screen after closing that popup. diff --git a/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java b/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java index 49371c6773b..632314eb2df 100644 --- a/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java +++ b/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java @@ -309,8 +309,11 @@ private void showPopup() { String id = trade.getShortId(); if (paymentAccountPayload instanceof CryptoCurrencyAccountPayload) { String address = ((CryptoCurrencyAccountPayload) paymentAccountPayload).getAddress(); + String explorerOrWalletString = trade.getOffer().getCurrencyCode().equals("XMR") ? + Res.get("portfolio.pending.step3_seller.altcoin.wallet", currencyName) : + Res.get("portfolio.pending.step3_seller.altcoin.explorer", currencyName); //noinspection UnusedAssignment - message = Res.get("portfolio.pending.step3_seller.altcoin", part1, currencyName, address, tradeVolumeWithCode, currencyName); + message = Res.get("portfolio.pending.step3_seller.altcoin", part1, explorerOrWalletString, address, tradeVolumeWithCode, currencyName); } else { if (paymentAccountPayload instanceof USPostalMoneyOrderAccountPayload) { message = Res.get("portfolio.pending.step3_seller.postal", part1, tradeVolumeWithCode, id);