From 91c69428ed0dc2dd26b00c6dd5a6684f25515a34 Mon Sep 17 00:00:00 2001
From: Abin Mn <abinmn619@gmail.com>
Date: Tue, 26 Oct 2021 21:18:20 +0530
Subject: Cleanup/remove feature toggle for todo, workspace, service proxy
 (#2134)

* Remove DEFAULT_FEATURES_CONFIG from config
* Remove static controller

Co-authored-by: Madhuri B <MadhuriBandanadam@users.noreply.github.com>
---
 .../settings/navigation/SettingsNavigation.js       | 21 +++++++++------------
 .../settings/settings/EditSettingsForm.js           | 16 +++++-----------
 2 files changed, 14 insertions(+), 23 deletions(-)

(limited to 'src/components/settings')

diff --git a/src/components/settings/navigation/SettingsNavigation.js b/src/components/settings/navigation/SettingsNavigation.js
index 18a71fdeb..dbb1365b0 100644
--- a/src/components/settings/navigation/SettingsNavigation.js
+++ b/src/components/settings/navigation/SettingsNavigation.js
@@ -6,7 +6,6 @@ import { RouterStore } from 'mobx-react-router';
 
 import { LOCAL_SERVER, LIVE_FERDI_API, LIVE_FRANZ_API } from '../../../config';
 import Link from '../../ui/Link';
-import { workspaceStore } from '../../../features/workspaces';
 import UIStore from '../../../stores/UIStore';
 import SettingsStore from '../../../stores/SettingsStore';
 import UserStore from '../../../stores/UserStore';
@@ -117,17 +116,15 @@ class SettingsNavigation extends Component {
           {intl.formatMessage(messages.yourServices)}{' '}
           <span className="badge">{serviceCount}</span>
         </Link>
-        {workspaceStore.isFeatureEnabled ? (
-          <Link
-            to="/settings/workspaces"
-            className="settings-navigation__link"
-            activeClassName="is-active"
-            disabled={!isLoggedIn}
-          >
-            {intl.formatMessage(messages.yourWorkspaces)}{' '}
-            <span className="badge">{workspaceCount}</span>
-          </Link>
-        ) : null}
+        <Link
+          to="/settings/workspaces"
+          className="settings-navigation__link"
+          activeClassName="is-active"
+          disabled={!isLoggedIn}
+        >
+          {intl.formatMessage(messages.yourWorkspaces)}{' '}
+          <span className="badge">{workspaceCount}</span>
+        </Link>
         {!isUsingWithoutAccount && (
           <Link
             to="/settings/user"
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index 60bd91493..54f2025e5 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -194,9 +194,7 @@ class EditSettingsForm extends Component {
     isClearingAllCache: PropTypes.bool.isRequired,
     onClearAllCache: PropTypes.func.isRequired,
     getCacheSize: PropTypes.func.isRequired,
-    isTodosEnabled: PropTypes.bool.isRequired,
     isTodosActivated: PropTypes.bool.isRequired,
-    isWorkspaceEnabled: PropTypes.bool.isRequired,
     automaticUpdates: PropTypes.bool.isRequired,
     isDarkmodeEnabled: PropTypes.bool.isRequired,
     isAdaptableDarkModeEnabled: PropTypes.bool.isRequired,
@@ -244,8 +242,6 @@ class EditSettingsForm extends Component {
       isClearingAllCache,
       onClearAllCache,
       getCacheSize,
-      isTodosEnabled,
-      isWorkspaceEnabled,
       automaticUpdates,
       isDarkmodeEnabled,
       isTodosActivated,
@@ -414,14 +410,12 @@ class EditSettingsForm extends Component {
 
                 <Hr />
 
-                {isWorkspaceEnabled && (
-                  <>
-                    <Toggle field={form.$('keepAllWorkspacesLoaded')} />
-                    <Hr />
-                  </>
-                )}
+                <>
+                  <Toggle field={form.$('keepAllWorkspacesLoaded')} />
+                  <Hr />
+                </>
 
-                {isTodosEnabled && !hasAddedTodosAsService && (
+                {!hasAddedTodosAsService && (
                   <>
                     <Toggle field={form.$('enableTodos')} />
                     {isTodosActivated && (
-- 
cgit v1.2.3-70-g09d2