Merge pull request #29530 from dukenv0307/fix/27546

fix: Emojis, emoji picker icon, and edit icon are disappeared when hovering over notification from completed task
Expensify · Oct 16, 2023 · 63af51e · 63af51e
2 parents e38b53f + 0998012
commit 63af51e
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/libs/ReportUtils.js b/src/libs/ReportUtils.js
@@ -3596,7 +3596,8 @@ function shouldDisableWriteActions(report) {
  * @returns {String}
  */
 function getOriginalReportID(reportID, reportAction) {
-    return isThreadFirstChat(reportAction, reportID) ? lodashGet(allReports, [`${ONYXKEYS.COLLECTION.REPORT}${reportID}`, 'parentReportID']) : reportID;
+    const currentReportAction = ReportActionsUtils.getReportAction(reportID, reportAction.reportActionID);
+    return isThreadFirstChat(reportAction, reportID) && _.isEmpty(currentReportAction) ? lodashGet(allReports, [`${ONYXKEYS.COLLECTION.REPORT}${reportID}`, 'parentReportID']) : reportID;
 }
 
 /**