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

Merge pull request #4930 from gabrielbazan7/fix/nextSteps

Browse source 
fix next steps
This commit is contained in:
Matias Alejo Garcia 2016-10-27 12:35:56 -03:00 • committed by GitHub
commit 070ce0470a
1 changed files with 23 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/js/controllers/tab-home.js
View file

@ -197,13 +197,13 @@ angular.module('copayApp.controllers').controller('tabHomeController',
}); });
}; };
var nextStep = function() { var nextStep = function(cb) {
lodash.each(['AmazonGiftCards', 'BitpayCard', 'BuyAndSell'], function(service) { var i = 0;
var services = ['AmazonGiftCards', 'BitpayCard', 'BuyAndSell'];
lodash.each(services, function(service) {
storageService.getNextStep(service, function(err, value) { storageService.getNextStep(service, function(err, value) {
$scope.externalServices[service] = value ? true : false; $scope.externalServices[service] = value ? true : false;
$timeout(function() { if (++i == services.length) return cb();
$ionicScrollDelegate.resize();
}, 10);
}); });
}); });
}; };
@ -243,7 +243,6 @@ angular.module('copayApp.controllers').controller('tabHomeController',
}; };
$scope.$on("$ionicView.enter", function(event, data) { $scope.$on("$ionicView.enter", function(event, data) {
nextStep();
updateAllWallets(); updateAllWallets();
addressbookService.list(function(err, ab) { addressbookService.list(function(err, ab) {
@ -264,22 +263,28 @@ angular.module('copayApp.controllers').controller('tabHomeController',
]; ];
configService.whenAvailable(function() { configService.whenAvailable(function() {
var config = configService.getSync(); nextStep(function() {
var isWindowsPhoneApp = platformInfo.isWP && platformInfo.isCordova; var config = configService.getSync();
var isWindowsPhoneApp = platformInfo.isWP && platformInfo.isCordova;
$scope.glideraEnabled = config.glidera.enabled && !isWindowsPhoneApp; $scope.glideraEnabled = config.glidera.enabled && !isWindowsPhoneApp;
$scope.coinbaseEnabled = config.coinbase.enabled && !isWindowsPhoneApp; $scope.coinbaseEnabled = config.coinbase.enabled && !isWindowsPhoneApp;
$scope.amazonEnabled = config.amazon.enabled; $scope.amazonEnabled = config.amazon.enabled;
$scope.bitpayCardEnabled = config.bitpayCard.enabled; $scope.bitpayCardEnabled = config.bitpayCard.enabled;
var buyAndSellEnabled = !$scope.externalServices.BuyAndSell && ($scope.glideraEnabled || $scope.coinbaseEnabled); var buyAndSellEnabled = !$scope.externalServices.BuyAndSell && ($scope.glideraEnabled || $scope.coinbaseEnabled);
var amazonEnabled = !$scope.externalServices.AmazonGiftCards && $scope.amazonEnabled; var amazonEnabled = !$scope.externalServices.AmazonGiftCards && $scope.amazonEnabled;
var bitpayCardEnabled = !$scope.externalServices.BitpayCard && $scope.bitpayCardEnabled; var bitpayCardEnabled = !$scope.externalServices.BitpayCard && $scope.bitpayCardEnabled;
$scope.nextStepEnabled = buyAndSellEnabled || amazonEnabled || bitpayCardEnabled; $scope.nextStepEnabled = buyAndSellEnabled || amazonEnabled || bitpayCardEnabled;
$scope.recentTransactionsEnabled = config.recentTransactions.enabled; $scope.recentTransactionsEnabled = config.recentTransactions.enabled;
if ($scope.bitpayCardEnabled) bitpayCardCache(); if ($scope.bitpayCardEnabled) bitpayCardCache();
$timeout(function() {
$ionicScrollDelegate.resize();
$scope.$apply();
}, 10);
});
}); });
}); });