diff --git a/public/views/walletHome.html b/public/views/walletHome.html
index d62f1c9df..52e7eae8f 100644
--- a/public/views/walletHome.html
+++ b/public/views/walletHome.html
@@ -220,8 +220,8 @@
-
-
+
+
+
-
diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index 3d301b4b5..b178ac625 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -373,7 +373,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
self.setSpendUnconfirmed = function(spendUnconfirmed) {
self.spendUnconfirmed = spendUnconfirmed || configService.getSync().wallet.spendUnconfirmed;
- };
+ };
self.updateBalance = function() {
var fc = profileService.focusedClient;
@@ -778,10 +778,11 @@ angular.module('copayApp.controllers').controller('indexController', function($r
});
};
- self.removeSoftConfirmedTx = function(txs) {
+ self.removeAndMarkSoftConfirmedTx = function(txs) {
return lodash.filter(txs, function(tx) {
if (tx.confirmations >= SOFT_CONFIRMATION_LIMIT)
return tx;
+ tx.recent = true;
});
}
@@ -835,7 +836,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
fixTxsUnit(txsFromLocal);
- var confirmedTxs = self.removeSoftConfirmedTx(txsFromLocal);
+ var confirmedTxs = self.removeAndMarkSoftConfirmedTx(txsFromLocal);
var endingTxid = confirmedTxs[0] ? confirmedTxs[0].txid : null;
@@ -845,9 +846,9 @@ angular.module('copayApp.controllers').controller('indexController', function($r
self.setCompactTxHistory();
}
- if (historyUpdateInProgress[walletId])
+ if (historyUpdateInProgress[walletId])
return;
-
+
historyUpdateInProgress[walletId] = true;
function getNewTxs(newTxs, skip, i_cb) {
@@ -861,7 +862,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
if (!shouldContinue) {
newTxs = self.processNewTxs(newTxs);
- $log.debug('Finish Sync: New Txs: ' + newTxs.length);
+ $log.debug('Finished Sync: New / soft confirmed Txs: ' + newTxs.length);
return i_cb(null, newTxs);
}
@@ -889,6 +890,12 @@ angular.module('copayApp.controllers').controller('indexController', function($r
if (err) return cb(err);
var newHistory = lodash.compact(txs.concat(confirmedTxs));
+ var historyToSave = JSON.stringify(newHistory);
+
+ lodash.each(txs, function(tx) {
+ tx.recent = true;
+ })
+
$log.debug('Tx History synced. Total Txs: ' + newHistory.length);
// Final update
@@ -897,7 +904,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
self.setCompactTxHistory();
}
- return storageService.setTxHistory(JSON.stringify(newHistory), walletId, function() {
+ return storageService.setTxHistory(historyToSave, walletId, function() {
$log.debug('Tx History saved.');
return cb();