From 210ebf9514dc10ee2c01b8af921cd775e3248240 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Tue, 31 Jan 2017 17:45:19 -0300 Subject: [PATCH] fix refresh --- src/js/controllers/tab-home.js | 4 +++- src/js/controllers/tab-settings.js | 14 +++++--------- www/views/tab-settings.html | 2 +- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/js/controllers/tab-home.js b/src/js/controllers/tab-home.js index ded89466e..35efbf203 100644 --- a/src/js/controllers/tab-home.js +++ b/src/js/controllers/tab-home.js @@ -106,7 +106,9 @@ angular.module('copayApp.controllers').controller('tabHomeController', $scope.recentTransactionsEnabled = config.recentTransactions.enabled; if ($scope.recentTransactionsEnabled) getNotifications(); - if (!config.hideNextSteps.enabled) { + if (config.hideNextSteps.enabled) { + $scope.nextStepsItems = null; + } else { $scope.nextStepsItems = nextStepsService.get(); } diff --git a/src/js/controllers/tab-settings.js b/src/js/controllers/tab-settings.js index d43b4cc6d..98d2b1bf5 100644 --- a/src/js/controllers/tab-settings.js +++ b/src/js/controllers/tab-settings.js @@ -25,15 +25,11 @@ angular.module('copayApp.controllers').controller('tabSettingsController', funct isoCode: config.wallet.settings.alternativeIsoCode }; - // TODO Move this to a generic service, like buyAndSell. - $scope.bitpayCardEnabled = config.bitpayCard.enabled; - - if ($scope.bitpayCardEnabled) { - bitpayCardService.getCards(function(err, cards) { - if (err) $log.error(err); - $scope.bitpayCards = cards && cards.length > 0; - }); - } + // TODO move this to a generic service + bitpayCardService.getCards(function(err, cards) { + if (err) $log.error(err); + $scope.bitpayCards = cards && cards.length > 0; + }); }); }; diff --git a/www/views/tab-settings.html b/www/views/tab-settings.html index f6ec0ddbb..3474e80fd 100644 --- a/www/views/tab-settings.html +++ b/www/views/tab-settings.html @@ -117,7 +117,7 @@