From 296ce5ce62bcde6888df291f97105fa912ed7d35 Mon Sep 17 00:00:00 2001 From: Vijay Raghavan Aravamudhan Date: Wed, 26 May 2021 21:05:50 +0530 Subject: Replace 'remote' with 'electron/remote' (#1448) * Locked new version of 'recipes' submodule with corresponding changes. --- src/components/settings/settings/EditSettingsForm.js | 8 ++------ src/components/settings/supportFerdi/SupportFerdiDashboard.js | 4 +--- 2 files changed, 3 insertions(+), 9 deletions(-) (limited to 'src/components/settings') diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js index eef529730..28f456608 100644 --- a/src/components/settings/settings/EditSettingsForm.js +++ b/src/components/settings/settings/EditSettingsForm.js @@ -1,4 +1,4 @@ -import { remote } from 'electron'; +import { app, systemPreferences } from '@electron/remote'; import React, { Component, Fragment } from 'react'; import PropTypes from 'prop-types'; import { observer } from 'mobx-react'; @@ -19,10 +19,6 @@ import { } from '../../../config'; import { isMac, isWindows } from '../../../environment'; -const { - systemPreferences, -} = remote; - const messages = defineMessages({ headline: { id: 'settings.app.headline', @@ -665,7 +661,7 @@ export default @observer class EditSettingsForm extends Component { )} {intl.formatMessage(messages.currentVersion)} {' '} - {remote.app.getVersion()} + {app.getVersion()} {noUpdateAvailable && ( <>
diff --git a/src/components/settings/supportFerdi/SupportFerdiDashboard.js b/src/components/settings/supportFerdi/SupportFerdiDashboard.js index f6fc7c171..36c126565 100644 --- a/src/components/settings/supportFerdi/SupportFerdiDashboard.js +++ b/src/components/settings/supportFerdi/SupportFerdiDashboard.js @@ -1,10 +1,8 @@ import React, { Component } from 'react'; import { defineMessages, FormattedHTMLMessage, intlShape } from 'react-intl'; -import { remote } from 'electron'; +import { BrowserWindow } from '@electron/remote'; import InfoBar from '../../ui/InfoBar'; -const { BrowserWindow } = remote; - const messages = defineMessages({ headline: { id: 'settings.supportFerdi.headline', -- cgit v1.2.3-54-g00ecf