From 46dc82c02d9bcabc3ab5a94f0bdea212edb1317a Mon Sep 17 00:00:00 2001
From: Manfred Karrer <mk@nucleo.io>
Date: Sun, 16 Jul 2017 01:17:19 +0200
Subject: [PATCH] Fix wrong sub view selection in DAO view. Only allow DAO view
 if BTC is basecurrency

---
 .../main/java/io/bisq/gui/main/MainView.java  | 20 ++++++++++---------
 .../gui/main/dao/wallet/BsqWalletView.java    | 11 +++++-----
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/gui/src/main/java/io/bisq/gui/main/MainView.java b/gui/src/main/java/io/bisq/gui/main/MainView.java
index e777bf5333..0c095f3f97 100644
--- a/gui/src/main/java/io/bisq/gui/main/MainView.java
+++ b/gui/src/main/java/io/bisq/gui/main/MainView.java
@@ -149,15 +149,17 @@ public class MainView extends InitializableView<StackPane, MainViewModel> {
         }
 
         // TODO can be removed once DAO is released
-        UserThread.runAfter(() -> {
-            root.getScene().addEventHandler(KeyEvent.KEY_RELEASED, keyEvent -> {
-                if (Utilities.isAltOrCtrlPressed(KeyCode.D, keyEvent)) {
-                    daoButton.setVisible(true);
-                    daoButton.setManaged(true);
-                }
-            });
-        }, 1);
-
+        if (BisqEnvironment.getBaseCurrencyNetwork().isBitcoin()) {
+            UserThread.runAfter(() -> {
+                root.getScene().addEventHandler(KeyEvent.KEY_RELEASED, keyEvent -> {
+                    if (Utilities.isAltOrCtrlPressed(KeyCode.D, keyEvent)) {
+                        daoButton.setVisible(true);
+                        daoButton.setManaged(true);
+                    }
+                });
+            }, 1);
+        }
+        
         HBox leftNavPane = new HBox(marketButton, buyButton, sellButton, portfolioButtonHolder, fundsButton, disputesButtonHolder) {{
             setLeftAnchor(this, 10d);
             setTopAnchor(this, 0d);
diff --git a/gui/src/main/java/io/bisq/gui/main/dao/wallet/BsqWalletView.java b/gui/src/main/java/io/bisq/gui/main/dao/wallet/BsqWalletView.java
index 5ce00f85ab..7714edfeac 100644
--- a/gui/src/main/java/io/bisq/gui/main/dao/wallet/BsqWalletView.java
+++ b/gui/src/main/java/io/bisq/gui/main/dao/wallet/BsqWalletView.java
@@ -19,7 +19,6 @@ package io.bisq.gui.main.dao.wallet;
 
 import de.jensd.fx.fontawesome.AwesomeDude;
 import de.jensd.fx.fontawesome.AwesomeIcon;
-import io.bisq.common.UserThread;
 import io.bisq.common.app.DevEnv;
 import io.bisq.common.locale.Res;
 import io.bisq.gui.Navigation;
@@ -83,14 +82,11 @@ public class BsqWalletView extends ActivatableViewAndModel {
         transactions = new MenuItem(navigation, toggleGroup, Res.get("dao.wallet.menuItem.transactions"), BsqTxView.class, AwesomeIcon.TABLE);
         leftVBox.getChildren().addAll(dashboard, send, receive, transactions);
 
-        //TODO
+        // TODO just until DAO is enabled
         if (!DevEnv.DAO_ACTIVATED) {
             dashboard.setDisable(true);
             send.setDisable(true);
             transactions.setDisable(true);
-            UserThread.execute(() -> {
-                receive.setSelected(true);
-            });
         }
     }
 
@@ -108,8 +104,11 @@ public class BsqWalletView extends ActivatableViewAndModel {
             if (selectedViewClass == null)
                 selectedViewClass = BsqDashboardView.class;
 
-            loadView(selectedViewClass);
+            // TODO just until DAO is enabled
+            if (!DevEnv.DAO_ACTIVATED)
+                selectedViewClass = BsqReceiveView.class;
 
+            loadView(selectedViewClass);
         } else if (viewPath.size() == 4 && viewPath.indexOf(BsqWalletView.class) == 2) {
             selectedViewClass = viewPath.get(3);
             loadView(selectedViewClass);