diff --git a/app/components/StepsOfStepper/ConfirmStep.tsx b/app/components/StepsOfStepper/ConfirmStep.tsx index 369281f..9a10f18 100644 --- a/app/components/StepsOfStepper/ConfirmStep.tsx +++ b/app/components/StepsOfStepper/ConfirmStep.tsx @@ -1,16 +1,11 @@ import React, { useEffect, useState } from 'react'; -import { remote } from 'electron'; +import { ipcRenderer } from 'electron'; import { Text } from '@blueprintjs/core'; import { Row, Col } from 'react-flexbox-grid'; import { useTranslation } from 'react-i18next'; import SharingSourcePreviewCard from '../SharingSourcePreviewCard'; -import SharingSessionService from '../../features/SharingSessionService'; import DeviceInfoCallout from '../DeviceInfoCallout'; -import SharingSession from '../../features/SharingSessionService/SharingSession'; - -const sharingSessionService = remote.getGlobal( - 'sharingSessionService' -) as SharingSessionService; +import { IpcEvents } from '../../main/IpcEvents.enum'; interface ConfirmStepProps { device: Device | null; @@ -19,23 +14,25 @@ interface ConfirmStepProps { export default function ConfirmStep(props: ConfirmStepProps) { const { t } = useTranslation(); const { device } = props; - const [sharingSession, setSharingSession] = useState< - SharingSession | undefined - >(); + const [ + waitingForConnectionSharingSessionSourceId, + setWaitingForConnectionSharingSessionSourceId, + ] = useState(); useEffect(() => { - if (sharingSessionService.waitingForConnectionSharingSession !== null) { - setSharingSession( - sharingSessionService.waitingForConnectionSharingSession - ); - } + ipcRenderer + .invoke(IpcEvents.GetWaitingForConnectionSharingSessionSourceId) + // eslint-disable-next-line promise/always-return + .then((id) => { + setWaitingForConnectionSharingSessionSourceId(id); + }) + .catch((e) => console.error(e)); }, []); return (
- {/* eslint-disable-next-line react/no-unescaped-entities */} {t('Check if all is OK and click Confirm')} @@ -51,7 +48,7 @@ export default function ConfirmStep(props: ConfirmStepProps) { diff --git a/app/main/IpcEvents.enum.ts b/app/main/IpcEvents.enum.ts index debad58..44be3e5 100644 --- a/app/main/IpcEvents.enum.ts +++ b/app/main/IpcEvents.enum.ts @@ -14,4 +14,5 @@ export enum IpcEvents { DisconnectAllDevices = 'disconnect-all-devices', AppLanguageChanged = 'app-language-changed', GetDesktopCapturerServiceSourcesMap = 'get-desktop-capturer-service-sources-map', + GetWaitingForConnectionSharingSessionSourceId = 'get-waiting-for-connection-sharing-session-source-id', } diff --git a/app/main/ipcMainHandlers.ts b/app/main/ipcMainHandlers.ts index 15339ca..c09bef9 100644 --- a/app/main/ipcMainHandlers.ts +++ b/app/main/ipcMainHandlers.ts @@ -206,4 +206,12 @@ export default function initIpcMainHandlers( } return res; }); + + ipcMain.handle( + IpcEvents.GetWaitingForConnectionSharingSessionSourceId, + () => { + return getDeskreenGlobal().sharingSessionService + .waitingForConnectionSharingSession?.desktopCapturerSourceID; + } + ); }