From 3b7b6083c5a3bbf52e6d6e602f449a85d38c4743 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Thu, 19 Oct 2023 16:52:37 -0600 Subject: [PATCH 1/3] check if the participant is a workspace chat to avoid filtering out --- src/pages/iou/steps/MoneyRequestConfirmPage.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/pages/iou/steps/MoneyRequestConfirmPage.js b/src/pages/iou/steps/MoneyRequestConfirmPage.js index b0f802a2ab2c..5edd6f63fb10 100644 --- a/src/pages/iou/steps/MoneyRequestConfirmPage.js +++ b/src/pages/iou/steps/MoneyRequestConfirmPage.js @@ -75,7 +75,10 @@ function MoneyRequestConfirmPage(props) { const isPolicyExpenseChat = lodashGet(participant, 'isPolicyExpenseChat', false); return isPolicyExpenseChat ? OptionsListUtils.getPolicyExpenseReportOption(participant) : OptionsListUtils.getParticipantsOption(participant, props.personalDetails); }) - .filter((participant) => !!participant.login) + .filter((participant) => { + const isPolicyExpenseChat = lodashGet(participant, 'isPolicyExpenseChat', false); + return isPolicyExpenseChat || !!participant.login; + }) .value(), [props.iou.participants, props.personalDetails], ); From 64143d99e82644b4dc7a61b9747b5fed5e02560a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Thu, 19 Oct 2023 17:05:38 -0600 Subject: [PATCH 2/3] DRY isPolicyExpenseChat value --- src/pages/iou/steps/MoneyRequestConfirmPage.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/pages/iou/steps/MoneyRequestConfirmPage.js b/src/pages/iou/steps/MoneyRequestConfirmPage.js index 5edd6f63fb10..f5027e3cef77 100644 --- a/src/pages/iou/steps/MoneyRequestConfirmPage.js +++ b/src/pages/iou/steps/MoneyRequestConfirmPage.js @@ -73,12 +73,12 @@ function MoneyRequestConfirmPage(props) { _.chain(props.iou.participants) .map((participant) => { const isPolicyExpenseChat = lodashGet(participant, 'isPolicyExpenseChat', false); - return isPolicyExpenseChat ? OptionsListUtils.getPolicyExpenseReportOption(participant) : OptionsListUtils.getParticipantsOption(participant, props.personalDetails); - }) - .filter((participant) => { - const isPolicyExpenseChat = lodashGet(participant, 'isPolicyExpenseChat', false); - return isPolicyExpenseChat || !!participant.login; + const option = isPolicyExpenseChat + ? OptionsListUtils.getPolicyExpenseReportOption(participant) + : OptionsListUtils.getParticipantsOption(participant, props.personalDetails); + return { ...option, isPolicyExpenseChat }; }) + .filter((option) => option.isPolicyExpenseChat || !!option.login) .value(), [props.iou.participants, props.personalDetails], ); From 334f8eb23630fbab41f4e3aa64addbfd302cd8d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Thu, 19 Oct 2023 17:06:23 -0600 Subject: [PATCH 3/3] fix style --- src/pages/iou/steps/MoneyRequestConfirmPage.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/iou/steps/MoneyRequestConfirmPage.js b/src/pages/iou/steps/MoneyRequestConfirmPage.js index f5027e3cef77..05f11422e19e 100644 --- a/src/pages/iou/steps/MoneyRequestConfirmPage.js +++ b/src/pages/iou/steps/MoneyRequestConfirmPage.js @@ -76,7 +76,7 @@ function MoneyRequestConfirmPage(props) { const option = isPolicyExpenseChat ? OptionsListUtils.getPolicyExpenseReportOption(participant) : OptionsListUtils.getParticipantsOption(participant, props.personalDetails); - return { ...option, isPolicyExpenseChat }; + return {...option, isPolicyExpenseChat}; }) .filter((option) => option.isPolicyExpenseChat || !!option.login) .value(),