From 2daa4aa41bdee51f5d28805e5e287c2e42540135 Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Fri, 15 Feb 2019 19:03:53 -0500 Subject: [PATCH 1/3] Add more instructions at dispute system message - Use redirect link for arbitr. doc --- .../bisq/core/arbitration/DisputeManager.java | 2 +- .../resources/i18n/displayStrings.properties | 26 ++++++++++++++----- .../main/overlays/windows/TacWindow.java | 2 +- 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/core/src/main/java/bisq/core/arbitration/DisputeManager.java b/core/src/main/java/bisq/core/arbitration/DisputeManager.java index 637357787c1..69dc30a2b57 100644 --- a/core/src/main/java/bisq/core/arbitration/DisputeManager.java +++ b/core/src/main/java/bisq/core/arbitration/DisputeManager.java @@ -337,7 +337,7 @@ public void sendOpenNewDisputeMessage(Dispute dispute, boolean reOpen, ResultHan final Optional 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( diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties index 4a1825cfc9b..ff9c9513a86 100644 --- a/core/src/main/resources/i18n/displayStrings.properties +++ b/core/src/main/resources/i18n/displayStrings.properties @@ -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\ +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} diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/TacWindow.java b/desktop/src/main/java/bisq/desktop/main/overlays/windows/TacWindow.java index c2d410b2c87..0d1d529131c 100644 --- a/desktop/src/main/java/bisq/desktop/main/overlays/windows/TacWindow.java +++ b/desktop/src/main/java/bisq/desktop/main/overlays/windows/TacWindow.java @@ -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)); } From 94e702f165e03a60a1a039ad52e38dafd81e71af Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Sat, 16 Feb 2019 19:02:48 -0500 Subject: [PATCH 2/3] Improve text. Use link to docs --- core/src/main/resources/i18n/displayStrings.properties | 10 +++++----- .../bisq/desktop/main/overlays/windows/TacWindow.java | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties index ff9c9513a86..4a25630b6ed 100644 --- a/core/src/main/resources/i18n/displayStrings.properties +++ b/core/src/main/resources/i18n/displayStrings.properties @@ -827,18 +827,18 @@ 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 send a description about your problem in the text field below. \ +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 made the Fiat or Altcoin transfer? If so, did you click the 'payment started' \ + \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 received the Fiat or Altcoin payment? If so, did you click the 'payment received' \ + \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 a software bug with failed transactions please consider to start over with a new data directory.\n\ + \t● If you encountered an issue with failed transactions please consider switching to 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\ + \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\ diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/TacWindow.java b/desktop/src/main/java/bisq/desktop/main/overlays/windows/TacWindow.java index 0d1d529131c..ad62b5017e7 100644 --- a/desktop/src/main/java/bisq/desktop/main/overlays/windows/TacWindow.java +++ b/desktop/src/main/java/bisq/desktop/main/overlays/windows/TacWindow.java @@ -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//docs/exchange/arbitration-system"); + "https://bisq.network/docs/exchange/arbitration-system"); hyperlinkWithIcon.getStyleClass().add(fontStyleClass); GridPane.setMargin(hyperlinkWithIcon, new Insets(-6, 0, -20, -4)); } From a54594725a7890fb548f7a5c43aef1c6dcfd62e9 Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Sat, 16 Feb 2019 19:04:14 -0500 Subject: [PATCH 3/3] Improve text --- core/src/main/resources/i18n/displayStrings.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties index 4a25630b6ed..bba832e2c37 100644 --- a/core/src/main/resources/i18n/displayStrings.properties +++ b/core/src/main/resources/i18n/displayStrings.properties @@ -837,7 +837,7 @@ support.initialInfo=Please enter a description of your problem in the text field \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 It can be that some data are corrupted which can cause repeated bugs. \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\