Merge branch 'master' of github.com:bitpay/copay into improveWalletDetails

This commit is contained in:
Marty Alcala 2016-11-11 13:52:47 -05:00
commit d02affadd1
29 changed files with 793 additions and 200 deletions

View file

@ -22,7 +22,13 @@
</div>
<div class="amount-label">
<div class="amount">{{displayAmount}} <span class="unit">{{displayUnit}}</span></div>
<div class="alternative">{{btx.alternativeAmountStr}}</div>
<div class="alternative" ng-click="getFiatRate(); showRate = !showRate">
<span ng-show="!showRate">{{btx.alternativeAmountStr}}</span>
<span ng-show="showRate">
<span ng-show="!loadingRate">{{rateStr}} ({{rateDate | amDateFormat:'MM/DD/YYYY HH:mm a'}})</span>
<span ng-show="loadingRate">...</span>
</span>
</div>
</div>
</div>
<div class="info">