BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #4015 from bitpay/revert-4014-fix/countdown-paypro 

Revert "fix remaining time paypro"
This commit is contained in:
Matias Alejo Garcia 2016-03-22 15:40:18 -03:00
parent b1e385e247 bd2b49dd46
commit e8a4a1e567
2 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
public/views/walletHome.html
View File

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

26
src/js/controllers/walletHome.js
View File

@ -1107,24 +1107,26 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
}, 1); }, 1);
}; };
function _paymentTimeControl(expirationTime) { function _paymentTimeControl(timeToExpire) {
var countDown; var now = Math.floor(Date.now() / 1000);
setEpirationTime();
countDown = $interval(function() {
setEpirationTime();
}, 1000);
function setEpirationTime() { if (timeToExpire <= now) {
if (moment().isAfter(expirationTime * 1000)) { setExpiredPaymentValues();
return;
}
self.timeToExpire = timeToExpire;
var countDown = $interval(function() {
if (self.timeToExpire <= now) {
setExpiredPaymentValues(); setExpiredPaymentValues();
if (countDown) $interval.cancel(countDown); $interval.cancel(countDown);
} }
self.remainingTimeStr = moment(expirationTime * 1000).fromNow(); self.timeToExpire--;
}; }, 1000);
function setExpiredPaymentValues() { function setExpiredPaymentValues() {
self.paymentExpired = true; self.paymentExpired = true;
self.remainingTimeStr = null; self.timeToExpire = null;
self._paypro = null; self._paypro = null;
self.error = gettext('Cannot sign: The payment request has expired'); self.error = gettext('Cannot sign: The payment request has expired');
}; };