mirror of https://github.com/BTCPrivate/copay.git
fix future times
This commit is contained in:
parent
460b65d9ea
commit
4ffd6bd351
|
@ -433,14 +433,15 @@ angular.module('copayApp.controllers').controller('indexController', function($r
|
|||
};
|
||||
|
||||
self.setTxHistory = function(txs) {
|
||||
var now = new Date();
|
||||
var now = Math.floor(Date.now() / 1000);
|
||||
var c = 0;
|
||||
self.txHistoryPaging = txs[self.limitHistory] ? true : false;
|
||||
lodash.each(txs, function(tx) {
|
||||
tx.ts = tx.minedTs || tx.sentTs;
|
||||
// no future transaction...
|
||||
if (tx.ts > now)
|
||||
ts.ts = now;
|
||||
|
||||
// no future transactions...
|
||||
if (tx.time > now)
|
||||
tx.time = now;
|
||||
|
||||
tx.rateTs = Math.floor((tx.ts || now) / 1000);
|
||||
tx.amountStr = profileService.formatAmount(tx.amount); //$filter('noFractionNumber')(
|
||||
if (c < self.limitHistory) {
|
||||
|
|
|
@ -959,22 +959,6 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
|
|||
return this.alternativeIsoCode;
|
||||
};
|
||||
|
||||
this._addRates = function(txs, cb) {
|
||||
if (!txs || txs.length == 0) return cb();
|
||||
var index = lodash.groupBy(txs, 'rateTs');
|
||||
|
||||
rateService.getHistoricRates(config.alternativeIsoCode, lodash.keys(index), function(err, res) {
|
||||
if (err || !res) return cb(err);
|
||||
lodash.each(res, function(r) {
|
||||
lodash.each(index[r.ts], function(tx) {
|
||||
var alternativeAmount = (r.rate != null ? tx.amount * rateService.SAT_TO_BTC * r.rate : null);
|
||||
tx.alternativeAmount = alternativeAmount ? $filter('noFractionNumber')(alternativeAmount, 2) : null;
|
||||
});
|
||||
});
|
||||
return cb();
|
||||
});
|
||||
};
|
||||
|
||||
this.openTxModal = function(btx) {
|
||||
var self = this;
|
||||
var fc = profileService.focusedClient;
|
||||
|
|
Loading…
Reference in New Issue