Skip to content

Refactor IOURequestStepMerchant to handle empty merchant input and cl… #91307

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

Open
ChavdaSachin wants to merge 7 commits into
base: main
Choose a base branch
from
+132 −8
Open

Refactor IOURequestStepMerchant to handle empty merchant input and cl… #91307

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
fd9046b
Refactor IOURequestStepMerchant to handle empty merchant input and cl…
ChavdaSachin May 21, 2026
3c8eee2
Enhance IOURequestStepMerchant to handle empty merchant input more ef…
ChavdaSachin May 21, 2026
20e0e89
prettier
ChavdaSachin May 21, 2026
74c918f
Update MerchantField to conditionally display merchant value based on…
ChavdaSachin May 21, 2026
41f114b
Merge remote-tracking branch 'upstream/main' into fix/90577
ChavdaSachin May 22, 2026
72596c2
Adjust the logic for the new selector
ChavdaSachin May 22, 2026
6236ddf
Add merchant tests
ChavdaSachin May 22, 2026
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
2 changes: 1 addition & 1 deletion src/components/MoneyRequestConfirmationList/sections/MerchantField.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ function MerchantField({
const [splitDraftTransaction] = useOnyx(`${ONYXKEYS.COLLECTION.SPLIT_TRANSACTION_DRAFT}${transactionID}`);

const merchantValue = getMerchant(transaction);
const displayMerchantValue = isInvalidMerchantValue(merchantValue) ? '' : merchantValue;
const displayMerchantValue = !transaction?.isMerchantSet && isInvalidMerchantValue(merchantValue) ? '' : merchantValue;
const isMerchantEmpty = !displayMerchantValue;

// Determine if the merchant error should be displayed
Expand Down
14 changes: 11 additions & 3 deletions src/pages/iou/request/step/IOURequestStepMerchant.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import {skipNextFocusRestore} from '@libs/NavigationFocusReturn';
import {getTransactionDetails, isExpenseRequest, isPolicyExpenseChat} from '@libs/ReportUtils';
import {hasReceipt} from '@libs/TransactionUtils';
import {isInvalidMerchantValue, isValidInputLength} from '@libs/ValidationUtils';
import {setMoneyRequestMerchant} from '@userActions/IOU/MoneyRequest';
import {clearMoneyRequestMerchant, setMoneyRequestMerchant} from '@userActions/IOU/MoneyRequest';
import {setDraftSplitTransaction} from '@userActions/IOU/Split';
import {updateMoneyRequestMerchant} from '@userActions/IOU/UpdateMoneyRequest';
import CONST from '@src/CONST';
Expand Down Expand Up @@ -123,7 +123,13 @@ function IOURequestStepMerchant({
return;
}

if (newMerchant === merchant || (newMerchant === '' && merchant === CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT)) {
if (newMerchant === '' && isInvalidMerchantValue(merchant)) {
setIsSaved(true);
shouldNavigateAfterSaveRef.current = true;
clearMoneyRequestMerchant(transactionID);
return;
}
if (newMerchant === merchant || (newMerchant === '' && isInvalidMerchantValue(merchant))) {
setIsSaved(true);
shouldNavigateAfterSaveRef.current = true;
return;
Expand All @@ -146,8 +152,10 @@ function IOURequestStepMerchant({
parentReportNextStep,
delegateAccountID,
});
} else if (!newMerchant) {
clearMoneyRequestMerchant(transactionID);
} else {
setMoneyRequestMerchant(transactionID, newMerchant || CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT, true, hasReceipt(transaction));
setMoneyRequestMerchant(transactionID, newMerchant, true, hasReceipt(transaction));
}
setIsSaved(true);
shouldNavigateAfterSaveRef.current = true;
Expand Down
Loading