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

Merge pull request #223 from isocolsky/fix/txhistory-cache 

Fix history refresh
This commit is contained in:
Gustavo Maximiliano Cortez 2016-09-30 11:34:29 -03:00 committed by GitHub
parent 2cdd8df4eb 968dea6eb1
commit 96dbd563d3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -171,7 +171,7 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
});
};
$scope.$on("$ionicView.beforeEnter", function(event, data){
$scope.$on("$ionicView.beforeEnter", function(event, data) {
$scope.wallet = profileService.getWallet(data.stateParams.walletId);
$scope.requiresMultipleSignatures = $scope.wallet.credentials.m > 1;

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

@ -421,8 +421,8 @@ 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;
// First update
progressFn(txsFromLocal);
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);
progressFn(newTxs.concat(txsFromLocal));
skip = skip + requestLimit;