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

Merge pull request #3283 from matiu/bug/trezor

Browse source 
disables TREZOR
This commit is contained in:
Gustavo Maximiliano Cortez 2015-10-07 12:21:08 -03:00
commit fec10d6b30
10 changed files with 26 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

10
public/views/create.html
View file

@ -107,11 +107,11 @@
<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="!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>
<!-- -->
<!-- <label ng&#45;show="!index.isCordova" for="hw&#45;trezor" class="oh"> -->
<!-- <span translate>Use TREZOR hardware wallet</span> -->
<!-- <switch id="hw&#45;trezor" name="hwTrezor" ng&#45;model="hwTrezor" class="green right m5t m10b"></switch> -->
<!-- </label> -->
<!-- TODO account
<div ng-show="hwLedger">
<label class="oh"><span translate>Ledger Slot</span>

6
public/views/export.html
View file

@ -68,14 +68,14 @@
<button class="black round expand m0" ng-click="backup.downloadWalletBackup()"
ng-disabled="(!backup.password || backup.password != backup.repeatpassword)"
ng-style="{'background-color':index.backgroundColor}"
ng-show="!backup.isSafari && !backup.isCordova"><i class="fi-download"></i>
ng-show="!index.isSafari && !index.isCordova"><i class="fi-download"></i>
<span translate>Download</span></button>
<button class="black round expand m0" ng-click="backup.viewWalletBackup()"
ng-disabled="(!backup.password || backup.password != backup.repeatpassword)"
ng-style="{'background-color':index.backgroundColor}"
ng-show="backup.isSafari && !backup.isCordova"><i class="fi-eye"></i>
ng-show="index.isSafari && !index.isCordova"><i class="fi-eye"></i>
<span translate>View</span></button>
<div ng-show="backup.isCordova">
<div ng-show="index.isCordova">
<h4 translate>Export options</h4>
<button class="black round expand" ng-disabled="(!backup.password || backup.password != backup.repeatpassword)"
ng-style="{'background-color':index.backgroundColor}"

16
public/views/import.html
View file

@ -112,7 +112,7 @@
</span>
</div>
<div ng-show="!import.isSafari && !import.isCordova" class="line-b m10b">
<div ng-show="!index.isSafari && !index.isCordova" class="line-b m10b">
<label for="backupFile">
<span translate>Choose a backup file from your computer</span> <i class="fi-laptop"></i>
</label>
@ -120,7 +120,7 @@
name="backupFile" ng-model="import.backupFile" ng-file-select>
</div>
<div ng-show="import.isSafari || import.isCordova">
<div ng-show="index.isSafari || index.isCordova">
<label for="backupText">
<span translate>Paste the backup plain text code</span> <i class="fi-clipboard"></i>
</label>
@ -176,16 +176,10 @@
<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>
-->
<!-- ng-disabled="import.loading || import.ledger" -->
<button translate type="submit" class="button round expand black"
ng-disabled="import.loading || import.ledger">
ng-disabled="true"
>
Import from TREZOR
</button>
</div>

12
public/views/join.html
View file

@ -81,12 +81,12 @@
<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>
<!-- -->
<!-- <label ng&#45;show="!index.isCordova" for="hw&#45;trezor" class="oh"> -->
<!-- <span translate>Use TREZOR hardware wallet</span> -->
<!-- <switch id="hw&#45;trezor" name="hwTrezor" ng&#45;model="hwTrezor" class="green right m5t m10b"></switch> -->
<!-- </label> -->
<!-- -->
<!-- TODO account
<div class="large-12 columns" ng-hide="!hwLedger">
<label class="oh">

2
public/views/preferencesLogs.html
View file

@ -9,7 +9,7 @@
<div class="content p20v" ng-controller="preferencesLogs as logs">
<div class="row columns large-centered medium-centered">
<button class="black round small expand" ng-show="logs.isCordova" ng-style="{'background-color':index.backgroundColor}" ng-click="logs.sendLogs()"><i class="fi-mail"></i>
<button class="black round small expand" ng-show="index.isCordova" ng-style="{'background-color':index.backgroundColor}" ng-click="logs.sendLogs()"><i class="fi-mail"></i>
<span translate>Send by email</span>
</button>