add: originalFileName to report onyx

Expensify · Jun 12, 2024 · 9d4a66f · 9d4a66f
1 parent 6d6953f
commit 9d4a66f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/src/libs/actions/Report.ts b/src/libs/actions/Report.ts
@@ -673,6 +673,7 @@ function updateGroupChatAvatar(reportID: string, file?: File | CustomRNImageMani
             key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
             value: {
                 avatarUrl: file?.uri ?? '',
+                originalFileName: file?.name ?? '',
                 pendingFields: {
                     avatar: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
                 },
@@ -689,6 +690,7 @@ function updateGroupChatAvatar(reportID: string, file?: File | CustomRNImageMani
             key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
             value: {
                 avatarUrl: currentReportData?.[reportID]?.avatarUrl ?? null,
+                originalFileName: currentReportData?.[reportID]?.originalFileName ?? null,
                 pendingFields: {
                     avatar: null,
                 },

diff --git a/src/pages/ReportAvatar.tsx b/src/pages/ReportAvatar.tsx
@@ -42,7 +42,7 @@ function ReportAvatar({report = {} as Report, policies, isLoadingApp = true, rou
     } else {
         avatarURL = policy ? ReportUtils.getWorkspaceAvatar(report) : report?.avatarUrl;
         // In the case of default workspace avatar, originalFileName prop takes policyID as value to get the color of the avatar
-        fileName = policy?.originalFileName ?? policy?.id ?? report?.policyID;
+        fileName = policy ? policy?.originalFileName ?? policy?.id ?? report?.policyID : report?.originalFileName;
         title = policy ? ReportUtils.getPolicyName(report, false, policy) : ReportUtils.getReportName(report);
         shouldShowNotFoundPage = !isLoadingApp && !report?.reportID;
     }

diff --git a/src/types/onyx/Report.ts b/src/types/onyx/Report.ts
@@ -71,6 +71,9 @@ type Report = OnyxCommon.OnyxValueWithOfflineFeedback<
         /** The URL of the Group Chat report custom avatar */
         avatarUrl?: string;
 
+        /** The file name of the Group Chat report custom avatar */
+        originalFileName?: string;
+
         /** The specific type of chat */
         chatType?: ValueOf<typeof CONST.REPORT.CHAT_TYPE>;