Merge pull request #3981 from matiu/v194

fix addr
This commit is contained in:
Gustavo Maximiliano Cortez 2016-03-09 16:15:48 -03:00
commit e67cb6e4aa
2 changed files with 7 additions and 3 deletions

View file

@ -159,7 +159,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
$log.debug('Wallet not complete after update... redirecting'); $log.debug('Wallet not complete after update... redirecting');
go.path('copayers'); go.path('copayers');
} else { } else {
if ($state.is('copayers')) { if ($state.is('copayers')) {
$log.debug('Wallet Complete after update... redirect to home'); $log.debug('Wallet Complete after update... redirect to home');
go.walletHome(); go.walletHome();
} }
@ -1558,12 +1558,16 @@ angular.module('copayApp.controllers').controller('indexController', function($r
self.setFocusedWallet(); self.setFocusedWallet();
self.updateHistory(); self.updateHistory();
storageService.getCleanAndScanAddresses(function(err, walletId) { storageService.getCleanAndScanAddresses(function(err, walletId) {
if (walletId && profileService.walletClients[walletId]) { if (walletId && profileService.walletClients[walletId]) {
$log.debug('Clear last address cache and Scan ', walletId); $log.debug('Clear last address cache and Scan ', walletId);
addressService.expireAddress(walletId, function(err) { addressService.expireAddress(walletId, function(err) {
self.startScan(walletId); self.startScan(walletId);
}); });
storageService.removeCleanAndScanAddresses(function() {}); storageService.removeCleanAndScanAddresses(function() {
$rootScope.$emit('Local/NewFocusedWalletReady');
});
} else {
$rootScope.$emit('Local/NewFocusedWalletReady'); $rootScope.$emit('Local/NewFocusedWalletReady');
} }
}); });

View file

@ -52,7 +52,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
self.resetForm(); self.resetForm();
$scope.search = ''; $scope.search = '';
if (profileService.focusedClient && rofileService.focusedClient.isComplete) { if (profileService.focusedClient && profileService.focusedClient.isComplete) {
self.setAddress(); self.setAddress();
self.setSendFormInputs(); self.setSendFormInputs();
} }