From 77d93847246ffaefa2de3c132297d44710d59c7f Mon Sep 17 00:00:00 2001 From: dhairyashil Date: Tue, 7 Jan 2025 02:35:04 +0530 Subject: [PATCH 1/2] Feat: Conditionally show 'Edit Message' button based on attachment description --- packages/react/src/views/Message/MessageToolbox.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/react/src/views/Message/MessageToolbox.js b/packages/react/src/views/Message/MessageToolbox.js index f276ef82cf..5e697691f8 100644 --- a/packages/react/src/views/Message/MessageToolbox.js +++ b/packages/react/src/views/Message/MessageToolbox.js @@ -82,9 +82,7 @@ export const MessageToolbox = ({ ? true : message.u._id === authenticatedUserId; - const isVisibleForMessageType = - message.files?.[0].type !== 'audio/mpeg' && - message.files?.[0].type !== 'video/mp4'; + const isVisibleForMessage = message.attachments?.[0].description !== ''; const options = useMemo( () => ({ @@ -136,7 +134,7 @@ export const MessageToolbox = ({ id: 'edit', onClick: () => handleEditMessage(message), iconName: 'edit', - visible: isAllowedToEditMessage && isVisibleForMessageType, + visible: isAllowedToEditMessage && isVisibleForMessage, color: isEditing ? 'secondary' : 'default', ghost: !isEditing, }, From fd3424351083ad750db85c36c891254614df90a2 Mon Sep 17 00:00:00 2001 From: dhairyashil Date: Tue, 7 Jan 2025 11:07:53 +0530 Subject: [PATCH 2/2] Edit option visible to all message types --- packages/react/src/views/Message/MessageToolbox.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/react/src/views/Message/MessageToolbox.js b/packages/react/src/views/Message/MessageToolbox.js index 5e697691f8..e7dc070237 100644 --- a/packages/react/src/views/Message/MessageToolbox.js +++ b/packages/react/src/views/Message/MessageToolbox.js @@ -82,8 +82,6 @@ export const MessageToolbox = ({ ? true : message.u._id === authenticatedUserId; - const isVisibleForMessage = message.attachments?.[0].description !== ''; - const options = useMemo( () => ({ reply: { @@ -134,7 +132,7 @@ export const MessageToolbox = ({ id: 'edit', onClick: () => handleEditMessage(message), iconName: 'edit', - visible: isAllowedToEditMessage && isVisibleForMessage, + visible: isAllowedToEditMessage, color: isEditing ? 'secondary' : 'default', ghost: !isEditing, },