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

fix seed source selector in join view

Browse source
This commit is contained in:
Gabriel Bazán 2017-05-29 15:34:44 -03:00
commit 7a424bc6ec
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -66,7 +66,7 @@ angular.module('copayApp.controllers').controller('joinController',
id: 'set', id: 'set',
label: gettextCatalog.getString('Specify Recovery Phrase...'), label: gettextCatalog.getString('Specify Recovery Phrase...'),
}]; }];
$scope.seedSource = $scope.seedOptions[0]; $scope.formData.seedSource = $scope.seedOptions[0];
/* /*
Disable Hardware Wallets Disable Hardware Wallets
@ -105,7 +105,7 @@ angular.module('copayApp.controllers').controller('joinController',
bwsurl: $scope.formData.bwsurl bwsurl: $scope.formData.bwsurl
} }
var setSeed = $scope.seedSource.id == 'set'; var setSeed = $scope.formData.seedSource.id == 'set';
if (setSeed) { if (setSeed) {
var words = $scope.formData.privateKey; var words = $scope.formData.privateKey;
if (words.indexOf(' ') == -1 && words.indexOf('prv') == 1 && words.length > 108) { if (words.indexOf(' ') == -1 && words.indexOf('prv') == 1 && words.length > 108) {
@ -135,22 +135,22 @@ angular.module('copayApp.controllers').controller('joinController',
return; return;
} }
if ($scope.seedSource.id == walletService.externalSource.ledger.id || $scope.seedSource.id == walletService.externalSource.trezor.id || $scope.seedSource.id == walletService.externalSource.intelTEE.id) { if ($scope.formData.seedSource.id == walletService.externalSource.ledger.id || $scope.formData.seedSource.id == walletService.externalSource.trezor.id || $scope.formData.seedSource.id == walletService.externalSource.intelTEE.id) {
var account = $scope.account; var account = $scope.account;
if (!account || account < 1) { if (!account || account < 1) {
popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Invalid account number')); popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Invalid account number'));
return; return;
} }
if ($scope.seedSource.id == walletService.externalSource.trezor.id || $scope.seedSource.id == walletService.externalSource.intelTEE.id) if ($scope.formData.seedSource.id == walletService.externalSource.trezor.id || $scope.formData.seedSource.id == walletService.externalSource.intelTEE.id)
account = account - 1; account = account - 1;
opts.account = account; opts.account = account;
opts.isMultisig = true; opts.isMultisig = true;
ongoingProcess.set('connecting' + $scope.seedSource.id, true); ongoingProcess.set('connecting' + $scope.formData.seedSource.id, true);
var src; var src;
switch ($scope.seedSource.id) { switch ($scope.formData.seedSource.id) {
case walletService.externalSource.ledger.id: case walletService.externalSource.ledger.id:
src = ledger; src = ledger;
break; break;
@ -167,7 +167,7 @@ angular.module('copayApp.controllers').controller('joinController',
// TODO: cannot currently join an intelTEE testnet wallet (need to detect from the secret) // TODO: cannot currently join an intelTEE testnet wallet (need to detect from the secret)
src.getInfoForNewWallet(true, account, 'livenet', function(err, lopts) { src.getInfoForNewWallet(true, account, 'livenet', function(err, lopts) {
ongoingProcess.set('connecting' + $scope.seedSource.id, false); ongoingProcess.set('connecting' + $scope.formData.seedSource.id, false);
if (err) { if (err) {
popupService.showAlert(gettextCatalog.getString('Error'), err); popupService.showAlert(gettextCatalog.getString('Error'), err);
return; return;