Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-06-24 23:00:36 -04:00
Code Issues Projects Releases Packages Wiki Activity

Change woring for reference text, add info about bank fees

Browse source
This commit is contained in:
Manfred Karrer 2016-04-10 19:11:35 +02:00
parent 40064724d3
commit 83f03e75da
3 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
gui/src/main/java/io/bitsquare/gui/main/overlays/windows/TacWindow.java
View file

@ -32,7 +32,8 @@ public class TacWindow extends Overlay<TacWindow> {
"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" + "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" + "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 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 cooperate with the arbitrator during the arbitration process.\n" +
" - You must reply within 48 hours to each arbitrator inquiry.\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" + " - Failure to follow the above requirements may result in loss of your security deposit.\n\n" +

11
gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java
View file

@ -84,10 +84,11 @@ public class BuyerStep2View extends TradeStepView {
"Here are the payment account details of the bitcoin seller:\n" + "Here are the payment account details of the bitcoin seller:\n" +
"" + paymentAccountContractData.getPaymentDetailsForTradePopup() + ".\n" + "" + paymentAccountContractData.getPaymentDetailsForTradePopup() + ".\n" +
"(You can copy & paste the values from the main screen after closing that popup.)\n\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() + "Please don't forget to add the trade ID \"" + trade.getShortId() +
"\" so the receiver can assign your payment to this trade.\n\n" + "\" as \"reason for payment\" so the receiver can assign your payment to this trade.\n\n" +
"DO NOT use any additional notice in the reference text like " + "DO NOT use any additional notice in the \"reason for payment\" text like " +
"Bitcoin, Btc or Bitsquare."; "Bitcoin, Btc or Bitsquare.\n\n" +
"If your bank charges fees you have to cover those fees.";
if (!BitsquareApp.DEV_MODE && preferences.showAgain(key)) { if (!BitsquareApp.DEV_MODE && preferences.showAgain(key)) {
preferences.dontShowAgain(key, true); preferences.dontShowAgain(key, true);
@ -168,7 +169,7 @@ public class BuyerStep2View extends TradeStepView {
} }
if (!(paymentAccountContractData instanceof CryptoCurrencyAccountContractData)) 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); GridPane.setRowSpan(accountTitledGroupBg, gridRow - 3);

4
gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java
View file

@ -83,7 +83,7 @@ public class SellerStep3View extends TradeStepView {
message = "Your trading partner has confirmed that he initiated the " + currencyName + " payment.\n\n" + 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 " + "Please go to your online banking web page and check if you have received " +
tradeAmountWithCode + " from the bitcoin buyer.\n\n" + 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)) { if (!BitsquareApp.DEV_MODE && preferences.showAgain(key)) {
preferences.dontShowAgain(key, true); preferences.dontShowAgain(key, true);
@ -151,7 +151,7 @@ public class SellerStep3View extends TradeStepView {
paymentDetailsTextField.setTooltip(new Tooltip(paymentDetails)); paymentDetailsTextField.setTooltip(new Tooltip(paymentDetails));
if (!isBlockChain) { if (!isBlockChain) {
addLabelTextFieldWithCopyIcon(gridPane, ++gridRow, "Reference text:", model.dataModel.getReference()); addLabelTextFieldWithCopyIcon(gridPane, ++gridRow, "Reason for payment:", model.dataModel.getReference());
GridPane.setRowSpan(titledGroupBg, 3); GridPane.setRowSpan(titledGroupBg, 3);
} }