diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index 2f6af493e..bd5ede5c3 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -79,19 +79,19 @@ angular.module('copayApp.controllers').controller('indexController', function($r $log.debug('Cleaning Index Instance'); lodash.each(self, function(v, k) { if (lodash.isFunction(v)) return; - if (vanillaScope[k]) { - self[k] = vanillaScope[k]; - return; - } - // This are to prevent flicker in mobile: if (k == 'hasProfile') return; + if (k == 'tab') return; if (k == 'noFocusedWallet') return; if (k == 'backgroundColor') return; if (k == 'loadingWallet') { self.loadingWallet = true; return; } + if (vanillaScope[k]) { + self[k] = vanillaScope[k]; + return; + } delete self[k]; }); diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js index 412390955..2b3c24c12 100644 --- a/src/js/controllers/walletHome.js +++ b/src/js/controllers/walletHome.js @@ -52,6 +52,10 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi var disableFocusListener = $rootScope.$on('Local/NewFocusedWallet', function() { self.addr = null; self.resetForm(); + if (profileService.focusedClient) { + self.setAddress(); + self.setSendFormInputs(); + } $log.debug('Cleaning WalletHome Instance'); lodash.each(self, function(v, k) { @@ -60,6 +64,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi self[k] = vanillaScope[k]; return; } + if (k == 'isRateAvailable') return; delete self[k]; });