This commit is contained in:
Gabriel Bazán 2016-09-23 12:42:33 -03:00
commit 35756cf529
21 changed files with 89 additions and 78 deletions

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>

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>

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>