resolve comment

Expensify · Jul 15, 2024 · d89894c · d89894c
1 parent 31df927
commit d89894c
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 13 deletions.
diff --git a/src/pages/home/ReportScreen.tsx b/src/pages/home/ReportScreen.tsx
@@ -69,9 +69,6 @@ type ReportScreenOnyxProps = {
     /** The policies which the user has access to */
     policies: OnyxCollection<OnyxTypes.Policy>;
 
-    /** Additional report details */
-    reportNameValuePairs: OnyxEntry<OnyxTypes.ReportNameValuePairs>;
-
     /** The report metadata loading states */
     reportMetadata: OnyxEntry<OnyxTypes.ReportMetadata>;
 };
@@ -116,7 +113,6 @@ function getParentReportAction(parentReportActions: OnyxEntry<OnyxTypes.ReportAc
 function ReportScreen({
     betas = [],
     route,
-    reportNameValuePairs,
     reportMetadata = {
         isLoadingInitialReportActions: true,
         isLoadingOlderReportActions: false,
@@ -789,7 +785,6 @@ function ReportScreen({
                                         onComposerBlur={() => setIsComposerFocus(false)}
                                         report={report}
                                         reportMetadata={reportMetadata}
-                                        reportNameValuePairs={reportNameValuePairs}
                                         policy={policy}
                                         pendingAction={reportPendingAction}
                                         isComposerFullSize={!!isComposerFullSize}
@@ -815,10 +810,6 @@ export default withCurrentReportID(
             isSidebarLoaded: {
                 key: ONYXKEYS.IS_SIDEBAR_LOADED,
             },
-            reportNameValuePairs: {
-                key: ({route}) => `${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${getReportID(route)}`,
-                allowStaleData: true,
-            },
             reportMetadata: {
                 key: ({route}) => `${ONYXKEYS.COLLECTION.REPORT_METADATA}${getReportID(route)}`,
                 initialValue: {

diff --git a/src/pages/home/report/ReportFooter.tsx b/src/pages/home/report/ReportFooter.tsx
@@ -36,9 +36,6 @@ type ReportFooterProps = {
     /** Report metadata */
     reportMetadata?: OnyxEntry<OnyxTypes.ReportMetadata>;
 
-    /** Additional report details */
-    reportNameValuePairs?: OnyxEntry<OnyxTypes.ReportNameValuePairs>;
-
     /** The policy of the report */
     policy: OnyxEntry<OnyxTypes.Policy>;
 
@@ -69,7 +66,6 @@ function ReportFooter({
     pendingAction,
     report = {reportID: '-1'},
     reportMetadata,
-    reportNameValuePairs,
     policy,
     isEmptyChat = true,
     isReportReadyForDisplay = true,
@@ -98,6 +94,7 @@ function ReportFooter({
             }
         },
     });
+    const [reportNameValuePairs] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${report?.reportID ?? -1}`);
 
     const chatFooterStyles = {...styles.chatFooter, minHeight: !isOffline ? CONST.CHAT_FOOTER_MIN_HEIGHT : 0};
     const isArchivedRoom = ReportUtils.isArchivedRoom(report, reportNameValuePairs);