Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add more instructions at dispute system message #2428

Merged
merged 3 commits into from
Feb 17, 2019
+21 −9
Merged

Add more instructions at dispute system message #2428

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2daa4aa
Add more instructions at dispute system message
ManfredKarrer Feb 16, 2019
94e702f
Improve text. Use link to docs
ManfredKarrer Feb 17, 2019
a545947
Improve text
ManfredKarrer Feb 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/src/main/java/bisq/core/arbitration/DisputeManager.java
View file
Open in desktop
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
View file
Open in desktop
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 send a description about 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 made 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 received 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 a software bug with failed transactions please consider to start over with a new data directory.\n\
\t It can be that some data are corrupted which can cause repeated bugs. \n\
\t See: https://bisq.community/t/how-to-switch-to-a-new-data-directory/6753\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\
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be a bullet item? Or part of the sentence above?

Please make yourself familiar with the basic rules for the dispute process. You accepted the rules outlined in the dispute document in the user agreement when you first started the application.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Which one you mean? The
"You accepted the rules"?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was intended to be a bullet point

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
2 changes: 1 addition & 1 deletion desktop/src/main/java/bisq/desktop/main/overlays/windows/TacWindow.java
View file
Open in desktop
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