From 52dd29aae43a4ae99273aea08be2b91225b2fcd9 Mon Sep 17 00:00:00 2001 From: woodser Date: Tue, 3 Oct 2023 14:46:08 -0400 Subject: [PATCH] update terms and conditions on startup --- .../main/overlays/windows/TacWindow.java | 30 ++++++------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/desktop/src/main/java/haveno/desktop/main/overlays/windows/TacWindow.java b/desktop/src/main/java/haveno/desktop/main/overlays/windows/TacWindow.java index a25e0cb6..a25666d3 100644 --- a/desktop/src/main/java/haveno/desktop/main/overlays/windows/TacWindow.java +++ b/desktop/src/main/java/haveno/desktop/main/overlays/windows/TacWindow.java @@ -20,16 +20,11 @@ package haveno.desktop.main.overlays.windows; import com.google.inject.Inject; import haveno.core.locale.Res; import haveno.desktop.app.HavenoApp; -import haveno.desktop.components.HyperlinkWithIcon; import haveno.desktop.main.overlays.Overlay; -import javafx.geometry.Insets; import javafx.geometry.Rectangle2D; -import javafx.scene.layout.GridPane; import javafx.stage.Screen; import lombok.extern.slf4j.Slf4j; -import static haveno.desktop.util.FormBuilder.addHyperlinkWithIcon; - @Slf4j public class TacWindow extends Overlay { @@ -56,8 +51,7 @@ public class TacWindow extends Overlay { // We do not translate the tacs because of the legal nature. We would need translations checked by lawyers // in each language which is too expensive atm. - String text = "Note: This document is still related to haveno and will be adapted later on. Haveno is currently for testing only. Do not use real money.\n\n" + - "1. In no event, unless for damages caused by acts of intent and gross negligence, damages resulting from personal injury, " + + String text = "1. In no event, unless for damages caused by acts of intent and gross negligence, damages resulting from personal injury, " + "or damages ensuing from other instances where liability is required by applicable law or agreed to in writing, will any " + "developer, copyright holder and/or any other party who modifies and/or conveys the software as permitted above or " + "facilitates its operation, be liable for damages, including any general, special, incidental or consequential damages " + @@ -80,16 +74,9 @@ public class TacWindow extends Overlay { " - You must complete trades within the maximum duration specified for each payment method.\n" + " - Leave the \"reason for payment\" field empty. DO NOT put the trade ID or any other text like 'monero', 'XMR', or 'Haveno'.\n" + " - If the bank of the fiat sender charges fees, the sender (" + Res.getBaseCurrencyCode() + " buyer) has to cover the fees.\n" + - " - You must cooperate with the mediator during the mediation process, and respond to each mediator message within 48 hours.\n" + - " - If either (or both) traders do not accept the mediator's suggested payout, traders can open a refund request from an arbitrator after 10 days in case of crypto trades\n" + - " and 20 days for fiat trades.\n" + - " - You should only open a refund request from an arbitrator if you think the mediator's suggested payout is unfair, or if your trading peer is unresponsive.\n" + - " - Opening a refund request from an arbitrator triggers the delayed payout transaction, sending all funds from the deposit transaction to the Haveno receiver\n" + - " address ('collateral for refund to avoid scamming the refund process'). At this point, the arbitrator will re-investigate the case and personally refund \n" + - " (at their discretion) the trader who requested arbitration.\n" + - " - The arbitrator may charge a small fee (max. the traders security deposit) as compensation for their work.\n" + - " - The arbitrator will then make a reimbursement request to the Haveno to get reimbursed for the refund they paid to the trader.\n\n" + - "For more details and a general overview please read the full documentation about dispute resolution."; + " - In case of arbitration, you must cooperate with the arbitrator and respond to each message within 48 hours.\n" + + " - In case of arbitration, the decision of the arbitrator is final.\n" + + " - The arbitrator may charge a small fee (max. the traders security deposit) as compensation for their work.\n"; message(text); showScrollPane(); actionButtonText(Res.get("tacWindow.agree")); @@ -105,10 +92,11 @@ public class TacWindow extends Overlay { String fontStyleClass = smallScreen ? "small-text" : "normal-text"; messageLabel.getStyleClass().add(fontStyleClass); - HyperlinkWithIcon hyperlinkWithIcon = addHyperlinkWithIcon(gridPane, ++rowIndex, Res.get("tacWindow.arbitrationSystem"), - "https://bisq.wiki/Dispute_resolution"); - hyperlinkWithIcon.getStyleClass().add(fontStyleClass); - GridPane.setMargin(hyperlinkWithIcon, new Insets(-6, 0, -20, -4)); + // TODO: link to the wiki + // HyperlinkWithIcon hyperlinkWithIcon = addHyperlinkWithIcon(gridPane, ++rowIndex, Res.get("tacWindow.arbitrationSystem"), + // "https://bisq.wiki/Dispute_resolution"); + // hyperlinkWithIcon.getStyleClass().add(fontStyleClass); + // GridPane.setMargin(hyperlinkWithIcon, new Insets(-6, 0, -20, -4)); } @Override