Merge pull request #33198 from bernhardoj/fix/32529-optimistic-add-is…

…-lost Fix a fail to add and edit/delete message doesn't get cleared when closing the error message
Expensify · Jan 8, 2024 · c0c4d64 · c0c4d64
2 parents 347a06e + 382a096
commit c0c4d64
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 4 deletions.
diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
@@ -2426,6 +2426,7 @@ function buildOptimisticAddCommentReportAction(text?: string, file?: File): Opti
             attachmentInfo,
             pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
             shouldShow: true,
+            isOptimisticAction: true,
         },
     };
 }
@@ -4116,6 +4117,11 @@ function getTaskAssigneeChatOnyxData(
                 value: optimisticAssigneeReport,
             },
         );
+        successData.push({
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${assigneeChatReportID}`,
+            value: {[optimisticAssigneeAddComment.reportAction.reportActionID ?? '']: {isOptimisticAction: null}},
+        });
         failureData.push({
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${assigneeChatReportID}`,

diff --git a/src/libs/actions/Report.ts b/src/libs/actions/Report.ts
@@ -369,7 +369,7 @@ function addActions(reportID: string, text = '', file?: File) {
     const successReportActions: OnyxCollection<NullishDeep<ReportAction>> = {};
 
     Object.entries(optimisticReportActions).forEach(([actionKey]) => {
-        successReportActions[actionKey] = {pendingAction: null};
+        successReportActions[actionKey] = {pendingAction: null, isOptimisticAction: null};
     });
 
     const successData: OnyxUpdate[] = [

diff --git a/src/libs/actions/ReportActions.ts b/src/libs/actions/ReportActions.ts
@@ -13,7 +13,7 @@ function clearReportActionErrors(reportID: string, reportAction: ReportAction) {
         return;
     }
 
-    if (reportAction.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD) {
+    if (reportAction.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD || reportAction.isOptimisticAction) {
         // Delete the optimistic action
         Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${originalReportID}`, {
             [reportAction.reportActionID]: null,

diff --git a/src/libs/actions/Task.js b/src/libs/actions/Task.js
@@ -191,7 +191,7 @@ function createTaskAndNavigate(parentReportID, title, description, assigneeEmail
     successData.push({
         onyxMethod: Onyx.METHOD.MERGE,
         key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${parentReportID}`,
-        value: {[optimisticAddCommentReport.reportAction.reportActionID]: {pendingAction: null}},
+        value: {[optimisticAddCommentReport.reportAction.reportActionID]: {pendingAction: null, isOptimisticAction: null}},
     });
 
     // FOR PARENT REPORT (SHARE DESTINATION)

diff --git a/src/pages/home/report/ReportActionItem.js b/src/pages/home/report/ReportActionItem.js
@@ -689,7 +689,9 @@ function ReportActionItem(props) {
                         <View style={StyleUtils.getReportActionItemStyle(hovered || isWhisper || isContextMenuActive || !_.isUndefined(props.draftMessage))}>
                             <OfflineWithFeedback
                                 onClose={() => ReportActions.clearReportActionErrors(props.report.reportID, props.action)}
-                                pendingAction={!_.isUndefined(props.draftMessage) ? null : props.action.pendingAction}
+                                pendingAction={
+                                    !_.isUndefined(props.draftMessage) ? null : props.action.pendingAction || (props.action.isOptimisticAction ? CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD : '')
+                                }
                                 shouldHideOnDelete={!ReportActionsUtils.isThreadParentMessage(props.action, props.report.reportID)}
                                 errors={props.action.errors}
                                 errorRowStyles={[styles.ml10, styles.mr2]}

diff --git a/src/types/onyx/ReportAction.ts b/src/types/onyx/ReportAction.ts
@@ -194,6 +194,9 @@ type ReportActionBase = {
 
     /** We manually add this field while sorting to detect the end of the list */
     isNewestReportAction?: boolean;
+
+    /** Flag for checking if data is from optimistic data */
+    isOptimisticAction?: boolean;
 };
 
 type ReportAction = ReportActionBase & OriginalMessage;