From eeac37512c157194a51b22a00fd3e1ce4ec3c4db Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Mon, 11 Apr 2016 11:53:23 -0300
Subject: [PATCH] Hide menu if no wallet seletect. Also fix history js error

---
 public/views/walletHome.html | 2 +-
 src/js/controllers/index.js  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/views/walletHome.html b/public/views/walletHome.html
index 1ae3f96db..f781c6fab 100644
--- a/public/views/walletHome.html
+++ b/public/views/walletHome.html
@@ -523,4 +523,4 @@
   </div>
 </div>
 <div class="extra-margin-bottom"></div>
-<div ng-hide="$root.shouldHideMenuBar" ng-include="'views/includes/menu.html'" ng-show="!index.noFocusedWallet"></div>
+<div ng-include="'views/includes/menu.html'" ng-show="!index.noFocusedWallet && !$root.shouldHideMenuBar"></div>
diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index b30bcdcce..0718a29bf 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -1082,9 +1082,9 @@ angular.module('copayApp.controllers').controller('indexController', function($r
   self.setCompactTxHistory = function() {
     self.isSearching = false;
     self.nextTxHistory = self.historyShowMoreLimit;
-    self.txHistory = self.completeHistory.slice(0, self.historyShowLimit);
+    self.txHistory = self.completeHistory ? self.completeHistory.slice(0, self.historyShowLimit) : null;
     self.txHistorySearchResults = self.txHistory;
-    self.historyShowMore = self.completeHistory.length > self.historyShowLimit;
+    self.historyShowMore = self.completeHistory ? self.completeHistory.length > self.historyShowLimit : null;
   };
 
   self.debounceUpdateHistory = lodash.debounce(function() {