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

fix import from xPriv (#4192)

Browse source
This commit is contained in:
Matias Alejo Garcia 2016-05-09 12:03:25 -03:00 • committed by Gustavo Maximiliano Cortez
commit 88ac00afcc
3 changed files with 20 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -82,7 +82,6 @@ angular.module('copayApp.controllers').controller('importController',
};
var _importExtendedPrivateKey = function(xPrivKey, opts) {
console.log('[import.js.84:xPrivKey:]',xPrivKey); //TODO
self.loading = true;
$timeout(function() {
@ -177,7 +176,16 @@ console.log('[import.js.84:xPrivKey:]',xPrivKey); //TODO
if ($scope.bwsurl)
opts.bwsurl = $scope.bwsurl;
var passphrase = form.passphrase.$modelValue;
var pathData = derivationPathHelper.parse($scope.derivationPath);
if (!pathData) {
this.error = gettext('Invalid derivation path');
return;
}
opts.account = pathData.account;
opts.networkName = pathData.networkName;
opts.derivationStrategy = pathData.derivationStrategy;
var words = form.words.$modelValue;
this.error = null;
@ -199,18 +207,9 @@ console.log('[import.js.84:xPrivKey:]',xPrivKey); //TODO
return;
}
var passphrase = form.passphrase.$modelValue;
opts.passphrase = form.passphrase.$modelValue || null;
var pathData = derivationPathHelper.parse($scope.derivationPath);
if (!pathData) {
this.error = gettext('Invalid derivation path');
return;
}
opts.account = pathData.account;
opts.networkName = pathData.networkName;
opts.derivationStrategy = pathData.derivationStrategy;
_importMnemonic(words, opts);
};