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

fix login / create form errors and confirmed messages

Browse source
This commit is contained in:
Matias Alejo Garcia 2014-11-01 21:34:03 -03:00
commit 3360c31a12
10 changed files with 74 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

20
js/services/identityService.js
View file

@ -33,8 +33,14 @@ angular.module('copayApp.services')
passphraseConfig: config.passphraseConfig,
failIfExists: true,
}, function(err, iden) {
scope.loading = false;
if (err || !iden) {
controllerUtils.onErrorDigest(scope, 'User already exists!');
copay.logger.debug(err);
if (err && ( err.match('EEXISTS') || err.match('BADCREDENTIALS'))) {
scope.error = 'User already exists!';
} else {
scope.error = 'Unknown error when connecting Insight Server';
}
return;
}
var walletOptions = {
@ -47,10 +53,10 @@ angular.module('copayApp.services')
};
iden.createWallet(walletOptions, function(err, wallet) {
if (err || !wallet) {
controllerUtils.onErrorDigest(scope, 'Could not create default wallet');
copay.logger.debug(err);
scope.error = 'Could not create default wallet';
return;
}
scope.loading = false;
controllerUtils.bindProfile(scope, iden, wallet.id);
});
});
@ -69,8 +75,12 @@ angular.module('copayApp.services')
passphraseConfig: config.passphraseConfig,
}, function(err, iden) {
if (err && !iden) {
controllerUtils.onErrorDigest(
scope, (err.toString() || '').match('PNOTFOUND') ? 'Invalid email or password' : 'Unknown error');
if ((err.toString() || '').match('PNOTFOUND')) {
scope.error = 'Invalid email or password';
}
else {
scope.error = 'Unknown error';
}
} else {
var firstWallet = iden.getLastFocusedWallet();
controllerUtils.bindProfile(scope, iden, firstWallet);