mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-23 06:55:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1720 from ManfredKarrer/handle-xmr-popup-text

Browse source 
Adjust trade popup text for XMR
This commit is contained in:
Christoph Atteneder 2018-09-25 17:27:59 +02:00 • committed by GitHub
commit 5d46a991a8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/src/main/resources/i18n/displayStrings.properties
View file

@ -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. 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" # 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.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\ {2}\n\
has already sufficient blockchain confirmations.\nThe payment amount has to be {3}\n\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. You can copy & paste your {4} address from the main screen after closing that popup.

5
desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java
View file

@ -309,8 +309,11 @@ public class SellerStep3View extends TradeStepView {
String id = trade.getShortId(); String id = trade.getShortId();
if (paymentAccountPayload instanceof CryptoCurrencyAccountPayload) { if (paymentAccountPayload instanceof CryptoCurrencyAccountPayload) {
String address = ((CryptoCurrencyAccountPayload) paymentAccountPayload).getAddress(); 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 //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 { } else {
if (paymentAccountPayload instanceof USPostalMoneyOrderAccountPayload) { if (paymentAccountPayload instanceof USPostalMoneyOrderAccountPayload) {
message = Res.get("portfolio.pending.step3_seller.postal", part1, tradeVolumeWithCode, id); message = Res.get("portfolio.pending.step3_seller.postal", part1, tradeVolumeWithCode, id);