Skip to content

[CP Staging] Followup - manual expense flow UI refactor r3 #90687

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

Merged
puneetlath merged 6 commits into from
May 14, 2026
Merged

[CP Staging] Followup - manual expense flow UI refactor r3 #90687

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0750cc5
Refine display merchant logic, Fixes #90575, #90577
ChavdaSachin May 14, 2026
e4ada47
Pass the missing isAmountSet and isMerchantSet fileds, Fixes #90649
ChavdaSachin May 14, 2026
dc23243
Show invalid amount for iou type pay when amount is 0, Fixes #90654
ChavdaSachin May 14, 2026
fab5127
Pass the missing isAmountSet and isMerchantSet fileds, Fixes #90649
ChavdaSachin May 14, 2026
1aa71f3
lint
ChavdaSachin May 14, 2026
2ce7b7e
lint
ChavdaSachin May 14, 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/hooks/useConfirmationValidation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ function useConfirmationValidation({
const isP2P = !!(firstParticipant?.accountID && !firstParticipant?.isPolicyExpenseChat);

// P2P manual submit: $0 is invalid unless scan/time/distance (same guard as legacy inline confirm).
if (iouType !== CONST.IOU.TYPE.PAY && !isScanRequestUtil(transaction) && !isTimeRequest && !isDistanceRequest && iouAmount === 0 && isP2P) {
if (!isScanRequestUtil(transaction) && !isTimeRequest && !isDistanceRequest && iouAmount === 0 && isP2P) {
return {errorKey: 'common.error.invalidAmount'};
}
if (isNewManualExpenseFlowEnabled && !transaction?.isAmountSet) {
Expand Down
4 changes: 2 additions & 2 deletions src/components/MoneyRequestConfirmationList/sections/MerchantField.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import useThemeStyles from '@hooks/useThemeStyles';
import {clearMoneyRequestMerchant, setMoneyRequestMerchant} from '@libs/actions/IOU';
import Navigation from '@libs/Navigation/Navigation';
import {getMerchant, hasReceipt} from '@libs/TransactionUtils';
import {isValidInputLength} from '@libs/ValidationUtils';
import {isInvalidMerchantValue, isValidInputLength} from '@libs/ValidationUtils';
import {setDraftSplitTransaction} from '@userActions/IOU/Split';
import CONST from '@src/CONST';
import type {IOUAction, IOUType} from '@src/CONST';
Expand Down Expand Up @@ -54,7 +54,7 @@ function MerchantField({
const [splitDraftTransaction] = useOnyx(`${ONYXKEYS.COLLECTION.SPLIT_TRANSACTION_DRAFT}${transactionID}`);

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

// Determine if the merchant error should be displayed
Expand Down
4 changes: 4 additions & 0 deletions src/libs/ReportUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,7 @@ import addTrailingForwardSlash from './UrlUtils';
import type {AvatarSource} from './UserAvatarUtils';
import {getDefaultAvatarURL} from './UserAvatarUtils';
import {generateAccountID} from './UserUtils';
import {isInvalidMerchantValue} from './ValidationUtils';
import ViolationsUtils from './Violations/ViolationsUtils';

type AvatarRange = 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18;
Expand Down Expand Up @@ -11326,6 +11327,7 @@ function createDraftTransactionAndNavigateToParticipantSelector({
.find((action) => isMoneyRequestAction(action) && getOriginalMessage(action)?.IOUTransactionID === transactionID);

const {created, amount, currency, merchant, mccGroup} = getTransactionDetails(transaction) ?? {};
const isMerchantValid = !isInvalidMerchantValue(merchant);
const baseComment = getTransactionCommentObject(transaction);
// Use modifiedAttendees if present (for edited transactions), otherwise use the attendees from comment
const comment = {
Expand All @@ -11345,10 +11347,12 @@ function createDraftTransactionAndNavigateToParticipantSelector({
modifiedAmount: undefined,
modifiedCurrency: undefined,
amount,
isAmountSet: true,
currency,
comment,
merchant,
modifiedMerchant: '',
isMerchantSet: !!isMerchantValid,
modifiedAttendees: undefined,
mccGroup,
participants: [],
Expand Down
Loading