Skip to content

Simplify isXRequest utils to only use iouRequestType #84902

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

Draft
GCyganek wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

Simplify isXRequest utils to only use iouRequestType #84902

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
48f47b4
Simplify isXRequest utils to only use iouRequestType
GCyganek Mar 11, 2026
a5a3bbe
Merge branch 'main' into @GCyganek/use-iouRequestType
GCyganek Mar 13, 2026
3d04cf0
Fix typescript
GCyganek Mar 13, 2026
3f3e627
fix isManualDistanceRequestTransactionUtils() call
GCyganek Mar 13, 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/ReportActionItem/MoneyRequestView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ function MoneyRequestView({
} = getTransactionDetails(transaction, undefined, undefined, allowNegativeAmount, false, currentUserPersonalDetails) ?? {};
const isEmptyMerchant = isInvalidMerchantValue(transactionMerchant);
const isDistanceRequest = isDistanceRequestTransactionUtils(transaction);
const isManualDistanceRequest = isManualDistanceRequestTransactionUtils(transaction, !!mergeTransactionID);
const isManualDistanceRequest = isManualDistanceRequestTransactionUtils(transaction);
const isGPSDistanceRequest = isGPSDistanceRequestTransactionUtils(transaction);
const isOdometerDistanceRequest = isOdometerDistanceRequestTransactionUtils(transaction);
const isMapDistanceRequest = isMapDistanceRequestTransactionUtils(transaction) || isDistanceTypeRequest(transaction);
Expand Down
2 changes: 0 additions & 2 deletions src/libs/GPSDraftDetailsUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ function getGPSWaypoints(gpsDraftDetails: GpsDraftDetails | undefined): Waypoint
...(firstPoint
? {
waypoint0: {
keyForList: 'gps_start', // temporary for hasGPSWaypoints()
lat: firstPoint.lat,
lng: firstPoint.long,
address: startAddress,
Expand All @@ -32,7 +31,6 @@ function getGPSWaypoints(gpsDraftDetails: GpsDraftDetails | undefined): Waypoint
...(lastPoint
? {
waypoint1: {
keyForList: 'gps_stop', // temporary for hasGPSWaypoints()
lat: lastPoint.lat,
lng: lastPoint.long,
address: endAddress,
Expand Down
168 changes: 28 additions & 140 deletions src/libs/TransactionUtils/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,173 +136,70 @@ type BuildOptimisticTransactionParams = {
isDemoTransactionParam?: boolean;
};

function hasDistanceCustomUnit(transaction: OnyxEntry<Transaction> | Partial<Transaction>): boolean {
return transaction?.comment?.type === CONST.TRANSACTION.TYPE.CUSTOM_UNIT && transaction?.comment?.customUnit?.name === CONST.CUSTOM_UNITS.NAME_DISTANCE;
}

function isDistanceRequest(transaction: OnyxEntry<Transaction>): boolean {
// This is used during the expense creation flow before the transaction has been saved to the server
if (transaction && Object.hasOwn(transaction, 'iouRequestType')) {
return (
transaction?.iouRequestType === CONST.IOU.REQUEST_TYPE.DISTANCE ||
transaction?.iouRequestType === CONST.IOU.REQUEST_TYPE.DISTANCE_MAP ||
transaction?.iouRequestType === CONST.IOU.REQUEST_TYPE.DISTANCE_ODOMETER ||
transaction?.iouRequestType === CONST.IOU.REQUEST_TYPE.DISTANCE_GPS ||
transaction?.iouRequestType === CONST.IOU.REQUEST_TYPE.DISTANCE_MANUAL
);
}

// This is the case for transaction objects once they have been saved to the server
return hasDistanceCustomUnit(transaction);
}

function isDistanceTypeRequest(transaction: OnyxEntry<Transaction>): boolean {
// This is used during the expense creation flow before the transaction has been saved to the server
if (transaction && Object.hasOwn(transaction, 'iouRequestType')) {
return transaction?.iouRequestType === CONST.IOU.REQUEST_TYPE.DISTANCE;
function isRequestOfType(transaction: OnyxEntry<Transaction> | Partial<Transaction>, type: IOURequestType): boolean {
if (!transaction || !Object.hasOwn(transaction, 'iouRequestType')) {
return false;
}

// This is the case for transaction objects once they have been saved to the server
return hasDistanceCustomUnit(transaction);
return transaction.iouRequestType === type;
}

/**
* todo: Currently there is no way to tell server map transaction object from
* server GPS transaction object, this will be discussed and updated later.
* To fix this temporarily we set keyForList of GPS waypoints to 'gps_start' and 'gps_end'
* and use that to determine if it's a GPS or Map transaction. This should be changed before
* the first GPS release.
*/
function hasGPSWaypoints(transaction: OnyxEntry<Transaction>) {
const waypoints = transaction?.comment?.waypoints;

if (!waypoints) {
function isDistanceRequest(transaction: OnyxEntry<Transaction>): boolean {
if (!transaction || !Object.hasOwn(transaction, 'iouRequestType')) {
return false;
}

const waypoint = Object.values(waypoints).at(0);
return (
transaction?.iouRequestType === CONST.IOU.REQUEST_TYPE.DISTANCE ||
transaction?.iouRequestType === CONST.IOU.REQUEST_TYPE.DISTANCE_MAP ||
transaction?.iouRequestType === CONST.IOU.REQUEST_TYPE.DISTANCE_ODOMETER ||
transaction?.iouRequestType === CONST.IOU.REQUEST_TYPE.DISTANCE_GPS ||
transaction?.iouRequestType === CONST.IOU.REQUEST_TYPE.DISTANCE_MANUAL
);
}

return !!waypoint?.keyForList?.startsWith('gps');
function isDistanceTypeRequest(transaction: OnyxEntry<Transaction>): boolean {
return isRequestOfType(transaction, CONST.IOU.REQUEST_TYPE.DISTANCE);
}

function isMapDistanceRequest(transaction: OnyxEntry<Transaction>): boolean {
// This is used during the expense creation flow before the transaction has been saved to the server
if (transaction && Object.hasOwn(transaction, 'iouRequestType')) {
return transaction?.iouRequestType === CONST.IOU.REQUEST_TYPE.DISTANCE_MAP;
}

// This is the case for transaction objects once they have been saved to the server
return hasDistanceCustomUnit(transaction) && !hasGPSWaypoints(transaction);
return isRequestOfType(transaction, CONST.IOU.REQUEST_TYPE.DISTANCE_MAP);
}

function isGPSDistanceRequest(transaction: OnyxEntry<Transaction>): boolean {
// This is used during the expense creation flow before the transaction has been saved to the server
if (transaction && Object.hasOwn(transaction, 'iouRequestType')) {
return transaction?.iouRequestType === CONST.IOU.REQUEST_TYPE.DISTANCE_GPS;
}

// This is the case for transaction objects once they have been saved to the server
return hasGPSWaypoints(transaction);
return isRequestOfType(transaction, CONST.IOU.REQUEST_TYPE.DISTANCE_GPS);
}

function isManualDistanceRequest(transaction: OnyxEntry<Transaction>, isUpdatedMergeTransaction = false): boolean {
// This is used during the expense creation flow before the transaction has been saved to the server
if (transaction && Object.hasOwn(transaction, 'iouRequestType') && !isUpdatedMergeTransaction) {
return transaction?.iouRequestType === CONST.IOU.REQUEST_TYPE.DISTANCE_MANUAL;
}

// This is the case for transaction objects once they have been saved to the server
// Exclude odometer requests which also have no waypoints but have odometer readings
return (
hasDistanceCustomUnit(transaction) &&
isEmptyObject(transaction?.comment?.waypoints) &&
transaction?.comment?.odometerStart === undefined &&
transaction?.comment?.odometerEnd === undefined
);
function isManualDistanceRequest(transaction: OnyxEntry<Transaction>): boolean {
return isRequestOfType(transaction, CONST.IOU.REQUEST_TYPE.DISTANCE_MANUAL);
}

function isOdometerDistanceRequest(transaction: OnyxEntry<Transaction>): boolean {
// This is used during the expense creation flow before the transaction has been saved to the server
if (transaction && Object.hasOwn(transaction, 'iouRequestType')) {
return transaction?.iouRequestType === CONST.IOU.REQUEST_TYPE.DISTANCE_ODOMETER;
}

// This is the case for transaction objects once they have been saved to the server
// Odometer requests have odometerStart and odometerEnd in comment, and no waypoints
return (
hasDistanceCustomUnit(transaction) &&
isEmptyObject(transaction?.comment?.waypoints) &&
(transaction?.comment?.odometerStart !== undefined || transaction?.comment?.odometerEnd !== undefined)
);
return isRequestOfType(transaction, CONST.IOU.REQUEST_TYPE.DISTANCE_ODOMETER);
}

function isScanRequest(transaction: OnyxEntry<Transaction> | Partial<Transaction>): boolean {
// This is used during the expense creation flow before the transaction has been saved to the server
if (transaction && Object.hasOwn(transaction, 'iouRequestType')) {
return transaction?.iouRequestType === CONST.IOU.REQUEST_TYPE.SCAN;
}

// Distance requests can have a receipt source (for the map), so we need to exclude them
if (hasDistanceCustomUnit(transaction)) {
return false;
}

return !!transaction?.receipt?.source && transaction?.amount === 0;
return isRequestOfType(transaction, CONST.IOU.REQUEST_TYPE.SCAN);
}

function isPerDiemRequest(transaction: OnyxEntry<Transaction>): boolean {
// This is used during the expense creation flow before the transaction has been saved to the server
if (transaction && Object.hasOwn(transaction, 'iouRequestType')) {
return transaction?.iouRequestType === CONST.IOU.REQUEST_TYPE.PER_DIEM;
}

// This is the case for transaction objects once they have been saved to the server
const type = transaction?.comment?.type;
const customUnitName = transaction?.comment?.customUnit?.name;
return type === CONST.TRANSACTION.TYPE.CUSTOM_UNIT && customUnitName === CONST.CUSTOM_UNITS.NAME_PER_DIEM_INTERNATIONAL;
return isRequestOfType(transaction, CONST.IOU.REQUEST_TYPE.PER_DIEM);
}

function isTimeRequest(transaction: OnyxEntry<Transaction>): boolean {
// This is used during the expense creation flow before the transaction has been saved to the server
if (transaction && Object.hasOwn(transaction, 'iouRequestType')) {
return transaction?.iouRequestType === CONST.IOU.REQUEST_TYPE.TIME;
}
return isRequestOfType(transaction, CONST.IOU.REQUEST_TYPE.TIME);
}

// This is the case for transaction objects once they have been saved to the server
return transaction?.comment?.type === CONST.TRANSACTION.TYPE.TIME;
function isManualRequest(transaction: Transaction): boolean {
return isRequestOfType(transaction, CONST.IOU.REQUEST_TYPE.MANUAL);
}

function isCorporateCardTransaction(transaction: OnyxEntry<Transaction>): boolean {
return isManagedCardTransaction(transaction) && transaction?.comment?.liabilityType === CONST.TRANSACTION.LIABILITY_TYPE.RESTRICT;
}

function getRequestType(transaction: OnyxEntry<Transaction>): IOURequestType {
if (isOdometerDistanceRequest(transaction)) {
return CONST.IOU.REQUEST_TYPE.DISTANCE_ODOMETER;
}
if (isManualDistanceRequest(transaction)) {
return CONST.IOU.REQUEST_TYPE.DISTANCE_MANUAL;
}
if (isMapDistanceRequest(transaction)) {
return CONST.IOU.REQUEST_TYPE.DISTANCE_MAP;
}
if (isDistanceTypeRequest(transaction)) {
return CONST.IOU.REQUEST_TYPE.DISTANCE;
}
if (isScanRequest(transaction)) {
return CONST.IOU.REQUEST_TYPE.SCAN;
}
if (isPerDiemRequest(transaction)) {
return CONST.IOU.REQUEST_TYPE.PER_DIEM;
}
if (isTimeRequest(transaction)) {
return CONST.IOU.REQUEST_TYPE.TIME;
}
if (isGPSDistanceRequest(transaction)) {
return CONST.IOU.REQUEST_TYPE.DISTANCE_GPS;
}

return CONST.IOU.REQUEST_TYPE.MANUAL;
return transaction?.iouRequestType ?? CONST.IOU.REQUEST_TYPE.MANUAL;
}

/**
Expand Down Expand Up @@ -382,15 +279,6 @@ function getExpenseTypeTranslationKey(expenseType: ValueOf<typeof CONST.SEARCH.T
}
}

function isManualRequest(transaction: Transaction): boolean {
// This is used during the expense creation flow before the transaction has been saved to the server
if (transaction && Object.hasOwn(transaction, 'iouRequestType')) {
return transaction.iouRequestType === CONST.IOU.REQUEST_TYPE.MANUAL;
}

return getRequestType(transaction) === CONST.IOU.REQUEST_TYPE.MANUAL;
}

function isPartialTransaction(transaction: OnyxEntry<Transaction>): boolean {
const merchant = getMerchant(transaction);

Expand Down
Loading