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

Merge branch 'ref/design' of https://github.com/bitpay/bitpay-wallet into feature/address_book

Browse source
This commit is contained in:
Jamal Jackson 2016-09-23 13:58:21 -04:00
commit b5a4597416
34 changed files with 132 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

4
public/views/buyAmazon.html
View file

@ -42,7 +42,7 @@
ng-attr-placeholder="{{'Amount in USD'}}"
min="0.01"
max="500"
ng-model="fiat"
ng-model="formData.fiat"
ng-pattern="/^[0-9]+(\.[0-9]{1,2})?$/"
step="0.01"
autocomplete="off" ignore-mouse-wheel required>
@ -53,7 +53,7 @@
<wallets ng-if="wallets[0]" wallets="wallets"></wallets>
<button class="button button-block button-positive"
ng-disabled="!fiat"
ng-disabled="!formData.fiat"
type="submit">
Buy now
</button>

2
public/views/modals/tx-details.html
View file

@ -75,7 +75,7 @@
</div>
<div class="item">
<div ng-if="btx.action == 'received'">
<div ng-if="btx.action == 'received' || 'moved'">
<span translate>Date</span>
<span class="item-note">
<time>{{ btx.time * 1000 | amDateFormat:'MM/DD/YYYY HH:mm a'}}</time>

6
public/views/preferences.html
View file

@ -19,7 +19,7 @@
<a class="item" ng-show="wallet.isPrivKeyExternal()">
<span translate>Hardware Wallet</span>
<span class="item-note">
{{wallet.externalSource}}
{{externalSource}}
</span>
</div>
<a class="item item-icon-right" ui-sref="tabs.preferences.preferencesColor">
@ -45,12 +45,12 @@
<i class="icon nav-item-arrow-right"></i>
</a>
<div ng-show="wallet.canSign()">
<ion-toggle ng-model="encryptEnabled" toggle-class="toggle-balanced" ng-change="encryptChange()">
<ion-toggle ng-model="encryptEnabled.value" toggle-class="toggle-balanced" ng-change="encryptChange()">
<span class="toggle-label" translate>Request Spending Password</span>
</ion-toggle>
</div>
<div ng-show="wallet.canSign() && touchIdAvailable">
<ion-toggle ng-model="touchIdEnabled" toggle-class="toggle-balanced" ng-change="touchIdChange()">
<ion-toggle ng-model="touchIdEnabled.value" toggle-class="toggle-balanced" ng-change="touchIdChange()">
<span class="toggle-label" translate>Request Fingerprint</span>
</ion-toggle>
</div>

2
public/views/preferencesAlias.html
View file

@ -11,7 +11,7 @@
<div class="card list">
<label class="item item-input item-stacked-label">
<span class="input-label" transalate>Alias for {{walletName}}</span>
<input type="text" id="alias" name="alias" ng-model="alias" placeholder="John" required>
<input type="text" id="alias" name="alias" ng-model="alias.value" placeholder="John" required>
</label>
</div>
<button type="submit"

2
public/views/preferencesBwsUrl.html
View file

@ -9,7 +9,7 @@
<div class="card list">
<label class="item item-input item-stacked-label no-border">
<span class="input-label">Wallet Service URL</span>
<input type="text" id="bwsurl" type="text" name="bwsurl" ng-model="bwsurl">
<input type="text" id="bwsurl" type="text" name="bwsurl" ng-model="bwsurl.value">
<a class="postfix" on-tap="resetDefaultUrl()">
<i class="icon ion-ios-reload"></i>
</a>

2
public/views/preferencesEmail.html
View file

@ -11,7 +11,7 @@
<div class="card list">
<label class="item item-input item-stacked-label">
<span class="input-label" transalate>Email for wallet notifications</span>
<input type="email" id="email" name="email" ng-model="email" required></input>
<input type="email" id="email" name="email" ng-model="email.value" required></input>
</label>
</div>
<button type="submit"

6
public/views/tab-export-file.html
View file

@ -29,7 +29,7 @@
</ion-checkbox>
</div>
<div class="box-notification error" ng-show="!canSign">
<div class="box-notification error ng-hide" ng-show="!canSign">
<span class="size-14">
<i class="ion-alert-circled"></i>
<span translate>
@ -38,7 +38,7 @@
</span>
</div>
<div class="box-notification error" ng-show="formData.noSignEnabled">
<div class="box-notification error ng-hide" ng-show="formData.noSignEnabled">
<span class="size-14">
<i class="ion-alert-circled"></i>
<span translate>
@ -90,4 +90,4 @@
<i class="icon ion-compose"></i>
<p translate>Copy this text as it is to a safe place (notepad or email)</p>
</div>
</div>
</div>

4
public/views/tab-send.html
View file

@ -10,8 +10,8 @@
<i class="icon ion-search placeholder-icon"></i>
<input type="text"
placeholder="Search or enter bitcoin address"
ng-model="search"
ng-change="findContact(search)"
ng-model="formData.search"
ng-change="findContact(formData.search)"
ng-model-onblur>
</label>
</div>