Merge pull request #47949 from FitseTLT/fix-mention-list-on-message-edit

Fix - Room - Rooms mention list does not appear in message edit mode
Expensify · Sep 6, 2024 · e0e7bc8 · e0e7bc8
2 parents 06c76c9 + 8ce3dbc
commit e0e7bc8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/pages/home/report/ReportActionItem.tsx b/src/pages/home/report/ReportActionItem.tsx
@@ -722,6 +722,7 @@ function ReportActionItem({
                                 action={action}
                                 draftMessage={draftMessage}
                                 reportID={report.reportID}
+                                policyID={report.policyID}
                                 index={index}
                                 ref={textInputRef}
                                 shouldDisableEmojiPicker={

diff --git a/src/pages/home/report/ReportActionItemMessageEdit.tsx b/src/pages/home/report/ReportActionItemMessageEdit.tsx
@@ -61,14 +61,17 @@ type ReportActionItemMessageEditProps = {
     /** ReportID that holds the comment we're editing */
     reportID: string;
 
+    /** PolicyID of the policy the report belongs to */
+    policyID?: string;
+
     /** Position index of the report action in the overall report FlatList view */
     index: number;
 
     /** Whether or not the emoji picker is disabled */
     shouldDisableEmojiPicker?: boolean;
 
     /** Whether report is from group policy */
-    isGroupPolicyReport?: boolean;
+    isGroupPolicyReport: boolean;
 };
 
 // native ids
@@ -81,7 +84,7 @@ const shouldUseForcedSelectionRange = shouldUseEmojiPickerSelection();
 const draftMessageVideoAttributeCache = new Map<string, string>();
 
 function ReportActionItemMessageEdit(
-    {action, draftMessage, reportID, index, isGroupPolicyReport, shouldDisableEmojiPicker = false}: ReportActionItemMessageEditProps,
+    {action, draftMessage, reportID, policyID, index, isGroupPolicyReport, shouldDisableEmojiPicker = false}: ReportActionItemMessageEditProps,
     forwardedRef: ForwardedRef<TextInput | HTMLTextAreaElement | undefined>,
 ) {
     const [preferredSkinTone] = useOnyx(ONYXKEYS.PREFERRED_EMOJI_SKIN_TONE, {initialValue: CONST.EMOJI_DEFAULT_SKIN_TONE});
@@ -532,7 +535,8 @@ function ReportActionItemMessageEdit(
                         isComposerFocused={textInputRef.current?.isFocused()}
                         updateComment={updateDraft}
                         measureParentContainerAndReportCursor={measureParentContainerAndReportCursor}
-                        isGroupPolicyReport={false}
+                        isGroupPolicyReport={isGroupPolicyReport}
+                        policyID={policyID}
                         value={draft}
                         selection={selection}
                         setSelection={setSelection}