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

UI: Remove Elements Core Wallet Support #540

Merged
merged 1 commit into from
Nov 7, 2022
Merged

UI: Remove Elements Core Wallet Support #540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 1 addition & 7 deletions desktop/src/main/java/bisq/desktop/common/view/NavigationTarget.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,13 +142,7 @@ public enum NavigationTarget {
REGISTER_MEDIATOR(ROLES_TABS, false),
REGISTER_ARBITRATOR(ROLES_TABS, false),
REGISTER_MODERATOR(ROLES_TABS, false),
REGISTER_ORACLE(ROLES_TABS, false),

WALLET_LBTC(CONTENT, false),
WALLET_LBTC_TRANSACTIONS(WALLET_LBTC),
WALLET_LBTC_SEND(WALLET_LBTC),
WALLET_LBTC_RECEIVE(WALLET_LBTC),
WALLET_LBTC_UTXOS(WALLET_LBTC);
REGISTER_ORACLE(ROLES_TABS, false);

@Getter
private final Optional<NavigationTarget> parent;
Expand Down
4 changes: 0 additions & 4 deletions desktop/src/main/java/bisq/desktop/primary/main/content/ContentController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
import bisq.desktop.primary.main.content.trade.liquidSwap.LiquidSwapController;
import bisq.desktop.primary.main.content.trade.multiSig.MultiSigController;
import bisq.desktop.primary.main.content.trade.xmrSwap.XmrSwapController;
import bisq.desktop.primary.main.content.wallet.LBtcWalletController;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;

Expand Down Expand Up @@ -127,9 +126,6 @@ protected Optional<? extends Controller> createController(NavigationTarget navig
case LIGHTNING_X: {
return Optional.of(new LightningController(applicationService));
}
case WALLET_LBTC: {
return Optional.of(new LBtcWalletController(applicationService));
}
case SETTINGS: {
return Optional.of(new SettingsController(applicationService));
}
Expand Down
60 changes: 0 additions & 60 deletions desktop/src/main/java/bisq/desktop/primary/main/content/wallet/LBtcWalletController.java
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion desktop/src/main/java/bisq/desktop/primary/main/content/wallet/WalletModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@ public WalletModel() {

@Override
public NavigationTarget getDefaultNavigationTarget() {
return NavigationTarget.WALLET_LBTC_TRANSACTIONS;
return null;
}
}
10 changes: 2 additions & 8 deletions desktop/src/main/java/bisq/desktop/primary/main/left/LeftNavView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,15 +93,9 @@ public LeftNavView(LeftNavModel model, LeftNavController controller) {
createSubmenuNavigationButton(Res.get("bsqSwap"), NavigationTarget.BSQ_SWAP, trade)
);


LeftNavButton wallet = createNavigationButton(Res.get("wallet"),
"nav-wallet",
NavigationTarget.WALLET_LBTC, true);

VBox walletSubMenuItems = createSubmenu(
createSubmenuNavigationButton(Res.get("lbtc.wallet"), NavigationTarget.WALLET_LBTC, wallet)
);

NavigationTarget.DASHBOARD, false);

LeftNavButton learn = createNavigationButton(Res.get("learn"),
"nav-learn",
Expand Down Expand Up @@ -168,7 +162,7 @@ public LeftNavView(LeftNavModel model, LeftNavController controller) {
selectionMarker.setPrefWidth(3);
selectionMarker.setPrefHeight(LeftNavButton.HEIGHT);

mainMenuItems.getChildren().addAll(dashBoard, trade, tradeSubMenuItems, wallet, walletSubMenuItems,
mainMenuItems.getChildren().addAll(dashBoard, trade, tradeSubMenuItems, wallet,
learn, learnSubMenuItems,
chat, events, support,
settings);
Expand Down