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

Merge pull request #3435 from matiu/bug/trezor-fixes

Browse source 
fix join message
This commit is contained in:
Gustavo Maximiliano Cortez 2015-11-11 16:49:25 -03:00
commit 77be7f217d
5 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
public/index.html
View file

@ -5,6 +5,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
<meta name="msapplication-tap-highlight" content="no">
<meta name="format-detection" content="telephone=no">
<link rel="stylesheet" type="text/css" href="css/foundation.css">
<link rel="stylesheet" type="text/css" href="icons/foundation-icons.css">
<link rel="stylesheet" type="text/css" href="css/copay.css">

3
public/views/create.html
View file

@ -22,7 +22,7 @@
</div>
<div class="onGoingProcess" ng-show="create.hwWallet">
<div class="onGoingProcess-content" ng-style="{'background-color':'#222'}">
<div class="onGoingProcess-content" ng-style="{'background-color':'#222'}" style="max-height:6.5em" >
<div class="spinner">
<div class="rect1"></div>
<div class="rect2"></div>
@ -31,6 +31,7 @@
<div class="rect5"></div>
</div>
<span translate>Connecting to {{create.hwWallet}} Wallet...</span>
<span ng-show="create.hwWallet=='Trezor'" translate>Please accept to export two public keys from the Trezor app</span>
</div>
</div>

10
public/views/join.html
View file

@ -20,7 +20,7 @@
</div>
<div class="onGoingProcess" ng-show="join.hwWallet">
<div class="onGoingProcess-content" ng-style="{'background-color':'#222'}">
<div class="onGoingProcess-content" ng-style="{'background-color':'#222'}" style="max-height:6.5em">
<div class="spinner">
<div class="rect1"></div>
<div class="rect2"></div>
@ -29,6 +29,7 @@
<div class="rect5"></div>
</div>
<span translate>Connecting to {{join.hwWallet}} Wallet...</span>
<span ng-show="join.hwWallet=='Trezor'" translate>Please accept to export two public keys from the Trezor app</span>
</div>
</div>
@ -98,12 +99,9 @@
</div>
<div ng-show="join.seedSourceId == 'trezor' || join.seedSourceId == 'ledger'">
<label class="oh"><span translate>Account</span>
<select class="m10t" ng-model="account" ng-options="externalIndex as externalIndex for externalIndex in join.accountValues">
</select>
<label class="oh"><span translate>Account Number</span>
<input type="number" id="account" ng-model="account">
</label>
<div class="oh text-gray line-b size-12 p10b m20b"><span translate>Multiple wallets accounts are supported on the device simultaneously. Select which account should be used for this wallet</div>
</div>
<div class="box-notification" ng-show="join.seedSourceId=='new' && createPassphrase">