Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Don't show duplicate merchant input for distance requests #29388

Merged
merged 4 commits into from
Oct 12, 2023
Merged

Don't show duplicate merchant input for distance requests #29388

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3b01c71
Don't show duplicate merchant input for distance requests
francoisl Oct 11, 2023
b8556dd
Merge branch 'main' of github.com:Expensify/App into francois-fix-mon…
francoisl Oct 11, 2023
f36a1f8
Pull main, fix conflict
francoisl Oct 12, 2023
93c89d6
Update based on change that was just merged
francoisl Oct 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/components/MoneyRequestConfirmationList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down