BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

returning error when allet already exists in profile

This commit is contained in:
Ivan Socolsky 2014-12-03 19:20:51 -03:00
parent 4a01e35649
commit bd0ddf5c8c
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/controllers/join.js
View File

@ -125,11 +125,14 @@ angular.module('copayApp.controllers').controller('JoinController',
privateHex: $scope.private, privateHex: $scope.private,
}, function(err) { }, function(err) {
$scope.loading = false; $scope.loading = false;
console.log(err);
if (err) { if (err) {
if (err === 'joinError') if (err === 'joinError')
notification.error('Fatal error connecting to Insight server'); notification.error('Fatal error connecting to Insight server');
else if (err === 'walletFull') else if (err === 'walletFull')
notification.error('The wallet is full'); notification.error('The wallet is full');
else if (err === 'walletAlreadyExists')
notification.error('Wallet already exists', 'Cannot join again from the same profile');
else if (err === 'badNetwork') else if (err === 'badNetwork')
notification.error('Network Error', 'Wallet network configuration missmatch'); notification.error('Network Error', 'Wallet network configuration missmatch');
else if (err === 'badSecret') else if (err === 'badSecret')
@ -138,6 +141,7 @@ angular.module('copayApp.controllers').controller('JoinController',
notification.error('Error', err.message || err); notification.error('Error', err.message || err);
} }
} }
$timeout(function () { $scope.$digest(); }, 1);
}); });
} }
}); });

5
js/models/Identity.js
View File

@ -575,6 +575,11 @@ Identity.prototype.createWallet = function(opts, cb) {
var self = this; var self = this;
var w = new walletClass(opts); var w = new walletClass(opts);
if (_.contains(_.keys(self.wallets), w.getId())) {
return cb('walletAlreadyExists');
}
self.wallets[w.getId()] = w; self.wallets[w.getId()] = w;
self.updateFocusedTimestamp(w.getId()); self.updateFocusedTimestamp(w.getId());
self.bindWallet(w); self.bindWallet(w);

5
js/models/Wallet.js
View File

@ -2550,7 +2550,10 @@ Wallet.prototype.isComplete = function() {
* @param {string} version - the new version for the wallet * @param {string} version - the new version for the wallet
*/ */
Wallet.prototype.setVersion = function(version) { Wallet.prototype.setVersion = function(version) {
this.version = this.opts.version = version; this.version = version;
if (this.opts) {
this.opts.version = version;
}
}; };
/** /**