Merge pull request #590 from alvasw/remove_monero_and_lightning

Remove Morero and Lightning from Bisq 2
bisq-network · Dec 12, 2022 · ba4d623 · ba4d623
2 parents 9870c98 + 537e30e
commit ba4d623
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/chat/src/main/java/bisq/chat/discuss/pub/PublicDiscussionChannelService.java b/chat/src/main/java/bisq/chat/discuss/pub/PublicDiscussionChannelService.java
@@ -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"));

diff --git a/desktop/src/main/java/bisq/desktop/primary/main/content/ContentController.java b/desktop/src/main/java/bisq/desktop/primary/main/content/ContentController.java
@@ -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));
             }

diff --git a/...in/java/bisq/desktop/primary/main/content/trade/overview/TradeOverviewBaseController.java b/...in/java/bisq/desktop/primary/main/content/trade/overview/TradeOverviewBaseController.java
@@ -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"),
@@ -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"),
@@ -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"),
@@ -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"),

diff --git a/desktop/src/main/java/bisq/desktop/primary/main/left/LeftNavView.java b/desktop/src/main/java/bisq/desktop/primary/main/left/LeftNavView.java
@@ -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)
         );