From cba99de2ca02a02f02eded936d7c43c3176b4806 Mon Sep 17 00:00:00 2001
From: Amine Mouafik <amine@mouafik.fr>
Date: Thu, 19 Sep 2019 19:58:11 +0700
Subject: Fix GitHub links to reflect Ferdi org

---
 src/components/auth/AuthLayout.js                    | 2 +-
 src/components/settings/settings/EditSettingsForm.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/components')

diff --git a/src/components/auth/AuthLayout.js b/src/components/auth/AuthLayout.js
index 641b754ed..0c5198583 100644
--- a/src/components/auth/AuthLayout.js
+++ b/src/components/auth/AuthLayout.js
@@ -87,7 +87,7 @@ export default @observer class AuthLayout extends Component {
             })}
           </div>
           {/* </div> */}
-          <Link to="https://github.com/kytwb/ferdi" className="auth__adlk" target="_blank">
+          <Link to="https://github.com/getferdi/ferdi" className="auth__adlk" target="_blank">
             <img src="./assets/images/adlk.svg" alt="" />
           </Link>
         </div>
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index ef6ab2707..012a10aa6 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -217,7 +217,7 @@ export default @observer class EditSettingsForm extends Component {
                   {' '}
                   or
                   {' '}
-                  <a href="https://github.com/vantezzen/ferdi-server" target="_blank">using a self-hosted ferdi-server</a>
+                  <a href="https://github.com/getferdi/server" target="_blank">using a self-hosted ferdi-server</a>
                   {' '}
                   (if you have the knowledge and resources to do so).
                   <br />
-- 
cgit v1.2.3-70-g09d2


From 1d41b849cb7840a1611d34f20bfe636fc8b903dc Mon Sep 17 00:00:00 2001
From: vantezzen <hello@vantezzen.io>
Date: Fri, 20 Sep 2019 12:34:56 +0200
Subject: Implement Quick Switch feature

---
 src/components/layout/AppLayout.js                 |   2 +
 src/components/ui/Modal/index.js                   |   3 +
 src/features/quickSwitch/Component.js              | 291 +++++++++++++++++++++
 src/features/quickSwitch/index.js                  |  24 ++
 src/i18n/locales/defaultMessages.json              | 268 +++++++++++--------
 src/i18n/locales/en-US.json                        |   5 +-
 src/i18n/locales/ua.json                           |   2 +-
 src/i18n/locales/whitelist_en-US.json              |   3 +-
 .../messages/src/components/layout/AppLayout.json  |  16 +-
 .../src/features/quickSwitch/Component.json        |  28 ++
 src/i18n/messages/src/lib/Menu.json                | 221 ++++++++--------
 src/lib/Menu.js                                    |  14 +
 src/stores/FeaturesStore.js                        |   2 +
 13 files changed, 651 insertions(+), 228 deletions(-)
 create mode 100644 src/features/quickSwitch/Component.js
 create mode 100644 src/features/quickSwitch/index.js
 create mode 100644 src/i18n/messages/src/features/quickSwitch/Component.json

(limited to 'src/components')

diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js
index e82275b9f..2b0719f92 100644
--- a/src/components/layout/AppLayout.js
+++ b/src/components/layout/AppLayout.js
@@ -8,6 +8,7 @@ import injectSheet from 'react-jss';
 import InfoBar from '../ui/InfoBar';
 import { Component as BasicAuth } from '../../features/basicAuth';
 import { Component as ShareFranz } from '../../features/shareFranz';
+import { Component as QuickSwitch } from '../../features/quickSwitch';
 import ErrorBoundary from '../util/ErrorBoundary';
 
 // import globalMessages from '../../i18n/globalMessages';
@@ -185,6 +186,7 @@ class AppLayout extends Component {
               )}
               <BasicAuth />
               <ShareFranz />
+              <QuickSwitch />
               {services}
               {children}
             </div>
diff --git a/src/components/ui/Modal/index.js b/src/components/ui/Modal/index.js
index 63d858c47..0af521452 100644
--- a/src/components/ui/Modal/index.js
+++ b/src/components/ui/Modal/index.js
@@ -41,6 +41,8 @@ export default @injectCSS(styles) class Modal extends Component {
       showClose,
     } = this.props;
 
+    const appRoot = document.getElementById('root');
+
     return (
       <ReactModal
         isOpen={isOpen}
@@ -53,6 +55,7 @@ export default @injectCSS(styles) class Modal extends Component {
         portal={portal}
         onRequestClose={close}
         shouldCloseOnOverlayClick={shouldCloseOnOverlayClick}
+        appElement={appRoot}
       >
         {showClose && close && (
           <button
diff --git a/src/features/quickSwitch/Component.js b/src/features/quickSwitch/Component.js
new file mode 100644
index 000000000..3217a3d93
--- /dev/null
+++ b/src/features/quickSwitch/Component.js
@@ -0,0 +1,291 @@
+import React, { Component, createRef } from 'react';
+import PropTypes from 'prop-types';
+import { observer, inject } from 'mobx-react';
+import { reaction } from 'mobx';
+import injectSheet from 'react-jss';
+import { defineMessages, intlShape } from 'react-intl';
+import { Input } from '@meetfranz/forms';
+
+import Modal from '../../components/ui/Modal';
+import { state as ModalState } from '.';
+import ServicesStore from '../../stores/ServicesStore';
+
+const messages = defineMessages({
+  search: {
+    id: 'feature.quickSwitch.search',
+    defaultMessage: '!!!Search...',
+  },
+  info: {
+    id: 'feature.quickSwitch.info',
+    defaultMessage: '!!!Select a service with TAB, ↑ and ↓. Open a service with ENTER.',
+  },
+});
+
+const styles = theme => ({
+  modal: {
+    width: '80%',
+    maxWidth: 600,
+    background: theme.styleTypes.primary.contrast,
+    color: theme.styleTypes.primary.accent,
+    paddingTop: 30,
+  },
+  services: {
+    width: '100%',
+    marginTop: 30,
+  },
+  service: {
+    background: theme.styleTypes.primary.contrast,
+    color: theme.colorText,
+    borderColor: theme.styleTypes.primary.accent,
+    borderStyle: 'solid',
+    borderWidth: 1,
+    borderRadius: 6,
+    padding: '3px 25px',
+    marginBottom: 10,
+    display: 'flex',
+    alignItems: 'center',
+    '&:hover': {
+      background: theme.styleTypes.primary.accent,
+      color: theme.styleTypes.primary.contrast,
+      cursor: 'pointer',
+    },
+  },
+  activeService: {
+    background: theme.styleTypes.primary.accent,
+    color: theme.styleTypes.primary.contrast,
+    cursor: 'pointer',
+  },
+  serviceIcon: {
+    width: 50,
+    height: 50,
+    paddingRight: 20,
+    objectFit: 'contain',
+  },
+});
+
+export default @injectSheet(styles) @inject('stores', 'actions') @observer class QuickSwitchModal extends Component {
+  static propTypes = {
+    classes: PropTypes.object.isRequired,
+  };
+
+  static contextTypes = {
+    intl: intlShape,
+  };
+
+  state = {
+    selected: 0,
+    search: '',
+    wasPrevVisible: false,
+  }
+
+  ARROW_DOWN = 40;
+
+  ARROW_UP = 38;
+
+  ENTER = 13;
+
+  TAB = 9;
+
+  inputRef = createRef();
+
+  constructor(props) {
+    super(props);
+
+    this._handleKeyDown = this._handleKeyDown.bind(this);
+    this._handleSearchUpdate = this._handleSearchUpdate.bind(this);
+    this._handleVisibilityChange = this._handleVisibilityChange.bind(this);
+    this.openService = this.openService.bind(this);
+
+    reaction(
+      () => ModalState.isModalVisible,
+      this._handleVisibilityChange,
+    );
+  }
+
+  // Add global keydown listener when component mounts
+  componentDidMount() {
+    document.addEventListener('keydown', this._handleKeyDown);
+  }
+
+  // Remove global keydown listener when component unmounts
+  componentWillUnmount() {
+    document.removeEventListener('keydown', this._handleKeyDown);
+  }
+
+  // Get currently shown services
+  services() {
+    let services = this.props.stores.services.allDisplayed;
+    if (this.state.search) {
+      // Apply simple search algorythm
+      services = services.filter(service => service.name.toLowerCase().includes(this.state.search.toLowerCase()));
+    }
+
+    return services;
+  }
+
+  openService(index) {
+    // Open service
+    const service = this.services()[index];
+    this.props.actions.service.setActive({ serviceId: service.id });
+
+    // Reset and close modal
+    this.setState({
+      search: '',
+    });
+    this.close();
+  }
+
+  // Change the selected service
+  // factor should be -1 or 1
+  changeSelected(factor) {
+    this.setState((state) => {
+      let newSelected = state.selected + factor;
+      const services = this.services().length;
+
+      // Roll around when on edge of list
+      if (state.selected < 1 && factor === -1) {
+        newSelected = services - 1;
+      } else if ((state.selected >= (services - 1)) && factor === 1) {
+        newSelected = 0;
+      }
+
+      return {
+        selected: newSelected,
+      };
+    });
+  }
+
+  // Handle global key presses to change the selection
+  _handleKeyDown(event) {
+    if (ModalState.isModalVisible) {
+      switch (event.keyCode) {
+        case this.ARROW_DOWN:
+          this.changeSelected(1);
+          break;
+        case this.TAB:
+          this.changeSelected(1);
+          break;
+        case this.ARROW_UP:
+          this.changeSelected(-1);
+          break;
+        case this.ENTER:
+          this.openService(this.state.selected);
+          break;
+        default:
+          break;
+      }
+    }
+  }
+
+  // Handle update of the search query
+  _handleSearchUpdate(evt) {
+    this.setState({
+      search: evt.target.value,
+    });
+  }
+
+  _handleVisibilityChange() {
+    const { isModalVisible } = ModalState;
+
+    if (isModalVisible && !this.state.wasPrevVisible) {
+      // Set focus back on current window if its in a service
+      // TODO: Find a way to gain back focus
+
+      // The input "focus" attribute will only work on first modal open
+      // Manually add focus to the input element
+      // Wrapped inside timeout to let the modal render first
+      setTimeout(() => {
+        if (this.inputRef.current) {
+          this.inputRef.current.getElementsByTagName('input')[0].focus();
+        }
+      }, 10);
+
+      this.setState({
+        wasPrevVisible: true,
+      });
+    } else if (!isModalVisible && this.state.wasPrevVisible) {
+      // Manually blur focus from the input element to prevent
+      // search query change when modal not visible
+      setTimeout(() => {
+        if (this.inputRef.current) {
+          this.inputRef.current.getElementsByTagName('input')[0].blur();
+        }
+      }, 100);
+
+      this.setState({
+        wasPrevVisible: false,
+      });
+    }
+  }
+
+  // Close this modal
+  close() {
+    ModalState.isModalVisible = false;
+  }
+
+  render() {
+    const { isModalVisible } = ModalState;
+
+    const {
+      openService,
+    } = this;
+
+    const {
+      classes,
+    } = this.props;
+
+    const services = this.services();
+
+    const { intl } = this.context;
+
+    return (
+      <Modal
+        isOpen={isModalVisible}
+        className={classes.modal}
+        shouldCloseOnOverlayClick
+        close={this.close.bind(this)}
+      >
+        <div ref={this.inputRef}>
+          <Input
+            placeholder={intl.formatMessage(messages.search)}
+            focus
+            value={this.state.search}
+            onChange={this._handleSearchUpdate}
+          />
+        </div>
+
+        <div className={classes.services}>
+          { services.map((service, index) => (
+            <div
+              className={`${classes.service} ${this.state.selected === index ? classes.activeService : ''}`}
+              onClick={() => openService(index)}
+              key={service.id}
+            >
+              <img
+                src={service.icon}
+                className={classes.serviceIcon}
+                alt={service.recipe.name}
+              />
+              <div>
+                { service.name }
+              </div>
+            </div>
+          ))}
+        </div>
+
+        <p>{intl.formatMessage(messages.info)}</p>
+      </Modal>
+    );
+  }
+}
+
+QuickSwitchModal.wrappedComponent.propTypes = {
+  stores: PropTypes.shape({
+    services: PropTypes.instanceOf(ServicesStore).isRequired,
+  }).isRequired,
+  actions: PropTypes.shape({
+    service: PropTypes.shape({
+      setActive: PropTypes.func.isRequired,
+    }).isRequired,
+  }).isRequired,
+};
diff --git a/src/features/quickSwitch/index.js b/src/features/quickSwitch/index.js
new file mode 100644
index 000000000..c57fad366
--- /dev/null
+++ b/src/features/quickSwitch/index.js
@@ -0,0 +1,24 @@
+import { observable } from 'mobx';
+
+export { default as Component } from './Component';
+
+const debug = require('debug')('Ferdi:feature:quickSwitch');
+
+const defaultState = {
+  isModalVisible: false,
+};
+
+export const state = observable(defaultState);
+
+export default function initialize() {
+  debug('Initialize quickSwitch feature');
+
+  function showModal() {
+    state.isModalVisible = true;
+  }
+
+  window.ferdi.features.quickSwitch = {
+    state,
+    showModal,
+  };
+}
diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json
index 45d691e22..7f02af685 100644
--- a/src/i18n/locales/defaultMessages.json
+++ b/src/i18n/locales/defaultMessages.json
@@ -817,52 +817,52 @@
         "defaultMessage": "!!!Your services have been updated.",
         "end": {
           "column": 3,
-          "line": 30
+          "line": 31
         },
         "file": "src/components/layout/AppLayout.js",
         "id": "infobar.servicesUpdated",
         "start": {
           "column": 19,
-          "line": 27
+          "line": 28
         }
       },
       {
         "defaultMessage": "!!!Reload services",
         "end": {
           "column": 3,
-          "line": 34
+          "line": 35
         },
         "file": "src/components/layout/AppLayout.js",
         "id": "infobar.buttonReloadServices",
         "start": {
           "column": 24,
-          "line": 31
+          "line": 32
         }
       },
       {
         "defaultMessage": "!!!Could not load services and user information",
         "end": {
           "column": 3,
-          "line": 38
+          "line": 39
         },
         "file": "src/components/layout/AppLayout.js",
         "id": "infobar.requiredRequestsFailed",
         "start": {
           "column": 26,
-          "line": 35
+          "line": 36
         }
       },
       {
         "defaultMessage": "!!!There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.",
         "end": {
           "column": 3,
-          "line": 42
+          "line": 43
         },
         "file": "src/components/layout/AppLayout.js",
         "id": "infobar.authRequestFailed",
         "start": {
           "column": 21,
-          "line": 39
+          "line": 40
         }
       }
     ],
@@ -4096,6 +4096,37 @@
     ],
     "path": "src/features/delayApp/Component.json"
   },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Search...",
+        "end": {
+          "column": 3,
+          "line": 17
+        },
+        "file": "src/features/quickSwitch/Component.js",
+        "id": "feature.quickSwitch.search",
+        "start": {
+          "column": 10,
+          "line": 14
+        }
+      },
+      {
+        "defaultMessage": "!!!Select a service with TAB, ↑ and ↓. Open a service with ENTER.",
+        "end": {
+          "column": 3,
+          "line": 21
+        },
+        "file": "src/features/quickSwitch/Component.js",
+        "id": "feature.quickSwitch.info",
+        "start": {
+          "column": 8,
+          "line": 18
+        }
+      }
+    ],
+    "path": "src/features/quickSwitch/Component.json"
+  },
   {
     "descriptors": [
       {
@@ -5196,679 +5227,692 @@
         }
       },
       {
-        "defaultMessage": "!!!Back",
+        "defaultMessage": "!!!Open Quick Switch",
         "end": {
           "column": 3,
           "line": 75
         },
         "file": "src/lib/Menu.js",
+        "id": "menu.view.openQuickSwitch",
+        "start": {
+          "column": 19,
+          "line": 72
+        }
+      },
+      {
+        "defaultMessage": "!!!Back",
+        "end": {
+          "column": 3,
+          "line": 79
+        },
+        "file": "src/lib/Menu.js",
         "id": "menu.view.back",
         "start": {
           "column": 8,
-          "line": 72
+          "line": 76
         }
       },
       {
         "defaultMessage": "!!!Forward",
         "end": {
           "column": 3,
-          "line": 79
+          "line": 83
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.forward",
         "start": {
           "column": 11,
-          "line": 76
+          "line": 80
         }
       },
       {
         "defaultMessage": "!!!Actual Size",
         "end": {
           "column": 3,
-          "line": 83
+          "line": 87
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.resetZoom",
         "start": {
           "column": 13,
-          "line": 80
+          "line": 84
         }
       },
       {
         "defaultMessage": "!!!Zoom In",
         "end": {
           "column": 3,
-          "line": 87
+          "line": 91
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.zoomIn",
         "start": {
           "column": 10,
-          "line": 84
+          "line": 88
         }
       },
       {
         "defaultMessage": "!!!Zoom Out",
         "end": {
           "column": 3,
-          "line": 91
+          "line": 95
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.zoomOut",
         "start": {
           "column": 11,
-          "line": 88
+          "line": 92
         }
       },
       {
         "defaultMessage": "!!!Enter Full Screen",
         "end": {
           "column": 3,
-          "line": 95
+          "line": 99
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.enterFullScreen",
         "start": {
           "column": 19,
-          "line": 92
+          "line": 96
         }
       },
       {
         "defaultMessage": "!!!Exit Full Screen",
         "end": {
           "column": 3,
-          "line": 99
+          "line": 103
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.exitFullScreen",
         "start": {
           "column": 18,
-          "line": 96
+          "line": 100
         }
       },
       {
         "defaultMessage": "!!!Toggle Full Screen",
         "end": {
           "column": 3,
-          "line": 103
+          "line": 107
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.toggleFullScreen",
         "start": {
           "column": 20,
-          "line": 100
+          "line": 104
         }
       },
       {
         "defaultMessage": "!!!Toggle Developer Tools",
         "end": {
           "column": 3,
-          "line": 107
+          "line": 111
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.toggleDevTools",
         "start": {
           "column": 18,
-          "line": 104
+          "line": 108
         }
       },
       {
         "defaultMessage": "!!!Toggle Todos Developer Tools",
         "end": {
           "column": 3,
-          "line": 111
+          "line": 115
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.toggleTodosDevTools",
         "start": {
           "column": 23,
-          "line": 108
+          "line": 112
         }
       },
       {
         "defaultMessage": "!!!Toggle Service Developer Tools",
         "end": {
           "column": 3,
-          "line": 115
+          "line": 119
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.toggleServiceDevTools",
         "start": {
           "column": 25,
-          "line": 112
+          "line": 116
         }
       },
       {
         "defaultMessage": "!!!Reload Service",
         "end": {
           "column": 3,
-          "line": 119
+          "line": 123
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.reloadService",
         "start": {
           "column": 17,
-          "line": 116
+          "line": 120
         }
       },
       {
         "defaultMessage": "!!!Reload Ferdi",
         "end": {
           "column": 3,
-          "line": 123
+          "line": 127
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.reloadFranz",
         "start": {
           "column": 15,
-          "line": 120
+          "line": 124
         }
       },
       {
         "defaultMessage": "!!!Lock Ferdi",
         "end": {
           "column": 3,
-          "line": 127
+          "line": 131
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.lockFerdi",
         "start": {
           "column": 13,
-          "line": 124
+          "line": 128
         }
       },
       {
         "defaultMessage": "!!!Minimize",
         "end": {
           "column": 3,
-          "line": 131
+          "line": 135
         },
         "file": "src/lib/Menu.js",
         "id": "menu.window.minimize",
         "start": {
           "column": 12,
-          "line": 128
+          "line": 132
         }
       },
       {
         "defaultMessage": "!!!Close",
         "end": {
           "column": 3,
-          "line": 135
+          "line": 139
         },
         "file": "src/lib/Menu.js",
         "id": "menu.window.close",
         "start": {
           "column": 9,
-          "line": 132
+          "line": 136
         }
       },
       {
         "defaultMessage": "!!!Learn More",
         "end": {
           "column": 3,
-          "line": 139
+          "line": 143
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.learnMore",
         "start": {
           "column": 13,
-          "line": 136
+          "line": 140
         }
       },
       {
         "defaultMessage": "!!!Changelog",
         "end": {
           "column": 3,
-          "line": 143
+          "line": 147
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.changelog",
         "start": {
           "column": 13,
-          "line": 140
+          "line": 144
         }
       },
       {
         "defaultMessage": "!!!Support",
         "end": {
           "column": 3,
-          "line": 147
+          "line": 151
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.support",
         "start": {
           "column": 11,
-          "line": 144
+          "line": 148
         }
       },
       {
         "defaultMessage": "!!!Copy Debug Information",
         "end": {
           "column": 3,
-          "line": 151
+          "line": 155
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.debugInfo",
         "start": {
           "column": 13,
-          "line": 148
+          "line": 152
         }
       },
       {
         "defaultMessage": "!!!Ferdi Debug Information",
         "end": {
           "column": 3,
-          "line": 155
+          "line": 159
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.debugInfoCopiedHeadline",
         "start": {
           "column": 27,
-          "line": 152
+          "line": 156
         }
       },
       {
         "defaultMessage": "!!!Your Debug Information has been copied to your clipboard.",
         "end": {
           "column": 3,
-          "line": 159
+          "line": 163
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.debugInfoCopiedBody",
         "start": {
           "column": 23,
-          "line": 156
+          "line": 160
         }
       },
       {
         "defaultMessage": "!!!Terms of Service",
         "end": {
           "column": 3,
-          "line": 163
+          "line": 167
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.tos",
         "start": {
           "column": 7,
-          "line": 160
+          "line": 164
         }
       },
       {
         "defaultMessage": "!!!Privacy Statement",
         "end": {
           "column": 3,
-          "line": 167
+          "line": 171
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.privacy",
         "start": {
           "column": 11,
-          "line": 164
+          "line": 168
         }
       },
       {
         "defaultMessage": "!!!File",
         "end": {
           "column": 3,
-          "line": 171
+          "line": 175
         },
         "file": "src/lib/Menu.js",
         "id": "menu.file",
         "start": {
           "column": 8,
-          "line": 168
+          "line": 172
         }
       },
       {
         "defaultMessage": "!!!View",
         "end": {
           "column": 3,
-          "line": 175
+          "line": 179
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view",
         "start": {
           "column": 8,
-          "line": 172
+          "line": 176
         }
       },
       {
         "defaultMessage": "!!!Services",
         "end": {
           "column": 3,
-          "line": 179
+          "line": 183
         },
         "file": "src/lib/Menu.js",
         "id": "menu.services",
         "start": {
           "column": 12,
-          "line": 176
+          "line": 180
         }
       },
       {
         "defaultMessage": "!!!Window",
         "end": {
           "column": 3,
-          "line": 183
+          "line": 187
         },
         "file": "src/lib/Menu.js",
         "id": "menu.window",
         "start": {
           "column": 10,
-          "line": 180
+          "line": 184
         }
       },
       {
         "defaultMessage": "!!!Help",
         "end": {
           "column": 3,
-          "line": 187
+          "line": 191
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help",
         "start": {
           "column": 8,
-          "line": 184
+          "line": 188
         }
       },
       {
         "defaultMessage": "!!!About Ferdi",
         "end": {
           "column": 3,
-          "line": 191
+          "line": 195
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.about",
         "start": {
           "column": 9,
-          "line": 188
+          "line": 192
         }
       },
       {
         "defaultMessage": "!!!What's new?",
         "end": {
           "column": 3,
-          "line": 195
+          "line": 199
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.announcement",
         "start": {
           "column": 16,
-          "line": 192
+          "line": 196
         }
       },
       {
         "defaultMessage": "!!!Settings",
         "end": {
           "column": 3,
-          "line": 199
+          "line": 203
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.settings",
         "start": {
           "column": 12,
-          "line": 196
+          "line": 200
         }
       },
       {
         "defaultMessage": "!!!Check for updates",
         "end": {
           "column": 3,
-          "line": 203
+          "line": 207
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.checkForUpdates",
         "start": {
           "column": 19,
-          "line": 200
+          "line": 204
         }
       },
       {
         "defaultMessage": "!!!Hide",
         "end": {
           "column": 3,
-          "line": 207
+          "line": 211
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.hide",
         "start": {
           "column": 8,
-          "line": 204
+          "line": 208
         }
       },
       {
         "defaultMessage": "!!!Hide Others",
         "end": {
           "column": 3,
-          "line": 211
+          "line": 215
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.hideOthers",
         "start": {
           "column": 14,
-          "line": 208
+          "line": 212
         }
       },
       {
         "defaultMessage": "!!!Unhide",
         "end": {
           "column": 3,
-          "line": 215
+          "line": 219
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.unhide",
         "start": {
           "column": 10,
-          "line": 212
+          "line": 216
         }
       },
       {
         "defaultMessage": "!!!Auto-hide menu bar",
         "end": {
           "column": 3,
-          "line": 219
+          "line": 223
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.autohideMenuBar",
         "start": {
           "column": 19,
-          "line": 216
+          "line": 220
         }
       },
       {
         "defaultMessage": "!!!Quit",
         "end": {
           "column": 3,
-          "line": 223
+          "line": 227
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.quit",
         "start": {
           "column": 8,
-          "line": 220
+          "line": 224
         }
       },
       {
         "defaultMessage": "!!!Add New Service...",
         "end": {
           "column": 3,
-          "line": 227
+          "line": 231
         },
         "file": "src/lib/Menu.js",
         "id": "menu.services.addNewService",
         "start": {
           "column": 17,
-          "line": 224
+          "line": 228
         }
       },
       {
         "defaultMessage": "!!!Add New Workspace...",
         "end": {
           "column": 3,
-          "line": 231
+          "line": 235
         },
         "file": "src/lib/Menu.js",
         "id": "menu.workspaces.addNewWorkspace",
         "start": {
           "column": 19,
-          "line": 228
+          "line": 232
         }
       },
       {
         "defaultMessage": "!!!Open workspace drawer",
         "end": {
           "column": 3,
-          "line": 235
+          "line": 239
         },
         "file": "src/lib/Menu.js",
         "id": "menu.workspaces.openWorkspaceDrawer",
         "start": {
           "column": 23,
-          "line": 232
+          "line": 236
         }
       },
       {
         "defaultMessage": "!!!Close workspace drawer",
         "end": {
           "column": 3,
-          "line": 239
+          "line": 243
         },
         "file": "src/lib/Menu.js",
         "id": "menu.workspaces.closeWorkspaceDrawer",
         "start": {
           "column": 24,
-          "line": 236
+          "line": 240
         }
       },
       {
         "defaultMessage": "!!!Activate next service...",
         "end": {
           "column": 3,
-          "line": 243
+          "line": 247
         },
         "file": "src/lib/Menu.js",
         "id": "menu.services.setNextServiceActive",
         "start": {
           "column": 23,
-          "line": 240
+          "line": 244
         }
       },
       {
         "defaultMessage": "!!!Activate previous service...",
         "end": {
           "column": 3,
-          "line": 247
+          "line": 251
         },
         "file": "src/lib/Menu.js",
         "id": "menu.services.activatePreviousService",
         "start": {
           "column": 27,
-          "line": 244
+          "line": 248
         }
       },
       {
         "defaultMessage": "!!!Disable notifications & audio",
         "end": {
           "column": 3,
-          "line": 251
+          "line": 255
         },
         "file": "src/lib/Menu.js",
         "id": "sidebar.muteApp",
         "start": {
           "column": 11,
-          "line": 248
+          "line": 252
         }
       },
       {
         "defaultMessage": "!!!Enable notifications & audio",
         "end": {
           "column": 3,
-          "line": 255
+          "line": 259
         },
         "file": "src/lib/Menu.js",
         "id": "sidebar.unmuteApp",
         "start": {
           "column": 13,
-          "line": 252
+          "line": 256
         }
       },
       {
         "defaultMessage": "!!!Workspaces",
         "end": {
           "column": 3,
-          "line": 259
+          "line": 263
         },
         "file": "src/lib/Menu.js",
         "id": "menu.workspaces",
         "start": {
           "column": 14,
-          "line": 256
+          "line": 260
         }
       },
       {
         "defaultMessage": "!!!Default",
         "end": {
           "column": 3,
-          "line": 263
+          "line": 267
         },
         "file": "src/lib/Menu.js",
         "id": "menu.workspaces.defaultWorkspace",
         "start": {
           "column": 20,
-          "line": 260
+          "line": 264
         }
       },
       {
         "defaultMessage": "!!!Todos",
         "end": {
           "column": 3,
-          "line": 267
+          "line": 271
         },
         "file": "src/lib/Menu.js",
         "id": "menu.todos",
         "start": {
           "column": 9,
-          "line": 264
+          "line": 268
         }
       },
       {
         "defaultMessage": "!!!Open Todos drawer",
         "end": {
           "column": 3,
-          "line": 271
+          "line": 275
         },
         "file": "src/lib/Menu.js",
         "id": "menu.Todoss.openTodosDrawer",
         "start": {
           "column": 19,
-          "line": 268
+          "line": 272
         }
       },
       {
         "defaultMessage": "!!!Close Todos drawer",
         "end": {
           "column": 3,
-          "line": 275
+          "line": 279
         },
         "file": "src/lib/Menu.js",
         "id": "menu.Todoss.closeTodosDrawer",
         "start": {
           "column": 20,
-          "line": 272
+          "line": 276
         }
       },
       {
         "defaultMessage": "!!!Enable Todos",
         "end": {
           "column": 3,
-          "line": 279
+          "line": 283
         },
         "file": "src/lib/Menu.js",
         "id": "menu.todos.enableTodos",
         "start": {
           "column": 15,
-          "line": 276
+          "line": 280
         }
       }
     ],
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index acf8724a6..f809ac51f 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -9,6 +9,8 @@
   "feature.delayApp.trial.headline": "Get the free Ferdi Professional 14 day trial and skip the line",
   "feature.delayApp.upgrade.action": "Get a Ferdi Supporter License",
   "feature.delayApp.upgrade.actionShort": "Upgrade account",
+  "feature.quickSwitch.info": "Select a service with TAB, ↑ and ↓. Open a service with ENTER.",
+  "feature.quickSwitch.search": "Search...",
   "feature.serviceLimit.limitReached": "You have added {amount} out of {limit} services that are included in your plan. Please upgrade your account to add more services.",
   "feature.shareFranz.action.email": "Send as email",
   "feature.shareFranz.action.facebook": "Share on Facebook",
@@ -109,6 +111,7 @@
   "menu.view.exitFullScreen": "Exit Full Screen",
   "menu.view.forward": "Forward",
   "menu.view.lockFerdi": "Lock Ferdi",
+  "menu.view.openQuickSwitch": "Open Quick Switch",
   "menu.view.reloadFranz": "Reload Ferdi",
   "menu.view.reloadService": "Reload Service",
   "menu.view.resetZoom": "Actual Size",
@@ -409,4 +412,4 @@
   "workspaceDrawer.workspaceFeatureInfo": "<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>",
   "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings",
   "workspaces.switchingIndicator.switchingTo": "Switching to"
-}
\ No newline at end of file
+}
diff --git a/src/i18n/locales/ua.json b/src/i18n/locales/ua.json
index 4dcfdc6e8..dfd9b6fa4 100644
--- a/src/i18n/locales/ua.json
+++ b/src/i18n/locales/ua.json
@@ -60,7 +60,7 @@
   "infobar.buttonInstallUpdate": "Перезавантажити і встановити оновлення",
   "infobar.requiredRequestsFailed": "Не вдалося завантажити сервіси та інформацію користувача",
   "sidebar.settings": "Налаштування",
-  "sidebar.addNewService": "!!!Add new service",
+  "sidebar.addNewService": "Add new service",
   "services.welcome": "Ласкаво просимо в Ferdi",
   "services.getStarted": "Почати",
   "settings.account.headline": "Акаунт",
diff --git a/src/i18n/locales/whitelist_en-US.json b/src/i18n/locales/whitelist_en-US.json
index 32960f8ce..fe51488c7 100644
--- a/src/i18n/locales/whitelist_en-US.json
+++ b/src/i18n/locales/whitelist_en-US.json
@@ -1,2 +1 @@
-[
-]
\ No newline at end of file
+[]
diff --git a/src/i18n/messages/src/components/layout/AppLayout.json b/src/i18n/messages/src/components/layout/AppLayout.json
index 3b8e047b4..0625487b4 100644
--- a/src/i18n/messages/src/components/layout/AppLayout.json
+++ b/src/i18n/messages/src/components/layout/AppLayout.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Your services have been updated.",
     "file": "src/components/layout/AppLayout.js",
     "start": {
-      "line": 27,
+      "line": 28,
       "column": 19
     },
     "end": {
-      "line": 30,
+      "line": 31,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Reload services",
     "file": "src/components/layout/AppLayout.js",
     "start": {
-      "line": 31,
+      "line": 32,
       "column": 24
     },
     "end": {
-      "line": 34,
+      "line": 35,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Could not load services and user information",
     "file": "src/components/layout/AppLayout.js",
     "start": {
-      "line": 35,
+      "line": 36,
       "column": 26
     },
     "end": {
-      "line": 38,
+      "line": 39,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!!There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.",
     "file": "src/components/layout/AppLayout.js",
     "start": {
-      "line": 39,
+      "line": 40,
       "column": 21
     },
     "end": {
-      "line": 42,
+      "line": 43,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/features/quickSwitch/Component.json b/src/i18n/messages/src/features/quickSwitch/Component.json
new file mode 100644
index 000000000..248925a37
--- /dev/null
+++ b/src/i18n/messages/src/features/quickSwitch/Component.json
@@ -0,0 +1,28 @@
+[
+  {
+    "id": "feature.quickSwitch.search",
+    "defaultMessage": "!!!Search...",
+    "file": "src/features/quickSwitch/Component.js",
+    "start": {
+      "line": 14,
+      "column": 10
+    },
+    "end": {
+      "line": 17,
+      "column": 3
+    }
+  },
+  {
+    "id": "feature.quickSwitch.info",
+    "defaultMessage": "!!!Select a service with TAB, ↑ and ↓. Open a service with ENTER.",
+    "file": "src/features/quickSwitch/Component.js",
+    "start": {
+      "line": 18,
+      "column": 8
+    },
+    "end": {
+      "line": 21,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/lib/Menu.json b/src/i18n/messages/src/lib/Menu.json
index 521022edd..c09148b2f 100644
--- a/src/i18n/messages/src/lib/Menu.json
+++ b/src/i18n/messages/src/lib/Menu.json
@@ -181,16 +181,29 @@
       "column": 3
     }
   },
+  {
+    "id": "menu.view.openQuickSwitch",
+    "defaultMessage": "!!!Open Quick Switch",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 72,
+      "column": 19
+    },
+    "end": {
+      "line": 75,
+      "column": 3
+    }
+  },
   {
     "id": "menu.view.back",
     "defaultMessage": "!!!Back",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 72,
+      "line": 76,
       "column": 8
     },
     "end": {
-      "line": 75,
+      "line": 79,
       "column": 3
     }
   },
@@ -199,11 +212,11 @@
     "defaultMessage": "!!!Forward",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 76,
+      "line": 80,
       "column": 11
     },
     "end": {
-      "line": 79,
+      "line": 83,
       "column": 3
     }
   },
@@ -212,11 +225,11 @@
     "defaultMessage": "!!!Actual Size",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 80,
+      "line": 84,
       "column": 13
     },
     "end": {
-      "line": 83,
+      "line": 87,
       "column": 3
     }
   },
@@ -225,11 +238,11 @@
     "defaultMessage": "!!!Zoom In",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 84,
+      "line": 88,
       "column": 10
     },
     "end": {
-      "line": 87,
+      "line": 91,
       "column": 3
     }
   },
@@ -238,11 +251,11 @@
     "defaultMessage": "!!!Zoom Out",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 88,
+      "line": 92,
       "column": 11
     },
     "end": {
-      "line": 91,
+      "line": 95,
       "column": 3
     }
   },
@@ -251,11 +264,11 @@
     "defaultMessage": "!!!Enter Full Screen",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 92,
+      "line": 96,
       "column": 19
     },
     "end": {
-      "line": 95,
+      "line": 99,
       "column": 3
     }
   },
@@ -264,11 +277,11 @@
     "defaultMessage": "!!!Exit Full Screen",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 96,
+      "line": 100,
       "column": 18
     },
     "end": {
-      "line": 99,
+      "line": 103,
       "column": 3
     }
   },
@@ -277,11 +290,11 @@
     "defaultMessage": "!!!Toggle Full Screen",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 100,
+      "line": 104,
       "column": 20
     },
     "end": {
-      "line": 103,
+      "line": 107,
       "column": 3
     }
   },
@@ -290,11 +303,11 @@
     "defaultMessage": "!!!Toggle Developer Tools",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 104,
+      "line": 108,
       "column": 18
     },
     "end": {
-      "line": 107,
+      "line": 111,
       "column": 3
     }
   },
@@ -303,11 +316,11 @@
     "defaultMessage": "!!!Toggle Todos Developer Tools",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 108,
+      "line": 112,
       "column": 23
     },
     "end": {
-      "line": 111,
+      "line": 115,
       "column": 3
     }
   },
@@ -316,11 +329,11 @@
     "defaultMessage": "!!!Toggle Service Developer Tools",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 112,
+      "line": 116,
       "column": 25
     },
     "end": {
-      "line": 115,
+      "line": 119,
       "column": 3
     }
   },
@@ -329,11 +342,11 @@
     "defaultMessage": "!!!Reload Service",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 116,
+      "line": 120,
       "column": 17
     },
     "end": {
-      "line": 119,
+      "line": 123,
       "column": 3
     }
   },
@@ -342,11 +355,11 @@
     "defaultMessage": "!!!Reload Ferdi",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 120,
+      "line": 124,
       "column": 15
     },
     "end": {
-      "line": 123,
+      "line": 127,
       "column": 3
     }
   },
@@ -355,11 +368,11 @@
     "defaultMessage": "!!!Lock Ferdi",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 124,
+      "line": 128,
       "column": 13
     },
     "end": {
-      "line": 127,
+      "line": 131,
       "column": 3
     }
   },
@@ -368,11 +381,11 @@
     "defaultMessage": "!!!Minimize",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 128,
+      "line": 132,
       "column": 12
     },
     "end": {
-      "line": 131,
+      "line": 135,
       "column": 3
     }
   },
@@ -381,11 +394,11 @@
     "defaultMessage": "!!!Close",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 132,
+      "line": 136,
       "column": 9
     },
     "end": {
-      "line": 135,
+      "line": 139,
       "column": 3
     }
   },
@@ -394,11 +407,11 @@
     "defaultMessage": "!!!Learn More",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 136,
+      "line": 140,
       "column": 13
     },
     "end": {
-      "line": 139,
+      "line": 143,
       "column": 3
     }
   },
@@ -407,11 +420,11 @@
     "defaultMessage": "!!!Changelog",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 140,
+      "line": 144,
       "column": 13
     },
     "end": {
-      "line": 143,
+      "line": 147,
       "column": 3
     }
   },
@@ -420,11 +433,11 @@
     "defaultMessage": "!!!Support",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 144,
+      "line": 148,
       "column": 11
     },
     "end": {
-      "line": 147,
+      "line": 151,
       "column": 3
     }
   },
@@ -433,11 +446,11 @@
     "defaultMessage": "!!!Copy Debug Information",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 148,
+      "line": 152,
       "column": 13
     },
     "end": {
-      "line": 151,
+      "line": 155,
       "column": 3
     }
   },
@@ -446,11 +459,11 @@
     "defaultMessage": "!!!Ferdi Debug Information",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 152,
+      "line": 156,
       "column": 27
     },
     "end": {
-      "line": 155,
+      "line": 159,
       "column": 3
     }
   },
@@ -459,11 +472,11 @@
     "defaultMessage": "!!!Your Debug Information has been copied to your clipboard.",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 156,
+      "line": 160,
       "column": 23
     },
     "end": {
-      "line": 159,
+      "line": 163,
       "column": 3
     }
   },
@@ -472,11 +485,11 @@
     "defaultMessage": "!!!Terms of Service",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 160,
+      "line": 164,
       "column": 7
     },
     "end": {
-      "line": 163,
+      "line": 167,
       "column": 3
     }
   },
@@ -485,11 +498,11 @@
     "defaultMessage": "!!!Privacy Statement",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 164,
+      "line": 168,
       "column": 11
     },
     "end": {
-      "line": 167,
+      "line": 171,
       "column": 3
     }
   },
@@ -498,11 +511,11 @@
     "defaultMessage": "!!!File",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 168,
+      "line": 172,
       "column": 8
     },
     "end": {
-      "line": 171,
+      "line": 175,
       "column": 3
     }
   },
@@ -511,11 +524,11 @@
     "defaultMessage": "!!!View",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 172,
+      "line": 176,
       "column": 8
     },
     "end": {
-      "line": 175,
+      "line": 179,
       "column": 3
     }
   },
@@ -524,11 +537,11 @@
     "defaultMessage": "!!!Services",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 176,
+      "line": 180,
       "column": 12
     },
     "end": {
-      "line": 179,
+      "line": 183,
       "column": 3
     }
   },
@@ -537,11 +550,11 @@
     "defaultMessage": "!!!Window",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 180,
+      "line": 184,
       "column": 10
     },
     "end": {
-      "line": 183,
+      "line": 187,
       "column": 3
     }
   },
@@ -550,11 +563,11 @@
     "defaultMessage": "!!!Help",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 184,
+      "line": 188,
       "column": 8
     },
     "end": {
-      "line": 187,
+      "line": 191,
       "column": 3
     }
   },
@@ -563,11 +576,11 @@
     "defaultMessage": "!!!About Ferdi",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 188,
+      "line": 192,
       "column": 9
     },
     "end": {
-      "line": 191,
+      "line": 195,
       "column": 3
     }
   },
@@ -576,11 +589,11 @@
     "defaultMessage": "!!!What's new?",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 192,
+      "line": 196,
       "column": 16
     },
     "end": {
-      "line": 195,
+      "line": 199,
       "column": 3
     }
   },
@@ -589,11 +602,11 @@
     "defaultMessage": "!!!Settings",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 196,
+      "line": 200,
       "column": 12
     },
     "end": {
-      "line": 199,
+      "line": 203,
       "column": 3
     }
   },
@@ -602,11 +615,11 @@
     "defaultMessage": "!!!Check for updates",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 200,
+      "line": 204,
       "column": 19
     },
     "end": {
-      "line": 203,
+      "line": 207,
       "column": 3
     }
   },
@@ -615,11 +628,11 @@
     "defaultMessage": "!!!Hide",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 204,
+      "line": 208,
       "column": 8
     },
     "end": {
-      "line": 207,
+      "line": 211,
       "column": 3
     }
   },
@@ -628,11 +641,11 @@
     "defaultMessage": "!!!Hide Others",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 208,
+      "line": 212,
       "column": 14
     },
     "end": {
-      "line": 211,
+      "line": 215,
       "column": 3
     }
   },
@@ -641,11 +654,11 @@
     "defaultMessage": "!!!Unhide",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 212,
+      "line": 216,
       "column": 10
     },
     "end": {
-      "line": 215,
+      "line": 219,
       "column": 3
     }
   },
@@ -654,11 +667,11 @@
     "defaultMessage": "!!!Auto-hide menu bar",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 216,
+      "line": 220,
       "column": 19
     },
     "end": {
-      "line": 219,
+      "line": 223,
       "column": 3
     }
   },
@@ -667,11 +680,11 @@
     "defaultMessage": "!!!Quit",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 220,
+      "line": 224,
       "column": 8
     },
     "end": {
-      "line": 223,
+      "line": 227,
       "column": 3
     }
   },
@@ -680,11 +693,11 @@
     "defaultMessage": "!!!Add New Service...",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 224,
+      "line": 228,
       "column": 17
     },
     "end": {
-      "line": 227,
+      "line": 231,
       "column": 3
     }
   },
@@ -693,11 +706,11 @@
     "defaultMessage": "!!!Add New Workspace...",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 228,
+      "line": 232,
       "column": 19
     },
     "end": {
-      "line": 231,
+      "line": 235,
       "column": 3
     }
   },
@@ -706,11 +719,11 @@
     "defaultMessage": "!!!Open workspace drawer",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 232,
+      "line": 236,
       "column": 23
     },
     "end": {
-      "line": 235,
+      "line": 239,
       "column": 3
     }
   },
@@ -719,11 +732,11 @@
     "defaultMessage": "!!!Close workspace drawer",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 236,
+      "line": 240,
       "column": 24
     },
     "end": {
-      "line": 239,
+      "line": 243,
       "column": 3
     }
   },
@@ -732,11 +745,11 @@
     "defaultMessage": "!!!Activate next service...",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 240,
+      "line": 244,
       "column": 23
     },
     "end": {
-      "line": 243,
+      "line": 247,
       "column": 3
     }
   },
@@ -745,11 +758,11 @@
     "defaultMessage": "!!!Activate previous service...",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 244,
+      "line": 248,
       "column": 27
     },
     "end": {
-      "line": 247,
+      "line": 251,
       "column": 3
     }
   },
@@ -758,11 +771,11 @@
     "defaultMessage": "!!!Disable notifications & audio",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 248,
+      "line": 252,
       "column": 11
     },
     "end": {
-      "line": 251,
+      "line": 255,
       "column": 3
     }
   },
@@ -771,11 +784,11 @@
     "defaultMessage": "!!!Enable notifications & audio",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 252,
+      "line": 256,
       "column": 13
     },
     "end": {
-      "line": 255,
+      "line": 259,
       "column": 3
     }
   },
@@ -784,11 +797,11 @@
     "defaultMessage": "!!!Workspaces",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 256,
+      "line": 260,
       "column": 14
     },
     "end": {
-      "line": 259,
+      "line": 263,
       "column": 3
     }
   },
@@ -797,11 +810,11 @@
     "defaultMessage": "!!!Default",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 260,
+      "line": 264,
       "column": 20
     },
     "end": {
-      "line": 263,
+      "line": 267,
       "column": 3
     }
   },
@@ -810,11 +823,11 @@
     "defaultMessage": "!!!Todos",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 264,
+      "line": 268,
       "column": 9
     },
     "end": {
-      "line": 267,
+      "line": 271,
       "column": 3
     }
   },
@@ -823,11 +836,11 @@
     "defaultMessage": "!!!Open Todos drawer",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 268,
+      "line": 272,
       "column": 19
     },
     "end": {
-      "line": 271,
+      "line": 275,
       "column": 3
     }
   },
@@ -836,11 +849,11 @@
     "defaultMessage": "!!!Close Todos drawer",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 272,
+      "line": 276,
       "column": 20
     },
     "end": {
-      "line": 275,
+      "line": 279,
       "column": 3
     }
   },
@@ -849,11 +862,11 @@
     "defaultMessage": "!!!Enable Todos",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 276,
+      "line": 280,
       "column": 15
     },
     "end": {
-      "line": 279,
+      "line": 283,
       "column": 3
     }
   }
diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index 2898fcad1..5b04346b5 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -69,6 +69,10 @@ const menuItems = defineMessages({
     id: 'menu.edit.emojiSymbols',
     defaultMessage: '!!!Emoji & Symbols',
   },
+  openQuickSwitch: {
+    id: 'menu.view.openQuickSwitch',
+    defaultMessage: '!!!Open Quick Switch',
+  },
   back: {
     id: 'menu.view.back',
     defaultMessage: '!!!Back',
@@ -332,6 +336,16 @@ const _templateFactory = intl => [
   {
     label: intl.formatMessage(menuItems.view),
     submenu: [
+      {
+        type: 'separator',
+      },
+      {
+        label: intl.formatMessage(menuItems.openQuickSwitch),
+        accelerator: 'CmdOrCtrl+P',
+        click() {
+          window.ferdi.features.quickSwitch.state.isModalVisible = true;
+        },
+      },
       {
         type: 'separator',
       },
diff --git a/src/stores/FeaturesStore.js b/src/stores/FeaturesStore.js
index cf28b6bec..c39b6d7f3 100644
--- a/src/stores/FeaturesStore.js
+++ b/src/stores/FeaturesStore.js
@@ -13,6 +13,7 @@ import spellchecker from '../features/spellchecker';
 import serviceProxy from '../features/serviceProxy';
 import basicAuth from '../features/basicAuth';
 import workspaces from '../features/workspaces';
+import quickSwitch from '../features/quickSwitch';
 import shareFranz from '../features/shareFranz';
 import announcements from '../features/announcements';
 import settingsWS from '../features/settingsWS';
@@ -75,6 +76,7 @@ export default class FeaturesStore extends Store {
     serviceProxy(this.stores, this.actions);
     basicAuth(this.stores, this.actions);
     workspaces(this.stores, this.actions);
+    quickSwitch(this.stores, this.actions);
     shareFranz(this.stores, this.actions);
     announcements(this.stores, this.actions);
     settingsWS(this.stores, this.actions);
-- 
cgit v1.2.3-70-g09d2


From 3c1b41663946f93b9070bfa10879155e84139ebd Mon Sep 17 00:00:00 2001
From: vantezzen <hello@vantezzen.io>
Date: Fri, 20 Sep 2019 12:37:39 +0200
Subject: Improve Ferdi Lock password field

---
 src/components/settings/settings/EditSettingsForm.js | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/components')

diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index 012a10aa6..c1e812008 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -248,6 +248,8 @@ export default @observer class EditSettingsForm extends Component {
                   onChange={e => this.submit(e)}
                   field={form.$('lockedPassword')}
                   type="password"
+                  scorePassword
+                  showPasswordToggle
                 />
                 <p>
                   { intl.formatMessage(messages.lockedPasswordInfo) }
-- 
cgit v1.2.3-70-g09d2


From 4e1fc89de9ce3bf00f7387f39062d1b4878ecd16 Mon Sep 17 00:00:00 2001
From: vantezzen <hello@vantezzen.io>
Date: Sat, 21 Sep 2019 11:37:30 +0200
Subject: Add scheduled Do-not-Disturb feature

---
 CHANGELOG.md                                       |   2 +
 README.md                                          |   1 +
 .../settings/settings/EditSettingsForm.js          |  64 +++++++-
 src/config.js                                      |   9 +-
 src/containers/settings/EditSettingsScreen.js      |  32 ++++
 src/helpers/schedule-helpers.js                    |  70 +++++++++
 src/i18n/locales/defaultMessages.json              | 165 ++++++++++++++-------
 src/i18n/locales/en-US.json                        |   7 +-
 src/i18n/locales/whitelist_en-US.json              |   3 +-
 .../settings/settings/EditSettingsForm.json        |  90 +++++++----
 .../containers/settings/EditSettingsScreen.json    |  75 +++++++---
 src/stores/ServicesStore.js                        |  13 ++
 12 files changed, 425 insertions(+), 106 deletions(-)
 create mode 100644 src/helpers/schedule-helpers.js

(limited to 'src/components')

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 597af5932..b10fb3eef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,9 @@
 - Fix continuous releases/assets delivery on tags builds #53
 - Attempt at making menubar hiding feature cross-platform #7 (comment)
 - Attempt at making "About Ferdi" consistent across platforms #47 (comment)
+- Attempt at fixing "Launch on start" feature on Linux #63
 - Add "Quick Switch" feature
+- Add "Scheduled Do-not-Disturb" feature
 
 # [5.3.3](https://github.com/meetfranz/franz/compare/v5.3.2...v5.3.3) (2019-09-18)
 - Merged Franz v5.3.3 into Ferdi
diff --git a/README.md b/README.md
index d525686ff..c09f9a178 100644
--- a/README.md
+++ b/README.md
@@ -29,6 +29,7 @@ You can find the installers in the [latest release](https://github.com/getferdi/
 - [x] Add an option to keep individual workspaces always loaded ([#37](https://github.com/getferdi/ferdi/issues/37))
 - [x] Add an option to auto-hide the menubar ([#7](https://github.com/getferdi/ferdi/issues/7), [franz#833](https://github.com/meetfranz/franz/issues/833))
 - [x] Add "Quick Switch" feature to help you navigate a long list of services (similar to Rambox's [Quick Switcher](https://rambox.pro/#feature-details/quick_switcher))
+- [x] Add "Scheduled Do-not-Disturb" feature in which you won't get notifications (similar to Rambox's [Work Hours](https://rambox.pro/#feature-details/work_hours))
 - [x] Add CTRL+← and CTRL+→ shortcuts and menu options to go back and forward in the service browsing history([#39](https://github.com/getferdi/ferdi/issues/39))
 - [x] Add "npm run prepare-code" command for development to lint and beautify code
 - [x] Remove "Franz is better together" popup
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index c1e812008..52bd18603 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -38,6 +38,14 @@ const messages = defineMessages({
     id: 'settings.app.lockedPasswordInfo',
     defaultMessage: '!!!Please make sure to set a password you\'ll remember.\nIf you loose this password, you will have to reinstall Ferdi.',
   },
+  scheduledDNDTimeInfo: {
+    id: 'settings.app.scheduledDNDTimeInfo',
+    defaultMessage: '!!!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.',
+  },
+  scheduledDNDInfo: {
+    id: 'settings.app.scheduledDNDInfo',
+    defaultMessage: '!!!Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.',
+  },
   headlineLanguage: {
     id: 'settings.app.headlineLanguage',
     defaultMessage: '!!!Language',
@@ -167,7 +175,11 @@ export default @observer class EditSettingsForm extends Component {
     }
 
     const isLoggedIn = Boolean(localStorage.getItem('authToken'));
-    const lockingFeatureEnabled = window.ferdi.stores.settings.all.app.lockingFeatureEnabled;
+
+    const {
+      lockingFeatureEnabled,
+      scheduledDNDEnabled,
+    } = window.ferdi.stores.settings.all.app;
 
     return (
       <div className="settings__main">
@@ -273,6 +285,56 @@ export default @observer class EditSettingsForm extends Component {
             </p>
 
 
+            <Toggle field={form.$('scheduledDNDEnabled')} />
+            {scheduledDNDEnabled && (
+              <>
+                <div style={{
+                  display: 'flex',
+                  justifyContent: 'center',
+                }}
+                >
+                  <div style={{
+                    padding: '0 1rem',
+                    width: '100%',
+                  }}
+                  >
+                    <Input
+                      placeholder="17:00"
+                      onChange={e => this.submit(e)}
+                      field={form.$('scheduledDNDStart')}
+                      type="time"
+                    />
+                  </div>
+                  <div style={{
+                    padding: '0 1rem',
+                    width: '100%',
+                  }}
+                  >
+                    <Input
+                      placeholder="09:00"
+                      onChange={e => this.submit(e)}
+                      field={form.$('scheduledDNDEnd')}
+                      type="time"
+                    />
+                  </div>
+                </div>
+                <p>
+                  { intl.formatMessage(messages.scheduledDNDTimeInfo) }
+                </p>
+              </>
+            )}
+            <p
+              className="settings__message"
+              style={{
+                borderTop: 0, marginTop: 0, paddingTop: 0, marginBottom: '2rem',
+              }}
+            >
+              <span>
+                { intl.formatMessage(messages.scheduledDNDInfo) }
+              </span>
+            </p>
+
+
             {/* Appearance */}
             <h2 id="apperance">{intl.formatMessage(messages.headlineAppearance)}</h2>
             <Toggle field={form.$('showDisabledServices')} />
diff --git a/src/config.js b/src/config.js
index d01ece849..96c054cca 100644
--- a/src/config.js
+++ b/src/config.js
@@ -40,8 +40,6 @@ export const DEFAULT_APP_SETTINGS = {
   enableSystemTray: true,
   minimizeToSystemTray: false,
   privateNotifications: false,
-  server: LIVE_API,
-  todoServer: PRODUCTION_TODOS_FRONTEND_URL,
   showDisabledServices: true,
   showMessageBadgeWhenMuted: true,
   enableSpellchecking: true,
@@ -53,10 +51,17 @@ export const DEFAULT_APP_SETTINGS = {
   isAppMuted: false,
   enableGPUAcceleration: true,
   serviceLimit: 5,
+
+  // Ferdi specific options
+  server: LIVE_API,
+  todoServer: PRODUCTION_TODOS_FRONTEND_URL,
   autohideMenuBar: false,
   lockingFeatureEnabled: false,
   locked: false,
   lockedPassword: '',
+  scheduledDNDEnabled: false,
+  scheduledDNDStart: '17:00',
+  scheduledDNDEnd: '09:00',
 };
 
 export const DEFAULT_FEATURES_CONFIG = {
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js
index 4d85d4f12..0ae64b6ad 100644
--- a/src/containers/settings/EditSettingsScreen.js
+++ b/src/containers/settings/EditSettingsScreen.js
@@ -65,6 +65,18 @@ const messages = defineMessages({
     id: 'settings.app.form.lockPassword',
     defaultMessage: '!!!Ferdi Lock password',
   },
+  scheduledDNDEnabled: {
+    id: 'settings.app.form.scheduledDNDEnabled',
+    defaultMessage: '!!!Enable scheduled Do-not-Disturb',
+  },
+  scheduledDNDStart: {
+    id: 'settings.app.form.scheduledDNDStart',
+    defaultMessage: '!!!From',
+  },
+  scheduledDNDEnd: {
+    id: 'settings.app.form.scheduledDNDEnd',
+    defaultMessage: '!!!To',
+  },
   language: {
     id: 'settings.app.form.language',
     defaultMessage: '!!!Language',
@@ -134,6 +146,9 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
         todoServer: settingsData.todoServer,
         lockingFeatureEnabled: settingsData.lockingFeatureEnabled,
         lockedPassword: settingsData.lockedPassword,
+        scheduledDNDEnabled: settingsData.scheduledDNDEnabled,
+        scheduledDNDStart: settingsData.scheduledDNDStart,
+        scheduledDNDEnd: settingsData.scheduledDNDEnd,
         enableGPUAcceleration: settingsData.enableGPUAcceleration,
         showDisabledServices: settingsData.showDisabledServices,
         darkMode: settingsData.darkMode,
@@ -235,6 +250,23 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
           default: DEFAULT_LOCK_PASSWORD,
           type: 'password',
         },
+        scheduledDNDEnabled: {
+          label: intl.formatMessage(messages.scheduledDNDEnabled),
+          value: settings.all.app.scheduledDNDEnabled || false,
+          default: false,
+        },
+        scheduledDNDStart: {
+          label: intl.formatMessage(messages.scheduledDNDStart),
+          value: settings.all.app.scheduledDNDStart,
+          default: '17:00',
+          type: 'time',
+        },
+        scheduledDNDEnd: {
+          label: intl.formatMessage(messages.scheduledDNDEnd),
+          value: settings.all.app.scheduledDNDEnd,
+          default: '09:00',
+          type: 'time',
+        },
         showDisabledServices: {
           label: intl.formatMessage(messages.showDisabledServices),
           value: settings.all.app.showDisabledServices,
diff --git a/src/helpers/schedule-helpers.js b/src/helpers/schedule-helpers.js
new file mode 100644
index 000000000..a3020cad6
--- /dev/null
+++ b/src/helpers/schedule-helpers.js
@@ -0,0 +1,70 @@
+/* eslint-disable import/prefer-default-export */
+
+export function isInTimeframe(start, end) {
+  const [
+    startHourStr,
+    startMinuteStr,
+  ] = start.split(':');
+  const startHour = parseInt(startHourStr, 10);
+  const startMinute = parseInt(startMinuteStr, 10);
+
+  const [
+    endHourStr,
+    endMinuteStr,
+  ] = end.split(':');
+  const endHour = parseInt(endHourStr, 10);
+  const endMinute = parseInt(endMinuteStr, 10);
+
+  const currentHour = new Date().getHours();
+  const currentMinute = new Date().getMinutes();
+
+  // Check if the end time is before the start time (scheduled overnight)
+  // as we need to change our checks based on this
+  const endBeforeStart = (startHour > endHour || (startHour === endHour && startMinute > endMinute));
+
+  if (
+    // End is after start (e.g. 09:00-17:00)
+    !endBeforeStart
+    // Check if past start
+    && ((currentHour > startHour
+        || (
+          currentHour === startHour
+          && currentMinute >= startMinute
+        )
+    )
+      // Check that not past end
+      && (currentHour < endHour
+        || (
+          currentHour === endHour
+          && currentMinute < endMinute
+        )
+      ))
+  ) {
+    // We are in scheduled timeframe
+    return true;
+  }
+  if (
+    // End is before start (e.g. 17:00-09:00)
+    endBeforeStart
+    // Check if past start
+    && ((currentHour > startHour
+        || (
+          currentHour === startHour
+          && currentMinute >= startMinute
+        )
+    )
+      // Check that we are not past end
+      || (currentHour < endHour
+        || (
+          currentHour === endHour
+          && currentMinute < endMinute
+        )
+      ))
+  ) {
+    // We are also in scheduled timeframe
+    return true;
+  }
+
+  // We are not in scheduled timeframe
+  return false;
+}
diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json
index 7f02af685..de1712048 100644
--- a/src/i18n/locales/defaultMessages.json
+++ b/src/i18n/locales/defaultMessages.json
@@ -2540,211 +2540,237 @@
         }
       },
       {
-        "defaultMessage": "!!!Language",
+        "defaultMessage": "!!!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.",
         "end": {
           "column": 3,
           "line": 44
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
+        "id": "settings.app.scheduledDNDTimeInfo",
+        "start": {
+          "column": 24,
+          "line": 41
+        }
+      },
+      {
+        "defaultMessage": "!!!Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
+        "end": {
+          "column": 3,
+          "line": 48
+        },
+        "file": "src/components/settings/settings/EditSettingsForm.js",
+        "id": "settings.app.scheduledDNDInfo",
+        "start": {
+          "column": 20,
+          "line": 45
+        }
+      },
+      {
+        "defaultMessage": "!!!Language",
+        "end": {
+          "column": 3,
+          "line": 52
+        },
+        "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.headlineLanguage",
         "start": {
           "column": 20,
-          "line": 41
+          "line": 49
         }
       },
       {
         "defaultMessage": "!!!Updates",
         "end": {
           "column": 3,
-          "line": 48
+          "line": 56
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.headlineUpdates",
         "start": {
           "column": 19,
-          "line": 45
+          "line": 53
         }
       },
       {
         "defaultMessage": "!!!Appearance",
         "end": {
           "column": 3,
-          "line": 52
+          "line": 60
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.headlineAppearance",
         "start": {
           "column": 22,
-          "line": 49
+          "line": 57
         }
       },
       {
         "defaultMessage": "!!!Advanced",
         "end": {
           "column": 3,
-          "line": 56
+          "line": 64
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.headlineAdvanced",
         "start": {
           "column": 20,
-          "line": 53
+          "line": 61
         }
       },
       {
         "defaultMessage": "!!!Help us to translate Ferdi into your language.",
         "end": {
           "column": 3,
-          "line": 60
+          "line": 68
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.translationHelp",
         "start": {
           "column": 19,
-          "line": 57
+          "line": 65
         }
       },
       {
         "defaultMessage": "!!!Cache",
         "end": {
           "column": 3,
-          "line": 64
+          "line": 72
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.subheadlineCache",
         "start": {
           "column": 20,
-          "line": 61
+          "line": 69
         }
       },
       {
         "defaultMessage": "!!!Ferdi cache is currently using {size} of disk space.",
         "end": {
           "column": 3,
-          "line": 68
+          "line": 76
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.cacheInfo",
         "start": {
           "column": 13,
-          "line": 65
+          "line": 73
         }
       },
       {
         "defaultMessage": "!!!Clear cache",
         "end": {
           "column": 3,
-          "line": 72
+          "line": 80
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.buttonClearAllCache",
         "start": {
           "column": 23,
-          "line": 69
+          "line": 77
         }
       },
       {
         "defaultMessage": "!!!Check for updates",
         "end": {
           "column": 3,
-          "line": 76
+          "line": 84
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.buttonSearchForUpdate",
         "start": {
           "column": 25,
-          "line": 73
+          "line": 81
         }
       },
       {
         "defaultMessage": "!!!Restart & install update",
         "end": {
           "column": 3,
-          "line": 80
+          "line": 88
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.buttonInstallUpdate",
         "start": {
           "column": 23,
-          "line": 77
+          "line": 85
         }
       },
       {
         "defaultMessage": "!!!Is searching for update",
         "end": {
           "column": 3,
-          "line": 84
+          "line": 92
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.updateStatusSearching",
         "start": {
           "column": 25,
-          "line": 81
+          "line": 89
         }
       },
       {
         "defaultMessage": "!!!Update available, downloading...",
         "end": {
           "column": 3,
-          "line": 88
+          "line": 96
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.updateStatusAvailable",
         "start": {
           "column": 25,
-          "line": 85
+          "line": 93
         }
       },
       {
         "defaultMessage": "!!!You are using the latest version of Ferdi",
         "end": {
           "column": 3,
-          "line": 92
+          "line": 100
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.updateStatusUpToDate",
         "start": {
           "column": 24,
-          "line": 89
+          "line": 97
         }
       },
       {
         "defaultMessage": "!!!Current version:",
         "end": {
           "column": 3,
-          "line": 96
+          "line": 104
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.currentVersion",
         "start": {
           "column": 18,
-          "line": 93
+          "line": 101
         }
       },
       {
         "defaultMessage": "!!!Changes require restart",
         "end": {
           "column": 3,
-          "line": 100
+          "line": 108
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.restartRequired",
         "start": {
           "column": 29,
-          "line": 97
+          "line": 105
         }
       },
       {
         "defaultMessage": "!!!Official translations are English & German. All other languages are community based translations.",
         "end": {
           "column": 3,
-          "line": 104
+          "line": 112
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.languageDisclaimer",
         "start": {
           "column": 22,
-          "line": 101
+          "line": 109
         }
       }
     ],
@@ -3767,120 +3793,159 @@
         }
       },
       {
-        "defaultMessage": "!!!Language",
+        "defaultMessage": "!!!Enable scheduled Do-not-Disturb",
         "end": {
           "column": 3,
           "line": 71
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
+        "id": "settings.app.form.scheduledDNDEnabled",
+        "start": {
+          "column": 23,
+          "line": 68
+        }
+      },
+      {
+        "defaultMessage": "!!!From",
+        "end": {
+          "column": 3,
+          "line": 75
+        },
+        "file": "src/containers/settings/EditSettingsScreen.js",
+        "id": "settings.app.form.scheduledDNDStart",
+        "start": {
+          "column": 21,
+          "line": 72
+        }
+      },
+      {
+        "defaultMessage": "!!!To",
+        "end": {
+          "column": 3,
+          "line": 79
+        },
+        "file": "src/containers/settings/EditSettingsScreen.js",
+        "id": "settings.app.form.scheduledDNDEnd",
+        "start": {
+          "column": 19,
+          "line": 76
+        }
+      },
+      {
+        "defaultMessage": "!!!Language",
+        "end": {
+          "column": 3,
+          "line": 83
+        },
+        "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.language",
         "start": {
           "column": 12,
-          "line": 68
+          "line": 80
         }
       },
       {
         "defaultMessage": "!!!Dark Mode",
         "end": {
           "column": 3,
-          "line": 75
+          "line": 87
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.darkMode",
         "start": {
           "column": 12,
-          "line": 72
+          "line": 84
         }
       },
       {
         "defaultMessage": "!!!Display disabled services tabs",
         "end": {
           "column": 3,
-          "line": 79
+          "line": 91
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.showDisabledServices",
         "start": {
           "column": 24,
-          "line": 76
+          "line": 88
         }
       },
       {
         "defaultMessage": "!!!Show unread message badge when notifications are disabled",
         "end": {
           "column": 3,
-          "line": 83
+          "line": 95
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.showMessagesBadgesWhenMuted",
         "start": {
           "column": 29,
-          "line": 80
+          "line": 92
         }
       },
       {
         "defaultMessage": "!!!Enable spell checking",
         "end": {
           "column": 3,
-          "line": 87
+          "line": 99
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.enableSpellchecking",
         "start": {
           "column": 23,
-          "line": 84
+          "line": 96
         }
       },
       {
         "defaultMessage": "!!!Enable GPU Acceleration",
         "end": {
           "column": 3,
-          "line": 91
+          "line": 103
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.enableGPUAcceleration",
         "start": {
           "column": 25,
-          "line": 88
+          "line": 100
         }
       },
       {
         "defaultMessage": "!!!Include beta versions",
         "end": {
           "column": 3,
-          "line": 95
+          "line": 107
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.beta",
         "start": {
           "column": 8,
-          "line": 92
+          "line": 104
         }
       },
       {
         "defaultMessage": "!!!Enable Franz Todos",
         "end": {
           "column": 3,
-          "line": 99
+          "line": 111
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.enableTodos",
         "start": {
           "column": 15,
-          "line": 96
+          "line": 108
         }
       },
       {
         "defaultMessage": "!!!Keep all workspaces loaded",
         "end": {
           "column": 3,
-          "line": 103
+          "line": 115
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.keepAllWorkspacesLoaded",
         "start": {
           "column": 27,
-          "line": 100
+          "line": 112
         }
       }
     ],
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index 5d32aa4c1..8997a1948 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -232,6 +232,9 @@
   "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
   "settings.app.form.runInBackground": "Keep Ferdi in background when closing the window",
+  "settings.app.form.scheduledDNDEnabled": "Enable scheduled Do-not-Disturb",
+  "settings.app.form.scheduledDNDEnd": "To",
+  "settings.app.form.scheduledDNDStart": "From",
   "settings.app.form.server": "Server",
   "settings.app.form.showDisabledServices": "Display disabled services tabs",
   "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
@@ -246,6 +249,8 @@
   "settings.app.lockedPassword": "Ferdi Lock Password",
   "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.",
   "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.",
   "settings.app.subheadlineCache": "Cache",
   "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.Ferditodos.com)",
@@ -412,4 +417,4 @@
   "workspaceDrawer.workspaceFeatureInfo": "<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>",
   "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings",
   "workspaces.switchingIndicator.switchingTo": "Switching to"
-}
\ No newline at end of file
+}
diff --git a/src/i18n/locales/whitelist_en-US.json b/src/i18n/locales/whitelist_en-US.json
index 32960f8ce..fe51488c7 100644
--- a/src/i18n/locales/whitelist_en-US.json
+++ b/src/i18n/locales/whitelist_en-US.json
@@ -1,2 +1 @@
-[
-]
\ No newline at end of file
+[]
diff --git a/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json b/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json
index c8d85f1af..ccbc155f3 100644
--- a/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json
+++ b/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json
@@ -77,16 +77,42 @@
       "column": 3
     }
   },
+  {
+    "id": "settings.app.scheduledDNDTimeInfo",
+    "defaultMessage": "!!!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.",
+    "file": "src/components/settings/settings/EditSettingsForm.js",
+    "start": {
+      "line": 41,
+      "column": 24
+    },
+    "end": {
+      "line": 44,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.scheduledDNDInfo",
+    "defaultMessage": "!!!Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
+    "file": "src/components/settings/settings/EditSettingsForm.js",
+    "start": {
+      "line": 45,
+      "column": 20
+    },
+    "end": {
+      "line": 48,
+      "column": 3
+    }
+  },
   {
     "id": "settings.app.headlineLanguage",
     "defaultMessage": "!!!Language",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 41,
+      "line": 49,
       "column": 20
     },
     "end": {
-      "line": 44,
+      "line": 52,
       "column": 3
     }
   },
@@ -95,11 +121,11 @@
     "defaultMessage": "!!!Updates",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 45,
+      "line": 53,
       "column": 19
     },
     "end": {
-      "line": 48,
+      "line": 56,
       "column": 3
     }
   },
@@ -108,11 +134,11 @@
     "defaultMessage": "!!!Appearance",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 49,
+      "line": 57,
       "column": 22
     },
     "end": {
-      "line": 52,
+      "line": 60,
       "column": 3
     }
   },
@@ -121,11 +147,11 @@
     "defaultMessage": "!!!Advanced",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 53,
+      "line": 61,
       "column": 20
     },
     "end": {
-      "line": 56,
+      "line": 64,
       "column": 3
     }
   },
@@ -134,11 +160,11 @@
     "defaultMessage": "!!!Help us to translate Ferdi into your language.",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 57,
+      "line": 65,
       "column": 19
     },
     "end": {
-      "line": 60,
+      "line": 68,
       "column": 3
     }
   },
@@ -147,11 +173,11 @@
     "defaultMessage": "!!!Cache",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 61,
+      "line": 69,
       "column": 20
     },
     "end": {
-      "line": 64,
+      "line": 72,
       "column": 3
     }
   },
@@ -160,11 +186,11 @@
     "defaultMessage": "!!!Ferdi cache is currently using {size} of disk space.",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 65,
+      "line": 73,
       "column": 13
     },
     "end": {
-      "line": 68,
+      "line": 76,
       "column": 3
     }
   },
@@ -173,11 +199,11 @@
     "defaultMessage": "!!!Clear cache",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 69,
+      "line": 77,
       "column": 23
     },
     "end": {
-      "line": 72,
+      "line": 80,
       "column": 3
     }
   },
@@ -186,11 +212,11 @@
     "defaultMessage": "!!!Check for updates",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 73,
+      "line": 81,
       "column": 25
     },
     "end": {
-      "line": 76,
+      "line": 84,
       "column": 3
     }
   },
@@ -199,11 +225,11 @@
     "defaultMessage": "!!!Restart & install update",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 77,
+      "line": 85,
       "column": 23
     },
     "end": {
-      "line": 80,
+      "line": 88,
       "column": 3
     }
   },
@@ -212,11 +238,11 @@
     "defaultMessage": "!!!Is searching for update",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 81,
+      "line": 89,
       "column": 25
     },
     "end": {
-      "line": 84,
+      "line": 92,
       "column": 3
     }
   },
@@ -225,11 +251,11 @@
     "defaultMessage": "!!!Update available, downloading...",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 85,
+      "line": 93,
       "column": 25
     },
     "end": {
-      "line": 88,
+      "line": 96,
       "column": 3
     }
   },
@@ -238,11 +264,11 @@
     "defaultMessage": "!!!You are using the latest version of Ferdi",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 89,
+      "line": 97,
       "column": 24
     },
     "end": {
-      "line": 92,
+      "line": 100,
       "column": 3
     }
   },
@@ -251,11 +277,11 @@
     "defaultMessage": "!!!Current version:",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 93,
+      "line": 101,
       "column": 18
     },
     "end": {
-      "line": 96,
+      "line": 104,
       "column": 3
     }
   },
@@ -264,11 +290,11 @@
     "defaultMessage": "!!!Changes require restart",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 97,
+      "line": 105,
       "column": 29
     },
     "end": {
-      "line": 100,
+      "line": 108,
       "column": 3
     }
   },
@@ -277,11 +303,11 @@
     "defaultMessage": "!!!Official translations are English & German. All other languages are community based translations.",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 101,
+      "line": 109,
       "column": 22
     },
     "end": {
-      "line": 104,
+      "line": 112,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
index 83d9cefe8..da3d8d7f4 100644
--- a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
+++ b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
@@ -129,16 +129,55 @@
       "column": 3
     }
   },
+  {
+    "id": "settings.app.form.scheduledDNDEnabled",
+    "defaultMessage": "!!!Enable scheduled Do-not-Disturb",
+    "file": "src/containers/settings/EditSettingsScreen.js",
+    "start": {
+      "line": 68,
+      "column": 23
+    },
+    "end": {
+      "line": 71,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.form.scheduledDNDStart",
+    "defaultMessage": "!!!From",
+    "file": "src/containers/settings/EditSettingsScreen.js",
+    "start": {
+      "line": 72,
+      "column": 21
+    },
+    "end": {
+      "line": 75,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.form.scheduledDNDEnd",
+    "defaultMessage": "!!!To",
+    "file": "src/containers/settings/EditSettingsScreen.js",
+    "start": {
+      "line": 76,
+      "column": 19
+    },
+    "end": {
+      "line": 79,
+      "column": 3
+    }
+  },
   {
     "id": "settings.app.form.language",
     "defaultMessage": "!!!Language",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 68,
+      "line": 80,
       "column": 12
     },
     "end": {
-      "line": 71,
+      "line": 83,
       "column": 3
     }
   },
@@ -147,11 +186,11 @@
     "defaultMessage": "!!!Dark Mode",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 72,
+      "line": 84,
       "column": 12
     },
     "end": {
-      "line": 75,
+      "line": 87,
       "column": 3
     }
   },
@@ -160,11 +199,11 @@
     "defaultMessage": "!!!Display disabled services tabs",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 76,
+      "line": 88,
       "column": 24
     },
     "end": {
-      "line": 79,
+      "line": 91,
       "column": 3
     }
   },
@@ -173,11 +212,11 @@
     "defaultMessage": "!!!Show unread message badge when notifications are disabled",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 80,
+      "line": 92,
       "column": 29
     },
     "end": {
-      "line": 83,
+      "line": 95,
       "column": 3
     }
   },
@@ -186,11 +225,11 @@
     "defaultMessage": "!!!Enable spell checking",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 84,
+      "line": 96,
       "column": 23
     },
     "end": {
-      "line": 87,
+      "line": 99,
       "column": 3
     }
   },
@@ -199,11 +238,11 @@
     "defaultMessage": "!!!Enable GPU Acceleration",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 88,
+      "line": 100,
       "column": 25
     },
     "end": {
-      "line": 91,
+      "line": 103,
       "column": 3
     }
   },
@@ -212,11 +251,11 @@
     "defaultMessage": "!!!Include beta versions",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 92,
+      "line": 104,
       "column": 8
     },
     "end": {
-      "line": 95,
+      "line": 107,
       "column": 3
     }
   },
@@ -225,11 +264,11 @@
     "defaultMessage": "!!!Enable Franz Todos",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 96,
+      "line": 108,
       "column": 15
     },
     "end": {
-      "line": 99,
+      "line": 111,
       "column": 3
     }
   },
@@ -238,11 +277,11 @@
     "defaultMessage": "!!!Keep all workspaces loaded",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 100,
+      "line": 112,
       "column": 27
     },
     "end": {
-      "line": 103,
+      "line": 115,
       "column": 3
     }
   }
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index f88b14983..45350d8f5 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -11,6 +11,7 @@ import Store from './lib/Store';
 import Request from './lib/Request';
 import CachedRequest from './lib/CachedRequest';
 import { matchRoute } from '../helpers/routing-helpers';
+import { isInTimeframe } from '../helpers/schedule-helpers';
 import { workspaceStore } from '../features/workspaces';
 import { serviceLimitStore } from '../features/serviceLimit';
 import { RESTRICTION_TYPES } from '../models/Service';
@@ -422,6 +423,18 @@ export default class ServicesStore extends Store {
       });
     } else if (channel === 'notification') {
       const { options } = args[0];
+
+      // 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;
+      }
+
       if (service.recipe.hasNotificationSound || service.isMuted || this.stores.settings.all.app.isAppMuted) {
         Object.assign(options, {
           silent: true,
-- 
cgit v1.2.3-70-g09d2


From aa18d3b84ece4fbc864f6a4f4d3b84fbef564b48 Mon Sep 17 00:00:00 2001
From: vantezzen <hello@vantezzen.io>
Date: Mon, 23 Sep 2019 20:18:01 +0200
Subject: Fix lint

---
 package.json                                         |  2 +-
 src/components/services/content/ServiceWebview.js    | 20 +++++++++++++++++++-
 src/features/quickSwitch/Component.js                |  3 +++
 src/i18n/locales/defaultMessages.json                |  8 ++++----
 .../messages/src/features/quickSwitch/Component.json |  8 ++++----
 src/webview/recipe.js                                |  2 +-
 6 files changed, 32 insertions(+), 11 deletions(-)

(limited to 'src/components')

diff --git a/package.json b/package.json
index 39ad362b9..98f3e0ec4 100644
--- a/package.json
+++ b/package.json
@@ -173,7 +173,7 @@
   ],
   "husky": {
     "hooks": {
-      "pre-push": "npm run lint && npm run reformat-files && npm run apply-branding && npm run manage-translations"
+      "pre-push": "npm run lint && npm run reformat-files && npm run manage-translations && npm run apply-branding"
     }
   }
 }
diff --git a/src/components/services/content/ServiceWebview.js b/src/components/services/content/ServiceWebview.js
index 7252c695f..75b3d2cf0 100644
--- a/src/components/services/content/ServiceWebview.js
+++ b/src/components/services/content/ServiceWebview.js
@@ -1,10 +1,13 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
+import { observable, reaction } from 'mobx';
 import ElectronWebView from 'react-electron-web-view';
 
 import ServiceModel from '../../../models/Service';
 
+const debug = require('debug')('Ferdi:Services');
+
 @observer
 class ServiceWebview extends Component {
   static propTypes = {
@@ -13,7 +16,22 @@ class ServiceWebview extends Component {
     detachService: PropTypes.func.isRequired,
   };
 
-  webview = null;
+  @observable webview = null;
+
+  constructor(props) {
+    super(props);
+
+    reaction(
+      () => this.webview,
+      () => {
+        if (this.webview.view) {
+          this.webview.view.addEventListener('console-message', (e) => {
+            debug('Service logged a message:', e.message);
+          });
+        }
+      },
+    );
+  }
 
   componentWillUnmount() {
     const { service, detachService } = this.props;
diff --git a/src/features/quickSwitch/Component.js b/src/features/quickSwitch/Component.js
index 3217a3d93..ddbdbe304 100644
--- a/src/features/quickSwitch/Component.js
+++ b/src/features/quickSwitch/Component.js
@@ -1,4 +1,5 @@
 import React, { Component, createRef } from 'react';
+import { remote } from 'electron';
 import PropTypes from 'prop-types';
 import { observer, inject } from 'mobx-react';
 import { reaction } from 'mobx';
@@ -190,6 +191,8 @@ export default @injectSheet(styles) @inject('stores', 'actions') @observer class
     if (isModalVisible && !this.state.wasPrevVisible) {
       // Set focus back on current window if its in a service
       // TODO: Find a way to gain back focus
+      remote.getCurrentWindow().blurWebView();
+      remote.getCurrentWindow().webContents.focus();
 
       // The input "focus" attribute will only work on first modal open
       // Manually add focus to the input element
diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json
index de1712048..ccb81a9f3 100644
--- a/src/i18n/locales/defaultMessages.json
+++ b/src/i18n/locales/defaultMessages.json
@@ -4167,26 +4167,26 @@
         "defaultMessage": "!!!Search...",
         "end": {
           "column": 3,
-          "line": 17
+          "line": 18
         },
         "file": "src/features/quickSwitch/Component.js",
         "id": "feature.quickSwitch.search",
         "start": {
           "column": 10,
-          "line": 14
+          "line": 15
         }
       },
       {
         "defaultMessage": "!!!Select a service with TAB, ↑ and ↓. Open a service with ENTER.",
         "end": {
           "column": 3,
-          "line": 21
+          "line": 22
         },
         "file": "src/features/quickSwitch/Component.js",
         "id": "feature.quickSwitch.info",
         "start": {
           "column": 8,
-          "line": 18
+          "line": 19
         }
       }
     ],
diff --git a/src/i18n/messages/src/features/quickSwitch/Component.json b/src/i18n/messages/src/features/quickSwitch/Component.json
index 248925a37..f42e1af49 100644
--- a/src/i18n/messages/src/features/quickSwitch/Component.json
+++ b/src/i18n/messages/src/features/quickSwitch/Component.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Search...",
     "file": "src/features/quickSwitch/Component.js",
     "start": {
-      "line": 14,
+      "line": 15,
       "column": 10
     },
     "end": {
-      "line": 17,
+      "line": 18,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Select a service with TAB, ↑ and ↓. Open a service with ENTER.",
     "file": "src/features/quickSwitch/Component.js",
     "start": {
-      "line": 18,
+      "line": 19,
       "column": 8
     },
     "end": {
-      "line": 21,
+      "line": 22,
       "column": 3
     }
   }
diff --git a/src/webview/recipe.js b/src/webview/recipe.js
index e97013b3c..fca00fde2 100644
--- a/src/webview/recipe.js
+++ b/src/webview/recipe.js
@@ -114,7 +114,7 @@ class RecipeController {
       }
     }
 
-    if (this.settings.service.isDarkModeEnabled || this.settings.app.darkMode) {
+    if (this.settings.service.isDarkModeEnabled || this.settings.app.darkMode) {
       debug('Enable dark mode');
 
       // Check if recipe has a darkmode.css
-- 
cgit v1.2.3-70-g09d2