From 4ffd6bd3517c7b2c32cba8628cbbf2ceb8e517cd Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Mon, 13 Jul 2015 13:31:05 -0300
Subject: [PATCH] fix future times

---
 src/js/controllers/index.js      | 11 ++++++-----
 src/js/controllers/walletHome.js | 16 ----------------
 2 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index 66fc83553..5787c5f81 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -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) {
diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js
index 618070537..a50009ff6 100644
--- a/src/js/controllers/walletHome.js
+++ b/src/js/controllers/walletHome.js
@@ -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;