Hide menu if no wallet seletect. Also fix history js error

This commit is contained in:
Gustavo Maximiliano Cortez 2016-04-11 11:53:23 -03:00
parent 1f60f46081
commit eeac37512c
No known key found for this signature in database
GPG Key ID: 15EDAD8D9F2EB1AF
2 changed files with 3 additions and 3 deletions

View File

@ -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>

View File

@ -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() {