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

Merge pull request #3696 from m52go/fix-ua-arblink

Browse source 
Replace arbitration link in tac
This commit is contained in:
Christoph Atteneder 2019-11-27 09:11:15 +01:00 • committed by GitHub
commit e00ae654d4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2384,7 +2384,7 @@ showWalletDataWindow.includePrivKeys=Include private keys
tacWindow.headline=User agreement tacWindow.headline=User agreement
tacWindow.agree=I agree tacWindow.agree=I agree
tacWindow.disagree=I disagree and quit tacWindow.disagree=I disagree and quit
tacWindow.arbitrationSystem=Arbitration system tacWindow.arbitrationSystem=Dispute resolution
tradeDetailsWindow.headline=Trade tradeDetailsWindow.headline=Trade
tradeDetailsWindow.disputedPayoutTxId=Disputed payout transaction ID: tradeDetailsWindow.disputedPayoutTxId=Disputed payout transaction ID:

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

@ -92,8 +92,8 @@ public class TacWindow extends Overlay<TacWindow> {
" - Opening a refund request from an arbitrator triggers the delayed payout transaction, sending all funds from the deposit transaction to the Bisq DAO receiver address ('collateral for refund to avoid scamming the refund process'). At this point, the arbitrator will re-investigate the case and personally refund (at their discretion) the trader who requested arbitration.\n" + " - Opening a refund request from an arbitrator triggers the delayed payout transaction, sending all funds from the deposit transaction to the Bisq DAO receiver address ('collateral for refund to avoid scamming the refund process'). At this point, the arbitrator will re-investigate the case and personally refund (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 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 Bisq DAO to get reimbursed for the refund they paid to the trader.\n\n" + " - The arbitrator will then make a reimbursement request to the Bisq DAO 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 the " + "For more details and a general overview please read the full documentation about " +
"arbitration system and the dispute process."; "dispute resolution.";
message(text); message(text);
actionButtonText(Res.get("tacWindow.agree")); actionButtonText(Res.get("tacWindow.agree"));
closeButtonText(Res.get("tacWindow.disagree")); closeButtonText(Res.get("tacWindow.disagree"));
@ -108,7 +108,7 @@ public class TacWindow extends Overlay<TacWindow> {
String fontStyleClass = smallScreen ? "small-text" : "normal-text"; String fontStyleClass = smallScreen ? "small-text" : "normal-text";
messageLabel.getStyleClass().add(fontStyleClass); messageLabel.getStyleClass().add(fontStyleClass);
HyperlinkWithIcon hyperlinkWithIcon = addHyperlinkWithIcon(gridPane, ++rowIndex, Res.get("tacWindow.arbitrationSystem"), HyperlinkWithIcon hyperlinkWithIcon = addHyperlinkWithIcon(gridPane, ++rowIndex, Res.get("tacWindow.arbitrationSystem"),
"https://bisq.network/docs/exchange/arbitration-system"); "https://docs.bisq.network/trading-rules.html#dispute-resolution");
hyperlinkWithIcon.getStyleClass().add(fontStyleClass); hyperlinkWithIcon.getStyleClass().add(fontStyleClass);
GridPane.setMargin(hyperlinkWithIcon, new Insets(-6, 0, -20, -4)); GridPane.setMargin(hyperlinkWithIcon, new Insets(-6, 0, -20, -4));
} }