Hide menu if no wallet seletect. Also fix history js error
This commit is contained in:
parent
1f60f46081
commit
eeac37512c
2 changed files with 3 additions and 3 deletions
|
|
@ -523,4 +523,4 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="extra-margin-bottom"></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>
|
||||||
|
|
|
||||||
|
|
@ -1082,9 +1082,9 @@ angular.module('copayApp.controllers').controller('indexController', function($r
|
||||||
self.setCompactTxHistory = function() {
|
self.setCompactTxHistory = function() {
|
||||||
self.isSearching = false;
|
self.isSearching = false;
|
||||||
self.nextTxHistory = self.historyShowMoreLimit;
|
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.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() {
|
self.debounceUpdateHistory = lodash.debounce(function() {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue