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

fix import / logs

Browse source
This commit is contained in:
Matias Alejo Garcia 2014-11-30 04:42:39 -03:00
commit 49205a76a0
6 changed files with 25 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

22
js/controllers/importProfile.js
View file

@ -18,18 +18,10 @@ angular.module('copayApp.controllers').controller('ImportProfileController',
var password = $scope.password;
updateStatus('Importing profile - Setting things up...');
identityService.importProfile(str,password, function(err){
})
copay.Identity.importFromEncryptedFullJson(str, password, {
pluginManager: pluginManager,
network: config.network,
networkName: config.networkName,
walletDefaults: config.wallet,
passphraseConfig: config.passphraseConfig,
}, function(err, iden) {
identityService.importProfile(str,password, function(err, iden) {
$scope.loading = false;
if (err) {
$scope.loading = false;
copay.logger.warn(err);
if ((err.toString() || '').match('BADSTR')) {
$scope.error = 'Bad password or corrupt profile file';
} else if ((err.toString() || '').match('EEXISTS')) {
@ -37,12 +29,8 @@ angular.module('copayApp.controllers').controller('ImportProfileController',
} else {
$scope.error = 'Unknown error';
}
$scope.$digest();
} else {
var firstWallet = iden.getLastFocusedWallet();
root.bind($scope, iden, firstWallet);
}
$rootScope.$digest();
}
});
};