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

Merge pull request #488 from cmgustavo/bug/bitpay-card-flash-get-started

Browse source 
Bug/bitpay card Get Started message
This commit is contained in:
Matias Alejo Garcia 2016-10-17 11:09:53 -03:00 • committed by GitHub
commit b48438be8c
5 changed files with 59 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

31
www/views/bitpayCard.html
View file

@ -39,22 +39,25 @@
</div>
<div
class="m10t text-center padding"
ng-if="!loadingHistory && !bitpayCard.bitpayCardTransactionHistory[0] && !error">
class="m10t text-center padding ng-hide"
ng-show="bitpayCard.getStarted">
<i class="icon ion-ios-arrow-thin-up size-24"></i>
<h1>Get started</h1>
<h4>Your BitPay Card is ready. Add funds to your card to start using your card at stores and ATMs worldwide.</h4>
</div>
<div class="list" ng-if="bitpayCard.bitpayCardTransactionHistory[0] && !error">
<div class="item item-divider">
<select class="select-style" ng-model="dateRange.value" ng-change="bitpayCard.update()">
<option value="last30Days">Recent Activity</option>
<option value="lastMonth">Last Month</option>
<option value="all">All Activity</option>
</select>
</div>
<div
<div class="list" ng-show="!bitpayCard.getStarted">
<label class="item item-input item-select">
<div class="input-label" translate>
Activity
</div>
<select ng-model="dateRange.value" ng-change="bitpayCard.update()">
<option value="last30Days" selected translate>Recent</option>
<option value="lastMonth" translate>Last Month</option>
<option value="all" translate>All</option>
</select>
</label>
<div ng-if="bitpayCard.bitpayCardTransactionHistory[0]"
ng-repeat="tx in bitpayCard.bitpayCardTransactionHistory | orderBy: ['pending','-timestamp']"
class="item row">
<div class="col col-10">
@ -74,18 +77,18 @@
{{tx.desc}}
</div>
-->
<div class="col col-20 text-center p10t">
<div class="col col-10 text-center p10t">
<img ng-show="!tx.pending" ng-src="img/check.svg" width="14">
<img ng-show="tx.pending" ng-src="img/sync.svg" width="14">
</div>
<div class="col col-20 text-right size-12 text-gray">
<div class="col text-right size-12 text-gray">
<div class="size-14"
ng-class="{
'text-success': tx.amount.indexOf('-') == -1 && !tx.pending,
'text-gray': tx.amount.indexOf('-') == -1 && tx.pending}">
{{tx.amount | currency:'$':2 }}
</div>
<time ng-if="!tx.pending">{{tx.timestamp | amCalendar}}</time>
<time ng-if="!tx.pending">{{tx.timestamp | amTimeAgo}}</time>
<span ng-if="tx.pending" class="tu" translate>Pending</span>
</div>
</div>

2
www/views/tab-home.html
View file

@ -109,7 +109,7 @@
<div class="bg icon-bitpay-card"></div>
</i>
<h2>BitPay Visa&reg; Card</h2>
<p translate>Add your cards</p>
<p translate>Add your card</p>
<i class="icon bp-arrow-right"></i>
</a>
</div>