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

Add alternative text until mediation is activated

Browse source
This commit is contained in:
Christoph Atteneder 2019-09-13 11:57:57 +02:00
parent 84d91582d6
commit 982f610a16
No known key found for this signature in database
GPG key ID: CD5DC1C529CDFD3B
3 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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 \ 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. \ 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. 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.button.getHelp=Get support
portfolio.pending.support.popup.info=If your issue with the trade remains unsolved, you can open a 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? Are you sure you want to open a support ticket?
portfolio.pending.support.popup.button=Open support ticket portfolio.pending.support.popup.button=Open support ticket
portfolio.pending.support.headline.halfPeriodOver=Check payment portfolio.pending.support.headline.halfPeriodOver=Check payment

4
desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/TradeStepInfo.java
View file

@ -21,6 +21,7 @@ import bisq.desktop.components.AutoTooltipButton;
import bisq.desktop.components.TitledGroupBg; import bisq.desktop.components.TitledGroupBg;
import bisq.core.locale.Res; import bisq.core.locale.Res;
import bisq.core.support.dispute.mediation.MediationManager;
import bisq.core.trade.Trade; import bisq.core.trade.Trade;
import javafx.scene.control.Label; import javafx.scene.control.Label;
@ -101,7 +102,8 @@ public class TradeStepInfo {
case SHOW_GET_HELP_BUTTON: case SHOW_GET_HELP_BUTTON:
// grey button // grey button
titledGroupBg.setText(Res.get("portfolio.pending.support.headline.getHelp")); 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.setText(Res.get("portfolio.pending.support.button.getHelp").toUpperCase());
button.setId(null); button.setId(null);
button.getStyleClass().remove("action-button"); button.getStyleClass().remove("action-button");

4
desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/TradeStepView.java
View file

@ -29,6 +29,7 @@ import bisq.desktop.util.Layout;
import bisq.core.locale.Res; import bisq.core.locale.Res;
import bisq.core.support.dispute.Dispute; import bisq.core.support.dispute.Dispute;
import bisq.core.support.dispute.DisputeResult; import bisq.core.support.dispute.DisputeResult;
import bisq.core.support.dispute.mediation.MediationManager;
import bisq.core.trade.Contract; import bisq.core.trade.Contract;
import bisq.core.trade.Trade; import bisq.core.trade.Trade;
import bisq.core.user.DontShowAgainLookup; import bisq.core.user.DontShowAgainLookup;
@ -212,7 +213,8 @@ public abstract class TradeStepView extends AnchorPane {
if (!isMediationClosedState()) { if (!isMediationClosedState()) {
tradeStepInfo.setOnAction(e -> { 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")) .actionButtonText(Res.get("portfolio.pending.support.popup.button"))
.onAction(this::openSupportTicket) .onAction(this::openSupportTicket)
.closeButtonText(Res.get("shared.cancel")) .closeButtonText(Res.get("shared.cancel"))