mirror of https://github.com/BTCPrivate/copay.git
fix seed source selector
This commit is contained in:
parent
82112dc66b
commit
b8a09a0154
|
@ -84,7 +84,9 @@ angular.module('copayApp.controllers').controller('createController',
|
|||
supportsTestnet: false
|
||||
}];
|
||||
|
||||
$scope.seedSource = seedOptions[0];
|
||||
console.log(seedOptions[0]);
|
||||
console.log("############################111");
|
||||
$scope.formData.seedSource = seedOptions[0];
|
||||
|
||||
/*
|
||||
|
||||
|
@ -139,7 +141,7 @@ angular.module('copayApp.controllers').controller('createController',
|
|||
walletPrivKey: $scope.formData._walletPrivKey, // Only for testing
|
||||
};
|
||||
|
||||
var setSeed = $scope.seedSource.id == 'set';
|
||||
var setSeed = $scope.formData.seedSource.id == 'set';
|
||||
if (setSeed) {
|
||||
|
||||
var words = $scope.formData.privateKey || '';
|
||||
|
@ -169,21 +171,21 @@ angular.module('copayApp.controllers').controller('createController',
|
|||
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.formData.account;
|
||||
if (!account || account < 1) {
|
||||
popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Invalid account number'));
|
||||
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;
|
||||
|
||||
opts.account = account;
|
||||
ongoingProcess.set('connecting ' + $scope.seedSource.id, true);
|
||||
ongoingProcess.set('connecting ' + $scope.formData.seedSource.id, true);
|
||||
|
||||
var src;
|
||||
switch ($scope.seedSource.id) {
|
||||
switch ($scope.formData.seedSource.id) {
|
||||
case walletService.externalSource.ledger.id:
|
||||
src = ledger;
|
||||
break;
|
||||
|
@ -199,7 +201,7 @@ angular.module('copayApp.controllers').controller('createController',
|
|||
}
|
||||
|
||||
src.getInfoForNewWallet(opts.n > 1, account, opts.networkName, function(err, lopts) {
|
||||
ongoingProcess.set('connecting ' + $scope.seedSource.id, false);
|
||||
ongoingProcess.set('connecting ' + $scope.formData.seedSource.id, false);
|
||||
if (err) {
|
||||
popupService.showAlert(gettextCatalog.getString('Error'), err);
|
||||
return;
|
||||
|
@ -226,7 +228,7 @@ angular.module('copayApp.controllers').controller('createController',
|
|||
walletService.updateRemotePreferences(client);
|
||||
pushNotificationsService.updateSubscription(client);
|
||||
|
||||
if ($scope.seedSource.id == 'set') {
|
||||
if ($scope.formData.seedSource.id == 'set') {
|
||||
profileService.setBackupFlag(client.credentials.walletId);
|
||||
}
|
||||
|
||||
|
|
|
@ -58,19 +58,19 @@
|
|||
Wallet Key
|
||||
</div>
|
||||
<select class="m10t"
|
||||
ng-model="seedSource"
|
||||
ng-model="formData.seedSource"
|
||||
ng-options="seed as seed.label for seed in seedOptions"
|
||||
ng-change="resizeView()">
|
||||
</select>
|
||||
</label>
|
||||
|
||||
<label class="item item-input item-stacked-label"
|
||||
ng-show="seedSource.id == 'trezor' || seedSource.id == 'ledger'">
|
||||
ng-show="formData.seedSource.id == 'trezor' || formData.seedSource.id == 'ledger'">
|
||||
<span class="input-label" translate>Account Number</span>
|
||||
<input type="number" id="account" ng-model="formData.account" ignore-mouse-wheel>
|
||||
</label>
|
||||
|
||||
<label class="item item-input item-stacked-label" ng-show="seedSource.id == 'set'">
|
||||
<label class="item item-input item-stacked-label" ng-show="formData.seedSource.id == 'set'">
|
||||
<span class="input-label" translate>Wallet Recovery Phrase</span>
|
||||
<input id="ext-master"
|
||||
placeholder="{{'Enter the recovery phrase (BIP39)'|translate}}"
|
||||
|
@ -80,16 +80,16 @@
|
|||
ng-model="formData.privateKey">
|
||||
</label>
|
||||
|
||||
<ion-toggle class="has-comment" ng-model="encrypt" toggle-class="toggle-positive" ng-change="resizeView()" ng-show="seedSource.id == 'new' || seedSource.id == 'set'">
|
||||
<ion-toggle class="has-comment" ng-model="encrypt" toggle-class="toggle-positive" ng-change="resizeView()" ng-show="formData.seedSource.id == 'new' || formData.seedSource.id == 'set'">
|
||||
<span class="toggle-label" translate>Add a password</span>
|
||||
</ion-toggle>
|
||||
<div class="comment">
|
||||
<span ng-show="seedSource.id == 'new'" translate>Add an optional password to secure the recovery phrase</span>
|
||||
<span ng-show="seedSource.id == 'set'" translate>The recovery phrase could require a password to be imported</span>
|
||||
<span ng-show="formData.seedSource.id == 'new'" translate>Add an optional password to secure the recovery phrase</span>
|
||||
<span ng-show="formData.seedSource.id == 'set'" translate>The recovery phrase could require a password to be imported</span>
|
||||
</div>
|
||||
|
||||
<div class="item item-input" ng-show="encrypt">
|
||||
<input ng-show="seedSource.id == 'new'"
|
||||
<input ng-show="formData.seedSource.id == 'new'"
|
||||
placeholder="{{'Password'|translate}}"
|
||||
type="password"
|
||||
autocapitalize="off"
|
||||
|
@ -98,7 +98,7 @@
|
|||
ng-change="checkPassword(formData.createPassphrase, formData.repeatPassword)"
|
||||
ng-class="{'correct': result == 'correct', 'incorrect': result == 'incorrect'}">
|
||||
|
||||
<input ng-show="seedSource.id == 'set'"
|
||||
<input ng-show="formData.seedSource.id == 'set'"
|
||||
placeholder="{{'Password'|translate}}"
|
||||
type="password"
|
||||
autocapitalize="off"
|
||||
|
@ -109,7 +109,7 @@
|
|||
</div>
|
||||
|
||||
<div class="item item-input" ng-show="encrypt">
|
||||
<input ng-show="seedSource.id == 'new'"
|
||||
<input ng-show="formData.seedSource.id == 'new'"
|
||||
placeholder="{{'Repeat password'|translate}}"
|
||||
type="password"
|
||||
autocapitalize="off"
|
||||
|
@ -117,7 +117,7 @@
|
|||
ng-change="checkPassword(formData.createPassphrase, formData.repeatPassword)"
|
||||
ng-class="{'correct': result == 'correct', 'incorrect': result == 'incorrect'}">
|
||||
|
||||
<input ng-show="seedSource.id == 'set'"
|
||||
<input ng-show="formData.seedSource.id == 'set'"
|
||||
placeholder="{{'Repeat password'|translate}}"
|
||||
type="password"
|
||||
autocapitalize="off"
|
||||
|
@ -126,7 +126,7 @@
|
|||
ng-class="{'correct': result == 'correct', 'incorrect': result == 'incorrect'}">
|
||||
</div>
|
||||
|
||||
<div class="text-center box-notification error" ng-show="(seedSource.id =='new' || seedSource.id =='set') && encrypt">
|
||||
<div class="text-center box-notification error" ng-show="(formData.seedSource.id =='new' || formData.seedSource.id =='set') && encrypt">
|
||||
<strong translate>This password cannot be recovered. If the password is lost, there is no way you could recover your funds.</strong>
|
||||
</div>
|
||||
|
||||
|
@ -134,7 +134,7 @@
|
|||
<span class="toggle-label" translate>I have written it down</span>
|
||||
</ion-checkbox>
|
||||
|
||||
<label class="item item-input item-stacked-label" ng-show="seedSource.id == 'set'">
|
||||
<label class="item item-input item-stacked-label" ng-show="formData.seedSource.id == 'set'">
|
||||
<span class="input-label" translate>Derivation Path</span>
|
||||
<input type="text"
|
||||
placeholder="{{'BIP32 path for address derivation'|translate}}"
|
||||
|
@ -146,7 +146,7 @@
|
|||
</div> <!-- list -->
|
||||
|
||||
<button type="submit" class="button button-standard button-primary"
|
||||
ng-disabled="setupForm.$invalid || ((encrypt && !formData.passwordSaved) || encrypt && ((seedSource.id == 'new' && !formData.createPassphrase) || (seedSource.id == 'set' && !formData.passphrase)))"
|
||||
ng-disabled="setupForm.$invalid || ((encrypt && !formData.passwordSaved) || encrypt && ((formData.seedSource.id == 'new' && !formData.createPassphrase) || (formData.seedSource.id == 'set' && !formData.passphrase)))"
|
||||
translate>Join
|
||||
</button>
|
||||
</form>
|
||||
|
|
|
@ -36,15 +36,15 @@
|
|||
<div class="input-label" translate>
|
||||
Wallet Key
|
||||
</div>
|
||||
<select class="m10t" ng-model="seedSource" ng-options="seed as seed.label for seed in seedOptions" ng-change="resizeView()"></select>
|
||||
<select class="m10t" ng-model="formData.seedSource" ng-options="seed as seed.label for seed in seedOptions" ng-change="resizeView()"></select>
|
||||
</label>
|
||||
|
||||
<label class="item item-input item-stacked-label" ng-show="seedSource.id == 'trezor' || seedSource.id == 'ledger'">
|
||||
<label class="item item-input item-stacked-label" ng-show="formData.seedSource.id == 'trezor' || formData.seedSource.id == 'ledger'">
|
||||
<span class="input-label" translate>Account Number</span>
|
||||
<input type="number" ng-model="formData.account" ignore-mouse-wheel>
|
||||
</label>
|
||||
|
||||
<label class="item item-input item-stacked-label" ng-show="seedSource.id == 'set'">
|
||||
<label class="item item-input item-stacked-label" ng-show="formData.seedSource.id == 'set'">
|
||||
<span class="input-label" translate>Wallet Recovery Phrase</span>
|
||||
<input placeholder="{{'Enter the recovery phrase (BIP39)'|translate}}"
|
||||
autocapitalize="off"
|
||||
|
@ -52,18 +52,18 @@
|
|||
ng-model="formData.privateKey">
|
||||
</label>
|
||||
|
||||
<div ng-show="seedSource.id == 'new' || seedSource.id == 'set'">
|
||||
<div ng-show="formData.seedSource.id == 'new' || formData.seedSource.id == 'set'">
|
||||
<ion-toggle class="has-comment" ng-model="encrypt" toggle-class="toggle-positive" ng-change="resizeView()">
|
||||
<span class="toggle-label" translate>Add a password</span>
|
||||
</ion-toggle>
|
||||
<div class="comment">
|
||||
<span ng-show="seedSource.id == 'new'" translate>Add an optional password to secure the recovery phrase</span>
|
||||
<span ng-show="seedSource.id == 'set'" translate>The recovery phrase could require a password to be imported</span>
|
||||
<span ng-show="formData.seedSource.id == 'new'" translate>Add an optional password to secure the recovery phrase</span>
|
||||
<span ng-show="formData.seedSource.id == 'set'" translate>The recovery phrase could require a password to be imported</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="item item-input" ng-show="encrypt">
|
||||
<input ng-show="seedSource.id == 'new'"
|
||||
<input ng-show="formData.seedSource.id == 'new'"
|
||||
placeholder="{{'Password'|translate}}"
|
||||
type="password"
|
||||
autocapitalize="off"
|
||||
|
@ -71,7 +71,7 @@
|
|||
ng-change="checkPassword(formData.createPassphrase, formData.repeatPassword)"
|
||||
ng-class="{'correct': result == 'correct', 'incorrect': result == 'incorrect'}">
|
||||
|
||||
<input ng-show="seedSource.id == 'set'"
|
||||
<input ng-show="formData.seedSource.id == 'set'"
|
||||
placeholder="{{'Password'|translate}}"
|
||||
type="password"
|
||||
autocapitalize="off"
|
||||
|
@ -80,7 +80,7 @@
|
|||
ng-class="{'correct': result == 'correct', 'incorrect': result == 'incorrect'}">
|
||||
</div>
|
||||
<div class="item item-input" ng-show="encrypt">
|
||||
<input ng-show="seedSource.id == 'new'"
|
||||
<input ng-show="formData.seedSource.id == 'new'"
|
||||
placeholder="{{'Repeat password'|translate}}"
|
||||
type="password"
|
||||
autocapitalize="off"
|
||||
|
@ -88,7 +88,7 @@
|
|||
ng-change="checkPassword(formData.createPassphrase, formData.repeatPassword)"
|
||||
ng-class="{'correct': result == 'correct', 'incorrect': result == 'incorrect'}">
|
||||
|
||||
<input ng-show="seedSource.id == 'set'"
|
||||
<input ng-show="formData.seedSource.id == 'set'"
|
||||
placeholder="{{'Repeat password'|translate}}"
|
||||
type="password"
|
||||
autocapitalize="off"
|
||||
|
@ -97,7 +97,7 @@
|
|||
ng-class="{'correct': result == 'correct', 'incorrect': result == 'incorrect'}">
|
||||
</div>
|
||||
|
||||
<div class="text-center box-notification error" ng-show="(seedSource.id =='new' || seedSource.id =='set') && encrypt">
|
||||
<div class="text-center box-notification error" ng-show="(formData.seedSource.id =='new' || formData.seedSource.id =='set') && encrypt">
|
||||
<strong translate>This password cannot be recovered. If the password is lost, there is no way you could recover your funds.</strong>
|
||||
</div>
|
||||
|
||||
|
@ -105,14 +105,14 @@
|
|||
<span class="toggle-label" translate>I have written it down</span>
|
||||
</ion-checkbox>
|
||||
|
||||
<label class="item item-input item-stacked-label" ng-show="seedSource.id == 'set'">
|
||||
<label class="item item-input item-stacked-label" ng-show="formData.seedSource.id == 'set'">
|
||||
<span class="input-label" translate>Derivation Path</span>
|
||||
<input type="text"
|
||||
placeholder="{{'BIP32 path for address derivation'|translate}}"
|
||||
ng-model="formData.derivationPath">
|
||||
</label>
|
||||
|
||||
<ion-toggle ng-show="seedSource.supportsTestnet" ng-model="formData.testnetEnabled" toggle-class="toggle-positive">
|
||||
<ion-toggle ng-show="formData.seedSource.supportsTestnet" ng-model="formData.testnetEnabled" toggle-class="toggle-positive">
|
||||
<span translate>Testnet</span>
|
||||
</ion-toggle>
|
||||
|
||||
|
@ -125,7 +125,7 @@
|
|||
</div> <!-- list -->
|
||||
|
||||
<button type="submit" class="button button-standard button-primary"
|
||||
ng-disabled="setupForm.$invalid || ((encrypt && !formData.passwordSaved) || encrypt && ((seedSource.id == 'new' && !formData.createPassphrase) || (seedSource.id == 'set' && !formData.passphrase)))">
|
||||
ng-disabled="setupForm.$invalid || ((encrypt && !formData.passwordSaved) || encrypt && ((formData.seedSource.id == 'new' && !formData.createPassphrase) || (formData.seedSource.id == 'set' && !formData.passphrase)))">
|
||||
<span translate>Create new wallet</span>
|
||||
</button>
|
||||
</form>
|
||||
|
|
|
@ -65,15 +65,15 @@
|
|||
<div class="input-label" translate>
|
||||
Wallet Key
|
||||
</div>
|
||||
<select class="m10t" ng-model="seedSource" ng-options="seed as seed.label for seed in seedOptions" ng-change="resizeView()"></select>
|
||||
<select class="m10t" ng-model="formData.seedSource" ng-options="seed as seed.label for seed in seedOptions" ng-change="resizeView()"></select>
|
||||
</label>
|
||||
|
||||
<label class="item item-input item-stacked-label" ng-show="seedSource.id == 'trezor' || seedSource.id == 'ledger'">
|
||||
<label class="item item-input item-stacked-label" ng-show="formData.seedSource.id == 'trezor' || formData.seedSource.id == 'ledger'">
|
||||
<span class="input-label" translate>Account Number</span>
|
||||
<input type="number" ng-model="formData.account" ignore-mouse-wheel>
|
||||
</label>
|
||||
|
||||
<label class="item item-input item-stacked-label" ng-show="seedSource.id == 'set'">
|
||||
<label class="item item-input item-stacked-label" ng-show="formData.seedSource.id == 'set'">
|
||||
<span class="input-label" translate>Wallet Recovery Phrase</span>
|
||||
<input placeholder="{{'Enter the recovery phrase (BIP39)'|translate}}"
|
||||
autocapitalize="off"
|
||||
|
@ -81,18 +81,18 @@
|
|||
ng-model="formData.privateKey">
|
||||
</label>
|
||||
|
||||
<div ng-show="seedSource.id == 'new' || seedSource.id == 'set'">
|
||||
<div ng-show="formData.seedSource.id == 'new' || formData.seedSource.id == 'set'">
|
||||
<ion-toggle class="has-comment" ng-model="encrypt" toggle-class="toggle-positive" ng-change="resizeView()">
|
||||
<span class="toggle-label" translate>Add a password</span>
|
||||
</ion-toggle>
|
||||
<div class="comment">
|
||||
<span ng-show="seedSource.id == 'new'" translate>Add an optional password to secure the recovery phrase</span>
|
||||
<span ng-show="seedSource.id == 'set'" translate>The recovery phrase could require a password to be imported</span>
|
||||
<span ng-show="formData.seedSource.id == 'new'" translate>Add an optional password to secure the recovery phrase</span>
|
||||
<span ng-show="formData.seedSource.id == 'set'" translate>The recovery phrase could require a password to be imported</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="item item-input" ng-show="encrypt">
|
||||
<input ng-show="seedSource.id == 'new'"
|
||||
<input ng-show="formData.seedSource.id == 'new'"
|
||||
placeholder="{{'Password'|translate}}"
|
||||
type="password"
|
||||
autocapitalize="off"
|
||||
|
@ -100,7 +100,7 @@
|
|||
ng-change="checkPassword(formData.createPassphrase, formData.repeatPassword)"
|
||||
ng-class="{'correct': result == 'correct', 'incorrect': result == 'incorrect'}">
|
||||
|
||||
<input ng-show="seedSource.id == 'set'"
|
||||
<input ng-show="formData.seedSource.id == 'set'"
|
||||
placeholder="{{'Password'|translate}}"
|
||||
type="password"
|
||||
autocapitalize="off"
|
||||
|
@ -109,7 +109,7 @@
|
|||
ng-class="{'correct': result == 'correct', 'incorrect': result == 'incorrect'}">
|
||||
</div>
|
||||
<div class="item item-input" ng-show="encrypt">
|
||||
<input ng-show="seedSource.id == 'new'"
|
||||
<input ng-show="formData.seedSource.id == 'new'"
|
||||
placeholder="{{'Repeat password'|translate}}"
|
||||
type="password"
|
||||
autocapitalize="off"
|
||||
|
@ -117,7 +117,7 @@
|
|||
ng-change="checkPassword(formData.createPassphrase, formData.repeatPassword)"
|
||||
ng-class="{'correct': result == 'correct', 'incorrect': result == 'incorrect'}">
|
||||
|
||||
<input ng-show="seedSource.id == 'set'"
|
||||
<input ng-show="formData.seedSource.id == 'set'"
|
||||
placeholder="{{'Repeat password'|translate}}"
|
||||
type="password"
|
||||
autocapitalize="off"
|
||||
|
@ -126,7 +126,7 @@
|
|||
ng-class="{'correct': result == 'correct', 'incorrect': result == 'incorrect'}">
|
||||
</div>
|
||||
|
||||
<div class="text-center box-notification error" ng-show="(seedSource.id =='new' || seedSource.id =='set') && encrypt">
|
||||
<div class="text-center box-notification error" ng-show="(formData.seedSource.id =='new' || formData.seedSource.id =='set') && encrypt">
|
||||
<strong translate>This password cannot be recovered. If the password is lost, there is no way you could recover your funds.</strong>
|
||||
</div>
|
||||
|
||||
|
@ -134,14 +134,14 @@
|
|||
<span class="toggle-label" translate>I have written it down</span>
|
||||
</ion-checkbox>
|
||||
|
||||
<label class="item item-input item-stacked-label" ng-show="seedSource.id == 'set'">
|
||||
<label class="item item-input item-stacked-label" ng-show="formData.seedSource.id == 'set'">
|
||||
<span class="input-label" translate>Derivation Path</span>
|
||||
<input type="text"
|
||||
placeholder="{{'BIP32 path for address derivation'|translate}}"
|
||||
ng-model="formData.derivationPath">
|
||||
</label>
|
||||
|
||||
<ion-toggle ng-show="seedSource.supportsTestnet" ng-model="formData.testnetEnabled" toggle-class="toggle-positive">
|
||||
<ion-toggle ng-show="formData.seedSource.supportsTestnet" ng-model="formData.testnetEnabled" toggle-class="toggle-positive">
|
||||
Testnet
|
||||
</ion-toggle>
|
||||
|
||||
|
@ -154,7 +154,7 @@
|
|||
</div> <!-- list -->
|
||||
|
||||
<button type="submit" class="button button-standard button-primary"
|
||||
ng-disabled="setupForm.$invalid || ((encrypt && !formData.passwordSaved) || encrypt && ((seedSource.id == 'new' && !formData.createPassphrase) || (seedSource.id == 'set' && !formData.passphrase)))">
|
||||
ng-disabled="setupForm.$invalid || ((encrypt && !formData.passwordSaved) || encrypt && ((formData.seedSource.id == 'new' && !formData.createPassphrase) || (formData.seedSource.id == 'set' && !formData.passphrase)))">
|
||||
<span translate>Create {{formData.requiredCopayers}}-of-{{formData.totalCopayers}} wallet</span>
|
||||
</button>
|
||||
</form>
|
||||
|
|
Loading…
Reference in New Issue