fix and enhance create / join / import forms for hardware wallets
This commit is contained in:
Matias Alejo Garcia
parent
8eecdd1e86
commit
f2deba10ec
9 changed files with 178 additions and 81 deletions
|
|
@ -103,12 +103,12 @@
|
|||
<div ng-hide="hideAdv" class="row">
|
||||
<div class="large-12 columns">
|
||||
|
||||
<label ng-show="create.isChromeApp() && totalCopayers > 1 " for="hw-ledger" class="oh">
|
||||
<label ng-show="index.isChromeApp && totalCopayers > 1 " for="hw-ledger" class="oh">
|
||||
<span translate>Use Ledger hardware wallet</span>
|
||||
<switch id="hw-ledger" name="hwLedger" ng-model="hwLedger" ng-change="isTestnet=false" class="green right m5t m10b"></switch>
|
||||
</label>
|
||||
|
||||
<label ng-show="1" for="hw-trezor" class="oh">
|
||||
<label ng-show="!index.isCordova" for="hw-trezor" class="oh">
|
||||
<span translate>Use TREZOR hardware wallet</span>
|
||||
<switch id="hw-trezor" name="hwTrezor" ng-model="hwTrezor" class="green right m5t m10b"></switch>
|
||||
</label>
|
||||
|
|
@ -131,21 +131,21 @@
|
|||
<switch id="seed" name="setSeed" ng-model="setSeed" class="green right m5t m10b"></switch>
|
||||
</label>
|
||||
|
||||
<label for="createPassphrase" class="line-b oh" ng-show="!setSeed && !hwLedger && !hwTrezor" ><span translate>Seed Passphrase</span> <small translate>Add an optional passphrase to secure the seed</small>
|
||||
<label for="createPassphrase" class="line-b oh" ng-hide="setSeed || hwLedger || hwTrezor" ><span translate>Add a Seed Passphrase</span> <small translate>Add an optional passphrase to secure the seed</small>
|
||||
<div class="input">
|
||||
<input type="text" class="form-control"
|
||||
name="createPassphrase" ng-model="createPassphrase">
|
||||
</div>
|
||||
</label>
|
||||
|
||||
<label for="ext-master" class="m10t" ng-show="setSeed && !hwLedger">
|
||||
<label for="ext-master" class="m10t" ng-show="setSeed">
|
||||
<span translate>Wallet Seed</span>
|
||||
<small translate>Enter the seed words (BIP39)</small>
|
||||
<input id="ext-master"
|
||||
type="text"
|
||||
name="privateKey" ng-model="privateKey">
|
||||
</label>
|
||||
<label for="passphrase" class="line-b oh" ng-show="setSeed && !hwLedger && !hwTrezor"><span translate>Seed Passphrase</span> <small translate>The seed could require a passphrase to be imported</small>
|
||||
<label for="passphrase" class="line-b oh" ng-show="setSeed"><span translate>Seed Passphrase</span> <small translate>The seed could require a passphrase to be imported</small>
|
||||
<div class="input">
|
||||
<input type="text" class="form-control" name="passphrase" ng-model="passphrase">
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
</div>
|
||||
|
||||
<div class="content p20v" ng-controller="importController as import" ng-init="type='12'">
|
||||
<div class="onGoingProcess" ng-show="import.loading && !import.ledger">
|
||||
<div class="onGoingProcess" ng-show="import.loading && !import.hwWallet">
|
||||
<div class="onGoingProcess-content" ng-style="{'background-color':'#222'}">
|
||||
<div class="spinner">
|
||||
<div class="rect1"></div>
|
||||
|
|
@ -17,7 +17,7 @@
|
|||
<span translate>Importing wallet...</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="onGoingProcess" ng-show="import.ledger">
|
||||
<div class="onGoingProcess" ng-show="import.hwWallet">
|
||||
<div class="onGoingProcess-content" ng-style="{'background-color':'#222'}">
|
||||
<div class="spinner">
|
||||
<div class="rect1"></div>
|
||||
|
|
@ -26,26 +26,14 @@
|
|||
<div class="rect4"></div>
|
||||
<div class="rect5"></div>
|
||||
</div>
|
||||
<span translate>Connecting to Ledger Wallet...</span>
|
||||
<span translate>Connecting to {{import.hwWallet}} Wallet...</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<div class="create-tab small-only-text-center" ng-hide="create.hideTabs">
|
||||
<div class="row" ng-show="!index.isChromeApp">
|
||||
<div class="tab-container small-6 medium-6 large-6">
|
||||
<a href
|
||||
ng-class="{'selected': type =='12'}"
|
||||
ng-click="import.setType('12')" translate>Wallet Seed</a>
|
||||
</div>
|
||||
<div class="tab-container small-6 medium-6 large-6">
|
||||
<a href
|
||||
ng-class="{'selected': type=='file'}"
|
||||
ng-click="import.setType('file')" translate>File/Text Backup</a>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row" ng-show="index.isChromeApp">
|
||||
<div class="row">
|
||||
<div class="tab-container small-4 medium-4 large-4">
|
||||
<a href
|
||||
ng-class="{'selected': type =='12'}"
|
||||
|
|
@ -58,17 +46,12 @@
|
|||
</div>
|
||||
<div class="tab-container small-4 medium-4 large-4">
|
||||
<a href
|
||||
ng-class="{'selected': type=='ledger'}"
|
||||
ng-click="import.setType('ledger')" translate>Ledger</a>
|
||||
ng-class="{'selected': type=='hwWallet'}"
|
||||
ng-click="import.setType('hwWallet')" translate>Hardware Wallet</a>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<div class="row" ng-show="type == '12' ">
|
||||
<div class="large-12 columns">
|
||||
<form name="importForm12" ng-submit="import.importMnemonic(importForm12)" novalidate>
|
||||
|
|
@ -166,14 +149,15 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row" ng-show="type == 'ledger'">
|
||||
<div class="row" ng-show="type == 'hwWallet'">
|
||||
<div class="large-12 columns">
|
||||
<form name="importForm3" ng-submit="import.importLedger(importForm3)" novalidate>
|
||||
<div class="box-notification" ng-show="import.error">
|
||||
<span class="text-warning size-14">
|
||||
{{import.error|translate}}
|
||||
</span>
|
||||
</div>
|
||||
<div class="box-notification" ng-show="import.error">
|
||||
<span class="text-warning size-14">
|
||||
{{import.error|translate}}
|
||||
</span>
|
||||
</div>
|
||||
|
||||
<form name="importForm3" ng-submit="import.importLedger(importForm3)" ng-show="index.isChromeApp" novalidate>
|
||||
<div class="large-12 columns">
|
||||
<!-- TODO: account
|
||||
<label class=" oh">
|
||||
|
|
@ -185,7 +169,24 @@
|
|||
-->
|
||||
<button translate type="submit" class="button round expand black"
|
||||
ng-disabled="import.loading || import.ledger">
|
||||
Import backup
|
||||
Import from Ledger
|
||||
</button>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
<form name="importForm4" ng-submit="import.importTrezor(importForm4)" novalidate>
|
||||
<div class="large-12 columns">
|
||||
<!-- TODO: account
|
||||
<label class=" oh">
|
||||
<span translate>Ledger Slot</span>
|
||||
<select class="m10t" ng-model="externalIndex" ng-options="externalIndex as externalIndex for externalIndex in import.externalIndexValues">
|
||||
</select>
|
||||
</label>
|
||||
<div class="oh text-gray line-b size-12 p10b m20b"><span translate>Ledger supports up to 20 Copay wallets simultaneously. Select which slot to import</div>
|
||||
-->
|
||||
<button translate type="submit" class="button round expand black"
|
||||
ng-disabled="import.loading || import.ledger">
|
||||
Import from TREZOR
|
||||
</button>
|
||||
</div>
|
||||
</form>
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
|
||||
<div class="content p20v" ng-controller="joinController as join">
|
||||
<div class="onGoingProcess" ng-show="join.loading && !join.ledger">
|
||||
<div class="onGoingProcess" ng-show="join.loading && !join.hwWallet">
|
||||
<div class="onGoingProcess-content" ng-style="{'background-color':'#222'}">
|
||||
<div class="spinner">
|
||||
<div class="rect1"></div>
|
||||
|
|
@ -19,7 +19,7 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div class="onGoingProcess" ng-show="join.ledger">
|
||||
<div class="onGoingProcess" ng-show="join.hwWallet">
|
||||
<div class="onGoingProcess-content" ng-style="{'background-color':'#222'}">
|
||||
<div class="spinner">
|
||||
<div class="rect1"></div>
|
||||
|
|
@ -28,7 +28,7 @@
|
|||
<div class="rect4"></div>
|
||||
<div class="rect5"></div>
|
||||
</div>
|
||||
<span translate>Connecting to Ledger Wallet...</span>
|
||||
<span translate>Connecting to {{join.hwWallet}} Wallet...</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
@ -76,12 +76,17 @@
|
|||
<i ng-show="join.hideAdv" class="icon-arrow-up4"></i>
|
||||
</a>
|
||||
<div ng-show="join.hideAdv" class="row">
|
||||
<div class="large-12 columns" ng-show="join.isChromeApp()">
|
||||
<label for="hw-ledger" class="oh">
|
||||
<span translate>Use Ledger hardware wallet</span>
|
||||
<switch id="hw-ledger" name="hwLedger" ng-model="hwLedger" class="green right m5t m10b"></switch>
|
||||
</label>
|
||||
</div>
|
||||
<div class="large-12 columns">
|
||||
<label for="hw-ledger" class="oh" ng-show="index.isChromeApp">
|
||||
<span translate>Use Ledger hardware wallet</span>
|
||||
<switch id="hw-ledger" name="hwLedger" ng-model="hwLedger" class="green right m5t m10b"></switch>
|
||||
</label>
|
||||
|
||||
<label ng-show="!index.isCordova" for="hw-trezor" class="oh">
|
||||
<span translate>Use TREZOR hardware wallet</span>
|
||||
<switch id="hw-trezor" name="hwTrezor" ng-model="hwTrezor" class="green right m5t m10b"></switch>
|
||||
</label>
|
||||
|
||||
<!-- TODO account
|
||||
<div class="large-12 columns" ng-hide="!hwLedger">
|
||||
<label class="oh">
|
||||
|
|
@ -92,32 +97,30 @@
|
|||
<div class="oh text-gray line-b size-12 p10b m20b"><span translate>Ledger supports up to 20 Copay wallets simultaneously. Select which slot should be used to host this wallet</div>
|
||||
</div>
|
||||
-->
|
||||
<div class="large-12 columns">
|
||||
|
||||
<label ng-show="!hwLedger" for="seed" class="oh">
|
||||
<label ng-show="!hwLedger && !hwTrezor" for="seed" class="oh">
|
||||
<span translate>Specify your wallet seed</span>
|
||||
<switch id="seed" name="setSeed" ng-model="setSeed" class="green right m5t m10b"></switch>
|
||||
</label>
|
||||
|
||||
<label for="createPassphrase" class="line-b oh" ng-show="!setSeed && !hwLedger" ><span translate>Seed Passphrase</span> <small translate>Add an optional passphrase to secure the seed</small>
|
||||
<label for="createPassphrase" class="line-b oh" ng-show="!setSeed && !hwLedger && !hwTrezor" ><span translate>Add a Seed Passphrase</span> <small translate>Add an optional passphrase to secure the seed</small>
|
||||
<div class="input">
|
||||
<input type="text" class="form-control"
|
||||
name="createPassphrase" ng-model="createPassphrase">
|
||||
</div>
|
||||
</label>
|
||||
|
||||
<label for="ext-master" class="m10t" ng-show="setSeed && !hwLedger">
|
||||
<label for="ext-master" class="m10t" ng-show="setSeed">
|
||||
<span translate>Wallet Seed</span>
|
||||
<small translate>Enter the seed words (BIP39)</small>
|
||||
<input id="ext-master"
|
||||
type="text"
|
||||
name="privateKey" ng-model="privateKey">
|
||||
</label>
|
||||
<label for="passphrase" class="line-b oh" ng-show="setSeed && !hwLedger"><span translate>Seed Passphrase</span> <small translate>The seed could require a passphrase to be imported</small>
|
||||
<div class="input">
|
||||
<input type="text" class="form-control" name="passphrase" ng-model="passphrase">
|
||||
</div>
|
||||
</label>
|
||||
<label for="passphrase" class="line-b oh" ng-show="setSeed"><span translate>Seed Passphrase</span> <small translate>The seed could require a passphrase to be imported</small>
|
||||
<div class="input">
|
||||
<input type="text" class="form-control" name="passphrase" ng-model="passphrase">
|
||||
</div>
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue