From 897af821ebd8aef191740d79f029cc21944dc488 Mon Sep 17 00:00:00 2001 From: ShridharGoel <35566748+ShridharGoel@users.noreply.github.com> Date: Thu, 16 Jul 2026 12:09:08 +0530 Subject: [PATCH 1/3] refactor: pass NVPs to outstanding report checks --- src/libs/IOUUtils.ts | 9 ++++++--- src/pages/Share/SubmitDetailsPage.tsx | 3 ++- .../iou/request/step/IOURequestStepConfirmation.tsx | 4 +++- src/pages/iou/request/step/IOURequestStepReport.tsx | 3 ++- tests/unit/IOUUtilsTest.ts | 13 ++++++++++++- 5 files changed, 25 insertions(+), 7 deletions(-) diff --git a/src/libs/IOUUtils.ts b/src/libs/IOUUtils.ts index d1cba1cfa3d4..beeab30859cb 100644 --- a/src/libs/IOUUtils.ts +++ b/src/libs/IOUUtils.ts @@ -1,11 +1,11 @@ import type {IOUAction, IOURequestType, IOUType} from '@src/CONST'; import CONST from '@src/CONST'; import ROUTES from '@src/ROUTES'; -import type {OnyxInputOrEntry, Policy, Report, ReportAction, Transaction} from '@src/types/onyx'; +import type {OnyxInputOrEntry, Policy, Report, ReportAction, ReportNameValuePairs, Transaction} from '@src/types/onyx'; import type {Attendee, Participant} from '@src/types/onyx/IOU'; import type {CurrentUserPersonalDetails} from '@src/types/onyx/PersonalDetails'; -import type {OnyxEntry} from 'react-native-onyx'; +import type {OnyxCollection, OnyxEntry} from 'react-native-onyx'; import type {ValueOf} from 'type-fest'; import {SafeString} from 'expensify-common'; @@ -511,16 +511,19 @@ function resolveReportForMoneyRequest({ transactionReport, routeReport, policy, + reportNameValuePairs, }: { transaction: OnyxEntry; transactionReport: OnyxEntry; routeReport: OnyxEntry; policy: OnyxEntry; + reportNameValuePairs?: OnyxCollection; }): OnyxEntry { if (transaction?.reportID === CONST.REPORT.UNREPORTED_REPORT_ID) { return undefined; } - const canUseTransactionReport = !(isProcessingReport(transactionReport) && !policy?.harvesting?.enabled) && isReportOutstanding(transactionReport, policy?.id, undefined, false); + const canUseTransactionReport = + !(isProcessingReport(transactionReport) && !policy?.harvesting?.enabled) && isReportOutstanding(transactionReport, policy?.id, reportNameValuePairs, false); const shouldUseTransactionReport = !!transactionReport && (canUseTransactionReport || !routeReport); if (shouldUseTransactionReport) { return transactionReport; diff --git a/src/pages/Share/SubmitDetailsPage.tsx b/src/pages/Share/SubmitDetailsPage.tsx index a3560c573308..9b000a5d790e 100644 --- a/src/pages/Share/SubmitDetailsPage.tsx +++ b/src/pages/Share/SubmitDetailsPage.tsx @@ -87,6 +87,7 @@ function SubmitDetailsPage({ const [reportDraft] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_DRAFT}${draftReportID}`); const [parentReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${report?.parentReportID}`); const [transaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${CONST.IOU.OPTIMISTIC_TRANSACTION_ID}`); + const [reportNameValuePairs] = useOnyx(ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS); const transactionReport = useReportOrReportDraft(transaction?.reportID); const iouType = isSelfDM(report) ? CONST.IOU.TYPE.TRACK : CONST.IOU.TYPE.SUBMIT; // Self-DM's FAKE policyID can't load real policy data — usePolicyForTransaction resolves the active workspace instead. @@ -246,7 +247,7 @@ function SubmitDetailsPage({ const [storedTransaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${getNonEmptyStringOnyxID(existingTransactionID)}`); const listOfParticipants = participants.filter((participant) => participant.selected); const participant = listOfParticipants.at(0) ?? selectedParticipants.at(0); - const reportToSubmit = resolveReportForMoneyRequest({transaction, transactionReport, routeReport: report, policy}); + const reportToSubmit = resolveReportForMoneyRequest({transaction, transactionReport, routeReport: report, policy, reportNameValuePairs}); const isIouReport = isMoneyRequestReport(reportToSubmit); const policyTagsForRequestMoney = useMoneyRequestPolicyTags({ moneyRequestReportID: isIouReport ? reportToSubmit?.reportID : undefined, diff --git a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx index 3446132b55c7..c220d23946ef 100644 --- a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx +++ b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx @@ -160,6 +160,7 @@ function IOURequestStepConfirmation({ const [policyDraft] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_DRAFTS}${draftPolicyID}`); const [policyReal] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${realPolicyID}`); const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID); + const [reportNameValuePairs] = useOnyx(ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS); const expensifyIcons = useMemoizedLazyExpensifyIcons(['ReplaceReceipt', 'SmartScan']); @@ -179,8 +180,9 @@ function IOURequestStepConfirmation({ transactionReport, routeReport: reportWithDraftFallback, policy: policyReal, + reportNameValuePairs, }), - [transaction, transactionReport, reportWithDraftFallback, policyReal], + [transaction, transactionReport, reportWithDraftFallback, policyReal, reportNameValuePairs], ); const [reportDrafts] = useOnyx(ONYXKEYS.COLLECTION.REPORT_DRAFT); diff --git a/src/pages/iou/request/step/IOURequestStepReport.tsx b/src/pages/iou/request/step/IOURequestStepReport.tsx index 64a786117611..28bde8744a98 100644 --- a/src/pages/iou/request/step/IOURequestStepReport.tsx +++ b/src/pages/iou/request/step/IOURequestStepReport.tsx @@ -54,9 +54,10 @@ function IOURequestStepReport({route, transaction}: IOURequestStepReportProps) { const {backTo, action, iouType, transactionID, reportID: reportIDFromRoute, reportActionID} = route.params; const isUnreported = transaction?.reportID === CONST.REPORT.UNREPORTED_REPORT_ID; const [transactionReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${transaction?.reportID}`); + const [reportNameValuePairs] = useOnyx(ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS); const participantReportID = transaction?.participants?.at(0)?.reportID; const [participantReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${participantReportID}`); - const shouldUseTransactionReport = (!!transactionReport && isReportOutstanding(transactionReport, transactionReport?.policyID)) || isUnreported; + const shouldUseTransactionReport = (!!transactionReport && isReportOutstanding(transactionReport, transactionReport?.policyID, reportNameValuePairs)) || isUnreported; const outstandingReportID = isPolicyExpenseChat(participantReport) ? participantReport?.iouReportID : participantReportID; const selectedReportID = shouldUseTransactionReport ? transactionReport?.reportID : outstandingReportID; const [selectedReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${selectedReportID}`); diff --git a/tests/unit/IOUUtilsTest.ts b/tests/unit/IOUUtilsTest.ts index f3c1fc94838c..7e10d1b3fe03 100644 --- a/tests/unit/IOUUtilsTest.ts +++ b/tests/unit/IOUUtilsTest.ts @@ -15,7 +15,7 @@ import * as TransactionUtils from '@src/libs/TransactionUtils'; import {hasAnyTransactionWithoutRTERViolation} from '@src/libs/TransactionUtils'; import ONYXKEYS from '@src/ONYXKEYS'; import ROUTES from '@src/ROUTES'; -import type {Policy, Report, ReportMetadata, Transaction, TransactionViolations} from '@src/types/onyx'; +import type {Policy, Report, ReportMetadata, ReportNameValuePairs, Transaction, TransactionViolations} from '@src/types/onyx'; import type {OnyxCollection} from 'react-native-onyx'; @@ -943,6 +943,17 @@ describe('getExistingTransactionID', () => { expect(IOUUtils.resolveReportForMoneyRequest({transaction, transactionReport, routeReport, policy: policyForResolve})?.reportID).toBe('500'); }); + it('returns undefined when the picked report is archived', () => { + const transaction = makeTransaction('500'); + const transactionReport = makeOutstandingReport('500'); + const routeReport = makeRouteReport('100'); + const reportNameValuePairs: OnyxCollection = { + [`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${transactionReport.reportID}`]: {private_isArchived: testDate}, + }; + + expect(IOUUtils.resolveReportForMoneyRequest({transaction, transactionReport, routeReport, policy: policyForResolve, reportNameValuePairs})).toBeUndefined(); + }); + it('returns undefined when the picked report is non-outstanding and differs from the route (forces a new optimistic IOU)', () => { const transaction = makeTransaction('500'); const nonOutstandingPick: Report = { From bfd0e141569b1518555a3831966dc43ec9c8a026 Mon Sep 17 00:00:00 2001 From: ShridharGoel <35566748+ShridharGoel@users.noreply.github.com> Date: Fri, 24 Jul 2026 14:45:31 +0530 Subject: [PATCH 2/3] refactor: pass single NVP to report check --- .../sections/ReportField.tsx | 3 ++- src/libs/IOUUtils.ts | 8 ++++---- src/libs/ReportUtils.ts | 13 +++++++------ src/pages/Share/SubmitDetailsPage.tsx | 4 ++-- .../iou/request/step/IOURequestStepConfirmation.tsx | 6 +++--- src/pages/iou/request/step/IOURequestStepReport.tsx | 5 +++-- tests/unit/IOUUtilsTest.ts | 6 ++---- tests/unit/ReportUtilsTest.ts | 4 ++-- 8 files changed, 25 insertions(+), 24 deletions(-) diff --git a/src/components/MoneyRequestConfirmationList/sections/ReportField.tsx b/src/components/MoneyRequestConfirmationList/sections/ReportField.tsx index 379a8574dc3c..a900439ba639 100644 --- a/src/components/MoneyRequestConfirmationList/sections/ReportField.tsx +++ b/src/components/MoneyRequestConfirmationList/sections/ReportField.tsx @@ -77,7 +77,8 @@ function ReportField({selectedParticipants, iouType, reportID, reportActionID, a * We need to check if the transaction report exists first in order to prevent the outstanding reports from being used. * Also we need to check if transaction report exists in outstanding reports in order to show a correct report name. */ - const shouldUseTransactionReport = (!!transactionReportEntry && isReportOutstanding(transactionReportEntry, policyID, reportNameValuePairs, false)) || isUnreported; + const transactionReportNameValuePair = reportNameValuePairs?.[`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${transactionReportID}`]; + const shouldUseTransactionReport = (!!transactionReportEntry && isReportOutstanding(transactionReportEntry, policyID, transactionReportNameValuePair, false)) || isUnreported; const ownerAccountID = selectedParticipants?.at(0)?.ownerAccountID; diff --git a/src/libs/IOUUtils.ts b/src/libs/IOUUtils.ts index beeab30859cb..50b280bd14ef 100644 --- a/src/libs/IOUUtils.ts +++ b/src/libs/IOUUtils.ts @@ -5,7 +5,7 @@ import type {OnyxInputOrEntry, Policy, Report, ReportAction, ReportNameValuePair import type {Attendee, Participant} from '@src/types/onyx/IOU'; import type {CurrentUserPersonalDetails} from '@src/types/onyx/PersonalDetails'; -import type {OnyxCollection, OnyxEntry} from 'react-native-onyx'; +import type {OnyxEntry} from 'react-native-onyx'; import type {ValueOf} from 'type-fest'; import {SafeString} from 'expensify-common'; @@ -511,19 +511,19 @@ function resolveReportForMoneyRequest({ transactionReport, routeReport, policy, - reportNameValuePairs, + reportNameValuePair, }: { transaction: OnyxEntry; transactionReport: OnyxEntry; routeReport: OnyxEntry; policy: OnyxEntry; - reportNameValuePairs?: OnyxCollection; + reportNameValuePair?: OnyxInputOrEntry; }): OnyxEntry { if (transaction?.reportID === CONST.REPORT.UNREPORTED_REPORT_ID) { return undefined; } const canUseTransactionReport = - !(isProcessingReport(transactionReport) && !policy?.harvesting?.enabled) && isReportOutstanding(transactionReport, policy?.id, reportNameValuePairs, false); + !(isProcessingReport(transactionReport) && !policy?.harvesting?.enabled) && isReportOutstanding(transactionReport, policy?.id, reportNameValuePair, false); const shouldUseTransactionReport = !!transactionReport && (canUseTransactionReport || !routeReport); if (shouldUseTransactionReport) { return transactionReport; diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts index 0a6d5e6ca329..559511b056e1 100644 --- a/src/libs/ReportUtils.ts +++ b/src/libs/ReportUtils.ts @@ -5275,7 +5275,8 @@ function canEditFieldOfMoneyRequest({ return canUnreportedBeMoved(transaction, allPolicies); } - if (!isReportOutstanding(moneyRequestReport, moneyRequestReport.policyID, reportNameValuePairs)) { + const moneyRequestReportNameValuePair = reportNameValuePairs?.[`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${moneyRequestReport.reportID}`]; + if (!isReportOutstanding(moneyRequestReport, moneyRequestReport.policyID, moneyRequestReportNameValuePair)) { return false; } @@ -5304,7 +5305,7 @@ function canEditFieldOfMoneyRequest({ } // Check the cheaper condition first - if ((isOwner || isAdmin || isManager) && isReportOutstanding(moneyRequestReport, moneyRequestReport.policyID, reportNameValuePairs)) { + if ((isOwner || isAdmin || isManager) && isReportOutstanding(moneyRequestReport, moneyRequestReport.policyID, moneyRequestReportNameValuePair)) { return true; } @@ -11615,7 +11616,7 @@ function isReportOutstanding( iouReport: OnyxInputOrEntry, policyID: string | undefined, // Temporarily optional while archived report checks are migrated in smaller PRs. Remove this fallback as part of https://github.com/Expensify/App/issues/66422. - reportNameValuePairs?: OnyxCollection, + reportNameValuePair?: OnyxInputOrEntry, allowSubmitted = true, ): boolean { if ( @@ -11629,8 +11630,8 @@ function isReportOutstanding( ) { return false; } - const reportNameValuePair = (reportNameValuePairs ?? allReportNameValuePair)?.[`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${iouReport.reportID}`]; - if (isArchivedReport(reportNameValuePair)) { + const resolvedReportNameValuePair = reportNameValuePair ?? allReportNameValuePair?.[`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${iouReport.reportID}`]; + if (isArchivedReport(resolvedReportNameValuePair)) { return false; } const currentRoute = navigationRef.getCurrentRoute(); @@ -11663,7 +11664,7 @@ function getOutstandingReportsForUser( return Object.values(reports).filter( (report) => report?.pendingFields?.preview !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE && - isReportOutstanding(report, policyID, reportNameValuePairs, allowSubmitted) && + isReportOutstanding(report, policyID, reportNameValuePairs?.[`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${report?.reportID}`], allowSubmitted) && report?.ownerAccountID === reportOwnerAccountID, ); } diff --git a/src/pages/Share/SubmitDetailsPage.tsx b/src/pages/Share/SubmitDetailsPage.tsx index 9b000a5d790e..fbf5baeba599 100644 --- a/src/pages/Share/SubmitDetailsPage.tsx +++ b/src/pages/Share/SubmitDetailsPage.tsx @@ -87,8 +87,8 @@ function SubmitDetailsPage({ const [reportDraft] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_DRAFT}${draftReportID}`); const [parentReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${report?.parentReportID}`); const [transaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${CONST.IOU.OPTIMISTIC_TRANSACTION_ID}`); - const [reportNameValuePairs] = useOnyx(ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS); const transactionReport = useReportOrReportDraft(transaction?.reportID); + const [reportNameValuePair] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${getNonEmptyStringOnyxID(transactionReport?.reportID)}`); const iouType = isSelfDM(report) ? CONST.IOU.TYPE.TRACK : CONST.IOU.TYPE.SUBMIT; // Self-DM's FAKE policyID can't load real policy data — usePolicyForTransaction resolves the active workspace instead. const {policy} = usePolicyForTransaction({ @@ -247,7 +247,7 @@ function SubmitDetailsPage({ const [storedTransaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${getNonEmptyStringOnyxID(existingTransactionID)}`); const listOfParticipants = participants.filter((participant) => participant.selected); const participant = listOfParticipants.at(0) ?? selectedParticipants.at(0); - const reportToSubmit = resolveReportForMoneyRequest({transaction, transactionReport, routeReport: report, policy, reportNameValuePairs}); + const reportToSubmit = resolveReportForMoneyRequest({transaction, transactionReport, routeReport: report, policy, reportNameValuePair}); const isIouReport = isMoneyRequestReport(reportToSubmit); const policyTagsForRequestMoney = useMoneyRequestPolicyTags({ moneyRequestReportID: isIouReport ? reportToSubmit?.reportID : undefined, diff --git a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx index c220d23946ef..8a5a829aff31 100644 --- a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx +++ b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx @@ -160,7 +160,7 @@ function IOURequestStepConfirmation({ const [policyDraft] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_DRAFTS}${draftPolicyID}`); const [policyReal] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${realPolicyID}`); const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID); - const [reportNameValuePairs] = useOnyx(ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS); + const [reportNameValuePair] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${getNonEmptyStringOnyxID(transaction?.reportID)}`); const expensifyIcons = useMemoizedLazyExpensifyIcons(['ReplaceReceipt', 'SmartScan']); @@ -180,9 +180,9 @@ function IOURequestStepConfirmation({ transactionReport, routeReport: reportWithDraftFallback, policy: policyReal, - reportNameValuePairs, + reportNameValuePair, }), - [transaction, transactionReport, reportWithDraftFallback, policyReal, reportNameValuePairs], + [transaction, transactionReport, reportWithDraftFallback, policyReal, reportNameValuePair], ); const [reportDrafts] = useOnyx(ONYXKEYS.COLLECTION.REPORT_DRAFT); diff --git a/src/pages/iou/request/step/IOURequestStepReport.tsx b/src/pages/iou/request/step/IOURequestStepReport.tsx index 28bde8744a98..a48faa34009b 100644 --- a/src/pages/iou/request/step/IOURequestStepReport.tsx +++ b/src/pages/iou/request/step/IOURequestStepReport.tsx @@ -12,6 +12,7 @@ import useRestartOnReceiptFailure from '@hooks/useRestartOnReceiptFailure'; import useShowNotFoundPageInIOUStep from '@hooks/useShowNotFoundPageInIOUStep'; import {createNewReport} from '@libs/actions/Report'; +import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID'; import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute'; import Navigation from '@libs/Navigation/Navigation'; import {getOriginalMessage, isMoneyRequestAction} from '@libs/ReportActionsUtils'; @@ -54,10 +55,10 @@ function IOURequestStepReport({route, transaction}: IOURequestStepReportProps) { const {backTo, action, iouType, transactionID, reportID: reportIDFromRoute, reportActionID} = route.params; const isUnreported = transaction?.reportID === CONST.REPORT.UNREPORTED_REPORT_ID; const [transactionReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${transaction?.reportID}`); - const [reportNameValuePairs] = useOnyx(ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS); + const [reportNameValuePair] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${getNonEmptyStringOnyxID(transaction?.reportID)}`); const participantReportID = transaction?.participants?.at(0)?.reportID; const [participantReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${participantReportID}`); - const shouldUseTransactionReport = (!!transactionReport && isReportOutstanding(transactionReport, transactionReport?.policyID, reportNameValuePairs)) || isUnreported; + const shouldUseTransactionReport = (!!transactionReport && isReportOutstanding(transactionReport, transactionReport?.policyID, reportNameValuePair)) || isUnreported; const outstandingReportID = isPolicyExpenseChat(participantReport) ? participantReport?.iouReportID : participantReportID; const selectedReportID = shouldUseTransactionReport ? transactionReport?.reportID : outstandingReportID; const [selectedReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${selectedReportID}`); diff --git a/tests/unit/IOUUtilsTest.ts b/tests/unit/IOUUtilsTest.ts index 7e10d1b3fe03..81ae3a3df95d 100644 --- a/tests/unit/IOUUtilsTest.ts +++ b/tests/unit/IOUUtilsTest.ts @@ -947,11 +947,9 @@ describe('getExistingTransactionID', () => { const transaction = makeTransaction('500'); const transactionReport = makeOutstandingReport('500'); const routeReport = makeRouteReport('100'); - const reportNameValuePairs: OnyxCollection = { - [`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${transactionReport.reportID}`]: {private_isArchived: testDate}, - }; + const reportNameValuePair: ReportNameValuePairs = {private_isArchived: testDate}; - expect(IOUUtils.resolveReportForMoneyRequest({transaction, transactionReport, routeReport, policy: policyForResolve, reportNameValuePairs})).toBeUndefined(); + expect(IOUUtils.resolveReportForMoneyRequest({transaction, transactionReport, routeReport, policy: policyForResolve, reportNameValuePair})).toBeUndefined(); }); it('returns undefined when the picked report is non-outstanding and differs from the route (forces a new optimistic IOU)', () => { diff --git a/tests/unit/ReportUtilsTest.ts b/tests/unit/ReportUtilsTest.ts index 473bb81fc203..80d0d97369e3 100644 --- a/tests/unit/ReportUtilsTest.ts +++ b/tests/unit/ReportUtilsTest.ts @@ -9290,8 +9290,8 @@ describe('ReportUtils', () => { statusNum: CONST.REPORT.STATUS_NUM.SUBMITTED, }; - const reportNameValuePairs = {[`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${report.reportID}`]: {private_isArchived: '2024-01-01 00:00:00.000'}}; - expect(isReportOutstanding(report, policy.id, reportNameValuePairs)).toBe(false); + const reportNameValuePair = {private_isArchived: '2024-01-01 00:00:00.000'}; + expect(isReportOutstanding(report, policy.id, reportNameValuePair)).toBe(false); }); }); From 62a020ec5871c87a26f3ad81daf840c3dce5b94e Mon Sep 17 00:00:00 2001 From: ShridharGoel <35566748+ShridharGoel@users.noreply.github.com> Date: Sat, 25 Jul 2026 13:00:58 +0530 Subject: [PATCH 3/3] refactor: require report NVP entry --- src/libs/IOUUtils.ts | 2 +- tests/unit/IOUUtilsTest.ts | 61 ++++++++++++++++++++++++++++++++++---- 2 files changed, 56 insertions(+), 7 deletions(-) diff --git a/src/libs/IOUUtils.ts b/src/libs/IOUUtils.ts index 50b280bd14ef..a98d13af6047 100644 --- a/src/libs/IOUUtils.ts +++ b/src/libs/IOUUtils.ts @@ -517,7 +517,7 @@ function resolveReportForMoneyRequest({ transactionReport: OnyxEntry; routeReport: OnyxEntry; policy: OnyxEntry; - reportNameValuePair?: OnyxInputOrEntry; + reportNameValuePair: OnyxInputOrEntry; }): OnyxEntry { if (transaction?.reportID === CONST.REPORT.UNREPORTED_REPORT_ID) { return undefined; diff --git a/tests/unit/IOUUtilsTest.ts b/tests/unit/IOUUtilsTest.ts index 81ae3a3df95d..2583edcf70d3 100644 --- a/tests/unit/IOUUtilsTest.ts +++ b/tests/unit/IOUUtilsTest.ts @@ -910,6 +910,7 @@ describe('getExistingTransactionID', () => { describe('resolveReportForMoneyRequest', () => { const policyForResolve: Policy = {...createRandomPolicy(1, CONST.POLICY.TYPE.TEAM, 'Resolve Test Policy'), id: 'resolve-policy'}; + const nonArchivedReportNameValuePair: ReportNameValuePairs = {}; const makeOutstandingReport = (reportID: string): Report => ({ ...createRandomReport(Number(reportID), undefined), @@ -933,14 +934,30 @@ describe('getExistingTransactionID', () => { const transaction = makeTransaction(CONST.REPORT.UNREPORTED_REPORT_ID); const transactionReport = makeOutstandingReport('500'); const routeReport = makeRouteReport('100'); - expect(IOUUtils.resolveReportForMoneyRequest({transaction, transactionReport, routeReport, policy: policyForResolve})).toBeUndefined(); + expect( + IOUUtils.resolveReportForMoneyRequest({ + transaction, + transactionReport, + routeReport, + policy: policyForResolve, + reportNameValuePair: nonArchivedReportNameValuePair, + }), + ).toBeUndefined(); }); it('returns the picked report when it is outstanding (user-selected report wins)', () => { const transaction = makeTransaction('500'); const transactionReport = makeOutstandingReport('500'); const routeReport = makeRouteReport('100'); - expect(IOUUtils.resolveReportForMoneyRequest({transaction, transactionReport, routeReport, policy: policyForResolve})?.reportID).toBe('500'); + expect( + IOUUtils.resolveReportForMoneyRequest({ + transaction, + transactionReport, + routeReport, + policy: policyForResolve, + reportNameValuePair: nonArchivedReportNameValuePair, + })?.reportID, + ).toBe('500'); }); it('returns undefined when the picked report is archived', () => { @@ -959,20 +976,44 @@ describe('getExistingTransactionID', () => { policyID: 'someOtherPolicy', }; const routeReport = makeRouteReport('100'); - expect(IOUUtils.resolveReportForMoneyRequest({transaction, transactionReport: nonOutstandingPick, routeReport, policy: policyForResolve})).toBeUndefined(); + expect( + IOUUtils.resolveReportForMoneyRequest({ + transaction, + transactionReport: nonOutstandingPick, + routeReport, + policy: policyForResolve, + reportNameValuePair: nonArchivedReportNameValuePair, + }), + ).toBeUndefined(); }); it('returns the route report when no different transaction report has been picked', () => { const transaction = makeTransaction('100'); const transactionReport = makeRouteReport('100'); const routeReport = makeRouteReport('100'); - expect(IOUUtils.resolveReportForMoneyRequest({transaction, transactionReport, routeReport, policy: policyForResolve})?.reportID).toBe('100'); + expect( + IOUUtils.resolveReportForMoneyRequest({ + transaction, + transactionReport, + routeReport, + policy: policyForResolve, + reportNameValuePair: nonArchivedReportNameValuePair, + })?.reportID, + ).toBe('100'); }); it('falls back to the transaction report when no route report exists (the !routeReport branch)', () => { const transaction = makeTransaction('500'); const transactionReport = makeOutstandingReport('500'); - expect(IOUUtils.resolveReportForMoneyRequest({transaction, transactionReport, routeReport: undefined, policy: policyForResolve})?.reportID).toBe('500'); + expect( + IOUUtils.resolveReportForMoneyRequest({ + transaction, + transactionReport, + routeReport: undefined, + policy: policyForResolve, + reportNameValuePair: nonArchivedReportNameValuePair, + })?.reportID, + ).toBe('500'); }); it('returns undefined when the picked report is processing and policy harvesting is disabled', () => { @@ -984,7 +1025,15 @@ describe('getExistingTransactionID', () => { }; const routeReport = makeRouteReport('100'); const harvestingDisabledPolicy: Policy = {...policyForResolve, harvesting: {enabled: false}}; - expect(IOUUtils.resolveReportForMoneyRequest({transaction, transactionReport: processingPick, routeReport, policy: harvestingDisabledPolicy})).toBeUndefined(); + expect( + IOUUtils.resolveReportForMoneyRequest({ + transaction, + transactionReport: processingPick, + routeReport, + policy: harvestingDisabledPolicy, + reportNameValuePair: nonArchivedReportNameValuePair, + }), + ).toBeUndefined(); }); });