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

support xPrivKey seeds

Browse source
This commit is contained in:
Matias Alejo Garcia 2015-09-05 00:11:14 -03:00
commit f1f4e5cfaf
6 changed files with 81 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -158,13 +158,18 @@ angular.module('copayApp.controllers').controller('joinController',
var setSeed = form.setSeed.$modelValue;
if (setSeed) {
opts.mnemonic = form.privateKey.$modelValue;
var words = form.privateKey.$modelValue;
if (words.indexOf(' ') == -1 && words.indexOf('prv') == 1 && words.length > 108) {
opts.extendedPrivateKey = words;
} else {
opts.mnemonic = words;
}
opts.passphrase = form.passphrase.$modelValue;
} else {
opts.passphrase = form.createPassphrase.$modelValue;
}
if (setSeed && !opts.mnemonic) {
if (setSeed && !opts.mnemonic && !opts.extendedPrivateKey) {
this.error = gettext('Please enter the wallet seed');
return;
}
@ -197,7 +202,7 @@ angular.module('copayApp.controllers').controller('joinController',
}
$timeout(function() {
var fc = profileService.focusedClient;
if ( ( opts.mnemonic || opts.externalSource ) && fc.isComplete()) {
if ( fc.isComplete() && (opts.mnemonic || opts.externalSource || opts.extendedPrivateKey)) {
$rootScope.$emit('Local/WalletImported', fc.credentials.walletId);
} else {
go.walletHome();