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

fix join

Browse source
This commit is contained in:
Matias Alejo Garcia 2015-09-04 12:25:54 -03:00
commit 06c76d6351
2 changed files with 21 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/js/controllers/join.js
View file

@ -153,10 +153,9 @@ angular.module('copayApp.controllers').controller('joinController',
var opts = {
secret: form.secret.$modelValue,
myName: form.myName.$modelValue
extendedPrivateKey: form.privateKey.$modelValue,
myName: form.myName.$modelValue
myName: form.myName.$modelValue,
}
var setSeed = form.setSeed.$modelValue;
if (setSeed) {
opts.mnemonic = form.privateKey.$modelValue;
@ -170,23 +169,17 @@ angular.module('copayApp.controllers').controller('joinController',
return;
}
if (form.hwLedger.$modelValue) {
self.ledger = true;
ledger.getXPubKey($scope.externalIndex, function(data) {
ledger.getInfoForNewWallet($scope.externalIndex, function(err, lopts) {
self.ledger = false;
$scope.$apply();
if (data.success) {
opts.extendedPublicKey = data.xpubkey;
opts.externalSource = 'ledger';
opts.externalIndex = $scope.externalIndex;
self._join(opts);
} else {
self.loading = false;
$log.debug(data.message);
self.error = data.message;
if (err) {
self.error = err;
$scope.$apply();
return;
}
opts = lodash.assign(lopts, opts);
self._join(opts);
});
} else {
self._join(opts);