Merge pull request #56619 from software-mansion-labs/@zfurtak/fix-deleted-workspace-name

luacmartins · web-flow · commit a4cbb1d48318 · 2025-02-11T10:14:57.000-07:00
Fix room name for deleted workspaces
diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
@@ -1062,8 +1062,7 @@ function getPolicyName({report, returnEmptyIfNotFound = false, policy, policies,
     if (isEmptyObject(report) || (isEmptyObject(policies) && isEmptyObject(allPolicies) && !report?.policyName)) {
         return noPolicyFound;
     }
-
-    const finalPolicy = policy ?? policies?.find((p) => p.id === report.policyID) ?? allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${report.policyID}`];
+    const finalPolicy = isEmptyObject(policy) ? allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${report.policyID}`] : policy ?? policies?.find((p) => p.id === report.policyID);
 
     const parentReport = getRootParentReport({report, reports});
 

Original file line number	Diff line number	Diff line change
`@@ -1062,8 +1062,7 @@ function getPolicyName({report, returnEmptyIfNotFound = false, policy, policies,`
`1062`	`1062`	`if (isEmptyObject(report) \|\| (isEmptyObject(policies) && isEmptyObject(allPolicies) && !report?.policyName)) {`
`1063`	`1063`	`return noPolicyFound;`
`1064`	`1064`	`}`
`1065`		`-`
`1066`		- const finalPolicy = policy ?? policies?.find((p) => p.id === report.policyID) ?? allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${report.policyID}`];
	`1065`	+ const finalPolicy = isEmptyObject(policy) ? allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${report.policyID}`] : policy ?? policies?.find((p) => p.id === report.policyID);
`1067`	`1066`
`1068`	`1067`	`const parentReport = getRootParentReport({report, reports});`
`1069`	`1068`