Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Create modal pop-up with single button taking user to Support screen if there are active support tickets #3477

Closed
wants to merge 3 commits into from
Closed

Create modal pop-up with single button taking user to Support screen if there are active support tickets #3477

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0219887
Create modal pop-up with single button taking user to Support screen if
niyid Oct 26, 2019
aae6fc7
This should run in a thread.
niyid Oct 26, 2019
acda8c3
Merge branch 'master' into master
niyid Nov 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions core/src/main/resources/i18n/displayStrings.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -789,6 +789,11 @@ 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 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.attention=You have unresolved support issues. Please resolve as promptly as possible.
portfolio.pending.support.popup.info.arbitrator=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
portfolio.pending.support.headline.periodOver=Trade period is over
Expand Down
14 changes: 14 additions & 0 deletions desktop/src/main/java/bisq/desktop/main/MainView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
import bisq.desktop.main.settings.SettingsView;
import bisq.desktop.main.shared.PriceFeedComboBoxItem;
import bisq.desktop.main.support.SupportView;
import bisq.desktop.main.support.dispute.client.arbitration.ArbitrationClientView;
import bisq.desktop.util.DisplayUtils;
import bisq.desktop.util.Transitions;

Expand Down Expand Up @@ -413,6 +414,7 @@ protected Tooltip computeValue() {

// Delay a bit to give time for rendering the splash screen
UserThread.execute(() -> onUiReadyHandler.run());
UserThread.execute(() -> checkOpenSupportTickets());
niyid marked this conversation as resolved.
Show resolved Hide resolved
}

///////////////////////////////////////////////////////////////////////////////////////////
Expand All @@ -429,6 +431,18 @@ public void onCheckpointFail() {
.useShutDownButton()
.show();
}

private void checkOpenSupportTickets() {
// Create modal pop-up with single button taking user to Support screen if there
// are active support tickets
if (model.getNumOpenSupportTickets() != null && Integer.parseInt(model.getNumOpenSupportTickets().get()) > 0) {
new Popup<>().attention(Res.get("portfolio.pending.support.popup.attention"))
.closeButtonTextWithGoTo("navigation.support")
.onClose(
() -> navigation.navigateTo(MainView.class, SupportView.class, ArbitrationClientView.class))
.show();
niyid marked this conversation as resolved.
Show resolved Hide resolved
}
}


///////////////////////////////////////////////////////////////////////////////////////////
Expand Down