Moved default service settings into different struct so as to de-pollute config on user's machine

3 files changed, 30 insertions, 30 deletions

diff --git a/src/config.ts b/src/config.ts
index ceadda645..dd83bd05b 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -427,19 +427,10 @@ export const DEFAULT_APP_SETTINGS = {
   alwaysShowWorkspaces: false,
   liftSingleInstanceLock: false,
   enableLongPressServiceHint: false,
-  proxyFeatureEnabled: false,
-  proxyHost: '',
-  proxyPort: 0,
-  proxyUser: '',
-  proxyPassword: '',
-  onlyShowFavoritesInUnreadCount: false,
+  isTodosFeatureEnabled: true,
   customTodoServer: '',
   locale: 'en-US',
   keepAllWorkspacesLoaded: false,
-  isFeatureEnabledByUser: true,
-  darkReaderBrightness: 100,
-  darkReaderContrast: 90,
-  darkReaderSepia: 10,
 };
 
 export const DEFAULT_SERVICE_SETTINGS = {
@@ -464,4 +455,13 @@ export const DEFAULT_SERVICE_SETTINGS = {
   allowFavoritesDelineationInUnreadCount: false,
   disablewebsecurity: false,
   spellcheckerLanguage: false,
+  onlyShowFavoritesInUnreadCount: false,
+  proxyFeatureEnabled: false,
+  proxyHost: '',
+  proxyPort: 0,
+  proxyUser: '',
+  proxyPassword: '',
+  darkReaderBrightness: 100,
+  darkReaderContrast: 90,
+  darkReaderSepia: 10,
 };
diff --git a/src/containers/settings/EditServiceScreen.tsx b/src/containers/settings/EditServiceScreen.tsx
index d02138fce..a72df5604 100644
--- a/src/containers/settings/EditServiceScreen.tsx
+++ b/src/containers/settings/EditServiceScreen.tsx
@@ -277,22 +277,22 @@ class EditServiceScreen extends Component<IProps> {
           label: intl.formatMessage(messages.darkReaderBrightness),
           value: service?.darkReaderSettings
             ? service?.darkReaderSettings.brightness
-            : DEFAULT_APP_SETTINGS.darkReaderBrightness,
-          default: DEFAULT_APP_SETTINGS.darkReaderBrightness,
+            : DEFAULT_SERVICE_SETTINGS.darkReaderBrightness,
+          default: DEFAULT_SERVICE_SETTINGS.darkReaderBrightness,
         },
         darkReaderContrast: {
           label: intl.formatMessage(messages.darkReaderContrast),
           value: service?.darkReaderSettings
             ? service?.darkReaderSettings.contrast
-            : DEFAULT_APP_SETTINGS.darkReaderContrast,
-          default: DEFAULT_APP_SETTINGS.darkReaderContrast,
+            : DEFAULT_SERVICE_SETTINGS.darkReaderContrast,
+          default: DEFAULT_SERVICE_SETTINGS.darkReaderContrast,
         },
         darkReaderSepia: {
           label: intl.formatMessage(messages.darkReaderSepia),
           value: service?.darkReaderSettings
             ? service?.darkReaderSettings.sepia
-            : DEFAULT_APP_SETTINGS.darkReaderSepia,
-          default: DEFAULT_APP_SETTINGS.darkReaderSepia,
+            : DEFAULT_SERVICE_SETTINGS.darkReaderSepia,
+          default: DEFAULT_SERVICE_SETTINGS.darkReaderSepia,
         },
         isProgressbarEnabled: {
           label: intl.formatMessage(messages.enableProgressbar),
@@ -380,9 +380,9 @@ class EditServiceScreen extends Component<IProps> {
           label: intl.formatMessage(messages.onlyShowFavoritesInUnreadCount),
           value: ifUndefined<boolean>(
             service?.onlyShowFavoritesInUnreadCount,
-            DEFAULT_APP_SETTINGS.onlyShowFavoritesInUnreadCount,
+            DEFAULT_SERVICE_SETTINGS.onlyShowFavoritesInUnreadCount,
           ),
-          default: DEFAULT_APP_SETTINGS.onlyShowFavoritesInUnreadCount,
+          default: DEFAULT_SERVICE_SETTINGS.onlyShowFavoritesInUnreadCount,
           type: 'checkbox',
         },
       };
@@ -409,42 +409,42 @@ class EditServiceScreen extends Component<IProps> {
               label: intl.formatMessage(messages.enableProxy),
               value: ifUndefined<boolean>(
                 serviceProxyConfig.isEnabled,
-                DEFAULT_APP_SETTINGS.proxyFeatureEnabled,
+                DEFAULT_SERVICE_SETTINGS.proxyFeatureEnabled,
               ),
-              default: DEFAULT_APP_SETTINGS.proxyFeatureEnabled,
+              default: DEFAULT_SERVICE_SETTINGS.proxyFeatureEnabled,
               type: 'checkbox',
             },
             host: {
               label: intl.formatMessage(messages.proxyHost),
               value: ifUndefined<string>(
                 serviceProxyConfig.host,
-                DEFAULT_APP_SETTINGS.proxyHost,
+                DEFAULT_SERVICE_SETTINGS.proxyHost,
               ),
-              default: DEFAULT_APP_SETTINGS.proxyHost,
+              default: DEFAULT_SERVICE_SETTINGS.proxyHost,
             },
             port: {
               label: intl.formatMessage(messages.proxyPort),
               value: ifUndefined<number>(
                 serviceProxyConfig.port,
-                DEFAULT_APP_SETTINGS.proxyPort,
+                DEFAULT_SERVICE_SETTINGS.proxyPort,
               ),
-              default: DEFAULT_APP_SETTINGS.proxyPort,
+              default: DEFAULT_SERVICE_SETTINGS.proxyPort,
             },
             user: {
               label: intl.formatMessage(messages.proxyUser),
               value: ifUndefined<string>(
                 serviceProxyConfig.user,
-                DEFAULT_APP_SETTINGS.proxyUser,
+                DEFAULT_SERVICE_SETTINGS.proxyUser,
               ),
-              default: DEFAULT_APP_SETTINGS.proxyUser,
+              default: DEFAULT_SERVICE_SETTINGS.proxyUser,
             },
             password: {
               label: intl.formatMessage(messages.proxyPassword),
               value: ifUndefined<string>(
                 serviceProxyConfig.password,
-                DEFAULT_APP_SETTINGS.proxyPassword,
+                DEFAULT_SERVICE_SETTINGS.proxyPassword,
               ),
-              default: DEFAULT_APP_SETTINGS.proxyPassword,
+              default: DEFAULT_SERVICE_SETTINGS.proxyPassword,
               type: 'password',
             },
           },
diff --git a/src/containers/settings/EditSettingsScreen.tsx b/src/containers/settings/EditSettingsScreen.tsx
index 5c82a7e34..fd99fd616 100644
--- a/src/containers/settings/EditSettingsScreen.tsx
+++ b/src/containers/settings/EditSettingsScreen.tsx
@@ -1165,9 +1165,9 @@ class EditSettingsScreen extends Component<EditSettingsScreenProps> {
         label: intl.formatMessage(messages.enableTodos),
         value: ifUndefined<boolean>(
           todos.settings.isFeatureEnabledByUser,
-          DEFAULT_APP_SETTINGS.isFeatureEnabledByUser,
+          DEFAULT_APP_SETTINGS.isTodosFeatureEnabled,
         ),
-        default: DEFAULT_APP_SETTINGS.isFeatureEnabledByUser,
+        default: DEFAULT_APP_SETTINGS.isTodosFeatureEnabled,
         type: 'checkbox',
       };
     }