diff --git a/src/js/controllers/advancedSettings.js b/src/js/controllers/advancedSettings.js
index 9bfd90a58..0664a0804 100644
--- a/src/js/controllers/advancedSettings.js
+++ b/src/js/controllers/advancedSettings.js
@@ -3,27 +3,18 @@
angular.module('copayApp.controllers').controller('advancedSettingsController', function($scope, $rootScope, $log, $window, lodash, configService, uxLanguage, platformInfo, pushNotificationsService, profileService, feeService, storageService, $ionicHistory, $timeout, $ionicScrollDelegate) {
var updateConfig = function() {
-
var config = configService.getSync();
$scope.spendUnconfirmed = {
value: config.wallet.spendUnconfirmed
};
- $scope.bitpayCardEnabled = {
- value: config.bitpayCard.enabled
- };
- $scope.amazonEnabled = {
- value: config.amazon.enabled
- };
- $scope.glideraEnabled = {
- value: config.glidera.enabled
- };
- $scope.coinbaseEnabled = {
- value: config.coinbaseV2
- };
$scope.recentTransactionsEnabled = {
value: config.recentTransactions.enabled
};
+
+ $scope.hideNextSteps = {
+ value: config.hideNextSteps.enabled
+ };
};
$scope.spendUnconfirmedChange = function() {
@@ -37,42 +28,11 @@ angular.module('copayApp.controllers').controller('advancedSettingsController',
});
};
- $scope.bitpayCardChange = function() {
+ $scope.nextStepsChange = function() {
var opts = {
- bitpayCard: {
- enabled: $scope.bitpayCardEnabled.value
- }
- };
- configService.set(opts, function(err) {
- if (err) $log.debug(err);
- });
- };
-
- $scope.amazonChange = function() {
- var opts = {
- amazon: {
- enabled: $scope.amazonEnabled.value
- }
- };
- configService.set(opts, function(err) {
- if (err) $log.debug(err);
- });
- };
-
- $scope.glideraChange = function() {
- var opts = {
- glidera: {
- enabled: $scope.glideraEnabled.value
- }
- };
- configService.set(opts, function(err) {
- if (err) $log.debug(err);
- });
- };
-
- $scope.coinbaseChange = function() {
- var opts = {
- coinbaseV2: $scope.coinbaseEnabled.value
+ hideNextSteps: {
+ enabled: $scope.hideNextSteps.value
+ },
};
configService.set(opts, function(err) {
if (err) $log.debug(err);
diff --git a/src/js/controllers/tab-home.js b/src/js/controllers/tab-home.js
index 8690f169c..ded89466e 100644
--- a/src/js/controllers/tab-home.js
+++ b/src/js/controllers/tab-home.js
@@ -94,7 +94,6 @@ angular.module('copayApp.controllers').controller('tabHomeController',
];
- $scope.nextStepsItems = nextStepsService.get();
$scope.buyAndSellItems = buyAndSellService.getLinked();
$scope.homeIntegrations = homeIntegrationsService.get();
@@ -107,7 +106,10 @@ angular.module('copayApp.controllers').controller('tabHomeController',
$scope.recentTransactionsEnabled = config.recentTransactions.enabled;
if ($scope.recentTransactionsEnabled) getNotifications();
- if ($scope.bitpayCardEnabled) bitpayCardCache();
+ if (!config.hideNextSteps.enabled) {
+ $scope.nextStepsItems = nextStepsService.get();
+ }
+
$timeout(function() {
$ionicScrollDelegate.resize();
$scope.$apply();
diff --git a/src/js/services/configService.js b/src/js/services/configService.js
index fd6b3206a..09dfe268f 100644
--- a/src/js/services/configService.js
+++ b/src/js/services/configService.js
@@ -43,26 +43,14 @@ angular.module('copayApp.services').factory('configService', function(storageSer
},
// External services
- glidera: {
- enabled: true,
- testnet: false
- },
-
- coinbaseV2: true,
-
- bitpayCard: {
- enabled: true
- },
-
- amazon: {
- enabled: true
- },
-
-
recentTransactions: {
enabled: true,
},
+ hideNextSteps: {
+ enabled: false,
+ },
+
rates: {
url: 'https://insight.bitpay.com:443/api/rates',
},
diff --git a/www/views/advancedSettings.html b/www/views/advancedSettings.html
index afbbf764b..03632f52c 100644
--- a/www/views/advancedSettings.html
+++ b/www/views/advancedSettings.html
@@ -7,24 +7,6 @@
-
Enabled Integrations
-
-
- Enable BitPay Card Integration
-
-
-
- Enable Amazon Integration
-
-
-
- Enable Glidera Service
-
-
-
- Enable Coinbase Service
-
-
Wallet Operation
+
+
+ Hide Next Steps Card
+
+
+
+
diff --git a/www/views/tab-home.html b/www/views/tab-home.html
index 85eaf7964..788422bb3 100644
--- a/www/views/tab-home.html
+++ b/www/views/tab-home.html
@@ -81,7 +81,7 @@
Incomplete
- {{wallet.status.totalBalanceStr ? wallet.status.totalBalanceStr : ( wallet.cachedBalance ? wallet.cachedBalance + ' | ' + (wallet.cachedBalanceUpdatedOn ? ( wallet.cachedBalanceUpdatedOn * 1000 | amTimeAgo) : '') : '' ) }}
+ {{wallet.status.totalBalanceStr ? wallet.status.totalBalanceStr : ( wallet.cachedBalance ? wallet.cachedBalance + (wallet.cachedBalanceUpdatedOn ? ' | ' + ( wallet.cachedBalanceUpdatedOn * 1000 | amTimeAgo) : '') : '' ) }}
[Balance Hidden]