fix: Regression - Emoji reaction not working - Issue 22235 (Original - 21826)

src/libs/actions/Report.js

@@ -1635,13 +1635,14 @@ function removeEmojiReaction(reportID, originalReportAction, emoji) {
 /**
  * Calls either addEmojiReaction or removeEmojiReaction depending on if the current user has reacted to the report action.
  * @param {String} reportID
- * @param {String} reportActionID
+ * @param {Object} action
  * @param {Object} emoji
  * @param {number} paramSkinTone
  * @returns {Promise}
  */
-function toggleEmojiReaction(reportID, reportActionID, emoji, paramSkinTone = preferredSkinTone) {
-    const reportAction = ReportActionsUtils.getReportAction(reportID, reportActionID);
+function toggleEmojiReaction(reportID, action, emoji, paramSkinTone = preferredSkinTone) {
+    const originalReportID = ReportUtils.getOriginalReportID(reportID, action);
+    const reportAction = ReportActionsUtils.getReportAction(originalReportID, action.reportActionID);
 
     if (_.isEmpty(reportAction)) {
         return;

src/pages/home/report/ContextMenu/ContextMenuActions.js

@@ -58,7 +58,7 @@ export default [
             };
 
             const onEmojiSelected = (emoji) => {
-                Report.toggleEmojiReaction(reportID, reportAction.reportActionID, emoji);
+                Report.toggleEmojiReaction(reportID, reportAction, emoji);
                 closeContextMenu();
             };
 

src/pages/home/report/ReportActionItem.js

@@ -199,7 +199,7 @@ function ReportActionItem(props) {
 
     const toggleReaction = useCallback(
         (emoji) => {
-            Report.toggleEmojiReaction(props.report.reportID, props.action.reportActionID, emoji);
+            Report.toggleEmojiReaction(props.report.reportID, props.action, emoji);
         },
         [props.report, props.action],
     );

tests/actions/ReportTest.js

@@ -656,7 +656,7 @@ describe('actions/Report', () => {
                 const resultAction = _.first(_.values(reportActions));
 
                 // Add a reaction to the comment
-                Report.toggleEmojiReaction(REPORT_ID, resultAction.reportActionID, EMOJI);
+                Report.toggleEmojiReaction(REPORT_ID, resultAction, EMOJI);
                 return waitForPromisesToResolve();
             })
             .then(() => {
@@ -665,7 +665,7 @@ describe('actions/Report', () => {
                 // Now we toggle the reaction while the skin tone has changed.
                 // As the emoji doesn't support skin tones, the emoji
                 // should get removed instead of added again.
-                Report.toggleEmojiReaction(REPORT_ID, resultAction.reportActionID, EMOJI, 2);
+                Report.toggleEmojiReaction(REPORT_ID, resultAction, EMOJI, 2);
                 return waitForPromisesToResolve();
             })
             .then(() => {