From 66c9cefb0c539ed1817b3ecb7674082a5eb9f924 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Dominguez <jb@bitcoin.com>
Date: Fri, 3 Aug 2018 01:15:54 +0900
Subject: [PATCH 1/2] Fix the tx history

---
 src/js/services/walletService.js | 42 +++++++++++++++++++++++++-------
 1 file changed, 33 insertions(+), 9 deletions(-)

diff --git a/src/js/services/walletService.js b/src/js/services/walletService.js
index 774fa0906..7ea98600f 100644
--- a/src/js/services/walletService.js
+++ b/src/js/services/walletService.js
@@ -343,21 +343,23 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
       if (err) return cb(err);
 
       if (!txsFromServer.length)
-        return cb();
+        return cb(null, []);
 
-      var res = lodash.takeWhile(txsFromServer, function(tx) {
+      /*var res = lodash.takeWhile(txsFromServer, function(tx) {
         return tx.txid != endingTxid;
-      });
+      });*/
 
-      return cb(null, res, res.length >= limit);
+      return cb(null, txsFromServer);
     });
   };
 
   var removeAndMarkSoftConfirmedTx = function(txs) {
     return lodash.filter(txs, function(tx) {
-      if (tx.confirmations >= root.SOFT_CONFIRMATION_LIMIT)
-        return tx;
-      tx.recent = true;
+      var isConfirm = (tx.confirmations >= root.SOFT_CONFIRMATION_LIMIT);
+      if (!isConfirm) {
+        tx.recent = true;
+      }
+      return isConfirm;
     });
   }
 
@@ -437,12 +439,14 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
       var endingTxid = confirmedTxs[0] ? confirmedTxs[0].txid : null;
       var endingTs = confirmedTxs[0] ? confirmedTxs[0].time : null;
 
+      $log.debug('Confirmed TXs. Got:' + confirmedTxs.length + '/' + txsFromLocal.length);
+
       // First update
       progressFn(txsFromLocal, 0);
       wallet.completeHistory = txsFromLocal;
 
       function getNewTxs(newTxs, skip, next) {
-        getTxsFromServer(wallet, skip, endingTxid, requestLimit, function(err, res, shouldContinue) {
+        getTxsFromServer(wallet, skip, endingTxid, requestLimit, function(err, res) {
           if (err) {
             $log.warn(bwcError.msg(err, 'Server Error')); //TODO
             if (err instanceof errors.CONNECTION_ERROR || (err.message && err.message.match(/5../))) {
@@ -454,7 +458,27 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
             return next(err);
           }
 
-          newTxs = newTxs.concat(processNewTxs(wallet, lodash.compact(res)));
+          // Check if new txs are founds, if yes, lets investigate in the 50 next
+          // To be sure we are not missing txs by order (maybe a new tx is after the "endingTxid"
+
+          var newDiscoveredTxs = res.filter(function (x) {
+            return confirmedTxs.filter(function (confX) {
+              return confX.txid == x.txid;
+            }).length == 0;
+          });
+
+          $log.debug('Discovering TXs. Got:' + newDiscoveredTxs.length);
+
+          /*var newDiscoveredTxs = lodash.uniq(lodash.union(res, newTxs), function(x) {
+            return x.txid;
+          });*/
+
+          var shouldContinue = newDiscoveredTxs.length > 0;
+
+          // If no new tx, no need to check
+          if (shouldContinue) {
+            newTxs = newTxs.concat(processNewTxs(wallet, lodash.compact(newDiscoveredTxs)));
+          }
 
           progressFn(newTxs.concat(txsFromLocal), newTxs.length);
 

From 9c8ec7d3a21f890d73ac18dc84a82e76c99266fe Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Dominguez <jb@bitcoin.com>
Date: Fri, 3 Aug 2018 01:17:01 +0900
Subject: [PATCH 2/2] Fix tx history

---
 src/js/services/walletService.js | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/js/services/walletService.js b/src/js/services/walletService.js
index 7ea98600f..cb04ffbe3 100644
--- a/src/js/services/walletService.js
+++ b/src/js/services/walletService.js
@@ -345,10 +345,6 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
       if (!txsFromServer.length)
         return cb(null, []);
 
-      /*var res = lodash.takeWhile(txsFromServer, function(tx) {
-        return tx.txid != endingTxid;
-      });*/
-
       return cb(null, txsFromServer);
     });
   };
@@ -459,8 +455,7 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
           }
 
           // Check if new txs are founds, if yes, lets investigate in the 50 next
-          // To be sure we are not missing txs by order (maybe a new tx is after the "endingTxid"
-
+          // To be sure we are not missing txs by sorting (maybe a new tx is after the "endingTxid"
           var newDiscoveredTxs = res.filter(function (x) {
             return confirmedTxs.filter(function (confX) {
               return confX.txid == x.txid;
@@ -469,10 +464,6 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
 
           $log.debug('Discovering TXs. Got:' + newDiscoveredTxs.length);
 
-          /*var newDiscoveredTxs = lodash.uniq(lodash.union(res, newTxs), function(x) {
-            return x.txid;
-          });*/
-
           var shouldContinue = newDiscoveredTxs.length > 0;
 
           // If no new tx, no need to check