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

Merge pull request #2428 from ManfredKarrer/add-more-info-at-dispute-system-msg

Browse source 
Add more instructions at dispute system message
This commit is contained in:
Manfred Karrer 2019-02-16 19:32:02 -05:00 • committed by GitHub
commit edb050a087
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/src/main/java/bisq/core/arbitration/DisputeManager.java
View file

@ -337,7 +337,7 @@ public class DisputeManager implements PersistedDataHost {
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(

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

@ -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}

2
desktop/src/main/java/bisq/desktop/main/overlays/windows/TacWindow.java
View file

@ -107,7 +107,7 @@ public class TacWindow extends Overlay<TacWindow> {
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));
}