From 1f60f460813dd21255c84aba2eb0ec0e63f40685 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Mon, 11 Apr 2016 10:50:50 -0300 Subject: [PATCH 1/2] Fix delete last wallet --- src/js/controllers/preferencesDelete.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/js/controllers/preferencesDelete.js b/src/js/controllers/preferencesDelete.js index e70f83eaf..1cc97f71a 100644 --- a/src/js/controllers/preferencesDelete.js +++ b/src/js/controllers/preferencesDelete.js @@ -1,7 +1,7 @@ 'use strict'; angular.module('copayApp.controllers').controller('preferencesDeleteWalletController', - function($scope, $rootScope, $filter, $timeout, $modal, $log, storageService, notification, profileService, isCordova, go, gettext, gettextCatalog, animationService) { + function($scope, $rootScope, $filter, $timeout, $modal, $log, storageService, notification, profileService, isCordova, go, gettext, gettextCatalog, animationService, applicationService) { this.isCordova = isCordova; this.error = null; @@ -56,7 +56,7 @@ angular.module('copayApp.controllers').controller('preferencesDeleteWalletContro notification.success(gettextCatalog.getString('Success'), gettextCatalog.getString('The wallet "{{walletName}}" was deleted', { walletName: walletName })); - go.walletHome(); + applicationService.restart(); } }); }; From eeac37512c157194a51b22a00fd3e1ce4ec3c4db Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Mon, 11 Apr 2016 11:53:23 -0300 Subject: [PATCH 2/2] 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 @@
-
+
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() {