Merge pull request #17 from gabrielbazan7/feat/hiddenBalance

Feat/hidden balance
This commit is contained in:
Matias Alejo Garcia 2016-08-31 12:42:06 -03:00 committed by GitHub
commit 970ff5e277
4 changed files with 26 additions and 14 deletions

View file

@ -50,9 +50,12 @@
<span class="badge badge-assertive" ng-show="!item.isComplete()" translate>
Incomplete
</span>
<span class="item-note" ng-show="item.isComplete()">
<span class="item-note" ng-show="item.isComplete() && !item.balanceHidden">
{{item.status.availableBalanceStr}}
</span>
<span class="item-note" ng-show="item.isComplete() && item.balanceHidden">
<strong class="size-12" translate>[Balance Hidden]</strong>
</span>
</a>
<a ui-sref="bitpayCard.main" ng-show="externalServices.BitpayCard" class="item item-icon-left">
<i class="icon ion-card"></i>BitPay Card

View file

@ -44,7 +44,7 @@
</div>
<div ng-click='updateAll()' ng-show="!updateStatusError && wallet.walletScanStatus != 'error' && !shouldHideBalance" on-hold="hideToggle()">
<div ng-click='updateAll()' ng-show="!updateStatusError && wallet.walletScanStatus != 'error' && !wallet.balanceHidden" on-hold="hideToggle()">
<strong class="size-36">{{status.totalBalanceStr}}</strong>
<div class="size-14" ng-if="status.totalBalanceAlternative">{{status.totalBalanceAlternative}} {{status.alternativeIsoCode}}</div>
<div class="size-14" ng-if="status.pendingAmount">
@ -52,7 +52,7 @@
</div>
</div>
<div ng-show="!updateStatusError && wallet.walletScanStatus != 'error' && shouldHideBalance" on-hold="hideToggle()">
<div ng-show="!updateStatusError && wallet.walletScanStatus != 'error' && wallet.balanceHidden" on-hold="hideToggle()">
<strong class="size-24" translate>[Balance Hidden]</strong>
<div class="size-14" translate>
Tap and hold to show