From ef80addf1d457ed0b0f640cd320d3dfbb9af558d Mon Sep 17 00:00:00 2001
From: mushka-n <nikitamushka@mail.ru>
Date: Fri, 20 Oct 2023 12:07:02 +0300
Subject: [PATCH] fixed missing isMe variable

---
 .../sub-components/ChangeRoomOwner/index.js                | 2 +-
 .../CreateEditRoomDialog/sub-components/SetRoomParams.js   | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/ChangeRoomOwner/index.js b/packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/ChangeRoomOwner/index.js
index df47431186..7d698aa460 100644
--- a/packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/ChangeRoomOwner/index.js
+++ b/packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/ChangeRoomOwner/index.js
@@ -33,7 +33,7 @@ const ChangeRoomOwner = ({
           <Text fontWeight={600} fontSize="13px">
             {roomOwner.displayName}
           </Text>
-          {roomOwner?.id === currentUserId && (
+          {roomOwner.id === currentUserId && (
             <Text className="me-label">({t("Common:MeLabel")})</Text>
           )}
         </div>
diff --git a/packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js b/packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js
index b9a390cc06..4f71e4a0f8 100644
--- a/packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js
+++ b/packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js
@@ -55,9 +55,13 @@ const SetRoomParams = ({
   enableThirdParty,
   setChangeRoomOwnerIsVisible,
   isAdmin,
+  userId,
 }) => {
   const [previewIcon, setPreviewIcon] = React.useState(null);
 
+  const isMe = userId === roomParams?.roomOwner?.id;
+  const canChangeRoomOwner = (isAdmin || isMe) && roomParams.roomOwner;
+
   const onChangeName = (e) => {
     setIsValidTitle(true);
     setRoomParams({ ...roomParams, title: e.target.value });
@@ -128,7 +132,7 @@ const SetRoomParams = ({
         />
       )} */}
 
-      {(isAdmin || isMe) && roomParams.roomOwner && (
+      {isEdit && canChangeRoomOwner && (
         <ChangeRoomOwner
           roomOwner={roomParams.roomOwner}
           onOwnerChange={onOwnerChange}
@@ -183,6 +187,7 @@ export default inject(({ auth, dialogsStore }) => {
   return {
     setChangeRoomOwnerIsVisible,
     isAdmin: user.isAdmin || user.isOwner,
+    userId: user.id,
   };
 })(
   observer(