From 1a80da2bb77f7ec8719207635bf53cf88110255f Mon Sep 17 00:00:00 2001 From: wiz Date: Fri, 2 Oct 2020 08:44:55 +0900 Subject: [PATCH 1/2] Update text/URL in Terms and Conditions window for Bisq Price Indices Since this is a legal agreement, the goal is to limit the liability of the facilitators of the service, not to explain how we calculate the price indicies - users can find that information on the "about" page. Also updates URL for Dispute Resolution to the new wiki article. Fixes #4571 --- .../java/bisq/desktop/main/overlays/windows/TacWindow.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 d2cb12c4426..2c16dfcb65c 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 @@ -72,8 +72,7 @@ public void show() { "2. The user is responsible for using the software in compliance with local laws. Don't use the software if using it is not legal in your jurisdiction.\n\n" + - "3. The " + Res.getBaseCurrencyName() + " market price is delivered by 3rd parties (BitcoinAverage, Poloniex, Coinmarketcap). " + - "It is your responsibility to verify the price with other sources for correctness.\n\n" + + "3. Any " + Res.getBaseCurrencyName() + " market prices, network fee estimates, or other data obtained from servers operated by the Bisq DAO is provided is on an 'as is, as available' basis without representation or warranty of any kind. It is your responsibility to verify any data provided in regards to inaccuracies or omissions.\n\n" + "4. Any Fiat payment method carries a potential risk for bank chargeback. By accepting the \"User Agreement\" the user confirms " + "to be aware of those risks and in no case will claim legal responsibility to the authors or copyright holders of the software.\n\n" + @@ -107,8 +106,9 @@ protected void addMessage() { super.addMessage(); String fontStyleClass = smallScreen ? "small-text" : "normal-text"; messageLabel.getStyleClass().add(fontStyleClass); + HyperlinkWithIcon hyperlinkWithIcon = addHyperlinkWithIcon(gridPane, ++rowIndex, Res.get("tacWindow.arbitrationSystem"), - "https://docs.bisq.network/trading-rules.html#dispute-resolution"); + "https://bisq.wiki/Dispute_resolution"); hyperlinkWithIcon.getStyleClass().add(fontStyleClass); GridPane.setMargin(hyperlinkWithIcon, new Insets(-6, 0, -20, -4)); } From 4dc27d9c2a6c448ac141e25a396aba752ba2d4c5 Mon Sep 17 00:00:00 2001 From: wiz Date: Fri, 2 Oct 2020 22:03:51 +0900 Subject: [PATCH 2/2] Remove extra "is" word in TaC text --- .../main/java/bisq/desktop/main/overlays/windows/TacWindow.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 2c16dfcb65c..fff22fba6e5 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 @@ -72,7 +72,7 @@ public void show() { "2. The user is responsible for using the software in compliance with local laws. Don't use the software if using it is not legal in your jurisdiction.\n\n" + - "3. Any " + Res.getBaseCurrencyName() + " market prices, network fee estimates, or other data obtained from servers operated by the Bisq DAO is provided is on an 'as is, as available' basis without representation or warranty of any kind. It is your responsibility to verify any data provided in regards to inaccuracies or omissions.\n\n" + + "3. Any " + Res.getBaseCurrencyName() + " market prices, network fee estimates, or other data obtained from servers operated by the Bisq DAO is provided on an 'as is, as available' basis without representation or warranty of any kind. It is your responsibility to verify any data provided in regards to inaccuracies or omissions.\n\n" + "4. Any Fiat payment method carries a potential risk for bank chargeback. By accepting the \"User Agreement\" the user confirms " + "to be aware of those risks and in no case will claim legal responsibility to the authors or copyright holders of the software.\n\n" +