From 982f610a165b3725e860eaeab38da5329879f78e Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Fri, 13 Sep 2019 11:57:57 +0200 Subject: [PATCH] Add alternative text until mediation is activated --- core/src/main/resources/i18n/displayStrings.properties | 8 +++++++- .../main/portfolio/pendingtrades/TradeStepInfo.java | 4 +++- .../main/portfolio/pendingtrades/steps/TradeStepView.java | 4 +++- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties index cdea48da0a..9b54cf9471 100644 --- a/core/src/main/resources/i18n/displayStrings.properties +++ b/core/src/main/resources/i18n/displayStrings.properties @@ -760,9 +760,15 @@ portfolio.pending.support.headline.getHelp=Need help? portfolio.pending.support.text.getHelp=If you have any problems you can try to contact the trade peer in the trade \ chat or ask the Bisq community at https://bisq.community. \ If your issue still isn't resolved, you can request more help from a mediator. +portfolio.pending.support.text.getHelp.arbitrator=If you have any problems you can try to contact the trade peer in the trade \ + chat or ask the Bisq community at https://bisq.community. \ + If your issue still isn't resolved, you can request more help from an arbitrator. portfolio.pending.support.button.getHelp=Get support portfolio.pending.support.popup.info=If your issue with the trade remains unsolved, you can open a support \ - ticket to request help from the mediator. If you have not received the payment, please wait until the trade period is over.\n\n\ + ticket to request help from a mediator. If you have not received the payment, please wait until the trade period is over.\n\n\ + Are you sure you want to open a support ticket? +portfolio.pending.support.popup.info.aribtrator=If your issue with the trade remains unsolved, you can open a support \ + ticket to request help from an arbitrator. If you have not received the payment, please wait until the trade period is over.\n\n\ Are you sure you want to open a support ticket? portfolio.pending.support.popup.button=Open support ticket portfolio.pending.support.headline.halfPeriodOver=Check payment diff --git a/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/TradeStepInfo.java b/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/TradeStepInfo.java index e27e285a65..a04dc306ee 100644 --- a/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/TradeStepInfo.java +++ b/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/TradeStepInfo.java @@ -21,6 +21,7 @@ import bisq.desktop.components.AutoTooltipButton; import bisq.desktop.components.TitledGroupBg; import bisq.core.locale.Res; +import bisq.core.support.dispute.mediation.MediationManager; import bisq.core.trade.Trade; import javafx.scene.control.Label; @@ -101,7 +102,8 @@ public class TradeStepInfo { case SHOW_GET_HELP_BUTTON: // grey button titledGroupBg.setText(Res.get("portfolio.pending.support.headline.getHelp")); - label.setText(Res.get("portfolio.pending.support.text.getHelp")); + label.setText(MediationManager.isMediationActivated() ? + Res.get("portfolio.pending.support.text.getHelp") : Res.get("portfolio.pending.support.text.getHelp.arbitrator")); button.setText(Res.get("portfolio.pending.support.button.getHelp").toUpperCase()); button.setId(null); button.getStyleClass().remove("action-button"); diff --git a/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/TradeStepView.java b/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/TradeStepView.java index e0fd522d8f..ec6f96e743 100644 --- a/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/TradeStepView.java +++ b/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/TradeStepView.java @@ -29,6 +29,7 @@ import bisq.desktop.util.Layout; import bisq.core.locale.Res; import bisq.core.support.dispute.Dispute; import bisq.core.support.dispute.DisputeResult; +import bisq.core.support.dispute.mediation.MediationManager; import bisq.core.trade.Contract; import bisq.core.trade.Trade; import bisq.core.user.DontShowAgainLookup; @@ -212,7 +213,8 @@ public abstract class TradeStepView extends AnchorPane { if (!isMediationClosedState()) { tradeStepInfo.setOnAction(e -> { - new Popup<>().attention(Res.get("portfolio.pending.support.popup.info")) + new Popup<>().attention(MediationManager.isMediationActivated() ? + Res.get("portfolio.pending.support.popup.info") : Res.get("portfolio.pending.support.popup.info.aribtrator")) .actionButtonText(Res.get("portfolio.pending.support.popup.button")) .onAction(this::openSupportTicket) .closeButtonText(Res.get("shared.cancel"))