From beb7719c72b02b77ec916d9f0f02a3d3440cee2a Mon Sep 17 00:00:00 2001
From: Shahzad Aziz <saziz@box.com>
Date: Wed, 11 Oct 2023 12:30:16 -0700
Subject: [PATCH] fix(activity-thread): Hide Modify option on comment if
 resolved

---
 .../comment/components/BaseCommentMenu.js      |  2 +-
 .../__tests__/BaseCommentMenu.test.js          | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/elements/content-sidebar/activity-feed/comment/components/BaseCommentMenu.js b/src/elements/content-sidebar/activity-feed/comment/components/BaseCommentMenu.js
index 2940d2705c..388afb4574 100644
--- a/src/elements/content-sidebar/activity-feed/comment/components/BaseCommentMenu.js
+++ b/src/elements/content-sidebar/activity-feed/comment/components/BaseCommentMenu.js
@@ -88,7 +88,7 @@ export const BaseCommentMenu = ({
                         <FormattedMessage {...messages.commentResolveMenuItem} />
                     </MenuItem>
                 )}
-                {canEdit && (
+                {canEdit && !isResolved && (
                     <MenuItem
                         data-resin-target={ACTIVITY_TARGETS.COMMENT_OPTIONS_EDIT}
                         data-testid="edit-comment"
diff --git a/src/elements/content-sidebar/activity-feed/comment/components/__tests__/BaseCommentMenu.test.js b/src/elements/content-sidebar/activity-feed/comment/components/__tests__/BaseCommentMenu.test.js
index e9580ffaa1..71ab6e18d2 100644
--- a/src/elements/content-sidebar/activity-feed/comment/components/__tests__/BaseCommentMenu.test.js
+++ b/src/elements/content-sidebar/activity-feed/comment/components/__tests__/BaseCommentMenu.test.js
@@ -65,6 +65,24 @@ describe('elements/content-sidebar/ActivityFeed/comment/BaseCommentMenu', () =>
         },
     );
 
+    test.each`
+        canEdit | isResolved | should
+        ${true} | ${false}   | ${'should'}
+        ${true} | ${true}    | ${'should NOT'}
+    `(
+        `$should render modify menu item when isResolved is $isResolved and canEdit is $canEdit`,
+        ({ canEdit, isResolved, should }) => {
+            const wrapper = getWrapper({ canEdit, isResolved });
+            const message = localize(messages.commentEditMenuItem.id);
+            openMenu(wrapper);
+            if (should === 'should') {
+                expect(wrapper.getByText(message)).toBeInTheDocument();
+            } else {
+                expect(wrapper.queryByText(message)).not.toBeInTheDocument();
+            }
+        },
+    );
+
     test.each`
         isConfirmingDelete | should
         ${true}            | ${'should'}