From 95acfa1f8fd9d0db8814932a2611512915aaa217 Mon Sep 17 00:00:00 2001 From: Mohammad Luthfi Fathur Rahman Date: Fri, 1 Apr 2022 09:42:44 +0700 Subject: [PATCH 1/2] fix linkedWorkspace find policy null --- src/pages/ReportSettingsPage.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/pages/ReportSettingsPage.js b/src/pages/ReportSettingsPage.js index a0ddbc6c8e55..04b754639b25 100644 --- a/src/pages/ReportSettingsPage.js +++ b/src/pages/ReportSettingsPage.js @@ -153,7 +153,13 @@ class ReportSettingsPage extends Component { const shouldShowRoomName = !ReportUtils.isPolicyExpenseChat(this.props.report); const shouldDisableRename = ReportUtils.isDefaultRoom(this.props.report) || ReportUtils.isArchivedRoom(this.props.report); - const linkedWorkspace = _.find(this.props.policies, policy => policy.id === this.props.report.policyID); + const linkedWorkspace = _.find(this.props.policies, (policy) => { + if (policy === null) { + return false; + } + + return policy.id === this.props.report.policyID; + }); return ( From abdc6c5028c5168e42fcb1a805b2b99f68db11c4 Mon Sep 17 00:00:00 2001 From: mollfpr Date: Fri, 1 Apr 2022 13:38:13 +0700 Subject: [PATCH 2/2] refactoring the code Co-authored-by: Rajat Parashar --- src/pages/ReportSettingsPage.js | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/pages/ReportSettingsPage.js b/src/pages/ReportSettingsPage.js index 04b754639b25..6ee169d0256d 100644 --- a/src/pages/ReportSettingsPage.js +++ b/src/pages/ReportSettingsPage.js @@ -153,13 +153,7 @@ class ReportSettingsPage extends Component { const shouldShowRoomName = !ReportUtils.isPolicyExpenseChat(this.props.report); const shouldDisableRename = ReportUtils.isDefaultRoom(this.props.report) || ReportUtils.isArchivedRoom(this.props.report); - const linkedWorkspace = _.find(this.props.policies, (policy) => { - if (policy === null) { - return false; - } - - return policy.id === this.props.report.policyID; - }); + const linkedWorkspace = _.find(this.props.policies, policy => policy && policy.id === this.props.report.policyID); return (