From 2b9b1a153dd0dd7842e9e2938fed2b8e0df9a7ad Mon Sep 17 00:00:00 2001 From: krishna2323 Date: Sat, 13 Jul 2024 14:18:39 +0530 Subject: [PATCH 1/2] fix: Split - App does not throw an error when saving the empty merchant field. Signed-off-by: krishna2323 --- src/pages/iou/request/step/IOURequestStepMerchant.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/iou/request/step/IOURequestStepMerchant.tsx b/src/pages/iou/request/step/IOURequestStepMerchant.tsx index b9816c7daf7b..a22e8de33645 100644 --- a/src/pages/iou/request/step/IOURequestStepMerchant.tsx +++ b/src/pages/iou/request/step/IOURequestStepMerchant.tsx @@ -63,7 +63,7 @@ function IOURequestStepMerchant({ const merchant = ReportUtils.getTransactionDetails(isEditingSplitBill && !isEmptyObject(splitDraftTransaction) ? splitDraftTransaction : transaction)?.merchant; const isEmptyMerchant = merchant === '' || merchant === CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT; - const isMerchantRequired = ReportUtils.isExpenseRequest(report) || transaction?.participants?.some((participant) => !!participant.isPolicyExpenseChat); + const isMerchantRequired = ReportUtils.isPolicyExpenseChat(report) || transaction?.participants?.some((participant) => !!participant.isPolicyExpenseChat); const navigateBack = () => { Navigation.goBack(backTo); From 07def0a5a645a5960596719620f07a6cfbc02fdf Mon Sep 17 00:00:00 2001 From: krishna2323 Date: Mon, 15 Jul 2024 19:14:19 +0530 Subject: [PATCH 2/2] add ReportUtils.isExpenseRequest(report) check back. Signed-off-by: krishna2323 --- src/pages/iou/request/step/IOURequestStepMerchant.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pages/iou/request/step/IOURequestStepMerchant.tsx b/src/pages/iou/request/step/IOURequestStepMerchant.tsx index a22e8de33645..870e6085c22b 100644 --- a/src/pages/iou/request/step/IOURequestStepMerchant.tsx +++ b/src/pages/iou/request/step/IOURequestStepMerchant.tsx @@ -63,7 +63,8 @@ function IOURequestStepMerchant({ const merchant = ReportUtils.getTransactionDetails(isEditingSplitBill && !isEmptyObject(splitDraftTransaction) ? splitDraftTransaction : transaction)?.merchant; const isEmptyMerchant = merchant === '' || merchant === CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT; - const isMerchantRequired = ReportUtils.isPolicyExpenseChat(report) || transaction?.participants?.some((participant) => !!participant.isPolicyExpenseChat); + const isMerchantRequired = + ReportUtils.isPolicyExpenseChat(report) || ReportUtils.isExpenseRequest(report) || transaction?.participants?.some((participant) => !!participant.isPolicyExpenseChat); const navigateBack = () => { Navigation.goBack(backTo);