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

Merge branch 'ref/design' of github.com:matiu/copay into ref/design

Browse source
This commit is contained in:
Matias Alejo Garcia 2016-08-23 16:53:33 -03:00
commit c83c2e7550
No known key found for this signature in database
GPG key ID: 02470DB551277AB3
26 changed files with 95 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

2
public/views/walletDetails.html
View file

@ -45,7 +45,7 @@
</div>
<div ng-click='updateAll()' ng-show="!updateStatusError && wallet.walletScanStatus != 'error' && !hideBalance" on-hold="hideToggle()">
<div ng-click='updateAll()' ng-show="!updateStatusError && wallet.walletScanStatus != 'error' && !shouldHideBalance" 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">