Merge pull request #28519 from abdel-h66/issue-28059-fix-emoji-reacti…

…ons-in-offline-mode Issue 28059 fix emoji reactions in offline mode
Expensify · Oct 4, 2023 · f709b8d · f709b8d
2 parents 96c6c51 + b0145f1
commit f709b8d
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 16 deletions.
diff --git a/src/components/Reactions/ReportActionItemEmojiReactions.js b/src/components/Reactions/ReportActionItemEmojiReactions.js
@@ -1,4 +1,5 @@
 import React, {useRef, useContext} from 'react';
+import lodashGet from 'lodash/get';
 import _ from 'underscore';
 import {View} from 'react-native';
 import PropTypes from 'prop-types';
@@ -14,12 +15,14 @@ import Tooltip from '../Tooltip';
 import ReactionTooltipContent from './ReactionTooltipContent';
 import * as EmojiUtils from '../../libs/EmojiUtils';
 import {ReactionListContext} from '../../pages/home/ReportScreenContext';
+import OfflineWithFeedback from '../OfflineWithFeedback';
+import reportActionPropTypes from '../../pages/home/report/reportActionPropTypes';
 
 const propTypes = {
     emojiReactions: EmojiReactionsPropTypes,
 
-    /** The ID of the reportAction. It is the string representation of the a 64-bit integer. */
-    reportActionID: PropTypes.string.isRequired,
+    /** The report action that these reactions are for */
+    reportAction: PropTypes.shape(reportActionPropTypes).isRequired,
 
     /**
      * Function to call when the user presses on an emoji.
@@ -46,6 +49,9 @@ function ReportActionItemEmojiReactions(props) {
 
     let totalReactionCount = 0;
 
+    const reportAction = props.reportAction;
+    const reportActionID = reportAction.reportActionID;
+
     // Each emoji is sorted by the oldest timestamp of user reactions so that they will always appear in the same order for everyone
     const sortedReactions = _.sortBy(props.emojiReactions, (emojiReaction, emojiName) => {
         // Since the emojiName is only stored as the object key, when _.sortBy() runs, the object is converted to an array and the
@@ -96,7 +102,7 @@ function ReportActionItemEmojiReactions(props) {
         };
 
         const onReactionListOpen = (event) => {
-            reactionListRef.current.showReactionList(event, popoverReactionListAnchors.current[reactionEmojiName], reactionEmojiName, props.reportActionID);
+            reactionListRef.current.showReactionList(event, popoverReactionListAnchors.current[reactionEmojiName], reactionEmojiName, reportActionID);
         };
 
         return {
@@ -108,6 +114,7 @@ function ReportActionItemEmojiReactions(props) {
             reactionCount,
             hasUserReacted,
             onReactionListOpen,
+            pendingAction: reaction.pendingAction,
         };
     });
 
@@ -132,24 +139,29 @@ function ReportActionItemEmojiReactions(props) {
                             key={reaction.reactionEmojiName}
                         >
                             <View>
-                                <EmojiReactionBubble
-                                    ref={(ref) => (popoverReactionListAnchors.current[reaction.reactionEmojiName] = ref)}
-                                    count={reaction.reactionCount}
-                                    emojiCodes={reaction.emojiCodes}
-                                    onPress={reaction.onPress}
-                                    reactionUsers={reaction.reactionUsers}
-                                    hasUserReacted={reaction.hasUserReacted}
-                                    onReactionListOpen={reaction.onReactionListOpen}
-                                    shouldBlockReactions={props.shouldBlockReactions}
-                                />
+                                <OfflineWithFeedback
+                                    pendingAction={reaction.pendingAction}
+                                    shouldDisableOpacity={Boolean(lodashGet(reportAction, 'pendingAction'))}
+                                >
+                                    <EmojiReactionBubble
+                                        ref={(ref) => (popoverReactionListAnchors.current[reaction.reactionEmojiName] = ref)}
+                                        count={reaction.reactionCount}
+                                        emojiCodes={reaction.emojiCodes}
+                                        onPress={reaction.onPress}
+                                        reactionUsers={reaction.reactionUsers}
+                                        hasUserReacted={reaction.hasUserReacted}
+                                        onReactionListOpen={reaction.onReactionListOpen}
+                                        shouldBlockReactions={props.shouldBlockReactions}
+                                    />
+                                </OfflineWithFeedback>
                             </View>
                         </Tooltip>
                     );
                 })}
                 {!props.shouldBlockReactions && (
                     <AddReactionBubble
                         onSelectEmoji={props.toggleReaction}
-                        reportAction={{reportActionID: props.reportActionID}}
+                        reportAction={{reportActionID}}
                     />
                 )}
             </View>

diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js
@@ -1747,6 +1747,7 @@ function addEmojiReaction(reportID, reportActionID, emoji, skinTone = preferredS
             value: {
                 [emoji.name]: {
                     createdAt,
+                    pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
                     users: {
                         [currentUserAccountID]: {
                             skinTones: {
@@ -1759,6 +1760,30 @@ function addEmojiReaction(reportID, reportActionID, emoji, skinTone = preferredS
         },
     ];
 
+    const failureData = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS_REACTIONS}${reportActionID}`,
+            value: {
+                [emoji.name]: {
+                    pendingAction: null,
+                },
+            },
+        },
+    ];
+
+    const successData = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS_REACTIONS}${reportActionID}`,
+            value: {
+                [emoji.name]: {
+                    pendingAction: null,
+                },
+            },
+        },
+    ];
+
     const parameters = {
         reportID,
         skinTone,
@@ -1768,7 +1793,7 @@ function addEmojiReaction(reportID, reportActionID, emoji, skinTone = preferredS
         // This will be removed as part of https://github.com/Expensify/App/issues/19535
         useEmojiReactions: true,
     };
-    API.write('AddEmojiReaction', parameters, {optimisticData});
+    API.write('AddEmojiReaction', parameters, {optimisticData, successData, failureData});
 }
 
 /**

diff --git a/src/pages/home/report/ReportActionItem.js b/src/pages/home/report/ReportActionItem.js
@@ -442,7 +442,7 @@ function ReportActionItem(props) {
                 {!ReportActionsUtils.isMessageDeleted(props.action) && (
                     <View style={draftMessageRightAlign}>
                         <ReportActionItemEmojiReactions
-                            reportActionID={props.action.reportActionID}
+                            reportAction={props.action}
                             emojiReactions={props.emojiReactions}
                             shouldBlockReactions={hasErrors}
                             toggleReaction={(emoji) => {