From c3f2230f337740a5213a6fb97379d2c162ff720e Mon Sep 17 00:00:00 2001 From: JDonadio Date: Thu, 19 Jan 2017 13:16:29 -0300 Subject: [PATCH] fix enabled services --- src/js/controllers/advancedSettings.js | 6 +++--- src/js/controllers/buyandsellController.js | 19 +++++++++++++++++++ src/js/routes.js | 1 + www/views/buyandsell.html | 14 ++++++++------ 4 files changed, 31 insertions(+), 9 deletions(-) create mode 100644 src/js/controllers/buyandsellController.js diff --git a/src/js/controllers/advancedSettings.js b/src/js/controllers/advancedSettings.js index bef368e18..04b46e0a7 100644 --- a/src/js/controllers/advancedSettings.js +++ b/src/js/controllers/advancedSettings.js @@ -24,9 +24,9 @@ angular.module('copayApp.controllers').controller('advancedSettingsController', $scope.recentTransactionsEnabled = { value: config.recentTransactions.enabled }; - $scope.frequentlyUsedEnabled = { - value: config.frequentlyUsed.enabled - }; + // $scope.frequentlyUsedEnabled = { + // value: config.frequentlyUsed.enabled + // }; }; $scope.spendUnconfirmedChange = function() { diff --git a/src/js/controllers/buyandsellController.js b/src/js/controllers/buyandsellController.js new file mode 100644 index 000000000..3b92c766f --- /dev/null +++ b/src/js/controllers/buyandsellController.js @@ -0,0 +1,19 @@ +'use strict'; + +angular.module('copayApp.controllers').controller('buyandsellController', function($scope, $ionicHistory, $state, configService) { + + $scope.$on("$ionicView.beforeEnter", function(event, data) { + configService.whenAvailable(function(config) { + $scope.isCoinbaseEnabled = config.coinbase.enabled; + $scope.isGlideraEnabled = config.glidera.enabled; + + if (!$scope.isCoinbaseEnabled && !$scope.isGlideraEnabled) + goHome(); + }); + }); + + function goHome() { + $ionicHistory.removeBackView(); + $state.go('tabs.home'); + }; +}); diff --git a/src/js/routes.js b/src/js/routes.js index e88c15275..aa4ac20b7 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -866,6 +866,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr url: '/buyandsell', views: { 'tab-home': { + controller: 'buyandsellController', templateUrl: 'views/buyandsell.html' } } diff --git a/www/views/buyandsell.html b/www/views/buyandsell.html index 47e361365..b48b777f2 100644 --- a/www/views/buyandsell.html +++ b/www/views/buyandsell.html @@ -5,15 +5,17 @@ Buy and sell - - +
+
+ +
- - +
+
- - +
+