diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js index ea5a36559..4ec000ee4 100644 --- a/src/js/controllers/walletHome.js +++ b/src/js/controllers/walletHome.js @@ -355,11 +355,16 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi }, 1000); function setExpirationTime() { - if (moment().isAfter(expirationTime * 1000)) { + var now = Math.floor(Date.now() / 1000); + if (now > expirationTime) { $scope.paymentExpired = true; if (self.countDown) $interval.cancel(self.countDown); + return; } - $scope.expires = moment(expirationTime * 1000).fromNow(); + var totalSecs = expirationTime - now; + var m = Math.floor(totalSecs / 60); + var s = totalSecs % 60; + $scope.expires = ('0' + m).slice(-2) + ":" + ('0' + s).slice(-2); }; };