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

Merge pull request #2540 from matiu/bug/recreate-addr

Browse source 
fix addr at recreate
This commit is contained in:
Gustavo Maximiliano Cortez 2015-04-18 10:38:30 -03:00
commit 1a6e06202f
3 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/js/controllers/import.js
View file

@ -38,6 +38,7 @@ angular.module('copayApp.controllers').controller('importController',
self.error = err; self.error = err;
} }
else { else {
$rootScope.$emit('Local/WalletImported', walletId);
go.walletHome(); go.walletHome();
notification.success('Success', 'Your wallet has been imported correctly'); notification.success('Success', 'Your wallet has been imported correctly');
} }

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

@ -134,8 +134,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
$timeout(function() { $timeout(function() {
self.setOngoingProcess('updatingPendingTxps', true); self.setOngoingProcess('updatingPendingTxps', true);
$log.debug('Updating PendingTxps'); $log.debug('Updating PendingTxps');
fc.getTxProposals({ fc.getTxProposals({}, function(err, txps) {
}, function(err, txps) {
self.setOngoingProcess('updatingPendingTxps', false); self.setOngoingProcess('updatingPendingTxps', false);
if (err) { if (err) {
$log.debug('Wallet PendingTxps ERROR:', err); $log.debug('Wallet PendingTxps ERROR:', err);
@ -339,7 +338,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
if (used) { if (used) {
$log.debug('Address ' + addr + ' was used. Cleaning Cache.') $log.debug('Address ' + addr + ' was used. Cleaning Cache.')
$rootScope.$emit('Local/NeedNewAddress', err); $rootScope.$emit('Local/NeedNewAddress', err);
storageService.clearLastAddress(self.walletId, function(err, addr) { storageService.clearLastAddress(self.walletId, function(err) {
if (cb) return cb(); if (cb) return cb();
}); });
}; };
@ -351,6 +350,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
self.recreate = function(cb) { self.recreate = function(cb) {
var fc = profileService.focusedClient; var fc = profileService.focusedClient;
self.setOngoingProcess('recreating', true); self.setOngoingProcess('recreating', true);
self.clientError = null;
fc.recreateWallet(function(err) { fc.recreateWallet(function(err) {
self.notAuthorized = false; self.notAuthorized = false;
self.setOngoingProcess('recreating', false); self.setOngoingProcess('recreating', false);
@ -459,7 +459,9 @@ angular.module('copayApp.controllers').controller('indexController', function($r
}); });
$rootScope.$on('Local/WalletImported', function(event, walletId) { $rootScope.$on('Local/WalletImported', function(event, walletId) {
self.startScan(walletId); storageService.clearLastAddress(walletId, function(err) {
self.startScan(walletId);
});
}); });
$rootScope.$on('Animation/Disable', function(event) { $rootScope.$on('Animation/Disable', function(event) {

1
src/js/services/profileService.js
View file

@ -253,7 +253,6 @@ angular.module('copayApp.services')
root.setAndStoreFocus(walletId, function() { root.setAndStoreFocus(walletId, function() {
storageService.storeProfile(root.profile, function(err) { storageService.storeProfile(root.profile, function(err) {
$rootScope.$emit('Local/WalletImported', walletId);
return cb(null, walletId); return cb(null, walletId);
}); });
}); });