From 0ae6f043edf2a457a754b80eced5ba6500b7087c Mon Sep 17 00:00:00 2001 From: Sebastiaan Pasma Date: Wed, 15 Aug 2018 17:23:00 +0200 Subject: [PATCH 01/15] loading new txs using pagination --- src/js/controllers/walletDetails.js | 13 +++- src/js/services/walletService.js | 103 +++++++++++++++++++++++++--- www/views/walletDetails.html | 2 +- 3 files changed, 105 insertions(+), 13 deletions(-) diff --git a/src/js/controllers/walletDetails.js b/src/js/controllers/walletDetails.js index ec787a5f4..68d26baf2 100644 --- a/src/js/controllers/walletDetails.js +++ b/src/js/controllers/walletDetails.js @@ -256,11 +256,18 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun return !tx.confirmations || tx.confirmations === 0; }; + var loadingTxs = false; $scope.showMore = function() { + if (loadingTxs) + return; + loadingTxs = true; $timeout(function() { - currentTxHistoryPage++; - $scope.showHistory(); - $scope.$broadcast('scroll.infiniteScrollComplete'); + walletService.getMoreTxs($scope.wallet, function() { + currentTxHistoryPage++; + $scope.showHistory(); + $scope.$broadcast('scroll.infiniteScrollComplete'); + loadingTxs = false; + }); }, 100); }; diff --git a/src/js/services/walletService.js b/src/js/services/walletService.js index 647c69734..4d293a01f 100644 --- a/src/js/services/walletService.js +++ b/src/js/services/walletService.js @@ -396,6 +396,8 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim return ret; }; + var skipped = 0; + var updateLocalTxHistory = function(wallet, opts, cb) { var FIRST_LIMIT = 5; var LIMIT = 50; @@ -492,6 +494,9 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim } // + shouldContinue = false; + + skipped = skip; if (!shouldContinue) { $log.debug('Finished Sync: New / soft confirmed Txs: ' + newTxs.length); @@ -499,7 +504,6 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim } requestLimit = LIMIT; - getNewTxs(newTxs, skip, next); }); }; @@ -535,6 +539,87 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim }); } + + if (opts.getMoreTxs) { + var requestLimit = LIMIT; + getNewTxs([], skipped, function(err, txs) { + if (err) return cb(err); + + createReceivedEvents(txs); + + var newHistory = lodash.uniq(lodash.compact(txs.concat(confirmedTxs)), function(x) { + return x.txid; + }); + + + function updateNotes(cb2) { + if (!endingTs) return cb2(); + + $log.debug('Syncing notes from: ' + endingTs); + wallet.getTxNotes({ + minTs: endingTs + }, function(err, notes) { + if (err) { + $log.warn(err); + return cb2(); + }; + lodash.each(notes, function(note) { + $log.debug('Note for ' + note.txid); + lodash.each(newHistory, function(tx) { + if (tx.txid == note.txid) { + $log.debug('...updating note for ' + note.txid); + tx.note = note; + } + }); + }); + return cb2(); + }); + } + + function updateLowAmount(txs) { + if (!opts.lowAmount) return; + + lodash.each(txs, function(tx) { + tx.lowAmount = tx.amount < opts.lowAmount; + }); + }; + + updateLowAmount(txs); + + updateNotes(function() { + + // + if (foundLimitTx) { + $log.debug('Tx history read until limitTx: ' + opts.limitTx); + return cb(null, newHistory); + } + // + + var historyToSave = JSON.stringify(newHistory); + + lodash.each(txs, function(tx) { + tx.recent = true; + }) + + $log.debug('Tx History synced. Total Txs: ' + newHistory.length); + + // Final update + if (walletId == wallet.credentials.walletId) { + wallet.completeHistory = newHistory; + } + + return storageService.setTxHistory(historyToSave, walletId, function() { + $log.debug('Tx History saved.'); + + return cb(); + }); + }); + }); + return; + } + + skipped = 0; + getNewTxs([], 0, function(err, txs) { if (err) return cb(err); @@ -611,6 +696,12 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim }); }; + root.getMoreTxs = function(wallet, cb) { + var opts = {}; + opts.getMoreTxs = true; + updateLocalTxHistory(wallet, opts, cb); + }; + root.getTxNote = function(wallet, txid, cb) { wallet.getTxNote({ txid: txid @@ -675,16 +766,10 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim root.getTxHistory = function(wallet, opts, cb) { opts = opts || {}; - var walletId = wallet.credentials.walletId; - if (!wallet.isComplete()) return cb(); - function isHistoryCached() { - return wallet.completeHistory && wallet.completeHistory.isValid; - }; - - // disable caching - //if (isHistoryCached() && !opts.force) return cb(null, wallet.completeHistory); + // var historyIsCached = wallet.completeHistory && wallet.completeHistory.isValid; + // if (historyIsCached && !opts.force) return cb(null, wallet.completeHistory); $log.debug('Updating Transaction History'); diff --git a/www/views/walletDetails.html b/www/views/walletDetails.html index 6e05862aa..fc422ff1f 100644 --- a/www/views/walletDetails.html +++ b/www/views/walletDetails.html @@ -306,7 +306,7 @@ From 93b6c3f1be5fbf345c3628a0a9d64193e8154e57 Mon Sep 17 00:00:00 2001 From: Brendon Duncan Date: Thu, 16 Aug 2018 15:00:51 +1200 Subject: [PATCH 02/15] Spinner same size as refresh button. --- src/sass/views/walletDetails.scss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/sass/views/walletDetails.scss b/src/sass/views/walletDetails.scss index 858229d85..39118320b 100644 --- a/src/sass/views/walletDetails.scss +++ b/src/sass/views/walletDetails.scss @@ -341,4 +341,6 @@ a.item { .loading-wallet svg { margin-top: 0; + width: 16px; + height: 16px; } \ No newline at end of file From 33d780f2e561f1681a9a1db7fd4377a2406814a3 Mon Sep 17 00:00:00 2001 From: Brendon Duncan Date: Thu, 16 Aug 2018 15:44:59 +1200 Subject: [PATCH 03/15] The spinner in wallet details now spins when the infinite scroll spinner spins. --- src/js/controllers/walletDetails.js | 46 +++++++++++++++++++++++------ www/views/includes/walletInfo.html | 4 +-- www/views/walletDetails.html | 10 +++---- 3 files changed, 44 insertions(+), 16 deletions(-) diff --git a/src/js/controllers/walletDetails.js b/src/js/controllers/walletDetails.js index 68d26baf2..171c71847 100644 --- a/src/js/controllers/walletDetails.js +++ b/src/js/controllers/walletDetails.js @@ -5,12 +5,39 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun var HISTORY_SHOW_LIMIT = 10; var currentTxHistoryPage = 0; var listeners = []; - $scope.txps = []; + + // For gradual migration for doing it properly + $scope.vm = { + gettingInitialHistory: false, + updatingTxHistory: false + }; + + $scope.amountIsCollapsible = false; + $scope.color = '#888888'; $scope.completeTxHistory = []; - $scope.openTxpModal = txpModalService.open; + $scope.filteredTxHistory = []; $scope.isCordova = platformInfo.isCordova; $scope.isAndroid = platformInfo.isAndroid; $scope.isIOS = platformInfo.isIOS; + $scope.isSearching = false; + $scope.openTxpModal = txpModalService.open; + $scope.requiresMultipleSignatures = false; + $scope.showBalanceButton = false; + $scope.status = null; + $scope.txHistory = []; + $scope.txHistorySearchResults = []; + $scope.txHistoryShowMore = false; + $scope.txps = []; + $scope.updatingStatus = false; + $scope.updateStatusError = null; + $scope.updateTxHistoryError = null; + $scope.updatingTxHistoryProgress = 0; + $scope.wallet = null; + $scope.walletId = ''; + $scope.walletNotRegistered = false; + + + var channel = "ga"; if (platformInfo.isCordova) { @@ -172,7 +199,7 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun walletService.getTxHistory($scope.wallet, { feeLevels: levels }, function(err, txHistory) { - $scope.updatingTxHistory = false; + $scope.vm.gettingInitialHistory = false; if (err) { $scope.txHistory = null; $scope.updateTxHistoryError = true; @@ -256,17 +283,18 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun return !tx.confirmations || tx.confirmations === 0; }; - var loadingTxs = false; + $scope.showMore = function() { - if (loadingTxs) + if ($scope.vm.updatingTxHistory) { return; - loadingTxs = true; + } + $scope.vm.updatingTxHistory = true; $timeout(function() { - walletService.getMoreTxs($scope.wallet, function() { + walletService.getMoreTxs($scope.wallet, function onMoreTxs() { currentTxHistoryPage++; $scope.showHistory(); $scope.$broadcast('scroll.infiniteScrollComplete'); - loadingTxs = false; + $scope.vm.updatingTxHistory = false; }); }, 100); }; @@ -400,7 +428,7 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun if (!$scope.wallet) return; $scope.requiresMultipleSignatures = $scope.wallet.credentials.m > 1; - $scope.updatingTxHistory = true; + $scope.vm.gettingInitialHistory = true; addressbookService.list(function(err, ab) { if (err) $log.error(err); diff --git a/www/views/includes/walletInfo.html b/www/views/includes/walletInfo.html index 1680d2c2c..aff10fc09 100644 --- a/www/views/includes/walletInfo.html +++ b/www/views/includes/walletInfo.html @@ -3,8 +3,8 @@ Tap to recreate Tap to retry -↻ -