12 files changed, 23 insertions, 227 deletions

diff --git a/src/features/announcements/api.js b/src/features/announcements/api.js
index a7fe24bb1..962f3e694 100644
--- a/src/features/announcements/api.js
+++ b/src/features/announcements/api.js
@@ -1,14 +1,14 @@
-import { app } from '@electron/remote';
 import Request from '../../stores/lib/Request';
 import apiBase from '../../api/apiBase';
 import { GITHUB_FERDI_REPO_NAME, GITHUB_NIGHTLIES_REPO_NAME, GITHUB_ORG_NAME } from '../../config';
+import { ferdiVersion } from '../../environment';
 
 const debug = require('debug')('Ferdi:feature:announcements:api');
 
 export const announcementsApi = {
   async getCurrentVersion() {
     debug('getting current version of electron app');
-    return Promise.resolve(app.getVersion());
+    return Promise.resolve(ferdiVersion);
   },
 
   async getChangelog(version) {
diff --git a/src/features/announcements/index.js b/src/features/announcements/index.js
index 28f0b10ed..19930c5b1 100644
--- a/src/features/announcements/index.js
+++ b/src/features/announcements/index.js
@@ -24,8 +24,6 @@ export default function initAnnouncements(stores, actions) {
         announcementsStore.stop();
       }
     },
-    {
-      fireImmediately: true,
-    },
+    { fireImmediately: true },
   );
 }
diff --git a/src/features/appearance/index.js b/src/features/appearance/index.js
index 87651a3f4..c3425ba9c 100644
--- a/src/features/appearance/index.js
+++ b/src/features/appearance/index.js
@@ -235,8 +235,6 @@ export default function initAppearance(stores) {
     () => {
       updateStyle(settings.all.app);
     },
-    {
-      fireImmediately: true,
-    },
+    { fireImmediately: true },
   );
 }
diff --git a/src/features/nightlyBuilds/Component.js b/src/features/nightlyBuilds/Component.js
index 5a809aaf2..6e5941948 100644
--- a/src/features/nightlyBuilds/Component.js
+++ b/src/features/nightlyBuilds/Component.js
@@ -55,7 +55,7 @@ const styles = () => ({
   },
 });
 
-export default @injectSheet(styles) @inject('stores', 'actions') @observer class nightlyBuildsModal extends Component {
+export default @injectSheet(styles) @inject('stores', 'actions') @observer class NightlyBuildsModal extends Component {
   static contextTypes = {
     intl: intlShape,
   };
@@ -124,7 +124,7 @@ export default @injectSheet(styles) @inject('stores', 'actions') @observer class
   }
 }
 
-nightlyBuildsModal.wrappedComponent.propTypes = {
+NightlyBuildsModal.wrappedComponent.propTypes = {
   stores: PropTypes.shape({
     settings: PropTypes.instanceOf(SettingsStore).isRequired,
   }).isRequired,
diff --git a/src/features/quickSwitch/Component.js b/src/features/quickSwitch/Component.js
index 812f2c04b..78d5d94a0 100644
--- a/src/features/quickSwitch/Component.js
+++ b/src/features/quickSwitch/Component.js
@@ -118,8 +118,12 @@ export default @injectSheet(styles) @inject('stores', 'actions') @observer class
     this.openService = this.openService.bind(this);
 
     reaction(
-      () => ModalState.isModalVisible,
-      this._handleVisibilityChange,
+      () => (
+        ModalState.isModalVisible
+      ),
+      () => {
+        this._handleVisibilityChange();
+      },
     );
   }
 
diff --git a/src/features/settingsWS/index.js b/src/features/settingsWS/index.js
index 6711296da..7771421d6 100755
--- a/src/features/settingsWS/index.js
+++ b/src/features/settingsWS/index.js
@@ -22,8 +22,6 @@ export default function initSettingsWebSocket(stores, actions) {
         settingsStore.stop();
       }
     },
-    {
-      fireImmediately: true,
-    },
+    { fireImmediately: true },
   );
 }
