From f6ca0147669f8a912ad1883971b6266e05f55de8 Mon Sep 17 00:00:00 2001 From: hublot Date: Wed, 30 Nov 2022 12:27:31 +0800 Subject: [PATCH 1/2] Fix blank page on archived room --- src/pages/home/ReportScreen.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/pages/home/ReportScreen.js b/src/pages/home/ReportScreen.js index fd2260a898b1..7c85512cf04d 100644 --- a/src/pages/home/ReportScreen.js +++ b/src/pages/home/ReportScreen.js @@ -195,10 +195,12 @@ class ReportScreen extends React.Component { // We create policy rooms for all policies, however we don't show them unless // - It's a free plan workspace // - The report includes guides participants (@team.expensify.com) for 1:1 Assigned + // - It has removed all guide participants before archiving if (!Permissions.canUseDefaultRooms(this.props.betas) && ReportUtils.isDefaultRoom(this.props.report) && ReportUtils.getPolicyType(this.props.report, this.props.policies) !== CONST.POLICY.TYPE.FREE && !ReportUtils.hasExpensifyGuidesEmails(lodashGet(this.props.report, ['participants'], [])) + && !ReportUtils.isArchivedRoom(this.props.report) ) { return null; } From 86fd5c340dcfeaabbae6507fe294156d08f15f2d Mon Sep 17 00:00:00 2001 From: hublot Date: Wed, 30 Nov 2022 18:41:11 +0800 Subject: [PATCH 2/2] Update ReportScreen archived room comment --- src/pages/home/ReportScreen.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/home/ReportScreen.js b/src/pages/home/ReportScreen.js index 7c85512cf04d..c88e1dce4fc4 100644 --- a/src/pages/home/ReportScreen.js +++ b/src/pages/home/ReportScreen.js @@ -195,7 +195,7 @@ class ReportScreen extends React.Component { // We create policy rooms for all policies, however we don't show them unless // - It's a free plan workspace // - The report includes guides participants (@team.expensify.com) for 1:1 Assigned - // - It has removed all guide participants before archiving + // - It's an archived room if (!Permissions.canUseDefaultRooms(this.props.betas) && ReportUtils.isDefaultRoom(this.props.report) && ReportUtils.getPolicyType(this.props.report, this.props.policies) !== CONST.POLICY.TYPE.FREE