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

Show file tree
Hide file tree
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
4 changes: 1 addition & 3 deletions desktop/src/main/java/bisq/desktop/main/account/AccountView.java
View file
Open in desktop
Expand Up @@ -82,7 +82,6 @@ public class AccountView extends ActivatableView<TabPane, Void> {
private ArbitratorRegistrationView arbitratorRegistrationView;
private MediatorRegistrationView mediatorRegistrationView;
private RefundAgentRegistrationView refundAgentRegistrationView;
private SigningView signingView;
private Scene scene;
private EventHandler<KeyEvent> keyEventEventHandler;
private ListChangeListener<Tab> tabListChangeListener;
Expand Down Expand Up @@ -152,7 +151,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 (signingTab != null && selectedTab != signingTab) {
} else if (signingTab != null && !selectedTab.equals(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 @@ -305,7 +304,6 @@ private void loadView(Class<? extends View> viewClass) {
} else if (view instanceof SigningView) {
if (signingTab != null) {
selectedTab = signingTab;
signingView = (SigningView) view;
}
} else if (view instanceof FiatAccountsView) {
selectedTab = fiatAccountsTab;
Expand Down
5 changes: 1 addition & 4 deletions desktop/src/main/java/bisq/desktop/main/account/register/signing/SigningView.java
View file
Open in desktop
Expand Up @@ -24,11 +24,9 @@
import bisq.desktop.main.overlays.windows.SignSpecificWitnessWindow;
import bisq.desktop.main.overlays.windows.SignUnsignedPubKeysWindow;

import bisq.common.config.Config;
import bisq.common.util.Utilities;

import javax.inject.Inject;
import javax.inject.Named;

import javafx.scene.Scene;
import javafx.scene.input.KeyCode;
Expand All @@ -49,8 +47,7 @@ public class SigningView extends ActivatableView<AnchorPane, Void> {
@Inject
public SigningView(SignPaymentAccountsWindow signPaymentAccountsWindow,
SignSpecificWitnessWindow signSpecificWitnessWindow,
SignUnsignedPubKeysWindow signUnsignedPubKeysWindow,
@Named(Config.USE_DEV_PRIVILEGE_KEYS) boolean useDevPrivilegeKeys) {
SignUnsignedPubKeysWindow signUnsignedPubKeysWindow) {
this.signPaymentAccountsWindow = signPaymentAccountsWindow;
this.signSpecificWitnessWindow = signSpecificWitnessWindow;
this.signUnsignedPubKeysWindow = signUnsignedPubKeysWindow;
Expand Down