anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Fix cache for activity, addressbook, amazon, proposals

Browse source
This commit is contained in:
Gustavo Maximiliano Cortez 2016-09-22 01:47:39 -03:00
commit 9cb0dc128c
No known key found for this signature in database
GPG key ID: 15EDAD8D9F2EB1AF
9 changed files with 68 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

40
src/js/controllers/activity.js
View file

@ -3,12 +3,12 @@
angular.module('copayApp.controllers').controller('activityController',
function($timeout, $scope, $log, $ionicModal, lodash, txpModalService, profileService, walletService, ongoingProcess, popupService, gettextCatalog) {
$scope.openTxpModal = txpModalService.open;
$scope.fetchingNotifications = true;
$scope.init = function() {
$scope.fetchingNotifications = true;
$scope.$on("$ionicView.enter", function(event, data){
profileService.getNotifications(50, function(err, n) {
if (err) {
console.log('[tab-home.js.35:err:]', $log.error(err)); //TODO
$log.error(err);
return;
}
$scope.fetchingNotifications = false;
@ -22,7 +22,7 @@ angular.module('copayApp.controllers').controller('activityController',
});
});
});
};
});
$scope.openNotificationModal = function(n) {
if (n.txid) {
@ -33,8 +33,16 @@ angular.module('copayApp.controllers').controller('activityController',
});
if (txp) txpModalService.open(txp);
else {
$log.warn('No txp found');
return popupService.showAlert(null, gettextCatalog.getString('Transaction not found'));
ongoingProcess.set('loadingTxInfo', true);
walletService.getTxp(n.wallet, n.txpId, function(err, txp) {
var _txp = txp;
ongoingProcess.set('loadingTxInfo', false);
if (err) {
$log.warn('No txp found');
return popupService.showAlert(null, gettextCatalog.getString('Transaction not found'));
}
txpModalService.open(_txp);
});
}
}
};
@ -56,18 +64,18 @@ angular.module('copayApp.controllers').controller('activityController',
return popupService.showAlert(null, gettextCatalog.getString('Transaction not found'));
}
walletService.getTxNote(wallet, n.txid, function(err, note) {
if (err) $log.debug(gettextCatalog.getString('Could not fetch transaction note'));
$scope.wallet = wallet;
$scope.btx = lodash.cloneDeep(tx);
$ionicModal.fromTemplateUrl('views/modals/tx-details.html', {
scope: $scope
}).then(function(modal) {
$scope.txDetailsModal = modal;
$scope.txDetailsModal.show();
});
$scope.wallet = wallet;
$scope.btx = lodash.cloneDeep(tx);
walletService.getTxNote(wallet, n.txid, function(err, note) {
if (err) $log.debug('Could not fetch transaction note');
$scope.btx.note = note;
$ionicModal.fromTemplateUrl('views/modals/tx-details.html', {
scope: $scope
}).then(function(modal) {
$scope.txDetailsModal = modal;
$scope.txDetailsModal.show();
});
});
});
};