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

fixing import of existing profile

Browse source
This commit is contained in:
Ivan Socolsky 2014-11-18 12:12:09 -03:00
commit af6c066c3f
2 changed files with 23 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
js/controllers/importProfile.js
View file

@ -27,9 +27,18 @@ angular.module('copayApp.controllers').controller('ImportProfileController',
walletDefaults: config.wallet,
passphraseConfig: config.passphraseConfig,
}, function(err, iden) {
if (err && !iden) {
if (err) {
// if (err && !iden) {
$scope.loading = false;
$scope.error = (err.toString() || '').match('BADSTR') ? 'Bad password or corrupt profile file' : 'Unknown error';
if ((err.toString() || '').match('BADSTR')) {
$scope.error ='Bad password or corrupt profile file';
} else if ((err.toString() || '').match('EEXISTS')) {
$scope.error = 'Profile already exists';
} else {
$scope.error = 'Unknown error';
}
} else {
var firstWallet = iden.getLastFocusedWallet();
controllerUtils.bindProfile($scope, iden, firstWallet);