Fix remaining time paypro

This commit is contained in:
Javier 2016-03-22 16:37:55 -03:00
commit 55dc423db0
3 changed files with 33 additions and 31 deletions

View file

@ -54,7 +54,7 @@
<div class="large-6 medium-6 small-6 columns text-right" ng-show="canSign">
<button class="button primary round expand" ng-click="sign(tx)"
ng-style="{'background-color':color}"
ng-disabled="loading || (paymentExpired && usePaypro)">
ng-disabled="loading || paymentExpired">
<i class="fi-check"></i>
<span translate>Accept</span>
</button>
@ -149,7 +149,7 @@
<li class="line-b p10" ng-if="!paymentExpired">
<span class="text-gray" translate>Expires</span>
<span class="right">
<time>{{expires * 1000 | amTimeAgo }}</time>
<time>{{expires}}</time>
</span>
</li>
<li class="line-b p10">

View file

@ -279,13 +279,13 @@
<a class="text-gray size-12"
ng-show="index.historyShowMore"
ng-click="index.showMore()">
<span translate>Show more</span>
<span translate>Show more</span>
<span ng-if="!index.isSearching">
({{index.completeHistory.length - index.txHistory.length}})
</span>
</span>
<span ng-if="index.isSearching">
({{index.result.length - index.txHistorySearchResults.length}})
</span>
</span>
<i class="icon-arrow-down4"></i>
</a>
</div>
@ -394,7 +394,7 @@
</a>
<div ng-show="!home.paymentExpired && home._paypro">
<span translate>Payment expires</span>
<time> {{home.timeToExpire * 1000 | amTimeAgo}}</time>
<time> {{home.remainingTimeStr}}</time>
</div>
</h4>
<div class="camera-icon" ng-show="index.isComplete">