Skip to content

Commit

Permalink
Merge pull request #2428 from ManfredKarrer/add-more-info-at-dispute-…
Browse files Browse the repository at this point in the history
…system-msg

Add more instructions at dispute system message
  • Loading branch information
ManfredKarrer authored Feb 17, 2019
2 parents 9edd4cf + a545947 commit edb050a
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ public void sendOpenNewDisputeMessage(Dispute dispute, boolean reOpen, ResultHan
final Optional<Dispute> storedDisputeOptional = findDispute(dispute.getTradeId(), dispute.getTraderId());
if (!storedDisputeOptional.isPresent() || reOpen) {
String sysMsg = dispute.isSupportTicket() ?
Res.get("support.youOpenedTicket")
Res.get("support.youOpenedTicket", disputeInfo)
: Res.get("support.youOpenedDispute", disputeInfo);

DisputeCommunicationMessage disputeCommunicationMessage = new DisputeCommunicationMessage(
Expand Down
26 changes: 19 additions & 7 deletions core/src/main/resources/i18n/displayStrings.properties
Original file line number Diff line number Diff line change
Expand Up @@ -827,14 +827,26 @@ Please use this method only if you are sure that the software is not working as
If you have problems or questions, please review the FAQ on the \
bisq.network web page or post in the Bisq forum in the Support section.

support.initialInfo=Please note the basic rules for the dispute process:\n\
1. You need to respond to the arbitrator's requests within 2 days.\n\
2. The maximum period for a dispute is 14 days.\n\
3. You need to cooperate with the arbitrator and provide the information they request to make your case.\n\
4. You accepted the rules outlined in the wiki in the user agreement when you first started the application.\n\n\
Please read more about the dispute process in our wiki:\nhttps://github.com/bisq-network/exchange/wiki/Arbitration-system
support.initialInfo=Please enter a description of your problem in the text field below. \
Add as much information as possible to speed up dispute resolution time.\n\n\
Here is a check list for information you should provide:\n\
\t● If you are the BTC buyer: Did you make the Fiat or Altcoin transfer? If so, did you click the 'payment started' \
button in the application?\n\
\t● If you are the BTC seller: Did you receive the Fiat or Altcoin payment? If so, did you click the 'payment received' \
button in the application?\n\
\t● Which version of Bisq are you using?\n\
\t● Which operating system are you using?\n\
\t● If you encountered an issue with failed transactions please consider switching to a new data directory.\n\
\t Sometimes the data directory gets corrupted and leads to strange bugs. \n\
\t See: https://docs.bisq.network/backup-recovery.html#switch-to-a-new-data-directory\n\n\
Please make yourself familiar with the basic rules for the dispute process:\n\
\t● You need to respond to the arbitrator's requests within 2 days.\n\
\t● The maximum period for a dispute is 14 days.\n\
\t● You need to cooperate with the arbitrator and provide the information they request to make your case.\n\
\t● You accepted the rules outlined in the dispute document in the user agreement when you first started the application.\n\n\
You can read more about the dispute process at: https://bisq.network/docs/exchange/arbitration-system
support.systemMsg=System message: {0}
support.youOpenedTicket=You opened a request for support.
support.youOpenedTicket=You opened a request for support.\n\n{0}
support.youOpenedDispute=You opened a request for a dispute.\n\n{0}
support.peerOpenedTicket=Your trading peer has requested support due technical problems. Please wait for further instructions.
support.peerOpenedDispute=Your trading peer has requested a dispute.\n\n{0}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ protected void addMessage() {
String fontStyleClass = smallScreen ? "small-text" : "normal-text";
messageLabel.getStyleClass().add(fontStyleClass);
HyperlinkWithIcon hyperlinkWithIcon = addHyperlinkWithIcon(gridPane, ++rowIndex, Res.get("tacWindow.arbitrationSystem"),
"https://bisq.network/arbitration_system.pdf");
"https://bisq.network/docs/exchange/arbitration-system");
hyperlinkWithIcon.getStyleClass().add(fontStyleClass);
GridPane.setMargin(hyperlinkWithIcon, new Insets(-6, 0, -20, -4));
}
Expand Down

0 comments on commit edb050a

Please sign in to comment.