mirror of https://github.com/BTCPrivate/copay.git
This commit is contained in:
parent
ac68106cbf
commit
8bcb332276
|
@ -105,23 +105,20 @@ angular.module('copayApp.controllers').controller('tabHomeController',
|
|||
|
||||
$log.debug('Updating wallet:'+ wallet.name)
|
||||
walletService.getStatus(wallet, {}, function(err, status) {
|
||||
console.log('[tab-home.js.107:status:]',status); //TODO
|
||||
if (err) {
|
||||
console.log('[tab-home.js.35:err:]', $log.error(err)); //TODO
|
||||
return;
|
||||
}
|
||||
if (status.pendingTxps && status.pendingTxps[0]) {
|
||||
|
||||
console.log('[tab-home.js.113]', status.pendingTxps); //TODO
|
||||
var txps = lodash.filter($scope.txps, function(x) {
|
||||
return x.walletId != wallet.id;
|
||||
});
|
||||
txps = txps.concat(status.pendingTxps);
|
||||
txps = formatPendingTxps(txps);
|
||||
console.log('[tab-home.js.120:txps:]',txps); //TODO
|
||||
setPendingTxps(txps);
|
||||
}
|
||||
wallet.status = status;
|
||||
$scope.$apply();
|
||||
});
|
||||
};
|
||||
|
||||
|
|
|
@ -71,8 +71,9 @@ angular.module('copayApp.services')
|
|||
walletId, wallet.credentials.walletName);
|
||||
|
||||
|
||||
if (wallet.cacheStatus)
|
||||
wallet.cacheStatus.isValid = false;
|
||||
// TODO (put this in wallet ViewModel)
|
||||
if (wallet.cachedStatus)
|
||||
wallet.cachedStatus.isValid = false;
|
||||
|
||||
if (wallet.completeHistory)
|
||||
wallet.completeHistory.isValid = false;
|
||||
|
|
|
@ -114,12 +114,12 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
|
|||
|
||||
|
||||
root.invalidateCache = function(wallet) {
|
||||
if (wallet.cacheStatus) {
|
||||
wallet.cacheStatus.isValid = false;
|
||||
if (wallet.cachedStatus) {
|
||||
wallet.cachedStatus.isValid = false;
|
||||
}
|
||||
|
||||
if (wallet.cacheHistory) {
|
||||
wallet.cacheHistory.isValid = false;
|
||||
if (wallet.completeHistory) {
|
||||
wallet.completeHistory.isValid = false;
|
||||
}
|
||||
};
|
||||
|
||||
|
@ -214,7 +214,11 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
|
|||
};
|
||||
|
||||
function _getStatus(initStatusHash, tries, cb) {
|
||||
if (isStatusCached() && !opts.force) return cb(null, wallet.cachedStatus);
|
||||
if (isStatusCached() && !opts.force) {
|
||||
$log.debug('Wallet status cache hit:' + wallet.id);
|
||||
|
||||
return cb(null, wallet.cachedStatus);
|
||||
};
|
||||
|
||||
tries = tries || 0;
|
||||
|
||||
|
|
Loading…
Reference in New Issue