diff --git a/src/features/shareFranz/Component.js b/src/features/shareFranz/Component.js
deleted file mode 100644
index cc2e81b70..000000000
--- a/src/features/shareFranz/Component.js
+++ /dev/null
@@ -1,159 +0,0 @@
-import React, { Component } from 'react';
-import PropTypes from 'prop-types';
-import { observer, inject } from 'mobx-react';
-import injectSheet from 'react-jss';
-import { defineMessages, intlShape } from 'react-intl';
-import { Button } from '@meetfranz/forms';
-import { H1, Icon } from '@meetfranz/ui';
-
-import {
-  mdiHeart, mdiEmail, mdiFacebookBox, mdiTwitter,
-} from '@mdi/js';
-import Modal from '../../components/ui/Modal';
-import { state } from './store';
-import ServicesStore from '../../stores/ServicesStore';
-
-const messages = defineMessages({
-  headline: {
-    id: 'feature.shareFranz.headline',
-    defaultMessage: '!!!Ferdi is better together!',
-  },
-  text: {
-    id: 'feature.shareFranz.text',
-    defaultMessage: '!!!Tell your friends and colleagues how awesome Ferdi is and help us to spread the word.',
-  },
-  actionsEmail: {
-    id: 'feature.shareFranz.action.email',
-    defaultMessage: '!!!Share as email',
-  },
-  actionsFacebook: {
-    id: 'feature.shareFranz.action.facebook',
-    defaultMessage: '!!!Share on Facebook',
-  },
-  actionsTwitter: {
-    id: 'feature.shareFranz.action.twitter',
-    defaultMessage: '!!!Share on Twitter',
-  },
-  shareTextEmail: {
-    id: 'feature.shareFranz.shareText.email',
-    defaultMessage: '!!! I\'ve added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com',
-  },
-  shareTextTwitter: {
-    id: 'feature.shareFranz.shareText.twitter',
-    defaultMessage: '!!! I\'ve added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com /cc @FranzMessenger',
-  },
-});
-
-const styles = (theme) => ({
-  modal: {
-    width: '80%',
-    maxWidth: 600,
-    background: theme.styleTypes.primary.accent,
-    textAlign: 'center',
-    color: theme.styleTypes.primary.contrast,
-  },
-  heartContainer: {
-    display: 'flex',
-    justifyContent: 'center',
-    borderRadius: '100%',
-    background: theme.brandDanger,
-    padding: 20,
-    width: 100,
-    height: 100,
-    margin: [-70, 'auto', 30],
-  },
-  heart: {
-    fill: theme.styleTypes.primary.contrast,
-  },
-  headline: {
-    textAlign: 'center',
-    fontSize: 40,
-    marginBottom: 20,
-  },
-  actions: {
-    display: 'flex',
-    justifyContent: 'space-between',
-    marginTop: 30,
-  },
-  cta: {
-    background: theme.styleTypes.primary.contrast,
-    color: `${theme.styleTypes.primary.accent} !important`,
-
-    '& svg': {
-      fill: theme.styleTypes.primary.accent,
-    },
-  },
-});
-
-export default @injectSheet(styles) @inject('stores') @observer class ShareFranzModal extends Component {
-  static propTypes = {
-    classes: PropTypes.object.isRequired,
-  };
-
-  static contextTypes = {
-    intl: intlShape,
-  };
-
-  close() {
-    state.isModalVisible = false;
-  }
-
-  render() {
-    const { isModalVisible } = state;
-
-    const {
-      classes,
-      stores,
-    } = this.props;
-
-    const serviceCount = stores.services.all.length;
-
-    const { intl } = this.context;
-
-    return (
-      <Modal
-        isOpen={isModalVisible}
-        className={classes.modal}
-        shouldCloseOnOverlayClick
-        close={this.close.bind(this)}
-      >
-        <div className={classes.heartContainer}>
-          <Icon icon={mdiHeart} className={classes.heart} size={4} />
-        </div>
-        <H1 className={classes.headline}>
-          {intl.formatMessage(messages.headline)}
-        </H1>
-        <p>{intl.formatMessage(messages.text)}</p>
-        <div className={classes.actions}>
-          <Button
-            label={intl.formatMessage(messages.actionsEmail)}
-            className={classes.cta}
-            icon={mdiEmail}
-            href={`mailto:?subject=Meet the cool app Franz&body=${intl.formatMessage(messages.shareTextEmail, { count: serviceCount })}}`}
-            target="_blank"
-          />
-          <Button
-            label={intl.formatMessage(messages.actionsFacebook)}
-            className={classes.cta}
-            icon={mdiFacebookBox}
-            href="https://www.facebook.com/sharer/sharer.php?u=https://www.meetfranz.com?utm_source=facebook&utm_medium=referral&utm_campaign=share-button"
-            target="_blank"
-          />
-          <Button
-            label={intl.formatMessage(messages.actionsTwitter)}
-            className={classes.cta}
-            icon={mdiTwitter}
-            href={`http://twitter.com/intent/tweet?status=${intl.formatMessage(messages.shareTextTwitter, { count: serviceCount })}`}
-            target="_blank"
-          />
-        </div>
-      </Modal>
-    );
-  }
-}
-
-ShareFranzModal.wrappedComponent.propTypes = {
-  stores: PropTypes.shape({
-    services: PropTypes.instanceOf(ServicesStore).isRequired,
-  }).isRequired,
-};
diff --git a/src/features/shareFranz/index.js b/src/features/shareFranz/index.js
deleted file mode 100644
index 9add0f65e..000000000
--- a/src/features/shareFranz/index.js
+++ /dev/null
@@ -1,35 +0,0 @@
-import { reaction } from 'mobx';
-import ms from 'ms';
-import { state as ModalState } from './store';
-
-export { default as Component } from './Component';
-
-const debug = require('debug')('Ferdi:feature:shareFranz');
-
-const state = ModalState;
-
-export default function initialize(stores) {
-  debug('Initialize shareFerdi feature');
-
-  window.ferdi.features.shareFerdi = {
-    state,
-  };
-
-  function showModal() {
-    debug('Would have showed share window');
-  }
-
-  reaction(
-    () => stores.user.isLoggedIn,
-    () => {
-      setTimeout(() => {
-        if (stores.settings.stats.appStarts % 50 === 0) {
-          showModal();
-        }
-      }, ms('2s'));
-    },
-    {
-      fireImmediately: true,
-    },
-  );
-}
diff --git a/src/features/shareFranz/store.js b/src/features/shareFranz/store.js
deleted file mode 100644
index c637e9eff..000000000
--- a/src/features/shareFranz/store.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { observable } from 'mobx';
-
-const defaultState = {
-  isModalVisible: false,
-  lastShown: null,
-};
-
-export const state = observable(defaultState);
diff --git a/src/features/todos/index.js b/src/features/todos/index.js
index 1c6c9179a..55956d1d7 100644
--- a/src/features/todos/index.js
+++ b/src/features/todos/index.js
@@ -13,7 +13,9 @@ export default function initTodos(stores, actions) {
 
   // Toggle todos feature
   reaction(
-    () => features.features.isTodosEnabled,
+    () => (
+      features.features.isTodosEnabled
+    ),
     (isEnabled) => {
       if (isEnabled) {
         debug('Initializing `todos` feature');
@@ -23,8 +25,6 @@ export default function initTodos(stores, actions) {
         todosStore.stop();
       }
     },
-    {
-      fireImmediately: true,
-    },
+    { fireImmediately: true },
   );
 }
diff --git a/src/features/workspaces/components/WorkspaceDrawerItem.js b/src/features/workspaces/components/WorkspaceDrawerItem.js
index fff607330..252158364 100644
--- a/src/features/workspaces/components/WorkspaceDrawerItem.js
+++ b/src/features/workspaces/components/WorkspaceDrawerItem.js
@@ -5,7 +5,7 @@ import { observer } from 'mobx-react';
 import injectSheet from 'react-jss';
 import classnames from 'classnames';
 import { defineMessages, intlShape } from 'react-intl';
-import { altKey, shortcutKey } from '../../../environment';
+import { altKey, cmdOrCtrlShortcutKey } from '../../../environment';
 
 const messages = defineMessages({
   noServicesAddedYet: {
@@ -125,7 +125,7 @@ class WorkspaceDrawerItem extends Component {
           onContextMenuEditClick && contextMenu.popup(getCurrentWindow())
         }
         data-tip={`${
-          shortcutIndex <= 9 ? `(${shortcutKey(false)}+${altKey}+${shortcutIndex})` : ''
+          shortcutIndex <= 9 ? `(${cmdOrCtrlShortcutKey(false)}+${altKey(false)}+${shortcutIndex})` : ''
         }`}
       >
         <span
diff --git a/src/features/workspaces/index.js b/src/features/workspaces/index.js
index 3db6de5b2..83e4d9049 100644
--- a/src/features/workspaces/index.js
+++ b/src/features/workspaces/index.js
@@ -12,7 +12,9 @@ export default function initWorkspaces(stores, actions) {
 
   // Toggle workspace feature
   reaction(
-    () => features.features.isWorkspaceEnabled,
+    () => (
+      features.features.isWorkspaceEnabled
+    ),
     (isEnabled) => {
       if (isEnabled && !workspaceStore.isFeatureActive) {
         debug('Initializing `workspaces` feature');
@@ -23,8 +25,6 @@ export default function initWorkspaces(stores, actions) {
         resetApiRequests();
       }
     },
-    {
-      fireImmediately: true,
-    },
+    { fireImmediately: true },
   );
 }