5 files changed, 9 insertions, 19 deletions

diff --git a/src/features/announcements/api.js b/src/features/announcements/api.js
index e5c5a7d6f..2ab5a15b2 100644
--- a/src/features/announcements/api.js
+++ b/src/features/announcements/api.js
@@ -1,4 +1,4 @@
-import { remote } from 'electron';
+import { app } from '@electron/remote';
 import Request from '../../stores/lib/Request';
 
 const debug = require('debug')('Ferdi:feature:announcements:api');
@@ -6,7 +6,7 @@ const debug = require('debug')('Ferdi:feature:announcements:api');
 export const announcementsApi = {
   async getCurrentVersion() {
     debug('getting current version of electron app');
-    return Promise.resolve(remote.app.getVersion());
+    return Promise.resolve(app.getVersion());
   },
 
   async getChangelog(version) {
diff --git a/src/features/planSelection/containers/PlanSelectionScreen.js b/src/features/planSelection/containers/PlanSelectionScreen.js
index e4d85cda5..fba65506e 100644
--- a/src/features/planSelection/containers/PlanSelectionScreen.js
+++ b/src/features/planSelection/containers/PlanSelectionScreen.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import { observer, inject } from 'mobx-react';
 import PropTypes from 'prop-types';
-import { remote } from 'electron';
+import { dialog, app } from '@electron/remote';
 import { defineMessages, intlShape } from 'react-intl';
 
 import FeaturesStore from '../../../stores/FeaturesStore';
@@ -10,8 +10,6 @@ import PlanSelection from '../components/PlanSelection';
 import ErrorBoundary from '../../../components/util/ErrorBoundary';
 import { planSelectionStore } from '..';
 
-const { dialog, app } = remote;
-
 const messages = defineMessages({
   dialogTitle: {
     id: 'feature.planSelection.fullscreen.dialog.title',
diff --git a/src/features/quickSwitch/Component.js b/src/features/quickSwitch/Component.js
index 58479e7ef..c5c320f52 100644
--- a/src/features/quickSwitch/Component.js
+++ b/src/features/quickSwitch/Component.js
@@ -1,5 +1,5 @@
 import React, { Component, createRef } from 'react';
-import { remote } from 'electron';
+import { getCurrentWindow } from '@electron/remote';
 import PropTypes from 'prop-types';
 import { observer, inject } from 'mobx-react';
 import { reaction } from 'mobx';
@@ -244,8 +244,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();
+      getCurrentWindow().blurWebView();
+      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/features/serviceProxy/index.js b/src/features/serviceProxy/index.js
index e78607667..f74f5f0b2 100644
--- a/src/features/serviceProxy/index.js
+++ b/src/features/serviceProxy/index.js
@@ -1,9 +1,5 @@
 import { autorun, observable } from 'mobx';
-import { remote } from 'electron';
-
-// import { DEFAULT_FEATURES_CONFIG } from '../../config';
-
-const { session } = remote;
+import { session } from '@electron/remote';
 
 const debug = require('debug')('Ferdi:feature:serviceProxy');
 
@@ -16,8 +12,6 @@ export default function init(stores) {
   debug('Initializing `serviceProxy` feature');
 
   autorun(() => {
-    // const { isServiceProxyEnabled, isServiceProxyIncludedInCurrentPlan } = stores.features.features;
-
     config.isEnabled = true;
     config.isIncludedInCurrentPlan = true;
 
diff --git a/src/features/workspaces/components/WorkspaceDrawerItem.js b/src/features/workspaces/components/WorkspaceDrawerItem.js
index 18f424d8a..2e58b70d6 100644
--- a/src/features/workspaces/components/WorkspaceDrawerItem.js
+++ b/src/features/workspaces/components/WorkspaceDrawerItem.js
@@ -1,4 +1,4 @@
-import { remote } from 'electron';
+import { Menu, getCurrentWindow } from '@electron/remote';
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
@@ -7,8 +7,6 @@ import classnames from 'classnames';
 import { defineMessages, intlShape } from 'react-intl';
 import { ctrlKey } from '../../../environment';
 
-const { Menu } = remote;
-
 const messages = defineMessages({
   noServicesAddedYet: {
     id: 'workspaceDrawer.item.noServicesAddedYet',
@@ -113,7 +111,7 @@ class WorkspaceDrawerItem extends Component {
         ])}
         onClick={onClick}
         onContextMenu={() => (
-          onContextMenuEditClick && contextMenu.popup(remote.getCurrentWindow())
+          onContextMenuEditClick && contextMenu.popup(getCurrentWindow())
         )}
         data-tip={`${shortcutIndex <= 9 ? `(${ctrlKey}+Alt+${shortcutIndex})` : ''}`}
       >