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

updates ledger integration

Browse source
This commit is contained in:
Matias Alejo Garcia 2015-09-04 10:17:59 -03:00
commit fe7a628edd
9 changed files with 282 additions and 244 deletions
Download patch file Download diff file Expand all files Collapse all files

10
public/views/create.html
View file

@ -117,7 +117,7 @@
<switch id="network-name" name="isTestnet" ng-model="isTestnet" class="green right m5t m10b"></switch>
</label>
<label for="seed" class="oh">
<label ng-hide="hwLedger" 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>
@ -129,14 +129,14 @@
</div>
</label>
<label for="ext-master" class="m10t" ng-show="setSeed">
<label for="ext-master" class="m10t" ng-show="setSeed && !hwLedger">
<span translate>Wallet Seed</span>
<small translate>Enter the 12 words seed (BIP39)</small>
<input id="ext-master"
type="text"
name="privateKey" ng-model="privateKey">
</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>
<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>
@ -155,11 +155,11 @@
<button type="submit" class="button round black expand m0" ng-show="totalCopayers != 1" ng-disabled="setupForm.$invalid || create.loading">
<button type="submit" class="button round black expand m0" ng-show="totalCopayers != 1" ng-disabled="setupForm.$invalid || create.loading || create.ledger">
<span translate>Create {{requiredCopayers}}-of-{{totalCopayers}} wallet</span>
</button>
<button type="submit" class="button round black expand m0" ng-show="totalCopayers == 1" ng-disabled="setupForm.$invalid || create.loading">
<button type="submit" class="button round black expand m0" ng-show="totalCopayers == 1" ng-disabled="setupForm.$invalid || create.loading || create.ledger">
<span translate>Create new wallet</span>
</button>
</div>

7
public/views/preferences.html
View file

@ -36,19 +36,18 @@
<span ng-style="{'color':index.backgroundColor}">&block;</span>
</span>
</li>
<li class="line-b p20" ng-hide="preferences.externalIndex >= 0">
<li class="line-b p20" ng-hide="index.isPrivKeyExternal">
<span translate>Request Password for Spending Funds</span>
<switch id="network-name" name="encrypt" ng-model="encrypt" class="green right"></switch>
</li>
<li class="line-b p20" ng-show="preferences.externalIndex >= 0">
<li class="line-b p20" ng-show="index.isPrivKeyExternal">
<span translate>Hardware wallet</span>
<span class="right text-gray">
{{preferences.externalSource}}
(index {{preferences.externalIndex}})
</span>
</li>
<li class="line-b p20" ng-click="$root.go('backup')" ng-show="preferences.externalIndex >= 0">
<li class="line-b p20" ng-click="$root.go('backup')" ng-hide="index.isPrivKeyExternal">
<i class="icon-arrow-right3 size-24 right text-gray"></i>
<span class="text-warning right" ng-show="index.needsBackup">
<i class="fi-alert"></i> <span translate> Still not done</span>

8
public/views/walletHome.html
View file

@ -123,10 +123,9 @@
{{(index.alias || index.walletName)}}
</p>
<div class="size-12 text-gray">
<span translate>Multisignature wallet</span>
<span translate>Multisignature wallet</span>
(<span translate>{{index.m}}-of-{{index.n}}</span>)
<span ng-if="index.network != 'livenet'">- Testnet</span>
<span ng-if="!index.canSign"> - <span translate>No Private key</span></span>
<span ng-include="'views/includes/walletInfo.html'"></span>
</div>
</div>
<div ng-show="!index.isShared">
@ -134,8 +133,7 @@
{{(index.alias || index.walletName)}}
</p>
<div class="size-12 text-gray">
<span ng-if="index.network != 'livenet'"> Testnet </span>
<span ng-if="!index.canSign" translate>No Private key</span>
<span ng-include="'views/includes/walletInfo.html'"></span>
</div>
</div>
</div>