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

Remove Morero and Lightning from Bisq 2 #590

Merged
merged 1 commit into from
Dec 12, 2022
Merged

Remove Morero and Lightning from Bisq 2 #590

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
2 changes: 1 addition & 1 deletion chat/src/main/java/bisq/chat/discuss/pub/PublicDiscussionChannelService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ protected void maybeAddDefaultChannels() {
ObservableArray<PublicDiscussionChannel> channels = getChannels();
channels.add(defaultDiscussionChannel);
channels.add(new PublicDiscussionChannel("bitcoin"));
channels.add(new PublicDiscussionChannel("monero"));
// channels.add(new PublicDiscussionChannel("monero"));
channels.add(new PublicDiscussionChannel("markets"));
channels.add(new PublicDiscussionChannel("economy"));
channels.add(new PublicDiscussionChannel("offTopic"));
Expand Down
8 changes: 4 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 @@ -118,15 +118,15 @@ protected Optional<? extends Controller> createController(NavigationTarget navig
case BISQ_MULTISIG: {
return Optional.of(new MultiSigController(applicationService));
}
case MONERO_SWAP: {
/* case MONERO_SWAP: {
return Optional.of(new XmrSwapController(applicationService));
}
} */
case BSQ_SWAP: {
return Optional.of(new BsqSwapController(applicationService));
}
case LIGHTNING_X: {
/* case LIGHTNING_X: {
return Optional.of(new LightningController(applicationService));
}
} */
case SETTINGS: {
return Optional.of(new SettingsController(applicationService));
}
Expand Down
8 changes: 4 additions & 4 deletions ...in/java/bisq/desktop/primary/main/content/trade/overview/TradeOverviewBaseController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public TradeOverviewBaseController(M model) {
"Q4/22",
"protocol-liquid"
),
new ProtocolListItem(SwapProtocol.Type.MONERO_SWAP,
/* new ProtocolListItem(SwapProtocol.Type.MONERO_SWAP,
NavigationTarget.MONERO_SWAP,
Res.get("trade.protocols.basic.info.MONERO_SWAP"),
Res.get("trade.protocols.markets.MONERO_SWAP"),
Expand All @@ -74,7 +74,7 @@ public TradeOverviewBaseController(M model) {
Res.get("trade.protocols.speed.info.MONERO_SWAP"),
"Q1/23",
"protocol-monero"
),
), */
new ProtocolListItem(SwapProtocol.Type.BISQ_MULTISIG,
NavigationTarget.BISQ_MULTISIG,
Res.get("trade.protocols.basic.info.BISQ_MULTISIG"),
Expand All @@ -89,7 +89,7 @@ public TradeOverviewBaseController(M model) {
"Q2/23",
"protocol-bisq"
),
new ProtocolListItem(SwapProtocol.Type.LIGHTNING_X,
/* new ProtocolListItem(SwapProtocol.Type.LIGHTNING_X,
NavigationTarget.LIGHTNING_X,
Res.get("trade.protocols.basic.info.LIGHTNING_X"),
Res.get("trade.protocols.markets.LIGHTNING_X"),
Expand All @@ -102,7 +102,7 @@ public TradeOverviewBaseController(M model) {
Res.get("trade.protocols.speed.info.LIGHTNING_X"),
"Q2/23",
"protocol-lightning"
),
), */
new ProtocolListItem(SwapProtocol.Type.BSQ_SWAP,
NavigationTarget.BSQ_SWAP,
Res.get("trade.protocols.basic.info.BSQ_SWAP"),
Expand Down
4 changes: 2 additions & 2 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 @@ -87,9 +87,9 @@ public LeftNavView(LeftNavModel model, LeftNavController controller) {
VBox tradeSubMenuItems = createSubmenu(
createSubmenuNavigationButton(Res.get("bisqEasy"), NavigationTarget.BISQ_EASY, trade),
createSubmenuNavigationButton(Res.get("liquidSwap"), NavigationTarget.LIQUID_SWAP, trade),
createSubmenuNavigationButton(Res.get("moneroSwap"), NavigationTarget.MONERO_SWAP, trade),
// createSubmenuNavigationButton(Res.get("moneroSwap"), NavigationTarget.MONERO_SWAP, trade),
createSubmenuNavigationButton(Res.get("multiSig"), NavigationTarget.BISQ_MULTISIG, trade),
createSubmenuNavigationButton(Res.get("lightning"), NavigationTarget.LIGHTNING_X, trade),
// createSubmenuNavigationButton(Res.get("lightning"), NavigationTarget.LIGHTNING_X, trade),
createSubmenuNavigationButton(Res.get("bsqSwap"), NavigationTarget.BSQ_SWAP, trade)
);

Expand Down