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

fix remaining time

This commit is contained in:
Javier 2016-03-22 15:26:16 -03:00
parent 5febc0d704
commit 8d427c5849
2 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/views/walletHome.html
View File

@ -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.timeToExpire * 1000 | amTimeAgo}}</time> <time>{{home.remainingTimeStr}}</time>
</div> </div>
</h4> </h4>
<div class="camera-icon" ng-show="index.isComplete"> <div class="camera-icon" ng-show="index.isComplete">

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

@ -1107,26 +1107,24 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
}, 1); }, 1);
}; };
function _paymentTimeControl(timeToExpire) { function _paymentTimeControl(expirationTime) {
var now = Math.floor(Date.now() / 1000); var countDown;
setEpirationTime();
if (timeToExpire <= now) { countDown = $interval(function() {
setExpiredPaymentValues(); setEpirationTime();
return;
}
self.timeToExpire = timeToExpire;
var countDown = $interval(function() {
if (self.timeToExpire <= now) {
setExpiredPaymentValues();
$interval.cancel(countDown);
}
self.timeToExpire--;
}, 1000); }, 1000);
function setEpirationTime() {
if (moment().isAfter(expirationTime * 1000)) {
setExpiredPaymentValues();
if (countDown) $interval.cancel(countDown);
}
self.remainingTimeStr = moment(expirationTime * 1000).fromNow();
};
function setExpiredPaymentValues() { function setExpiredPaymentValues() {
self.paymentExpired = true; self.paymentExpired = true;
self.timeToExpire = null; self.remainingTimeStr = 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');
}; };