clear pending action from failure data

Author: samranahm

src/libs/ReportActionsUtils.ts

@@ -2269,7 +2269,7 @@ function getUpdateRoomDescriptionMessage(reportAction: ReportAction): string {
 
 function getRoomAvatarUpdatedMessage(reportAction: ReportAction): string {
     const originalMessage = getOriginalMessage(reportAction) as OriginalMessageChangeLog;
-    if (originalMessage?.avatarUrl) {
+    if (originalMessage?.avatarURL) {
         // eslint-disable-next-line @typescript-eslint/no-deprecated
         return translateLocal('roomChangeLog.changedRoomAvatar');
     }

src/libs/ReportUtils.ts

@@ -7717,7 +7717,7 @@ function buildOptimisticRoomDescriptionUpdatedReportAction(description: string):
 /**
  * Returns the necessary reportAction onyx data to indicate that the room avatar has been updated
  */
-function buildOptimisticRoomAvatarUpdatedReportAction(avatarUrl: string): OptimisticRoomAvatarUpdatedReportAction {
+function buildOptimisticRoomAvatarUpdatedReportAction(avatarURL: string): OptimisticRoomAvatarUpdatedReportAction {
     const now = DateUtils.getDBTime();
     return {
         reportActionID: rand64(),
@@ -7727,8 +7727,8 @@ function buildOptimisticRoomAvatarUpdatedReportAction(avatarUrl: string): Optimi
         message: [
             {
                 type: CONST.REPORT.MESSAGE.TYPE.COMMENT,
-                text: avatarUrl ? `changed room avatar` : 'removed the room avatar',
-                html: avatarUrl ? `<muted-text>changed room avatar</muted-text>` : '<muted-text>removed the room avatar</muted-text>',
+                text: avatarURL ? `changed the room avatar` : 'removed the room avatar',
+                html: avatarURL ? `<muted-text>changed the room avatar</muted-text>` : '<muted-text>removed the room avatar</muted-text>',
             },
         ],
         person: [
@@ -7739,7 +7739,7 @@ function buildOptimisticRoomAvatarUpdatedReportAction(avatarUrl: string): Optimi
             },
         ],
         originalMessage: {
-            avatarUrl,
+            avatarURL,
             lastModified: now,
         },
         created: now,

src/libs/actions/Report.ts

@@ -994,10 +994,10 @@ function updateGroupChatAvatar(reportID: string, file?: File | CustomRNImageMani
  * Updates the avatar for a policy room.
  */
 function updatePolicyRoomAvatar(reportID: string, file?: File | CustomRNImageManipulatorResult) {
-    const avatarUrl = file?.uri ?? '';
+    const avatarURL = file?.uri ?? '';
     const {optimisticData, successData, failureData} = buildUpdateReportAvatarOnyxData(reportID, file);
 
-    const optimisticAction = buildOptimisticRoomAvatarUpdatedReportAction(avatarUrl);
+    const optimisticAction = buildOptimisticRoomAvatarUpdatedReportAction(avatarURL);
     optimisticData.push({
         onyxMethod: Onyx.METHOD.MERGE,
         key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`,
@@ -1011,7 +1011,7 @@ function updatePolicyRoomAvatar(reportID: string, file?: File | CustomRNImageMan
         value: {
             lastActorAccountID: currentUserAccountID,
             lastVisibleActionCreated: optimisticAction.created,
-            lastMessageText: (optimisticAction?.message as Message[])?.at(0)?.text,
+            lastMessageText: (optimisticAction.message as Message[]).at(0)?.text,
         },
     });
 
@@ -1024,6 +1024,16 @@ function updatePolicyRoomAvatar(reportID: string, file?: File | CustomRNImageMan
         },
     });
 
+    failureData.push({
+        onyxMethod: Onyx.METHOD.MERGE,
+        key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`,
+        value: {
+            [optimisticAction.reportActionID]: {
+                pendingAction: null,
+            },
+        },
+    });
+
     const parameters: UpdateRoomAvatarParams = {reportID, file, reportActionID: optimisticAction.reportActionID};
     API.write(WRITE_COMMANDS.UPDATE_ROOM_AVATAR, parameters, {optimisticData, failureData, successData});
 }

src/types/onyx/OriginalMessage.ts

@@ -369,7 +369,7 @@ type OriginalMessageChangeLog = {
     categoryName?: string;
 
     /** Avatar URL of workspace room */
-    avatarUrl?: string;
+    avatarURL?: string;
 };
 
 /** Model of change log */