Merge pull request #35638 from callstack-internal/hur/fix-35590

[CP Staging] fix: ReportScreen props not updating (cherry picked from commit d02ee8d)
Expensify · Feb 2, 2024 · edb62a4 · edb62a4
1 parent ff7a149
commit edb62a4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 20 deletions.
diff --git a/src/pages/home/ReportScreen.js b/src/pages/home/ReportScreen.js
@@ -203,6 +203,9 @@ function ReportScreen({
             isPinned: reportProp.isPinned,
             chatReportID: reportProp.chatReportID,
             visibility: reportProp.visibility,
+            oldPolicyName: reportProp.oldPolicyName,
+            policyName: reportProp.policyName,
+            isOptimisticReport: reportProp.isOptimisticReport,
         }),
         [
             reportProp.lastReadTime,
@@ -236,6 +239,9 @@ function ReportScreen({
             reportProp.isPinned,
             reportProp.chatReportID,
             reportProp.visibility,
+            reportProp.oldPolicyName,
+            reportProp.policyName,
+            reportProp.isOptimisticReport,
         ],
     );
 
@@ -659,17 +665,8 @@ export default compose(
             _.isEqual(prevProps.policies, nextProps.policies) &&
             prevProps.accountManagerReportID === nextProps.accountManagerReportID &&
             prevProps.userLeavingStatus === nextProps.userLeavingStatus &&
-            prevProps.report.reportID === nextProps.report.reportID &&
-            prevProps.report.policyID === nextProps.report.policyID &&
-            prevProps.report.managerID === nextProps.report.managerID &&
-            prevProps.report.isOptimisticReport === nextProps.report.isOptimisticReport &&
-            prevProps.report.statusNum === nextProps.report.statusNum &&
-            _.isEqual(prevProps.report.pendingFields, nextProps.report.pendingFields) &&
             prevProps.currentReportID === nextProps.currentReportID &&
-            prevProps.report.notificationPreference === nextProps.report.notificationPreference &&
-            prevProps.report.isPinned === nextProps.report.isPinned &&
-            prevProps.report.chatReportID === nextProps.report.chatReportID &&
-            prevProps.report.visibility === nextProps.report.visibility &&
-            prevProps.viewportOffsetTop === nextProps.viewportOffsetTop,
+            prevProps.viewportOffsetTop === nextProps.viewportOffsetTop &&
+            _.isEqual(prevProps.report, nextProps.report),
     ),
 );
diff --git a/src/pages/home/report/ReportActionsView.js b/src/pages/home/report/ReportActionsView.js
@@ -314,15 +314,7 @@ function arePropsEqual(oldProps, newProps) {
         return false;
     }
 
-    return (
-        oldProps.report.lastReadTime === newProps.report.lastReadTime &&
-        oldProps.report.reportID === newProps.report.reportID &&
-        oldProps.report.policyID === newProps.report.policyID &&
-        oldProps.report.managerID === newProps.report.managerID &&
-        oldProps.report.lastVisibleActionCreated === newProps.report.lastVisibleActionCreated &&
-        oldProps.report.isOptimisticReport === newProps.report.isOptimisticReport &&
-        _.isEqual(oldProps.report.pendingFields, newProps.report.pendingFields)
-    );
+    return _.isEqual(oldProps.report, newProps.report);
 }
 
 const MemoizedReportActionsView = React.memo(ReportActionsView, arePropsEqual);