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

refactor time to expire control

Browse source
This commit is contained in:
Javier 2016-02-10 18:26:30 -03:00
commit 256f7218d7
1 changed files with 21 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/js/controllers/walletHome.js
View file

@ -1,6 +1,6 @@
'use strict'; 'use strict';
angular.module('copayApp.controllers').controller('walletHomeController', function($scope, $rootScope, $interval, $timeout, $filter, $modal, $log, notification, txStatus, isCordova, isMobile, profileService, lodash, configService, rateService, storageService, bitcore, isChromeApp, gettext, gettextCatalog, nodeWebkit, addressService, ledger, bwsError, confirmDialog, txFormatService, animationService, addressbookService, go, feeService, txSignService) { angular.module('copayApp.controllers').controller('walletHomeController', function($scope, $rootScope, $interval, $timeout, $filter, $modal, $log, notification, txStatus, isCordova, isMobile, profileService, lodash, configService, rateService, storageService, bitcore, isChromeApp, gettext, gettextCatalog, nodeWebkit, addressService, ledger, bwsError, confirmDialog, txFormatService, animationService, addressbookService, go, feeService) {
var self = this; var self = this;
window.ignoreMobilePause = false; window.ignoreMobilePause = false;
@ -1084,26 +1084,37 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
self._paypro = paypro; self._paypro = paypro;
self.setForm(paypro.toAddress, (paypro.amount * satToUnit).toFixed(self.unitDecimals), paypro.memo); self.setForm(paypro.toAddress, (paypro.amount * satToUnit).toFixed(self.unitDecimals), paypro.memo);
_countDownPaymentTime(paypro.expires); _paymentTimeControl(paypro.expires);
return cb(); return cb();
}); });
}, 1); }, 1);
}; };
function _countDownPaymentTime(time) { function _paymentTimeControl(timeToExpire) {
self.usePaypro = true; self.usePaypro = true;
var now = Math.floor(Date.now() / 1000);
if (timeToExpire <= now) {
setExpiredPaymentValues();
return;
}
self.paymentExpired = false; self.paymentExpired = false;
self.timeToExpire = time; self.timeToExpire = timeToExpire;
var countDown = $interval(function() { var countDown = $interval(function() {
if (self.timeToExpire <= Math.floor(Date.now() / 1000)) { if (self.timeToExpire <= now) {
self.paymentExpired = true; setExpiredPaymentValues();
self.timeToExpire = null;
self._paypro = null;
self.error = gettext('Cannot sign: The payment request has expired');
$interval.cancel(countDown); $interval.cancel(countDown);
} }
self.timeToExpire--; self.timeToExpire --;
}, 1000); }, 1000);
function setExpiredPaymentValues() {
self.paymentExpired = true;
self.timeToExpire = null;
self._paypro = null;
self.error = gettext('Cannot sign: The payment request has expired');
};
}; };
this.setFromUri = function(uri) { this.setFromUri = function(uri) {