BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #230 from cmgustavo/ref/design-64 

Fix walletDetails getHistory
This commit is contained in:
Gustavo Maximiliano Cortez 2016-09-30 17:14:03 -03:00 committed by GitHub
parent 05059638f7 5ec82cd8ef
commit 7fb2113c86
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/views/walletDetails.html
View File

@ -111,7 +111,7 @@
No transactions yet
</div>
<div ng-show="updatingTxHistory" class="updatingHistory">
<div ng-show="updatingTxHistory && updatingTxHistoryProgress>5" class="updatingHistory">
<div class="row" >
<ion-spinner class="spinner-dark" icon="lines"></ion-spinner>
</div>

7
src/js/controllers/walletDetails.js
View File

@ -118,10 +118,13 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
$scope.updateTxHistoryError = false;
$scope.updatingTxHistoryProgress = 0;
var progressFn = function(txs) {
$scope.updatingTxHistoryProgress = txs ? txs.length : 0;
var progressFn = function(txs, newTxs) {
$scope.updatingTxHistoryProgress = newTxs;
$scope.completeTxHistory = txs;
$scope.showHistory();
$timeout(function() {
$scope.$apply();
});
};
$timeout(function() {

4
src/js/services/walletService.js
View File

@ -422,7 +422,7 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
var endingTs = confirmedTxs[0] ? confirmedTxs[0].time : null;
// First update
progressFn(txsFromLocal);
progressFn(txsFromLocal, 0);
wallet.completeHistory = txsFromLocal;
function getNewTxs(newTxs, skip, cb) {
@ -431,7 +431,7 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
newTxs = newTxs.concat(processNewTxs(wallet, lodash.compact(res)));
progressFn(newTxs.concat(txsFromLocal));
progressFn(newTxs.concat(txsFromLocal), newTxs.length);
skip = skip + requestLimit;