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

Merge remote-tracking branch 'origin/wallet/sprint/22' into wallet/task/497

Browse source
This commit is contained in:
Sebastiaan Pasma 2018-10-02 14:37:51 +02:00
commit 26674447e1
No known key found for this signature in database
GPG key ID: 9A2B0C8B95A1D26F
27 changed files with 2493 additions and 1115 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/js/controllers/wallet-details.controller.js
View file

@ -216,6 +216,7 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
function updateTxHistoryFromCachedData() {
$scope.vm.gettingCachedHistory = true;
walletHistoryService.getCachedTxHistory($scope.wallet.id, function onGetCachedTxHistory(err, txHistory){
$scope.vm.gettingCachedHistory = false;
if (err) {
@ -413,8 +414,9 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
var refreshInterval;
$scope.$on("$ionicView.afterEnter", function(event, data) {
$scope.updateAll();
$scope.$on("$ionicView.afterEnter", function onAfterEnter(event, data) {
updateTxHistoryFromCachedData();
$scope.updateAll(true, true);
// refreshAmountSection();
refreshInterval = $interval($scope.onRefresh, 10 * 1000);
$timeout(function() {