From 038a4413d044f3bfcb44e8ee217378f05616e10e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Thu, 27 Oct 2016 11:45:38 -0300 Subject: [PATCH 1/2] fix next steps --- src/js/controllers/tab-home.js | 41 +++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/src/js/controllers/tab-home.js b/src/js/controllers/tab-home.js index 45d00c09b..8b66500de 100644 --- a/src/js/controllers/tab-home.js +++ b/src/js/controllers/tab-home.js @@ -181,13 +181,13 @@ angular.module('copayApp.controllers').controller('tabHomeController', }); }; - var nextStep = function() { - lodash.each(['AmazonGiftCards', 'BitpayCard', 'BuyAndSell'], function(service) { + var nextStep = function(cb) { + var i = 1; + var services = ['AmazonGiftCards', 'BitpayCard', 'BuyAndSell']; + lodash.each(services, function(service) { storageService.getNextStep(service, function(err, value) { $scope.externalServices[service] = value ? true : false; - $timeout(function() { - $ionicScrollDelegate.resize(); - }, 10); + if (i++ == services.length) return cb(); }); }); }; @@ -227,7 +227,6 @@ angular.module('copayApp.controllers').controller('tabHomeController', }; $scope.$on("$ionicView.enter", function(event, data) { - nextStep(); updateAllWallets(); addressbookService.list(function(err, ab) { @@ -248,22 +247,28 @@ angular.module('copayApp.controllers').controller('tabHomeController', ]; configService.whenAvailable(function() { - var config = configService.getSync(); - var isWindowsPhoneApp = platformInfo.isWP && platformInfo.isCordova; + nextStep(function() { + var config = configService.getSync(); + var isWindowsPhoneApp = platformInfo.isWP && platformInfo.isCordova; - $scope.glideraEnabled = config.glidera.enabled && !isWindowsPhoneApp; - $scope.coinbaseEnabled = config.coinbase.enabled && !isWindowsPhoneApp; - $scope.amazonEnabled = config.amazon.enabled; - $scope.bitpayCardEnabled = config.bitpayCard.enabled; + $scope.glideraEnabled = config.glidera.enabled && !isWindowsPhoneApp; + $scope.coinbaseEnabled = config.coinbase.enabled && !isWindowsPhoneApp; + $scope.amazonEnabled = config.amazon.enabled; + $scope.bitpayCardEnabled = config.bitpayCard.enabled; - var buyAndSellEnabled = !$scope.externalServices.BuyAndSell && ($scope.glideraEnabled || $scope.coinbaseEnabled); - var amazonEnabled = !$scope.externalServices.AmazonGiftCards && $scope.amazonEnabled; - var bitpayCardEnabled = !$scope.externalServices.BitpayCard && $scope.bitpayCardEnabled; + var buyAndSellEnabled = !$scope.externalServices.BuyAndSell && ($scope.glideraEnabled || $scope.coinbaseEnabled); + var amazonEnabled = !$scope.externalServices.AmazonGiftCards && $scope.amazonEnabled; + var bitpayCardEnabled = !$scope.externalServices.BitpayCard && $scope.bitpayCardEnabled; - $scope.nextStepEnabled = buyAndSellEnabled || amazonEnabled || bitpayCardEnabled; - $scope.recentTransactionsEnabled = config.recentTransactions.enabled; + $scope.nextStepEnabled = buyAndSellEnabled || amazonEnabled || bitpayCardEnabled; + $scope.recentTransactionsEnabled = config.recentTransactions.enabled; - if ($scope.bitpayCardEnabled) bitpayCardCache(); + if ($scope.bitpayCardEnabled) bitpayCardCache(); + $timeout(function() { + $ionicScrollDelegate.resize(); + $scope.$apply(); + }, 10); + }); }); }); From c5bc1006a9722f32683c4d6d40d0bff2ce0ff7dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Thu, 27 Oct 2016 12:31:28 -0300 Subject: [PATCH 2/2] refactor --- src/js/controllers/tab-home.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/js/controllers/tab-home.js b/src/js/controllers/tab-home.js index 8b66500de..f4b818b49 100644 --- a/src/js/controllers/tab-home.js +++ b/src/js/controllers/tab-home.js @@ -182,12 +182,12 @@ angular.module('copayApp.controllers').controller('tabHomeController', }; var nextStep = function(cb) { - var i = 1; + var i = 0; var services = ['AmazonGiftCards', 'BitpayCard', 'BuyAndSell']; lodash.each(services, function(service) { storageService.getNextStep(service, function(err, value) { $scope.externalServices[service] = value ? true : false; - if (i++ == services.length) return cb(); + if (++i == services.length) return cb(); }); }); };