Merge pull request #2191 from isocolsky/send_error
Give feedback when email cannot be verified (as per Insight)
This commit is contained in:
commit
f886e36481
5 changed files with 9 additions and 7 deletions
|
|
@ -120,6 +120,10 @@ angular.module('copayApp.controllers').controller('CreateProfileController', fun
|
|||
msg = 'This profile already exists'
|
||||
$scope.createStep = 'email';
|
||||
}
|
||||
if (msg.indexOf('EMAILERROR') >= 0) {
|
||||
msg = 'Could not send verification email. Please check your email address.';
|
||||
$scope.createStep = 'email';
|
||||
}
|
||||
$scope.error = msg;
|
||||
} else {
|
||||
// mobile
|
||||
|
|
|
|||
|
|
@ -381,12 +381,9 @@ Identity.prototype.store = function(opts, cb) {
|
|||
var storeFunction = opts.failIfExists ? self.storage.createItem : self.storage.setItem;
|
||||
|
||||
storeFunction.call(self.storage, this.getId(), this.toObj(), function(err) {
|
||||
if (err) {
|
||||
return cb(err);
|
||||
}
|
||||
if (err) return cb(err);
|
||||
|
||||
if (opts.noWallets)
|
||||
return cb();
|
||||
if (opts.noWallets) return cb();
|
||||
|
||||
async.each(self.getWallets(), function(wallet, in_cb) {
|
||||
self.storeWallet(wallet, in_cb);
|
||||
|
|
|
|||
|
|
@ -223,6 +223,8 @@ InsightStorage.prototype.setItem = function(name, value, callback) {
|
|||
return callback('BADCREDENTIALS: Invalid username or password');
|
||||
} else if (response.statusCode === 406) {
|
||||
return callback('OVERQUOTA: Quota exceeded');
|
||||
} else if (response.statusCode === 501) {
|
||||
return callback('EMAILERROR: Error sending verification email');
|
||||
} else if (response.statusCode !== 200) {
|
||||
return callback('Unable to store data on insight');
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ angular.module('copayApp.services').factory('configService', function($timeout,
|
|||
};
|
||||
|
||||
root.reset = function(cb) {
|
||||
config = defauls;
|
||||
config = defaults;
|
||||
localstorageService.removeItem('config', cb);
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -37,7 +37,6 @@ angular.module('copayApp.services')
|
|||
passphraseConfig: config.passphraseConfig,
|
||||
failIfExists: true,
|
||||
}, function(err, iden) {
|
||||
|
||||
if (err) return cb(err);
|
||||
preconditions.checkState(iden);
|
||||
root.bind(iden);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue