12 files changed, 4 insertions, 301 deletions

diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js
index 084d93ecd..b47a6040d 100644
--- a/src/components/layout/AppLayout.js
+++ b/src/components/layout/AppLayout.js
@@ -10,7 +10,6 @@ import { mdiFlash, mdiPowerPlug } from '@mdi/js';
 import InfoBar from '../ui/InfoBar';
 import { Component as BasicAuth } from '../../features/basicAuth';
 import { Component as QuickSwitch } from '../../features/quickSwitch';
-import { Component as NightlyBuilds } from '../../features/nightlyBuilds';
 import { Component as PublishDebugInfo } from '../../features/publishDebugInfo';
 import ErrorBoundary from '../util/ErrorBoundary';
 
@@ -193,7 +192,6 @@ class AppLayout extends Component {
               )}
               <BasicAuth />
               <QuickSwitch />
-              <NightlyBuilds />
               <PublishDebugInfo />
               {services}
               {children}
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index eab65f5e5..d17c804f0 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -9,7 +9,6 @@ import { mdiGithub, mdiOpenInNew } from '@mdi/js';
 import Form from '../../../lib/Form';
 import Button from '../../ui/Button';
 import Toggle from '../../ui/Toggle';
-import ToggleRaw from '../../ui/ToggleRaw';
 import Select from '../../ui/Select';
 import Input from '../../ui/Input';
 import Infobox from '../../ui/Infobox';
@@ -203,7 +202,6 @@ class EditSettingsForm extends Component {
     isDarkmodeEnabled: PropTypes.bool.isRequired,
     isAdaptableDarkModeEnabled: PropTypes.bool.isRequired,
     isSplitModeEnabled: PropTypes.bool.isRequired,
-    isNightlyEnabled: PropTypes.bool.isRequired,
     hasAddedTodosAsService: PropTypes.bool.isRequired,
     isOnline: PropTypes.bool.isRequired,
   };
@@ -252,7 +250,6 @@ class EditSettingsForm extends Component {
       isDarkmodeEnabled,
       isSplitModeEnabled,
       isTodosActivated,
-      isNightlyEnabled,
       hasAddedTodosAsService,
       isOnline,
     } = this.props;
@@ -770,17 +767,6 @@ class EditSettingsForm extends Component {
                 {automaticUpdates && (
                   <div>
                     <Toggle field={form.$('beta')} />
-                    <ToggleRaw
-                      field={{
-                        value: isNightlyEnabled,
-                        id: 'nightly',
-                        label: 'Include nightly versions',
-                        name: 'Nightly builds',
-                      }}
-                      onChange={
-                        window['ferdi'].features.nightlyBuilds.toggleFeature
-                      }
-                    />
                     {updateIsReadyToInstall ? (
                       <Button
                         label={intl.formatMessage(messages.buttonInstallUpdate)}
diff --git a/src/components/ui/ToggleRaw.js b/src/components/ui/ToggleRaw.js
deleted file mode 100644
index e482b97b4..000000000
--- a/src/components/ui/ToggleRaw.js
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * "Raw" Toggle - for usage without a MobX Form element
- */
-import { Component } from 'react';
-import PropTypes from 'prop-types';
-import { observer } from 'mobx-react';
-import classnames from 'classnames';
-
-class ToggleRaw extends Component {
-  static propTypes = {
-    onChange: PropTypes.func.isRequired,
-    field: PropTypes.shape({
-      value: PropTypes.bool.isRequired,
-      id: PropTypes.string,
-      name: PropTypes.string,
-      label: PropTypes.string,
-      error: PropTypes.string,
-    }).isRequired,
-    className: PropTypes.string,
-    showLabel: PropTypes.bool,
-    disabled: PropTypes.bool,
-  };
-
-  static defaultProps = {
-    className: '',
-    showLabel: true,
-    disabled: false,
-  };
-
-  onChange(e) {
-    const { onChange } = this.props;
-
-    onChange(e);
-  }
-
-  render() {
-    const { field, className, showLabel, disabled } = this.props;
-
-    return (
-      <div
-        className={classnames([
-          'franz-form__field',
-          'franz-form__toggle-wrapper',
-          'franz-form__toggle-disabled',
-          className,
-        ])}
-      >
-        <label
-          htmlFor={field.id}
-          className={classnames({
-            'franz-form__toggle': true,
-            'is-active': field.value,
-          })}
-        >
-          <div className="franz-form__toggle-button" />
-          <input
-            type="checkbox"
-            id={field.id}
-            name={field.name}
-            value={field.name}
-            checked={field.value}
-            onChange={e => (!disabled ? this.onChange(e) : null)}
-          />
-        </label>
-        {field.error && <div className={field.error}>{field.error}</div>}
-        {field.label && showLabel && (
-          <label className="franz-form__label" htmlFor={field.id}>
-            {field.label}
-          </label>
-        )}
-      </div>
-    );
-  }
-}
-
-export default observer(ToggleRaw);
diff --git a/src/config.ts b/src/config.ts
index 9600cc088..2079d7cc0 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -226,7 +226,6 @@ export const DEFAULT_APP_SETTINGS = {
   serviceRibbonWidth: 68,
   iconSize: iconSizeBias,
   sentry: false,
-  nightly: false,
   navigationBarBehaviour: 'custom',
   searchEngine: SEARCH_ENGINE_DDG,
   useVerticalStyle: false,
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js
index 3d215a0d7..78a0eac6f 100644
--- a/src/containers/settings/EditSettingsScreen.js
+++ b/src/containers/settings/EditSettingsScreen.js
@@ -229,7 +229,7 @@ const messages = defineMessages({
   },
   beta: {
     id: 'settings.app.form.beta',
-    defaultMessage: 'Include beta versions',
+    defaultMessage: 'Include pre-releases',
   },
   automaticUpdates: {
     id: 'settings.app.form.automaticUpdates',
@@ -743,7 +743,6 @@ class EditSettingsScreen extends Component {
           isUsingCustomTodoService={
             this.props.stores.todos.isUsingCustomTodoService
           }
-          isNightlyEnabled={this.props.stores.settings.app.nightly}
           hasAddedTodosAsService={services.isTodosServiceAdded}
           isOnline={app.isOnline}
         />
diff --git a/src/electron/ipc-api/autoUpdate.ts b/src/electron/ipc-api/autoUpdate.ts
index a41c1f6f4..aed87455e 100644
--- a/src/electron/ipc-api/autoUpdate.ts
+++ b/src/electron/ipc-api/autoUpdate.ts
@@ -18,14 +18,6 @@ export default (params: { mainWindow: BrowserWindow; settings: any }) => {
           autoUpdater.allowPrerelease = Boolean(
             params.settings.app.get('beta'),
           );
-          autoUpdater.channel = autoUpdater.allowPrerelease ? 'beta' : 'latest';
-
-          if (params.settings.app.get('nightly')) {
-            autoUpdater.allowPrerelease = Boolean(
-              params.settings.app.get('nightly'),
-            );
-            autoUpdater.channel = 'alpha';
-          }
 
           if (args.action === 'check') {
             debug('checking for update');
diff --git a/src/features/nightlyBuilds/Component.js b/src/features/nightlyBuilds/Component.js
deleted file mode 100644
index 216e35f65..000000000
--- a/src/features/nightlyBuilds/Component.js
+++ /dev/null
@@ -1,142 +0,0 @@
-import { Component } from 'react';
-import PropTypes from 'prop-types';
-import { observer, inject } from 'mobx-react';
-import injectSheet from 'react-jss';
-import { defineMessages, injectIntl } from 'react-intl';
-import { H1 } from '../../components/ui/headline';
-
-import Modal from '../../components/ui/Modal';
-import Button from '../../components/ui/Button';
-import { state as ModalState } from './store';
-import SettingsStore from '../../stores/SettingsStore';
-import UIStore from '../../stores/UIStore';
-import UserStore from '../../stores/UserStore';
-import globalMessages from '../../i18n/globalMessages';
-
-const messages = defineMessages({
-  title: {
-    id: 'feature.nightlyBuilds.title',
-    defaultMessage: 'Nightly Builds',
-  },
-  info: {
-    id: 'feature.nightlyBuilds.info',
-    defaultMessage:
-      "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
-  },
-  activate: {
-    id: 'feature.nightlyBuilds.activate',
-    defaultMessage: 'Activate',
-  },
-});
-
-const styles = theme => ({
-  modal: {
-    width: '80%',
-    maxWidth: 600,
-    background: theme.styleTypes.primary.contrast,
-    paddingTop: 30,
-  },
-  info: {
-    paddingBottom: 20,
-  },
-  headline: {
-    fontSize: 20,
-    marginBottom: 20,
-    marginTop: -27,
-  },
-  buttonContainer: {
-    display: 'flex',
-  },
-  button: {
-    width: '50%',
-    marginTop: 10,
-    cursor: 'pointer',
-  },
-  activateButton: {
-    marginRight: 10,
-    background: '#c45a5a !important',
-    color: '#ffffff !important',
-  },
-});
-
-class NightlyBuildsModal extends Component {
-  close() {
-    ModalState.isModalVisible = false;
-
-    const { ui } = this.props.actions;
-    ui.openSettings({ path: 'app' });
-  }
-
-  activate() {
-    const { settings, user } = this.props.actions;
-
-    settings.update({
-      type: 'app',
-      data: {
-        nightly: true,
-      },
-    });
-    user.update({
-      userData: {
-        nightly: true,
-      },
-    });
-    this.close();
-  }
-
-  render() {
-    const { isModalVisible } = ModalState;
-
-    const { classes } = this.props;
-
-    const { intl } = this.props;
-
-    return (
-      <Modal
-        isOpen={isModalVisible}
-        className={`${classes.modal} nightly-builds`}
-        shouldCloseOnOverlayClick
-        close={this.close.bind(this)}
-      >
-        <H1 className={classes.headline}>
-          {intl.formatMessage(messages.title)}
-        </H1>
-
-        <p className={classes.info}>{intl.formatMessage(messages.info)}</p>
-
-        <div className={classes.buttonContainer}>
-          <Button
-            type="button"
-            label={intl.formatMessage(messages.activate)}
-            className={`${classes.button} ${classes.activateButton}`}
-            onClick={() => this.activate()}
-          />
-          <Button
-            type="button"
-            label={intl.formatMessage(globalMessages.cancel)}
-            className={classes.button}
-            onClick={() => this.close()}
-          />
-        </div>
-      </Modal>
-    );
-  }
-}
-
-NightlyBuildsModal.propTypes = {
-  stores: PropTypes.shape({
-    settings: PropTypes.instanceOf(SettingsStore).isRequired,
-  }).isRequired,
-  actions: PropTypes.shape({
-    settings: PropTypes.instanceOf(SettingsStore).isRequired,
-    user: PropTypes.instanceOf(UserStore).isRequired,
-    ui: PropTypes.instanceOf(UIStore).isRequired,
-  }).isRequired,
-  classes: PropTypes.object.isRequired,
-};
-
-export default injectIntl(
-  injectSheet(styles)(
-    inject('stores', 'actions')(observer(NightlyBuildsModal)),
-  ),
-);
diff --git a/src/features/nightlyBuilds/index.ts b/src/features/nightlyBuilds/index.ts
deleted file mode 100644
index 14afbaf1b..000000000
--- a/src/features/nightlyBuilds/index.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import { state as ModalState } from './store';
-
-export { default as Component } from './Component';
-
-const debug = require('debug')('Ferdi:feature:nightlyBuilds');
-
-const state = ModalState;
-
-export default function initialize() {
-  debug('Initialize nightlyBuilds feature');
-
-  function showModal() {
-    state.isModalVisible = true;
-  }
-
-  function toggleFeature() {
-    if (window['ferdi'].stores.settings.app.nightly) {
-      window['ferdi'].actions.settings.update({
-        type: 'app',
-        data: {
-          nightly: false,
-        },
-      });
-      window['ferdi'].actions.user.update({
-        userData: {
-          nightly: false,
-        },
-      });
-    } else {
-      // We need to close the settings, otherwise the modal will be drawn under the settings window
-      window['ferdi'].actions.ui.closeSettings();
-      showModal();
-    }
-  }
-
-  window['ferdi'].features.nightlyBuilds = {
-    state,
-    showModal,
-    toggleFeature,
-  };
-}
diff --git a/src/features/nightlyBuilds/store.ts b/src/features/nightlyBuilds/store.ts
deleted file mode 100644
index ed06e5a7d..000000000
--- a/src/features/nightlyBuilds/store.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { observable } from 'mobx';
-
-const defaultState = {
-  isModalVisible: false,
-};
-
-export const state = observable(defaultState);
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index db528ac47..b6445b4bc 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -10,9 +10,6 @@
   "connectionLostBanner.informationLink": "What happened?",
   "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
   "feature.basicAuth.signIn": "Sign In",
-  "feature.nightlyBuilds.activate": "Activate",
-  "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
-  "feature.nightlyBuilds.title": "Nightly Builds",
   "feature.publishDebugInfo.error": "There was an error while trying to publish the debug information. Please try again later or view the console for more information.",
   "feature.publishDebugInfo.info": "Publishing your debug information helps us find issues and errors in Ferdi. By publishing your debug information you accept Ferdi Debugger's privacy policy and terms of service",
   "feature.publishDebugInfo.privacy": "Privacy policy",
@@ -201,7 +198,7 @@
   "settings.app.form.autoLaunchInBackground": "Open in background",
   "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start",
   "settings.app.form.automaticUpdates": "Enable updates",
-  "settings.app.form.beta": "Include beta versions",
+  "settings.app.form.beta": "Include pre-releases",
   "settings.app.form.clipboardNotifications": "Don't show notifications for clipboard events",
   "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
   "settings.app.form.confirmOnQuit": "Confirm when quitting Ferdi",
@@ -452,4 +449,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/stores/FeaturesStore.js b/src/stores/FeaturesStore.js
index 26a045314..e2c0c08ef 100644
--- a/src/stores/FeaturesStore.js
+++ b/src/stores/FeaturesStore.js
@@ -7,7 +7,6 @@ import serviceProxy from '../features/serviceProxy';
 import basicAuth from '../features/basicAuth';
 import workspaces from '../features/workspaces';
 import quickSwitch from '../features/quickSwitch';
-import nightlyBuilds from '../features/nightlyBuilds';
 import publishDebugInfo from '../features/publishDebugInfo';
 import communityRecipes from '../features/communityRecipes';
 import todos from '../features/todos';
@@ -70,7 +69,6 @@ export default class FeaturesStore extends Store {
     basicAuth();
     workspaces(this.stores, this.actions);
     quickSwitch();
-    nightlyBuilds();
     publishDebugInfo();
     communityRecipes(this.stores, this.actions);
     todos(this.stores, this.actions);
diff --git a/src/styles/features.scss b/src/styles/features.scss
index 80362b648..c6d982b25 100644
--- a/src/styles/features.scss
+++ b/src/styles/features.scss
@@ -23,6 +23,6 @@
   }
 }
 
-.theme__dark .publish-debug, .theme__dark .nightly-builds {
+.theme__dark .publish-debug {
   background: $dark-theme-gray-darkest;
 }