anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

fix changing wallet when a tab is selected

Browse source
This commit is contained in:
Matias Alejo Garcia 2016-02-23 10:33:40 -03:00
commit 0dfcde57f3
2 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/js/controllers/index.js
View file

@ -79,19 +79,19 @@ angular.module('copayApp.controllers').controller('indexController', function($r
$log.debug('Cleaning Index Instance'); $log.debug('Cleaning Index Instance');
lodash.each(self, function(v, k) { lodash.each(self, function(v, k) {
if (lodash.isFunction(v)) return; if (lodash.isFunction(v)) return;
if (vanillaScope[k]) {
self[k] = vanillaScope[k];
return;
}
// This are to prevent flicker in mobile: // This are to prevent flicker in mobile:
if (k == 'hasProfile') return; if (k == 'hasProfile') return;
if (k == 'tab') return;
if (k == 'noFocusedWallet') return; if (k == 'noFocusedWallet') return;
if (k == 'backgroundColor') return; if (k == 'backgroundColor') return;
if (k == 'loadingWallet') { if (k == 'loadingWallet') {
self.loadingWallet = true; self.loadingWallet = true;
return; return;
} }
if (vanillaScope[k]) {
self[k] = vanillaScope[k];
return;
}
delete self[k]; delete self[k];
}); });

5
src/js/controllers/walletHome.js
View file

@ -52,6 +52,10 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
var disableFocusListener = $rootScope.$on('Local/NewFocusedWallet', function() { var disableFocusListener = $rootScope.$on('Local/NewFocusedWallet', function() {
self.addr = null; self.addr = null;
self.resetForm(); self.resetForm();
if (profileService.focusedClient) {
self.setAddress();
self.setSendFormInputs();
}
$log.debug('Cleaning WalletHome Instance'); $log.debug('Cleaning WalletHome Instance');
lodash.each(self, function(v, k) { lodash.each(self, function(v, k) {
@ -60,6 +64,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
self[k] = vanillaScope[k]; self[k] = vanillaScope[k];
return; return;
} }
if (k == 'isRateAvailable') return;
delete self[k]; delete self[k];
}); });