From 3b01c7114b56cc163dd02ad630e9600bcb6bb93d Mon Sep 17 00:00:00 2001 From: Francois Laithier Date: Wed, 11 Oct 2023 14:09:20 -0700 Subject: [PATCH 1/2] Don't show duplicate merchant input for distance requests --- src/components/MoneyRequestConfirmationList.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/MoneyRequestConfirmationList.js b/src/components/MoneyRequestConfirmationList.js index acaa83181bbf..33251136b2b0 100755 --- a/src/components/MoneyRequestConfirmationList.js +++ b/src/components/MoneyRequestConfirmationList.js @@ -571,7 +571,7 @@ function MoneyRequestConfirmationList(props) { disabled={didConfirm || props.isReadOnly || !isTypeRequest} /> )} - {shouldShowSmartScanFields && ( + {shouldShowSmartScanFields && !props.isDistanceRequest && ( Date: Wed, 11 Oct 2023 17:06:00 -0700 Subject: [PATCH 2/2] Update based on change that was just merged --- src/components/MoneyRequestConfirmationList.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/MoneyRequestConfirmationList.js b/src/components/MoneyRequestConfirmationList.js index 7f7c1e465d3b..a04229673f72 100755 --- a/src/components/MoneyRequestConfirmationList.js +++ b/src/components/MoneyRequestConfirmationList.js @@ -213,9 +213,9 @@ function MoneyRequestConfirmationList(props) { // Do not hide fields in case of send money request const shouldShowAllFields = props.isDistanceRequest || shouldExpandFields || !shouldShowSmartScanFields || isTypeSend; - // In Send Money flow, we don't allow the Merchant or Date to be edited. + // In Send Money flow, we don't allow the Merchant or Date to be edited. For distance requests, don't show the merchant as there's already another "Distance" menu item const shouldShowDate = shouldShowAllFields && !isTypeSend; - const shouldShowMerchant = shouldShowAllFields && !isTypeSend; + const shouldShowMerchant = shouldShowAllFields && !isTypeSend && !props.isDistanceRequest; // Fetches the first tag list of the policy const policyTag = PolicyUtils.getTag(props.policyTags);