From 537697a6e9757f118d09d9e76362ba1ff617e2c6 Mon Sep 17 00:00:00 2001
From: Markus Hatvan <markus_hatvan@aon.at>
Date: Mon, 13 Sep 2021 14:45:46 +0200
Subject: chore: upgrade intl dependencies (#1920)

---
 src/containers/settings/AccountScreen.js      |  11 +-
 src/containers/settings/EditServiceScreen.js  | 121 ++++++++++---------
 src/containers/settings/EditSettingsScreen.js | 166 ++++++++++++++------------
 src/containers/settings/EditUserScreen.js     |  60 +++++-----
 src/containers/settings/InviteScreen.js       |   8 +-
 src/containers/settings/RecipesScreen.js      |  92 ++++++++------
 src/containers/settings/ServicesScreen.js     |  17 +--
 src/containers/settings/SettingsWindow.js     |  21 ++--
 src/containers/settings/SupportScreen.js      |   9 +-
 src/containers/settings/TeamScreen.js         |  11 +-
 10 files changed, 289 insertions(+), 227 deletions(-)

(limited to 'src/containers/settings')

diff --git a/src/containers/settings/AccountScreen.js b/src/containers/settings/AccountScreen.js
index 8d92b01be..cc3929656 100644
--- a/src/containers/settings/AccountScreen.js
+++ b/src/containers/settings/AccountScreen.js
@@ -12,7 +12,6 @@ import ErrorBoundary from '../../components/util/ErrorBoundary';
 import { LIVE_FRANZ_API } from '../../config';
 import { WEBSITE } from '../../environment';
 
-export default
 @inject('stores', 'actions')
 @observer
 class AccountScreen extends Component {
@@ -58,16 +57,16 @@ class AccountScreen extends Component {
           user={user.data}
           isLoading={isLoadingUserInfo}
           userInfoRequestFailed={
-            user.getUserInfoRequest.wasExecuted
-            && user.getUserInfoRequest.isError
+            user.getUserInfoRequest.wasExecuted &&
+            user.getUserInfoRequest.isError
           }
           retryUserInfoRequest={() => this.reloadData()}
           onCloseSubscriptionWindow={() => this.onCloseWindow()}
           deleteAccount={userActions.delete}
           isLoadingDeleteAccount={user.deleteAccountRequest.isExecuting}
           isDeleteAccountSuccessful={
-            user.deleteAccountRequest.wasExecuted
-            && !user.deleteAccountRequest.isError
+            user.deleteAccountRequest.wasExecuted &&
+            !user.deleteAccountRequest.isError
           }
           openEditAccount={() => this.handleWebsiteLink('/user/profile')}
           openInvoices={() => this.handleWebsiteLink('/user/invoices')}
@@ -89,3 +88,5 @@ AccountScreen.wrappedComponent.propTypes = {
     user: PropTypes.instanceOf(UserStore).isRequired,
   }).isRequired,
 };
+
+export default AccountScreen;
diff --git a/src/containers/settings/EditServiceScreen.js b/src/containers/settings/EditServiceScreen.js
index c880e97ae..12e7b9e95 100644
--- a/src/containers/settings/EditServiceScreen.js
+++ b/src/containers/settings/EditServiceScreen.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { inject, observer } from 'mobx-react';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 
 import { RouterStore } from 'mobx-react-router';
 import UserStore from '../../stores/UserStore';
@@ -27,87 +27,85 @@ import globalMessages from '../../i18n/globalMessages';
 const messages = defineMessages({
   name: {
     id: 'settings.service.form.name',
-    defaultMessage: '!!!Name',
+    defaultMessage: 'Name',
   },
   enableService: {
     id: 'settings.service.form.enableService',
-    defaultMessage: '!!!Enable service',
+    defaultMessage: 'Enable service',
   },
   enableHibernation: {
     id: 'settings.service.form.enableHibernation',
-    defaultMessage: '!!!Enable hibernation',
+    defaultMessage: 'Enable hibernation',
   },
   enableNotification: {
     id: 'settings.service.form.enableNotification',
-    defaultMessage: '!!!Enable Notifications',
+    defaultMessage: 'Enable Notifications',
   },
   enableBadge: {
     id: 'settings.service.form.enableBadge',
-    defaultMessage: '!!!Show unread message badges',
+    defaultMessage: 'Show unread message badges',
   },
   enableAudio: {
     id: 'settings.service.form.enableAudio',
-    defaultMessage: '!!!Enable audio',
+    defaultMessage: 'Enable audio',
   },
   team: {
     id: 'settings.service.form.team',
-    defaultMessage: '!!!Team',
+    defaultMessage: 'Team',
   },
   customUrl: {
     id: 'settings.service.form.customUrl',
-    defaultMessage: '!!!Service URL',
+    defaultMessage: 'Service URL',
   },
   indirectMessages: {
     id: 'settings.service.form.indirectMessages',
-    defaultMessage: '!!!Show message badge for all new messages',
+    defaultMessage: 'Show message badge for all new messages',
   },
   icon: {
     id: 'settings.service.form.icon',
-    defaultMessage: '!!!Custom icon',
+    defaultMessage: 'Custom icon',
   },
   enableDarkMode: {
     id: 'settings.service.form.enableDarkMode',
-    defaultMessage: '!!!Enable Dark Mode',
+    defaultMessage: 'Enable Dark Mode',
   },
   darkReaderBrightness: {
     id: 'settings.service.form.darkReaderBrightness',
-    defaultMessage: '!!!Dark Reader Brightness',
+    defaultMessage: 'Dark Reader Brightness',
   },
   darkReaderContrast: {
     id: 'settings.service.form.darkReaderContrast',
-    defaultMessage: '!!!Dark Reader Contrast',
+    defaultMessage: 'Dark Reader Contrast',
   },
   darkReaderSepia: {
     id: 'settings.service.form.darkReaderSepia',
-    defaultMessage: '!!!Dark Reader Sepia',
+    defaultMessage: 'Dark Reader Sepia',
   },
   enableProxy: {
     id: 'settings.service.form.proxy.isEnabled',
-    defaultMessage: '!!!Use Proxy',
+    defaultMessage: 'Use Proxy',
   },
   proxyHost: {
     id: 'settings.service.form.proxy.host',
-    defaultMessage: '!!!Proxy Host/IP',
+    defaultMessage: 'Proxy Host/IP',
   },
   proxyPort: {
     id: 'settings.service.form.proxy.port',
-    defaultMessage: '!!!Port',
+    defaultMessage: 'Port',
   },
   proxyUser: {
     id: 'settings.service.form.proxy.user',
-    defaultMessage: '!!!User',
+    defaultMessage: 'User',
   },
   proxyPassword: {
     id: 'settings.service.form.proxy.password',
-    defaultMessage: '!!!Password',
+    defaultMessage: 'Password',
   },
 });
 
-export default @inject('stores', 'actions') @observer class EditServiceScreen extends Component {
-  static contextTypes = {
-    intl: intlShape,
-  };
-
+@inject('stores', 'actions')
+@observer
+class EditServiceScreen extends Component {
   onSubmit(data) {
     const { action } = this.props.router.params;
     const { recipes, services } = this.props.stores;
@@ -132,27 +130,31 @@ export default @inject('stores', 'actions') @observer class EditServiceScreen ex
   }
 
   prepareForm(recipe, service, proxy) {
-    const {
-      intl,
-    } = this.context;
+    const { intl } = this.props;
 
-    const {
-      stores,
-      router,
-    } = this.props;
+    const { stores, router } = this.props;
 
     const { action } = router.params;
 
-    let defaultSpellcheckerLanguage = SPELLCHECKER_LOCALES[stores.settings.app.spellcheckerLanguage];
+    let defaultSpellcheckerLanguage =
+      SPELLCHECKER_LOCALES[stores.settings.app.spellcheckerLanguage];
 
     if (stores.settings.app.spellcheckerLanguage === 'automatic') {
-      defaultSpellcheckerLanguage = intl.formatMessage(globalMessages.spellcheckerAutomaticDetectionShort);
+      defaultSpellcheckerLanguage = intl.formatMessage(
+        globalMessages.spellcheckerAutomaticDetectionShort,
+      );
     }
 
     const spellcheckerLanguage = getSelectOptions({
       locales: SPELLCHECKER_LOCALES,
-      resetToDefaultText: intl.formatMessage(globalMessages.spellcheckerSystemDefault, { default: defaultSpellcheckerLanguage }),
-      automaticDetectionText: stores.settings.app.spellcheckerLanguage !== 'automatic' ? intl.formatMessage(globalMessages.spellcheckerAutomaticDetection) : '',
+      resetToDefaultText: intl.formatMessage(
+        globalMessages.spellcheckerSystemDefault,
+        { default: defaultSpellcheckerLanguage },
+      ),
+      automaticDetectionText:
+        stores.settings.app.spellcheckerLanguage !== 'automatic'
+          ? intl.formatMessage(globalMessages.spellcheckerAutomaticDetection)
+          : '',
     });
 
     const config = {
@@ -169,7 +171,10 @@ export default @inject('stores', 'actions') @observer class EditServiceScreen ex
         },
         isHibernationEnabled: {
           label: intl.formatMessage(messages.enableHibernation),
-          value: action !== 'edit' ? recipe.autoHibernate : service.isHibernationEnabled,
+          value:
+            action !== 'edit'
+              ? recipe.autoHibernate
+              : service.isHibernationEnabled,
           default: true,
         },
         isNotificationEnabled: {
@@ -200,17 +205,23 @@ export default @inject('stores', 'actions') @observer class EditServiceScreen ex
         },
         darkReaderBrightness: {
           label: intl.formatMessage(messages.darkReaderBrightness),
-          value: service.darkReaderSettings ? service.darkReaderSettings.brightness : undefined,
+          value: service.darkReaderSettings
+            ? service.darkReaderSettings.brightness
+            : undefined,
           default: 100,
         },
         darkReaderContrast: {
           label: intl.formatMessage(messages.darkReaderContrast),
-          value: service.darkReaderSettings ? service.darkReaderSettings.contrast : undefined,
+          value: service.darkReaderSettings
+            ? service.darkReaderSettings.contrast
+            : undefined,
           default: 90,
         },
         darkReaderSepia: {
           label: intl.formatMessage(messages.darkReaderSepia),
-          value: service.darkReaderSettings ? service.darkReaderSettings.sepia : undefined,
+          value: service.darkReaderSettings
+            ? service.darkReaderSettings.sepia
+            : undefined,
           default: 10,
         },
         spellcheckerLanguage: {
@@ -252,7 +263,10 @@ export default @inject('stores', 'actions') @observer class EditServiceScreen ex
     // More fine grained and use case specific validation rules
     if (recipe.hasTeamId && recipe.hasCustomUrl) {
       config.fields.team.validators = [oneRequired(['team', 'customUrl'])];
-      config.fields.customUrl.validators = [url, oneRequired(['team', 'customUrl'])];
+      config.fields.customUrl.validators = [
+        url,
+        oneRequired(['team', 'customUrl']),
+      ];
     }
 
     // If a service can be hosted and has a teamId or customUrl
@@ -344,9 +358,7 @@ export default @inject('stores', 'actions') @observer class EditServiceScreen ex
   }
 
   render() {
-    const {
-      recipes, services, user,
-    } = this.props.stores;
+    const { recipes, services, user } = this.props.stores;
     const { action } = this.props.router.params;
 
     let recipe;
@@ -358,9 +370,7 @@ export default @inject('stores', 'actions') @observer class EditServiceScreen ex
 
       // TODO: render error message when recipe is `null`
       if (!recipe) {
-        return (
-          <ServiceError />
-        );
+        return <ServiceError />;
       }
     } else {
       service = services.activeSettings;
@@ -372,13 +382,11 @@ export default @inject('stores', 'actions') @observer class EditServiceScreen ex
     }
 
     if (isLoading) {
-      return (<div>Loading...</div>);
+      return <div>Loading...</div>;
     }
 
     if (!recipe) {
-      return (
-        <div>something went wrong</div>
-      );
+      return <div>something went wrong</div>;
     }
 
     const form = this.prepareForm(recipe, service, proxyFeature);
@@ -392,11 +400,14 @@ export default @inject('stores', 'actions') @observer class EditServiceScreen ex
           user={user.data}
           form={form}
           status={services.actionStatus}
-          isSaving={services.updateServiceRequest.isExecuting || services.createServiceRequest.isExecuting}
+          isSaving={
+            services.updateServiceRequest.isExecuting ||
+            services.createServiceRequest.isExecuting
+          }
           isDeleting={services.deleteServiceRequest.isExecuting}
-          onSubmit={(d) => this.onSubmit(d)}
+          onSubmit={d => this.onSubmit(d)}
           onDelete={() => this.deleteService()}
-          openRecipeFile={(file) => this.openRecipeFile(file)}
+          openRecipeFile={file => this.openRecipeFile(file)}
           isProxyFeatureEnabled={proxyFeature.isEnabled}
         />
       </ErrorBoundary>
@@ -417,3 +428,5 @@ EditServiceScreen.wrappedComponent.propTypes = {
     service: PropTypes.instanceOf(ServicesStore).isRequired,
   }).isRequired,
 };
+
+export default injectIntl(EditServiceScreen);
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js
index 09244bc3c..8834aa1ae 100644
--- a/src/containers/settings/EditSettingsScreen.js
+++ b/src/containers/settings/EditSettingsScreen.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { inject, observer } from 'mobx-react';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 
 import AppStore from '../../stores/AppStore';
 import SettingsStore from '../../stores/SettingsStore';
@@ -10,8 +10,15 @@ import TodosStore from '../../features/todos/store';
 import Form from '../../lib/Form';
 import { APP_LOCALES, SPELLCHECKER_LOCALES } from '../../i18n/languages';
 import {
-  HIBERNATION_STRATEGIES, SIDEBAR_WIDTH, ICON_SIZES, NAVIGATION_BAR_BEHAVIOURS, SEARCH_ENGINE_NAMES, TODO_APPS,
-  DEFAULT_SETTING_KEEP_ALL_WORKSPACES_LOADED, DEFAULT_IS_FEATURE_ENABLED_BY_USER, WAKE_UP_STRATEGIES,
+  HIBERNATION_STRATEGIES,
+  SIDEBAR_WIDTH,
+  ICON_SIZES,
+  NAVIGATION_BAR_BEHAVIOURS,
+  SEARCH_ENGINE_NAMES,
+  TODO_APPS,
+  DEFAULT_SETTING_KEEP_ALL_WORKSPACES_LOADED,
+  DEFAULT_IS_FEATURE_ENABLED_BY_USER,
+  WAKE_UP_STRATEGIES,
 } from '../../config';
 import { DEFAULT_APP_SETTINGS, isMac } from '../../environment';
 
@@ -31,195 +38,193 @@ const debug = require('debug')('Ferdi:EditSettingsScreen');
 const messages = defineMessages({
   autoLaunchOnStart: {
     id: 'settings.app.form.autoLaunchOnStart',
-    defaultMessage: '!!!Launch Ferdi on start',
+    defaultMessage: 'Launch Ferdi on start',
   },
   autoLaunchInBackground: {
     id: 'settings.app.form.autoLaunchInBackground',
-    defaultMessage: '!!!Open in background',
+    defaultMessage: 'Open in background',
   },
   runInBackground: {
     id: 'settings.app.form.runInBackground',
-    defaultMessage: '!!!Keep Ferdi in background when closing the window',
+    defaultMessage: 'Keep Ferdi in background when closing the window',
   },
   startMinimized: {
     id: 'settings.app.form.startMinimized',
-    defaultMessage: '!!!Start minimized',
+    defaultMessage: 'Start minimized',
   },
   confirmOnQuit: {
     id: 'settings.app.form.confirmOnQuit',
-    defaultMessage: '!!!Confirm when quitting Ferdi',
+    defaultMessage: 'Confirm when quitting Ferdi',
   },
   enableSystemTray: {
     id: 'settings.app.form.enableSystemTray',
-    defaultMessage: '!!!Always show Ferdi in System Tray',
+    defaultMessage: 'Always show Ferdi in System Tray',
   },
   enableMenuBar: {
     id: 'settings.app.form.enableMenuBar',
-    defaultMessage: '!!!Always show Ferdi in Menu Bar',
+    defaultMessage: 'Always show Ferdi in Menu Bar',
   },
   reloadAfterResume: {
     id: 'settings.app.form.reloadAfterResume',
-    defaultMessage: '!!!Reload Ferdi after system resume',
+    defaultMessage: 'Reload Ferdi after system resume',
   },
   minimizeToSystemTray: {
     id: 'settings.app.form.minimizeToSystemTray',
-    defaultMessage: '!!!Minimize Ferdi to system tray',
+    defaultMessage: 'Minimize Ferdi to system tray',
   },
   closeToSystemTray: {
     id: 'settings.app.form.closeToSystemTray',
-    defaultMessage: '!!!Close Ferdi to system tray',
+    defaultMessage: 'Close Ferdi to system tray',
   },
   privateNotifications: {
     id: 'settings.app.form.privateNotifications',
-    defaultMessage: '!!!Don\'t show message content in notifications',
+    defaultMessage: "Don't show message content in notifications",
   },
   clipboardNotifications: {
     id: 'settings.app.form.clipboardNotifications',
-    defaultMessage: '!!!Don\'t show notifications for clipboard events',
+    defaultMessage: "Don't show notifications for clipboard events",
   },
   notifyTaskBarOnMessage: {
     id: 'settings.app.form.notifyTaskBarOnMessage',
-    defaultMessage: '!!!Notify TaskBar/Dock on new message',
+    defaultMessage: 'Notify TaskBar/Dock on new message',
   },
   navigationBarBehaviour: {
     id: 'settings.app.form.navigationBarBehaviour',
-    defaultMessage: '!!!Navigation bar behaviour',
+    defaultMessage: 'Navigation bar behaviour',
   },
   searchEngine: {
     id: 'settings.app.form.searchEngine',
-    defaultMessage: '!!!Search engine',
+    defaultMessage: 'Search engine',
   },
   sentry: {
     id: 'settings.app.form.sentry',
-    defaultMessage: '!!!Send telemetry data',
+    defaultMessage: 'Send telemetry data',
   },
   hibernateOnStartup: {
     id: 'settings.app.form.hibernateOnStartup',
-    defaultMessage: '!!!Keep services in hibernation on startup',
+    defaultMessage: 'Keep services in hibernation on startup',
   },
   hibernationStrategy: {
     id: 'settings.app.form.hibernationStrategy',
-    defaultMessage: '!!!Hibernation strategy',
+    defaultMessage: 'Hibernation strategy',
   },
   wakeUpStrategy: {
     id: 'settings.app.form.wakeUpStrategy',
-    defaultMessage: '!!!Wake up strategy',
+    defaultMessage: 'Wake up strategy',
   },
   predefinedTodoServer: {
     id: 'settings.app.form.predefinedTodoServer',
-    defaultMessage: '!!!Todo Server',
+    defaultMessage: 'Todo Server',
   },
   customTodoServer: {
     id: 'settings.app.form.customTodoServer',
-    defaultMessage: '!!!Custom TodoServer',
+    defaultMessage: 'Custom TodoServer',
   },
   enableLock: {
     id: 'settings.app.form.enableLock',
-    defaultMessage: '!!!Enable Password Lock',
+    defaultMessage: 'Enable Password Lock',
   },
   lockPassword: {
     id: 'settings.app.form.lockPassword',
-    defaultMessage: '!!!Password',
+    defaultMessage: 'Password',
   },
   useTouchIdToUnlock: {
     id: 'settings.app.form.useTouchIdToUnlock',
-    defaultMessage: '!!!Allow using Touch ID to unlock',
+    defaultMessage: 'Allow using Touch ID to unlock',
   },
   inactivityLock: {
     id: 'settings.app.form.inactivityLock',
-    defaultMessage: '!!!Lock after inactivity',
+    defaultMessage: 'Lock after inactivity',
   },
   scheduledDNDEnabled: {
     id: 'settings.app.form.scheduledDNDEnabled',
-    defaultMessage: '!!!Enable scheduled Do-not-Disturb',
+    defaultMessage: 'Enable scheduled Do-not-Disturb',
   },
   scheduledDNDStart: {
     id: 'settings.app.form.scheduledDNDStart',
-    defaultMessage: '!!!From',
+    defaultMessage: 'From',
   },
   scheduledDNDEnd: {
     id: 'settings.app.form.scheduledDNDEnd',
-    defaultMessage: '!!!To',
+    defaultMessage: 'To',
   },
   language: {
     id: 'settings.app.form.language',
-    defaultMessage: '!!!Language',
+    defaultMessage: 'Language',
   },
   darkMode: {
     id: 'settings.app.form.darkMode',
-    defaultMessage: '!!!Dark Mode',
+    defaultMessage: 'Dark Mode',
   },
   adaptableDarkMode: {
     id: 'settings.app.form.adaptableDarkMode',
-    defaultMessage: '!!!Synchronize dark mode with my OS\'s dark mode setting',
+    defaultMessage: "Synchronize dark mode with my OS's dark mode setting",
   },
   universalDarkMode: {
     id: 'settings.app.form.universalDarkMode',
-    defaultMessage: '!!!Enable universal Dark Mode',
+    defaultMessage: 'Enable universal Dark Mode',
   },
   serviceRibbonWidth: {
     id: 'settings.app.form.serviceRibbonWidth',
-    defaultMessage: '!!!Sidebar width',
+    defaultMessage: 'Sidebar width',
   },
   iconSize: {
     id: 'settings.app.form.iconSize',
-    defaultMessage: '!!!Service icon size',
+    defaultMessage: 'Service icon size',
   },
   useVerticalStyle: {
     id: 'settings.app.form.useVerticalStyle',
-    defaultMessage: '!!!Use horizontal style',
+    defaultMessage: 'Use horizontal style',
   },
   alwaysShowWorkspaces: {
     id: 'settings.app.form.alwaysShowWorkspaces',
-    defaultMessage: '!!!Always show workspace drawer',
+    defaultMessage: 'Always show workspace drawer',
   },
   accentColor: {
     id: 'settings.app.form.accentColor',
-    defaultMessage: '!!!Accent color',
+    defaultMessage: 'Accent color',
   },
   showDisabledServices: {
     id: 'settings.app.form.showDisabledServices',
-    defaultMessage: '!!!Display disabled services tabs',
+    defaultMessage: 'Display disabled services tabs',
   },
   showMessageBadgeWhenMuted: {
     id: 'settings.app.form.showMessagesBadgesWhenMuted',
-    defaultMessage: '!!!Show unread message badge when notifications are disabled',
+    defaultMessage: 'Show unread message badge when notifications are disabled',
   },
   showDragArea: {
     id: 'settings.app.form.showDragArea',
-    defaultMessage: '!!!Show draggable area on window',
+    defaultMessage: 'Show draggable area on window',
   },
   enableSpellchecking: {
     id: 'settings.app.form.enableSpellchecking',
-    defaultMessage: '!!!Enable spell checking',
+    defaultMessage: 'Enable spell checking',
   },
   enableGPUAcceleration: {
     id: 'settings.app.form.enableGPUAcceleration',
-    defaultMessage: '!!!Enable GPU Acceleration',
+    defaultMessage: 'Enable GPU Acceleration',
   },
   beta: {
     id: 'settings.app.form.beta',
-    defaultMessage: '!!!Include beta versions',
+    defaultMessage: 'Include beta versions',
   },
   automaticUpdates: {
     id: 'settings.app.form.automaticUpdates',
-    defaultMessage: '!!!Enable updates',
+    defaultMessage: 'Enable updates',
   },
   enableTodos: {
     id: 'settings.app.form.enableTodos',
-    defaultMessage: '!!!Enable Franz Todos',
+    defaultMessage: 'Enable Franz Todos',
   },
   keepAllWorkspacesLoaded: {
     id: 'settings.app.form.keepAllWorkspacesLoaded',
-    defaultMessage: '!!!Keep all workspaces loaded',
+    defaultMessage: 'Keep all workspaces loaded',
   },
 });
 
-export default @inject('stores', 'actions') @observer class EditSettingsScreen extends Component {
-  static contextTypes = {
-    intl: intlShape,
-  };
-
+@inject('stores', 'actions')
+@observer
+class EditSettingsScreen extends Component {
   constructor(props) {
     super(props);
 
@@ -288,7 +293,9 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
         useVerticalStyle: Boolean(settingsData.useVerticalStyle),
         alwaysShowWorkspaces: Boolean(settingsData.alwaysShowWorkspaces),
         accentColor: settingsData.accentColor,
-        showMessageBadgeWhenMuted: Boolean(settingsData.showMessageBadgeWhenMuted),
+        showMessageBadgeWhenMuted: Boolean(
+          settingsData.showMessageBadgeWhenMuted,
+        ),
         showDragArea: Boolean(settingsData.showDragArea),
         enableSpellchecking: Boolean(settingsData.enableSpellchecking),
         spellcheckerLanguage: settingsData.spellcheckerLanguage,
@@ -309,24 +316,27 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
 
     if (workspaces.isFeatureActive) {
       const { keepAllWorkspacesLoaded } = workspaces.settings;
-      if (Boolean(keepAllWorkspacesLoaded) !== Boolean(settingsData.keepAllWorkspacesLoaded)) {
+      if (
+        Boolean(keepAllWorkspacesLoaded) !==
+        Boolean(settingsData.keepAllWorkspacesLoaded)
+      ) {
         workspaceActions.toggleKeepAllWorkspacesLoadedSetting();
       }
     }
 
     if (todos.isFeatureActive) {
       const { isFeatureEnabledByUser } = todos.settings;
-      if (Boolean(isFeatureEnabledByUser) !== Boolean(settingsData.enableTodos)) {
+      if (
+        Boolean(isFeatureEnabledByUser) !== Boolean(settingsData.enableTodos)
+      ) {
         todosActions.toggleTodosFeatureVisibility();
       }
     }
   }
 
   prepareForm() {
-    const {
-      app, settings, user, todos, workspaces,
-    } = this.props.stores;
-    const { intl } = this.context;
+    const { app, settings, user, todos, workspaces } = this.props.stores;
+    const { intl } = this.props;
     const { lockedPassword } = this.state;
 
     const locales = getSelectOptions({
@@ -370,7 +380,9 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
 
     const spellcheckingLanguages = getSelectOptions({
       locales: SPELLCHECKER_LOCALES,
-      automaticDetectionText: this.context.intl.formatMessage(globalMessages.spellcheckerAutomaticDetection),
+      automaticDetectionText: intl.formatMessage(
+        globalMessages.spellcheckerAutomaticDetection,
+      ),
     });
 
     const config = {
@@ -401,7 +413,9 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
           default: DEFAULT_APP_SETTINGS.confirmOnQuit,
         },
         enableSystemTray: {
-          label: intl.formatMessage(isMac ? messages.enableMenuBar : messages.enableSystemTray),
+          label: intl.formatMessage(
+            isMac ? messages.enableMenuBar : messages.enableSystemTray,
+          ),
           value: settings.all.app.enableSystemTray,
           default: DEFAULT_APP_SETTINGS.enableSystemTray,
         },
@@ -637,23 +651,15 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
   }
 
   render() {
-    const {
-      app,
-      todos,
-      workspaces,
-      services,
-    } = this.props.stores;
+    const { app, todos, workspaces, services } = this.props.stores;
     const {
       updateStatus,
       updateStatusTypes,
       isClearingAllCache,
       lockingFeatureEnabled,
     } = app;
-    const {
-      checkForUpdates,
-      installUpdate,
-      clearAllCache,
-    } = this.props.actions.app;
+    const { checkForUpdates, installUpdate, clearAllCache } =
+      this.props.actions.app;
     const form = this.prepareForm();
 
     return (
@@ -666,7 +672,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
           isUpdateAvailable={updateStatus === updateStatusTypes.AVAILABLE}
           noUpdateAvailable={updateStatus === updateStatusTypes.NOT_AVAILABLE}
           updateIsReadyToInstall={updateStatus === updateStatusTypes.DOWNLOADED}
-          onSubmit={(d) => this.onSubmit(d)}
+          onSubmit={d => this.onSubmit(d)}
           getCacheSize={() => app.cacheSize}
           isClearingAllCache={isClearingAllCache}
           onClearAllCache={clearAllCache}
@@ -675,9 +681,13 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
           lockingFeatureEnabled={lockingFeatureEnabled}
           automaticUpdates={this.props.stores.settings.app.automaticUpdates}
           isDarkmodeEnabled={this.props.stores.settings.app.darkMode}
-          isAdaptableDarkModeEnabled={this.props.stores.settings.app.adaptableDarkMode}
+          isAdaptableDarkModeEnabled={
+            this.props.stores.settings.app.adaptableDarkMode
+          }
           isTodosActivated={this.props.stores.todos.isFeatureEnabledByUser}
-          isUsingCustomTodoService={this.props.stores.todos.isUsingCustomTodoService}
+          isUsingCustomTodoService={
+            this.props.stores.todos.isUsingCustomTodoService
+          }
           isNightlyEnabled={this.props.stores.settings.app.nightly}
           hasAddedTodosAsService={services.isTodosServiceAdded}
           isOnline={app.isOnline}
@@ -704,3 +714,5 @@ EditSettingsScreen.wrappedComponent.propTypes = {
     workspaces: PropTypes.instanceOf(WorkspacesStore).isRequired,
   }).isRequired,
 };
+
+export default injectIntl(EditSettingsScreen);
diff --git a/src/containers/settings/EditUserScreen.js b/src/containers/settings/EditUserScreen.js
index 820b5e4d3..92ef94c29 100644
--- a/src/containers/settings/EditUserScreen.js
+++ b/src/containers/settings/EditUserScreen.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { inject, observer } from 'mobx-react';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 
 import UserStore from '../../stores/UserStore';
 import Form from '../../lib/Form';
@@ -13,47 +13,45 @@ import { required, email, minLength } from '../../helpers/validation-helpers';
 const messages = defineMessages({
   firstname: {
     id: 'settings.user.form.firstname',
-    defaultMessage: '!!!Firstname',
+    defaultMessage: 'Firstname',
   },
   lastname: {
     id: 'settings.user.form.lastname',
-    defaultMessage: '!!!Lastname',
+    defaultMessage: 'Lastname',
   },
   email: {
     id: 'settings.user.form.email',
-    defaultMessage: '!!!Email',
+    defaultMessage: 'Email',
   },
   accountTypeLabel: {
     id: 'settings.user.form.accountType.label',
-    defaultMessage: '!!!Account type',
+    defaultMessage: 'Account type',
   },
   accountTypeIndividual: {
     id: 'settings.user.form.accountType.individual',
-    defaultMessage: '!!!Individual',
+    defaultMessage: 'Individual',
   },
   accountTypeNonProfit: {
     id: 'settings.user.form.accountType.non-profit',
-    defaultMessage: '!!!Non-Profit',
+    defaultMessage: 'Non-Profit',
   },
   accountTypeCompany: {
     id: 'settings.user.form.accountType.company',
-    defaultMessage: '!!!Company',
+    defaultMessage: 'Company',
   },
   currentPassword: {
     id: 'settings.user.form.currentPassword',
-    defaultMessage: '!!!Current password',
+    defaultMessage: 'Current password',
   },
   newPassword: {
     id: 'settings.user.form.newPassword',
-    defaultMessage: '!!!New password',
+    defaultMessage: 'New password',
   },
 });
 
-export default @inject('stores', 'actions') @observer class EditUserScreen extends Component {
-  static contextTypes = {
-    intl: intlShape,
-  };
-
+@inject('stores', 'actions')
+@observer
+class EditUserScreen extends Component {
   componentWillUnmount() {
     this.props.actions.user.resetStatus();
   }
@@ -67,7 +65,7 @@ export default @inject('stores', 'actions') @observer class EditUserScreen exten
   }
 
   prepareForm(user) {
-    const { intl } = this.context;
+    const { intl } = this.props;
 
     const config = {
       fields: {
@@ -93,16 +91,20 @@ export default @inject('stores', 'actions') @observer class EditUserScreen exten
           value: user.accountType,
           validators: [required],
           label: intl.formatMessage(messages.accountTypeLabel),
-          options: [{
-            value: 'individual',
-            label: intl.formatMessage(messages.accountTypeIndividual),
-          }, {
-            value: 'non-profit',
-            label: intl.formatMessage(messages.accountTypeNonProfit),
-          }, {
-            value: 'company',
-            label: intl.formatMessage(messages.accountTypeCompany),
-          }],
+          options: [
+            {
+              value: 'individual',
+              label: intl.formatMessage(messages.accountTypeIndividual),
+            },
+            {
+              value: 'non-profit',
+              label: intl.formatMessage(messages.accountTypeNonProfit),
+            },
+            {
+              value: 'company',
+              label: intl.formatMessage(messages.accountTypeCompany),
+            },
+          ],
         },
         organization: {
           label: intl.formatMessage(messages.accountTypeCompany),
@@ -129,7 +131,7 @@ export default @inject('stores', 'actions') @observer class EditUserScreen exten
     const { user } = this.props.stores;
 
     if (user.getUserInfoRequest.isExecuting) {
-      return (<div>Loading...</div>);
+      return <div>Loading...</div>;
     }
 
     const form = this.prepareForm(user.data);
@@ -141,7 +143,7 @@ export default @inject('stores', 'actions') @observer class EditUserScreen exten
           status={user.actionStatus}
           form={form}
           isSaving={user.updateUserInfoRequest.isExecuting}
-          onSubmit={(d) => this.onSubmit(d)}
+          onSubmit={d => this.onSubmit(d)}
         />
       </ErrorBoundary>
     );
@@ -156,3 +158,5 @@ EditUserScreen.wrappedComponent.propTypes = {
     user: PropTypes.instanceOf(UserStore).isRequired,
   }).isRequired,
 };
+
+export default injectIntl(EditUserScreen);
diff --git a/src/containers/settings/InviteScreen.js b/src/containers/settings/InviteScreen.js
index 4fdaef08b..f17f6390c 100644
--- a/src/containers/settings/InviteScreen.js
+++ b/src/containers/settings/InviteScreen.js
@@ -6,7 +6,9 @@ import Invite from '../../components/auth/Invite';
 import ErrorBoundary from '../../components/util/ErrorBoundary';
 import UserStore from '../../stores/UserStore';
 
-export default @inject('stores', 'actions') @observer class InviteScreen extends Component {
+@inject('stores', 'actions')
+@observer
+class InviteScreen extends Component {
   componentWillUnmount() {
     this.props.stores.user.inviteRequest.reset();
   }
@@ -20,7 +22,9 @@ export default @inject('stores', 'actions') @observer class InviteScreen extends
         <Invite
           onSubmit={actions.user.invite}
           isLoadingInvite={user.inviteRequest.isExecuting}
-          isInviteSuccessful={user.inviteRequest.wasExecuted && !user.inviteRequest.isError}
+          isInviteSuccessful={
+            user.inviteRequest.wasExecuted && !user.inviteRequest.isError
+          }
           embed
         />
       </ErrorBoundary>
diff --git a/src/containers/settings/RecipesScreen.js b/src/containers/settings/RecipesScreen.js
index 784052bbe..06ddabe4c 100644
--- a/src/containers/settings/RecipesScreen.js
+++ b/src/containers/settings/RecipesScreen.js
@@ -18,7 +18,9 @@ import RecipePreview from '../../models/RecipePreview';
 import AppStore from '../../stores/AppStore';
 import { openPath } from '../../helpers/url-helpers';
 
-export default @inject('stores', 'actions') @observer class RecipesScreen extends Component {
+@inject('stores', 'actions')
+@observer
+class RecipesScreen extends Component {
   static propTypes = {
     params: PropTypes.shape({
       filter: PropTypes.string,
@@ -75,25 +77,32 @@ export default @inject('stores', 'actions') @observer class RecipesScreen extend
   }
 
   _sortByName(recipe1, recipe2) {
-    if (recipe1.name.toLowerCase() < recipe2.name.toLowerCase()) { return -1; }
-    if (recipe1.name.toLowerCase() > recipe2.name.toLowerCase()) { return 1; }
+    if (recipe1.name.toLowerCase() < recipe2.name.toLowerCase()) {
+      return -1;
+    }
+    if (recipe1.name.toLowerCase() > recipe2.name.toLowerCase()) {
+      return 1;
+    }
     return 0;
   }
 
   prepareRecipes(recipes) {
-    return recipes
-    // Filter out duplicate recipes
-      .filter((recipe, index, self) => {
-        const ids = self.map((rec) => rec.id);
-        return ids.indexOf(recipe.id) === index;
-
-        // Sort alphabetically
-      }).sort(this._sortByName);
+    return (
+      recipes
+        // Filter out duplicate recipes
+        .filter((recipe, index, self) => {
+          const ids = self.map(rec => rec.id);
+          return ids.indexOf(recipe.id) === index;
+
+          // Sort alphabetically
+        })
+        .sort(this._sortByName)
+    );
   }
 
   // Create an array of RecipePreviews from an array of recipe objects
   createPreviews(recipes) {
-    return recipes.map((recipe) => new RecipePreview(recipe));
+    return recipes.map(recipe => new RecipePreview(recipe));
   }
 
   resetSearch() {
@@ -101,16 +110,9 @@ export default @inject('stores', 'actions') @observer class RecipesScreen extend
   }
 
   render() {
-    const {
-      recipePreviews,
-      recipes,
-      services,
-    } = this.props.stores;
+    const { recipePreviews, recipes, services } = this.props.stores;
 
-    const {
-      app: appActions,
-      service: serviceActions,
-    } = this.props.actions;
+    const { app: appActions, service: serviceActions } = this.props.actions;
 
     const { filter } = { filter: 'all', ...this.props.params };
     let recipeFilter;
@@ -125,21 +127,33 @@ export default @inject('stores', 'actions') @observer class RecipesScreen extend
     }
     recipeFilter = recipeFilter.sort(this._sortByName);
 
-    const allRecipes = this.state.needle ? this.prepareRecipes([
-      // All search recipes from server
-      ...recipePreviews.searchResults,
-      // All search recipes from local recipes
-      ...this.createPreviews(
-        this.customRecipes
-          .filter((service) => service.name.toLowerCase().includes(this.state.needle.toLowerCase()) || (service.aliases || []).some(alias => alias.toLowerCase().includes(this.state.needle.toLowerCase()))),
-      ),
-    ]).sort(this._sortByName) : recipeFilter;
-
-    const customWebsiteRecipe = recipePreviews.all.find((service) => service.id === CUSTOM_WEBSITE_RECIPE_ID);
+    const allRecipes = this.state.needle
+      ? this.prepareRecipes([
+        // All search recipes from server
+        ...recipePreviews.searchResults,
+        // All search recipes from local recipes
+        ...this.createPreviews(
+          this.customRecipes.filter(
+            service =>
+              service.name
+                .toLowerCase()
+                .includes(this.state.needle.toLowerCase()) ||
+                (service.aliases || []).some(alias =>
+                  alias.toLowerCase().includes(this.state.needle.toLowerCase()),
+                ),
+          ),
+        ),
+      ]).sort(this._sortByName)
+      : recipeFilter;
+
+    const customWebsiteRecipe = recipePreviews.all.find(
+      service => service.id === CUSTOM_WEBSITE_RECIPE_ID,
+    );
 
-    const isLoading = recipePreviews.allRecipePreviewsRequest.isExecuting
-      || recipes.installRecipeRequest.isExecuting
-      || recipePreviews.searchRecipePreviewsRequest.isExecuting;
+    const isLoading =
+      recipePreviews.allRecipePreviewsRequest.isExecuting ||
+      recipes.installRecipeRequest.isExecuting ||
+      recipePreviews.searchRecipePreviewsRequest.isExecuting;
 
     const recipeDirectory = userDataRecipesPath('dev');
 
@@ -151,14 +165,16 @@ export default @inject('stores', 'actions') @observer class RecipesScreen extend
           isLoading={isLoading}
           addedServiceCount={services.all.length}
           showAddServiceInterface={serviceActions.showAddServiceInterface}
-          searchRecipes={(e) => this.searchRecipes(e)}
+          searchRecipes={e => this.searchRecipes(e)}
           resetSearch={() => this.resetSearch()}
           searchNeedle={this.state.needle}
           serviceStatus={services.actionStatus}
           recipeFilter={filter}
           recipeDirectory={recipeDirectory}
           openRecipeDirectory={() => openPath(recipeDirectory)}
-          openDevDocs={() => appActions.openExternalUrl({ url: FRANZ_DEV_DOCS })}
+          openDevDocs={() =>
+            appActions.openExternalUrl({ url: FRANZ_DEV_DOCS })
+          }
         />
       </ErrorBoundary>
     );
@@ -180,3 +196,5 @@ RecipesScreen.wrappedComponent.propTypes = {
     }).isRequired,
   }).isRequired,
 };
+
+export default RecipesScreen;
diff --git a/src/containers/settings/ServicesScreen.js b/src/containers/settings/ServicesScreen.js
index eb2b1bcb5..c9dfc68d0 100644
--- a/src/containers/settings/ServicesScreen.js
+++ b/src/containers/settings/ServicesScreen.js
@@ -10,7 +10,9 @@ import ServiceStore from '../../stores/ServicesStore';
 import ServicesDashboard from '../../components/settings/services/ServicesDashboard';
 import ErrorBoundary from '../../components/util/ErrorBoundary';
 
-export default @inject('stores', 'actions') @observer class ServicesScreen extends Component {
+@inject('stores', 'actions')
+@observer
+class ServicesScreen extends Component {
   componentWillUnmount() {
     this.props.actions.service.resetFilter();
     this.props.actions.service.resetStatus();
@@ -23,11 +25,7 @@ export default @inject('stores', 'actions') @observer class ServicesScreen exten
 
   render() {
     const { user, services, router } = this.props.stores;
-    const {
-      toggleService,
-      filter,
-      resetFilter,
-    } = this.props.actions.service;
+    const { toggleService, filter, resetFilter } = this.props.actions.service;
     const isLoading = services.allServicesRequest.isExecuting;
 
     let allServices = services.all;
@@ -47,7 +45,10 @@ export default @inject('stores', 'actions') @observer class ServicesScreen exten
           filterServices={filter}
           resetFilter={resetFilter}
           goTo={router.push}
-          servicesRequestFailed={services.allServicesRequest.wasExecuted && services.allServicesRequest.isError}
+          servicesRequestFailed={
+            services.allServicesRequest.wasExecuted &&
+            services.allServicesRequest.isError
+          }
           retryServicesRequest={() => services.allServicesRequest.reload()}
           searchNeedle={services.filterNeedle}
         />
@@ -66,3 +67,5 @@ ServicesScreen.wrappedComponent.propTypes = {
     service: PropTypes.instanceOf(ServiceStore).isRequired,
   }).isRequired,
 };
+
+export default ServicesScreen;
diff --git a/src/containers/settings/SettingsWindow.js b/src/containers/settings/SettingsWindow.js
index 9bb64b6fe..58e73f2f3 100644
--- a/src/containers/settings/SettingsWindow.js
+++ b/src/containers/settings/SettingsWindow.js
@@ -11,7 +11,9 @@ import ErrorBoundary from '../../components/util/ErrorBoundary';
 import { workspaceStore } from '../../features/workspaces';
 import UIStore from '../../stores/UIStore';
 
-export default @inject('stores', 'actions') @observer class SettingsContainer extends Component {
+@inject('stores', 'actions')
+@observer
+class SettingsContainer extends Component {
   portalRoot = document.querySelector('#portalContainer');
 
   el = document.createElement('div');
@@ -36,16 +38,11 @@ export default @inject('stores', 'actions') @observer class SettingsContainer ex
     );
 
     return ReactDOM.createPortal(
-      (
-        <ErrorBoundary>
-          <Layout
-            navigation={navigation}
-            closeSettings={closeSettings}
-          >
-            {children}
-          </Layout>
-        </ErrorBoundary>
-      ),
+      <ErrorBoundary>
+        <Layout navigation={navigation} closeSettings={closeSettings}>
+          {children}
+        </Layout>
+      </ErrorBoundary>,
       this.el,
     );
   }
@@ -60,3 +57,5 @@ SettingsContainer.wrappedComponent.propTypes = {
     ui: PropTypes.instanceOf(UIStore).isRequired,
   }).isRequired,
 };
+
+export default SettingsContainer;
diff --git a/src/containers/settings/SupportScreen.js b/src/containers/settings/SupportScreen.js
index 7d3b22f19..646f672ce 100644
--- a/src/containers/settings/SupportScreen.js
+++ b/src/containers/settings/SupportScreen.js
@@ -6,7 +6,8 @@ import SupportFerdi from '../../components/settings/supportFerdi/SupportFerdiDas
 import ErrorBoundary from '../../components/util/ErrorBoundary';
 import AppStore from '../../stores/AppStore';
 
-export default @inject('actions') class SupportScreen extends Component {
+@inject('actions')
+class SupportScreen extends Component {
   constructor(props) {
     super(props);
 
@@ -20,9 +21,7 @@ export default @inject('actions') class SupportScreen extends Component {
   render() {
     return (
       <ErrorBoundary>
-        <SupportFerdi
-          openLink={this.openLink}
-        />
+        <SupportFerdi openLink={this.openLink} />
       </ErrorBoundary>
     );
   }
@@ -33,3 +32,5 @@ SupportScreen.wrappedComponent.propTypes = {
     app: PropTypes.instanceOf(AppStore).isRequired,
   }).isRequired,
 };
+
+export default SupportScreen;
diff --git a/src/containers/settings/TeamScreen.js b/src/containers/settings/TeamScreen.js
index 10c2e36ef..ea447469b 100644
--- a/src/containers/settings/TeamScreen.js
+++ b/src/containers/settings/TeamScreen.js
@@ -10,7 +10,9 @@ import TeamDashboard from '../../components/settings/team/TeamDashboard';
 import ErrorBoundary from '../../components/util/ErrorBoundary';
 import { DEV_API_FRANZ_WEBSITE } from '../../config';
 
-export default @inject('stores', 'actions') @observer class TeamScreen extends Component {
+@inject('stores', 'actions')
+@observer
+class TeamScreen extends Component {
   handleWebsiteLink(route) {
     const { actions, stores } = this.props;
 
@@ -29,7 +31,10 @@ export default @inject('stores', 'actions') @observer class TeamScreen extends C
       <ErrorBoundary>
         <TeamDashboard
           isLoading={isLoadingUserInfo}
-          userInfoRequestFailed={user.getUserInfoRequest.wasExecuted && user.getUserInfoRequest.isError}
+          userInfoRequestFailed={
+            user.getUserInfoRequest.wasExecuted &&
+            user.getUserInfoRequest.isError
+          }
           retryUserInfoRequest={() => this.reloadData()}
           openTeamManagement={() => this.handleWebsiteLink('/user/team')}
           server={server}
@@ -50,3 +55,5 @@ TeamScreen.wrappedComponent.propTypes = {
     user: PropTypes.instanceOf(UserStore).isRequired,
   }).isRequired,
 };
+
+export default TeamScreen;
-- 
cgit v1.2.3-70-g09d2


From 318153ec7b93dfb10011f8337a9dd7c658239335 Mon Sep 17 00:00:00 2001
From: Markus Hatvan <markus_hatvan@aon.at>
Date: Tue, 14 Sep 2021 09:00:12 +0200
Subject: fix: regression from intl upgrades (#1933)

---
 src/containers/auth/ChangeServerScreen.js | 2 ++
 src/containers/auth/ImportScreen.js       | 2 ++
 src/containers/auth/LockedScreen.js       | 2 ++
 src/containers/auth/LoginScreen.js        | 2 ++
 src/containers/auth/PasswordScreen.js     | 2 ++
 src/containers/settings/InviteScreen.js   | 2 ++
 6 files changed, 12 insertions(+)

(limited to 'src/containers/settings')

diff --git a/src/containers/auth/ChangeServerScreen.js b/src/containers/auth/ChangeServerScreen.js
index 94fc98b61..a8910e7b1 100644
--- a/src/containers/auth/ChangeServerScreen.js
+++ b/src/containers/auth/ChangeServerScreen.js
@@ -43,3 +43,5 @@ ChangeServerScreen.wrappedComponent.propTypes = {
     router: PropTypes.instanceOf(RouterStore).isRequired,
   }).isRequired,
 };
+
+export default ChangeServerScreen;
diff --git a/src/containers/auth/ImportScreen.js b/src/containers/auth/ImportScreen.js
index ff2854f6e..ce786bdb8 100644
--- a/src/containers/auth/ImportScreen.js
+++ b/src/containers/auth/ImportScreen.js
@@ -35,3 +35,5 @@ ImportScreen.wrappedComponent.propTypes = {
     router: PropTypes.instanceOf(RouterStore).isRequired,
   }).isRequired,
 };
+
+export default ImportScreen;
diff --git a/src/containers/auth/LockedScreen.js b/src/containers/auth/LockedScreen.js
index 87205c4b9..a49549731 100644
--- a/src/containers/auth/LockedScreen.js
+++ b/src/containers/auth/LockedScreen.js
@@ -85,3 +85,5 @@ LockedScreen.wrappedComponent.propTypes = {
     user: PropTypes.instanceOf(UserStore).isRequired,
   }).isRequired,
 };
+
+export default LockedScreen;
diff --git a/src/containers/auth/LoginScreen.js b/src/containers/auth/LoginScreen.js
index d24eb1d22..cab73316b 100644
--- a/src/containers/auth/LoginScreen.js
+++ b/src/containers/auth/LoginScreen.js
@@ -40,3 +40,5 @@ LoginScreen.wrappedComponent.propTypes = {
     user: PropTypes.instanceOf(UserStore).isRequired,
   }).isRequired,
 };
+
+export default LoginScreen;
diff --git a/src/containers/auth/PasswordScreen.js b/src/containers/auth/PasswordScreen.js
index 47f6dfd01..86a746b9b 100644
--- a/src/containers/auth/PasswordScreen.js
+++ b/src/containers/auth/PasswordScreen.js
@@ -30,3 +30,5 @@ PasswordScreen.wrappedComponent.propTypes = {
     user: PropTypes.instanceOf(UserStore).isRequired,
   }).isRequired,
 };
+
+export default PasswordScreen;
diff --git a/src/containers/settings/InviteScreen.js b/src/containers/settings/InviteScreen.js
index f17f6390c..bf393f42f 100644
--- a/src/containers/settings/InviteScreen.js
+++ b/src/containers/settings/InviteScreen.js
@@ -40,3 +40,5 @@ InviteScreen.wrappedComponent.propTypes = {
     user: PropTypes.instanceOf(UserStore).isRequired,
   }).isRequired,
 };
+
+export default InviteScreen;
-- 
cgit v1.2.3-70-g09d2


From e708f25598358a6ac835d5b15a71811b043e3f77 Mon Sep 17 00:00:00 2001
From: Vijay A <avijayr@protonmail.com>
Date: Tue, 14 Sep 2021 16:19:26 +0530
Subject: refactor: revert the text for some more fields.

---
 src/components/auth/Signup.js                                 |  4 ++--
 src/components/services/tabs/TabItem.js                       | 10 +++++-----
 src/components/settings/recipes/RecipesDashboard.js           |  6 +++---
 src/components/settings/services/EditServiceForm.js           |  2 +-
 src/components/settings/supportFerdi/SupportFerdiDashboard.js |  2 +-
 src/containers/settings/EditServiceScreen.js                  |  8 ++++----
 src/containers/settings/EditSettingsScreen.js                 |  6 +++---
 src/containers/settings/EditUserScreen.js                     |  4 ++--
 src/features/workspaces/components/WorkspaceDrawer.js         |  4 ++--
 src/features/workspaces/components/WorkspacesDashboard.js     |  2 +-
 src/helpers/validation-helpers.ts                             |  8 ++++----
 11 files changed, 28 insertions(+), 28 deletions(-)

(limited to 'src/containers/settings')

diff --git a/src/components/auth/Signup.js b/src/components/auth/Signup.js
index 4d39835a2..936e0202d 100644
--- a/src/components/auth/Signup.js
+++ b/src/components/auth/Signup.js
@@ -23,11 +23,11 @@ const messages = defineMessages({
   },
   firstnameLabel: {
     id: 'signup.firstname.label',
-    defaultMessage: 'Firstname',
+    defaultMessage: 'First Name',
   },
   lastnameLabel: {
     id: 'signup.lastname.label',
-    defaultMessage: 'Lastname',
+    defaultMessage: 'Last Name',
   },
   emailLabel: {
     id: 'signup.email.label',
diff --git a/src/components/services/tabs/TabItem.js b/src/components/services/tabs/TabItem.js
index b1a3ffbbb..84cef8c0e 100644
--- a/src/components/services/tabs/TabItem.js
+++ b/src/components/services/tabs/TabItem.js
@@ -48,23 +48,23 @@ const messages = defineMessages({
   },
   disableService: {
     id: 'tabs.item.disableService',
-    defaultMessage: 'Disable Service',
+    defaultMessage: 'Disable service',
   },
   enableService: {
     id: 'tabs.item.enableService',
-    defaultMessage: 'Enable Service',
+    defaultMessage: 'Enable service',
   },
   hibernateService: {
     id: 'tabs.item.hibernateService',
-    defaultMessage: 'Hibernate Service',
+    defaultMessage: 'Hibernate service',
   },
   wakeUpService: {
     id: 'tabs.item.wakeUpService',
-    defaultMessage: 'Wake Up Service',
+    defaultMessage: 'Wake up service',
   },
   deleteService: {
     id: 'tabs.item.deleteService',
-    defaultMessage: 'Delete Service',
+    defaultMessage: 'Delete service',
   },
   confirmDeleteService: {
     id: 'tabs.item.confirmDeleteService',
diff --git a/src/components/settings/recipes/RecipesDashboard.js b/src/components/settings/recipes/RecipesDashboard.js
index e620abf93..44f5bc39a 100644
--- a/src/components/settings/recipes/RecipesDashboard.js
+++ b/src/components/settings/recipes/RecipesDashboard.js
@@ -18,7 +18,7 @@ import RecipePreview from '../../../models/RecipePreview';
 const messages = defineMessages({
   headline: {
     id: 'settings.recipes.headline',
-    defaultMessage: 'Available Services',
+    defaultMessage: 'Available services',
   },
   searchService: {
     id: 'settings.searchService',
@@ -47,11 +47,11 @@ const messages = defineMessages({
   },
   customRecipeIntro: {
     id: 'settings.recipes.customService.intro',
-    defaultMessage: 'To add a custom service, copy the recipe folder into:',
+    defaultMessage: 'To add a custom service, copy the service recipe to:',
   },
   openFolder: {
     id: 'settings.recipes.customService.openFolder',
-    defaultMessage: 'Open directory',
+    defaultMessage: 'Open folder',
   },
   openDevDocs: {
     id: 'settings.recipes.customService.openDevDocs',
diff --git a/src/components/settings/services/EditServiceForm.js b/src/components/settings/services/EditServiceForm.js
index 3fbb57cbb..9a9abeab4 100644
--- a/src/components/settings/services/EditServiceForm.js
+++ b/src/components/settings/services/EditServiceForm.js
@@ -26,7 +26,7 @@ const messages = defineMessages({
   },
   deleteService: {
     id: 'settings.service.form.deleteButton',
-    defaultMessage: 'Delete Service',
+    defaultMessage: 'Delete service',
   },
   openDarkmodeCss: {
     id: 'settings.service.form.openDarkmodeCss',
diff --git a/src/components/settings/supportFerdi/SupportFerdiDashboard.js b/src/components/settings/supportFerdi/SupportFerdiDashboard.js
index 64ffe8692..f24e4bd62 100644
--- a/src/components/settings/supportFerdi/SupportFerdiDashboard.js
+++ b/src/components/settings/supportFerdi/SupportFerdiDashboard.js
@@ -63,7 +63,7 @@ const messages = defineMessages({
   },
   openSurvey: {
     id: 'settings.supportFerdi.openSurvey',
-    defaultMessage: 'Open Survey',
+    defaultMessage: 'Open survey',
   },
   bannerText: {
     id: 'settings.supportFerdi.bannerText',
diff --git a/src/containers/settings/EditServiceScreen.js b/src/containers/settings/EditServiceScreen.js
index 12e7b9e95..e2ed4eeac 100644
--- a/src/containers/settings/EditServiceScreen.js
+++ b/src/containers/settings/EditServiceScreen.js
@@ -39,7 +39,7 @@ const messages = defineMessages({
   },
   enableNotification: {
     id: 'settings.service.form.enableNotification',
-    defaultMessage: 'Enable Notifications',
+    defaultMessage: 'Enable notifications',
   },
   enableBadge: {
     id: 'settings.service.form.enableBadge',
@@ -55,7 +55,7 @@ const messages = defineMessages({
   },
   customUrl: {
     id: 'settings.service.form.customUrl',
-    defaultMessage: 'Service URL',
+    defaultMessage: 'Custom server',
   },
   indirectMessages: {
     id: 'settings.service.form.indirectMessages',
@@ -95,11 +95,11 @@ const messages = defineMessages({
   },
   proxyUser: {
     id: 'settings.service.form.proxy.user',
-    defaultMessage: 'User',
+    defaultMessage: 'User (optional)',
   },
   proxyPassword: {
     id: 'settings.service.form.proxy.password',
-    defaultMessage: 'Password',
+    defaultMessage: 'Password (optional)',
   },
 });
 
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js
index 8834aa1ae..3df433160 100644
--- a/src/containers/settings/EditSettingsScreen.js
+++ b/src/containers/settings/EditSettingsScreen.js
@@ -118,7 +118,7 @@ const messages = defineMessages({
   },
   customTodoServer: {
     id: 'settings.app.form.customTodoServer',
-    defaultMessage: 'Custom TodoServer',
+    defaultMessage: 'Custom Todo Server',
   },
   enableLock: {
     id: 'settings.app.form.enableLock',
@@ -130,7 +130,7 @@ const messages = defineMessages({
   },
   useTouchIdToUnlock: {
     id: 'settings.app.form.useTouchIdToUnlock',
-    defaultMessage: 'Allow using Touch ID to unlock',
+    defaultMessage: 'Allow using TouchID to unlock Ferdi',
   },
   inactivityLock: {
     id: 'settings.app.form.inactivityLock',
@@ -154,7 +154,7 @@ const messages = defineMessages({
   },
   darkMode: {
     id: 'settings.app.form.darkMode',
-    defaultMessage: 'Dark Mode',
+    defaultMessage: 'Enable Dark Mode',
   },
   adaptableDarkMode: {
     id: 'settings.app.form.adaptableDarkMode',
diff --git a/src/containers/settings/EditUserScreen.js b/src/containers/settings/EditUserScreen.js
index 92ef94c29..ca1363c59 100644
--- a/src/containers/settings/EditUserScreen.js
+++ b/src/containers/settings/EditUserScreen.js
@@ -13,11 +13,11 @@ import { required, email, minLength } from '../../helpers/validation-helpers';
 const messages = defineMessages({
   firstname: {
     id: 'settings.user.form.firstname',
-    defaultMessage: 'Firstname',
+    defaultMessage: 'First Name',
   },
   lastname: {
     id: 'settings.user.form.lastname',
-    defaultMessage: 'Lastname',
+    defaultMessage: 'Last Name',
   },
   email: {
     id: 'settings.user.form.email',
diff --git a/src/features/workspaces/components/WorkspaceDrawer.js b/src/features/workspaces/components/WorkspaceDrawer.js
index 2f57e34a2..63eb4f75c 100644
--- a/src/features/workspaces/components/WorkspaceDrawer.js
+++ b/src/features/workspaces/components/WorkspaceDrawer.js
@@ -22,11 +22,11 @@ const messages = defineMessages({
   },
   workspacesSettingsTooltip: {
     id: 'workspaceDrawer.workspacesSettingsTooltip',
-    defaultMessage: 'Workspaces settings',
+    defaultMessage: 'Edit workspaces settings',
   },
   workspaceFeatureInfo: {
     id: 'workspaceDrawer.workspaceFeatureInfo',
-    defaultMessage: 'Info about workspace feature',
+    defaultMessage: '<p>Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>',
   },
   addNewWorkspaceLabel: {
     id: 'workspaceDrawer.addNewWorkspaceLabel',
diff --git a/src/features/workspaces/components/WorkspacesDashboard.js b/src/features/workspaces/components/WorkspacesDashboard.js
index fd279f896..49552df6b 100644
--- a/src/features/workspaces/components/WorkspacesDashboard.js
+++ b/src/features/workspaces/components/WorkspacesDashboard.js
@@ -40,7 +40,7 @@ const messages = defineMessages({
   },
   workspaceFeatureInfo: {
     id: 'settings.workspaces.workspaceFeatureInfo',
-    defaultMessage: 'Info about workspace feature',
+    defaultMessage: 'Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time. You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.',
   },
   workspaceFeatureHeadline: {
     id: 'settings.workspaces.workspaceFeatureHeadline',
diff --git a/src/helpers/validation-helpers.ts b/src/helpers/validation-helpers.ts
index 80d368b2e..3a9622309 100644
--- a/src/helpers/validation-helpers.ts
+++ b/src/helpers/validation-helpers.ts
@@ -4,19 +4,19 @@ import isEmail from 'validator/lib/isEmail';
 const messages = defineMessages({
   required: {
     id: 'validation.required',
-    defaultMessage: 'Field is required',
+    defaultMessage: '{field} is required',
   },
   email: {
     id: 'validation.email',
-    defaultMessage: 'Email not valid',
+    defaultMessage: '{field} is not valid',
   },
   url: {
     id: 'validation.url',
-    defaultMessage: 'Not a valid URL',
+    defaultMessage: '{field} is not a valid URL',
   },
   minLength: {
     id: 'validation.minLength',
-    defaultMessage: 'Too few characters',
+    defaultMessage: '{field} should be at least {length} characters long',
   },
   oneRequired: {
     id: 'validation.oneRequired',
-- 
cgit v1.2.3-70-g09d2


From b1243eff99bbfadab8f7deb8d714bbebae13e39a Mon Sep 17 00:00:00 2001
From: mhatvan <markus_hatvan@aon.at>
Date: Tue, 14 Sep 2021 14:12:07 +0200
Subject: chore: add --preserve-whitespace flag for extract script and sync
 translations

---
 package.json                                        | 2 +-
 src/components/settings/account/AccountDashboard.js | 2 +-
 src/containers/settings/EditSettingsScreen.js       | 2 +-
 src/i18n/locales/en-US.json                         | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/containers/settings')

diff --git a/package.json b/package.json
index c85e73eb8..9add26ec6 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
     "test": "jest",
     "test:watch": "jest --watch",
     "lint": "eslint \"{src,scripts,packages,uidev}/**/*.{js,jsx,ts,tsx}\" --quiet --fix",
-    "extract": "formatjs extract 'src/**/*.{js,ts}' --out-file temp.json --flatten --id-interpolation-pattern '[sha512:contenthash:base64:6]'",
+    "extract": "formatjs extract 'src/**/*.{js,ts}' --out-file temp.json --flatten --id-interpolation-pattern '[sha512:contenthash:base64:6]' --preserve-whitespace",
     "compile": "formatjs compile 'temp.json' --out-file src/i18n/locales/en-US.json",
     "manage-translations": "npm run extract && npm run compile && rimraf temp.json",
     "prebuild": "preval-build-info-cli && gulp build",
diff --git a/src/components/settings/account/AccountDashboard.js b/src/components/settings/account/AccountDashboard.js
index 66edc4975..544821e9a 100644
--- a/src/components/settings/account/AccountDashboard.js
+++ b/src/components/settings/account/AccountDashboard.js
@@ -51,7 +51,7 @@ const messages = defineMessages({
   },
   yourLicense: {
     id: 'settings.account.yourLicense',
-    defaultMessage: 'Your Franz License:',
+    defaultMessage: 'Your Ferdi License:',
   },
   accountUnavailable: {
     id: 'settings.account.accountUnavailable',
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js
index 3df433160..92985b68c 100644
--- a/src/containers/settings/EditSettingsScreen.js
+++ b/src/containers/settings/EditSettingsScreen.js
@@ -214,7 +214,7 @@ const messages = defineMessages({
   },
   enableTodos: {
     id: 'settings.app.form.enableTodos',
-    defaultMessage: 'Enable Franz Todos',
+    defaultMessage: 'Enable Ferdi Todos',
   },
   keepAllWorkspacesLoaded: {
     id: 'settings.app.form.keepAllWorkspacesLoaded',
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index aae78999d..e2e0cdc83 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -253,9 +253,9 @@
   "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
   "settings.app.inactivityLockInfo": "Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
   "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
-  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected. Using Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
   "settings.app.lockedPassword": "Password",
-  "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember. If you loose this password, you will have to reinstall Ferdi.",
+  "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
   "settings.app.restartRequired": "Changes require restart",
   "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
   "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
-- 
cgit v1.2.3-70-g09d2


From 95df3522a15631abc51a4295cae0ea401a8d4e1e Mon Sep 17 00:00:00 2001
From: Markus Hatvan <markus_hatvan@aon.at>
Date: Tue, 14 Sep 2021 19:58:52 +0200
Subject: feat: add eslint-plugin-unicorn (#1936)

---
 .eslintrc                                          | 165 ------------
 .eslintrc.js                                       | 186 +++++++++++++
 package-lock.json                                  |  86 ++++++
 package.json                                       |   4 +-
 packages/forms/src/button/index.tsx                |  70 +++--
 packages/forms/src/input/scorePassword.ts          |  10 +-
 packages/forms/src/select/index.tsx                |   7 +-
 packages/theme/src/themes/dark/index.ts            |   2 +-
 scripts/build-theme-info.js                        |  40 +--
 scripts/link-readme.js                             |   8 +-
 src/actions/lib/actions.ts                         |   3 +
 src/api/apiBase.ts                                 |  17 +-
 src/api/server/ServerApi.js                        |  80 +++---
 src/api/utils/auth.js                              |  15 +-
 src/app.js                                         |   2 +-
 src/components/auth/Invite.js                      |  10 +-
 src/components/settings/SettingsLayout.js          |   1 +
 .../settings/services/EditServiceForm.js           |   4 +-
 .../settings/services/ServicesDashboard.js         |   2 +-
 src/components/ui/ImageUpload.js                   |   4 +-
 src/components/ui/InfoBar.js                       |   3 +-
 src/components/ui/Infobox.js                       |   3 +-
 src/components/ui/Modal/index.js                   |   2 +-
 src/components/ui/Select.js                        |   2 +-
 src/components/ui/effects/Appear.js                |  10 +-
 src/config.ts                                      |   2 +-
 src/containers/settings/AccountScreen.js           |  14 +-
 src/containers/settings/SettingsWindow.js          |   4 +-
 src/electron/ipc-api/appIndicator.ts               |   4 +-
 src/electron/ipc-api/autoUpdate.ts                 |   4 +-
 src/electron/ipc-api/cld.ts                        |   4 +-
 src/electron/ipc-api/dnd.ts                        |   4 +-
 src/electron/ipc-api/download.ts                   |  10 +-
 src/features/appearance/index.js                   |  26 +-
 src/features/communityRecipes/store.js             |   8 +-
 src/features/quickSwitch/Component.js              |   6 +-
 src/features/serviceProxy/index.js                 |   4 +-
 src/features/settingsWS/store.js                   |  20 +-
 src/features/todos/preload.js                      |  12 +-
 src/features/utils/FeatureStore.js                 |   8 +-
 .../webControls/containers/WebControlsScreen.js    |  28 +-
 .../workspaces/components/EditWorkspaceForm.js     |   2 +-
 .../workspaces/components/WorkspaceDrawerItem.js   |   2 +-
 src/features/workspaces/models/Workspace.js        |   2 +-
 src/features/workspaces/store.js                   |   8 +-
 src/helpers/i18n-helpers.ts                        |  12 +-
 src/helpers/password-helpers.ts                    |  14 +-
 src/helpers/recipe-helpers.ts                      |  14 +-
 src/helpers/schedule-helpers.ts                    |   8 +-
 src/helpers/url-helpers.ts                         |   2 +-
 src/helpers/userAgent-helpers.ts                   |   2 +-
 src/helpers/validation-helpers.ts                  |  19 +-
 src/i18n/apply-branding.js                         |  15 +-
 src/i18n/translations.js                           |  10 +-
 src/index.js                                       |   6 +-
 .../app/Controllers/Http/RecipeController.js       |  51 ++--
 .../app/Controllers/Http/ServiceController.js      |  16 +-
 .../app/Controllers/Http/UserController.js         | 176 +++++++------
 .../app/Middleware/ConvertEmptyStringsToNull.js    |   2 +-
 src/internal-server/app/Models/Recipe.js           |   3 +-
 src/internal-server/app/Models/Service.js          |   3 +-
 src/internal-server/app/Models/Token.js            |   3 +-
 src/internal-server/app/Models/User.js             |   3 +-
 src/internal-server/app/Models/Workspace.js        |   3 +-
 src/internal-server/config/shield.js               |   3 +-
 src/internal-server/public/js/transfer.js          |  20 +-
 src/internal-server/start/kernel.js                |  10 +-
 src/internal-server/start/migrate.js               |  24 +-
 src/internal-server/test.js                        |   2 +-
 src/lib/Menu.js                                    |  38 +--
 src/lib/TouchBar.js                                |   8 +-
 src/models/News.ts                                 |   6 +-
 src/models/Recipe.ts                               |   6 +-
 src/models/RecipePreview.ts                        |   6 +-
 src/models/Service.js                              | 142 +++++++---
 src/models/User.ts                                 |   4 +-
 src/models/UserAgent.js                            |  19 +-
 src/prop-types.ts                                  |   1 -
 src/stores/AppStore.js                             |  32 ++-
 src/stores/FeaturesStore.js                        |  16 +-
 src/stores/GlobalErrorStore.js                     |  10 +-
 src/stores/RecipesStore.js                         |  51 ++--
 src/stores/RequestStore.js                         |  18 +-
 src/stores/ServicesStore.js                        | 291 +++++++++++----------
 src/stores/SettingsStore.js                        |  60 +++--
 src/stores/UserStore.js                            |  78 ++++--
 src/stores/index.ts                                |   4 +-
 src/stores/lib/CachedRequest.js                    |  96 ++++---
 src/stores/lib/Request.js                          |   2 +-
 src/stores/lib/Store.js                            |   6 +-
 src/webview/badge.ts                               |   2 +-
 src/webview/contextMenuBuilder.js                  | 248 +++++++++++-------
 src/webview/darkmode.ts                            |   6 +-
 src/webview/lib/RecipeWebview.js                   |  25 +-
 src/webview/lib/Userscript.js                      |  10 +-
 src/webview/recipe.js                              |  41 ++-
 src/webview/sessionHandler.ts                      |  17 +-
 src/webview/spellchecker.ts                        |   2 +-
 uidev/src/index.tsx                                |   2 +-
 99 files changed, 1439 insertions(+), 1137 deletions(-)
 delete mode 100644 .eslintrc
 create mode 100644 .eslintrc.js

(limited to 'src/containers/settings')

diff --git a/.eslintrc b/.eslintrc
deleted file mode 100644
index 26159ed87..000000000
--- a/.eslintrc
+++ /dev/null
@@ -1,165 +0,0 @@
-{
-  "root": true,
-  "parser": "@babel/eslint-parser",
-  "extends": "eslint-config-airbnb",
-  "plugins": [
-    "jest"
-  ],
-  "overrides": [
-    {
-      "files": [
-        "**/*.ts",
-        "**/*.tsx"
-      ],
-      "env": {
-        "browser": true,
-        "es6": true,
-        "node": true
-      },
-      "extends": [
-        "airbnb-typescript"
-      ],
-      "parser": "@typescript-eslint/parser",
-      "parserOptions": {
-        "ecmaFeatures": {
-          "jsx": true
-        },
-        "ecmaVersion": 2018,
-        "sourceType": "module",
-        "project": "./tsconfig.json"
-      },
-      "plugins": [
-        "@typescript-eslint"
-      ],
-      "rules": {
-        // eslint
-        "arrow-parens": 0,
-        "array-callback-return": 1,
-        "class-methods-use-this": 0,
-        "consistent-return": 0,
-        "function-paren-newline": 0,
-        "implicit-arrow-linebreak": 0,
-        "linebreak-style": 0,
-        "max-len": 0,
-        "no-confusing-arrow": 0,
-        "no-console": 0,
-        "no-param-reassign": 0,
-        "no-return-assign": 1,
-        "no-underscore-dangle": 0,
-        "no-use-before-define": 0,
-        "prefer-destructuring": 1,
-        "object-curly-newline": 0,
-        "operator-linebreak": 0,
-        // @typescript-eslint
-        "@typescript-eslint/indent": 0,
-        "@typescript-eslint/no-shadow": 0,
-        "@typescript-eslint/no-unused-expressions": 0,
-        // eslint-plugin-import
-        "import/extensions": 0,
-        "import/no-cycle": 1,
-        "import/no-extraneous-dependencies": 0,
-        "import/no-unresolved": 0,
-        "import/prefer-default-export": 0,
-        // eslint-plugin-react
-        "react/destructuring-assignment": 0,
-        "react/button-has-type": 0,
-        "react/forbid-prop-types": 0,
-        "react/jsx-curly-newline": 0,
-        "react/jsx-no-bind": 0,
-        "react/jsx-no-target-blank": 0,
-        "react/jsx-props-no-spreading": 0,
-        "react/no-deprecated": 1,
-        "react/no-array-index-key": 0,
-        "react/prefer-stateless-function": 0,
-        "react/sort-comp": 0,
-        "react/state-in-constructor": 0,
-        "react/static-property-placement": 0,
-        //  eslint-plugin-jsx-a11y
-        "jsx-a11y/click-events-have-key-events": 1,
-        "jsx-a11y/mouse-events-have-key-events": 1,
-        "jsx-a11y/label-has-for": [
-          2,
-          {
-            "components": [
-              "Label"
-            ],
-            "required": {
-              "every": [
-                "id"
-              ]
-            },
-            "allowChildren": false
-          }
-        ],
-        "jsx-a11y/no-static-element-interactions": 0,
-        "jsx-a11y/no-noninteractive-element-interactions": 1
-      }
-    }
-  ],
-  "settings": {
-    "react": {
-      "pragma": "React", // Pragma to use, default to "React"
-      "version": "detect" // React version. "detect" automatically picks the version you have installed.
-    }
-  },
-  "globals": {
-    "window": true,
-    "document": true,
-    "FormData": true,
-    "localStorage": true,
-    "navigator": true,
-    "Element": true,
-    "use": true,
-    "FileReader": true
-  },
-  "env": {
-    "jest/globals": true
-  },
-  "rules": {
-    // eslint
-    "arrow-parens": 0,
-    "class-methods-use-this": 0,
-    "consistent-return": 1,
-    "implicit-arrow-linebreak": 0,
-    "function-paren-newline": 0,
-    "max-len": 0,
-    "no-await-in-loop": 1,
-    "no-console": [
-      1,
-      {
-        "allow": [
-          "warn",
-          "error"
-        ]
-      }
-    ],
-    "no-param-reassign": 1,
-    "no-restricted-syntax": 0,
-    "no-underscore-dangle": 0,
-    "operator-linebreak": 0,
-    "prefer-destructuring": 1,
-    "object-curly-newline": 0,
-    // eslint-plugin-import
-    "import/extensions": 1,
-    "import/prefer-default-export": 0,
-    "import/no-extraneous-dependencies": 0, // various false positives, re-enable at some point
-    "import/no-unresolved": 1,
-    // eslint-plugin-react
-    "react/forbid-prop-types": 1,
-    "react/destructuring-assignment": 0,
-    "react/jsx-curly-newline": 0,
-    "react/jsx-filename-extension": 1,
-    "react/jsx-one-expression-per-line": 0,
-    "react/jsx-no-bind": 1,
-    "react/jsx-props-no-spreading": 0,
-    "react/prefer-stateless-function": 1,
-    "react/prop-types": 0,
-    "react/static-property-placement": 0,
-    "react/state-in-constructor": 1,
-    "react/sort-comp": 0,
-    //  eslint-plugin-jsx-a11y
-    "jsx-a11y/click-events-have-key-events": 1,
-    "jsx-a11y/no-static-element-interactions": 1,
-    "jsx-a11y/no-noninteractive-element-interactions": 1
-  }
-}
diff --git a/.eslintrc.js b/.eslintrc.js
new file mode 100644
index 000000000..057631708
--- /dev/null
+++ b/.eslintrc.js
@@ -0,0 +1,186 @@
+module.exports = {
+  root: true,
+  parser: '@babel/eslint-parser',
+  parserOptions: {
+    ecmaFeatures: {
+      jsx: true,
+    },
+    ecmaVersion: 2018,
+    sourceType: 'module',
+    project: './tsconfig.json',
+  },
+  extends: ['eslint-config-airbnb', 'plugin:unicorn/recommended'],
+  plugins: ['jest'],
+  settings: {
+    react: {
+      pragma: 'React', // Pragma to use, default to "React"
+      version: 'detect', // React version. "detect" automatically picks the version you have installed.
+    },
+  },
+  globals: {
+    window: true,
+    document: true,
+    FormData: true,
+    localStorage: true,
+    navigator: true,
+    Element: true,
+    use: true,
+    FileReader: true,
+  },
+  env: {
+    browser: true,
+    es6: true,
+    node: true,
+    jest: true,
+  },
+  overrides: [
+    {
+      files: ['**/*.ts', '**/*.tsx'],
+      extends: ['airbnb-typescript', 'plugin:unicorn/recommended'],
+      parser: '@typescript-eslint/parser',
+      plugins: ['@typescript-eslint'],
+      rules: {
+        // eslint
+        'arrow-parens': 0,
+        'array-callback-return': 1,
+        'class-methods-use-this': 0,
+        'consistent-return': 0,
+        'function-paren-newline': 0,
+        'implicit-arrow-linebreak': 0,
+        'linebreak-style': 0,
+        'max-len': 0,
+        'no-confusing-arrow': 0,
+        'no-console': 0,
+        'no-param-reassign': 0,
+        'no-restricted-syntax': 0,
+        'no-return-assign': 1,
+        'no-underscore-dangle': 0,
+        'no-use-before-define': 0,
+        'prefer-destructuring': 1,
+        'object-curly-newline': 0,
+        'operator-linebreak': 0,
+        // @typescript-eslint
+        '@typescript-eslint/indent': 0,
+        '@typescript-eslint/no-shadow': 0,
+        '@typescript-eslint/no-unused-expressions': 0,
+        // eslint-plugin-import
+        'import/extensions': 0,
+        'import/no-cycle': 1,
+        'import/no-extraneous-dependencies': 0,
+        'import/no-unresolved': 0,
+        'import/prefer-default-export': 0,
+        // eslint-plugin-react
+        'react/destructuring-assignment': 0,
+        'react/button-has-type': 0,
+        'react/forbid-prop-types': 0,
+        'react/jsx-curly-newline': 0,
+        'react/jsx-no-bind': 0,
+        'react/jsx-no-target-blank': 0,
+        'react/jsx-props-no-spreading': 0,
+        'react/no-deprecated': 1,
+        'react/no-array-index-key': 0,
+        'react/prefer-stateless-function': 0,
+        'react/sort-comp': 0,
+        'react/state-in-constructor': 0,
+        'react/static-property-placement': 0,
+        //  eslint-plugin-jsx-a11y
+        'jsx-a11y/click-events-have-key-events': 1,
+        'jsx-a11y/mouse-events-have-key-events': 1,
+        'jsx-a11y/label-has-for': [
+          2,
+          {
+            components: ['Label'],
+            required: {
+              every: ['id'],
+            },
+            allowChildren: false,
+          },
+        ],
+        'jsx-a11y/no-static-element-interactions': 0,
+        'jsx-a11y/no-noninteractive-element-interactions': 1,
+        //  eslint-plugin-unicorn
+        'unicorn/filename-case': 0,
+        'unicorn/no-null': 0,
+        'unicorn/no-useless-undefined': 0,
+        'unicorn/prefer-module': 0,
+        'unicorn/prevent-abbreviations': 0,
+        'unicorn/prefer-node-protocol': 0,
+        'unicorn/import-style': [
+          2,
+          {
+            styles: {
+              path: {
+                named: true,
+              },
+            },
+          },
+        ],
+        'unicorn/consistent-destructuring': 0,
+      },
+    },
+  ],
+  rules: {
+    // eslint
+    'arrow-parens': 0,
+    'class-methods-use-this': 0,
+    'consistent-return': 1,
+    'implicit-arrow-linebreak': 0,
+    indent: 0,
+    'function-paren-newline': 0,
+    'linebreak-style': 0,
+    'max-len': 0,
+    'no-await-in-loop': 1,
+    'no-console': [
+      1,
+      {
+        allow: ['warn', 'error'],
+      },
+    ],
+    'no-param-reassign': 1,
+    'no-restricted-syntax': 0,
+    'no-underscore-dangle': 0,
+    'operator-linebreak': 0,
+    'prefer-destructuring': 1,
+    'object-curly-newline': 0,
+    // eslint-plugin-import
+    'import/extensions': 0,
+    'import/prefer-default-export': 0,
+    'import/no-extraneous-dependencies': 0, // various false positives, re-enable at some point
+    'import/no-unresolved': 0,
+    // eslint-plugin-react
+    'react/forbid-prop-types': 1,
+    'react/destructuring-assignment': 0,
+    'react/jsx-curly-newline': 0,
+    'react/jsx-filename-extension': 1,
+    'react/jsx-one-expression-per-line': 0,
+    'react/jsx-no-bind': 1,
+    'react/jsx-props-no-spreading': 0,
+    'react/prefer-stateless-function': 1,
+    'react/prop-types': 0,
+    'react/static-property-placement': 0,
+    'react/state-in-constructor': 1,
+    'react/sort-comp': 0,
+    //  eslint-plugin-jsx-a11y
+    'jsx-a11y/click-events-have-key-events': 1,
+    'jsx-a11y/no-static-element-interactions': 1,
+    'jsx-a11y/no-noninteractive-element-interactions': 1,
+    //  eslint-plugin-unicorn
+    'unicorn/filename-case': 0,
+    'unicorn/no-null': 0,
+    'unicorn/no-useless-undefined': 0,
+    'unicorn/prefer-module': 0,
+    'unicorn/prevent-abbreviations': 0,
+    'unicorn/prefer-node-protocol': 0,
+    'unicorn/import-style': [
+      2,
+      {
+        styles: {
+          path: {
+            named: true,
+          },
+        },
+      },
+    ],
+    'unicorn/consistent-destructuring': 0,
+  },
+};
diff --git a/package-lock.json b/package-lock.json
index a278c76f1..a3076c7d6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9851,6 +9851,12 @@
         "sax": "^1.2.4"
       }
     },
+    "builtin-modules": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.2.0.tgz",
+      "integrity": "sha512-lGzLKcioL90C7wMczpkY0n/oART3MbBa8R9OFGE1rJxoVI86u4WAGfEk8Wjv10eKSyTHVGkSo3bvBylCEtk7LA==",
+      "dev": true
+    },
     "builtin-status-codes": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
@@ -10394,6 +10400,15 @@
         }
       }
     },
+    "clean-regexp": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/clean-regexp/-/clean-regexp-1.0.0.tgz",
+      "integrity": "sha1-jffHquUf02h06PjQW5GAvBGj/tc=",
+      "dev": true,
+      "requires": {
+        "escape-string-regexp": "^1.0.5"
+      }
+    },
     "clean-stack": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
@@ -14424,6 +14439,43 @@
       "integrity": "sha512-623WEiZJqxR7VdxFCKLI6d6LLpwJkGPYKODnkH3D7WpOG5KM8yWueBd8TLsNAetEJNF5iJmolaAKO3F8yzyVBQ==",
       "dev": true
     },
+    "eslint-plugin-unicorn": {
+      "version": "36.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-unicorn/-/eslint-plugin-unicorn-36.0.0.tgz",
+      "integrity": "sha512-xxN2vSctGWnDW6aLElm/LKIwcrmk6mdiEcW55Uv5krcrVcIFSWMmEgc/hwpemYfZacKZ5npFERGNz4aThsp1AA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-validator-identifier": "^7.14.9",
+        "ci-info": "^3.2.0",
+        "clean-regexp": "^1.0.0",
+        "eslint-template-visitor": "^2.3.2",
+        "eslint-utils": "^3.0.0",
+        "is-builtin-module": "^3.1.0",
+        "lodash": "^4.17.21",
+        "pluralize": "^8.0.0",
+        "read-pkg-up": "^7.0.1",
+        "regexp-tree": "^0.1.23",
+        "safe-regex": "^2.1.1",
+        "semver": "^7.3.5"
+      },
+      "dependencies": {
+        "pluralize": {
+          "version": "8.0.0",
+          "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-8.0.0.tgz",
+          "integrity": "sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA==",
+          "dev": true
+        },
+        "safe-regex": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-2.1.1.tgz",
+          "integrity": "sha512-rx+x8AMzKb5Q5lQ95Zoi6ZbJqwCLkqi3XuJXp5P3rT8OEc6sZCJG5AE5dU3lsgRr/F4Bs31jSlVN+j5KrsGu9A==",
+          "dev": true,
+          "requires": {
+            "regexp-tree": "~0.1.1"
+          }
+        }
+      }
+    },
     "eslint-scope": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
@@ -14434,6 +14486,19 @@
         "estraverse": "^4.1.1"
       }
     },
+    "eslint-template-visitor": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/eslint-template-visitor/-/eslint-template-visitor-2.3.2.tgz",
+      "integrity": "sha512-3ydhqFpuV7x1M9EK52BPNj6V0Kwu0KKkcIAfpUhwHbR8ocRln/oUHgfxQupY8O1h4Qv/POHDumb/BwwNfxbtnA==",
+      "dev": true,
+      "requires": {
+        "@babel/core": "^7.12.16",
+        "@babel/eslint-parser": "^7.12.16",
+        "eslint-visitor-keys": "^2.0.0",
+        "esquery": "^1.3.1",
+        "multimap": "^1.1.0"
+      }
+    },
     "eslint-utils": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
@@ -17902,6 +17967,15 @@
       "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
       "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
     },
+    "is-builtin-module": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.1.0.tgz",
+      "integrity": "sha512-OV7JjAgOTfAFJmHZLvpSTb4qi0nIILDV1gWPYDnDJUTNFM5aGlRAhk4QcT8i7TuAleeEV5Fdkqn3t4mS+Q11fg==",
+      "dev": true,
+      "requires": {
+        "builtin-modules": "^3.0.0"
+      }
+    },
     "is-callable": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
@@ -22324,6 +22398,12 @@
       "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=",
       "dev": true
     },
+    "multimap": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/multimap/-/multimap-1.1.0.tgz",
+      "integrity": "sha512-0ZIR9PasPxGXmRsEF8jsDzndzHDj7tIav+JUmvIFB/WHswliFnquxECT/De7GR4yg99ky/NlRKJT82G1y271bw==",
+      "dev": true
+    },
     "multimatch": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-5.0.0.tgz",
@@ -25934,6 +26014,12 @@
         }
       }
     },
+    "regexp-tree": {
+      "version": "0.1.23",
+      "resolved": "https://registry.npmjs.org/regexp-tree/-/regexp-tree-0.1.23.tgz",
+      "integrity": "sha512-+7HWfb4Bvu8Rs2eQTUIpX9I/PlQkYOuTNbRpKLJlQpSgwSkzFYh+pUj0gtvglnOZLKB6YgnIgRuJ2/IlpL48qw==",
+      "dev": true
+    },
     "regexp.prototype.flags": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz",
diff --git a/package.json b/package.json
index 9add26ec6..d0675ba6b 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,8 @@
     "dev": "cross-env NODE_ENV=development gulp dev",
     "test": "jest",
     "test:watch": "jest --watch",
-    "lint": "eslint \"{src,scripts,packages,uidev}/**/*.{js,jsx,ts,tsx}\" --quiet --fix",
+    "lint": "eslint \"{src,scripts,packages,uidev}/**/*.{js,jsx,ts,tsx}\" --quiet",
+    "lint:fix": "npm run lint -- --fix",
     "extract": "formatjs extract 'src/**/*.{js,ts}' --out-file temp.json --flatten --id-interpolation-pattern '[sha512:contenthash:base64:6]' --preserve-whitespace",
     "compile": "formatjs compile 'temp.json' --out-file src/i18n/locales/en-US.json",
     "manage-translations": "npm run extract && npm run compile && rimraf temp.json",
@@ -187,6 +188,7 @@
     "eslint-plugin-prettier": "3.4.0",
     "eslint-plugin-react": "7.25.1",
     "eslint-plugin-react-hooks": "4.2.0",
+    "eslint-plugin-unicorn": "36.0.0",
     "expect.js": "0.3.1",
     "gulp": "4.0.2",
     "gulp-babel": "8.0.0",
diff --git a/packages/forms/src/button/index.tsx b/packages/forms/src/button/index.tsx
index 48fb61635..c9ae47d55 100644
--- a/packages/forms/src/button/index.tsx
+++ b/packages/forms/src/button/index.tsx
@@ -227,44 +227,38 @@ class ButtonComponent extends Component<IProps> {
       </>
     );
 
-    let wrapperComponent: JSX.Element;
-
-    if (!href) {
-      wrapperComponent = (
-        <button
-          id={id}
-          type={type}
-          onClick={onClick}
-          className={classnames({
-            [`${classes.button}`]: true,
-            [`${classes[buttonType as ButtonType]}`]: true,
-            [`${classes.disabled}`]: disabled,
-            [`${className}`]: className,
-          })}
-          disabled={disabled}
-          data-type="franz-button"
-        >
-          {content}
-        </button>
-      );
-    } else {
-      wrapperComponent = (
-        <a
-          href={href}
-          target={target}
-          onClick={onClick}
-          className={classnames({
-            [`${classes.button}`]: true,
-            [`${classes[buttonType as ButtonType]}`]: true,
-            [`${className}`]: className,
-          })}
-          rel={target === '_blank' ? 'noopener' : ''}
-          data-type="franz-button"
-        >
-          {content}
-        </a>
-      );
-    }
+    const wrapperComponent = !href ? (
+      <button
+        id={id}
+        type={type}
+        onClick={onClick}
+        className={classnames({
+          [`${classes.button}`]: true,
+          [`${classes[buttonType as ButtonType]}`]: true,
+          [`${classes.disabled}`]: disabled,
+          [`${className}`]: className,
+        })}
+        disabled={disabled}
+        data-type="franz-button"
+      >
+        {content}
+      </button>
+    ) : (
+      <a
+        href={href}
+        target={target}
+        onClick={onClick}
+        className={classnames({
+          [`${classes.button}`]: true,
+          [`${classes[buttonType as ButtonType]}`]: true,
+          [`${className}`]: className,
+        })}
+        rel={target === '_blank' ? 'noopener' : ''}
+        data-type="franz-button"
+      >
+        {content}
+      </a>
+    );
 
     return wrapperComponent;
   }
diff --git a/packages/forms/src/input/scorePassword.ts b/packages/forms/src/input/scorePassword.ts
index bc30de4b8..59502e2b0 100644
--- a/packages/forms/src/input/scorePassword.ts
+++ b/packages/forms/src/input/scorePassword.ts
@@ -18,9 +18,9 @@ export function scorePasswordFunc(password: string): number {
 
   // award every unique letter until 5 repetitions
   const letters: ILetters = {};
-  for (let i = 0; i < password.length; i += 1) {
-    letters[password[i]] = (letters[password[i]] || 0) + 1;
-    score += 5.0 / letters[password[i]];
+  for (const element of password) {
+    letters[element] = (letters[element] || 0) + 1;
+    score += 5 / letters[element];
   }
 
   // bonus points for mixing it up
@@ -32,9 +32,9 @@ export function scorePasswordFunc(password: string): number {
   };
 
   let variationCount = 0;
-  Object.keys(variations).forEach(key => {
+  for (const key of Object.keys(variations)) {
     variationCount += variations[key] === true ? 1 : 0;
-  });
+  }
 
   score += (variationCount - 1) * 10;
 
diff --git a/packages/forms/src/select/index.tsx b/packages/forms/src/select/index.tsx
index d7479f63e..7806baa2a 100644
--- a/packages/forms/src/select/index.tsx
+++ b/packages/forms/src/select/index.tsx
@@ -187,10 +187,8 @@ class SelectComponent extends Component<IProps> {
   componentDidUpdate() {
     const { open } = this.state;
 
-    if (this.searchInputRef && this.searchInputRef.current) {
-      if (open) {
-        this.searchInputRef.current.focus();
-      }
+    if (this.searchInputRef && this.searchInputRef.current && open) {
+      this.searchInputRef.current.focus();
     }
   }
 
@@ -228,6 +226,7 @@ class SelectComponent extends Component<IProps> {
   }
 
   componentWillUnmount() {
+    // eslint-disable-next-line unicorn/no-invalid-remove-event-listener
     window.removeEventListener('keydown', this.arrowKeysHandler.bind(this));
   }
 
diff --git a/packages/theme/src/themes/dark/index.ts b/packages/theme/src/themes/dark/index.ts
index 87a68cb5d..aa132c743 100644
--- a/packages/theme/src/themes/dark/index.ts
+++ b/packages/theme/src/themes/dark/index.ts
@@ -9,7 +9,7 @@ export default (brandPrimary: string) => {
   let brandPrimaryColor = color(legacyStyles.themeBrandPrimary);
   try {
     brandPrimaryColor = color(defaultStyles.brandPrimary);
-  } catch (e) {
+  } catch {
     // Ignore invalid color and fall back to default.
   }
 
diff --git a/scripts/build-theme-info.js b/scripts/build-theme-info.js
index 4058be942..8aee96ab7 100644
--- a/scripts/build-theme-info.js
+++ b/scripts/build-theme-info.js
@@ -23,7 +23,7 @@ async function getRulesFromCssFile(file) {
   const cssSrc = (await fs.readFile(file)).toString();
   const cssTree = css.parse(cssSrc);
 
-  return cssTree.stylesheet.rules;
+  return cssTree.stylesheet?.rules;
 }
 
 /**
@@ -49,25 +49,30 @@ async function getRulesFromCssFile(file) {
 function getSelectorsDeclaringValues(rules, values) {
   const output = {};
 
-  rules.forEach((rule) => {
+  for (const rule of rules) {
     if (rule.declarations) {
-      rule.declarations.forEach((declaration) => {
-        if (declaration.type === 'declaration'
-            && values.includes(declaration.value.toLowerCase())) {
+      for (const declaration of rule.declarations) {
+        if (
+          declaration.type === 'declaration' &&
+          values.includes(declaration.value.toLowerCase())
+        ) {
           if (!output[declaration.property]) {
             output[declaration.property] = [];
           }
-          output[declaration.property] = output[declaration.property].concat(rule.selectors);
+          // eslint-disable-next-line unicorn/prefer-spread
+          output[declaration.property] = output[declaration.property].concat(
+            rule.selectors,
+          );
         }
-      });
+      }
     }
-  });
+  }
 
   return output;
 }
 
 async function generateThemeInfo() {
-  if (!await fs.pathExists(cssFile)) {
+  if (!(await fs.pathExists(cssFile))) {
     console.log('Please make sure to build the project first.');
     return;
   }
@@ -75,23 +80,24 @@ async function generateThemeInfo() {
   // Read and parse css bundle
   const rules = await getRulesFromCssFile(cssFile);
 
-  console.log(`Found ${rules.length} rules`);
+  console.log(`Found ${rules?.length} rules`);
 
   // Get rules specifying the brand colors
   const brandRules = getSelectorsDeclaringValues(rules, accentColors);
 
-  console.log(`Found ${Object.keys(brandRules).join(', ')} properties that set color to brand color`);
+  console.log(
+    `Found ${Object.keys(brandRules).join(
+      ', ',
+    )} properties that set color to brand color`,
+  );
 
   // Join array of declarations into a single string
-  Object.keys(brandRules).forEach((rule) => {
+  for (const rule of Object.keys(brandRules)) {
     brandRules[rule] = brandRules[rule].join(', ');
-  });
+  }
 
   // Write object with theme info to file
-  fs.writeFile(
-    outputFile,
-    JSON.stringify(brandRules),
-  );
+  fs.writeFile(outputFile, JSON.stringify(brandRules));
 }
 
 generateThemeInfo();
diff --git a/scripts/link-readme.js b/scripts/link-readme.js
index 1e47cddf8..2ab38912c 100644
--- a/scripts/link-readme.js
+++ b/scripts/link-readme.js
@@ -22,7 +22,7 @@ let replacements = 0;
 // Regex matches strings that don't begin with a "[", i.e. are not already linked
 // followed by a "franz#" and digits to indicate
 // a GitHub issue, and not ending with a "]"
-readme = readme.replace(/(?<!\[)franz#\d{1,}(?![\]\d])/gi, (match) => {
+readme = readme.replace(/(?<!\[)franz#\d+(?![\d\]])/gi, match => {
   const issueNr = match.replace('franz#', '');
   replacements += 1;
   return `[franz#${issueNr}](https://github.com/meetfranz/franz/issues/${issueNr})`;
@@ -31,7 +31,7 @@ readme = readme.replace(/(?<!\[)franz#\d{1,}(?![\]\d])/gi, (match) => {
 // Replace external issues
 // Regex matches strings that don't begin with a "[", followed a repo name in the format "user/repo"
 // followed by a "#" and digits to indicate a GitHub issue, and not ending with a "]"
-readme = readme.replace(/(?<!\[)\w+\/\w+#\d{1,}(?![\]\d])/gi, (match) => {
+readme = readme.replace(/(?<!\[)\w+\/\w+#\d+(?![\d\]])/gi, match => {
   const issueNr = match.replace(/\D/g, '');
   const repo = match.replace(/#\d+/g, '');
   replacements += 1;
@@ -42,7 +42,7 @@ readme = readme.replace(/(?<!\[)\w+\/\w+#\d{1,}(?![\]\d])/gi, (match) => {
 // Regex matches strings that don't begin with a "[", i.e. are not already linked and
 // don't begin with "franz", i.e. are not Franz issues, followed by a "#" and digits to indicate
 // a GitHub issue, and not ending with a "]"
-readme = readme.replace(/(?<!\[|franz)#\d{1,}(?![\]\d])/gi, (match) => {
+readme = readme.replace(/(?<!\[|franz)#\d+(?![\d\]])/gi, match => {
   const issueNr = match.replace('#', '');
   replacements += 1;
   return `[#${issueNr}](https://github.com/getferdi/ferdi/issues/${issueNr})`;
@@ -51,7 +51,7 @@ readme = readme.replace(/(?<!\[|franz)#\d{1,}(?![\]\d])/gi, (match) => {
 // Link GitHub users
 // Regex matches strings that don't begin with a "[", i.e. are not already linked
 // followed by a "@" and at least one word character and not ending with a "]"
-readme = readme.replace(/(?<!\[)@\w+(?!\])/gi, (match) => {
+readme = readme.replace(/(?<!\[)@\w+(?!])/gi, match => {
   const username = match.replace('@', '');
   replacements += 1;
   return `[@${username}](https://github.com/${username})`;
diff --git a/src/actions/lib/actions.ts b/src/actions/lib/actions.ts
index ed42eabc0..412a0d895 100644
--- a/src/actions/lib/actions.ts
+++ b/src/actions/lib/actions.ts
@@ -1,5 +1,6 @@
 export const createActionsFromDefinitions = (actionDefinitions, validate) => {
   const actions = {};
+  // eslint-disable-next-line unicorn/no-array-for-each
   Object.keys(actionDefinitions).forEach(actionName => {
     const action = (params = {}) => {
       const schema = actionDefinitions[actionName];
@@ -14,6 +15,7 @@ export const createActionsFromDefinitions = (actionDefinitions, validate) => {
       listeners.splice(listeners.indexOf(listener), 1);
     };
     action.notify = params =>
+      // eslint-disable-next-line unicorn/no-array-for-each
       action.listeners.forEach(listener => listener(params));
   });
   return actions;
@@ -21,6 +23,7 @@ export const createActionsFromDefinitions = (actionDefinitions, validate) => {
 
 export default (definitions, validate) => {
   const newActions = {};
+  // eslint-disable-next-line unicorn/no-array-for-each
   Object.keys(definitions).forEach(scopeName => {
     newActions[scopeName] = createActionsFromDefinitions(
       definitions[scopeName],
diff --git a/src/api/apiBase.ts b/src/api/apiBase.ts
index dc10fad91..510ccb619 100644
--- a/src/api/apiBase.ts
+++ b/src/api/apiBase.ts
@@ -12,8 +12,6 @@ import {
 
 // Note: This cannot be used from the internal-server since we are not running within the context of a browser window
 const apiBase = (withVersion = true) => {
-  let url: string;
-
   if (
     !(window as any).ferdi ||
     !(window as any).ferdi.stores.settings ||
@@ -23,15 +21,12 @@ const apiBase = (withVersion = true) => {
     // Stores have not yet been loaded - return SERVER_NOT_LOADED to force a retry when stores are loaded
     return SERVER_NOT_LOADED;
   }
-  if ((window as any).ferdi.stores.settings.all.app.server === LOCAL_SERVER) {
-    // Use URL for local server
-    url = `http://${LOCAL_HOSTNAME}:${
-      (window as any).ferdi.stores.requests.localServerPort
-    }`;
-  } else {
-    // Load URL from store
-    url = (window as any).ferdi.stores.settings.all.app.server;
-  }
+  const url =
+    (window as any).ferdi.stores.settings.all.app.server === LOCAL_SERVER
+      ? `http://${LOCAL_HOSTNAME}:${
+          (window as any).ferdi.stores.requests.localServerPort
+        }`
+      : (window as any).ferdi.stores.settings.all.app.server;
 
   return withVersion ? `${url}/${API_VERSION}` : url;
 };
diff --git a/src/api/server/ServerApi.js b/src/api/server/ServerApi.js
index b5042525a..fb0495b19 100644
--- a/src/api/server/ServerApi.js
+++ b/src/api/server/ServerApi.js
@@ -1,6 +1,16 @@
+/* eslint-disable global-require */
 import { join } from 'path';
 import tar from 'tar';
-import { readdirSync, statSync, writeFileSync, copySync, ensureDirSync, pathExistsSync, readJsonSync, removeSync } from 'fs-extra';
+import {
+  readdirSync,
+  statSync,
+  writeFileSync,
+  copySync,
+  ensureDirSync,
+  pathExistsSync,
+  readJsonSync,
+  removeSync,
+} from 'fs-extra';
 import { require as remoteRequire } from '@electron/remote';
 
 import ServiceModel from '../../models/Service';
@@ -12,7 +22,14 @@ import UserModel from '../../models/User';
 import { sleep } from '../../helpers/async-helpers';
 
 import { SERVER_NOT_LOADED } from '../../config';
-import { osArch, osPlatform, asarRecipesPath, userDataRecipesPath, userDataPath, ferdiVersion } from '../../environment';
+import {
+  osArch,
+  osPlatform,
+  asarRecipesPath,
+  userDataRecipesPath,
+  userDataPath,
+  ferdiVersion,
+} from '../../environment';
 import apiBase from '../apiBase';
 import { prepareAuthRequest, sendAuthRequest } from '../utils/auth';
 
@@ -310,22 +327,22 @@ export default class ServerApi {
   // Recipes
   async getInstalledRecipes() {
     const recipesDirectory = getRecipeDirectory();
-    const paths = readdirSync(recipesDirectory)
-      .filter(
-        file =>
-          statSync(join(recipesDirectory, file)).isDirectory() &&
-          file !== 'temp' &&
-          file !== 'dev',
-      );
+    const paths = readdirSync(recipesDirectory).filter(
+      file =>
+        statSync(join(recipesDirectory, file)).isDirectory() &&
+        file !== 'temp' &&
+        file !== 'dev',
+    );
 
     this.recipes = paths
       .map(id => {
-        // eslint-disable-next-line
+        // eslint-disable-next-line import/no-dynamic-require
         const Recipe = require(id)(RecipeModel);
         return new Recipe(loadRecipeConfig(id));
       })
       .filter(recipe => recipe.id);
 
+    // eslint-disable-next-line unicorn/prefer-spread
     this.recipes = this.recipes.concat(this._getDevRecipes());
 
     debug('StubServerApi::getInstalledRecipes resolves', this.recipes);
@@ -425,8 +442,8 @@ export default class ServerApi {
       removeSync(join(recipesDirectory, recipeId, 'recipe.tar.gz'));
 
       return id;
-    } catch (err) {
-      console.error(err);
+    } catch (error) {
+      console.error(error);
 
       return false;
     }
@@ -434,7 +451,9 @@ export default class ServerApi {
 
   // News
   async getLatestNews() {
-    const url = `${apiBase(true)}/news?platform=${osPlatform}&arch=${osArch}&version=${ferdiVersion}`;
+    const url = `${apiBase(
+      true,
+    )}/news?platform=${osPlatform}&arch=${osArch}&version=${ferdiVersion}`;
     const request = await sendAuthRequest(url);
     if (!request.ok) throw request;
     const data = await request.json();
@@ -494,7 +513,7 @@ export default class ServerApi {
         debug('ServerApi::getLegacyServices resolves', services);
         return services;
       }
-    } catch (err) {
+    } catch {
       console.error('ServerApi::getLegacyServices no config found');
     }
 
@@ -523,8 +542,8 @@ export default class ServerApi {
       }
 
       return new ServiceModel(service, recipe);
-    } catch (e) {
-      debug(e);
+    } catch (error) {
+      debug(error);
       return null;
     }
   }
@@ -559,7 +578,7 @@ export default class ServerApi {
 
         return recipe;
       }),
-    ).catch(err => console.error("Can't load recipe", err));
+    ).catch(error => console.error("Can't load recipe", error));
   }
 
   _mapRecipePreviewModel(recipes) {
@@ -567,8 +586,8 @@ export default class ServerApi {
       .map(recipe => {
         try {
           return new RecipePreviewModel(recipe);
-        } catch (e) {
-          console.error(e);
+        } catch (error) {
+          console.error(error);
           return null;
         }
       })
@@ -580,8 +599,8 @@ export default class ServerApi {
       .map(newsItem => {
         try {
           return new NewsModel(newsItem);
-        } catch (e) {
-          console.error(e);
+        } catch (error) {
+          console.error(error);
           return null;
         }
       })
@@ -591,22 +610,21 @@ export default class ServerApi {
   _getDevRecipes() {
     const recipesDirectory = getDevRecipeDirectory();
     try {
-      const paths = readdirSync(recipesDirectory)
-        .filter(
-          file =>
-            statSync(join(recipesDirectory, file)).isDirectory() &&
-            file !== 'temp',
-        );
+      const paths = readdirSync(recipesDirectory).filter(
+        file =>
+          statSync(join(recipesDirectory, file)).isDirectory() &&
+          file !== 'temp',
+      );
 
       const recipes = paths
         .map(id => {
           let Recipe;
           try {
-            // eslint-disable-next-line
+            // eslint-disable-next-line import/no-dynamic-require
             Recipe = require(id)(RecipeModel);
             return new Recipe(loadRecipeConfig(id));
-          } catch (err) {
-            console.error(err);
+          } catch (error) {
+            console.error(error);
           }
 
           return false;
@@ -624,7 +642,7 @@ export default class ServerApi {
         });
 
       return recipes;
-    } catch (err) {
+    } catch {
       debug('Could not load dev recipes');
       return false;
     }
diff --git a/src/api/utils/auth.js b/src/api/utils/auth.js
index e493b2962..527c68840 100644
--- a/src/api/utils/auth.js
+++ b/src/api/utils/auth.js
@@ -1,7 +1,11 @@
 import localStorage from 'mobx-localstorage';
 import { ferdiLocale, ferdiVersion } from '../../environment';
 
-export const prepareAuthRequest = (options = { method: 'GET' }, auth = true) => {
+export const prepareAuthRequest = (
+  // eslint-disable-next-line unicorn/no-object-as-default-parameter
+  options = { method: 'GET' },
+  auth = true,
+) => {
   const request = Object.assign(options, {
     mode: 'cors',
     headers: {
@@ -16,12 +20,13 @@ export const prepareAuthRequest = (options = { method: 'GET' }, auth = true) =>
   });
 
   if (auth) {
-    request.headers.Authorization = `Bearer ${localStorage.getItem('authToken')}`;
+    request.headers.Authorization = `Bearer ${localStorage.getItem(
+      'authToken',
+    )}`;
   }
 
   return request;
 };
 
-export const sendAuthRequest = (url, options, auth) => (
-  window.fetch(url, prepareAuthRequest(options, auth))
-);
+export const sendAuthRequest = (url, options, auth) =>
+  window.fetch(url, prepareAuthRequest(options, auth));
diff --git a/src/app.js b/src/app.js
index e0d2dbc5a..8a1f99320 100644
--- a/src/app.js
+++ b/src/app.js
@@ -44,7 +44,7 @@ window.addEventListener('load', () => {
           </I18N>
         </Provider>
       );
-      render(preparedApp, document.getElementById('root'));
+      render(preparedApp, document.querySelector('#root'));
     },
   };
   window.ferdi.render();
diff --git a/src/components/auth/Invite.js b/src/components/auth/Invite.js
index 519691ede..df8980314 100644
--- a/src/components/auth/Invite.js
+++ b/src/components/auth/Invite.js
@@ -65,7 +65,7 @@ class Invite extends Component {
       {
         fields: {
           invite: [
-            ...Array(3).fill({
+            ...Array.from({ length: 3 }).fill({
               fields: {
                 name: {
                   label: this.props.intl.formatMessage(messages.nameLabel),
@@ -95,19 +95,19 @@ class Invite extends Component {
       this.props.intl,
     );
 
-    document.querySelector('input:first-child').focus();
+    document.querySelector('input:first-child')?.focus();
   }
 
   submit(e) {
     e.preventDefault();
 
-    this.form.submit({
+    this.form?.submit({
       onSuccess: form => {
         this.props.onSubmit({ invites: form.values().invite });
 
-        this.form.clear();
+        this.form?.clear();
         // this.form.$('invite.0.name').focus(); // path accepted but does not focus ;(
-        document.querySelector('input:first-child').focus();
+        document.querySelector('input:first-child')?.focus();
         this.setState({ showSuccessInfo: true });
       },
       onError: () => {},
diff --git a/src/components/settings/SettingsLayout.js b/src/components/settings/SettingsLayout.js
index 0574b3765..71250bd4d 100644
--- a/src/components/settings/SettingsLayout.js
+++ b/src/components/settings/SettingsLayout.js
@@ -29,6 +29,7 @@ class SettingsLayout extends Component {
   componentWillUnmount() {
     document.removeEventListener(
       'keydown',
+      // eslint-disable-next-line unicorn/no-invalid-remove-event-listener
       this.handleKeyDown.bind(this),
       false,
     );
diff --git a/src/components/settings/services/EditServiceForm.js b/src/components/settings/services/EditServiceForm.js
index 9a9abeab4..7df6d5c78 100644
--- a/src/components/settings/services/EditServiceForm.js
+++ b/src/components/settings/services/EditServiceForm.js
@@ -183,8 +183,8 @@ class EditServiceForm extends Component {
               removeTrailingSlash: false,
             });
             isValid = await recipe.validateUrl(values.customUrl);
-          } catch (err) {
-            console.warn('ValidateURL', err);
+          } catch (error) {
+            console.warn('ValidateURL', error);
             isValid = false;
           }
         }
diff --git a/src/components/settings/services/ServicesDashboard.js b/src/components/settings/services/ServicesDashboard.js
index 847f2ea06..9272b05c9 100644
--- a/src/components/settings/services/ServicesDashboard.js
+++ b/src/components/settings/services/ServicesDashboard.js
@@ -91,7 +91,7 @@ class ServicesDashboard extends Component {
           <h1>{intl.formatMessage(messages.headline)}</h1>
         </div>
         <div className="settings__body">
-          {(services.length !== 0 || searchNeedle) && !isLoading && (
+          {(services.length > 0 || searchNeedle) && !isLoading && (
             <SearchInput
               placeholder={intl.formatMessage(messages.searchService)}
               onChange={needle => filterServices({ needle })}
diff --git a/src/components/ui/ImageUpload.js b/src/components/ui/ImageUpload.js
index 8ea31ca40..49aff389b 100644
--- a/src/components/ui/ImageUpload.js
+++ b/src/components/ui/ImageUpload.js
@@ -30,14 +30,14 @@ class ImageUpload extends Component {
   onDrop(acceptedFiles) {
     const { field } = this.props;
 
-    acceptedFiles.forEach(file => {
+    for (const file of acceptedFiles) {
       const imgPath = isWindows ? file.path.replace(/\\/g, '/') : file.path;
       this.setState({
         path: imgPath,
       });
 
       this.props.field.onDrop(file);
-    });
+    }
 
     field.set('');
   }
diff --git a/src/components/ui/InfoBar.js b/src/components/ui/InfoBar.js
index f5cbad48b..dc6be10da 100644
--- a/src/components/ui/InfoBar.js
+++ b/src/components/ui/InfoBar.js
@@ -5,7 +5,6 @@ import classnames from 'classnames';
 import Loader from 'react-loader';
 import { defineMessages, injectIntl } from 'react-intl';
 
-// import { oneOrManyChildElements } from '../../prop-types';
 import Appear from './effects/Appear';
 
 const messages = defineMessages({
@@ -18,7 +17,7 @@ const messages = defineMessages({
 @observer
 class InfoBar extends Component {
   static propTypes = {
-    // eslint-disable-next-line
+    // eslint-disable-next-line react/forbid-prop-types
     children: PropTypes.any.isRequired,
     onClick: PropTypes.func,
     type: PropTypes.string,
diff --git a/src/components/ui/Infobox.js b/src/components/ui/Infobox.js
index 13ae2303b..9e34bf110 100644
--- a/src/components/ui/Infobox.js
+++ b/src/components/ui/Infobox.js
@@ -15,7 +15,8 @@ const messages = defineMessages({
 @observer
 class Infobox extends Component {
   static propTypes = {
-    children: PropTypes.any.isRequired, // eslint-disable-line
+    // eslint-disable-next-line react/forbid-prop-types
+    children: PropTypes.any.isRequired,
     icon: PropTypes.string,
     type: PropTypes.string,
     ctaOnClick: PropTypes.func,
diff --git a/src/components/ui/Modal/index.js b/src/components/ui/Modal/index.js
index 9e6830b0c..3c7c66c59 100644
--- a/src/components/ui/Modal/index.js
+++ b/src/components/ui/Modal/index.js
@@ -54,7 +54,7 @@ class Modal extends Component {
         portal={portal}
         onRequestClose={close}
         shouldCloseOnOverlayClick={shouldCloseOnOverlayClick}
-        appElement={document.getElementById('root')}
+        appElement={document.querySelector('#root')}
       >
         {showClose && close && (
           <button type="button" className={classes.close} onClick={close}>
diff --git a/src/components/ui/Select.js b/src/components/ui/Select.js
index 15b4c28e7..5ac7ddd6d 100644
--- a/src/components/ui/Select.js
+++ b/src/components/ui/Select.js
@@ -49,7 +49,7 @@ class Select extends Component {
     let selected = field.value;
 
     if (multiple) {
-      if (typeof field.value === 'string' && field.value.substr(0, 1) === '[') {
+      if (typeof field.value === 'string' && field.value.slice(0, 1) === '[') {
         // Value is JSON encoded
         selected = JSON.parse(field.value);
       } else if (typeof field.value === 'object') {
diff --git a/src/components/ui/effects/Appear.js b/src/components/ui/effects/Appear.js
index 1255fce2e..183181f8f 100644
--- a/src/components/ui/effects/Appear.js
+++ b/src/components/ui/effects/Appear.js
@@ -1,11 +1,11 @@
-/* eslint-disable react/no-did-mount-set-state */
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import ReactCSSTransitionGroup from 'react-addons-css-transition-group';
 
 export default class Appear extends Component {
   static propTypes = {
-    children: PropTypes.any.isRequired, // eslint-disable-line
+    // eslint-disable-next-line react/forbid-prop-types
+    children: PropTypes.any.isRequired,
     transitionName: PropTypes.string,
     className: PropTypes.string,
   };
@@ -24,11 +24,7 @@ export default class Appear extends Component {
   }
 
   render() {
-    const {
-      children,
-      transitionName,
-      className,
-    } = this.props;
+    const { children, transitionName, className } = this.props;
 
     if (!this.state.mounted) {
       return null;
diff --git a/src/config.ts b/src/config.ts
index 7bb2525a5..6ad58c7a5 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -5,7 +5,7 @@ import ms from 'ms';
 export const CHECK_INTERVAL = ms('1h'); // How often should we perform checks
 
 export const LOCAL_HOSTNAME = 'localhost';
-export const LOCAL_PORT = 45569;
+export const LOCAL_PORT = 45_569;
 export const LOCAL_API = 'http://localhost:3000';
 export const DEV_FRANZ_API = 'https://dev.franzinfra.com';
 
diff --git a/src/containers/settings/AccountScreen.js b/src/containers/settings/AccountScreen.js
index cc3929656..0f9457fd0 100644
--- a/src/containers/settings/AccountScreen.js
+++ b/src/containers/settings/AccountScreen.js
@@ -32,14 +32,12 @@ class AccountScreen extends Component {
 
     const api = stores.settings.all.app.server;
 
-    let url;
-    if (api === LIVE_FRANZ_API) {
-      url = stores.user.getAuthURL(
-        `${WEBSITE}${route}?utm_source=app&utm_medium=account_dashboard`,
-      );
-    } else {
-      url = `${api}${route}`;
-    }
+    const url =
+      api === LIVE_FRANZ_API
+        ? stores.user.getAuthURL(
+            `${WEBSITE}${route}?utm_source=app&utm_medium=account_dashboard`,
+          )
+        : `${api}${route}`;
 
     actions.app.openExternalUrl({ url });
   }
diff --git a/src/containers/settings/SettingsWindow.js b/src/containers/settings/SettingsWindow.js
index 58e73f2f3..e03c4c1d2 100644
--- a/src/containers/settings/SettingsWindow.js
+++ b/src/containers/settings/SettingsWindow.js
@@ -19,11 +19,11 @@ class SettingsContainer extends Component {
   el = document.createElement('div');
 
   componentDidMount() {
-    this.portalRoot.appendChild(this.el);
+    this.portalRoot.append(this.el);
   }
 
   componentWillUnmount() {
-    this.portalRoot.removeChild(this.el);
+    this.el.remove();
   }
 
   render() {
diff --git a/src/electron/ipc-api/appIndicator.ts b/src/electron/ipc-api/appIndicator.ts
index 5b5f2bac7..a51ed8161 100644
--- a/src/electron/ipc-api/appIndicator.ts
+++ b/src/electron/ipc-api/appIndicator.ts
@@ -34,8 +34,7 @@ export default params => {
 
   ipcMain.on('updateAppIndicator', (_event, args) => {
     // Flash TaskBar for windows, bounce Dock on Mac
-    if (!(app as any).mainWindow.isFocused()) {
-      if (params.settings.app.get('notifyTaskBarOnMessage')) {
+    if (!(app as any).mainWindow.isFocused() && params.settings.app.get('notifyTaskBarOnMessage')) {
         if (isWindows) {
           (app as any).mainWindow.flashFrame(true);
           (app as any).mainWindow.once('focus', () =>
@@ -45,7 +44,6 @@ export default params => {
           app.dock.bounce('informational');
         }
       }
-    }
 
     // Update badge
     if (isMac && typeof args.indicator === 'string') {
diff --git a/src/electron/ipc-api/autoUpdate.ts b/src/electron/ipc-api/autoUpdate.ts
index 70890539d..31c614ab7 100644
--- a/src/electron/ipc-api/autoUpdate.ts
+++ b/src/electron/ipc-api/autoUpdate.ts
@@ -44,8 +44,8 @@ export default (params: { mainWindow: BrowserWindow; settings: any }) => {
               app.quit();
             }, 20);
           }
-        } catch (e) {
-          console.error(e);
+        } catch (error) {
+          console.error(error);
           event.sender.send('autoUpdate', { error: true });
         }
       }
diff --git a/src/electron/ipc-api/cld.ts b/src/electron/ipc-api/cld.ts
index b907f3730..4221f9b22 100644
--- a/src/electron/ipc-api/cld.ts
+++ b/src/electron/ipc-api/cld.ts
@@ -16,8 +16,8 @@ export default async () => {
 
         return result.languages[0].code;
       }
-    } catch (e) {
-      console.error(e);
+    } catch (error) {
+      console.error(error);
     }
   });
 };
diff --git a/src/electron/ipc-api/dnd.ts b/src/electron/ipc-api/dnd.ts
index 6fb8999a3..afaef9a66 100644
--- a/src/electron/ipc-api/dnd.ts
+++ b/src/electron/ipc-api/dnd.ts
@@ -15,8 +15,8 @@ export default async () => {
       const isDND = getDoNotDisturb();
       debug('Fetching DND state, set to', isDND);
       return isDND;
-    } catch (e) {
-      console.error(e);
+    } catch (error) {
+      console.error(error);
       return false;
     }
   });
diff --git a/src/electron/ipc-api/download.ts b/src/electron/ipc-api/download.ts
index 822658f26..af15b157e 100644
--- a/src/electron/ipc-api/download.ts
+++ b/src/electron/ipc-api/download.ts
@@ -7,7 +7,7 @@ import { PathLike } from 'fs';
 const debug = require('debug')('Ferdi:ipcApi:download');
 
 function decodeBase64Image(dataString: string) {
-  const matches = dataString.match(/^data:([A-Za-z-+/]+);base64,(.+)$/);
+  const matches = dataString.match(/^data:([+/A-Za-z-]+);base64,(.+)$/);
 
   if (matches?.length !== 3) {
     return new Error('Invalid input string');
@@ -47,12 +47,12 @@ export default (params: { mainWindow: BrowserWindow }) => {
             );
 
             debug('File blob saved to', saveDialog.filePath);
-          } catch (err) {
-            console.log(err);
+          } catch (error) {
+            console.log(error);
           }
         }
-      } catch (e) {
-        console.error(e);
+      } catch (error) {
+        console.error(error);
       }
     },
   );
diff --git a/src/features/appearance/index.js b/src/features/appearance/index.js
index d1db68ac6..0c935be32 100644
--- a/src/features/appearance/index.js
+++ b/src/features/appearance/index.js
@@ -14,7 +14,7 @@ function createStyleElement() {
 }
 
 function setAppearance(style) {
-  const styleElement = document.getElementById(STYLE_ELEMENT_ID);
+  const styleElement = document.querySelector(`#${STYLE_ELEMENT_ID}`);
 
   if (styleElement) {
     styleElement.innerHTML = style;
@@ -30,18 +30,18 @@ function darkenAbsolute(originalColor, absoluteChange) {
 function generateAccentStyle(accentColorStr) {
   let style = '';
 
-  Object.keys(themeInfo).forEach(property => {
+  for (const property of Object.keys(themeInfo)) {
     style += `
       ${themeInfo[property]} {
         ${property}: ${accentColorStr};
       }
     `;
-  });
+  }
 
   let accentColor = color(DEFAULT_APP_SETTINGS.accentColor);
   try {
     accentColor = color(accentColorStr);
-  } catch (e) {
+  } catch {
     // Ignore invalid accent color.
   }
   const darkerColorStr = darkenAbsolute(accentColor, 5).hex();
@@ -133,14 +133,14 @@ function generateShowDragAreaStyle(accentColor) {
 }
 
 function generateVerticalStyle(widthStr, alwaysShowWorkspaces) {
-  if (!document.getElementById('vertical-style')) {
+  if (!document.querySelector('#vertical-style')) {
     const link = document.createElement('link');
     link.id = 'vertical-style';
     link.rel = 'stylesheet';
     link.type = 'text/css';
     link.href = './styles/vertical.css';
 
-    document.head.appendChild(link);
+    document.head.append(link);
   }
   const width = Number(widthStr);
   const sidebarWidth = width - 4;
@@ -150,12 +150,12 @@ function generateVerticalStyle(widthStr, alwaysShowWorkspaces) {
   .sidebar {
     height: ${sidebarWidth + verticalStyleOffset + 1}px !important;
   ${
-  alwaysShowWorkspaces
-    ? `
+    alwaysShowWorkspaces
+      ? `
     width: calc(100% - 300px) !important;
   `
-    : ''
-}
+      : ''
+  }
   }
 
   .sidebar .sidebar__button {
@@ -220,10 +220,10 @@ function generateStyle(settings) {
   }
   if (useVerticalStyle) {
     style += generateVerticalStyle(serviceRibbonWidth, alwaysShowWorkspaces);
-  } else if (document.getElementById('vertical-style')) {
-    const link = document.getElementById('vertical-style');
+  } else if (document.querySelector('#vertical-style')) {
+    const link = document.querySelector('#vertical-style');
     if (link) {
-      document.head.removeChild(link);
+      link.remove();
     }
   }
   if (alwaysShowWorkspaces) {
diff --git a/src/features/communityRecipes/store.js b/src/features/communityRecipes/store.js
index a3614dd11..05e18e2f7 100644
--- a/src/features/communityRecipes/store.js
+++ b/src/features/communityRecipes/store.js
@@ -18,11 +18,13 @@ export class CommunityRecipesStore extends FeatureStore {
   @computed get communityRecipes() {
     if (!this.stores) return [];
 
-    return this.stores.recipePreviews.dev.map((r) => {
+    return this.stores.recipePreviews.dev.map(recipePreview => {
       // TODO: Need to figure out if this is even necessary/used
-      r.isDevRecipe = !!r.author.find((a) => a.email === this.stores.user.data.email);
+      recipePreview.isDevRecipe = !!recipePreview.author.some(
+        author => author.email === this.stores.user.data.email,
+      );
 
-      return r;
+      return recipePreview;
     });
   }
 }
diff --git a/src/features/quickSwitch/Component.js b/src/features/quickSwitch/Component.js
index df2bf968d..f21db0ebd 100644
--- a/src/features/quickSwitch/Component.js
+++ b/src/features/quickSwitch/Component.js
@@ -140,7 +140,7 @@ class QuickSwitchModal extends Component {
     let services = [];
     if (
       this.state.search &&
-      compact(invoke(this.state.search, 'match', /^[a-z0-9]/i)).length > 0
+      compact(invoke(this.state.search, 'match', /^[\da-z]/i)).length > 0
     ) {
       // Apply simple search algorythm to list of all services
       services = this.props.stores.services.allDisplayed;
@@ -261,7 +261,7 @@ class QuickSwitchModal extends Component {
       // Wrapped inside timeout to let the modal render first
       setTimeout(() => {
         if (this.inputRef.current) {
-          this.inputRef.current.getElementsByTagName('input')[0].focus();
+          this.inputRef.current.querySelectorAll('input')[0].focus();
         }
       }, 10);
 
@@ -273,7 +273,7 @@ class QuickSwitchModal extends Component {
       // search query change when modal not visible
       setTimeout(() => {
         if (this.inputRef.current) {
-          this.inputRef.current.getElementsByTagName('input')[0].blur();
+          this.inputRef.current.querySelectorAll('input')[0].blur();
         }
       }, 100);
 
diff --git a/src/features/serviceProxy/index.js b/src/features/serviceProxy/index.js
index eb7116651..b9320cda9 100644
--- a/src/features/serviceProxy/index.js
+++ b/src/features/serviceProxy/index.js
@@ -18,7 +18,7 @@ export default function init(stores) {
 
     debug('Service Proxy autorun');
 
-    services.forEach((service) => {
+    for (const service of services) {
       const s = session.fromPartition(`persist:service-${service.id}`);
 
       if (config.isEnabled) {
@@ -33,6 +33,6 @@ export default function init(stores) {
           });
         }
       }
-    });
+    }
   });
 }
diff --git a/src/features/settingsWS/store.js b/src/features/settingsWS/store.js
index 9100f33d1..e36ccee72 100755
--- a/src/features/settingsWS/store.js
+++ b/src/features/settingsWS/store.js
@@ -25,11 +25,13 @@ export class SettingsWSStore extends FeatureStore {
     this.stores = stores;
     this.actions = actions;
 
-    this._registerReactions(createReactions([
-      this._initialize.bind(this),
-      this._reconnect.bind(this),
-      this._close.bind(this),
-    ]));
+    this._registerReactions(
+      createReactions([
+        this._initialize.bind(this),
+        this._reconnect.bind(this),
+        this._close.bind(this),
+      ]),
+    );
   }
 
   connect() {
@@ -51,12 +53,12 @@ export class SettingsWSStore extends FeatureStore {
         this.heartbeat();
       });
 
-      this.ws.on('message', (data) => {
+      this.ws.on('message', data => {
         const resp = JSON.parse(data);
         debug('Received message', resp);
 
         if (resp.id) {
-          this.stores.user.getUserInfoRequest.patch((result) => {
+          this.stores.user.getUserInfoRequest.patch(result => {
             if (!result) return;
 
             debug('Patching user object with new values');
@@ -66,8 +68,8 @@ export class SettingsWSStore extends FeatureStore {
       });
 
       this.ws.on('ping', this.heartbeat.bind(this));
-    } catch (err) {
-      console.err(err);
+    } catch (error) {
+      console.error(error);
     }
   }
 
diff --git a/src/features/todos/preload.js b/src/features/todos/preload.js
index 9bd76a704..3b86ddbc5 100644
--- a/src/features/todos/preload.js
+++ b/src/features/todos/preload.js
@@ -7,7 +7,9 @@ debug('Preloading Todos Webview');
 
 let hostMessageListener = ({ action }) => {
   switch (action) {
-    case 'todos:initialize-as-service': ipcRenderer.sendToHost('hello'); break;
+    case 'todos:initialize-as-service':
+      ipcRenderer.sendToHost('hello');
+      break;
     default:
   }
 };
@@ -15,7 +17,9 @@ let hostMessageListener = ({ action }) => {
 window.ferdi = {
   onInitialize(ipcHostMessageListener) {
     hostMessageListener = ipcHostMessageListener;
-    ipcRenderer.sendToHost(IPC.TODOS_CLIENT_CHANNEL, { action: 'todos:initialized' });
+    ipcRenderer.sendToHost(IPC.TODOS_CLIENT_CHANNEL, {
+      action: 'todos:initialized',
+    });
   },
   sendToHost(message) {
     ipcRenderer.sendToHost(IPC.TODOS_CLIENT_CHANNEL, message);
@@ -30,7 +34,7 @@ ipcRenderer.on(IPC.TODOS_HOST_CHANNEL, (event, message) => {
 if (window.location.href === 'https://app.franztodos.com/login/') {
   // Insert info element informing about Franz accounts
   const infoElement = document.createElement('p');
-  infoElement.innerText = `You are using Franz's official Todo Service.
+  infoElement.textContent = `You are using Franz's official Todo Service.
 This service will only work with accounts registered with Franz - no Ferdi accounts will work here!
 If you do not have a Franz account you can change the Todo service by going into Ferdi's settings and changing the "Todo server".
 You can choose any service as this Todo server, e.g. Todoist or Apple Notes.`;
@@ -42,7 +46,7 @@ You can choose any service as this Todo server, e.g. Todoist or Apple Notes.`;
     const textElement = document.querySelector('p');
     if (textElement) {
       clearInterval(waitForReact);
-      textElement.parentElement.insertBefore(infoElement, textElement);
+      textElement.parentElement?.insertBefore(infoElement, textElement);
     } else {
       numChecks += 1;
 
diff --git a/src/features/utils/FeatureStore.js b/src/features/utils/FeatureStore.js
index 4d4e217a9..afe726294 100644
--- a/src/features/utils/FeatureStore.js
+++ b/src/features/utils/FeatureStore.js
@@ -16,11 +16,11 @@ export class FeatureStore {
   }
 
   _startActions(actions = this._actions) {
-    actions.forEach((a) => a.start());
+    for (const a of actions) a.start();
   }
 
   _stopActions(actions = this._actions) {
-    actions.forEach((a) => a.stop());
+    for (const a of actions) a.stop();
   }
 
   // REACTIONS
@@ -31,10 +31,10 @@ export class FeatureStore {
   }
 
   _startReactions(reactions = this._reactions) {
-    reactions.forEach((r) => r.start());
+    for (const r of reactions) r.start();
   }
 
   _stopReactions(reactions = this._reactions) {
-    reactions.forEach((r) => r.stop());
+    for (const r of reactions) r.stop();
   }
 }
diff --git a/src/features/webControls/containers/WebControlsScreen.js b/src/features/webControls/containers/WebControlsScreen.js
index e1e1b9991..0273bb13e 100644
--- a/src/features/webControls/containers/WebControlsScreen.js
+++ b/src/features/webControls/containers/WebControlsScreen.js
@@ -16,7 +16,8 @@ const URL_EVENTS = [
   'did-navigate-in-page',
 ];
 
-@inject('stores', 'actions') @observer
+@inject('stores', 'actions')
+@observer
 class WebControlsScreen extends Component {
   @observable url = '';
 
@@ -36,15 +37,15 @@ class WebControlsScreen extends Component {
         this.webview = service.webview;
         this.url = this.webview.getURL();
 
-        URL_EVENTS.forEach((event) => {
-          this.webview.addEventListener(event, (e) => {
+        for (const event of URL_EVENTS) {
+          this.webview.addEventListener(event, e => {
             if (!e.isMainFrame) return;
 
             this.url = e.url;
             this.canGoBack = this.webview.canGoBack();
             this.canGoForward = this.webview.canGoForward();
           });
-        });
+        }
       }
     });
   }
@@ -83,13 +84,16 @@ class WebControlsScreen extends Component {
 
     try {
       url = new URL(url).toString();
-    } catch (err) {
-      // eslint-disable-next-line no-useless-escape
-      if (url.match(/^((?!-))(xn--)?[a-z0-9][a-z0-9-_]{0,61}[a-z0-9]{0,1}\.(xn--)?([a-z0-9\-]{1,61}|[a-z0-9-]{1,30}\.[a-z]{2,})$/)) {
-        url = `http://${url}`;
-      } else {
-        url = SEARCH_ENGINE_URLS[this.settings.app.searchEngine]({ searchTerm: url });
-      }
+    } catch {
+      url =
+        // eslint-disable-next-line no-useless-escape
+        /^((?!-))(xn--)?[\da-z][\d_a-z-]{0,61}[\da-z]{0,1}\.(xn--)?([\da-z\-]{1,61}|[\da-z-]{1,30}\.[a-z]{2,})$/.test(
+          url,
+        )
+          ? `http://${url}`
+          : SEARCH_ENGINE_URLS[this.settings.app.searchEngine]({
+              searchTerm: url,
+            });
     }
 
     this.webview.loadURL(url);
@@ -114,7 +118,7 @@ class WebControlsScreen extends Component {
         goBack={() => this.goBack()}
         canGoForward={this.canGoForward}
         goForward={() => this.goForward()}
-        navigate={(url) => this.navigate(url)}
+        navigate={url => this.navigate(url)}
         url={this.url}
       />
     );
diff --git a/src/features/workspaces/components/EditWorkspaceForm.js b/src/features/workspaces/components/EditWorkspaceForm.js
index cae95e9ed..f562733dd 100644
--- a/src/features/workspaces/components/EditWorkspaceForm.js
+++ b/src/features/workspaces/components/EditWorkspaceForm.js
@@ -108,7 +108,7 @@ class EditWorkspaceForm extends Component {
           default: false,
         },
         services: {
-          value: workspace.services.slice(),
+          value: [...workspace.services],
         },
       },
     });
diff --git a/src/features/workspaces/components/WorkspaceDrawerItem.js b/src/features/workspaces/components/WorkspaceDrawerItem.js
index 82e1b81a4..7df2b60be 100644
--- a/src/features/workspaces/components/WorkspaceDrawerItem.js
+++ b/src/features/workspaces/components/WorkspaceDrawerItem.js
@@ -143,7 +143,7 @@ class WorkspaceDrawerItem extends Component {
             isActive ? classes.activeServices : null,
           ])}
         >
-          {services.length
+          {services.length > 0
             ? services.join(', ')
             : intl.formatMessage(messages.noServicesAddedYet)}
         </span>
diff --git a/src/features/workspaces/models/Workspace.js b/src/features/workspaces/models/Workspace.js
index d9488e991..14add9437 100644
--- a/src/features/workspaces/models/Workspace.js
+++ b/src/features/workspaces/models/Workspace.js
@@ -15,7 +15,7 @@ export default class Workspace {
 
   constructor(data) {
     if (!data.id) {
-      throw Error('Workspace requires Id');
+      throw new Error('Workspace requires Id');
     }
 
     this.id = data.id;
diff --git a/src/features/workspaces/store.js b/src/features/workspaces/store.js
index ec9d7ee7f..73e882990 100644
--- a/src/features/workspaces/store.js
+++ b/src/features/workspaces/store.js
@@ -302,8 +302,8 @@ export default class WorkspacesStore extends FeatureStore {
     const { allServicesRequest } = services;
     const servicesHaveBeenLoaded = allServicesRequest.wasExecuted && !allServicesRequest.isError;
     // Loop through all workspaces and remove invalid service ids (locally)
-    this.workspaces.forEach((workspace) => {
-      workspace.services.forEach((serviceId) => {
+    for (const workspace of this.workspaces) {
+      for (const serviceId of workspace.services) {
         if (
           servicesHaveBeenLoaded
           && !services.one(serviceId)
@@ -311,7 +311,7 @@ export default class WorkspacesStore extends FeatureStore {
         ) {
           workspace.services.remove(serviceId);
         }
-      });
-    });
+      }
+    }
   };
 }
diff --git a/src/helpers/i18n-helpers.ts b/src/helpers/i18n-helpers.ts
index c1f18f446..ec7dc8e98 100644
--- a/src/helpers/i18n-helpers.ts
+++ b/src/helpers/i18n-helpers.ts
@@ -4,13 +4,11 @@ export function getLocale({
   let localeStr = locale;
   if (locales[locale] === undefined) {
     let localeFuzzy: string | undefined;
-    Object.keys(locales).forEach((localStr) => {
-      if (locales && Object.hasOwnProperty.call(locales, localStr)) {
-        if (locale.substring(0, 2) === localStr.substring(0, 2)) {
+    for (const localStr of Object.keys(locales)) {
+      if (locales && Object.hasOwnProperty.call(locales, localStr) && locale.slice(0, 2) === localStr.slice(0, 2)) {
           localeFuzzy = localStr;
         }
-      }
-    });
+    }
 
     if (localeFuzzy !== undefined) {
       localeStr = localeFuzzy;
@@ -61,12 +59,12 @@ export function getSelectOptions({
   if (sort) {
     keys = keys.sort(Intl.Collator().compare);
   }
-  keys.forEach((key) => {
+  for (const key of keys) {
     options.push({
       value: key,
       label: locales[key],
     });
-  });
+  }
 
   return options;
 }
diff --git a/src/helpers/password-helpers.ts b/src/helpers/password-helpers.ts
index 89c75c752..e5d9a4a25 100644
--- a/src/helpers/password-helpers.ts
+++ b/src/helpers/password-helpers.ts
@@ -12,9 +12,9 @@ export function scorePassword(password: string) {
 
   // award every unique letter until 5 repetitions
   const letters = {};
-  for (let i = 0; i < password.length; i += 1) {
-    letters[password[i]] = (letters[password[i]] || 0) + 1;
-    score += 5.0 / letters[password[i]];
+  for (const letter of password) {
+    letters[letter] = (letters[letter] || 0) + 1;
+    score += 5 / letters[letter];
   }
 
   // bonus points for mixing it up
@@ -26,11 +26,11 @@ export function scorePassword(password: string) {
   };
 
   let variationCount = 0;
-  Object.keys(variations).forEach((key) => {
-    variationCount += (variations[key] === true) ? 1 : 0;
-  });
+  for (const key of Object.keys(variations)) {
+    variationCount += variations[key] === true ? 1 : 0;
+  }
 
   score += (variationCount - 1) * 10;
 
-  return parseInt(score.toString(), 10);
+  return Number.parseInt(score.toString(), 10);
 }
diff --git a/src/helpers/recipe-helpers.ts b/src/helpers/recipe-helpers.ts
index 965429210..65ef04088 100644
--- a/src/helpers/recipe-helpers.ts
+++ b/src/helpers/recipe-helpers.ts
@@ -1,3 +1,4 @@
+/* eslint-disable global-require */
 import { parse } from 'path';
 import { userDataRecipesPath } from '../environment';
 
@@ -15,20 +16,17 @@ export function loadRecipeConfig(recipeId: string) {
     // Delete module from cache
     delete require.cache[require.resolve(configPath)];
 
-    // eslint-disable-next-line
-    let config = require(configPath);
+    // eslint-disable-next-line import/no-dynamic-require
+    const config = require(configPath);
 
     const moduleConfigPath = require.resolve(configPath);
     config.path = parse(moduleConfigPath).dir;
 
     return config;
-  } catch (e) {
-    console.error(e);
+  } catch (error) {
+    console.error(error);
     return null;
   }
 }
 
-module.paths.unshift(
-  getDevRecipeDirectory(),
-  getRecipeDirectory(),
-);
+module.paths.unshift(getDevRecipeDirectory(), getRecipeDirectory());
diff --git a/src/helpers/schedule-helpers.ts b/src/helpers/schedule-helpers.ts
index 754fd5556..55b7c1e6f 100644
--- a/src/helpers/schedule-helpers.ts
+++ b/src/helpers/schedule-helpers.ts
@@ -5,15 +5,15 @@ export function isInTimeframe(start: string, end: string) {
     startHourStr,
     startMinuteStr,
   ] = start.split(':');
-  const startHour = parseInt(startHourStr, 10);
-  const startMinute = parseInt(startMinuteStr, 10);
+  const startHour = Number.parseInt(startHourStr, 10);
+  const startMinute = Number.parseInt(startMinuteStr, 10);
 
   const [
     endHourStr,
     endMinuteStr,
   ] = end.split(':');
-  const endHour = parseInt(endHourStr, 10);
-  const endMinute = parseInt(endMinuteStr, 10);
+  const endHour = Number.parseInt(endHourStr, 10);
+  const endMinute = Number.parseInt(endMinuteStr, 10);
 
   const currentHour = new Date().getHours();
   const currentMinute = new Date().getMinutes();
diff --git a/src/helpers/url-helpers.ts b/src/helpers/url-helpers.ts
index 3657ae693..1e87ecabb 100644
--- a/src/helpers/url-helpers.ts
+++ b/src/helpers/url-helpers.ts
@@ -12,7 +12,7 @@ export function isValidExternalURL(url: string | URL) {
   let parsedUrl: URL;
   try {
     parsedUrl = new URL(url.toString());
-  } catch (_) {
+  } catch {
     return false;
   }
 
diff --git a/src/helpers/userAgent-helpers.ts b/src/helpers/userAgent-helpers.ts
index 73c8bfd03..091a76400 100644
--- a/src/helpers/userAgent-helpers.ts
+++ b/src/helpers/userAgent-helpers.ts
@@ -8,7 +8,7 @@ import {
 function macOS() {
   const version = macosVersion() || '';
   let cpuName = os.cpus()[0].model.split(' ')[0];
-  if (cpuName && cpuName.match(/\(/)) {
+  if (cpuName && /\(/.test(cpuName)) {
     cpuName = cpuName.split('(')[0];
   }
   return `Macintosh; ${cpuName} Mac OS X ${version.replace(/\./g, '_')}`;
diff --git a/src/helpers/validation-helpers.ts b/src/helpers/validation-helpers.ts
index 3a9622309..23c297443 100644
--- a/src/helpers/validation-helpers.ts
+++ b/src/helpers/validation-helpers.ts
@@ -49,16 +49,15 @@ export function url({ field }) {
   const value = field.value.trim();
   let isValid = false;
 
-  if (value !== '') {
-    // eslint-disable-next-line
-    isValid = Boolean(
-      value.match(
-        /(^|[\s.:;?\-\]<(])(https?:\/\/[-\w;/?:@&=+$|_.!~*|'()[\]%#,☺]+[\w/#](\(\))?)(?=$|[\s',|().:;?\-[\]>)])/i,
-      ),
-    );
-  } else {
-    isValid = true;
-  }
+  isValid =
+    value !== ''
+      ? Boolean(
+          // eslint-disable-next-line unicorn/better-regex
+          /(^|[\s.:;?\-\]<(])(https?:\/\/[-\w;/?:@&=+$|_.!~*|'()[\]%#,☺]+[\w/#](\(\))?)(?=$|[\s',|().:;?\-[\]>)])/i.test(
+            value,
+          ),
+        )
+      : true;
 
   return [
     isValid,
diff --git a/src/i18n/apply-branding.js b/src/i18n/apply-branding.js
index 7aeabc4af..8ec573919 100644
--- a/src/i18n/apply-branding.js
+++ b/src/i18n/apply-branding.js
@@ -7,7 +7,7 @@ const path = require('path');
 console.log('Applying Ferdi branding to translations...');
 
 // Keys to ignore when applying branding
-const ignore = [
+const ignore = new Set([
   'login.customServerSuggestion',
   'login.customServerQuestion',
   'settings.app.todoServerInfo',
@@ -18,10 +18,10 @@ const ignore = [
   'settings.team.copy',
   'settings.team.manageAction',
   'settings.app.serverMoneyInfo',
-];
+]);
 
 // Files to ignore when applying branding
-const ignoreFiles = ['.DS_Store', '.', '..'];
+const ignoreFiles = new Set(['.DS_Store', '.', '..']);
 
 // What to replace
 const replace = {
@@ -38,14 +38,15 @@ const replaceFind = Object.keys(replace);
 const replaceReplaceWith = Object.values(replace);
 
 const replaceStr = (str, find, replaceWith) => {
-  for (let i = 0; i < find.length; i += 1) {
-    str = str.replace(new RegExp(find[i], 'gi'), replaceWith[i]);
+  for (const [i, element] of find.entries()) {
+    str = str.replace(new RegExp(element, 'gi'), replaceWith[i]);
   }
   return str;
 };
 
+// eslint-disable-next-line unicorn/no-array-for-each
 files.forEach(async file => {
-  if (ignoreFiles.includes(file)) return;
+  if (ignoreFiles.has(file)) return;
 
   // Read locale data
   const filePath = path.join(locales, file);
@@ -53,7 +54,7 @@ files.forEach(async file => {
 
   // Replace branding
   for (const key in locale) {
-    if (!ignore.includes(key)) {
+    if (!ignore.has(key)) {
       locale[key] = replaceStr(locale[key], replaceFind, replaceReplaceWith);
     }
   }
diff --git a/src/i18n/translations.js b/src/i18n/translations.js
index 161a172ba..9a7dc7453 100644
--- a/src/i18n/translations.js
+++ b/src/i18n/translations.js
@@ -1,13 +1,15 @@
+/* eslint-disable global-require */
 import { APP_LOCALES } from './languages';
 
 const translations = [];
-Object.keys(APP_LOCALES).forEach((key) => {
+for (const key of Object.keys(APP_LOCALES)) {
   try {
-    const translation = require(`./locales/${key}.json`); // eslint-disable-line
+    // eslint-disable-next-line import/no-dynamic-require
+    const translation = require(`./locales/${key}.json`);
     translations[key] = translation;
-  } catch (err) {
+  } catch {
     console.warn(`Can't find translations for ${key}`);
   }
-});
+}
 
 module.exports = translations;
diff --git a/src/index.js b/src/index.js
index 08d9a3a45..758b11dc9 100644
--- a/src/index.js
+++ b/src/index.js
@@ -147,7 +147,7 @@ if (!gotTheLock) {
 // https://github.com/electron/electron/issues/9046
 if (
   isLinux &&
-  ['Pantheon', 'Unity:Unity7'].indexOf(process.env.XDG_CURRENT_DESKTOP) !== -1
+  ['Pantheon', 'Unity:Unity7'].includes(process.env.XDG_CURRENT_DESKTOP)
 ) {
   process.env.XDG_CURRENT_DESKTOP = 'Unity';
 }
@@ -475,7 +475,7 @@ ipcMain.on(
     debug(
       `Received modifyRequestHeaders ${modifiedRequestHeaders} for serviceId ${serviceId}`,
     );
-    modifiedRequestHeaders.forEach(headerFilterSet => {
+    for (const headerFilterSet of modifiedRequestHeaders) {
       const { headers, requestFilters } = headerFilterSet;
       session
         .fromPartition(`persist:service-${serviceId}`)
@@ -488,7 +488,7 @@ ipcMain.on(
           }
           callback({ requestHeaders: details.requestHeaders });
         });
-    });
+    }
   },
 );
 
diff --git a/src/internal-server/app/Controllers/Http/RecipeController.js b/src/internal-server/app/Controllers/Http/RecipeController.js
index 1a7595a9d..2c7baf2a4 100644
--- a/src/internal-server/app/Controllers/Http/RecipeController.js
+++ b/src/internal-server/app/Controllers/Http/RecipeController.js
@@ -1,8 +1,6 @@
 const Recipe = use('App/Models/Recipe');
 const Drive = use('Drive');
-const {
-  validateAll,
-} = use('Validator');
+const { validateAll } = use('Validator');
 const Env = use('Env');
 
 const fetch = require('node-fetch');
@@ -14,9 +12,7 @@ const RECIPES_URL = `${LIVE_FERDI_API}/${API_VERSION}/recipes`;
 
 class RecipeController {
   // List official and custom recipes
-  async list({
-    response,
-  }) {
+  async list({ response }) {
     const officialRecipes = JSON.parse(await (await fetch(RECIPES_URL)).text());
     const customRecipesArray = (await Recipe.all()).rows;
     const customRecipes = customRecipesArray.map(recipe => ({
@@ -25,19 +21,13 @@ class RecipeController {
       ...JSON.parse(recipe.data),
     }));
 
-    const recipes = [
-      ...officialRecipes,
-      ...customRecipes,
-    ];
+    const recipes = [...officialRecipes, ...customRecipes];
 
     return response.send(recipes);
   }
 
   // Search official and custom recipes
-  async search({
-    request,
-    response,
-  }) {
+  async search({ request, response }) {
     // Validate user input
     const validation = await validateAll(request.all(), {
       needle: 'required',
@@ -64,13 +54,23 @@ class RecipeController {
       }));
     } else {
       let remoteResults = [];
-      if (Env.get('CONNECT_WITH_FRANZ') == 'true') { // eslint-disable-line eqeqeq
-        remoteResults = JSON.parse(await (await fetch(`${RECIPES_URL}/search?needle=${encodeURIComponent(needle)}`)).text());
+      // eslint-disable-next-line eqeqeq
+      if (Env.get('CONNECT_WITH_FRANZ') == 'true') {
+        // eslint-disable-line eqeqeq
+        remoteResults = JSON.parse(
+          await (
+            await fetch(
+              `${RECIPES_URL}/search?needle=${encodeURIComponent(needle)}`,
+            )
+          ).text(),
+        );
       }
 
       debug('remoteResults:', remoteResults);
 
-      const localResultsArray = (await Recipe.query().where('name', 'LIKE', `%${needle}%`).fetch()).toJSON();
+      const localResultsArray = (
+        await Recipe.query().where('name', 'LIKE', `%${needle}%`).fetch()
+      ).toJSON();
       const localResults = localResultsArray.map(recipe => ({
         id: recipe.recipeId,
         name: recipe.name,
@@ -79,20 +79,14 @@ class RecipeController {
 
       debug('localResults:', localResults);
 
-      results = [
-        ...localResults,
-        ...remoteResults || [],
-      ];
+      results = [...localResults, ...(remoteResults || [])];
     }
 
     return response.send(results);
   }
 
   // Download a recipe
-  async download({
-    response,
-    params,
-  }) {
+  async download({ response, params }) {
     // Validate user input
     const validation = await validateAll(params, {
       recipe: 'required|accepted',
@@ -108,14 +102,17 @@ class RecipeController {
     const service = params.recipe;
 
     // Check for invalid characters
-    if (/\.{1,}/.test(service) || /\/{1,}/.test(service)) {
+    if (/\.+/.test(service) || /\/+/.test(service)) {
       return response.send('Invalid recipe name');
     }
 
     // Check if recipe exists in recipes folder
     if (await Drive.exists(`${service}.tar.gz`)) {
       return response.send(await Drive.get(`${service}.tar.gz`));
-    } if (Env.get('CONNECT_WITH_FRANZ') == 'true') { // eslint-disable-line eqeqeq
+    }
+    // eslint-disable-next-line eqeqeq
+    if (Env.get('CONNECT_WITH_FRANZ') == 'true') {
+      // eslint-disable-line eqeqeq
       return response.redirect(`${RECIPES_URL}/download/${service}`);
     }
     return response.status(400).send({
diff --git a/src/internal-server/app/Controllers/Http/ServiceController.js b/src/internal-server/app/Controllers/Http/ServiceController.js
index f2af9d411..ae463617d 100644
--- a/src/internal-server/app/Controllers/Http/ServiceController.js
+++ b/src/internal-server/app/Controllers/Http/ServiceController.js
@@ -135,13 +135,11 @@ class ServiceController {
 
       const newSettings = {
         ...settings,
-        ...{
-          iconId,
-          customIconVersion:
-            settings && settings.customIconVersion
-              ? settings.customIconVersion + 1
-              : 1,
-        },
+        iconId,
+        customIconVersion:
+          settings && settings.customIconVersion
+            ? settings.customIconVersion + 1
+            : 1,
       };
 
       // Update data in database
@@ -157,9 +155,7 @@ class ServiceController {
           id,
           name: service.name,
           ...newSettings,
-          iconUrl: `http://${hostname}:${port}/${API_VERSION}/icon/${
-            newSettings.iconId
-          }`,
+          iconUrl: `http://${hostname}:${port}/${API_VERSION}/icon/${newSettings.iconId}`,
           userId: 1,
         },
         status: ['updated'],
diff --git a/src/internal-server/app/Controllers/Http/UserController.js b/src/internal-server/app/Controllers/Http/UserController.js
index 994dcc0dc..7b71aac14 100644
--- a/src/internal-server/app/Controllers/Http/UserController.js
+++ b/src/internal-server/app/Controllers/Http/UserController.js
@@ -1,34 +1,37 @@
 const User = use('App/Models/User');
 const Service = use('App/Models/Service');
 const Workspace = use('App/Models/Workspace');
-const {
-  validateAll,
-} = use('Validator');
+const { validateAll } = use('Validator');
 
 const btoa = require('btoa');
 const fetch = require('node-fetch');
 const uuid = require('uuid/v4');
 const crypto = require('crypto');
-const { DEFAULT_APP_SETTINGS, API_VERSION } = require('../../../../environment');
+const {
+  DEFAULT_APP_SETTINGS,
+  API_VERSION,
+} = require('../../../../environment');
 const { default: userAgent } = require('../../../../helpers/userAgent-helpers');
 
-const apiRequest = (url, route, method, auth) => new Promise((resolve, reject) => {
-  try {
-    fetch(`${url}/${API_VERSION}/${route}`, {
-      method,
-      headers: {
-        Authorization: `Bearer ${auth}`,
-        'User-Agent': userAgent(),
-      },
-    })
-      .then(data => data.json())
-      .then(json => resolve(json));
-  } catch (e) {
-    reject();
-  }
-});
+const apiRequest = (url, route, method, auth) =>
+  new Promise((resolve, reject) => {
+    try {
+      fetch(`${url}/${API_VERSION}/${route}`, {
+        method,
+        headers: {
+          Authorization: `Bearer ${auth}`,
+          'User-Agent': userAgent(),
+        },
+      })
+        .then(data => data.json())
+        .then(json => resolve(json));
+    } catch {
+      reject();
+    }
+  });
 
-const LOGIN_SUCCESS_TOKEN = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJGZXJkaSBJbnRlcm5hbCBTZXJ2ZXIiLCJpYXQiOjE1NzEwNDAyMTUsImV4cCI6MjUzMzk1NDE3ODQ0LCJhdWQiOiJnZXRmZXJkaS5jb20iLCJzdWIiOiJmZXJkaUBsb2NhbGhvc3QiLCJ1c2VySWQiOiIxIn0.9_TWFGp6HROv8Yg82Rt6i1-95jqWym40a-HmgrdMC6M';
+const LOGIN_SUCCESS_TOKEN =
+  'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJGZXJkaSBJbnRlcm5hbCBTZXJ2ZXIiLCJpYXQiOjE1NzEwNDAyMTUsImV4cCI6MjUzMzk1NDE3ODQ0LCJhdWQiOiJnZXRmZXJkaS5jb20iLCJzdWIiOiJmZXJkaUBsb2NhbGhvc3QiLCJ1c2VySWQiOiIxIn0.9_TWFGp6HROv8Yg82Rt6i1-95jqWym40a-HmgrdMC6M';
 
 const DEFAULT_USER_DATA = {
   accountType: 'individual',
@@ -45,10 +48,7 @@ const DEFAULT_USER_DATA = {
 
 class UserController {
   // Register a new user
-  async signup({
-    request,
-    response,
-  }) {
+  async signup({ request, response }) {
     // Validate user input
     const validation = await validateAll(request.all(), {
       firstname: 'required',
@@ -70,10 +70,7 @@ class UserController {
   }
 
   // Login using an existing user
-  async login({
-    request,
-    response,
-  }) {
+  async login({ request, response }) {
     if (!request.header('Authorization')) {
       return response.status(401).send({
         message: 'Please provide authorization',
@@ -88,23 +85,21 @@ class UserController {
   }
 
   // Return information about the current user
-  async me({
-    response,
-  }) {
+  async me({ response }) {
     const user = await User.find(1);
 
-    const settings = typeof user.settings === 'string' ? JSON.parse(user.settings) : user.settings;
+    const settings =
+      typeof user.settings === 'string'
+        ? JSON.parse(user.settings)
+        : user.settings;
 
     return response.send({
       ...DEFAULT_USER_DATA,
-      ...settings || {},
+      ...settings,
     });
   }
 
-  async updateMe({
-    request,
-    response,
-  }) {
+  async updateMe({ request, response }) {
     const user = await User.find(1);
 
     let settings = user.settings || {};
@@ -125,16 +120,11 @@ class UserController {
         ...DEFAULT_USER_DATA,
         ...newSettings,
       },
-      status: [
-        'data-updated',
-      ],
+      status: ['data-updated'],
     });
   }
 
-  async import({
-    request,
-    response,
-  }) {
+  async import({ request, response }) {
     // Validate user input
     const validation = await validateAll(request.all(), {
       email: 'required|email',
@@ -142,7 +132,8 @@ class UserController {
       server: 'required',
     });
     if (validation.fails()) {
-      let errorMessage = 'There was an error while trying to import your account:\n';
+      let errorMessage =
+        'There was an error while trying to import your account:\n';
       for (const message of validation.messages()) {
         if (message.validation === 'required') {
           errorMessage += `- Please make sure to supply your ${message.field}\n`;
@@ -155,13 +146,12 @@ class UserController {
       return response.status(401).send(errorMessage);
     }
 
-    const {
-      email,
-      password,
-      server,
-    } = request.all();
+    const { email, password, server } = request.all();
 
-    const hashedPassword = crypto.createHash('sha256').update(password).digest('base64');
+    const hashedPassword = crypto
+      .createHash('sha256')
+      .update(password)
+      .digest('base64');
 
     // Try to get an authentication token
     let token;
@@ -178,16 +168,17 @@ class UserController {
       const content = await rawResponse.json();
 
       if (!content.message || content.message !== 'Successfully logged in') {
-        const errorMessage = 'Could not login into Franz with your supplied credentials. Please check and try again';
+        const errorMessage =
+          'Could not login into Franz with your supplied credentials. Please check and try again';
         return response.status(401).send(errorMessage);
       }
 
       // eslint-disable-next-line prefer-destructuring
       token = content.token;
-    } catch (e) {
+    } catch (error) {
       return response.status(401).send({
         message: 'Cannot login to Franz',
-        error: e,
+        error,
       });
     }
 
@@ -195,12 +186,13 @@ class UserController {
     let userInf = false;
     try {
       userInf = await apiRequest(server, 'me', 'GET', token);
-    } catch (e) {
-      const errorMessage = `Could not get your user info from Franz. Please check your credentials or try again later.\nError: ${e}`;
+    } catch (error) {
+      const errorMessage = `Could not get your user info from Franz. Please check your credentials or try again later.\nError: ${error}`;
       return response.status(401).send(errorMessage);
     }
     if (!userInf) {
-      const errorMessage = 'Could not get your user info from Franz. Please check your credentials or try again later';
+      const errorMessage =
+        'Could not get your user info from Franz. Please check your credentials or try again later';
       return response.status(401).send(errorMessage);
     }
 
@@ -213,8 +205,8 @@ class UserController {
       for (const service of services) {
         await this._createAndCacheService(service, serviceIdTranslation); // eslint-disable-line no-await-in-loop
       }
-    } catch (e) {
-      const errorMessage = `Could not import your services into our system.\nError: ${e}`;
+    } catch (error) {
+      const errorMessage = `Could not import your services into our system.\nError: ${error}`;
       return response.status(401).send(errorMessage);
     }
 
@@ -225,12 +217,14 @@ class UserController {
       for (const workspace of workspaces) {
         await this._createWorkspace(workspace, serviceIdTranslation); // eslint-disable-line no-await-in-loop
       }
-    } catch (e) {
-      const errorMessage = `Could not import your workspaces into our system.\nError: ${e}`;
+    } catch (error) {
+      const errorMessage = `Could not import your workspaces into our system.\nError: ${error}`;
       return response.status(401).send(errorMessage);
     }
 
-    return response.send('Your account has been imported. You can now use your Franz account in Ferdi.');
+    return response.send(
+      'Your account has been imported. You can now use your Franz account in Ferdi.',
+    );
   }
 
   // Account import/export
@@ -255,10 +249,7 @@ class UserController {
       .send(exportData);
   }
 
-  async importFerdi({
-    request,
-    response,
-  }) {
+  async importFerdi({ request, response }) {
     const validation = await validateAll(request.all(), {
       file: 'required',
     });
@@ -269,8 +260,10 @@ class UserController {
     let file;
     try {
       file = JSON.parse(request.input('file'));
-    } catch (e) {
-      return response.send('Could not import: Invalid file, could not read file');
+    } catch {
+      return response.send(
+        'Could not import: Invalid file, could not read file',
+      );
     }
 
     if (!file || !file.services || !file.workspaces) {
@@ -284,8 +277,8 @@ class UserController {
       for (const service of file.services) {
         await this._createAndCacheService(service, serviceIdTranslation); // eslint-disable-line no-await-in-loop
       }
-    } catch (e) {
-      const errorMessage = `Could not import your services into our system.\nError: ${e}`;
+    } catch (error) {
+      const errorMessage = `Could not import your services into our system.\nError: ${error}`;
       return response.send(errorMessage);
     }
 
@@ -294,8 +287,8 @@ class UserController {
       for (const workspace of file.workspaces) {
         await this._createWorkspace(workspace, serviceIdTranslation); // eslint-disable-line no-await-in-loop
       }
-    } catch (e) {
-      const errorMessage = `Could not import your workspaces into our system.\nError: ${e}`;
+    } catch (error) {
+      const errorMessage = `Could not import your workspaces into our system.\nError: ${error}`;
       return response.status(401).send(errorMessage);
     }
 
@@ -306,15 +299,29 @@ class UserController {
     let newWorkspaceId;
     do {
       newWorkspaceId = uuid();
-    } while ((await Workspace.query().where('workspaceId', newWorkspaceId).fetch()).rows.length > 0); // eslint-disable-line no-await-in-loop
-
-    if (workspace.services && typeof (workspace.services) === 'string' && workspace.services.length > 0) {
+    } while (
+      (await Workspace.query().where('workspaceId', newWorkspaceId).fetch())
+        .rows.length > 0
+    ); // eslint-disable-line no-await-in-loop
+
+    if (
+      workspace.services &&
+      typeof workspace.services === 'string' &&
+      workspace.services.length > 0
+    ) {
       workspace.services = JSON.parse(workspace.services);
     }
-    const services = (workspace.services && typeof (workspace.services) === 'object') ?
-      workspace.services.map(oldServiceId => serviceIdTranslation[oldServiceId]) :
-      [];
-    if (workspace.data && typeof (workspace.data) === 'string' && workspace.data.length > 0) {
+    const services =
+      workspace.services && typeof workspace.services === 'object'
+        ? workspace.services.map(
+            oldServiceId => serviceIdTranslation[oldServiceId],
+          )
+        : [];
+    if (
+      workspace.data &&
+      typeof workspace.data === 'string' &&
+      workspace.data.length > 0
+    ) {
       workspace.data = JSON.parse(workspace.data);
     }
 
@@ -332,12 +339,19 @@ class UserController {
     let newServiceId;
     do {
       newServiceId = uuid();
-    } while ((await Service.query().where('serviceId', newServiceId).fetch()).rows.length > 0); // eslint-disable-line no-await-in-loop
+    } while (
+      (await Service.query().where('serviceId', newServiceId).fetch()).rows
+        .length > 0
+    ); // eslint-disable-line no-await-in-loop
 
     // store the old serviceId as the key for future lookup
     serviceIdTranslation[service.serviceId] = newServiceId;
 
-    if (service.settings && typeof (service.settings) === 'string' && service.settings.length > 0) {
+    if (
+      service.settings &&
+      typeof service.settings === 'string' &&
+      service.settings.length > 0
+    ) {
       service.settings = JSON.parse(service.settings);
     }
 
diff --git a/src/internal-server/app/Middleware/ConvertEmptyStringsToNull.js b/src/internal-server/app/Middleware/ConvertEmptyStringsToNull.js
index 87f1f6c25..9591cdc41 100644
--- a/src/internal-server/app/Middleware/ConvertEmptyStringsToNull.js
+++ b/src/internal-server/app/Middleware/ConvertEmptyStringsToNull.js
@@ -1,6 +1,6 @@
 class ConvertEmptyStringsToNull {
   async handle({ request }, next) {
-    if (Object.keys(request.body).length) {
+    if (Object.keys(request.body).length > 0) {
       request.body = Object.assign(
         ...Object.keys(request.body).map(key => ({
           [key]: request.body[key] !== '' ? request.body[key] : null,
diff --git a/src/internal-server/app/Models/Recipe.js b/src/internal-server/app/Models/Recipe.js
index bd9741114..f9370e206 100644
--- a/src/internal-server/app/Models/Recipe.js
+++ b/src/internal-server/app/Models/Recipe.js
@@ -1,7 +1,6 @@
 /** @type {typeof import('@adonisjs/lucid/src/Lucid/Model')} */
 const Model = use('Model');
 
-class Recipe extends Model {
-}
+class Recipe extends Model {}
 
 module.exports = Recipe;
diff --git a/src/internal-server/app/Models/Service.js b/src/internal-server/app/Models/Service.js
index a2e5c981e..95321686c 100644
--- a/src/internal-server/app/Models/Service.js
+++ b/src/internal-server/app/Models/Service.js
@@ -1,7 +1,6 @@
 /** @type {typeof import('@adonisjs/lucid/src/Lucid/Model')} */
 const Model = use('Model');
 
-class Service extends Model {
-}
+class Service extends Model {}
 
 module.exports = Service;
diff --git a/src/internal-server/app/Models/Token.js b/src/internal-server/app/Models/Token.js
index 83e989117..1388b94ad 100644
--- a/src/internal-server/app/Models/Token.js
+++ b/src/internal-server/app/Models/Token.js
@@ -1,7 +1,6 @@
 /** @type {typeof import('@adonisjs/lucid/src/Lucid/Model')} */
 const Model = use('Model');
 
-class Token extends Model {
-}
+class Token extends Model {}
 
 module.exports = Token;
diff --git a/src/internal-server/app/Models/User.js b/src/internal-server/app/Models/User.js
index 907710d8d..f17f04c3e 100644
--- a/src/internal-server/app/Models/User.js
+++ b/src/internal-server/app/Models/User.js
@@ -2,7 +2,6 @@
 /** @type {typeof import('@adonisjs/lucid/src/Lucid/Model')} */
 const Model = use('Model');
 
-class User extends Model {
-}
+class User extends Model {}
 
 module.exports = User;
diff --git a/src/internal-server/app/Models/Workspace.js b/src/internal-server/app/Models/Workspace.js
index dcf39ac75..c47c02e37 100644
--- a/src/internal-server/app/Models/Workspace.js
+++ b/src/internal-server/app/Models/Workspace.js
@@ -1,7 +1,6 @@
 /** @type {typeof import('@adonisjs/lucid/src/Lucid/Model')} */
 const Model = use('Model');
 
-class Workspace extends Model {
-}
+class Workspace extends Model {}
 
 module.exports = Workspace;
diff --git a/src/internal-server/config/shield.js b/src/internal-server/config/shield.js
index 76f430e91..4ff22c3f9 100644
--- a/src/internal-server/config/shield.js
+++ b/src/internal-server/config/shield.js
@@ -25,8 +25,7 @@ module.exports = {
     | }
     |
     */
-    directives: {
-    },
+    directives: {},
     /*
     |--------------------------------------------------------------------------
     | Report only
diff --git a/src/internal-server/public/js/transfer.js b/src/internal-server/public/js/transfer.js
index 8382bba02..36fdbd61a 100644
--- a/src/internal-server/public/js/transfer.js
+++ b/src/internal-server/public/js/transfer.js
@@ -1,13 +1,17 @@
-const submitBtn = document.getElementById('submit');
-const fileInput = document.getElementById('file');
-const fileOutput = document.getElementById('fileoutput');
+const submitBtn = document.querySelector('#submit');
+const fileInput = document.querySelector('#file');
+const fileOutput = document.querySelector('#fileoutput');
 
-fileInput.addEventListener('change', () => {
+fileInput?.addEventListener('change', () => {
   const reader = new FileReader();
-  reader.onload = () => {
+  reader.addEventListener('load', () => {
     const text = reader.result;
-    fileOutput.value = text;
-    submitBtn.disabled = false;
-  };
+    if (fileOutput) {
+      fileOutput.value = text;
+    }
+    if (submitBtn) {
+      submitBtn.disabled = false;
+    }
+  });
   reader.readAsText(fileInput.files[0]);
 });
diff --git a/src/internal-server/start/kernel.js b/src/internal-server/start/kernel.js
index 7b540f829..f72e445f2 100644
--- a/src/internal-server/start/kernel.js
+++ b/src/internal-server/start/kernel.js
@@ -32,8 +32,7 @@ const globalMiddleware = [
 | Route.get().middleware('auth')
 |
 */
-const namedMiddleware = {
-};
+const namedMiddleware = {};
 
 /*
 |--------------------------------------------------------------------------
@@ -45,11 +44,8 @@ const namedMiddleware = {
 | control over request lifecycle.
 |
 */
-const serverMiddleware = [
-  'Adonis/Middleware/Static',
-];
+const serverMiddleware = ['Adonis/Middleware/Static'];
 
-Server
-  .registerGlobal(globalMiddleware)
+Server.registerGlobal(globalMiddleware)
   .registerNamed(namedMiddleware)
   .use(serverMiddleware);
diff --git a/src/internal-server/start/migrate.js b/src/internal-server/start/migrate.js
index c27e07bc5..0f25240cc 100644
--- a/src/internal-server/start/migrate.js
+++ b/src/internal-server/start/migrate.js
@@ -6,29 +6,39 @@ const { ferdiVersion } = require('../../environment');
 const Database = use('Database');
 const User = use('App/Models/User');
 
-const migrateLog = (text) => {
-  console.log('\x1b[36m%s\x1b[0m', 'Ferdi Migration:', '\x1b[0m', text);
+const migrateLog = text => {
+  console.log('\u001B[36m%s\u001B[0m', 'Ferdi Migration:', '\u001B[0m', text);
 };
 
 module.exports = async () => {
   migrateLog('🧙‍  Running database migration wizard');
 
   // Make sure user table exists
-  await Database.raw('CREATE TABLE IF NOT EXISTS `users` (`id` integer not null primary key autoincrement, `settings` text, `created_at` datetime, `updated_at` datetime);');
+  await Database.raw(
+    'CREATE TABLE IF NOT EXISTS `users` (`id` integer not null primary key autoincrement, `settings` text, `created_at` datetime, `updated_at` datetime);',
+  );
 
   const user = await User.find(1);
   let settings;
   if (!user) {
-    migrateLog('🎩  Migrating from old Ferdi version as user doesn\'t exist');
+    migrateLog("🎩  Migrating from old Ferdi version as user doesn't exist");
 
     // Create new user
     await Database.raw('INSERT INTO  "users" ("id") VALUES (\'1\');');
   } else {
-    settings = typeof user.settings === 'string' ? JSON.parse(user.settings) : user.settings;
+    settings =
+      typeof user.settings === 'string'
+        ? JSON.parse(user.settings)
+        : user.settings;
   }
 
-  if (!settings || !settings.db_version || settings.db_version !== ferdiVersion) {
-    const srcVersion = settings && settings.db_version ? settings.db_version : '5.4.0-beta.2';
+  if (
+    !settings ||
+    !settings.db_version ||
+    settings.db_version !== ferdiVersion
+  ) {
+    const srcVersion =
+      settings && settings.db_version ? settings.db_version : '5.4.0-beta.2';
     migrateLog(`🔮  Migrating table from ${srcVersion} to ${ferdiVersion}`);
 
     // Migrate database to current Ferdi version
diff --git a/src/internal-server/test.js b/src/internal-server/test.js
index 8d4807d06..ef85743f3 100644
--- a/src/internal-server/test.js
+++ b/src/internal-server/test.js
@@ -6,4 +6,4 @@ const dummyUserFolder = path.join(__dirname, 'user_data');
 
 fs.ensureDirSync(dummyUserFolder);
 
-server(dummyUserFolder, 45568);
+server(dummyUserFolder, 45_568);
diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index 8e2d8bdca..563db087b 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -952,7 +952,7 @@ class FranzMenu {
       },
     );
 
-    services.allDisplayed.forEach((service, i) =>
+    for (const [i, service] of services.allDisplayed.entries()) {
       menu.push({
         label: this._getServiceName(service),
         accelerator: i < 9 ? `${cmdOrCtrlShortcutKey()}+${i + 1}` : null,
@@ -965,8 +965,8 @@ class FranzMenu {
             app.mainWindow.restore();
           }
         },
-      }),
-    );
+      });
+    }
 
     if (
       services.active &&
@@ -1018,23 +1018,23 @@ class FranzMenu {
       });
     }
 
-    menu.push({
-      type: 'separator',
-    });
-
-    // Default workspace
-    menu.push({
-      label: intl.formatMessage(menuItems.defaultWorkspace),
-      accelerator: `${cmdOrCtrlShortcutKey()}+${altKey()}+0`,
-      type: 'radio',
-      checked: !activeWorkspace,
-      click: () => {
-        workspaceActions.deactivate();
+    menu.push(
+      {
+        type: 'separator',
       },
-    });
+      {
+        label: intl.formatMessage(menuItems.defaultWorkspace),
+        accelerator: `${cmdOrCtrlShortcutKey()}+${altKey()}+0`,
+        type: 'radio',
+        checked: !activeWorkspace,
+        click: () => {
+          workspaceActions.deactivate();
+        },
+      },
+    );
 
     // Workspace items
-    workspaces.forEach((workspace, i) =>
+    for (const [i, workspace] of workspaces.entries()) {
       menu.push({
         label: workspace.name,
         accelerator:
@@ -1044,8 +1044,8 @@ class FranzMenu {
         click: () => {
           workspaceActions.activate({ workspace });
         },
-      }),
-    );
+      });
+    }
 
     return menu;
   }
diff --git a/src/lib/TouchBar.js b/src/lib/TouchBar.js
index 3397afdb2..c80931200 100644
--- a/src/lib/TouchBar.js
+++ b/src/lib/TouchBar.js
@@ -15,8 +15,8 @@ export default class FranzTouchBar {
       if (isMac && semver.gt(osRelease, '16.6.0')) {
         this.build = autorun(this._build.bind(this));
       }
-    } catch (err) {
-      console.error(err);
+    } catch (error) {
+      console.error(error);
     }
   }
 
@@ -27,7 +27,7 @@ export default class FranzTouchBar {
       const { TouchBarButton, TouchBarSpacer } = TouchBar;
 
       const buttons = [];
-      this.stores.services.allDisplayed.forEach(((service) => {
+      for (const service of this.stores.services.allDisplayed) {
         buttons.push(new TouchBarButton({
           label: `${service.name}${service.unreadDirectMessageCount > 0
             ? ' 🔴' : ''} ${service.unreadDirectMessageCount === 0
@@ -38,7 +38,7 @@ export default class FranzTouchBar {
             this.actions.service.setActive({ serviceId: service.id });
           },
         }), new TouchBarSpacer({ size: 'small' }));
-      }));
+      }
 
       const touchBar = new TouchBar({ items: buttons });
       currentWindow.setTouchBar(touchBar);
diff --git a/src/models/News.ts b/src/models/News.ts
index a6ff86dda..4fc21f590 100644
--- a/src/models/News.ts
+++ b/src/models/News.ts
@@ -1,5 +1,3 @@
-// @flow
-
 import { ifUndefinedString, ifUndefinedBoolean } from '../jsUtils';
 
 interface INews {
@@ -20,11 +18,11 @@ export default class News {
 
   constructor(data: INews) {
     if (!data) {
-      throw Error('News config not valid');
+      throw new Error('News config not valid');
     }
 
     if (!data.id) {
-      throw Error('News requires Id');
+      throw new Error('News requires Id');
     }
 
     this.id = data.id;
diff --git a/src/models/Recipe.ts b/src/models/Recipe.ts
index 0a93fbc5a..6022fb520 100644
--- a/src/models/Recipe.ts
+++ b/src/models/Recipe.ts
@@ -68,16 +68,16 @@ export default class Recipe {
   // TODO: Need to reconcile which of these are optional/mandatory
   constructor(data: IRecipe) {
     if (!data) {
-      throw Error('Recipe config not valid');
+      throw new Error('Recipe config not valid');
     }
 
     if (!data.id) {
       // Ferdi 4 recipes do not have an Id
-      throw Error(`Recipe '${data.name}' requires Id`);
+      throw new Error(`Recipe '${data.name}' requires Id`);
     }
 
     if (!semver.valid(data.version)) {
-      throw Error(`Version ${data.version} of recipe '${data.name}' is not a valid semver version`);
+      throw new Error(`Version ${data.version} of recipe '${data.name}' is not a valid semver version`);
     }
 
     this.id = data.id || this.id;
diff --git a/src/models/RecipePreview.ts b/src/models/RecipePreview.ts
index 4d2cc8450..fb8cb3e3e 100644
--- a/src/models/RecipePreview.ts
+++ b/src/models/RecipePreview.ts
@@ -1,5 +1,3 @@
-// @flow
-
 interface IRecipePreview {
   id: string;
   name: string;
@@ -21,11 +19,11 @@ export default class RecipePreview {
 
   constructor(data: IRecipePreview) {
     if (!data) {
-      throw Error('RecipePreview config not valid');
+      throw new Error('RecipePreview config not valid');
     }
 
     if (!data.id) {
-      throw Error(`RecipePreview '${data.name}' requires Id`);
+      throw new Error(`RecipePreview '${data.name}' requires Id`);
     }
 
     Object.assign(this, data);
diff --git a/src/models/Service.js b/src/models/Service.js
index 4ee054b2b..cc001f98d 100644
--- a/src/models/Service.js
+++ b/src/models/Service.js
@@ -8,7 +8,11 @@ import { todosStore } from '../features/todos';
 import { isValidExternalURL } from '../helpers/url-helpers';
 import UserAgent from './UserAgent';
 import { DEFAULT_SERVICE_ORDER } from '../config';
-import { ifUndefinedString, ifUndefinedBoolean, ifUndefinedNumber } from '../jsUtils';
+import {
+  ifUndefinedString,
+  ifUndefinedBoolean,
+  ifUndefinedNumber,
+} from '../jsUtils';
 
 const debug = require('debug')('Ferdi:Service');
 
@@ -95,11 +99,11 @@ export default class Service {
 
   constructor(data, recipe) {
     if (!data) {
-      throw Error('Service config not valid');
+      throw new Error('Service config not valid');
     }
 
     if (!recipe) {
-      throw Error('Service recipe not valid');
+      throw new Error('Service recipe not valid');
     }
 
     this.recipe = recipe;
@@ -115,22 +119,51 @@ export default class Service {
 
     this.order = ifUndefinedNumber(data.order, this.order);
     this.isEnabled = ifUndefinedBoolean(data.isEnabled, this.isEnabled);
-    this.isNotificationEnabled = ifUndefinedBoolean(data.isNotificationEnabled, this.isNotificationEnabled);
-    this.isBadgeEnabled = ifUndefinedBoolean(data.isBadgeEnabled, this.isBadgeEnabled);
-    this.isIndirectMessageBadgeEnabled = ifUndefinedBoolean(data.isIndirectMessageBadgeEnabled, this.isIndirectMessageBadgeEnabled);
+    this.isNotificationEnabled = ifUndefinedBoolean(
+      data.isNotificationEnabled,
+      this.isNotificationEnabled,
+    );
+    this.isBadgeEnabled = ifUndefinedBoolean(
+      data.isBadgeEnabled,
+      this.isBadgeEnabled,
+    );
+    this.isIndirectMessageBadgeEnabled = ifUndefinedBoolean(
+      data.isIndirectMessageBadgeEnabled,
+      this.isIndirectMessageBadgeEnabled,
+    );
     this.isMuted = ifUndefinedBoolean(data.isMuted, this.isMuted);
-    this.isDarkModeEnabled = ifUndefinedBoolean(data.isDarkModeEnabled, this.isDarkModeEnabled);
-    this.darkReaderSettings = ifUndefinedString(data.darkReaderSettings, this.darkReaderSettings);
-    this.hasCustomUploadedIcon = ifUndefinedBoolean(data.hasCustomIcon, this.hasCustomUploadedIcon);
+    this.isDarkModeEnabled = ifUndefinedBoolean(
+      data.isDarkModeEnabled,
+      this.isDarkModeEnabled,
+    );
+    this.darkReaderSettings = ifUndefinedString(
+      data.darkReaderSettings,
+      this.darkReaderSettings,
+    );
+    this.hasCustomUploadedIcon = ifUndefinedBoolean(
+      data.hasCustomIcon,
+      this.hasCustomUploadedIcon,
+    );
     this.proxy = ifUndefinedString(data.proxy, this.proxy);
-    this.spellcheckerLanguage = ifUndefinedString(data.spellcheckerLanguage, this.spellcheckerLanguage);
-    this.userAgentPref = ifUndefinedString(data.userAgentPref, this.userAgentPref);
-    this.isHibernationEnabled = ifUndefinedBoolean(data.isHibernationEnabled, this.isHibernationEnabled);
+    this.spellcheckerLanguage = ifUndefinedString(
+      data.spellcheckerLanguage,
+      this.spellcheckerLanguage,
+    );
+    this.userAgentPref = ifUndefinedString(
+      data.userAgentPref,
+      this.userAgentPref,
+    );
+    this.isHibernationEnabled = ifUndefinedBoolean(
+      data.isHibernationEnabled,
+      this.isHibernationEnabled,
+    );
 
     // Check if "Hibernate on Startup" is enabled and hibernate all services except active one
     const { hibernateOnStartup } = window.ferdi.stores.settings.app;
     // The service store is probably not loaded yet so we need to use localStorage data to get active service
-    const isActive = window.localStorage.service && JSON.parse(window.localStorage.service).activeService === this.id;
+    const isActive =
+      window.localStorage.service &&
+      JSON.parse(window.localStorage.service).activeService === this.id;
     if (hibernateOnStartup && !isActive) {
       this.isHibernationRequested = true;
     }
@@ -189,9 +222,14 @@ export default class Service {
     if (this.recipe.hasCustomUrl && this.customUrl) {
       let url;
       try {
-        url = normalizeUrl(this.customUrl, { stripWWW: false, removeTrailingSlash: false });
-      } catch (err) {
-        console.error(`Service (${this.recipe.name}): '${this.customUrl}' is not a valid Url.`);
+        url = normalizeUrl(this.customUrl, {
+          stripWWW: false,
+          removeTrailingSlash: false,
+        });
+      } catch {
+        console.error(
+          `Service (${this.recipe.name}): '${this.customUrl}' is not a valid Url.`,
+        );
       }
 
       if (typeof this.recipe.buildUrl === 'function') {
@@ -241,7 +279,9 @@ export default class Service {
   }
 
   initializeWebViewEvents({ handleIPCMessage, openWindow, stores }) {
-    const webviewWebContents = webContents.fromId(this.webview.getWebContentsId());
+    const webviewWebContents = webContents.fromId(
+      this.webview.getWebContentsId(),
+    );
 
     this.userAgentModel.setWebviewReference(this.webview);
 
@@ -270,9 +310,15 @@ export default class Service {
       debug(this.name, 'knownCertificateHosts is not defined in the recipe');
     }
 
-    this.webview.addEventListener('ipc-message', async (e) => {
+    this.webview.addEventListener('ipc-message', async e => {
       if (e.channel === 'inject-js-unsafe') {
-        await Promise.all(e.args.map((script) => this.webview.executeJavaScript(`"use strict"; (() => { ${script} })();`)));
+        await Promise.all(
+          e.args.map(script =>
+            this.webview.executeJavaScript(
+              `"use strict"; (() => { ${script} })();`,
+            ),
+          ),
+        );
       } else {
         handleIPCMessage({
           serviceId: this.id,
@@ -282,27 +328,33 @@ export default class Service {
       }
     });
 
-    this.webview.addEventListener('new-window', (event, url, frameName, options) => {
-      debug('new-window', event, url, frameName, options);
-      if (!isValidExternalURL(event.url)) {
-        return;
-      }
-      if (event.disposition === 'foreground-tab' || event.disposition === 'background-tab') {
-        openWindow({
-          event,
-          url,
-          frameName,
-          options,
-        });
-      } else {
-        ipcRenderer.send('open-browser-window', {
-          url: event.url,
-          serviceId: this.id,
-        });
-      }
-    });
+    this.webview.addEventListener(
+      'new-window',
+      (event, url, frameName, options) => {
+        debug('new-window', event, url, frameName, options);
+        if (!isValidExternalURL(event.url)) {
+          return;
+        }
+        if (
+          event.disposition === 'foreground-tab' ||
+          event.disposition === 'background-tab'
+        ) {
+          openWindow({
+            event,
+            url,
+            frameName,
+            options,
+          });
+        } else {
+          ipcRenderer.send('open-browser-window', {
+            url: event.url,
+            serviceId: this.id,
+          });
+        }
+      },
+    );
 
-    this.webview.addEventListener('did-start-loading', (event) => {
+    this.webview.addEventListener('did-start-loading', event => {
       debug('Did start load', this.name, event);
 
       this.hasCrashed = false;
@@ -321,9 +373,13 @@ export default class Service {
     this.webview.addEventListener('did-frame-finish-load', didLoad.bind(this));
     this.webview.addEventListener('did-navigate', didLoad.bind(this));
 
-    this.webview.addEventListener('did-fail-load', (event) => {
+    this.webview.addEventListener('did-fail-load', event => {
       debug('Service failed to load', this.name, event);
-      if (event.isMainFrame && event.errorCode !== -21 && event.errorCode !== -3) {
+      if (
+        event.isMainFrame &&
+        event.errorCode !== -21 &&
+        event.errorCode !== -3
+      ) {
         this.isError = true;
         this.errorMessage = event.errorDescription;
         this.isLoading = false;
@@ -365,12 +421,12 @@ export default class Service {
 
   initializeWebViewListener() {
     if (this.webview && this.recipe.events) {
-      Object.keys(this.recipe.events).forEach((eventName) => {
+      for (const eventName of Object.keys(this.recipe.events)) {
         const eventHandler = this.recipe[this.recipe.events[eventName]];
         if (typeof eventHandler === 'function') {
           this.webview.addEventListener(eventName, eventHandler);
         }
-      });
+      }
     }
   }
 
diff --git a/src/models/User.ts b/src/models/User.ts
index 54a6838df..a04d46d3c 100644
--- a/src/models/User.ts
+++ b/src/models/User.ts
@@ -43,11 +43,11 @@ export default class User {
 
   constructor(data: IUser) {
     if (!data) {
-      throw Error('User config not valid');
+      throw new Error('User config not valid');
     }
 
     if (!data.id) {
-      throw Error('User requires Id');
+      throw new Error('User requires Id');
     }
 
     this.id = data.id;
diff --git a/src/models/UserAgent.js b/src/models/UserAgent.js
index 930ae19ef..8ec274aa5 100644
--- a/src/models/UserAgent.js
+++ b/src/models/UserAgent.js
@@ -1,9 +1,4 @@
-import {
-  action,
-  computed,
-  observe,
-  observable,
-} from 'mobx';
+import { action, computed, observe, observable } from 'mobx';
 
 import defaultUserAgent from '../helpers/userAgent-helpers';
 
@@ -27,7 +22,7 @@ export default class UserAgent {
       this.getUserAgent = overrideUserAgent;
     }
 
-    observe(this, 'webview', (change) => {
+    observe(this, 'webview', change => {
       const { oldValue, newValue } = change;
       if (oldValue !== null) {
         this._removeWebviewEvents(oldValue);
@@ -64,11 +59,13 @@ export default class UserAgent {
 
   @computed get userAgentWithoutChromeVersion() {
     const withChrome = this.userAgentWithChromeVersion;
-    return withChrome.replace(/Chrome\/[0-9.]+/, 'Chrome');
+    return withChrome.replace(/Chrome\/[\d.]+/, 'Chrome');
   }
 
   @computed get userAgent() {
-    return this.chromelessUserAgent ? this.userAgentWithoutChromeVersion : this.userAgentWithChromeVersion;
+    return this.chromelessUserAgent
+      ? this.userAgentWithoutChromeVersion
+      : this.userAgentWithChromeVersion;
   }
 
   @action setWebviewReference(webview) {
@@ -95,10 +92,10 @@ export default class UserAgent {
   _addWebviewEvents(webview) {
     debug('Adding event handlers');
 
-    this._willNavigateListener = (event) => this._handleNavigate(event.url, true);
+    this._willNavigateListener = event => this._handleNavigate(event.url, true);
     webview.addEventListener('will-navigate', this._willNavigateListener);
 
-    this._didNavigateListener = (event) => this._handleNavigate(event.url);
+    this._didNavigateListener = event => this._handleNavigate(event.url);
     webview.addEventListener('did-navigate', this._didNavigateListener);
   }
 
diff --git a/src/prop-types.ts b/src/prop-types.ts
index 459b9a7b9..07607f105 100644
--- a/src/prop-types.ts
+++ b/src/prop-types.ts
@@ -1,6 +1,5 @@
 import PropTypes from 'prop-types';
 
-// eslint-disable-next-line
 export const oneOrManyChildElements = PropTypes.oneOfType([
   PropTypes.arrayOf(PropTypes.element),
   PropTypes.element,
diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index 469e7519e..85f74a91e 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -251,16 +251,14 @@ export default class AppStore extends Store {
     // macOS catalina notifications hack
     // notifications got stuck after upgrade but forcing a notification
     // via `new Notification` triggered the permission request
-    if (isMac) {
-      if (!localStorage.getItem(CATALINA_NOTIFICATION_HACK_KEY)) {
-        debug('Triggering macOS Catalina notification permission trigger');
-        // eslint-disable-next-line no-new
-        new window.Notification('Welcome to Ferdi 5', {
-          body: 'Have a wonderful day & happy messaging.',
-        });
+    if (isMac && !localStorage.getItem(CATALINA_NOTIFICATION_HACK_KEY)) {
+      debug('Triggering macOS Catalina notification permission trigger');
+      // eslint-disable-next-line no-new
+      new window.Notification('Welcome to Ferdi 5', {
+        body: 'Have a wonderful day & happy messaging.',
+      });
 
-        localStorage.setItem(CATALINA_NOTIFICATION_HACK_KEY, true);
-      }
+      localStorage.setItem(CATALINA_NOTIFICATION_HACK_KEY, true);
     }
   }
 
@@ -325,7 +323,7 @@ export default class AppStore extends Store {
 
     debug('New notification', title, options);
 
-    notification.onclick = () => {
+    notification.addEventListener('click', () => {
       if (serviceId) {
         this.actions.service.sendIPCMessage({
           channel: `notification-onclick:${notificationId}`,
@@ -346,7 +344,7 @@ export default class AppStore extends Store {
 
         debug('Notification click handler');
       }
-    };
+    });
   }
 
   @action _setBadge({ unreadDirectMessageCount, unreadIndirectMessageCount }) {
@@ -360,7 +358,7 @@ export default class AppStore extends Store {
     ) {
       indicator = 0;
     } else {
-      indicator = parseInt(indicator, 10);
+      indicator = Number.parseInt(indicator, 10);
     }
 
     ipcRenderer.send('updateAppIndicator', {
@@ -379,8 +377,8 @@ export default class AppStore extends Store {
         debug('disabling launch on startup');
         autoLauncher.disable();
       }
-    } catch (err) {
-      console.warn(err);
+    } catch (error) {
+      console.warn(error);
     }
   }
 
@@ -438,7 +436,7 @@ export default class AppStore extends Store {
     const allServiceIds = await getServiceIdsFromPartitions();
     const allOrphanedServiceIds = allServiceIds.filter(
       id =>
-        !this.stores.services.all.find(
+        !this.stores.services.all.some(
           s => id.replace('service-', '') === s.id,
         ),
     );
@@ -447,8 +445,8 @@ export default class AppStore extends Store {
       await Promise.all(
         allOrphanedServiceIds.map(id => removeServicePartitionDirectory(id)),
       );
-    } catch (ex) {
-      console.log('Error while deleting service partition directory - ', ex);
+    } catch (error) {
+      console.log('Error while deleting service partition directory -', error);
     }
     await Promise.all(
       this.stores.services.all.map(s =>
diff --git a/src/stores/FeaturesStore.js b/src/stores/FeaturesStore.js
index 1d50dd714..8e0134d7f 100644
--- a/src/stores/FeaturesStore.js
+++ b/src/stores/FeaturesStore.js
@@ -51,7 +51,9 @@ export default class FeaturesStore extends Store {
       let requestResult = {};
       try {
         requestResult = this.featuresRequest.execute().result;
-      } catch (e) {} // eslint-disable-line no-empty
+      } catch (error) {
+        console.error(error);
+      }
       Object.assign(features, requestResult);
     }
     runInAction('FeaturesStore::_updateFeatures', () => {
@@ -69,15 +71,15 @@ export default class FeaturesStore extends Store {
   }
 
   _setupFeatures() {
-    serviceProxy(this.stores, this.actions);
-    basicAuth(this.stores, this.actions);
+    serviceProxy(this.stores);
+    basicAuth();
     workspaces(this.stores, this.actions);
-    quickSwitch(this.stores, this.actions);
-    nightlyBuilds(this.stores, this.actions);
-    publishDebugInfo(this.stores, this.actions);
+    quickSwitch();
+    nightlyBuilds();
+    publishDebugInfo();
     settingsWS(this.stores, this.actions);
     communityRecipes(this.stores, this.actions);
     todos(this.stores, this.actions);
-    appearance(this.stores, this.actions);
+    appearance(this.stores);
   }
 }
diff --git a/src/stores/GlobalErrorStore.js b/src/stores/GlobalErrorStore.js
index aacaa247f..7cbfdc608 100644
--- a/src/stores/GlobalErrorStore.js
+++ b/src/stores/GlobalErrorStore.js
@@ -12,9 +12,9 @@ export default class GlobalErrorStore extends Store {
   constructor(...args) {
     super(...args);
 
-    window.onerror = (...errorArgs) => {
+    window.addEventListener('error', (...errorArgs) => {
       this._handleConsoleError.call(this, ['error', ...errorArgs]);
-    };
+    });
 
     const origConsoleError = console.error;
     window.console.error = (...errorArgs) => {
@@ -38,7 +38,7 @@ export default class GlobalErrorStore extends Store {
   }
 
   _handleConsoleError(type, error, url, line) {
-    if (typeof type === 'object' && type.length && type.length >= 1) {
+    if (typeof type === 'object' && type.length > 0) {
       this.messages.push({
         type: type[0],
         info: type,
@@ -53,14 +53,14 @@ export default class GlobalErrorStore extends Store {
     }
   }
 
-  _handleRequests = action(async (request) => {
+  _handleRequests = action(async request => {
     if (request.isError) {
       this.error = request.error;
 
       if (request.error.json) {
         try {
           this.response = await request.error.json();
-        } catch (error) {
+        } catch {
           this.response = {};
         }
         if (this.error.status === 401) {
diff --git a/src/stores/RecipesStore.js b/src/stores/RecipesStore.js
index d2acebb75..bfbdc57a8 100644
--- a/src/stores/RecipesStore.js
+++ b/src/stores/RecipesStore.js
@@ -25,9 +25,7 @@ export default class RecipesStore extends Store {
     this.actions.recipe.update.listen(this._update.bind(this));
 
     // Reactions
-    this.registerReactions([
-      this._checkIfRecipeIsInstalled.bind(this),
-    ]);
+    this.registerReactions([this._checkIfRecipeIsInstalled.bind(this)]);
   }
 
   setup() {
@@ -39,7 +37,10 @@ export default class RecipesStore extends Store {
   }
 
   @computed get active() {
-    const match = matchRoute('/settings/services/add/:id', this.stores.router.location.pathname);
+    const match = matchRoute(
+      '/settings/services/add/:id',
+      this.stores.router.location.pathname,
+    );
     if (match) {
       const activeRecipe = this.one(match.id);
       if (activeRecipe) {
@@ -53,11 +54,11 @@ export default class RecipesStore extends Store {
   }
 
   @computed get recipeIdForServices() {
-    return this.stores.services.all.map((s) => s.recipe.id);
+    return this.stores.services.all.map(s => s.recipe.id);
   }
 
   one(id) {
-    return this.all.find((recipe) => recipe.id === id);
+    return this.all.find(recipe => recipe.id === id);
   }
 
   isInstalled(id) {
@@ -77,41 +78,43 @@ export default class RecipesStore extends Store {
     const recipes = {};
 
     // Hackfix, reference this.all to fetch services
-    debug(`Check Recipe updates for ${this.all.map((recipe) => recipe.id)}`);
+    debug(`Check Recipe updates for ${this.all.map(recipe => recipe.id)}`);
 
-    recipeIds.forEach((r) => {
+    for (const r of recipeIds) {
       const recipe = this.one(r);
       recipes[r] = recipe.version;
-    });
+    }
 
     if (Object.keys(recipes).length === 0) return;
 
-    const remoteUpdates = await this.getRecipeUpdatesRequest.execute(recipes)._promise;
+    const remoteUpdates = await this.getRecipeUpdatesRequest.execute(recipes)
+      ._promise;
 
     // Check for local updates
     const allJsonFile = asarRecipesPath('all.json');
     const allJson = readJSONSync(allJsonFile);
     const localUpdates = [];
 
-    Object.keys(recipes).forEach((recipe) => {
+    for (const recipe of Object.keys(recipes)) {
       const version = recipes[recipe];
 
       // Find recipe in local recipe repository
-      const localRecipe = allJson.find((r) => r.id === recipe);
+      const localRecipe = allJson.find(r => r.id === recipe);
 
       if (localRecipe && semver.lt(version, localRecipe.version)) {
         localUpdates.push(recipe);
       }
-    });
+    }
 
-    const updates = [
-      ...remoteUpdates,
-      ...localUpdates,
-    ];
-    debug('Got update information (local, remote):', localUpdates, remoteUpdates);
+    const updates = [...remoteUpdates, ...localUpdates];
+    debug(
+      'Got update information (local, remote):',
+      localUpdates,
+      remoteUpdates,
+    );
 
     const length = updates.length - 1;
-    const syncUpdate = async (i) => {
+    const syncUpdate = async i => {
       const update = updates[i];
 
       this.actions.recipe.install({ recipeId: update });
@@ -134,7 +137,9 @@ export default class RecipesStore extends Store {
   async _checkIfRecipeIsInstalled() {
     const { router } = this.stores;
 
-    const match = router.location && matchRoute('/settings/services/add/:id', router.location.pathname);
+    const match =
+      router.location &&
+      matchRoute('/settings/services/add/:id', router.location.pathname);
     if (match) {
       const recipeId = match.id;
 
@@ -142,9 +147,11 @@ export default class RecipesStore extends Store {
         router.push('/settings/recipes');
         debug(`Recipe ${recipeId} is not installed, trying to install it`);
 
-        const recipe = await this.installRecipeRequest.execute(recipeId)._promise;
+        const recipe = await this.installRecipeRequest.execute(recipeId)
+          ._promise;
         if (recipe) {
-          await this.allRecipesRequest.invalidate({ immediately: true })._promise;
+          await this.allRecipesRequest.invalidate({ immediately: true })
+            ._promise;
           router.push(`/settings/services/add/${recipeId}`);
         } else {
           router.push('/settings/recipes');
diff --git a/src/stores/RequestStore.js b/src/stores/RequestStore.js
index a92f4c685..6d2f2ef91 100644
--- a/src/stores/RequestStore.js
+++ b/src/stores/RequestStore.js
@@ -13,7 +13,7 @@ export default class RequestStore extends Store {
 
   @observable showRequiredRequestsError = false;
 
-  @observable localServerPort = 45569;
+  @observable localServerPort = 45_569;
 
   retries = 0;
 
@@ -22,11 +22,11 @@ export default class RequestStore extends Store {
   constructor(...args) {
     super(...args);
 
-    this.actions.requests.retryRequiredRequests.listen(this._retryRequiredRequests.bind(this));
+    this.actions.requests.retryRequiredRequests.listen(
+      this._retryRequiredRequests.bind(this),
+    );
 
-    this.registerReactions([
-      this._autoRetry.bind(this),
-    ]);
+    this.registerReactions([this._autoRetry.bind(this)]);
   }
 
   setup() {
@@ -41,13 +41,11 @@ export default class RequestStore extends Store {
   }
 
   @computed get areRequiredRequestsSuccessful() {
-    return !this.userInfoRequest.isError
-      && !this.servicesRequest.isError;
+    return !this.userInfoRequest.isError && !this.servicesRequest.isError;
   }
 
   @computed get areRequiredRequestsLoading() {
-    return this.userInfoRequest.isExecuting
-      || this.servicesRequest.isExecuting;
+    return this.userInfoRequest.isExecuting || this.servicesRequest.isExecuting;
   }
 
   @action _retryRequiredRequests() {
@@ -67,7 +65,7 @@ export default class RequestStore extends Store {
         }
 
         this._autoRetry();
-        debug(`Retry required requests delayed in ${(delay) / 1000}s`);
+        debug(`Retry required requests delayed in ${delay / 1000}s`);
       }, delay);
     }
   }
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index 75bc71388..67fd4103f 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -10,7 +10,10 @@ import Request from './lib/Request';
 import CachedRequest from './lib/CachedRequest';
 import { matchRoute } from '../helpers/routing-helpers';
 import { isInTimeframe } from '../helpers/schedule-helpers';
-import { getRecipeDirectory, getDevRecipeDirectory } from '../helpers/recipe-helpers';
+import {
+  getRecipeDirectory,
+  getDevRecipeDirectory,
+} from '../helpers/recipe-helpers';
 import { workspaceStore } from '../features/workspaces';
 import { KEEP_WS_LOADED_USID } from '../config';
 import { SPELLCHECKER_LOCALES } from '../i18n/languages';
@@ -125,63 +128,49 @@ export default class ServicesStore extends Store {
   setup() {
     // Single key reactions for the sake of your CPU
     reaction(
-      () => (
-        this.stores.settings.app.enableSpellchecking
-      ),
+      () => this.stores.settings.app.enableSpellchecking,
       () => {
         this._shareSettingsWithServiceProcess();
       },
     );
 
     reaction(
-      () => (
-        this.stores.settings.app.spellcheckerLanguage
-      ),
+      () => this.stores.settings.app.spellcheckerLanguage,
       () => {
         this._shareSettingsWithServiceProcess();
       },
     );
 
     reaction(
-      () => (
-        this.stores.settings.app.darkMode
-      ),
+      () => this.stores.settings.app.darkMode,
       () => {
         this._shareSettingsWithServiceProcess();
       },
     );
 
     reaction(
-      () => (
-        this.stores.settings.app.adaptableDarkMode
-      ),
+      () => this.stores.settings.app.adaptableDarkMode,
       () => {
         this._shareSettingsWithServiceProcess();
       },
     );
 
     reaction(
-      () => (
-        this.stores.settings.app.universalDarkMode
-      ),
+      () => this.stores.settings.app.universalDarkMode,
       () => {
         this._shareSettingsWithServiceProcess();
       },
     );
 
     reaction(
-      () => (
-        this.stores.settings.app.searchEngine
-      ),
+      () => this.stores.settings.app.searchEngine,
       () => {
         this._shareSettingsWithServiceProcess();
       },
     );
 
     reaction(
-      () => (
-        this.stores.settings.app.clipboardNotifications
-      ),
+      () => this.stores.settings.app.clipboardNotifications,
       () => {
         this._shareSettingsWithServiceProcess();
       },
@@ -215,12 +204,12 @@ export default class ServicesStore extends Store {
    * Run various maintenance tasks on services
    */
   _serviceMaintenance() {
-    this.enabled.forEach(service => {
+    for (const service of this.enabled) {
       // Defines which services should be hibernated or woken up
       if (!service.isActive) {
         if (
           !service.lastHibernated &&
-          (Date.now() - service.lastUsed) >
+          Date.now() - service.lastUsed >
             ms(`${this.stores.settings.all.app.hibernationStrategy}s`)
         ) {
           // If service is stale, hibernate it.
@@ -230,8 +219,8 @@ export default class ServicesStore extends Store {
         if (
           service.lastHibernated &&
           Number(this.stores.settings.all.app.wakeUpStrategy) > 0 &&
-          (Date.now() - service.lastHibernated) >
-          ms(`${this.stores.settings.all.app.wakeUpStrategy}s`)
+          Date.now() - service.lastHibernated >
+            ms(`${this.stores.settings.all.app.wakeUpStrategy}s`)
         ) {
           // If service is in hibernation and the wakeup time has elapsed, wake it.
           this._awake({ serviceId: service.id });
@@ -240,7 +229,7 @@ export default class ServicesStore extends Store {
 
       if (
         service.lastPoll &&
-        (service.lastPoll - service.lastPollAnswer) > ms('1m')
+        service.lastPoll - service.lastPollAnswer > ms('1m')
       ) {
         // If service did not reply for more than 1m try to reload.
         if (!service.isActive) {
@@ -261,7 +250,7 @@ export default class ServicesStore extends Store {
         service.lostRecipeConnection = false;
         service.lostRecipeReloadAttempt = 0;
       }
-    });
+    }
   }
 
   // Computed props
@@ -270,8 +259,7 @@ export default class ServicesStore extends Store {
       const services = this.allServicesRequest.execute().result;
       if (services) {
         return observable(
-          services
-            .slice()
+          [...services]
             .slice()
             .sort((a, b) => a.order - b.order)
             .map((s, index) => {
@@ -318,11 +306,11 @@ export default class ServicesStore extends Store {
         // Check if workspace needs to be kept loaded
         if (workspace.services.includes(KEEP_WS_LOADED_USID)) {
           // Get services for workspace
-          const serviceIDs = workspace.services.filter(
-            i => i !== KEEP_WS_LOADED_USID,
+          const serviceIDs = new Set(
+            workspace.services.filter(i => i !== KEEP_WS_LOADED_USID),
           );
           const wsServices = filteredServices.filter(service =>
-            serviceIDs.includes(service.id),
+            serviceIDs.has(service.id),
           );
 
           displayedServices = [...displayedServices, ...wsServices];
@@ -410,12 +398,14 @@ export default class ServicesStore extends Store {
       customIcon: false,
       isDarkModeEnabled: false,
       spellcheckerLanguage:
-          SPELLCHECKER_LOCALES[this.stores.settings.app.spellcheckerLanguage],
+        SPELLCHECKER_LOCALES[this.stores.settings.app.spellcheckerLanguage],
       userAgentPref: '',
       ...serviceData,
     };
 
-    const data = skipCleanup ? serviceData : this._cleanUpTeamIdAndCustomUrl(recipeId, serviceData);
+    const data = skipCleanup
+      ? serviceData
+      : this._cleanUpTeamIdAndCustomUrl(recipeId, serviceData);
 
     const response = await this.createServiceRequest.execute(recipeId, data)
       ._promise;
@@ -562,7 +552,8 @@ export default class ServicesStore extends Store {
   // Write your scripts here
   console.log("Hello, World!", config);
 };
-`);
+`,
+        );
       }
     } else {
       ensureFileSync(filePath);
@@ -580,9 +571,9 @@ export default class ServicesStore extends Store {
     if (!keepActiveRoute) this.stores.router.push('/');
     const service = this.one(serviceId);
 
-    this.all.forEach(s => {
+    for (const s of this.all) {
       s.isActive = false;
-    });
+    }
     service.isActive = true;
     this._awake({ serviceId: service.id });
 
@@ -618,9 +609,9 @@ export default class ServicesStore extends Store {
       this.allDisplayed.length,
     );
 
-    this.all.forEach(s => {
+    for (const s of this.all) {
       s.isActive = false;
-    });
+    }
     this.allDisplayed[nextIndex].isActive = true;
   }
 
@@ -631,9 +622,9 @@ export default class ServicesStore extends Store {
       this.allDisplayed.length,
     );
 
-    this.all.forEach(s => {
+    for (const s of this.all) {
       s.isActive = false;
-    });
+    }
     this.allDisplayed[prevIndex].isActive = true;
   }
 
@@ -699,101 +690,128 @@ export default class ServicesStore extends Store {
   @action _handleIPCMessage({ serviceId, channel, args }) {
     const service = this.one(serviceId);
 
-    if (channel === 'hello') {
-      debug('Received hello event from', serviceId);
-
-      this._initRecipePolling(service.id);
-      this._initializeServiceRecipeInWebview(serviceId);
-      this._shareSettingsWithServiceProcess();
-    } else if (channel === 'alive') {
-      service.lastPollAnswer = Date.now();
-    } else if (channel === 'message-counts') {
-      debug(`Received unread message info from '${serviceId}'`, args[0]);
+    // eslint-disable-next-line default-case
+    switch (channel) {
+      case 'hello': {
+        debug('Received hello event from', serviceId);
 
-      this.actions.service.setUnreadMessageCount({
-        serviceId,
-        count: {
-          direct: args[0].direct,
-          indirect: args[0].indirect,
-        },
-      });
-    } else if (channel === 'notification') {
-      const { options } = args[0];
+        this._initRecipePolling(service.id);
+        this._initializeServiceRecipeInWebview(serviceId);
+        this._shareSettingsWithServiceProcess();
 
-      // Check if we are in scheduled Do-not-Disturb time
-      const { scheduledDNDEnabled, scheduledDNDStart, scheduledDNDEnd } =
-        this.stores.settings.all.app;
+        break;
+      }
+      case 'alive': {
+        service.lastPollAnswer = Date.now();
 
-      if (
-        scheduledDNDEnabled &&
-        isInTimeframe(scheduledDNDStart, scheduledDNDEnd)
-      ) {
-        return;
+        break;
       }
+      case 'message-counts': {
+        debug(`Received unread message info from '${serviceId}'`, args[0]);
 
-      if (
-        service.recipe.hasNotificationSound ||
-        service.isMuted ||
-        this.stores.settings.all.app.isAppMuted
-      ) {
-        Object.assign(options, {
-          silent: true,
+        this.actions.service.setUnreadMessageCount({
+          serviceId,
+          count: {
+            direct: args[0].direct,
+            indirect: args[0].indirect,
+          },
         });
+
+        break;
       }
+      case 'notification': {
+        const { options } = args[0];
 
-      if (service.isNotificationEnabled) {
-        let title = `Notification from ${service.name}`;
-        if (!this.stores.settings.all.app.privateNotifications) {
-          options.body = typeof options.body === 'string' ? options.body : '';
-          title =
-            typeof args[0].title === 'string' ? args[0].title : service.name;
-        } else {
-          // Remove message data from notification in private mode
-          options.body = '';
-          options.icon = '/assets/img/notification-badge.gif';
+        // Check if we are in scheduled Do-not-Disturb time
+        const { scheduledDNDEnabled, scheduledDNDStart, scheduledDNDEnd } =
+          this.stores.settings.all.app;
+
+        if (
+          scheduledDNDEnabled &&
+          isInTimeframe(scheduledDNDStart, scheduledDNDEnd)
+        ) {
+          return;
         }
 
-        console.log(title, options);
+        if (
+          service.recipe.hasNotificationSound ||
+          service.isMuted ||
+          this.stores.settings.all.app.isAppMuted
+        ) {
+          Object.assign(options, {
+            silent: true,
+          });
+        }
 
-        this.actions.app.notify({
-          notificationId: args[0].notificationId,
-          title,
-          options,
-          serviceId,
-        });
+        if (service.isNotificationEnabled) {
+          let title = `Notification from ${service.name}`;
+          if (!this.stores.settings.all.app.privateNotifications) {
+            options.body = typeof options.body === 'string' ? options.body : '';
+            title =
+              typeof args[0].title === 'string' ? args[0].title : service.name;
+          } else {
+            // Remove message data from notification in private mode
+            options.body = '';
+            options.icon = '/assets/img/notification-badge.gif';
+          }
+
+          console.log(title, options);
+
+          this.actions.app.notify({
+            notificationId: args[0].notificationId,
+            title,
+            options,
+            serviceId,
+          });
+        }
+
+        break;
       }
-    } else if (channel === 'avatar') {
-      const url = args[0];
-      if (service.iconUrl !== url && !service.hasCustomUploadedIcon) {
-        service.customIconUrl = url;
+      case 'avatar': {
+        const url = args[0];
+        if (service.iconUrl !== url && !service.hasCustomUploadedIcon) {
+          service.customIconUrl = url;
+
+          this.actions.service.updateService({
+            serviceId,
+            serviceData: {
+              customIconUrl: url,
+            },
+            redirect: false,
+          });
+        }
 
-        this.actions.service.updateService({
-          serviceId,
-          serviceData: {
-            customIconUrl: url,
-          },
-          redirect: false,
-        });
+        break;
       }
-    } else if (channel === 'new-window') {
-      const url = args[0];
+      case 'new-window': {
+        const url = args[0];
 
-      this.actions.app.openExternalUrl({ url });
-    } else if (channel === 'set-service-spellchecker-language') {
-      if (!args) {
-        console.warn('Did not receive locale');
-      } else {
-        this.actions.service.updateService({
-          serviceId,
-          serviceData: {
-            spellcheckerLanguage: args[0] === 'reset' ? '' : args[0],
-          },
-          redirect: false,
-        });
+        this.actions.app.openExternalUrl({ url });
+
+        break;
+      }
+      case 'set-service-spellchecker-language': {
+        if (!args) {
+          console.warn('Did not receive locale');
+        } else {
+          this.actions.service.updateService({
+            serviceId,
+            serviceData: {
+              spellcheckerLanguage: args[0] === 'reset' ? '' : args[0],
+            },
+            redirect: false,
+          });
+        }
+
+        break;
+      }
+      case 'feature:todos': {
+        Object.assign(args[0].data, { serviceId });
+        this.actions.todos.handleHostMessage(args[0]);
+
+        break;
       }
-    } else if (channel === 'feature:todos') {
-      Object.assign(args[0].data, { serviceId });
-      this.actions.todos.handleHostMessage(args[0]);
+      // No default
     }
   }
 
@@ -809,13 +827,13 @@ export default class ServicesStore extends Store {
   }
 
   @action _sendIPCMessageToAllServices({ channel, args }) {
-    this.all.forEach(s =>
+    for (const s of this.all) {
       this.actions.service.sendIPCMessage({
         serviceId: s.id,
         channel,
         args,
-      }),
-    );
+      });
+    }
   }
 
   @action _openWindow({ event }) {
@@ -863,11 +881,11 @@ export default class ServicesStore extends Store {
   }
 
   @action _reloadAll() {
-    this.enabled.forEach(s =>
+    for (const s of this.enabled) {
       this._reload({
         serviceId: s.id,
-      }),
-    );
+      });
+    }
   }
 
   @action _reloadUpdatedServices() {
@@ -901,17 +919,17 @@ export default class ServicesStore extends Store {
 
     const services = {};
     // TODO: simplify this
-    this.all.forEach((s, index) => {
+    for (const [index] of this.all.entries()) {
       services[this.all[index].id] = index;
-    });
+    }
 
     this.reorderServicesRequest.execute(services);
     this.allServicesRequest.patch(data => {
-      data.forEach(s => {
+      for (const s of data) {
         const service = s;
 
         service.order = services[s.id];
-      });
+      }
     });
   }
 
@@ -1001,13 +1019,14 @@ export default class ServicesStore extends Store {
       }`,
     );
 
+    // eslint-disable-next-line unicorn/consistent-function-scoping
     const resetTimer = service => {
       service.lastPollAnswer = Date.now();
       service.lastPoll = Date.now();
     };
 
     if (!serviceId) {
-      this.allDisplayed.forEach(service => resetTimer(service));
+      for (const service of this.allDisplayed) resetTimer(service);
     } else {
       const service = this.one(serviceId);
       if (service) {
@@ -1043,7 +1062,7 @@ export default class ServicesStore extends Store {
 
   _mapActiveServiceToServiceModelReaction() {
     const { activeService } = this.stores.settings.all.service;
-    if (this.allDisplayed.length) {
+    if (this.allDisplayed.length > 0) {
       this.allDisplayed.map(service =>
         Object.assign(service, {
           isActive: activeService
@@ -1102,14 +1121,14 @@ export default class ServicesStore extends Store {
     const { enabled } = this;
     const { isAppMuted } = this.stores.settings.app;
 
-    enabled.forEach(service => {
+    for (const service of enabled) {
       const { isAttached } = service;
       const isMuted = isAppMuted || service.isMuted;
 
       if (isAttached) {
         service.webview.audioMuted = isMuted;
       }
-    });
+    }
   }
 
   _shareSettingsWithServiceProcess() {
@@ -1151,7 +1170,7 @@ export default class ServicesStore extends Store {
 
     if (
       this.allDisplayed.findIndex(service => service.isActive) === -1 &&
-      this.allDisplayed.length !== 0
+      this.allDisplayed.length > 0
     ) {
       debug('No active service found, setting active service to index 0');
 
diff --git a/src/stores/SettingsStore.js b/src/stores/SettingsStore.js
index 9aade974c..690a18374 100644
--- a/src/stores/SettingsStore.js
+++ b/src/stores/SettingsStore.js
@@ -1,11 +1,11 @@
 import { ipcRenderer } from 'electron';
 import { getCurrentWindow } from '@electron/remote';
-import {
-  action, computed, observable, reaction,
-} from 'mobx';
+import { action, computed, observable, reaction } from 'mobx';
 import localStorage from 'mobx-localstorage';
 import {
-  FILE_SYSTEM_SETTINGS_TYPES, LOCAL_SERVER, SEARCH_ENGINE_DDG,
+  FILE_SYSTEM_SETTINGS_TYPES,
+  LOCAL_SERVER,
+  SEARCH_ENGINE_DDG,
 } from '../config';
 import { API, DEFAULT_APP_SETTINGS } from '../environment';
 import { getLocale } from '../helpers/i18n-helpers';
@@ -17,7 +17,10 @@ import Store from './lib/Store';
 const debug = require('debug')('Ferdi:SettingsStore');
 
 export default class SettingsStore extends Store {
-  @observable updateAppSettingsRequest = new Request(this.api.local, 'updateAppSettings');
+  @observable updateAppSettingsRequest = new Request(
+    this.api.local,
+    'updateAppSettings',
+  );
 
   startup = true;
 
@@ -40,9 +43,7 @@ export default class SettingsStore extends Store {
     await this._migrate();
 
     reaction(
-      () => (
-        this.all.app.autohideMenuBar
-      ),
+      () => this.all.app.autohideMenuBar,
       () => {
         const currentWindow = getCurrentWindow();
         currentWindow.setMenuBarVisibility(!this.all.app.autohideMenuBar);
@@ -51,10 +52,8 @@ export default class SettingsStore extends Store {
     );
 
     reaction(
-      () => (
-        this.all.app.server
-      ),
-      (server) => {
+      () => this.all.app.server,
+      server => {
         if (server === LOCAL_SERVER) {
           ipcRenderer.send('startLocalServer');
         }
@@ -65,7 +64,10 @@ export default class SettingsStore extends Store {
     // Inactivity lock timer
     let inactivityTimer;
     getCurrentWindow().on('blur', () => {
-      if (this.all.app.lockingFeatureEnabled && this.all.app.inactivityLock !== 0) {
+      if (
+        this.all.app.lockingFeatureEnabled &&
+        this.all.app.inactivityLock !== 0
+      ) {
         inactivityTimer = setTimeout(() => {
           this.actions.settings.update({
             type: 'app',
@@ -84,7 +86,11 @@ export default class SettingsStore extends Store {
 
     ipcRenderer.on('appSettings', (event, resp) => {
       // Lock on startup if enabled in settings
-      if (this.startup && resp.type === 'app' && resp.data.lockingFeatureEnabled) {
+      if (
+        this.startup &&
+        resp.type === 'app' &&
+        resp.data.lockingFeatureEnabled
+      ) {
         this.startup = false;
         process.nextTick(() => {
           if (!this.all.app.locked) {
@@ -97,9 +103,9 @@ export default class SettingsStore extends Store {
       ipcRenderer.send('initialAppSettings', resp);
     });
 
-    this.fileSystemSettingsTypes.forEach((type) => {
+    for (const type of this.fileSystemSettingsTypes) {
       ipcRenderer.send('getAppSettings', type);
-    });
+    }
   }
 
   @computed get app() {
@@ -111,15 +117,19 @@ export default class SettingsStore extends Store {
   }
 
   @computed get service() {
-    return localStorage.getItem('service') || {
-      activeService: '',
-    };
+    return (
+      localStorage.getItem('service') || {
+        activeService: '',
+      }
+    );
   }
 
   @computed get stats() {
-    return localStorage.getItem('stats') || {
-      activeService: '',
-    };
+    return (
+      localStorage.getItem('stats') || {
+        activeService: '',
+      }
+    );
   }
 
   @computed get migration() {
@@ -230,9 +240,7 @@ export default class SettingsStore extends Store {
     });
 
     this._ensureMigrationAndMarkDone('5.4.4-beta.2-settings', () => {
-      const {
-        showServiceNavigationBar,
-      } = this.all.app;
+      const { showServiceNavigationBar } = this.all.app;
 
       this.actions.settings.update({
         type: 'app',
@@ -248,7 +256,7 @@ export default class SettingsStore extends Store {
         data: {
           todoServer: 'isUsingCustomTodoService',
           customTodoServer: legacySettings.todoServer,
-          automaticUpdates: !(legacySettings.noUpdates),
+          automaticUpdates: !legacySettings.noUpdates,
         },
       });
 
diff --git a/src/stores/UserStore.js b/src/stores/UserStore.js
index 2e009893a..e3d57c662 100644
--- a/src/stores/UserStore.js
+++ b/src/stores/UserStore.js
@@ -46,7 +46,10 @@ export default class UserStore extends Store {
 
   @observable updateUserInfoRequest = new Request(this.api.user, 'updateInfo');
 
-  @observable getLegacyServicesRequest = new CachedRequest(this.api.user, 'getLegacyServices');
+  @observable getLegacyServicesRequest = new CachedRequest(
+    this.api.user,
+    'getLegacyServices',
+  );
 
   @observable deleteAccountRequest = new CachedRequest(this.api.user, 'delete');
 
@@ -81,13 +84,17 @@ export default class UserStore extends Store {
 
     // Register action handlers
     this.actions.user.login.listen(this._login.bind(this));
-    this.actions.user.retrievePassword.listen(this._retrievePassword.bind(this));
+    this.actions.user.retrievePassword.listen(
+      this._retrievePassword.bind(this),
+    );
     this.actions.user.logout.listen(this._logout.bind(this));
     this.actions.user.signup.listen(this._signup.bind(this));
     this.actions.user.invite.listen(this._invite.bind(this));
     this.actions.user.update.listen(this._update.bind(this));
     this.actions.user.resetStatus.listen(this._resetStatus.bind(this));
-    this.actions.user.importLegacyServices.listen(this._importLegacyServices.bind(this));
+    this.actions.user.importLegacyServices.listen(
+      this._importLegacyServices.bind(this),
+    );
     this.actions.user.delete.listen(this._delete.bind(this));
 
     // Reactions
@@ -176,7 +183,14 @@ export default class UserStore extends Store {
   }
 
   @action async _signup({
-    firstname, lastname, email, password, accountType, company, plan, currency,
+    firstname,
+    lastname,
+    email,
+    password,
+    accountType,
+    company,
+    plan,
+    currency,
   }) {
     const authToken = await this.signupRequest.execute({
       firstname,
@@ -205,7 +219,7 @@ export default class UserStore extends Store {
   }
 
   @action async _invite({ invites }) {
-    const data = invites.filter((invite) => invite.email !== '');
+    const data = invites.filter(invite => invite.email !== '');
 
     const response = await this.inviteRequest.execute(data)._promise;
 
@@ -220,7 +234,8 @@ export default class UserStore extends Store {
   @action async _update({ userData }) {
     if (!this.isLoggedIn) return;
 
-    const response = await this.updateUserInfoRequest.execute(userData)._promise;
+    const response = await this.updateUserInfoRequest.execute(userData)
+      ._promise;
 
     this.getUserInfoRequest.patch(() => response.data);
     this.actionStatus = response.status || [];
@@ -250,19 +265,27 @@ export default class UserStore extends Store {
     this.isImportLegacyServicesExecuting = true;
 
     // Reduces recipe duplicates
-    const recipes = services.filter((obj, pos, arr) => arr.map((mapObj) => mapObj.recipe.id).indexOf(obj.recipe.id) === pos).map((s) => s.recipe.id);
+    const recipes = services
+      .filter(
+        (obj, pos, arr) =>
+          arr.map(mapObj => mapObj.recipe.id).indexOf(obj.recipe.id) === pos,
+      )
+      .map(s => s.recipe.id);
 
     // Install recipes
-    for (const recipe of recipes) { // eslint-disable-line no-unused-vars
-      // eslint-disable-next-line
+    for (const recipe of recipes) {
+      // eslint-disable-line no-unused-vars
+      // eslint-disable-next-line no-await-in-loop
       await this.stores.recipes._install({ recipeId: recipe });
     }
 
-    for (const service of services) { // eslint-disable-line no-unused-vars
+    for (const service of services) {
+      // eslint-disable-line no-unused-vars
       this.actions.service.createFromLegacyService({
         data: service,
       });
-      await this.stores.services.createServiceRequest._promise; // eslint-disable-line
+      // eslint-disable-next-line no-await-in-loop
+      await this.stores.services.createServiceRequest._promise;
     }
 
     this.isImportLegacyServicesExecuting = false;
@@ -281,8 +304,7 @@ export default class UserStore extends Store {
 
     const { router } = this.stores;
     const currentRoute = window.location.hash;
-    if (!this.isLoggedIn
-      && currentRoute.includes('token=')) {
+    if (!this.isLoggedIn && currentRoute.includes('token=')) {
       router.push(this.WELCOME_ROUTE);
       const token = currentRoute.split('=')[1];
 
@@ -293,20 +315,18 @@ export default class UserStore extends Store {
           this._tokenLogin(token);
         }, 1000);
       }
-    } else if (!this.isLoggedIn
-      && !currentRoute.includes(this.BASE_ROUTE)) {
+    } else if (!this.isLoggedIn && !currentRoute.includes(this.BASE_ROUTE)) {
       router.push(this.WELCOME_ROUTE);
-    } else if (this.isLoggedIn
-      && currentRoute === this.LOGOUT_ROUTE) {
+    } else if (this.isLoggedIn && currentRoute === this.LOGOUT_ROUTE) {
       this.actions.user.logout();
       router.push(this.LOGIN_ROUTE);
-    } else if (this.isLoggedIn
-      && currentRoute.includes(this.BASE_ROUTE)
-      && (this.hasCompletedSignup
-        || this.hasCompletedSignup === null)) {
-      if (!isDevMode) {
-        this.stores.router.push('/');
-      }
+    } else if (
+      this.isLoggedIn &&
+      currentRoute.includes(this.BASE_ROUTE) &&
+      (this.hasCompletedSignup || this.hasCompletedSignup === null) &&
+      !isDevMode
+    ) {
+      this.stores.router.push('/');
     }
   };
 
@@ -316,7 +336,7 @@ export default class UserStore extends Store {
       let data;
       try {
         data = await this.getUserInfoRequest.execute()._promise;
-      } catch (e) {
+      } catch {
         return false;
       }
 
@@ -336,12 +356,12 @@ export default class UserStore extends Store {
     try {
       const decoded = jwt.decode(authToken);
 
-      return ({
+      return {
         id: decoded.userId,
         tokenExpiry: moment.unix(decoded.exp).toISOString(),
         authToken,
-      });
-    } catch (err) {
+      };
+    } catch {
       this._logout();
       return false;
     }
@@ -372,7 +392,7 @@ export default class UserStore extends Store {
   async _migrateUserLocale() {
     try {
       await this.getUserInfoRequest._promise;
-    } catch (e) {
+    } catch {
       return false;
     }
 
diff --git a/src/stores/index.ts b/src/stores/index.ts
index 4cd4e92ea..1760ddfa2 100644
--- a/src/stores/index.ts
+++ b/src/stores/index.ts
@@ -34,10 +34,10 @@ export default (api, actions, router) => {
   });
 
   // Initialize all stores
-  Object.keys(stores).forEach(name => {
+  for (const name of Object.keys(stores)) {
     if (stores[name] && stores[name].initialize) {
       stores[name].initialize();
     }
-  });
+  }
   return stores;
 };
diff --git a/src/stores/lib/CachedRequest.js b/src/stores/lib/CachedRequest.js
index 94f615144..a6dd47f7d 100644
--- a/src/stores/lib/CachedRequest.js
+++ b/src/stores/lib/CachedRequest.js
@@ -1,4 +1,3 @@
-// @flow
 import { action } from 'mobx';
 import { isEqual, remove } from 'lodash';
 import Request from './Request';
@@ -30,48 +29,60 @@ export default class CachedRequest extends Request {
 
     // This timeout is necessary to avoid warnings from mobx
     // regarding triggering actions as side-effect of getters
-    setTimeout(action(() => {
-      this.isExecuting = true;
-      // Apply the previous result from this call immediately (cached)
-      if (existingApiCall) {
-        this.result = existingApiCall.result;
-      }
-    }), 0);
+    setTimeout(
+      action(() => {
+        this.isExecuting = true;
+        // Apply the previous result from this call immediately (cached)
+        if (existingApiCall) {
+          this.result = existingApiCall.result;
+        }
+      }),
+      0,
+    );
 
     // Issue api call & save it as promise that is handled to update the results of the operation
-    this._promise = new Promise((resolve) => {
+    this._promise = new Promise(resolve => {
       this._api[this._method](...callArgs)
-        .then((result) => {
-          setTimeout(action(() => {
-            this.result = result;
-            if (this._currentApiCall) this._currentApiCall.result = result;
-            this.isExecuting = false;
-            this.isError = false;
-            this.wasExecuted = true;
-            this._isInvalidated = false;
-            this._isWaitingForResponse = false;
-            this._triggerHooks();
-            resolve(result);
-          }), 1);
+        .then(result => {
+          setTimeout(
+            action(() => {
+              this.result = result;
+              if (this._currentApiCall) this._currentApiCall.result = result;
+              this.isExecuting = false;
+              this.isError = false;
+              this.wasExecuted = true;
+              this._isInvalidated = false;
+              this._isWaitingForResponse = false;
+              this._triggerHooks();
+              resolve(result);
+            }),
+            1,
+          );
           return result;
         })
-        .catch(action((error) => {
-          setTimeout(action(() => {
-            this.error = error;
-            this.isExecuting = false;
-            this.isError = true;
-            this.wasExecuted = true;
-            this._isWaitingForResponse = false;
-            this._triggerHooks();
-            // reject(error);
-          }), 1);
-        }));
+        .catch(
+          action(error => {
+            setTimeout(
+              action(() => {
+                this.error = error;
+                this.isExecuting = false;
+                this.isError = true;
+                this.wasExecuted = true;
+                this._isWaitingForResponse = false;
+                this._triggerHooks();
+                // reject(error);
+              }),
+              1,
+            );
+          }),
+        );
     });
 
     this._isWaitingForResponse = true;
     return this;
   }
 
+  // eslint-disable-next-line unicorn/no-object-as-default-parameter
   invalidate(options = { immediately: false }) {
     this._isInvalidated = true;
     if (options.immediately && this._currentApiCall) {
@@ -81,18 +92,21 @@ export default class CachedRequest extends Request {
   }
 
   patch(modify) {
-    return new Promise((resolve) => {
-      setTimeout(action(() => {
-        const override = modify(this.result);
-        if (override !== undefined) this.result = override;
-        if (this._currentApiCall) this._currentApiCall.result = this.result;
-        resolve(this);
-      }), 0);
+    return new Promise(resolve => {
+      setTimeout(
+        action(() => {
+          const override = modify(this.result);
+          if (override !== undefined) this.result = override;
+          if (this._currentApiCall) this._currentApiCall.result = this.result;
+          resolve(this);
+        }),
+        0,
+      );
     });
   }
 
   removeCacheForCallWith(...args) {
-    remove(this._apiCalls, (c) => isEqual(c.args, args));
+    remove(this._apiCalls, c => isEqual(c.args, args));
   }
 
   _addApiCall(args) {
@@ -102,6 +116,6 @@ export default class CachedRequest extends Request {
   }
 
   _findApiCall(args) {
-    return this._apiCalls.find((c) => isEqual(c.args, args));
+    return this._apiCalls.find(c => isEqual(c.args, args));
   }
 }
diff --git a/src/stores/lib/Request.js b/src/stores/lib/Request.js
index 32ffe4367..39f32729a 100644
--- a/src/stores/lib/Request.js
+++ b/src/stores/lib/Request.js
@@ -107,7 +107,7 @@ export default class Request {
   }
 
   _triggerHooks() {
-    Request._hooks.forEach((hook) => hook(this));
+    for (const hook of Request._hooks) hook(this);
   }
 
   reset = () => {
diff --git a/src/stores/lib/Store.js b/src/stores/lib/Store.js
index b03a7e725..b39070ce8 100644
--- a/src/stores/lib/Store.js
+++ b/src/stores/lib/Store.js
@@ -28,18 +28,18 @@ export default class Store {
   }
 
   registerReactions(reactions) {
-    reactions.forEach((reaction) => this._reactions.push(new Reaction(reaction)));
+    for (const reaction of reactions) this._reactions.push(new Reaction(reaction));
   }
 
   setup() {}
 
   initialize() {
     this.setup();
-    this._reactions.forEach((reaction) => reaction.start());
+    for (const reaction of this._reactions) reaction.start();
   }
 
   teardown() {
-    this._reactions.forEach((reaction) => reaction.stop());
+    for (const reaction of this._reactions) reaction.stop();
   }
 
   resetStatus() {
diff --git a/src/webview/badge.ts b/src/webview/badge.ts
index 024e29b3f..8e8b66c0c 100644
--- a/src/webview/badge.ts
+++ b/src/webview/badge.ts
@@ -21,7 +21,7 @@ export class BadgeHandler {
     // Parse number to integer
     // This will correct errors that recipes may introduce, e.g.
     // by sending a String instead of an integer
-    const parsedNumber = parseInt(text.toString(), 10);
+    const parsedNumber = Number.parseInt(text.toString(), 10);
     const adjustedNumber = Number.isNaN(parsedNumber) ? 0 : parsedNumber;
     return Math.max(adjustedNumber, 0);
   }
diff --git a/src/webview/contextMenuBuilder.js b/src/webview/contextMenuBuilder.js
index 8c39e6d04..eb15aa138 100644
--- a/src/webview/contextMenuBuilder.js
+++ b/src/webview/contextMenuBuilder.js
@@ -6,7 +6,8 @@
  *
  * Source: https://github.com/electron-userland/electron-spellchecker/blob/master/src/context-menu-builder.js
  */
-import { clipboard, ipcRenderer, nativeImage } from 'electron';
+// eslint-disable-next-line no-unused-vars
+import { clipboard, ipcRenderer, nativeImage, WebContents } from 'electron';
 import { Menu, MenuItem } from '@electron/remote';
 import { cmdOrCtrlShortcutKey, isMac } from '../environment';
 
@@ -16,7 +17,8 @@ import { openExternalUrl } from '../helpers/url-helpers';
 const { URL } = require('url');
 
 function matchesWord(string) {
-  const regex = /[\u0041-\u005A\u0061-\u007A\u00AA\u00B5\u00BA\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0370-\u0374\u0376\u0377\u037A-\u037D\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u048A-\u0527\u0531-\u0556\u0559\u0561-\u0587\u05D0-\u05EA\u05F0-\u05F2\u0620-\u064A\u066E\u066F\u0671-\u06D3\u06D5\u06E5\u06E6\u06EE\u06EF\u06FA-\u06FC\u06FF\u0710\u0712-\u072F\u074D-\u07A5\u07B1\u07CA-\u07EA\u07F4\u07F5\u07FA\u0800-\u0815\u081A\u0824\u0828\u0840-\u0858\u08A0\u08A2-\u08AC\u0904-\u0939\u093D\u0950\u0958-\u0961\u0971-\u0977\u0979-\u097F\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BD\u09CE\u09DC\u09DD\u09DF-\u09E1\u09F0\u09F1\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A59-\u0A5C\u0A5E\u0A72-\u0A74\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABD\u0AD0\u0AE0\u0AE1\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3D\u0B5C\u0B5D\u0B5F-\u0B61\u0B71\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BD0\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C33\u0C35-\u0C39\u0C3D\u0C58\u0C59\u0C60\u0C61\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBD\u0CDE\u0CE0\u0CE1\u0CF1\u0CF2\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D\u0D4E\u0D60\u0D61\u0D7A-\u0D7F\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0E01-\u0E30\u0E32\u0E33\u0E40-\u0E46\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB0\u0EB2\u0EB3\u0EBD\u0EC0-\u0EC4\u0EC6\u0EDC-\u0EDF\u0F00\u0F40-\u0F47\u0F49-\u0F6C\u0F88-\u0F8C\u1000-\u102A\u103F\u1050-\u1055\u105A-\u105D\u1061\u1065\u1066\u106E-\u1070\u1075-\u1081\u108E\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u1380-\u138F\u13A0-\u13F4\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u1700-\u170C\u170E-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176C\u176E-\u1770\u1780-\u17B3\u17D7\u17DC\u1820-\u1877\u1880-\u18A8\u18AA\u18B0-\u18F5\u1900-\u191C\u1950-\u196D\u1970-\u1974\u1980-\u19AB\u19C1-\u19C7\u1A00-\u1A16\u1A20-\u1A54\u1AA7\u1B05-\u1B33\u1B45-\u1B4B\u1B83-\u1BA0\u1BAE\u1BAF\u1BBA-\u1BE5\u1C00-\u1C23\u1C4D-\u1C4F\u1C5A-\u1C7D\u1CE9-\u1CEC\u1CEE-\u1CF1\u1CF5\u1CF6\u1D00-\u1DBF\u1E00-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u2071\u207F\u2090-\u209C\u2102\u2107\u210A-\u2113\u2115\u2119-\u211D\u2124\u2126\u2128\u212A-\u212D\u212F-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2183\u2184\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CEE\u2CF2\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D80-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u2E2F\u3005\u3006\u3031-\u3035\u303B\u303C\u3041-\u3096\u309D-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312D\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FCC\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA61F\uA62A\uA62B\uA640-\uA66E\uA67F-\uA697\uA6A0-\uA6E5\uA717-\uA71F\uA722-\uA788\uA78B-\uA78E\uA790-\uA793\uA7A0-\uA7AA\uA7F8-\uA801\uA803-\uA805\uA807-\uA80A\uA80C-\uA822\uA840-\uA873\uA882-\uA8B3\uA8F2-\uA8F7\uA8FB\uA90A-\uA925\uA930-\uA946\uA960-\uA97C\uA984-\uA9B2\uA9CF\uAA00-\uAA28\uAA40-\uAA42\uAA44-\uAA4B\uAA60-\uAA76\uAA7A\uAA80-\uAAAF\uAAB1\uAAB5\uAAB6\uAAB9-\uAABD\uAAC0\uAAC2\uAADB-\uAADD\uAAE0-\uAAEA\uAAF2-\uAAF4\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uABC0-\uABE2\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D\uFB1F-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE70-\uFE74\uFE76-\uFEFC\uFF21-\uFF3A\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC]+/g;
+  const regex =
+    /[A-Za-z\u00AA\u00B5\u00BA\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0370-\u0374\u0376\u0377\u037A-\u037D\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u048A-\u0527\u0531-\u0556\u0559\u0561-\u0587\u05D0-\u05EA\u05F0-\u05F2\u0620-\u064A\u066E\u066F\u0671-\u06D3\u06D5\u06E5\u06E6\u06EE\u06EF\u06FA-\u06FC\u06FF\u0710\u0712-\u072F\u074D-\u07A5\u07B1\u07CA-\u07EA\u07F4\u07F5\u07FA\u0800-\u0815\u081A\u0824\u0828\u0840-\u0858\u08A0\u08A2-\u08AC\u0904-\u0939\u093D\u0950\u0958-\u0961\u0971-\u0977\u0979-\u097F\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BD\u09CE\u09DC\u09DD\u09DF-\u09E1\u09F0\u09F1\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A59-\u0A5C\u0A5E\u0A72-\u0A74\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABD\u0AD0\u0AE0\u0AE1\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3D\u0B5C\u0B5D\u0B5F-\u0B61\u0B71\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BD0\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C33\u0C35-\u0C39\u0C3D\u0C58\u0C59\u0C60\u0C61\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBD\u0CDE\u0CE0\u0CE1\u0CF1\u0CF2\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D\u0D4E\u0D60\u0D61\u0D7A-\u0D7F\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0E01-\u0E30\u0E32\u0E33\u0E40-\u0E46\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB0\u0EB2\u0EB3\u0EBD\u0EC0-\u0EC4\u0EC6\u0EDC-\u0EDF\u0F00\u0F40-\u0F47\u0F49-\u0F6C\u0F88-\u0F8C\u1000-\u102A\u103F\u1050-\u1055\u105A-\u105D\u1061\u1065\u1066\u106E-\u1070\u1075-\u1081\u108E\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u1380-\u138F\u13A0-\u13F4\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u1700-\u170C\u170E-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176C\u176E-\u1770\u1780-\u17B3\u17D7\u17DC\u1820-\u1877\u1880-\u18A8\u18AA\u18B0-\u18F5\u1900-\u191C\u1950-\u196D\u1970-\u1974\u1980-\u19AB\u19C1-\u19C7\u1A00-\u1A16\u1A20-\u1A54\u1AA7\u1B05-\u1B33\u1B45-\u1B4B\u1B83-\u1BA0\u1BAE\u1BAF\u1BBA-\u1BE5\u1C00-\u1C23\u1C4D-\u1C4F\u1C5A-\u1C7D\u1CE9-\u1CEC\u1CEE-\u1CF1\u1CF5\u1CF6\u1D00-\u1DBF\u1E00-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u2071\u207F\u2090-\u209C\u2102\u2107\u210A-\u2113\u2115\u2119-\u211D\u2124\u2126\u2128\u212A-\u212D\u212F-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2183\u2184\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CEE\u2CF2\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D80-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u2E2F\u3005\u3006\u3031-\u3035\u303B\u303C\u3041-\u3096\u309D-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312D\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FCC\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA61F\uA62A\uA62B\uA640-\uA66E\uA67F-\uA697\uA6A0-\uA6E5\uA717-\uA71F\uA722-\uA788\uA78B-\uA78E\uA790-\uA793\uA7A0-\uA7AA\uA7F8-\uA801\uA803-\uA805\uA807-\uA80A\uA80C-\uA822\uA840-\uA873\uA882-\uA8B3\uA8F2-\uA8F7\uA8FB\uA90A-\uA925\uA930-\uA946\uA960-\uA97C\uA984-\uA9B2\uA9CF\uAA00-\uAA28\uAA40-\uAA42\uAA44-\uAA4B\uAA60-\uAA76\uAA7A\uAA80-\uAAAF\uAAB1\uAAB5\uAAB6\uAAB9-\uAABD\uAAC0\uAAC2\uAADB-\uAADD\uAAE0-\uAAEA\uAAF2-\uAAF4\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uABC0-\uABE2\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D\uFB1F-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE70-\uFE74\uFE76-\uFEFC\uFF21-\uFF3A\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC]+/g;
 
   return string.match(regex);
 }
@@ -56,12 +58,12 @@ module.exports = class ContextMenuBuilder {
   /**
    * Creates an instance of ContextMenuBuilder
    *
-   * @param  {webContents} webContents  Current webContents
+   * @param  {WebContents} webContents  Current webContents
    * @param  {Boolean} debugMode    If true, display the "Inspect Element" menu item.
    * @param  {function} processMenu If passed, this method will be passed the menu to change
    *                                it prior to display. Signature: (menu, info) => menu
    */
-  constructor(webContents, debugMode = false, processMenu = (m) => m) {
+  constructor(webContents, debugMode = false, processMenu = m => m) {
     this.debugMode = debugMode;
     this.processMenu = processMenu;
     this.menu = null;
@@ -115,7 +117,10 @@ module.exports = class ContextMenuBuilder {
       return this.buildMenuForImage(info);
     }
 
-    if (info.isEditable || (info.inputFieldType && info.inputFieldType !== 'none')) {
+    if (
+      info.isEditable ||
+      (info.inputFieldType && info.inputFieldType !== 'none')
+    ) {
       return this.buildMenuForTextInput(info);
     }
 
@@ -157,12 +162,17 @@ module.exports = class ContextMenuBuilder {
     const isEmailAddress = menuInfo.linkURL.startsWith('mailto:');
 
     const copyLink = new MenuItem({
-      label: isEmailAddress ? this.stringTable.copyMail() : this.stringTable.copyLinkUrl(),
+      label: isEmailAddress
+        ? this.stringTable.copyMail()
+        : this.stringTable.copyLinkUrl(),
       click: () => {
         // Omit the mailto: portion of the link; we just want the address
         const url = isEmailAddress ? menuInfo.linkText : menuInfo.linkURL;
         clipboard.writeText(url);
-        this._sendNotificationOnClipboardEvent(menuInfo.clipboardNotifications, () => `Link URL copied: ${url}`);
+        this._sendNotificationOnClipboardEvent(
+          menuInfo.clipboardNotifications,
+          () => `Link URL copied: ${url}`,
+        );
       },
     });
 
@@ -250,11 +260,13 @@ module.exports = class ContextMenuBuilder {
     const webContents = this.getWebContents();
     // Add each spelling suggestion
     for (const suggestion of menuInfo.dictionarySuggestions) {
-      menu.append(new MenuItem({
-        label: suggestion,
-        // eslint-disable-next-line no-loop-func
-        click: () => webContents.replaceMisspelling(suggestion),
-      }));
+      menu.append(
+        new MenuItem({
+          label: suggestion,
+          // eslint-disable-next-line no-loop-func
+          click: () => webContents.replaceMisspelling(suggestion),
+        }),
+      );
     }
 
     // Allow users to add the misspelled word to the dictionary
@@ -262,7 +274,10 @@ module.exports = class ContextMenuBuilder {
       menu.append(
         new MenuItem({
           label: this.stringTable.addToDictionary(),
-          click: () => webContents.session.addWordToSpellCheckerDictionary(menuInfo.misspelledWord),
+          click: () =>
+            webContents.session.addWordToSpellCheckerDictionary(
+              menuInfo.misspelledWord,
+            ),
         }),
       );
     }
@@ -274,7 +289,7 @@ module.exports = class ContextMenuBuilder {
    * Adds search-related menu items.
    */
   addSearchItems(menu, menuInfo) {
-    if (!menuInfo.selectionText || menuInfo.selectionText.length < 1) {
+    if (!menuInfo.selectionText || menuInfo.selectionText.length === 0) {
       return menu;
     }
 
@@ -287,7 +302,9 @@ module.exports = class ContextMenuBuilder {
       const webContents = this.getWebContents();
 
       const lookUpDefinition = new MenuItem({
-        label: this.stringTable.lookUpDefinition({ word: menuInfo.selectionText.trim() }),
+        label: this.stringTable.lookUpDefinition({
+          word: menuInfo.selectionText.trim(),
+        }),
         click: () => webContents.showDefinitionForSelection(),
       });
 
@@ -295,9 +312,13 @@ module.exports = class ContextMenuBuilder {
     }
 
     const search = new MenuItem({
-      label: this.stringTable.searchWith({ searchEngine: SEARCH_ENGINE_NAMES[menuInfo.searchEngine] }),
+      label: this.stringTable.searchWith({
+        searchEngine: SEARCH_ENGINE_NAMES[menuInfo.searchEngine],
+      }),
       click: () => {
-        const url = SEARCH_ENGINE_URLS[menuInfo.searchEngine]({ searchTerm: encodeURIComponent(menuInfo.selectionText) });
+        const url = SEARCH_ENGINE_URLS[menuInfo.searchEngine]({
+          searchTerm: encodeURIComponent(menuInfo.selectionText),
+        });
         openExternalUrl(url, true);
       },
     });
@@ -319,10 +340,14 @@ module.exports = class ContextMenuBuilder {
     const copyImage = new MenuItem({
       label: this.stringTable.copyImage(),
       click: () => {
-        const result = this.convertImageToBase64(menuInfo.srcURL,
-          (dataURL) => clipboard.writeImage(nativeImage.createFromDataURL(dataURL)));
-
-        this._sendNotificationOnClipboardEvent(menuInfo.clipboardNotifications, () => `Image copied from URL: ${menuInfo.srcURL}`);
+        const result = this.convertImageToBase64(menuInfo.srcURL, dataURL =>
+          clipboard.writeImage(nativeImage.createFromDataURL(dataURL)),
+        );
+
+        this._sendNotificationOnClipboardEvent(
+          menuInfo.clipboardNotifications,
+          () => `Image copied from URL: ${menuInfo.srcURL}`,
+        );
         return result;
       },
     });
@@ -333,7 +358,10 @@ module.exports = class ContextMenuBuilder {
       label: this.stringTable.copyImageUrl(),
       click: () => {
         const result = clipboard.writeText(menuInfo.srcURL);
-        this._sendNotificationOnClipboardEvent(menuInfo.clipboardNotifications, () => `Image URL copied: ${menuInfo.srcURL}`);
+        this._sendNotificationOnClipboardEvent(
+          menuInfo.clipboardNotifications,
+          () => `Image URL copied: ${menuInfo.srcURL}`,
+        );
         return result;
       },
     });
@@ -345,20 +373,22 @@ module.exports = class ContextMenuBuilder {
       const downloadImage = new MenuItem({
         label: this.stringTable.downloadImage(),
         click: () => {
-          const urlWithoutBlob = menuInfo.srcURL.substr(5);
-          this.convertImageToBase64(menuInfo.srcURL,
-            (dataURL) => {
-              const url = new window.URL(urlWithoutBlob);
-              const fileName = url.pathname.substr(1);
-              ipcRenderer.send('download-file', {
-                content: dataURL,
-                fileOptions: {
-                  name: fileName,
-                  mime: 'image/png',
-                },
-              });
+          const urlWithoutBlob = menuInfo.srcURL.slice(5);
+          this.convertImageToBase64(menuInfo.srcURL, dataURL => {
+            const url = new window.URL(urlWithoutBlob);
+            const fileName = url.pathname.slice(1);
+            ipcRenderer.send('download-file', {
+              content: dataURL,
+              fileOptions: {
+                name: fileName,
+                mime: 'image/png',
+              },
             });
-          this._sendNotificationOnClipboardEvent(menuInfo.clipboardNotifications, () => `Image downloaded: ${urlWithoutBlob}`);
+          });
+          this._sendNotificationOnClipboardEvent(
+            menuInfo.clipboardNotifications,
+            () => `Image downloaded: ${urlWithoutBlob}`,
+          );
         },
       });
 
@@ -373,12 +403,14 @@ module.exports = class ContextMenuBuilder {
    */
   addCut(menu, menuInfo) {
     const webContents = this.getWebContents();
-    menu.append(new MenuItem({
-      label: this.stringTable.cut(),
-      accelerator: `${cmdOrCtrlShortcutKey()}+X`,
-      enabled: menuInfo.editFlags.canCut,
-      click: () => webContents.cut(),
-    }));
+    menu.append(
+      new MenuItem({
+        label: this.stringTable.cut(),
+        accelerator: `${cmdOrCtrlShortcutKey()}+X`,
+        enabled: menuInfo.editFlags.canCut,
+        click: () => webContents.cut(),
+      }),
+    );
 
     return menu;
   }
@@ -388,12 +420,14 @@ module.exports = class ContextMenuBuilder {
    */
   addCopy(menu, menuInfo) {
     const webContents = this.getWebContents();
-    menu.append(new MenuItem({
-      label: this.stringTable.copy(),
-      accelerator: `${cmdOrCtrlShortcutKey()}+C`,
-      enabled: menuInfo.editFlags.canCopy,
-      click: () => webContents.copy(),
-    }));
+    menu.append(
+      new MenuItem({
+        label: this.stringTable.copy(),
+        accelerator: `${cmdOrCtrlShortcutKey()}+C`,
+        enabled: menuInfo.editFlags.canCopy,
+        click: () => webContents.copy(),
+      }),
+    );
 
     return menu;
   }
@@ -403,21 +437,23 @@ module.exports = class ContextMenuBuilder {
    */
   addPaste(menu, menuInfo) {
     const webContents = this.getWebContents();
-    menu.append(new MenuItem({
-      label: this.stringTable.paste(),
-      accelerator: `${cmdOrCtrlShortcutKey()}+V`,
-      enabled: menuInfo.editFlags.canPaste,
-      click: () => webContents.paste(),
-    }));
+    menu.append(
+      new MenuItem({
+        label: this.stringTable.paste(),
+        accelerator: `${cmdOrCtrlShortcutKey()}+V`,
+        enabled: menuInfo.editFlags.canPaste,
+        click: () => webContents.paste(),
+      }),
+    );
 
     return menu;
   }
 
   addPastePlain(menu, menuInfo) {
     if (
-      menuInfo.editFlags.canPaste
-      && !menuInfo.linkText
-      && !menuInfo.hasImageContents
+      menuInfo.editFlags.canPaste &&
+      !menuInfo.linkText &&
+      !menuInfo.hasImageContents
     ) {
       const webContents = this.getWebContents();
       menu.append(
@@ -463,21 +499,21 @@ module.exports = class ContextMenuBuilder {
    * @param  {String} outputFormat  The image format to use, defaults to 'image/png'
    */
   convertImageToBase64(url, callback, outputFormat = 'image/png') {
-    let canvas = document.createElement('CANVAS');
+    let canvas = document.createElement('canvas');
     const ctx = canvas.getContext('2d');
     // eslint-disable-next-line no-undef
     const img = new Image();
     img.crossOrigin = 'Anonymous';
 
-    img.onload = () => {
+    img.addEventListener('load', () => {
       canvas.height = img.height;
       canvas.width = img.width;
-      ctx.drawImage(img, 0, 0);
+      ctx?.drawImage(img, 0, 0);
 
       const dataURL = canvas.toDataURL(outputFormat);
       canvas = null;
       callback(dataURL);
-    };
+    });
 
     img.src = url;
   }
@@ -487,12 +523,14 @@ module.exports = class ContextMenuBuilder {
    */
   goBack(menu) {
     const webContents = this.getWebContents();
-    menu.append(new MenuItem({
-      label: this.stringTable.goBack(),
-      accelerator: `${cmdOrCtrlShortcutKey()}+left`,
-      enabled: webContents.canGoBack(),
-      click: () => webContents.goBack(),
-    }));
+    menu.append(
+      new MenuItem({
+        label: this.stringTable.goBack(),
+        accelerator: `${cmdOrCtrlShortcutKey()}+left`,
+        enabled: webContents.canGoBack(),
+        click: () => webContents.goBack(),
+      }),
+    );
 
     return menu;
   }
@@ -502,12 +540,14 @@ module.exports = class ContextMenuBuilder {
    */
   goForward(menu) {
     const webContents = this.getWebContents();
-    menu.append(new MenuItem({
-      label: this.stringTable.goForward(),
-      accelerator: `${cmdOrCtrlShortcutKey()}+right`,
-      enabled: webContents.canGoForward(),
-      click: () => webContents.goForward(),
-    }));
+    menu.append(
+      new MenuItem({
+        label: this.stringTable.goForward(),
+        accelerator: `${cmdOrCtrlShortcutKey()}+right`,
+        enabled: webContents.canGoForward(),
+        click: () => webContents.goForward(),
+      }),
+    );
 
     return menu;
   }
@@ -516,14 +556,19 @@ module.exports = class ContextMenuBuilder {
    * Adds the 'copy page url' menu item.
    */
   copyPageUrl(menu, menuInfo) {
-    menu.append(new MenuItem({
-      label: this.stringTable.copyPageUrl(),
-      enabled: true,
-      click: () => {
-        clipboard.writeText(window.location.href);
-        this._sendNotificationOnClipboardEvent(menuInfo.clipboardNotifications, () => `Page URL copied: ${window.location.href}`);
-      },
-    }));
+    menu.append(
+      new MenuItem({
+        label: this.stringTable.copyPageUrl(),
+        enabled: true,
+        click: () => {
+          clipboard.writeText(window.location.href);
+          this._sendNotificationOnClipboardEvent(
+            menuInfo.clipboardNotifications,
+            () => `Page URL copied: ${window.location.href}`,
+          );
+        },
+      }),
+    );
 
     return menu;
   }
@@ -533,15 +578,17 @@ module.exports = class ContextMenuBuilder {
    */
   goToHomePage(menu, menuInfo) {
     const baseURL = new URL(menuInfo.pageURL);
-    menu.append(new MenuItem({
-      label: this.stringTable.goToHomePage(),
-      accelerator: `${cmdOrCtrlShortcutKey()}+Home`,
-      enabled: true,
-      click: () => {
-        // webContents.loadURL(baseURL.origin);
-        window.location.href = baseURL.origin;
-      },
-    }));
+    menu.append(
+      new MenuItem({
+        label: this.stringTable.goToHomePage(),
+        accelerator: `${cmdOrCtrlShortcutKey()}+Home`,
+        enabled: true,
+        click: () => {
+          // webContents.loadURL(baseURL.origin);
+          window.location.href = baseURL.origin;
+        },
+      }),
+    );
 
     return menu;
   }
@@ -550,13 +597,15 @@ module.exports = class ContextMenuBuilder {
    * Adds the 'open in browser' menu item.
    */
   openInBrowser(menu, menuInfo) {
-    menu.append(new MenuItem({
-      label: this.stringTable.openInBrowser(),
-      enabled: true,
-      click: () => {
-        openExternalUrl(menuInfo.pageURL, true);
-      },
-    }));
+    menu.append(
+      new MenuItem({
+        label: this.stringTable.openInBrowser(),
+        enabled: true,
+        click: () => {
+          openExternalUrl(menuInfo.pageURL, true);
+        },
+      }),
+    );
 
     return menu;
   }
@@ -566,9 +615,8 @@ module.exports = class ContextMenuBuilder {
       return;
     }
     // eslint-disable-next-line no-new
-    new window.Notification('Data copied into Clipboard',
-      {
-        body: notificationText(),
-      });
+    new window.Notification('Data copied into Clipboard', {
+      body: notificationText(),
+    });
   }
 };
diff --git a/src/webview/darkmode.ts b/src/webview/darkmode.ts
index e06c22f11..7b9407049 100644
--- a/src/webview/darkmode.ts
+++ b/src/webview/darkmode.ts
@@ -1,5 +1,3 @@
-/* eslint no-bitwise: ["error", { "int32Hint": true }] */
-
 import { join } from 'path';
 import { pathExistsSync, readFileSync } from 'fs-extra';
 
@@ -7,7 +5,9 @@ const debug = require('debug')('Ferdi:DarkMode');
 
 const chars = [...'abcdefghijklmnopqrstuvwxyz'];
 
-const ID = [...Array(20)].map(() => chars[Math.random() * chars.length | 0]).join('');
+const ID = [...Array.from({ length: 20 })]
+  .map(() => chars[Math.trunc(Math.random() * chars.length)])
+  .join('');
 
 export function injectDarkModeStyle(recipePath: string) {
   const darkModeStyle = join(recipePath, 'darkmode.css');
diff --git a/src/webview/lib/RecipeWebview.js b/src/webview/lib/RecipeWebview.js
index 157da7693..4085b925b 100644
--- a/src/webview/lib/RecipeWebview.js
+++ b/src/webview/lib/RecipeWebview.js
@@ -1,5 +1,5 @@
 import { ipcRenderer } from 'electron';
-import { exists, pathExistsSync, readFileSync } from 'fs-extra';
+import { pathExistsSync, readFileSync, existsSync } from 'fs-extra';
 
 const debug = require('debug')('Ferdi:Plugin:RecipeWebview');
 
@@ -62,12 +62,13 @@ class RecipeWebview {
    *                          be an absolute path to the file
    */
   injectCSS(...files) {
-    files.forEach(async (file) => {
+    // eslint-disable-next-line unicorn/no-array-for-each
+    files.forEach(file => {
       if (pathExistsSync(file)) {
         const styles = document.createElement('style');
         styles.innerHTML = readFileSync(file, 'utf8');
 
-        document.querySelector('head').appendChild(styles);
+        document.querySelector('head').append(styles);
 
         debug('Append styles', styles);
       }
@@ -75,14 +76,16 @@ class RecipeWebview {
   }
 
   injectJSUnsafe(...files) {
-    Promise.all(files.map(async (file) => {
-      if (await exists(file)) {
-        return readFileSync(file, 'utf8');
-      }
-      debug('Script not found', file);
-      return null;
-    })).then(async (scripts) => {
-      const scriptsFound = scripts.filter((script) => script !== null);
+    Promise.all(
+      files.map(file => {
+        if (existsSync(file)) {
+          return readFileSync(file, 'utf8');
+        }
+        debug('Script not found', file);
+        return null;
+      }),
+    ).then(scripts => {
+      const scriptsFound = scripts.filter(script => script !== null);
       if (scriptsFound.length > 0) {
         debug('Inject scripts to main world', scriptsFound);
         ipcRenderer.sendToHost('inject-js-unsafe', ...scriptsFound);
diff --git a/src/webview/lib/Userscript.js b/src/webview/lib/Userscript.js
index 2043d9fff..bed2b1ff8 100644
--- a/src/webview/lib/Userscript.js
+++ b/src/webview/lib/Userscript.js
@@ -28,7 +28,7 @@ export default class Userscript {
    *
    * @param {*} settings
    */
-  // eslint-disable-next-line
+  // eslint-disable-next-line camelcase
   internal_setSettings(settings) {
     // This is needed to get a clean JS object from the settings itself to provide better accessibility
     // Otherwise this will be a mobX instance
@@ -95,9 +95,7 @@ export default class Userscript {
    * @param {*} value
    */
   set(key, value) {
-    window.localStorage.setItem(
-      `ferdi-user-${key}`, JSON.stringify(value),
-    );
+    window.localStorage.setItem(`ferdi-user-${key}`, JSON.stringify(value));
   }
 
   /**
@@ -107,9 +105,7 @@ export default class Userscript {
    * @return Value of the key
    */
   get(key) {
-    return JSON.parse(window.localStorage.getItem(
-      `ferdi-user-${key}`,
-    ));
+    return JSON.parse(window.localStorage.getItem(`ferdi-user-${key}`));
   }
 
   /**
diff --git a/src/webview/recipe.js b/src/webview/recipe.js
index a3ae4513f..d7032da3f 100644
--- a/src/webview/recipe.js
+++ b/src/webview/recipe.js
@@ -1,3 +1,4 @@
+/* eslint-disable global-require */
 /* eslint-disable import/first */
 import { contextBridge, desktopCapturer, ipcRenderer } from 'electron';
 import { BrowserWindow, getCurrentWebContents } from '@electron/remote';
@@ -104,16 +105,13 @@ window.open = (url, frameName, features) => {
 // then overwrite the corresponding field of the window object by injected JS.
 contextBridge.exposeInMainWorld('ferdi', {
   open: window.open,
-  setBadge: (direct, indirect) =>
-    badgeHandler.setBadge(direct, indirect),
-  safeParseInt: (text) =>
-    badgeHandler.safeParseInt(text),
+  setBadge: (direct, indirect) => badgeHandler.setBadge(direct, indirect),
+  safeParseInt: text => badgeHandler.safeParseInt(text),
   displayNotification: (title, options) =>
     notificationsHandler.displayNotification(title, options),
-  clearStorageData: (storageLocations) =>
+  clearStorageData: storageLocations =>
     sessionHandler.clearStorageData(storageLocations),
-  releaseServiceWorkers: () =>
-    sessionHandler.releaseServiceWorkers(),
+  releaseServiceWorkers: () => sessionHandler.releaseServiceWorkers(),
   getDisplayMediaSelector,
   getCurrentWebContents,
   BrowserWindow,
@@ -173,12 +171,12 @@ class RecipeController {
   findInPage = null;
 
   async initialize() {
-    Object.keys(this.ipcEvents).forEach(channel => {
+    for (const channel of Object.keys(this.ipcEvents)) {
       ipcRenderer.on(channel, (...args) => {
         debug('Received IPC event for channel', channel, 'with', ...args);
         this[this.ipcEvents[channel]](...args);
       });
-    });
+    }
 
     debug('Send "hello" to host');
     setTimeout(() => ipcRenderer.sendToHost('hello'), 100);
@@ -210,7 +208,7 @@ class RecipeController {
     delete require.cache[require.resolve(modulePath)];
     try {
       this.recipe = new RecipeWebview(badgeHandler, notificationsHandler);
-      // eslint-disable-next-line
+      // eslint-disable-next-line import/no-dynamic-require
       require(modulePath)(this.recipe, { ...config, recipe });
       debug('Initialize Recipe', config, recipe);
 
@@ -218,8 +216,8 @@ class RecipeController {
 
       // Make sure to update the WebView, otherwise the custom darkmode handler may not be used
       this.update();
-    } catch (err) {
-      console.error('Recipe initialization failed', err);
+    } catch (error) {
+      console.error('Recipe initialization failed', error);
     }
 
     this.loadUserFiles(recipe, config);
@@ -234,12 +232,12 @@ class RecipeController {
       const data = readFileSync(userCss);
       styles.innerHTML += data.toString();
     }
-    document.querySelector('head').appendChild(styles);
+    document.querySelector('head').append(styles);
 
     const userJs = join(recipe.path, 'user.js');
     if (pathExistsSync(userJs)) {
       const loadUserJs = () => {
-        // eslint-disable-next-line
+        // eslint-disable-next-line import/no-dynamic-require
         const userJsModule = require(userJs);
 
         if (typeof userJsModule === 'function') {
@@ -392,15 +390,14 @@ class RecipeController {
     }
 
     // Remove dark reader if (universal) dark mode was just disabled
-    if (this.universalDarkModeInjected) {
-      if (
-        !this.settings.app.darkMode ||
+    if (
+      this.universalDarkModeInjected &&
+      (!this.settings.app.darkMode ||
         !this.settings.service.isDarkModeEnabled ||
-        !this.settings.app.universalDarkMode
-      ) {
-        disableDarkMode();
-        this.universalDarkModeInjected = false;
-      }
+        !this.settings.app.universalDarkMode)
+    ) {
+      disableDarkMode();
+      this.universalDarkModeInjected = false;
     }
   }
 
diff --git a/src/webview/sessionHandler.ts b/src/webview/sessionHandler.ts
index 6a7e62ac5..4961da12b 100644
--- a/src/webview/sessionHandler.ts
+++ b/src/webview/sessionHandler.ts
@@ -9,20 +9,21 @@ export class SessionHandler {
       const { session } = getCurrentWebContents();
       session.flushStorageData();
       session.clearStorageData({ storages: storageLocations });
-    } catch (err) {
-      debug(err);
+    } catch (error) {
+      debug(error);
     }
   }
 
   async releaseServiceWorkers() {
     try {
-      const registrations = await window.navigator.serviceWorker.getRegistrations();
-      registrations.forEach(r => {
-        r.unregister();
+      const registrations =
+        await window.navigator.serviceWorker.getRegistrations();
+      for (const registration of registrations) {
+        registration.unregister();
         debug('ServiceWorker unregistered');
-      });
-    } catch (err) {
-      debug(err);
+      }
+    } catch (error) {
+      debug(error);
     }
   }
 }
diff --git a/src/webview/spellchecker.ts b/src/webview/spellchecker.ts
index 30b4ef075..d0f6663d5 100644
--- a/src/webview/spellchecker.ts
+++ b/src/webview/spellchecker.ts
@@ -11,7 +11,7 @@ debug('Spellchecker default locale is', defaultLocale);
 export function getSpellcheckerLocaleByFuzzyIdentifier(identifier: string) {
   const locales = Object.keys(SPELLCHECKER_LOCALES).filter((key) => key.toLocaleLowerCase() === identifier.toLowerCase() || key.split('-')[0] === identifier.toLowerCase());
 
-  return locales.length >= 1 ? locales[0] : null;
+  return locales.length > 0 ? locales[0] : null;
 }
 
 export function switchDict(locale: string) {
diff --git a/uidev/src/index.tsx b/uidev/src/index.tsx
index 99658b184..5aa3979c8 100644
--- a/uidev/src/index.tsx
+++ b/uidev/src/index.tsx
@@ -6,4 +6,4 @@ const app = () => (
   <App />
 );
 
-render(app(), document.getElementById('root'));
+render(app(), document.querySelector('#root'));
-- 
cgit v1.2.3-70-g09d2


From e2f440ff2dd5179e2d9bc8dea119fc4fe7c562a1 Mon Sep 17 00:00:00 2001
From: niu tech <jerzyglowacki@gmail.com>
Date: Wed, 15 Sep 2021 10:39:27 +0200
Subject: Enable Split View Mode (#1926)

---
 src/components/services/content/ServiceView.js      |  2 +-
 .../settings/settings/EditSettingsForm.js           |  4 ++++
 src/containers/settings/EditSettingsScreen.js       | 10 ++++++++++
 src/environment.js                                  |  1 +
 src/features/workspaces/store.js                    | 11 +++++++++++
 src/i18n/locales/en-US.json                         |  1 +
 src/i18n/locales/pl.json                            |  1 +
 src/stores/ServicesStore.js                         | 18 +++++++++++++++++-
 src/stores/UIStore.ts                               | 21 +++++++++++++++++++++
 src/styles/layout.scss                              |  4 ++++
 src/styles/services.scss                            | 20 +++++++++++++++++++-
 11 files changed, 90 insertions(+), 3 deletions(-)

(limited to 'src/containers/settings')

diff --git a/src/components/services/content/ServiceView.js b/src/components/services/content/ServiceView.js
index fa866e153..81401b1d2 100644
--- a/src/components/services/content/ServiceView.js
+++ b/src/components/services/content/ServiceView.js
@@ -108,7 +108,7 @@ class ServiceView extends Component {
     }
 
     return (
-      <div className={webviewClasses}>
+      <div className={webviewClasses} data-name={service.name}>
         {service.isActive && service.isEnabled && (
           <>
             {service.hasCrashed && (
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index f7e0fdd6f..f5a29ff82 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -537,6 +537,10 @@ class EditSettingsForm extends Component {
 
                 <Hr />
 
+                <Toggle field={form.$('splitMode')} />
+
+                <Hr />
+
                 <Select field={form.$('serviceRibbonWidth')} />
 
                 <Toggle field={form.$('useVerticalStyle')} />
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js
index 92985b68c..36b9e949b 100644
--- a/src/containers/settings/EditSettingsScreen.js
+++ b/src/containers/settings/EditSettingsScreen.js
@@ -164,6 +164,10 @@ const messages = defineMessages({
     id: 'settings.app.form.universalDarkMode',
     defaultMessage: 'Enable universal Dark Mode',
   },
+  splitMode: {
+    id: 'settings.app.form.splitMode',
+    defaultMessage: 'Enable Split View Mode',
+  },
   serviceRibbonWidth: {
     id: 'settings.app.form.serviceRibbonWidth',
     defaultMessage: 'Sidebar width',
@@ -288,6 +292,7 @@ class EditSettingsScreen extends Component {
         darkMode: Boolean(settingsData.darkMode),
         adaptableDarkMode: Boolean(settingsData.adaptableDarkMode),
         universalDarkMode: Boolean(settingsData.universalDarkMode),
+        splitMode: Boolean(settingsData.splitMode),
         serviceRibbonWidth: Number(settingsData.serviceRibbonWidth),
         iconSize: Number(settingsData.iconSize),
         useVerticalStyle: Boolean(settingsData.useVerticalStyle),
@@ -580,6 +585,11 @@ class EditSettingsScreen extends Component {
           value: settings.all.app.universalDarkMode,
           default: DEFAULT_APP_SETTINGS.universalDarkMode,
         },
+        splitMode: {
+          label: intl.formatMessage(messages.splitMode),
+          value: settings.all.app.splitMode,
+          default: DEFAULT_APP_SETTINGS.splitMode,
+        },
         serviceRibbonWidth: {
           label: intl.formatMessage(messages.serviceRibbonWidth),
           value: settings.all.app.serviceRibbonWidth,
diff --git a/src/environment.js b/src/environment.js
index b30e3778d..b315466fc 100644
--- a/src/environment.js
+++ b/src/environment.js
@@ -136,6 +136,7 @@ export const DEFAULT_APP_SETTINGS = {
   enableSpellchecking: true,
   spellcheckerLanguage: 'en-us',
   darkMode: isMac && electronApi.nativeTheme.shouldUseDarkColors,
+  splitMode: false,
   locale: '',
   fallbackLocale: 'en-US',
   beta: false,
diff --git a/src/features/workspaces/store.js b/src/features/workspaces/store.js
index 73e882990..db2b69f99 100644
--- a/src/features/workspaces/store.js
+++ b/src/features/workspaces/store.js
@@ -190,6 +190,12 @@ export default class WorkspacesStore extends FeatureStore {
     setTimeout(() => {
       this.isSwitchingWorkspace = false;
       this.nextWorkspace = null;
+      if (this.stores.settings.app.splitMode) {
+        const serviceNames = new Set(this.getWorkspaceServices(workspace).map(service => service.name));
+        for (const wrapper of document.querySelectorAll('.services__webview-wrapper')) {
+          wrapper.style.display = serviceNames.has(wrapper.dataset.name) ? '' : 'none';
+        }
+      }
     }, 1000);
   };
 
@@ -205,6 +211,11 @@ export default class WorkspacesStore extends FeatureStore {
     // Indicate that we are done switching to the default workspace
     setTimeout(() => {
       this.isSwitchingWorkspace = false;
+      if (this.stores.settings.app.splitMode) {
+        for (const wrapper of document.querySelectorAll('.services__webview-wrapper')) {
+          wrapper.style.display = '';
+        }
+      }
     }, 1000);
   };
 
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index e2e0cdc83..25eedb456 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -239,6 +239,7 @@
   "settings.app.form.showDisabledServices": "Display disabled services tabs",
   "settings.app.form.showDragArea": "Show draggable area on window",
   "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
+  "settings.app.form.splitMode": "Enable Split View Mode",
   "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
diff --git a/src/i18n/locales/pl.json b/src/i18n/locales/pl.json
index d0bbe725d..2d79744a6 100644
--- a/src/i18n/locales/pl.json
+++ b/src/i18n/locales/pl.json
@@ -239,6 +239,7 @@
   "settings.app.form.showDisabledServices": "Wyświetlaj karty wyłączonych usług",
   "settings.app.form.showDragArea": "Show draggable area on window",
   "settings.app.form.showMessagesBadgesWhenMuted": "Pokaż licznik nieprzeczytanych wiadomości gdy powiadomienia są wyłączone",
+  "settings.app.form.splitMode": "Włącz tryb podzielony",
   "settings.app.form.startMinimized": "Uruchom zminimalizowany",
   "settings.app.form.universalDarkMode": "Włącz uniwersalny tryb ciemny",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index 67fd4103f..16defb327 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -162,6 +162,13 @@ export default class ServicesStore extends Store {
       },
     );
 
+    reaction(
+      () => this.stores.settings.app.splitMode,
+      () => {
+        this._shareSettingsWithServiceProcess();
+      },
+    );
+
     reaction(
       () => this.stores.settings.app.searchEngine,
       () => {
@@ -667,12 +674,21 @@ export default class ServicesStore extends Store {
     }
   }
 
-  @action _focusActiveService() {
+  @action _focusActiveService(focusEvent = null) {
     if (this.stores.user.isLoggedIn) {
       // TODO: add checks to not focus service when router path is /settings or /auth
       const service = this.active;
       if (service) {
         this._focusService({ serviceId: service.id });
+        if (this.stores.settings.app.splitMode && !focusEvent) {
+          setTimeout(() => {
+            document.querySelector('.services__webview-wrapper.is-active').scrollIntoView({
+              behavior: 'smooth',
+              block: 'end',
+              inline: 'nearest',
+            });
+          }, 10);
+        }
       } else {
         debug('No service is active');
       }
diff --git a/src/stores/UIStore.ts b/src/stores/UIStore.ts
index ec48eeb40..6ab63c2ee 100644
--- a/src/stores/UIStore.ts
+++ b/src/stores/UIStore.ts
@@ -51,6 +51,13 @@ export default class UIStore extends Store {
       },
       { fireImmediately: true },
     );
+    reaction(
+      () => this.isSplitModeActive,
+      () => {
+        this._setupModeInDOM();
+      },
+      { fireImmediately: true },
+    );
   }
 
   @computed get showMessageBadgesEvenWhenMuted() {
@@ -77,6 +84,10 @@ export default class UIStore extends Store {
     );
   }
 
+  @computed get isSplitModeActive() {
+    return this.stores.settings.app.splitMode;
+  }
+
   @computed get theme() {
     const themeId =
       this.isDarkThemeActive || this.stores.settings.app.darkMode
@@ -114,4 +125,14 @@ export default class UIStore extends Store {
       body?.classList.add('theme__dark');
     }
   }
+
+  _setupModeInDOM() {
+    const body = document.querySelector('body');
+
+    if (!this.isSplitModeActive) {
+      body?.classList.remove('mode__split');
+    } else {
+      body?.classList.add('mode__split');
+    }
+  }
 }
diff --git a/src/styles/layout.scss b/src/styles/layout.scss
index 49e041022..b5d4d86d0 100644
--- a/src/styles/layout.scss
+++ b/src/styles/layout.scss
@@ -82,6 +82,10 @@ body.win32:not(.isFullScreen) .app .app__content {
   height: calc(100% - 28px);
 }
 
+.mode__split .app .app__service {
+  overflow-x: auto;
+}
+
 .app {
   .app__content {
     display: flex;
diff --git a/src/styles/services.scss b/src/styles/services.scss
index 8b8c27e10..dd053e93d 100644
--- a/src/styles/services.scss
+++ b/src/styles/services.scss
@@ -18,6 +18,24 @@
   }
 }
 
+.mode__split .services {
+  display: flex;
+  overflow: visible;
+
+  .services__webview {
+    position: relative;
+    flex: 1 0 50%;
+
+    @media (min-width: 1280px) {
+      flex-basis: 33.33%;
+    }
+
+    @media (min-width: 2048px) {
+      flex-basis: 25%;
+    }
+  }
+}
+
 .services {
   background: #FFF;
   flex: 1;
@@ -71,7 +89,7 @@
   }
 
   .services__info-layer {
-    position: absolut;
+    position: absolute;
     z-index: 110;
   }
 
-- 
cgit v1.2.3-70-g09d2


From 2e96a61955e525bf6269e41342bf3ffce05805a6 Mon Sep 17 00:00:00 2001
From: Vijay Aravamudhan <vraravam@users.noreply.github.com>
Date: Fri, 24 Sep 2021 07:39:41 +0530
Subject: Allow services to delineate favorites vs non-favorites in unread
 counts (#1979)

implements getferdi/recipes#721 (eg: office365-owa)
---
 CHANGELOG.md                                       |  6 ++++
 .../settings/services/EditServiceForm.js           |  5 ++++
 src/containers/settings/EditServiceScreen.js       | 14 +++++++++
 src/i18n/locales/en-US.json                        |  1 +
 src/models/Recipe.ts                               | 34 +++++++++++++---------
 src/models/Service.js                              |  7 +++++
 6 files changed, 54 insertions(+), 13 deletions(-)

(limited to 'src/containers/settings')

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 26b94df53..0171c3b5d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# [v5.6.3-nightly.12](https://github.com/getferdi/ferdi/compare/v5.6.3-nightly.10...v5.6.3-nightly.12) (2021-09-24)
+
+### Services
+
+- Update 'skype' and 'discord' to properly relinquish window object for image overlay 💖 @vraravam
+- Allow services to delineate favorites vs non-favorites in unread counts (eg Outlook) (getferdi/recipes#721) 💖 @vraravam
 
 # [v5.6.3-nightly.10](https://github.com/getferdi/ferdi/compare/v5.6.3-nightly.9...v5.6.3-nightly.10) (2021-09-22)
 
diff --git a/src/components/settings/services/EditServiceForm.js b/src/components/settings/services/EditServiceForm.js
index 7df6d5c78..179741338 100644
--- a/src/components/settings/services/EditServiceForm.js
+++ b/src/components/settings/services/EditServiceForm.js
@@ -343,6 +343,11 @@ class EditServiceForm extends Component {
                         </p>
                       </>
                   )}
+                  {recipe.allowFavoritesDelineationInUnreadCount && (
+                    <Toggle
+                      field={form.$('onlyShowFavoritesInUnreadCount')}
+                    />
+                  )}
                 </div>
 
                 <div className="settings__settings-group">
diff --git a/src/containers/settings/EditServiceScreen.js b/src/containers/settings/EditServiceScreen.js
index e2ed4eeac..dee7e7cff 100644
--- a/src/containers/settings/EditServiceScreen.js
+++ b/src/containers/settings/EditServiceScreen.js
@@ -81,6 +81,10 @@ const messages = defineMessages({
     id: 'settings.service.form.darkReaderSepia',
     defaultMessage: 'Dark Reader Sepia',
   },
+  onlyShowFavoritesInUnreadCount: {
+    id: 'settings.service.form.onlyShowFavoritesInUnreadCount',
+    defaultMessage: 'Only show Favorites in unread count',
+  },
   enableProxy: {
     id: 'settings.service.form.proxy.isEnabled',
     defaultMessage: 'Use Proxy',
@@ -289,6 +293,16 @@ class EditServiceScreen extends Component {
       });
     }
 
+    if (recipe.allowFavoritesDelineationInUnreadCount) {
+      Object.assign(config.fields, {
+        onlyShowFavoritesInUnreadCount: {
+          label: intl.formatMessage(messages.onlyShowFavoritesInUnreadCount),
+          value: service.onlyShowFavoritesInUnreadCount,
+          default: false,
+        },
+      });
+    }
+
     if (proxy.isEnabled) {
       const serviceProxyConfig = stores.settings.proxy[service.id] || {};
 
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index 25eedb456..471726ecc 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -321,6 +321,7 @@
   "settings.service.form.isHibernatedEnabledInfo": "When enabled, a service will be shut down after a period of time to save system resources.",
   "settings.service.form.isMutedInfo": "When disabled, all notification sounds and audio playback are muted",
   "settings.service.form.name": "Name",
+  "settings.service.form.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
   "settings.service.form.openDarkmodeCss": "Open darkmode.css",
   "settings.service.form.openUserCss": "Open user.css",
   "settings.service.form.openUserJs": "Open user.js",
diff --git a/src/models/Recipe.ts b/src/models/Recipe.ts
index 6022fb520..83d1d4478 100644
--- a/src/models/Recipe.ts
+++ b/src/models/Recipe.ts
@@ -1,6 +1,10 @@
 import semver from 'semver';
 import { pathExistsSync } from 'fs-extra';
 import { join } from 'path';
+import {
+  ifUndefinedString,
+  ifUndefinedBoolean,
+} from '../jsUtils';
 
 interface IRecipe {
   id: string;
@@ -22,6 +26,7 @@ interface IRecipe {
     autoHibernate?: boolean;
     partition?: string;
     message?: string;
+    allowFavoritesDelineationInUnreadCount?: boolean;
   };
 }
 
@@ -59,6 +64,8 @@ export default class Recipe {
 
   message: string = '';
 
+  allowFavoritesDelineationInUnreadCount: boolean = false;
+
   disablewebsecurity: boolean = false;
 
   autoHibernate: boolean = false;
@@ -81,30 +88,31 @@ export default class Recipe {
     }
 
     this.id = data.id || this.id;
-    this.name = data.name || this.name;
-    this.version = data.version || this.version;
+    this.name = ifUndefinedString(data.name, this.name);
+    this.version = ifUndefinedString(data.version, this.version);
     this.aliases = data.aliases || this.aliases;
     this.path = data.path;
 
-    this.serviceURL = data.config.serviceURL || this.serviceURL;
+    this.serviceURL = ifUndefinedString(data.config.serviceURL, this.serviceURL);
 
-    this.hasDirectMessages = data.config.hasDirectMessages || this.hasDirectMessages;
-    this.hasIndirectMessages = data.config.hasIndirectMessages || this.hasIndirectMessages;
-    this.hasNotificationSound = data.config.hasNotificationSound || this.hasNotificationSound;
-    this.hasTeamId = data.config.hasTeamId || this.hasTeamId;
-    this.hasCustomUrl = data.config.hasCustomUrl || this.hasCustomUrl;
-    this.hasHostedOption = data.config.hasHostedOption || this.hasHostedOption;
+    this.hasDirectMessages = ifUndefinedBoolean(data.config.hasDirectMessages, this.hasDirectMessages);
+    this.hasIndirectMessages = ifUndefinedBoolean(data.config.hasIndirectMessages, this.hasIndirectMessages);
+    this.hasNotificationSound = ifUndefinedBoolean(data.config.hasNotificationSound, this.hasNotificationSound);
+    this.hasTeamId = ifUndefinedBoolean(data.config.hasTeamId, this.hasTeamId);
+    this.hasCustomUrl = ifUndefinedBoolean(data.config.hasCustomUrl, this.hasCustomUrl);
+    this.hasHostedOption = ifUndefinedBoolean(data.config.hasHostedOption, this.hasHostedOption);
 
-    this.urlInputPrefix = data.config.urlInputPrefix || this.urlInputPrefix;
-    this.urlInputSuffix = data.config.urlInputSuffix || this.urlInputSuffix;
+    this.urlInputPrefix = ifUndefinedString(data.config.urlInputPrefix, this.urlInputPrefix);
+    this.urlInputSuffix = ifUndefinedString(data.config.urlInputSuffix, this.urlInputSuffix);
 
     this.disablewebsecurity = data.config.disablewebsecurity || this.disablewebsecurity;
 
     this.autoHibernate = data.config.autoHibernate || this.autoHibernate;
 
-    this.partition = data.config.partition || this.partition;
+    this.partition = ifUndefinedString(data.config.partition, this.partition);
 
-    this.message = data.config.message || this.message;
+    this.message = ifUndefinedString(data.config.message, this.message);
+    this.allowFavoritesDelineationInUnreadCount = ifUndefinedBoolean(data.config.allowFavoritesDelineationInUnreadCount, this.allowFavoritesDelineationInUnreadCount);
   }
 
   // TODO: Need to remove this if its not used anywhere
diff --git a/src/models/Service.js b/src/models/Service.js
index cc001f98d..75dfde027 100644
--- a/src/models/Service.js
+++ b/src/models/Service.js
@@ -83,6 +83,8 @@ export default class Service {
 
   @observable isHibernationRequested = false;
 
+  @observable onlyShowFavoritesInUnreadCount = false;
+
   @observable lastUsed = Date.now(); // timestamp
 
   @observable lastHibernated = null; // timestamp
@@ -144,6 +146,10 @@ export default class Service {
       data.hasCustomIcon,
       this.hasCustomUploadedIcon,
     );
+    this.onlyShowFavoritesInUnreadCount = ifUndefinedBoolean(
+      data.onlyShowFavoritesInUnreadCount,
+      this.onlyShowFavoritesInUnreadCount,
+    );
     this.proxy = ifUndefinedString(data.proxy, this.proxy);
     this.spellcheckerLanguage = ifUndefinedString(
       data.spellcheckerLanguage,
@@ -191,6 +197,7 @@ export default class Service {
       team: this.team,
       url: this.url,
       hasCustomIcon: this.hasCustomIcon,
+      onlyShowFavoritesInUnreadCount: this.onlyShowFavoritesInUnreadCount,
     };
   }
 
-- 
cgit v1.2.3-70-g09d2


From 11f99ffaac3529b1ef61fa5360923a78ee7ce7d5 Mon Sep 17 00:00:00 2001
From: Vijay A <vraravam@users.noreply.github.com>
Date: Fri, 1 Oct 2021 20:42:54 +0530
Subject: refactor: move 'asarRecipesPath' into 'asar-helpers'

---
 src/api/server/ServerApi.js              | 2 +-
 src/containers/settings/RecipesScreen.js | 3 ++-
 src/environment.ts                       | 7 -------
 src/helpers/asar-helpers.ts              | 7 +++++++
 src/stores/RecipesStore.js               | 2 +-
 5 files changed, 11 insertions(+), 10 deletions(-)

(limited to 'src/containers/settings')

diff --git a/src/api/server/ServerApi.js b/src/api/server/ServerApi.js
index ef3d51796..fb0d64dc3 100644
--- a/src/api/server/ServerApi.js
+++ b/src/api/server/ServerApi.js
@@ -25,11 +25,11 @@ import { SERVER_NOT_LOADED } from '../../config';
 import {
   osArch,
   osPlatform,
-  asarRecipesPath,
   userDataRecipesPath,
   userDataPath,
   ferdiVersion,
 } from '../../environment';
+import { asarRecipesPath } from '../../helpers/asar-helpers';
 import apiBase from '../apiBase';
 import { prepareAuthRequest, sendAuthRequest } from '../utils/auth';
 
diff --git a/src/containers/settings/RecipesScreen.js b/src/containers/settings/RecipesScreen.js
index 06ddabe4c..162390d57 100644
--- a/src/containers/settings/RecipesScreen.js
+++ b/src/containers/settings/RecipesScreen.js
@@ -12,7 +12,8 @@ import UserStore from '../../stores/UserStore';
 import RecipesDashboard from '../../components/settings/recipes/RecipesDashboard';
 import ErrorBoundary from '../../components/util/ErrorBoundary';
 import { CUSTOM_WEBSITE_RECIPE_ID, FRANZ_DEV_DOCS } from '../../config';
-import { asarRecipesPath, userDataRecipesPath } from '../../environment';
+import { userDataRecipesPath } from '../../environment';
+import { asarRecipesPath } from '../../helpers/asar-helpers';
 import { communityRecipesStore } from '../../features/communityRecipes';
 import RecipePreview from '../../models/RecipePreview';
 import AppStore from '../../stores/AppStore';
diff --git a/src/environment.ts b/src/environment.ts
index 3e63f449b..9478f803c 100644
--- a/src/environment.ts
+++ b/src/environment.ts
@@ -23,8 +23,6 @@ import {
   iconSizeBias,
 } from './config';
 
-import { asarPath } from './helpers/asar-helpers';
-
 // @ts-expect-error Cannot find module './buildInfo.json' or its corresponding type declarations.
 import * as buildInfo from './buildInfo.json';
 
@@ -64,11 +62,6 @@ export function userDataRecipesPath(...segments: any[]) {
   return userDataPath('recipes', ...[segments].flat());
 }
 
-// Replacing app.asar is not beautiful but unfortunately necessary
-export function asarRecipesPath(...segments: any[]) {
-  return join(asarPath(join(__dirname, 'recipes')), ...[segments].flat());
-}
-
 export const useLiveAPI = process.env.USE_LIVE_API;
 const useLocalAPI = process.env.USE_LOCAL_API;
 
diff --git a/src/helpers/asar-helpers.ts b/src/helpers/asar-helpers.ts
index 3d9f0d941..3da90625d 100644
--- a/src/helpers/asar-helpers.ts
+++ b/src/helpers/asar-helpers.ts
@@ -1,3 +1,10 @@
+import { join } from 'path';
+
 export function asarPath(dir: string = '') {
   return dir.replace('app.asar', 'app.asar.unpacked');
 }
+
+// Replacing app.asar is not beautiful but unfortunately necessary
+export function asarRecipesPath(...segments: any[]) {
+  return join(asarPath(join(__dirname, '..', 'recipes')), ...[segments].flat());
+}
diff --git a/src/stores/RecipesStore.js b/src/stores/RecipesStore.js
index bfbdc57a8..95d662e79 100644
--- a/src/stores/RecipesStore.js
+++ b/src/stores/RecipesStore.js
@@ -6,7 +6,7 @@ import Store from './lib/Store';
 import CachedRequest from './lib/CachedRequest';
 import Request from './lib/Request';
 import { matchRoute } from '../helpers/routing-helpers';
-import { asarRecipesPath } from '../environment';
+import { asarRecipesPath } from '../helpers/asar-helpers';
 
 const debug = require('debug')('Ferdi:RecipeStore');
 
-- 
cgit v1.2.3-70-g09d2


From 204a80708e6e0a2189de16438a3eb4b57ef84987 Mon Sep 17 00:00:00 2001
From: Vijay A <vraravam@users.noreply.github.com>
Date: Fri, 1 Oct 2021 21:51:55 +0530
Subject: refactor: split 'environment' into 'environment-remote' with only the
 remote module dependency

(might be a pre-requisite for the electron v14 upgrade)
---
 src/api/apiBase.ts                                 |  2 +-
 src/api/server/ServerApi.js                        |  9 +--
 src/api/utils/auth.js                              |  2 +-
 src/components/auth/Login.js                       |  2 +-
 .../settings/settings/EditSettingsForm.js          |  4 +-
 src/containers/settings/AccountScreen.js           |  2 +-
 src/containers/settings/RecipesScreen.js           |  2 +-
 src/electron/Settings.ts                           |  2 +-
 src/electron/ipc-api/localServer.ts                |  2 +-
 src/electron/macOSPermissions.ts                   |  2 +-
 src/environment-remote.ts                          | 93 ++++++++++++++++++++++
 src/environment.ts                                 | 91 +--------------------
 src/features/settingsWS/store.js                   |  2 +-
 src/helpers/recipe-helpers.ts                      |  2 +-
 src/helpers/service-helpers.ts                     |  2 +-
 src/index.html                                     |  2 +-
 src/index.js                                       |  6 +-
 .../app/Controllers/Http/RecipeController.js       |  2 +-
 .../app/Controllers/Http/UserController.js         |  6 +-
 src/internal-server/start/migrate.js               |  2 +-
 src/internal-server/start/routes.js                |  2 +-
 src/lib/Menu.js                                    |  2 +-
 src/stores/AppStore.js                             |  6 +-
 src/stores/ServicesStore.js                        |  2 +-
 src/stores/UserStore.js                            |  2 +-
 25 files changed, 125 insertions(+), 126 deletions(-)
 create mode 100644 src/environment-remote.ts

(limited to 'src/containers/settings')

diff --git a/src/api/apiBase.ts b/src/api/apiBase.ts
index 510ccb619..a30793848 100644
--- a/src/api/apiBase.ts
+++ b/src/api/apiBase.ts
@@ -1,7 +1,7 @@
 /**
  * Get API base URL from store
  */
-import { API_VERSION } from '../environment';
+import { API_VERSION } from '../environment-remote';
 import {
   DEV_API_FRANZ_WEBSITE,
   LIVE_FRANZ_API,
diff --git a/src/api/server/ServerApi.js b/src/api/server/ServerApi.js
index fb0d64dc3..e321f9372 100644
--- a/src/api/server/ServerApi.js
+++ b/src/api/server/ServerApi.js
@@ -22,13 +22,8 @@ import UserModel from '../../models/User';
 import { sleep } from '../../helpers/async-helpers';
 
 import { SERVER_NOT_LOADED } from '../../config';
-import {
-  osArch,
-  osPlatform,
-  userDataRecipesPath,
-  userDataPath,
-  ferdiVersion,
-} from '../../environment';
+import { osArch, osPlatform } from '../../environment';
+import { userDataRecipesPath, userDataPath, ferdiVersion } from '../../environment-remote';
 import { asarRecipesPath } from '../../helpers/asar-helpers';
 import apiBase from '../apiBase';
 import { prepareAuthRequest, sendAuthRequest } from '../utils/auth';
diff --git a/src/api/utils/auth.js b/src/api/utils/auth.js
index 527c68840..07b0c096b 100644
--- a/src/api/utils/auth.js
+++ b/src/api/utils/auth.js
@@ -1,5 +1,5 @@
 import localStorage from 'mobx-localstorage';
-import { ferdiLocale, ferdiVersion } from '../../environment';
+import { ferdiLocale, ferdiVersion } from '../../environment-remote';
 
 export const prepareAuthRequest = (
   // eslint-disable-next-line unicorn/no-object-as-default-parameter
diff --git a/src/components/auth/Login.js b/src/components/auth/Login.js
index 286d2dec8..2f9986858 100644
--- a/src/components/auth/Login.js
+++ b/src/components/auth/Login.js
@@ -5,7 +5,7 @@ import { observer, inject } from 'mobx-react';
 import { defineMessages, injectIntl } from 'react-intl';
 
 import { LIVE_FRANZ_API } from '../../config';
-import { API_VERSION, isDevMode, useLiveAPI } from '../../environment';
+import { API_VERSION, isDevMode, useLiveAPI } from '../../environment-remote';
 import Form from '../../lib/Form';
 import { required, email } from '../../helpers/validation-helpers';
 import serverlessLogin from '../../helpers/serverless-helpers';
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index 59aa0190e..819d0a9e6 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -15,13 +15,11 @@ import Input from '../../ui/Input';
 import { FRANZ_TRANSLATION, GITHUB_FRANZ_URL } from '../../../config';
 import {
   DEFAULT_APP_SETTINGS,
-  ferdiVersion,
   isMac,
   isWindows,
   lockFerdiShortcutKey,
-  userDataPath,
-  userDataRecipesPath,
 } from '../../../environment';
+import { ferdiVersion, userDataPath, userDataRecipesPath } from '../../../environment-remote';
 import { openPath } from '../../../helpers/url-helpers';
 import globalMessages from '../../../i18n/globalMessages';
 
diff --git a/src/containers/settings/AccountScreen.js b/src/containers/settings/AccountScreen.js
index 0f9457fd0..1515fc22b 100644
--- a/src/containers/settings/AccountScreen.js
+++ b/src/containers/settings/AccountScreen.js
@@ -10,7 +10,7 @@ import SettingsStore from '../../stores/SettingsStore';
 import AccountDashboard from '../../components/settings/account/AccountDashboard';
 import ErrorBoundary from '../../components/util/ErrorBoundary';
 import { LIVE_FRANZ_API } from '../../config';
-import { WEBSITE } from '../../environment';
+import { WEBSITE } from '../../environment-remote';
 
 @inject('stores', 'actions')
 @observer
diff --git a/src/containers/settings/RecipesScreen.js b/src/containers/settings/RecipesScreen.js
index 162390d57..2e60ceefa 100644
--- a/src/containers/settings/RecipesScreen.js
+++ b/src/containers/settings/RecipesScreen.js
@@ -12,7 +12,7 @@ import UserStore from '../../stores/UserStore';
 import RecipesDashboard from '../../components/settings/recipes/RecipesDashboard';
 import ErrorBoundary from '../../components/util/ErrorBoundary';
 import { CUSTOM_WEBSITE_RECIPE_ID, FRANZ_DEV_DOCS } from '../../config';
-import { userDataRecipesPath } from '../../environment';
+import { userDataRecipesPath } from '../../environment-remote';
 import { asarRecipesPath } from '../../helpers/asar-helpers';
 import { communityRecipesStore } from '../../features/communityRecipes';
 import RecipePreview from '../../models/RecipePreview';
diff --git a/src/electron/Settings.ts b/src/electron/Settings.ts
index a1344aa97..98acfa1d5 100644
--- a/src/electron/Settings.ts
+++ b/src/electron/Settings.ts
@@ -1,6 +1,6 @@
 import { observable, toJS } from 'mobx';
 import { pathExistsSync, outputJsonSync, readJsonSync } from 'fs-extra';
-import { userDataPath } from '../environment';
+import { userDataPath } from '../environment-remote';
 
 const debug = require('debug')('Ferdi:Settings');
 
diff --git a/src/electron/ipc-api/localServer.ts b/src/electron/ipc-api/localServer.ts
index 61e56c777..7ee642101 100644
--- a/src/electron/ipc-api/localServer.ts
+++ b/src/electron/ipc-api/localServer.ts
@@ -1,7 +1,7 @@
 import { ipcMain, BrowserWindow } from 'electron';
 import net from 'net';
 import { LOCAL_HOSTNAME, LOCAL_PORT } from '../../config';
-import { userDataPath } from '../../environment';
+import { userDataPath } from '../../environment-remote';
 import { server } from '../../internal-server/start';
 
 const portInUse = (port: number): Promise<boolean> =>
diff --git a/src/electron/macOSPermissions.ts b/src/electron/macOSPermissions.ts
index aef3ac30b..bcd5b5931 100644
--- a/src/electron/macOSPermissions.ts
+++ b/src/electron/macOSPermissions.ts
@@ -3,7 +3,7 @@ import { pathExistsSync, mkdirSync, writeFileSync } from 'fs-extra';
 import macosVersion from 'macos-version';
 import { dirname } from 'path';
 import { askForScreenCaptureAccess } from 'node-mac-permissions';
-import { userDataPath } from '../environment';
+import { userDataPath } from '../environment-remote';
 
 const debug = require('debug')('Ferdi:macOSPermissions');
 
diff --git a/src/environment-remote.ts b/src/environment-remote.ts
new file mode 100644
index 000000000..1ff019c5f
--- /dev/null
+++ b/src/environment-remote.ts
@@ -0,0 +1,93 @@
+import { join } from 'path';
+import osName from 'os-name';
+import { api as electronApi } from 'electron-util';
+import {
+  LIVE_FERDI_API,
+  DEV_FRANZ_API,
+  LOCAL_API,
+  LOCAL_API_WEBSITE,
+  DEV_API_FRANZ_WEBSITE,
+  LIVE_API_FERDI_WEBSITE,
+  LIVE_WS_API,
+  LOCAL_WS_API,
+  DEV_WS_API,
+  LOCAL_TODOS_FRONTEND_URL,
+  PRODUCTION_TODOS_FRONTEND_URL,
+} from './config';
+import { chromeVersion, electronVersion, isWindows, nodeVersion, osArch } from './environment';
+
+// @ts-expect-error Cannot find module './buildInfo.json' or its corresponding type declarations.
+import * as buildInfo from './buildInfo.json';
+
+export const { app } = electronApi;
+export const ferdiVersion = app.getVersion();
+export const ferdiLocale = app.getLocale();
+
+// Set app directory before loading user modules
+if (process.env.FERDI_APPDATA_DIR != null) {
+  app.setPath('appData', process.env.FERDI_APPDATA_DIR);
+  app.setPath('userData', app.getPath('appData'));
+} else if (process.env.PORTABLE_EXECUTABLE_DIR != null) {
+  app.setPath('appData', join(process.env.PORTABLE_EXECUTABLE_DIR, `${app.name}AppData`));
+  app.setPath('userData', join(app.getPath('appData'), `${app.name}AppData`));
+} else if (isWindows && process.env.APPDATA != null) {
+  app.setPath('appData', process.env.APPDATA);
+  app.setPath('userData', join(app.getPath('appData'), app.name));
+}
+
+export const isDevMode = process.env.ELECTRON_IS_DEV !== undefined ? Number.parseInt(process.env.ELECTRON_IS_DEV, 10) === 1 : !app.isPackaged;
+if (isDevMode) {
+  app.setPath('userData', join(app.getPath('appData'), `${app.name}Dev`));
+}
+
+export function userDataPath(...segments: string[]) {
+  return join(app.getPath('userData'), ...[segments].flat());
+}
+
+export function userDataRecipesPath(...segments: any[]) {
+  return userDataPath('recipes', ...[segments].flat());
+}
+
+const useLocalAPI = process.env.USE_LOCAL_API;
+export const useLiveAPI = process.env.USE_LIVE_API;
+
+let api: string;
+let wsApi: string;
+let web: string;
+let todos: string;
+if (!isDevMode || (isDevMode && useLiveAPI)) {
+  api = LIVE_FERDI_API;
+  wsApi = LIVE_WS_API;
+  web = LIVE_API_FERDI_WEBSITE;
+  todos = PRODUCTION_TODOS_FRONTEND_URL;
+} else if (isDevMode && useLocalAPI) {
+  api = LOCAL_API;
+  wsApi = LOCAL_WS_API;
+  web = LOCAL_API_WEBSITE;
+  todos = LOCAL_TODOS_FRONTEND_URL;
+} else {
+  api = DEV_FRANZ_API;
+  wsApi = DEV_WS_API;
+  web = DEV_API_FRANZ_WEBSITE;
+  todos = PRODUCTION_TODOS_FRONTEND_URL;
+}
+
+export const API = api;
+export const API_VERSION = 'v1';
+export const WS_API = wsApi;
+export const WEBSITE = web;
+export const TODOS_FRONTEND = todos;
+
+export function aboutAppDetails() {
+  return [
+    `Version: ${ferdiVersion}`,
+    `Electron: ${electronVersion}`,
+    `Chrome: ${chromeVersion}`,
+    `Node.js: ${nodeVersion}`,
+    `Platform: ${osName()}`,
+    `Arch: ${osArch}`,
+    `Build date: ${new Date(Number(buildInfo.timestamp))}`,
+    `Git SHA: ${buildInfo.gitHashShort}`,
+    `Git branch: ${buildInfo.gitBranch}`,
+  ].join('\n');
+}
diff --git a/src/environment.ts b/src/environment.ts
index 9478f803c..99002367f 100644
--- a/src/environment.ts
+++ b/src/environment.ts
@@ -1,69 +1,21 @@
 import os from 'os';
-import { join } from 'path';
-
-import { api as electronApi } from 'electron-util';
 
 import { DEFAULT_ACCENT_COLOR } from '@meetfranz/theme';
 
-import osName from 'os-name';
 import {
   LIVE_FERDI_API,
-  DEV_FRANZ_API,
-  LOCAL_API,
-  LOCAL_API_WEBSITE,
-  DEV_API_FRANZ_WEBSITE,
-  LIVE_API_FERDI_WEBSITE,
-  LIVE_WS_API,
-  LOCAL_WS_API,
-  DEV_WS_API,
-  LOCAL_TODOS_FRONTEND_URL,
-  PRODUCTION_TODOS_FRONTEND_URL,
   DEFAULT_TODO_SERVICE,
   SEARCH_ENGINE_DDG,
   iconSizeBias,
 } from './config';
 
-// @ts-expect-error Cannot find module './buildInfo.json' or its corresponding type declarations.
-import * as buildInfo from './buildInfo.json';
-
 export const isMac = process.platform === 'darwin';
 export const isWindows = process.platform === 'win32';
 export const isLinux = process.platform === 'linux';
 
-export const { app } = electronApi;
-export const ferdiVersion = app.getVersion();
 export const electronVersion = process.versions.electron;
 export const chromeVersion = process.versions.chrome;
 export const nodeVersion = process.versions.node;
-export const ferdiLocale = app.getLocale();
-
-// Set app directory before loading user modules
-if (process.env.FERDI_APPDATA_DIR != null) {
-  app.setPath('appData', process.env.FERDI_APPDATA_DIR);
-  app.setPath('userData', app.getPath('appData'));
-} else if (process.env.PORTABLE_EXECUTABLE_DIR != null) {
-  app.setPath('appData', join(process.env.PORTABLE_EXECUTABLE_DIR, `${app.name}AppData`));
-  app.setPath('userData', join(app.getPath('appData'), `${app.name}AppData`));
-} else if (isWindows && process.env.APPDATA != null) {
-  app.setPath('appData', process.env.APPDATA);
-  app.setPath('userData', join(app.getPath('appData'), app.name));
-}
-
-export const isDevMode = process.env.ELECTRON_IS_DEV !== undefined ? Number.parseInt(process.env.ELECTRON_IS_DEV, 10) === 1 : !app.isPackaged;
-if (isDevMode) {
-  app.setPath('userData', join(app.getPath('appData'), `${app.name}Dev`));
-}
-
-export function userDataPath(...segments: string[]) {
-  return join(app.getPath('userData'), ...[segments].flat());
-}
-
-export function userDataRecipesPath(...segments: any[]) {
-  return userDataPath('recipes', ...[segments].flat());
-}
-
-export const useLiveAPI = process.env.USE_LIVE_API;
-const useLocalAPI = process.env.USE_LOCAL_API;
 
 export const osPlatform = os.platform();
 export const osArch = os.arch();
@@ -96,33 +48,6 @@ export const addNewServiceShortcutKey = (isAccelerator = true) =>
 export const settingsShortcutKey = (isAccelerator = true) =>
   `${cmdOrCtrlShortcutKey(isAccelerator)}+${isMac ? ',' : 'P'}`;
 
-let api: string;
-let wsApi: string;
-let web: string;
-let todos: string;
-if (!isDevMode || (isDevMode && useLiveAPI)) {
-  api = LIVE_FERDI_API;
-  wsApi = LIVE_WS_API;
-  web = LIVE_API_FERDI_WEBSITE;
-  todos = PRODUCTION_TODOS_FRONTEND_URL;
-} else if (isDevMode && useLocalAPI) {
-  api = LOCAL_API;
-  wsApi = LOCAL_WS_API;
-  web = LOCAL_API_WEBSITE;
-  todos = LOCAL_TODOS_FRONTEND_URL;
-} else {
-  api = DEV_FRANZ_API;
-  wsApi = DEV_WS_API;
-  web = DEV_API_FRANZ_WEBSITE;
-  todos = PRODUCTION_TODOS_FRONTEND_URL;
-}
-
-export const API = api;
-export const API_VERSION = 'v1';
-export const WS_API = wsApi;
-export const WEBSITE = web;
-export const TODOS_FRONTEND = todos;
-
 export const DEFAULT_APP_SETTINGS = {
   autoLaunchInBackground: false,
   runInBackground: true,
@@ -140,7 +65,7 @@ export const DEFAULT_APP_SETTINGS = {
   showDragArea: false,
   enableSpellchecking: true,
   spellcheckerLanguage: 'en-us',
-  darkMode: isMac && electronApi.nativeTheme.shouldUseDarkColors,
+  darkMode: false,
   splitMode: false,
   locale: '',
   fallbackLocale: 'en-US',
@@ -178,17 +103,3 @@ export const DEFAULT_APP_SETTINGS = {
   alwaysShowWorkspaces: false,
   liftSingleInstanceLock: false,
 };
-
-export function aboutAppDetails() {
-  return [
-    `Version: ${ferdiVersion}`,
-    `Electron: ${electronVersion}`,
-    `Chrome: ${chromeVersion}`,
-    `Node.js: ${nodeVersion}`,
-    `Platform: ${osName()}`,
-    `Arch: ${osArch}`,
-    `Build date: ${new Date(Number(buildInfo.timestamp))}`,
-    `Git SHA: ${buildInfo.gitHashShort}`,
-    `Git branch: ${buildInfo.gitBranch}`,
-  ].join('\n');
-}
diff --git a/src/features/settingsWS/store.js b/src/features/settingsWS/store.js
index e36ccee72..3b9e10825 100755
--- a/src/features/settingsWS/store.js
+++ b/src/features/settingsWS/store.js
@@ -4,7 +4,7 @@ import ms from 'ms';
 
 import { FeatureStore } from '../utils/FeatureStore';
 import { createReactions } from '../../stores/lib/Reaction';
-import { WS_API } from '../../environment';
+import { WS_API } from '../../environment-remote';
 
 const debug = require('debug')('Ferdi:feature:settingsWS:store');
 
diff --git a/src/helpers/recipe-helpers.ts b/src/helpers/recipe-helpers.ts
index 65ef04088..d482dffab 100644
--- a/src/helpers/recipe-helpers.ts
+++ b/src/helpers/recipe-helpers.ts
@@ -1,6 +1,6 @@
 /* eslint-disable global-require */
 import { parse } from 'path';
-import { userDataRecipesPath } from '../environment';
+import { userDataRecipesPath } from '../environment-remote';
 
 export function getRecipeDirectory(id: string = ''): string {
   return userDataRecipesPath(id);
diff --git a/src/helpers/service-helpers.ts b/src/helpers/service-helpers.ts
index 13c921f88..678d5024f 100644
--- a/src/helpers/service-helpers.ts
+++ b/src/helpers/service-helpers.ts
@@ -1,5 +1,5 @@
 import { readdirSync, removeSync } from 'fs-extra';
-import { userDataPath } from '../environment';
+import { userDataPath } from '../environment-remote';
 
 export function getServicePartitionsDirectory(...segments) {
   return userDataPath('Partitions', ...[segments].flat());
diff --git a/src/index.html b/src/index.html
index 929aec3ad..fea2ec387 100644
--- a/src/index.html
+++ b/src/index.html
@@ -26,7 +26,7 @@
         );
 
       require('./sentry');
-      const { isDevMode } = require('./environment');
+      const { isDevMode } = require('./environment-remote');
       if (isDevMode) {
         const debugging = require('debug');
         debugging.enable(process.env.DEBUG);
diff --git a/src/index.js b/src/index.js
index 97a4f0379..6035d08a4 100644
--- a/src/index.js
+++ b/src/index.js
@@ -14,14 +14,16 @@ import { DEFAULT_WINDOW_OPTIONS } from './config';
 
 import {
   DEFAULT_APP_SETTINGS,
-  isDevMode,
   isMac,
   isWindows,
   isLinux,
+} from './environment';
+import {
+  isDevMode,
   aboutAppDetails,
   userDataRecipesPath,
   userDataPath,
-} from './environment';
+} from './environment-remote';
 import { ifUndefinedBoolean } from './jsUtils';
 
 import { mainIpcHandler as basicAuthHandler } from './features/basicAuth';
diff --git a/src/internal-server/app/Controllers/Http/RecipeController.js b/src/internal-server/app/Controllers/Http/RecipeController.js
index 2c7baf2a4..d44839db1 100644
--- a/src/internal-server/app/Controllers/Http/RecipeController.js
+++ b/src/internal-server/app/Controllers/Http/RecipeController.js
@@ -6,7 +6,7 @@ const Env = use('Env');
 const fetch = require('node-fetch');
 const debug = require('debug')('Ferdi:internalServer:RecipeController');
 const { LIVE_FERDI_API } = require('../../../../config');
-const { API_VERSION } = require('../../../../environment');
+const { API_VERSION } = require('../../../../environment-remote');
 
 const RECIPES_URL = `${LIVE_FERDI_API}/${API_VERSION}/recipes`;
 
diff --git a/src/internal-server/app/Controllers/Http/UserController.js b/src/internal-server/app/Controllers/Http/UserController.js
index 747606da7..9bbd2ff6e 100644
--- a/src/internal-server/app/Controllers/Http/UserController.js
+++ b/src/internal-server/app/Controllers/Http/UserController.js
@@ -7,10 +7,8 @@ const btoa = require('btoa');
 const fetch = require('node-fetch');
 const { v4: uuid } = require('uuid');
 const crypto = require('crypto');
-const {
-  DEFAULT_APP_SETTINGS,
-  API_VERSION,
-} = require('../../../../environment');
+const { DEFAULT_APP_SETTINGS } = require('../../../../environment');
+const { API_VERSION } = require('../../../../environment-remote');
 const { default: userAgent } = require('../../../../helpers/userAgent-helpers');
 
 const apiRequest = (url, route, method, auth) =>
diff --git a/src/internal-server/start/migrate.js b/src/internal-server/start/migrate.js
index 0f25240cc..97cefcc54 100644
--- a/src/internal-server/start/migrate.js
+++ b/src/internal-server/start/migrate.js
@@ -1,4 +1,4 @@
-const { ferdiVersion } = require('../../environment');
+const { ferdiVersion } = require('../../environment-remote');
 
 /**
  * Migrate server database to work with current Ferdi version
diff --git a/src/internal-server/start/routes.js b/src/internal-server/start/routes.js
index e75380ccd..db74479c9 100644
--- a/src/internal-server/start/routes.js
+++ b/src/internal-server/start/routes.js
@@ -8,7 +8,7 @@
 /** @type {typeof import('@adonisjs/framework/src/Route/Manager')} */
 const Route = use('Route');
 
-const { API_VERSION } = require('../../environment');
+const { API_VERSION } = require('../../environment-remote');
 // Run latest database migration
 const migrate = require('./migrate');
 
diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index 349748506..56d14ebee 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -14,13 +14,13 @@ import {
   settingsShortcutKey,
   isLinux,
   isMac,
-  aboutAppDetails,
   lockFerdiShortcutKey,
   todosToggleShortcutKey,
   workspaceToggleShortcutKey,
   addNewServiceShortcutKey,
   muteFerdiShortcutKey,
 } from '../environment';
+import { aboutAppDetails } from '../environment-remote';
 import { todosStore } from '../features/todos';
 import { todoActions } from '../features/todos/actions';
 import { workspaceActions } from '../features/workspaces/actions';
diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index cb17447c0..83e6a899b 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -20,12 +20,14 @@ import { CHECK_INTERVAL } from '../config';
 import {
   DEFAULT_APP_SETTINGS,
   isMac,
-  ferdiVersion,
   electronVersion,
   osRelease,
+} from '../environment';
+import {
+  ferdiVersion,
   userDataPath,
   ferdiLocale,
-} from '../environment';
+} from '../environment-remote';
 import locales from '../i18n/translations';
 import { getLocale } from '../helpers/i18n-helpers';
 
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index 2a4b0511c..ce6675866 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -17,7 +17,7 @@ import {
 import { workspaceStore } from '../features/workspaces';
 import { KEEP_WS_LOADED_USID } from '../config';
 import { SPELLCHECKER_LOCALES } from '../i18n/languages';
-import { ferdiVersion } from '../environment';
+import { ferdiVersion } from '../environment-remote';
 
 const debug = require('debug')('Ferdi:ServiceStore');
 
diff --git a/src/stores/UserStore.js b/src/stores/UserStore.js
index 77dd28d7c..9f222d2d3 100644
--- a/src/stores/UserStore.js
+++ b/src/stores/UserStore.js
@@ -5,7 +5,7 @@ import localStorage from 'mobx-localstorage';
 import { ipcRenderer } from 'electron';
 
 import { TODOS_PARTITION_ID } from '../config';
-import { isDevMode } from '../environment';
+import { isDevMode } from '../environment-remote';
 import Store from './lib/Store';
 import Request from './lib/Request';
 import CachedRequest from './lib/CachedRequest';
-- 
cgit v1.2.3-70-g09d2


From d4afc1eec9706d0027ad4b44421f8868688d1969 Mon Sep 17 00:00:00 2001
From: Vijay A <vraravam@users.noreply.github.com>
Date: Fri, 1 Oct 2021 22:13:42 +0530
Subject: refactor: move 'DEFAULT_APP_SETTINGS' from 'environment' to 'config'
 since it doesn't depend on the running process any more.

---
 .../settings/settings/EditSettingsForm.js          |  3 +-
 src/config.ts                                      | 58 +++++++++++++++++++
 src/containers/settings/EditSettingsScreen.js      |  3 +-
 src/environment.ts                                 | 67 +---------------------
 src/features/appearance/index.ts                   |  3 +-
 src/index.js                                       |  3 +-
 .../app/Controllers/Http/UserController.js         |  2 +-
 src/stores/AppStore.js                             |  3 +-
 src/stores/SettingsStore.js                        |  3 +-
 src/webview/recipe.js                              |  2 +-
 10 files changed, 69 insertions(+), 78 deletions(-)

(limited to 'src/containers/settings')

diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index 819d0a9e6..123ab4c2d 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -12,9 +12,8 @@ import ToggleRaw from '../../ui/ToggleRaw';
 import Select from '../../ui/Select';
 import Input from '../../ui/Input';
 
-import { FRANZ_TRANSLATION, GITHUB_FRANZ_URL } from '../../../config';
+import { DEFAULT_APP_SETTINGS, FRANZ_TRANSLATION, GITHUB_FRANZ_URL } from '../../../config';
 import {
-  DEFAULT_APP_SETTINGS,
   isMac,
   isWindows,
   lockFerdiShortcutKey,
diff --git a/src/config.ts b/src/config.ts
index 667b0a962..fe9145021 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -2,6 +2,8 @@
 
 import ms from 'ms';
 
+import { DEFAULT_ACCENT_COLOR } from '@meetfranz/theme';
+
 export const CHECK_INTERVAL = ms('1h'); // How often should we perform checks
 
 export const LOCAL_HOSTNAME = 'localhost';
@@ -176,3 +178,59 @@ export const TODOS_PARTITION_ID = 'persist:todos';
 export const CUSTOM_WEBSITE_RECIPE_ID = 'franz-custom-website';
 
 export const DEFAULT_SERVICE_ORDER = 99; // something high enough that it gets added to the end of the already-added services on the left sidebar
+
+export const DEFAULT_APP_SETTINGS = {
+  autoLaunchInBackground: false,
+  runInBackground: true,
+  reloadAfterResume: true,
+  enableSystemTray: true,
+  startMinimized: false,
+  confirmOnQuit: false,
+  minimizeToSystemTray: false,
+  closeToSystemTray: false,
+  privateNotifications: false,
+  clipboardNotifications: true,
+  notifyTaskBarOnMessage: false,
+  showDisabledServices: true,
+  showMessageBadgeWhenMuted: true,
+  showDragArea: false,
+  enableSpellchecking: true,
+  spellcheckerLanguage: 'en-us',
+  darkMode: false,
+  splitMode: false,
+  locale: '',
+  fallbackLocale: 'en-US',
+  beta: false,
+  isAppMuted: false,
+  enableGPUAcceleration: true,
+
+  // Ferdi specific options
+  server: LIVE_FERDI_API,
+  predefinedTodoServer: DEFAULT_TODO_SERVICE,
+  autohideMenuBar: false,
+  lockingFeatureEnabled: false,
+  locked: false,
+  lockedPassword: '',
+  useTouchIdToUnlock: true,
+  scheduledDNDEnabled: false,
+  scheduledDNDStart: '17:00',
+  scheduledDNDEnd: '09:00',
+  hibernateOnStartup: true,
+  hibernationStrategy: '300', // seconds
+  wakeUpStrategy: '300', // seconds
+  inactivityLock: 0,
+  automaticUpdates: true,
+  universalDarkMode: true,
+  userAgentPref: '',
+  adaptableDarkMode: true,
+  accentColor: DEFAULT_ACCENT_COLOR,
+  serviceRibbonWidth: 68,
+  iconSize: iconSizeBias,
+  sentry: false,
+  nightly: false,
+  navigationBarBehaviour: 'custom',
+  searchEngine: SEARCH_ENGINE_DDG,
+  useVerticalStyle: false,
+  alwaysShowWorkspaces: false,
+  liftSingleInstanceLock: false,
+};
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js
index 36b9e949b..1b05644f9 100644
--- a/src/containers/settings/EditSettingsScreen.js
+++ b/src/containers/settings/EditSettingsScreen.js
@@ -10,6 +10,7 @@ import TodosStore from '../../features/todos/store';
 import Form from '../../lib/Form';
 import { APP_LOCALES, SPELLCHECKER_LOCALES } from '../../i18n/languages';
 import {
+  DEFAULT_APP_SETTINGS,
   HIBERNATION_STRATEGIES,
   SIDEBAR_WIDTH,
   ICON_SIZES,
@@ -20,7 +21,7 @@ import {
   DEFAULT_IS_FEATURE_ENABLED_BY_USER,
   WAKE_UP_STRATEGIES,
 } from '../../config';
-import { DEFAULT_APP_SETTINGS, isMac } from '../../environment';
+import { isMac } from '../../environment';
 
 import { getSelectOptions } from '../../helpers/i18n-helpers';
 import { hash } from '../../helpers/password-helpers';
diff --git a/src/environment.ts b/src/environment.ts
index 99002367f..ce2a77e7a 100644
--- a/src/environment.ts
+++ b/src/environment.ts
@@ -1,13 +1,6 @@
-import os from 'os';
-
-import { DEFAULT_ACCENT_COLOR } from '@meetfranz/theme';
+// Note: This file has now become devoid of all references to values deduced from the remote process - all those now live in the `environment-remote.js` file
 
-import {
-  LIVE_FERDI_API,
-  DEFAULT_TODO_SERVICE,
-  SEARCH_ENGINE_DDG,
-  iconSizeBias,
-} from './config';
+import os from 'os';
 
 export const isMac = process.platform === 'darwin';
 export const isWindows = process.platform === 'win32';
@@ -47,59 +40,3 @@ export const addNewServiceShortcutKey = (isAccelerator = true) =>
   `${cmdOrCtrlShortcutKey(isAccelerator)}+N`;
 export const settingsShortcutKey = (isAccelerator = true) =>
   `${cmdOrCtrlShortcutKey(isAccelerator)}+${isMac ? ',' : 'P'}`;
-
-export const DEFAULT_APP_SETTINGS = {
-  autoLaunchInBackground: false,
-  runInBackground: true,
-  reloadAfterResume: true,
-  enableSystemTray: true,
-  startMinimized: false,
-  confirmOnQuit: false,
-  minimizeToSystemTray: false,
-  closeToSystemTray: false,
-  privateNotifications: false,
-  clipboardNotifications: true,
-  notifyTaskBarOnMessage: false,
-  showDisabledServices: true,
-  showMessageBadgeWhenMuted: true,
-  showDragArea: false,
-  enableSpellchecking: true,
-  spellcheckerLanguage: 'en-us',
-  darkMode: false,
-  splitMode: false,
-  locale: '',
-  fallbackLocale: 'en-US',
-  beta: false,
-  isAppMuted: false,
-  enableGPUAcceleration: true,
-
-  // Ferdi specific options
-  server: LIVE_FERDI_API,
-  predefinedTodoServer: DEFAULT_TODO_SERVICE,
-  autohideMenuBar: false,
-  lockingFeatureEnabled: false,
-  locked: false,
-  lockedPassword: '',
-  useTouchIdToUnlock: true,
-  scheduledDNDEnabled: false,
-  scheduledDNDStart: '17:00',
-  scheduledDNDEnd: '09:00',
-  hibernateOnStartup: true,
-  hibernationStrategy: '300', // seconds
-  wakeUpStrategy: '300', // seconds
-  inactivityLock: 0,
-  automaticUpdates: true,
-  universalDarkMode: true,
-  userAgentPref: '',
-  adaptableDarkMode: true,
-  accentColor: DEFAULT_ACCENT_COLOR,
-  serviceRibbonWidth: 68,
-  iconSize: iconSizeBias,
-  sentry: false,
-  nightly: false,
-  navigationBarBehaviour: 'custom',
-  searchEngine: SEARCH_ENGINE_DDG,
-  useVerticalStyle: false,
-  alwaysShowWorkspaces: false,
-  liftSingleInstanceLock: false,
-};
diff --git a/src/features/appearance/index.ts b/src/features/appearance/index.ts
index cb2f937eb..bb93507dc 100644
--- a/src/features/appearance/index.ts
+++ b/src/features/appearance/index.ts
@@ -1,7 +1,6 @@
 import color from 'color';
 import { reaction } from 'mobx';
-import { iconSizeBias } from '../../config';
-import { DEFAULT_APP_SETTINGS } from '../../environment';
+import { DEFAULT_APP_SETTINGS, iconSizeBias } from '../../config';
 
 const STYLE_ELEMENT_ID = 'custom-appearance-style';
 
diff --git a/src/index.js b/src/index.js
index 6035d08a4..ed37134c9 100644
--- a/src/index.js
+++ b/src/index.js
@@ -10,10 +10,9 @@ import ms from 'ms';
 
 require('@electron/remote/main').initialize();
 
-import { DEFAULT_WINDOW_OPTIONS } from './config';
+import { DEFAULT_APP_SETTINGS, DEFAULT_WINDOW_OPTIONS } from './config';
 
 import {
-  DEFAULT_APP_SETTINGS,
   isMac,
   isWindows,
   isLinux,
diff --git a/src/internal-server/app/Controllers/Http/UserController.js b/src/internal-server/app/Controllers/Http/UserController.js
index 9bbd2ff6e..25b5277bd 100644
--- a/src/internal-server/app/Controllers/Http/UserController.js
+++ b/src/internal-server/app/Controllers/Http/UserController.js
@@ -7,7 +7,7 @@ const btoa = require('btoa');
 const fetch = require('node-fetch');
 const { v4: uuid } = require('uuid');
 const crypto = require('crypto');
-const { DEFAULT_APP_SETTINGS } = require('../../../../environment');
+const { DEFAULT_APP_SETTINGS } = require('../../../../config');
 const { API_VERSION } = require('../../../../environment-remote');
 const { default: userAgent } = require('../../../../helpers/userAgent-helpers');
 
diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index 83e6a899b..3d9d2b551 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -16,9 +16,8 @@ import { readJsonSync } from 'fs-extra';
 
 import Store from './lib/Store';
 import Request from './lib/Request';
-import { CHECK_INTERVAL } from '../config';
+import { CHECK_INTERVAL, DEFAULT_APP_SETTINGS } from '../config';
 import {
-  DEFAULT_APP_SETTINGS,
   isMac,
   electronVersion,
   osRelease,
diff --git a/src/stores/SettingsStore.js b/src/stores/SettingsStore.js
index 4b203101a..ec80fee7c 100644
--- a/src/stores/SettingsStore.js
+++ b/src/stores/SettingsStore.js
@@ -2,8 +2,7 @@ import { ipcRenderer } from 'electron';
 import { getCurrentWindow } from '@electron/remote';
 import { action, computed, observable, reaction } from 'mobx';
 import localStorage from 'mobx-localstorage';
-import { FILE_SYSTEM_SETTINGS_TYPES, LOCAL_SERVER } from '../config';
-import { DEFAULT_APP_SETTINGS } from '../environment';
+import { DEFAULT_APP_SETTINGS, FILE_SYSTEM_SETTINGS_TYPES, LOCAL_SERVER } from '../config';
 import { hash } from '../helpers/password-helpers';
 import Request from './lib/Request';
 import Store from './lib/Store';
diff --git a/src/webview/recipe.js b/src/webview/recipe.js
index 892b08e54..5cab28c09 100644
--- a/src/webview/recipe.js
+++ b/src/webview/recipe.js
@@ -45,7 +45,7 @@ import {
   getSpellcheckerLocaleByFuzzyIdentifier,
 } from './spellchecker';
 
-import { DEFAULT_APP_SETTINGS } from '../environment';
+import { DEFAULT_APP_SETTINGS } from '../config';
 
 const debug = require('debug')('Ferdi:Plugin');
 
-- 
cgit v1.2.3-70-g09d2