Merge pull request #216 from gabrielbazan7/fix/recentTrans

experimental feature disabled by default
This commit is contained in:
Gustavo Maximiliano Cortez 2016-09-29 12:08:51 -03:00 committed by GitHub
commit c305c10374
2 changed files with 6 additions and 4 deletions

View File

@ -117,6 +117,7 @@ angular.module('copayApp.controllers').controller('tabHomeController',
}); });
}); });
if (!$scope.recentTransactionsEnabled) return;
$scope.fetchingNotifications = true; $scope.fetchingNotifications = true;
profileService.getNotifications({ profileService.getNotifications({
limit: 3 limit: 3
@ -144,6 +145,9 @@ angular.module('copayApp.controllers').controller('tabHomeController',
return; return;
} }
wallet.status = status; wallet.status = status;
updateTxps();
if (!$scope.recentTransactionsEnabled) return;
$scope.fetchingNotifications = true; $scope.fetchingNotifications = true;
profileService.getNotifications({ profileService.getNotifications({
@ -155,8 +159,6 @@ angular.module('copayApp.controllers').controller('tabHomeController',
return; return;
} }
$scope.notifications = notifications; $scope.notifications = notifications;
updateTxps();
}) })
}); });
}; };
@ -208,7 +210,7 @@ angular.module('copayApp.controllers').controller('tabHomeController',
var bitpayCardCache = function() { var bitpayCardCache = function() {
bitpayCardService.getCacheData(function(err, data) { bitpayCardService.getCacheData(function(err, data) {
if (err || lodash.isEmpty(data)) return; if (err ||  lodash.isEmpty(data)) return;
$scope.bitpayCard = data; $scope.bitpayCard = data;
}); });
}; };

View File

@ -54,7 +54,7 @@ angular.module('copayApp.services').factory('configService', function(storageSer
//Experimental Features //Experimental Features
recentTransactions: { recentTransactions: {
enabled: true enabled: false //disabled by default
}, },
frequentlyUsed: { frequentlyUsed: {