From 23a2738cece79a5fa70df79bc4e60dfdb0b8f66a Mon Sep 17 00:00:00 2001 From: Timothy Le Bon Date: Thu, 27 Oct 2022 18:13:15 +0200 Subject: [PATCH] fix: issue with sidebar context menu links --- .../renderer/src/components/context/ContextMenu.jsx | 2 +- .../src/components/context/EditAccountMenu.jsx | 10 +++++++--- electron/renderer/src/index.jsx | 9 +++++---- yarn.lock | 2 +- 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/electron/renderer/src/components/context/ContextMenu.jsx b/electron/renderer/src/components/context/ContextMenu.jsx index 132e0f83e43..008e11554fa 100644 --- a/electron/renderer/src/components/context/ContextMenu.jsx +++ b/electron/renderer/src/components/context/ContextMenu.jsx @@ -78,7 +78,7 @@ const ContextMenu = ({position, children, setAccountContextHidden}) => { }; return ( -
+
{children}
); diff --git a/electron/renderer/src/components/context/EditAccountMenu.jsx b/electron/renderer/src/components/context/EditAccountMenu.jsx index ae4dce2e7e4..ce06ec398ba 100644 --- a/electron/renderer/src/components/context/EditAccountMenu.jsx +++ b/electron/renderer/src/components/context/EditAccountMenu.jsx @@ -32,11 +32,15 @@ import {AccountSelector} from '../../selector/AccountSelector'; const EditAccountMenu = ({accountId, accountIndex, isAtLeastAdmin, lifecycle, sessionId, ...connected}) => { return ( - {isAtLeastAdmin && ( - window.open('https://teams.wire.com/login/')}> + {/* This appears to have been broken for some time. Removing it for the time being until a proper fix can be applied + https://wearezeta.atlassian.net/browse/FS-1124 + {isAtLeastAdmin && ( + { + window.open('https://teams.wire.com/login/'); + }}> {getText('wrapperManageTeam')} - )} + )} */} {lifecycle === EVENT_TYPE.LIFECYCLE.SIGNED_IN && ( { diff --git a/electron/renderer/src/index.jsx b/electron/renderer/src/index.jsx index 6fbae1bf9a0..9eef06a5919 100644 --- a/electron/renderer/src/index.jsx +++ b/electron/renderer/src/index.jsx @@ -18,9 +18,8 @@ */ import React from 'react'; -import {render} from 'react-dom'; import {Provider} from 'react-redux'; - +import {createRoot} from 'react-dom/client'; import {EVENT_TYPE} from '../../dist/lib/eventType'; import App from './components/App'; import configureStore from './configureStore'; @@ -43,9 +42,11 @@ window.addEventListener( ); window.addEventListener(EVENT_TYPE.ACTION.START_LOGIN, event => store.dispatch(addAccountWithSession()), false); -render( +const container = document.getElementById('root'); +const root = createRoot(container); + +root.render( , - document.getElementById('root'), ); diff --git a/yarn.lock b/yarn.lock index 77af1361939..e92e653b12f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8171,7 +8171,7 @@ oauth-sign@~0.9.0: object-assign@^4.1.1: version "4.1.1" resolved "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" - integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= + integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg== object-inspect@^1.12.2, object-inspect@^1.7.0, object-inspect@^1.8.0, object-inspect@^1.9.0: version "1.12.2"