From 83f03e75daf5e2f6678edd2b4565c43d9a15c12a Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Sun, 10 Apr 2016 19:11:35 +0200 Subject: [PATCH] Change woring for reference text, add info about bank fees --- .../gui/main/overlays/windows/TacWindow.java | 3 ++- .../pendingtrades/steps/buyer/BuyerStep2View.java | 11 ++++++----- .../pendingtrades/steps/seller/SellerStep3View.java | 4 ++-- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/gui/src/main/java/io/bitsquare/gui/main/overlays/windows/TacWindow.java b/gui/src/main/java/io/bitsquare/gui/main/overlays/windows/TacWindow.java index 92c7d7af5d..8cc1ac11f8 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/overlays/windows/TacWindow.java +++ b/gui/src/main/java/io/bitsquare/gui/main/overlays/windows/TacWindow.java @@ -32,7 +32,8 @@ public class TacWindow extends Overlay { "2. The user is responsible to use the software in compliance with local laws. Don't use Bitsquare if the usage of Bitcoin is not legal in your jurisdiction.\n\n" + "3. The user confirms that he has read and agreed to the rules regrading the dispute process:\n" + " - You must finalize trades within the maximum duration specified for each payment method.\n" + - " - You must enter the correct reference text for your payment transfers.\n" + + " - You must enter the trade ID in the \"reason for payment\" text field when doing the fiat payment transfer.\n" + + " - If the bank of the fiat sender charges fees for the fiat transfer the fiat sender (bitcoin buyer) has to cover the fees.\n" + " - You must cooperate with the arbitrator during the arbitration process.\n" + " - You must reply within 48 hours to each arbitrator inquiry.\n" + " - Failure to follow the above requirements may result in loss of your security deposit.\n\n" + diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java index a55aed5b01..03d4264772 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java +++ b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java @@ -84,10 +84,11 @@ public class BuyerStep2View extends TradeStepView { "Here are the payment account details of the bitcoin seller:\n" + "" + paymentAccountContractData.getPaymentDetailsForTradePopup() + ".\n" + "(You can copy & paste the values from the main screen after closing that popup.)\n\n" + - "Please don't forget to add the reference text \"" + trade.getShortId() + - "\" so the receiver can assign your payment to this trade.\n\n" + - "DO NOT use any additional notice in the reference text like " + - "Bitcoin, Btc or Bitsquare."; + "Please don't forget to add the trade ID \"" + trade.getShortId() + + "\" as \"reason for payment\" so the receiver can assign your payment to this trade.\n\n" + + "DO NOT use any additional notice in the \"reason for payment\" text like " + + "Bitcoin, Btc or Bitsquare.\n\n" + + "If your bank charges fees you have to cover those fees."; if (!BitsquareApp.DEV_MODE && preferences.showAgain(key)) { preferences.dontShowAgain(key, true); @@ -168,7 +169,7 @@ public class BuyerStep2View extends TradeStepView { } if (!(paymentAccountContractData instanceof CryptoCurrencyAccountContractData)) - addLabelTextFieldWithCopyIcon(gridPane, ++gridRow, "Reference text:", model.dataModel.getReference()); + addLabelTextFieldWithCopyIcon(gridPane, ++gridRow, "Reason for payment:", model.dataModel.getReference()); GridPane.setRowSpan(accountTitledGroupBg, gridRow - 3); diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java index 1f0291b8d5..1bfa5cd5eb 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java +++ b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java @@ -83,7 +83,7 @@ public class SellerStep3View extends TradeStepView { message = "Your trading partner has confirmed that he initiated the " + currencyName + " payment.\n\n" + "Please go to your online banking web page and check if you have received " + tradeAmountWithCode + " from the bitcoin buyer.\n\n" + - "The reference text of the transaction is: \"" + trade.getShortId() + "\""; + "The trade ID (\"reason for payment\" text) of the transaction is: \"" + trade.getShortId() + "\""; } if (!BitsquareApp.DEV_MODE && preferences.showAgain(key)) { preferences.dontShowAgain(key, true); @@ -151,7 +151,7 @@ public class SellerStep3View extends TradeStepView { paymentDetailsTextField.setTooltip(new Tooltip(paymentDetails)); if (!isBlockChain) { - addLabelTextFieldWithCopyIcon(gridPane, ++gridRow, "Reference text:", model.dataModel.getReference()); + addLabelTextFieldWithCopyIcon(gridPane, ++gridRow, "Reason for payment:", model.dataModel.getReference()); GridPane.setRowSpan(titledGroupBg, 3); }