From b2dc04aba020a92fa60932a18aa15b315d893b22 Mon Sep 17 00:00:00 2001 From: Youssef Lourayad Date: Fri, 13 Oct 2023 05:45:13 +0800 Subject: [PATCH 1/2] Fix missing isOwnPolicyExpenseChat --- src/libs/OptionsListUtils.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/libs/OptionsListUtils.js b/src/libs/OptionsListUtils.js index 4467746475aa..f8465e88dbe0 100644 --- a/src/libs/OptionsListUtils.js +++ b/src/libs/OptionsListUtils.js @@ -444,6 +444,7 @@ function createOption(accountIDs, personalDetails, report, reportActions = {}, { isArchivedRoom: false, shouldShowSubscript: false, isPolicyExpenseChat: false, + isOwnPolicyExpenseChat: false, isExpenseReport: false, policyID: null, isOptimisticPersonalDetail: false, @@ -463,12 +464,13 @@ function createOption(accountIDs, personalDetails, report, reportActions = {}, { result.isChatRoom = ReportUtils.isChatRoom(report); result.isDefaultRoom = ReportUtils.isDefaultRoom(report); result.isArchivedRoom = ReportUtils.isArchivedRoom(report); - result.isPolicyExpenseChat = ReportUtils.isPolicyExpenseChat(report); result.isExpenseReport = ReportUtils.isExpenseReport(report); result.isMoneyRequestReport = ReportUtils.isMoneyRequestReport(report); result.isThread = ReportUtils.isChatThread(report); result.isTaskReport = ReportUtils.isTaskReport(report); result.shouldShowSubscript = ReportUtils.shouldReportShowSubscript(report); + result.isPolicyExpenseChat = ReportUtils.isPolicyExpenseChat(report); + result.isOwnPolicyExpenseChat = report.isOwnPolicyExpenseChat; result.allReportErrors = getAllReportErrors(report, reportActions); result.brickRoadIndicator = !_.isEmpty(result.allReportErrors) ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : ''; result.pendingAction = report.pendingFields ? report.pendingFields.addWorkspaceRoom || report.pendingFields.createChat : null; From 85be547d33c49a9f00fbeb6e591975225dc30e90 Mon Sep 17 00:00:00 2001 From: Youssef Lourayad Date: Fri, 13 Oct 2023 06:06:26 +0800 Subject: [PATCH 2/2] Update OptionsListUtils.js Co-authored-by: Vit Horacek <36083550+mountiny@users.noreply.github.com> --- src/libs/OptionsListUtils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/OptionsListUtils.js b/src/libs/OptionsListUtils.js index f8465e88dbe0..61dc4866c76d 100644 --- a/src/libs/OptionsListUtils.js +++ b/src/libs/OptionsListUtils.js @@ -470,7 +470,7 @@ function createOption(accountIDs, personalDetails, report, reportActions = {}, { result.isTaskReport = ReportUtils.isTaskReport(report); result.shouldShowSubscript = ReportUtils.shouldReportShowSubscript(report); result.isPolicyExpenseChat = ReportUtils.isPolicyExpenseChat(report); - result.isOwnPolicyExpenseChat = report.isOwnPolicyExpenseChat; + result.isOwnPolicyExpenseChat = report.isOwnPolicyExpenseChat || false; result.allReportErrors = getAllReportErrors(report, reportActions); result.brickRoadIndicator = !_.isEmpty(result.allReportErrors) ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : ''; result.pendingAction = report.pendingFields ? report.pendingFields.addWorkspaceRoom || report.pendingFields.createChat : null;