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

Jump to bottom

Simplify witness signing #4455

Merged
merged 4 commits into from Sep 2, 2020
Merged

Simplify witness signing #4455

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
91e30de
Make a separate signing tab
sqrrm Aug 31, 2020
51908fc
Use mediation cases to popupate arbitrator signing in dev mode
sqrrm Aug 31, 2020
944825e
Close other tab when opening signing tab
sqrrm Aug 31, 2020
6e77ef0
Fix legit codacy complaints
sqrrm Sep 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
32 changes: 19 additions & 13 deletions desktop/src/main/java/bisq/desktop/main/account/AccountView.java
View file
Open in desktop
Expand Up @@ -125,28 +125,19 @@ public void initialize() {

keyEventEventHandler = event -> {
if (Utilities.isAltOrCtrlPressed(KeyCode.D, event) && mediatorRegistrationTab == null) {
if (arbitratorRegistrationTab != null) {
root.getTabs().remove(arbitratorRegistrationTab);
}
if (refundAgentRegistrationTab != null) {
root.getTabs().remove(refundAgentRegistrationTab);
}
closeOtherExtraTabs(mediatorRegistrationTab);
mediatorRegistrationTab = new Tab(Res.get("account.tab.mediatorRegistration").toUpperCase());
mediatorRegistrationTab.setClosable(true);
root.getTabs().add(mediatorRegistrationTab);
navigation.navigateTo(MainView.class, AccountView.class, MediatorRegistrationView.class);
} else if (Utilities.isAltOrCtrlPressed(KeyCode.N, event) && refundAgentRegistrationTab == null) {
if (arbitratorRegistrationTab != null) {
root.getTabs().remove(arbitratorRegistrationTab);
}
if (mediatorRegistrationTab != null) {
root.getTabs().remove(mediatorRegistrationTab);
}
closeOtherExtraTabs(refundAgentRegistrationTab);
refundAgentRegistrationTab = new Tab(Res.get("account.tab.refundAgentRegistration").toUpperCase());
refundAgentRegistrationTab.setClosable(true);
root.getTabs().add(refundAgentRegistrationTab);
navigation.navigateTo(MainView.class, AccountView.class, RefundAgentRegistrationView.class);
} else if (Utilities.isAltOrCtrlPressed(KeyCode.I, event) && signingTab == null) {
closeOtherExtraTabs(signingTab);
signingTab = new Tab(Res.get("account.tab.signing").toUpperCase());
signingTab.setClosable(true);
root.getTabs().add(signingTab);
Expand All @@ -161,7 +152,7 @@ public void initialize() {
navigation.navigateTo(MainView.class, AccountView.class, MediatorRegistrationView.class);
} else if (refundAgentRegistrationTab != null && selectedTab != refundAgentRegistrationTab) {
navigation.navigateTo(MainView.class, AccountView.class, RefundAgentRegistrationView.class);
} else if (newValue == signingTab && selectedTab != signingTab) {
} else if (signingTab != null && selectedTab != signingTab) {
navigation.navigateTo(MainView.class, AccountView.class, SigningView.class);
} else if (newValue == fiatAccountsTab && selectedTab != fiatAccountsTab) {
navigation.navigateTo(MainView.class, AccountView.class, FiatAccountsView.class);
Expand Down Expand Up @@ -195,6 +186,21 @@ public void initialize() {
};
}

private void closeOtherExtraTabs(Tab newTab) {
if (arbitratorRegistrationTab != null && !arbitratorRegistrationTab.equals(newTab)) {
root.getTabs().remove(arbitratorRegistrationTab);
}
if (mediatorRegistrationTab != null && !mediatorRegistrationTab.equals(newTab)) {
root.getTabs().remove(mediatorRegistrationTab);
}
if (refundAgentRegistrationTab != null && !refundAgentRegistrationTab.equals(newTab)) {
root.getTabs().remove(refundAgentRegistrationTab);
}
if (signingTab != null && !signingTab.equals(newTab)) {
root.getTabs().remove(signingTab);
}
}

private void onArbitratorRegistrationTabRemoved() {
arbitratorRegistrationTab = null;
navigation.navigateTo(MainView.class, AccountView.class, FiatAccountsView.class);
Expand Down