From 1d1f95db5d5271e2ea92bcb98691337d79249ab4 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Thu, 23 Jun 2016 11:58:32 -0300 Subject: [PATCH] Fix js error when selecting an incomplete wallet --- src/js/controllers/sidebar.js | 3 ++- src/js/controllers/walletHome.js | 7 +++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/js/controllers/sidebar.js b/src/js/controllers/sidebar.js index 85ccc9f34..2058caf46 100644 --- a/src/js/controllers/sidebar.js +++ b/src/js/controllers/sidebar.js @@ -25,7 +25,8 @@ angular.module('copayApp.controllers').controller('sidebarController', }; self.switchWallet = function(selectedWalletId, currentWalletId) { - if (selectedWalletId == currentWalletId) return; + var client = profileService.focusedClient; + if (selectedWalletId == currentWalletId && client.isComplete()) return; self.walletSelection = false; profileService.setAndStoreFocus(selectedWalletId, function() {}); $ionicScrollDelegate.scrollTop(); diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js index bebb57b0f..f75e93454 100644 --- a/src/js/controllers/walletHome.js +++ b/src/js/controllers/walletHome.js @@ -174,9 +174,8 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi this.setAddress = function(forceNew) { self.addrError = null; - var fc = profileService.focusedClient; - if (!fc) - return; + var client = profileService.focusedClient; + if (!client || !client.isComplete()) return; // Address already set? if (!forceNew && self.addr) { @@ -185,7 +184,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi self.generatingAddress = true; $timeout(function() { - addressService.getAddress(fc.credentials.walletId, forceNew, function(err, addr) { + addressService.getAddress(client.credentials.walletId, forceNew, function(err, addr) { self.generatingAddress = false; if (err) {