From c06c672c9bfde1063aed67268a972a1b6f17f2a3 Mon Sep 17 00:00:00 2001 From: jakubstec Date: Fri, 27 Mar 2026 09:53:37 +0100 Subject: [PATCH 1/8] feat: add new tests for changeTransactionsReport() in TransactionTest.ts --- tests/unit/TransactionTest.ts | 232 ++++++++++++++++++++++++++++++++++ 1 file changed, 232 insertions(+) diff --git a/tests/unit/TransactionTest.ts b/tests/unit/TransactionTest.ts index 8103eca0d10b..c518e3341415 100644 --- a/tests/unit/TransactionTest.ts +++ b/tests/unit/TransactionTest.ts @@ -987,6 +987,238 @@ describe('Transaction', () => { expect(nextStepMessage).toEqual('Waiting for You to submit %expenses.'); }); + + it('should correctly accumulate report totals when moving multiple transactions in a single batch', async () => { + const expenseReport = { + ...createRandomReport(1, undefined), + total: 0, + nonReimbursableTotal: 0, + currency: CONST.CURRENCY.USD, + }; + const transaction1 = { + ...generateTransaction({reportID: FAKE_OLD_REPORT_ID}), + amount: -100, + currency: CONST.CURRENCY.USD, + reimbursable: false, + }; + const transaction2 = { + ...generateTransaction({reportID: FAKE_OLD_REPORT_ID}), + amount: -200, + currency: CONST.CURRENCY.USD, + reimbursable: false, + }; + const oldIOUAction1: OnyxEntry> = { + reportActionID: rand64(), + actionName: CONST.REPORT.ACTIONS.TYPE.IOU, + actorAccountID: CURRENT_USER_ID, + created: DateUtils.getDBTime(), + originalMessage: { + IOUReportID: FAKE_OLD_REPORT_ID, + IOUTransactionID: transaction1.transactionID, + amount: transaction1.amount, + currency: transaction1.currency, + type: CONST.IOU.REPORT_ACTION_TYPE.CREATE, + }, + }; + const oldIOUAction2: OnyxEntry> = { + reportActionID: rand64(), + actionName: CONST.REPORT.ACTIONS.TYPE.IOU, + actorAccountID: CURRENT_USER_ID, + created: DateUtils.getDBTime(), + originalMessage: { + IOUReportID: FAKE_OLD_REPORT_ID, + IOUTransactionID: transaction2.transactionID, + amount: transaction2.amount, + currency: transaction2.currency, + type: CONST.IOU.REPORT_ACTION_TYPE.CREATE, + }, + }; + + await Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION}${transaction1.transactionID}`, transaction1); + await Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION}${transaction2.transactionID}`, transaction2); + await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${expenseReport.reportID}`, expenseReport); + await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${FAKE_OLD_REPORT_ID}`, { + [oldIOUAction1.reportActionID]: oldIOUAction1, + [oldIOUAction2.reportActionID]: oldIOUAction2, + }); + + const allTransactions = { + [`${ONYXKEYS.COLLECTION.TRANSACTION}${transaction1.transactionID}`]: transaction1, + [`${ONYXKEYS.COLLECTION.TRANSACTION}${transaction2.transactionID}`]: transaction2, + }; + + changeTransactionsReport({ + transactionIDs: [transaction1.transactionID, transaction2.transactionID], + isASAPSubmitBetaEnabled: false, + accountID: CURRENT_USER_ID, + email: 'test@example.com', + newReport: expenseReport, + policy: undefined, + allTransactions, + translate: TestHelper.translateLocal, + toLocaleDigit: TestHelper.toLocaleDigit, + }); + await waitForBatchedUpdates(); + + const report = await new Promise>((resolve) => { + const connection = Onyx.connect({ + key: `${ONYXKEYS.COLLECTION.REPORT}${expenseReport.reportID}`, + callback: (value) => { + Onyx.disconnect(connection); + resolve(value); + }, + }); + }); + + expect(report?.total).toBe(expenseReport.total + transaction1.amount + transaction2.amount); + expect(report?.nonReimbursableTotal).toBe(expenseReport.nonReimbursableTotal + transaction1.amount + transaction2.amount); + }); + + it('should not call API.write when the transaction is already on the target report', async () => { + const mockAPIWrite = jest.spyOn(require('@libs/API'), 'write').mockImplementation(() => Promise.resolve()); + + const transaction = generateTransaction({ + reportID: FAKE_NEW_REPORT_ID, + }); + await Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION}${transaction.transactionID}`, transaction); + + const report = await getReportFromUseOnyx(FAKE_NEW_REPORT_ID); + const allTransactions = { + [`${ONYXKEYS.COLLECTION.TRANSACTION}${transaction.transactionID}`]: transaction, + }; + + changeTransactionsReport({ + transactionIDs: [transaction.transactionID], + isASAPSubmitBetaEnabled: false, + accountID: CURRENT_USER_ID, + email: 'test@example.com', + newReport: report, + policy: undefined, + allTransactions, + translate: TestHelper.translateLocal, + toLocaleDigit: TestHelper.toLocaleDigit, + }); + await waitForBatchedUpdates(); + + expect(mockAPIWrite).not.toHaveBeenCalled(); + mockAPIWrite.mockRestore(); + }); + + it('should clear transaction violations when moving to unreported report', async () => { + const transaction = generateTransaction({ + reportID: FAKE_OLD_REPORT_ID, + }); + const oldIOUAction: OnyxEntry> = { + reportActionID: rand64(), + actionName: CONST.REPORT.ACTIONS.TYPE.IOU, + actorAccountID: CURRENT_USER_ID, + created: DateUtils.getDBTime(), + originalMessage: { + IOUReportID: FAKE_OLD_REPORT_ID, + IOUTransactionID: transaction.transactionID, + amount: transaction.amount, + currency: transaction.currency, + type: CONST.IOU.REPORT_ACTION_TYPE.CREATE, + }, + }; + const violations: TransactionViolation[] = [ + {name: CONST.VIOLATIONS.MISSING_CATEGORY, type: 'violation'}, + {name: CONST.VIOLATIONS.RTER, type: 'warning'}, + ]; + + await Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION}${transaction.transactionID}`, transaction); + await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${FAKE_OLD_REPORT_ID}`, {[oldIOUAction.reportActionID]: oldIOUAction}); + await Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transaction.transactionID}`, violations); + + const allTransactions = { + [`${ONYXKEYS.COLLECTION.TRANSACTION}${transaction.transactionID}`]: transaction, + }; + + changeTransactionsReport({ + transactionIDs: [transaction.transactionID], + isASAPSubmitBetaEnabled: false, + accountID: CURRENT_USER_ID, + email: 'test@example.com', + newReport: undefined, + policy: undefined, + allTransactions, + translate: TestHelper.translateLocal, + toLocaleDigit: TestHelper.toLocaleDigit, + }); + await waitForBatchedUpdates(); + + const updatedViolations = await getOnyxValue(`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transaction.transactionID}`); + expect(updatedViolations).toBeFalsy(); + }); + + it('should clear convertedAmount on transaction when moving between workspaces with different currencies', async () => { + const oldExpenseReport = { + ...createRandomReport(1, undefined), + total: -1503, + nonReimbursableTotal: 0, + currency: 'AUD', + }; + const transaction = { + ...generateTransaction({reportID: oldExpenseReport.reportID}), + currency: 'USD', + amount: -1000, + convertedAmount: -1503, + reimbursable: true, + }; + const oldIOUAction: OnyxEntry> = { + reportActionID: rand64(), + actionName: CONST.REPORT.ACTIONS.TYPE.IOU, + actorAccountID: CURRENT_USER_ID, + created: DateUtils.getDBTime(), + originalMessage: { + IOUReportID: oldExpenseReport.reportID, + IOUTransactionID: transaction.transactionID, + amount: transaction.amount, + currency: transaction.currency, + type: CONST.IOU.REPORT_ACTION_TYPE.CREATE, + }, + }; + const newExpenseReport = { + ...createRandomReport(2, undefined), + total: 0, + nonReimbursableTotal: 0, + currency: 'AED', + }; + + await Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION}${transaction.transactionID}`, transaction); + await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${oldExpenseReport.reportID}`, oldExpenseReport); + await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${newExpenseReport.reportID}`, newExpenseReport); + await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${oldExpenseReport.reportID}`, {[oldIOUAction.reportActionID]: oldIOUAction}); + + const allTransactions = { + [`${ONYXKEYS.COLLECTION.TRANSACTION}${transaction.transactionID}`]: transaction, + }; + + changeTransactionsReport({ + transactionIDs: [transaction.transactionID], + isASAPSubmitBetaEnabled: false, + accountID: CURRENT_USER_ID, + email: 'test@example.com', + newReport: newExpenseReport, + policy: undefined, + allTransactions, + translate: TestHelper.translateLocal, + toLocaleDigit: TestHelper.toLocaleDigit, + }); + await waitForBatchedUpdates(); + + const updatedTransaction = await new Promise>((resolve) => { + const connection = Onyx.connect({ + key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transaction.transactionID}`, + callback: (value) => { + Onyx.disconnect(connection); + resolve(value); + }, + }); + }); + + expect(updatedTransaction?.convertedAmount).toBeFalsy(); + }); }); describe('getAllNonDeletedTransactions', () => { From 01edbfca64d210f9d038ff0714d29890226c31c6 Mon Sep 17 00:00:00 2001 From: jakubstec Date: Fri, 27 Mar 2026 12:07:43 +0100 Subject: [PATCH 2/8] refactor: remove getPolicyTags() from src/libs/actions/Transaction.ts --- src/components/AddUnreportedExpenseFooter.tsx | 3 +++ src/libs/actions/Transaction.ts | 21 +++++-------------- src/pages/NewReportWorkspaceSelectionPage.tsx | 4 ++++ .../Search/SearchTransactionsChangeReport.tsx | 7 +++++++ .../iou/request/step/IOURequestEditReport.tsx | 5 +++++ .../iou/request/step/IOURequestStepReport.tsx | 5 +++++ tests/actions/IOUTest.ts | 3 +++ 7 files changed, 32 insertions(+), 16 deletions(-) diff --git a/src/components/AddUnreportedExpenseFooter.tsx b/src/components/AddUnreportedExpenseFooter.tsx index 14a42a1af963..7f6876a06d85 100644 --- a/src/components/AddUnreportedExpenseFooter.tsx +++ b/src/components/AddUnreportedExpenseFooter.tsx @@ -58,6 +58,8 @@ function AddUnreportedExpenseFooter({selectedIds, report, reportToConfirm, repor const [quickAction] = useOnyx(ONYXKEYS.NVP_QUICK_ACTION_GLOBAL_CREATE); const [betas] = useOnyx(ONYXKEYS.BETAS); const [chatReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${report?.chatReportID}`); + const [allPolicyTags] = useOnyx(ONYXKEYS.COLLECTION.POLICY_TAGS); + const policyTagList = policy ? (allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policy.id}`] ?? {}) : {}; const handleConfirm = () => { if (selectedIds.size === 0) { @@ -95,6 +97,7 @@ function AddUnreportedExpenseFooter({selectedIds, report, reportToConfirm, repor allTransactions: selectedTransactions, translate, toLocaleDigit, + policyTagList, }); } }); diff --git a/src/libs/actions/Transaction.ts b/src/libs/actions/Transaction.ts index f3bfc8a02f6b..0cbd41bcedb6 100644 --- a/src/libs/actions/Transaction.ts +++ b/src/libs/actions/Transaction.ts @@ -56,6 +56,7 @@ import type { PersonalDetails, Policy, PolicyCategories, + PolicyTagLists, RecentWaypoint, Report, ReportAction, @@ -70,7 +71,6 @@ import type {OnyxData} from '@src/types/onyx/Request'; import type {SearchDataTypes} from '@src/types/onyx/SearchResults'; import type {Waypoint, WaypointCollection} from '@src/types/onyx/Transaction'; import type TransactionState from '@src/types/utils/TransactionStateType'; -import {getPolicyTags} from './IOU/index'; let allReports: OnyxCollection = {}; Onyx.connect({ @@ -102,16 +102,6 @@ Onyx.connect({ callback: (val) => (allTransactionViolations = val ?? []), }); -/** - * @deprecated This function uses Onyx.connect and should be replaced with useOnyx for reactive data access. - * TODO: remove `getPolicyTagsData` from this file (https://github.com/Expensify/App/issues/72720) - * All usages of this function should be replaced with useOnyx hook in React components. - */ -function getPolicyTagsData(policyID: string | undefined) { - const allPolicyTags = getPolicyTags(); - return allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`] ?? {}; -} - // Helper to safely check for a string 'name' property function isViolationWithName(violation: unknown): violation is {name: string} { return !!(violation && typeof violation === 'object' && typeof (violation as {name?: unknown}).name === 'string'); @@ -854,6 +844,7 @@ type ChangeTransactionsReportProps = { allTransactions: OnyxCollection; translate: LocaleContextProps['translate']; toLocaleDigit: LocaleContextProps['toLocaleDigit']; + policyTagList?: OnyxEntry; }; function changeTransactionsReport({ @@ -868,6 +859,7 @@ function changeTransactionsReport({ allTransactions, translate, toLocaleDigit, + policyTagList, }: ChangeTransactionsReportProps) { const reportID = newReport?.reportID ?? CONST.REPORT.UNREPORTED_REPORT_ID; @@ -1003,9 +995,6 @@ function changeTransactionsReport({ let transactionsMoved = false; let shouldFixViolations = false; - // TODO: Replace getPolicyTagsData with useOnyx hook (https://github.com/Expensify/App/issues/72720) - // eslint-disable-next-line @typescript-eslint/no-deprecated - const policyTagList = getPolicyTagsData(policy?.id); const policyHasDependentTags = hasDependentTags(policy, policyTagList); // Determine the destination currency for convertedAmount clearing logic @@ -1128,7 +1117,7 @@ function changeTransactionsReport({ transaction, currentTransactionViolations[transaction.transactionID] ?? [], policy, - policyTagList, + policyTagList ?? {}, policyCategories ?? {}, policyHasDependentTags, false, @@ -1515,7 +1504,7 @@ function changeTransactionsReport({ transaction, currentTransactionViolations[transaction.transactionID] ?? [], policy, - policyTagList, + policyTagList ?? {}, policyCategories ?? {}, policyHasDependentTags, false, diff --git a/src/pages/NewReportWorkspaceSelectionPage.tsx b/src/pages/NewReportWorkspaceSelectionPage.tsx index 2a981d3bf937..585e0fa1f2ac 100644 --- a/src/pages/NewReportWorkspaceSelectionPage.tsx +++ b/src/pages/NewReportWorkspaceSelectionPage.tsx @@ -81,6 +81,8 @@ function NewReportWorkspaceSelectionPage({route}: NewReportWorkspaceSelectionPag const shouldShowLoadingIndicator = isLoadingApp && !isOffline; const [pendingPolicySelection, setPendingPolicySelection] = useState<{policy: WorkspaceListItem; shouldShowEmptyReportConfirmation: boolean} | null>(null); + const [allPolicyTags] = useOnyx(ONYXKEYS.COLLECTION.POLICY_TAGS); + const [policiesWithEmptyReports] = useOnyx(ONYXKEYS.COLLECTION.REPORT, { selector: (reports: OnyxCollection) => { if (!accountID) { @@ -120,6 +122,7 @@ function NewReportWorkspaceSelectionPage({route}: NewReportWorkspaceSelectionPag if (isMovingExpenses && (!!selectedTransactionsKeys.length || !!selectedTransactionIDs.length)) { const reportNextStep = allReportNextSteps?.[`${ONYXKEYS.COLLECTION.NEXT_STEP}${optimisticReport.reportID}`]; + const policyTagList = policyID ? (allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`] ?? {}) : {}; setNavigationActionToMicrotaskQueue(() => { changeTransactionsReport({ transactionIDs: selectedTransactionsKeys.length ? selectedTransactionsKeys : selectedTransactionIDs, @@ -133,6 +136,7 @@ function NewReportWorkspaceSelectionPage({route}: NewReportWorkspaceSelectionPag allTransactions, translate, toLocaleDigit, + policyTagList, }); // eslint-disable-next-line rulesdir/no-default-id-values diff --git a/src/pages/Search/SearchTransactionsChangeReport.tsx b/src/pages/Search/SearchTransactionsChangeReport.tsx index 2a3bfcd23e31..ac21e8ba237b 100644 --- a/src/pages/Search/SearchTransactionsChangeReport.tsx +++ b/src/pages/Search/SearchTransactionsChangeReport.tsx @@ -52,6 +52,7 @@ function SearchTransactionsChangeReport() { const [userBillingGraceEndPeriods] = useOnyx(ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_USER_BILLING_GRACE_PERIOD_END); const [ownerBillingGraceEndPeriod] = useOnyx(ONYXKEYS.NVP_PRIVATE_OWNER_BILLING_GRACE_PERIOD_END); const [betas] = useOnyx(ONYXKEYS.BETAS); + const [allPolicyTags] = useOnyx(ONYXKEYS.COLLECTION.POLICY_TAGS); const hasPerDiemTransactions = useHasPerDiemTransactions(selectedTransactionsKeys); const [transactionViolations] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS); const {isBetaEnabled} = usePermissions(); @@ -106,6 +107,7 @@ function SearchTransactionsChangeReport() { shouldDismissEmptyReportsConfirmation, ); const reportNextStep = allReportNextSteps?.[`${ONYXKEYS.COLLECTION.NEXT_STEP}${optimisticReport.reportID}`]; + const policyTagList = policyForMovingExpenses ? (allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyForMovingExpenses.id}`] ?? {}) : {}; setNavigationActionToMicrotaskQueue(() => { changeTransactionsReport({ transactionIDs: selectedTransactionsKeys, @@ -119,6 +121,7 @@ function SearchTransactionsChangeReport() { allTransactions: transactions, translate, toLocaleDigit, + policyTagList, }); clearSelectedTransactions(); }); @@ -151,6 +154,7 @@ function SearchTransactionsChangeReport() { const reportNextStep = allReportNextSteps?.[`${ONYXKEYS.COLLECTION.NEXT_STEP}${item.value}`]; const destinationReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${item.value}`]; + const policyTagList = item ? (allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${item.policyID}`] ?? {}) : {}; changeTransactionsReport({ transactionIDs: selectedTransactionsKeys, isASAPSubmitBetaEnabled, @@ -163,6 +167,7 @@ function SearchTransactionsChangeReport() { allTransactions: transactions, translate, toLocaleDigit, + policyTagList, }); // eslint-disable-next-line @typescript-eslint/no-deprecated InteractionManager.runAfterInteractions(() => { @@ -176,6 +181,7 @@ function SearchTransactionsChangeReport() { if (selectedTransactionsKeys.length === 0) { return; } + const policyTagList = personalPolicyID ? (allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${personalPolicyID}`] ?? {}) : {}; changeTransactionsReport({ transactionIDs: selectedTransactionsKeys, isASAPSubmitBetaEnabled, @@ -185,6 +191,7 @@ function SearchTransactionsChangeReport() { allTransactions: transactions, translate, toLocaleDigit, + policyTagList, }); clearSelectedTransactions(); Navigation.goBack(); diff --git a/src/pages/iou/request/step/IOURequestEditReport.tsx b/src/pages/iou/request/step/IOURequestEditReport.tsx index 55d8edb82e89..dbc5e0e924af 100644 --- a/src/pages/iou/request/step/IOURequestEditReport.tsx +++ b/src/pages/iou/request/step/IOURequestEditReport.tsx @@ -49,6 +49,7 @@ function IOURequestEditReport({route}: IOURequestEditReportProps) { const [ownerBillingGraceEndPeriod] = useOnyx(ONYXKEYS.NVP_PRIVATE_OWNER_BILLING_GRACE_PERIOD_END); const [allPolicies] = useOnyx(ONYXKEYS.COLLECTION.POLICY); const [allPolicyCategories] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}`); + const [allPolicyTags] = useOnyx(ONYXKEYS.COLLECTION.POLICY_TAGS); const personalDetails = usePersonalDetails(); const ownerPersonalDetails = useMemo( () => getPersonalDetailsForAccountID(selectedReport?.ownerAccountID, personalDetails) as PersonalDetails, @@ -71,6 +72,7 @@ function IOURequestEditReport({route}: IOURequestEditReportProps) { } const newReport = report ?? allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${item.value}`]; + const policyTagList = item ? (allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${item.policyID}`] ?? {}) : {}; setNavigationActionToMicrotaskQueue(() => { changeTransactionsReport({ @@ -85,6 +87,7 @@ function IOURequestEditReport({route}: IOURequestEditReportProps) { allTransactions, translate, toLocaleDigit, + policyTagList, }); turnOffMobileSelectionMode(); clearSelectedTransactions(true); @@ -97,6 +100,7 @@ function IOURequestEditReport({route}: IOURequestEditReportProps) { if (!selectedReport || transactionIDs.length === 0) { return; } + const policyTagList = personalPolicyID ? (allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${personalPolicyID}`] ?? {}) : {}; changeTransactionsReport({ transactionIDs, isASAPSubmitBetaEnabled, @@ -106,6 +110,7 @@ function IOURequestEditReport({route}: IOURequestEditReportProps) { allTransactions, translate, toLocaleDigit, + policyTagList, }); if (shouldTurnOffSelectionMode) { turnOffMobileSelectionMode(); diff --git a/src/pages/iou/request/step/IOURequestStepReport.tsx b/src/pages/iou/request/step/IOURequestStepReport.tsx index f912a0625110..10881c8ea99e 100644 --- a/src/pages/iou/request/step/IOURequestStepReport.tsx +++ b/src/pages/iou/request/step/IOURequestStepReport.tsx @@ -58,6 +58,7 @@ function IOURequestStepReport({route, transaction}: IOURequestStepReportProps) { const [selectedReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${selectedReportID}`); const [allPolicies] = useOnyx(ONYXKEYS.COLLECTION.POLICY); const [allPolicyCategories] = useOnyx(ONYXKEYS.COLLECTION.POLICY_CATEGORIES); + const [allPolicyTags] = useOnyx(ONYXKEYS.COLLECTION.POLICY_TAGS); const [userBillingGraceEndPeriods] = useOnyx(ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_USER_BILLING_GRACE_PERIOD_END); const [ownerBillingGraceEndPeriod] = useOnyx(ONYXKEYS.NVP_PRIVATE_OWNER_BILLING_GRACE_PERIOD_END); const [personalPolicyID] = useOnyx(ONYXKEYS.PERSONAL_POLICY_ID); @@ -175,6 +176,7 @@ function IOURequestStepReport({route, transaction}: IOURequestStepReportProps) { ); if (isEditing) { + const policyTagList = item ? (allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${item.policyID}`] ?? {}) : {}; changeTransactionsReport({ transactionIDs: [transaction.transactionID], isASAPSubmitBetaEnabled, @@ -187,6 +189,7 @@ function IOURequestStepReport({route, transaction}: IOURequestStepReportProps) { allTransactions, translate, toLocaleDigit, + policyTagList, }); removeTransaction(transaction.transactionID); } @@ -224,6 +227,7 @@ function IOURequestStepReport({route, transaction}: IOURequestStepReportProps) { Navigation.dismissToSuperWideRHP(); // eslint-disable-next-line @typescript-eslint/no-deprecated InteractionManager.runAfterInteractions(() => { + const policyTagList = personalPolicyID ? (allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${personalPolicyID}`] ?? {}) : {}; changeTransactionsReport({ transactionIDs: [transaction.transactionID], isASAPSubmitBetaEnabled, @@ -233,6 +237,7 @@ function IOURequestStepReport({route, transaction}: IOURequestStepReportProps) { allTransactions, translate, toLocaleDigit, + policyTagList, }); removeTransaction(transaction.transactionID); }); diff --git a/tests/actions/IOUTest.ts b/tests/actions/IOUTest.ts index dd84a38cc8b1..e16d7aa06fab 100644 --- a/tests/actions/IOUTest.ts +++ b/tests/actions/IOUTest.ts @@ -12526,6 +12526,8 @@ describe('actions/IOU', () => { expect(result.current.report).toBeDefined(); }); + const policyTagList = await getPolicyTags(mockPolicy.id); + changeTransactionsReport({ transactionIDs: [transaction?.transactionID], isASAPSubmitBetaEnabled: false, @@ -12536,6 +12538,7 @@ describe('actions/IOU', () => { allTransactions, translate: translateLocal, toLocaleDigit, + policyTagList, }); let updatedTransaction: OnyxEntry; From f5e358f34fb8ee41af56921c310b3052518abe5d Mon Sep 17 00:00:00 2001 From: jakubstec Date: Tue, 31 Mar 2026 17:35:58 +0200 Subject: [PATCH 3/8] apply review changes --- src/libs/actions/Transaction.ts | 2 +- tests/actions/IOUTest.ts | 14 +- tests/unit/TransactionTest.ts | 259 ++++---------------------------- 3 files changed, 38 insertions(+), 237 deletions(-) diff --git a/src/libs/actions/Transaction.ts b/src/libs/actions/Transaction.ts index 0cbd41bcedb6..7fbc3cc7dc78 100644 --- a/src/libs/actions/Transaction.ts +++ b/src/libs/actions/Transaction.ts @@ -844,7 +844,7 @@ type ChangeTransactionsReportProps = { allTransactions: OnyxCollection; translate: LocaleContextProps['translate']; toLocaleDigit: LocaleContextProps['toLocaleDigit']; - policyTagList?: OnyxEntry; + policyTagList?: PolicyTagLists; }; function changeTransactionsReport({ diff --git a/tests/actions/IOUTest.ts b/tests/actions/IOUTest.ts index e16d7aa06fab..7caf894a93a3 100644 --- a/tests/actions/IOUTest.ts +++ b/tests/actions/IOUTest.ts @@ -6173,7 +6173,7 @@ describe('actions/IOU', () => { }, }); const reportID = draftTransaction?.reportID ?? String(CONST.DEFAULT_NUMBER_ID); - const policyTags = await getPolicyTags(reportID); + const policyTags = (await getOnyxValue(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${reportID}`)) ?? {}; const reports = getTransactionAndExpenseReports(reportID); updateSplitTransactionsFromSplitExpensesFlow({ @@ -6292,7 +6292,7 @@ describe('actions/IOU', () => { }); const reportID = draftTransaction?.reportID ?? String(CONST.DEFAULT_NUMBER_ID); - const policyTags = await getPolicyTags(reportID); + const policyTags = (await getOnyxValue(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${reportID}`)) ?? {}; const reports = getTransactionAndExpenseReports(reportID); updateSplitTransactionsFromSplitExpensesFlow({ @@ -6423,7 +6423,7 @@ describe('actions/IOU', () => { }); const reportID = draftTransaction?.reportID ?? String(CONST.DEFAULT_NUMBER_ID); - const policyTags = await getPolicyTags(reportID); + const policyTags = (await getOnyxValue(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${reportID}`)) ?? {}; const reports = getTransactionAndExpenseReports(reportID); updateSplitTransactionsFromSplitExpensesFlow({ @@ -12718,7 +12718,7 @@ describe('actions/IOU', () => { }); const reportID = draftTransaction?.reportID ?? String(CONST.DEFAULT_NUMBER_ID); - const policyTags = await getPolicyTags(reportID); + const policyTags = (await getOnyxValue(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${reportID}`)) ?? {}; const reports = getTransactionAndExpenseReports(reportID); updateSplitTransactionsFromSplitExpensesFlow({ @@ -12893,7 +12893,7 @@ describe('actions/IOU', () => { }); const reportID = draftTransaction?.reportID ?? String(CONST.DEFAULT_NUMBER_ID); - const policyTags = await getPolicyTags(reportID); + const policyTags = (await getOnyxValue(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${reportID}`)) ?? {}; const reports = getTransactionAndExpenseReports(reportID); updateSplitTransactionsFromSplitExpensesFlow({ @@ -13081,7 +13081,7 @@ describe('actions/IOU', () => { }); const reportID = draftTransaction?.reportID ?? String(CONST.DEFAULT_NUMBER_ID); - const policyTags = await getPolicyTags(reportID); + const policyTags = (await getOnyxValue(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${reportID}`)) ?? {}; const reports = getTransactionAndExpenseReports(reportID); // it should use splitExpensesTotal in its calculation @@ -13293,7 +13293,7 @@ describe('actions/IOU', () => { }); const reportID = draftTransaction?.reportID ?? String(CONST.DEFAULT_NUMBER_ID); - const policyTags = await getPolicyTags(reportID); + const policyTags = (await getOnyxValue(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${reportID}`)) ?? {}; const reports = getTransactionAndExpenseReports(reportID); // When splitting the held expense diff --git a/tests/unit/TransactionTest.ts b/tests/unit/TransactionTest.ts index c518e3341415..3c112baacd03 100644 --- a/tests/unit/TransactionTest.ts +++ b/tests/unit/TransactionTest.ts @@ -2,6 +2,7 @@ import {act, renderHook, waitFor} from '@testing-library/react-native'; import type {OnyxEntry} from 'react-native-onyx'; import Onyx from 'react-native-onyx'; import OnyxUtils from 'react-native-onyx/dist/OnyxUtils'; +import type {ValueOf} from 'type-fest'; import useOnyx from '@hooks/useOnyx'; import {changeTransactionsReport, dismissDuplicateTransactionViolation, markAsCash, sanitizeWaypointsForAPI, saveWaypoint} from '@libs/actions/Transaction'; import DateUtils from '@libs/DateUtils'; @@ -94,23 +95,27 @@ describe('Transaction', () => { }); describe('changeTransactionsReport', () => { - it('correctly moves the IOU report action when an unreported transaction is added to an expense report', async () => { - const transaction = generateTransaction({ - reportID: CONST.REPORT.UNREPORTED_REPORT_ID, - }); - const oldIOUAction: OnyxEntry> = { + function createIOUAction(transaction: Transaction, reportID = transaction.reportID, type: ValueOf = CONST.IOU.REPORT_ACTION_TYPE.CREATE) { + return { reportActionID: rand64(), actionName: CONST.REPORT.ACTIONS.TYPE.IOU, actorAccountID: CURRENT_USER_ID, created: DateUtils.getDBTime(), originalMessage: { - IOUReportID: '0', + IOUReportID: reportID, IOUTransactionID: transaction.transactionID, amount: transaction.amount, currency: transaction.currency, - type: CONST.IOU.REPORT_ACTION_TYPE.TRACK, + type, }, - }; + } as ReportAction; + } + + it('correctly moves the IOU report action when an unreported transaction is added to an expense report', async () => { + const transaction = generateTransaction({ + reportID: CONST.REPORT.UNREPORTED_REPORT_ID, + }); + const oldIOUAction = createIOUAction(transaction, '0', CONST.IOU.REPORT_ACTION_TYPE.TRACK); await Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION}${transaction.transactionID}`, transaction); await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${FAKE_SELF_DM_REPORT_ID}`, {[oldIOUAction.reportActionID]: oldIOUAction}); @@ -148,19 +153,7 @@ describe('Transaction', () => { const transaction = generateTransaction({ reportID: FAKE_OLD_REPORT_ID, }); - const oldIOUAction: OnyxEntry> = { - reportActionID: rand64(), - actionName: CONST.REPORT.ACTIONS.TYPE.IOU, - actorAccountID: CURRENT_USER_ID, - created: DateUtils.getDBTime(), - originalMessage: { - IOUReportID: FAKE_OLD_REPORT_ID, - IOUTransactionID: transaction.transactionID, - amount: transaction.amount, - currency: transaction.currency, - type: CONST.IOU.REPORT_ACTION_TYPE.CREATE, - }, - }; + const oldIOUAction = createIOUAction(transaction); await Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION}${transaction.transactionID}`, transaction); await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${FAKE_OLD_REPORT_ID}`, {[oldIOUAction.reportActionID]: oldIOUAction}); @@ -200,19 +193,7 @@ describe('Transaction', () => { const transaction = generateTransaction({ reportID: FAKE_OLD_REPORT_ID, }); - const oldIOUAction: OnyxEntry> = { - reportActionID: rand64(), - actionName: CONST.REPORT.ACTIONS.TYPE.IOU, - actorAccountID: CURRENT_USER_ID, - created: DateUtils.getDBTime(), - originalMessage: { - IOUReportID: FAKE_OLD_REPORT_ID, - IOUTransactionID: transaction.transactionID, - amount: transaction.amount, - currency: transaction.currency, - type: CONST.IOU.REPORT_ACTION_TYPE.CREATE, - }, - }; + const oldIOUAction = createIOUAction(transaction); const mockReportNextStep = { type: 'neutral' as const, @@ -265,19 +246,7 @@ describe('Transaction', () => { const transaction = generateTransaction({ reportID: FAKE_OLD_REPORT_ID, }); - const oldIOUAction: OnyxEntry> = { - reportActionID: rand64(), - actionName: CONST.REPORT.ACTIONS.TYPE.IOU, - actorAccountID: CURRENT_USER_ID, - created: DateUtils.getDBTime(), - originalMessage: { - IOUReportID: FAKE_OLD_REPORT_ID, - IOUTransactionID: transaction.transactionID, - amount: transaction.amount, - currency: transaction.currency, - type: CONST.IOU.REPORT_ACTION_TYPE.CREATE, - }, - }; + const oldIOUAction = createIOUAction(transaction); const mockReportNextStep = { type: 'alert' as const, @@ -331,19 +300,7 @@ describe('Transaction', () => { const transaction = generateTransaction({ reportID: FAKE_OLD_REPORT_ID, }); - const oldIOUAction: OnyxEntry> = { - reportActionID: rand64(), - actionName: CONST.REPORT.ACTIONS.TYPE.IOU, - actorAccountID: CURRENT_USER_ID, - created: DateUtils.getDBTime(), - originalMessage: { - IOUReportID: FAKE_OLD_REPORT_ID, - IOUTransactionID: transaction.transactionID, - amount: transaction.amount, - currency: transaction.currency, - type: CONST.IOU.REPORT_ACTION_TYPE.CREATE, - }, - }; + const oldIOUAction = createIOUAction(transaction); await Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION}${transaction.transactionID}`, transaction); await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${FAKE_OLD_REPORT_ID}`, {[oldIOUAction.reportActionID]: oldIOUAction}); @@ -388,19 +345,7 @@ describe('Transaction', () => { amount: -100, currency: CONST.CURRENCY.USD, }); - const oldIOUAction: OnyxEntry> = { - reportActionID: rand64(), - actionName: CONST.REPORT.ACTIONS.TYPE.IOU, - actorAccountID: CURRENT_USER_ID, - created: DateUtils.getDBTime(), - originalMessage: { - IOUReportID: FAKE_OLD_REPORT_ID, - IOUTransactionID: transaction.transactionID, - amount: transaction.amount, - currency: transaction.currency, - type: CONST.IOU.REPORT_ACTION_TYPE.CREATE, - }, - }; + const oldIOUAction = createIOUAction(transaction); const submittedReport: Report = { ...createExpenseReport(6), reportID: FAKE_OLD_REPORT_ID, @@ -456,19 +401,7 @@ describe('Transaction', () => { const transaction = generateTransaction({ reportID: FAKE_OLD_REPORT_ID, }); - const oldIOUAction: OnyxEntry> = { - reportActionID: rand64(), - actionName: CONST.REPORT.ACTIONS.TYPE.IOU, - actorAccountID: CURRENT_USER_ID, - created: DateUtils.getDBTime(), - originalMessage: { - IOUReportID: FAKE_OLD_REPORT_ID, - IOUTransactionID: transaction.transactionID, - amount: transaction.amount, - currency: transaction.currency, - type: CONST.IOU.REPORT_ACTION_TYPE.CREATE, - }, - }; + const oldIOUAction = createIOUAction(transaction); await Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION}${transaction.transactionID}`, transaction); await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${FAKE_OLD_REPORT_ID}`, {[oldIOUAction.reportActionID]: oldIOUAction}); @@ -508,19 +441,7 @@ describe('Transaction', () => { const transaction = generateTransaction({ reportID: FAKE_OLD_REPORT_ID, }); - const oldIOUAction: OnyxEntry> = { - reportActionID: rand64(), - actionName: CONST.REPORT.ACTIONS.TYPE.IOU, - actorAccountID: CURRENT_USER_ID, - created: DateUtils.getDBTime(), - originalMessage: { - IOUReportID: FAKE_OLD_REPORT_ID, - IOUTransactionID: transaction.transactionID, - amount: transaction.amount, - currency: transaction.currency, - type: CONST.IOU.REPORT_ACTION_TYPE.CREATE, - }, - }; + const oldIOUAction = createIOUAction(transaction); await Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION}${transaction.transactionID}`, transaction); await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${FAKE_OLD_REPORT_ID}`, {[oldIOUAction.reportActionID]: oldIOUAction}); @@ -566,19 +487,7 @@ describe('Transaction', () => { currency: CONST.CURRENCY.USD, reimbursable: false, }; - const oldIOUAction: OnyxEntry> = { - reportActionID: rand64(), - actionName: CONST.REPORT.ACTIONS.TYPE.IOU, - actorAccountID: CURRENT_USER_ID, - created: DateUtils.getDBTime(), - originalMessage: { - IOUReportID: '0', - IOUTransactionID: transaction.transactionID, - amount: transaction.amount, - currency: transaction.currency, - type: CONST.IOU.REPORT_ACTION_TYPE.TRACK, - }, - }; + const oldIOUAction = createIOUAction(transaction, '0', CONST.IOU.REPORT_ACTION_TYPE.TRACK); const expenseReport = { ...createRandomReport(1, undefined), total: -200, @@ -627,19 +536,7 @@ describe('Transaction', () => { currency: 'IDR', reimbursable: false, }; - const oldIOUAction: OnyxEntry> = { - reportActionID: rand64(), - actionName: CONST.REPORT.ACTIONS.TYPE.IOU, - actorAccountID: CURRENT_USER_ID, - created: DateUtils.getDBTime(), - originalMessage: { - IOUReportID: '0', - IOUTransactionID: transaction.transactionID, - amount: transaction.amount, - currency: transaction.currency, - type: CONST.IOU.REPORT_ACTION_TYPE.TRACK, - }, - }; + const oldIOUAction = createIOUAction(transaction, '0', CONST.IOU.REPORT_ACTION_TYPE.TRACK); const expenseReport = { ...createRandomReport(1, undefined), total: -200, @@ -694,19 +591,7 @@ describe('Transaction', () => { convertedAmount: -3673, reimbursable: true, }; - const oldIOUAction: OnyxEntry> = { - reportActionID: rand64(), - actionName: CONST.REPORT.ACTIONS.TYPE.IOU, - actorAccountID: CURRENT_USER_ID, - created: DateUtils.getDBTime(), - originalMessage: { - IOUReportID: oldExpenseReport.reportID, - IOUTransactionID: transaction.transactionID, - amount: transaction.amount, - currency: transaction.currency, - type: CONST.IOU.REPORT_ACTION_TYPE.CREATE, - }, - }; + const oldIOUAction = createIOUAction(transaction); const newExpenseReport = { ...createRandomReport(2, undefined), total: 0, @@ -761,19 +646,7 @@ describe('Transaction', () => { convertedAmount: -1503, reimbursable: true, }; - const oldIOUAction: OnyxEntry> = { - reportActionID: rand64(), - actionName: CONST.REPORT.ACTIONS.TYPE.IOU, - actorAccountID: CURRENT_USER_ID, - created: DateUtils.getDBTime(), - originalMessage: { - IOUReportID: oldExpenseReport.reportID, - IOUTransactionID: transaction.transactionID, - amount: transaction.amount, - currency: transaction.currency, - type: CONST.IOU.REPORT_ACTION_TYPE.CREATE, - }, - }; + const oldIOUAction = createIOUAction(transaction); const newExpenseReport = { ...createRandomReport(2, undefined), total: 0, @@ -828,19 +701,7 @@ describe('Transaction', () => { amount: -100, reimbursable: false, }; - const oldIOUAction: OnyxEntry> = { - reportActionID: rand64(), - actionName: CONST.REPORT.ACTIONS.TYPE.IOU, - actorAccountID: CURRENT_USER_ID, - created: DateUtils.getDBTime(), - originalMessage: { - IOUReportID: FAKE_OLD_REPORT_ID, - IOUTransactionID: transaction.transactionID, - amount: transaction.amount, - currency: transaction.currency, - type: CONST.IOU.REPORT_ACTION_TYPE.CREATE, - }, - }; + const oldIOUAction = createIOUAction(transaction, FAKE_OLD_REPORT_ID); await Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION}${transaction.transactionID}`, transaction); await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${oldExpenseReport.reportID}`, oldExpenseReport); await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${oldExpenseReport.reportID}`, {[oldIOUAction.reportActionID]: oldIOUAction}); @@ -890,19 +751,7 @@ describe('Transaction', () => { reimbursable: false, currency: 'IDR', }; - const oldIOUAction: OnyxEntry> = { - reportActionID: rand64(), - actionName: CONST.REPORT.ACTIONS.TYPE.IOU, - actorAccountID: CURRENT_USER_ID, - created: DateUtils.getDBTime(), - originalMessage: { - IOUReportID: FAKE_OLD_REPORT_ID, - IOUTransactionID: transaction.transactionID, - amount: transaction.amount, - currency: transaction.currency, - type: CONST.IOU.REPORT_ACTION_TYPE.CREATE, - }, - }; + const oldIOUAction = createIOUAction(transaction, FAKE_OLD_REPORT_ID); await Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION}${transaction.transactionID}`, transaction); await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${oldExpenseReport.reportID}`, oldExpenseReport); await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${oldExpenseReport.reportID}`, {[oldIOUAction.reportActionID]: oldIOUAction}); @@ -1007,32 +856,8 @@ describe('Transaction', () => { currency: CONST.CURRENCY.USD, reimbursable: false, }; - const oldIOUAction1: OnyxEntry> = { - reportActionID: rand64(), - actionName: CONST.REPORT.ACTIONS.TYPE.IOU, - actorAccountID: CURRENT_USER_ID, - created: DateUtils.getDBTime(), - originalMessage: { - IOUReportID: FAKE_OLD_REPORT_ID, - IOUTransactionID: transaction1.transactionID, - amount: transaction1.amount, - currency: transaction1.currency, - type: CONST.IOU.REPORT_ACTION_TYPE.CREATE, - }, - }; - const oldIOUAction2: OnyxEntry> = { - reportActionID: rand64(), - actionName: CONST.REPORT.ACTIONS.TYPE.IOU, - actorAccountID: CURRENT_USER_ID, - created: DateUtils.getDBTime(), - originalMessage: { - IOUReportID: FAKE_OLD_REPORT_ID, - IOUTransactionID: transaction2.transactionID, - amount: transaction2.amount, - currency: transaction2.currency, - type: CONST.IOU.REPORT_ACTION_TYPE.CREATE, - }, - }; + const oldIOUAction1 = createIOUAction(transaction1); + const oldIOUAction2 = createIOUAction(transaction2); await Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION}${transaction1.transactionID}`, transaction1); await Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION}${transaction2.transactionID}`, transaction2); @@ -1108,19 +933,7 @@ describe('Transaction', () => { const transaction = generateTransaction({ reportID: FAKE_OLD_REPORT_ID, }); - const oldIOUAction: OnyxEntry> = { - reportActionID: rand64(), - actionName: CONST.REPORT.ACTIONS.TYPE.IOU, - actorAccountID: CURRENT_USER_ID, - created: DateUtils.getDBTime(), - originalMessage: { - IOUReportID: FAKE_OLD_REPORT_ID, - IOUTransactionID: transaction.transactionID, - amount: transaction.amount, - currency: transaction.currency, - type: CONST.IOU.REPORT_ACTION_TYPE.CREATE, - }, - }; + const oldIOUAction = createIOUAction(transaction); const violations: TransactionViolation[] = [ {name: CONST.VIOLATIONS.MISSING_CATEGORY, type: 'violation'}, {name: CONST.VIOLATIONS.RTER, type: 'warning'}, @@ -1165,19 +978,7 @@ describe('Transaction', () => { convertedAmount: -1503, reimbursable: true, }; - const oldIOUAction: OnyxEntry> = { - reportActionID: rand64(), - actionName: CONST.REPORT.ACTIONS.TYPE.IOU, - actorAccountID: CURRENT_USER_ID, - created: DateUtils.getDBTime(), - originalMessage: { - IOUReportID: oldExpenseReport.reportID, - IOUTransactionID: transaction.transactionID, - amount: transaction.amount, - currency: transaction.currency, - type: CONST.IOU.REPORT_ACTION_TYPE.CREATE, - }, - }; + const oldIOUAction = createIOUAction(transaction); const newExpenseReport = { ...createRandomReport(2, undefined), total: 0, From 17892345f2520f3cf82f66211732fb794aa3e798 Mon Sep 17 00:00:00 2001 From: jakubstec Date: Thu, 2 Apr 2026 13:18:08 +0200 Subject: [PATCH 4/8] add missing policyTagList argument in useUndeleteTransactions.ts and simplify policyTagList fallback assignment --- src/components/AddUnreportedExpenseFooter.tsx | 2 +- src/hooks/useUndeleteTransactions.ts | 3 +++ src/libs/actions/Transaction.ts | 2 +- src/pages/NewReportWorkspaceSelectionPage.tsx | 2 +- src/pages/Search/SearchTransactionsChangeReport.tsx | 6 +++--- src/pages/iou/request/step/IOURequestEditReport.tsx | 4 ++-- src/pages/iou/request/step/IOURequestStepReport.tsx | 4 ++-- 7 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/components/AddUnreportedExpenseFooter.tsx b/src/components/AddUnreportedExpenseFooter.tsx index 7f6876a06d85..69c787ed9a35 100644 --- a/src/components/AddUnreportedExpenseFooter.tsx +++ b/src/components/AddUnreportedExpenseFooter.tsx @@ -59,7 +59,7 @@ function AddUnreportedExpenseFooter({selectedIds, report, reportToConfirm, repor const [betas] = useOnyx(ONYXKEYS.BETAS); const [chatReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${report?.chatReportID}`); const [allPolicyTags] = useOnyx(ONYXKEYS.COLLECTION.POLICY_TAGS); - const policyTagList = policy ? (allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policy.id}`] ?? {}) : {}; + const policyTagList = policy ? allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policy.id}`] : {}; const handleConfirm = () => { if (selectedIds.size === 0) { diff --git a/src/hooks/useUndeleteTransactions.ts b/src/hooks/useUndeleteTransactions.ts index bc4e8452920e..dbe58f3ad51f 100644 --- a/src/hooks/useUndeleteTransactions.ts +++ b/src/hooks/useUndeleteTransactions.ts @@ -15,6 +15,8 @@ function useUndeleteTransactions() { const {translate, toLocaleDigit} = useLocalize(); const [personalPolicyID] = useOnyx(ONYXKEYS.PERSONAL_POLICY_ID); const [policy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${personalPolicyID}`); + const [allPolicyTags] = useOnyx(ONYXKEYS.COLLECTION.POLICY_TAGS); + const policyTagList = policy ? allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policy.id}`] : {}; return (transactionIDs: string[]) => { changeTransactionsReport({ @@ -26,6 +28,7 @@ function useUndeleteTransactions() { allTransactions, translate, toLocaleDigit, + policyTagList, }); }; } diff --git a/src/libs/actions/Transaction.ts b/src/libs/actions/Transaction.ts index 39c6893c2a08..307154ab0e20 100644 --- a/src/libs/actions/Transaction.ts +++ b/src/libs/actions/Transaction.ts @@ -846,7 +846,7 @@ type ChangeTransactionsReportProps = { allTransactions: OnyxCollection; translate: LocaleContextProps['translate']; toLocaleDigit: LocaleContextProps['toLocaleDigit']; - policyTagList?: PolicyTagLists; + policyTagList: OnyxEntry; }; function changeTransactionsReport({ diff --git a/src/pages/NewReportWorkspaceSelectionPage.tsx b/src/pages/NewReportWorkspaceSelectionPage.tsx index 8f58519e1553..3220c687d978 100644 --- a/src/pages/NewReportWorkspaceSelectionPage.tsx +++ b/src/pages/NewReportWorkspaceSelectionPage.tsx @@ -122,7 +122,7 @@ function NewReportWorkspaceSelectionPage({route}: NewReportWorkspaceSelectionPag if (isMovingExpenses && (!!selectedTransactionsKeys.length || !!selectedTransactionIDs.length)) { const reportNextStep = allReportNextSteps?.[`${ONYXKEYS.COLLECTION.NEXT_STEP}${optimisticReport.reportID}`]; - const policyTagList = policyID ? (allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`] ?? {}) : {}; + const policyTagList = policyID ? allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`] : {}; setNavigationActionToMicrotaskQueue(() => { changeTransactionsReport({ transactionIDs: selectedTransactionsKeys.length ? selectedTransactionsKeys : selectedTransactionIDs, diff --git a/src/pages/Search/SearchTransactionsChangeReport.tsx b/src/pages/Search/SearchTransactionsChangeReport.tsx index 03ac9b51f129..a9d1e0b8ef0f 100644 --- a/src/pages/Search/SearchTransactionsChangeReport.tsx +++ b/src/pages/Search/SearchTransactionsChangeReport.tsx @@ -107,7 +107,7 @@ function SearchTransactionsChangeReport() { shouldDismissEmptyReportsConfirmation, ); const reportNextStep = allReportNextSteps?.[`${ONYXKEYS.COLLECTION.NEXT_STEP}${optimisticReport.reportID}`]; - const policyTagList = policyForMovingExpenses ? (allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyForMovingExpenses.id}`] ?? {}) : {}; + const policyTagList = policyForMovingExpenses ? allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyForMovingExpenses.id}`] : {}; setNavigationActionToMicrotaskQueue(() => { changeTransactionsReport({ transactionIDs: selectedTransactionsKeys, @@ -154,7 +154,7 @@ function SearchTransactionsChangeReport() { const reportNextStep = allReportNextSteps?.[`${ONYXKEYS.COLLECTION.NEXT_STEP}${item.value}`]; const destinationReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${item.value}`]; - const policyTagList = item ? (allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${item.policyID}`] ?? {}) : {}; + const policyTagList = item ? allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${item.policyID}`] : {}; changeTransactionsReport({ transactionIDs: selectedTransactionsKeys, isASAPSubmitBetaEnabled, @@ -181,7 +181,7 @@ function SearchTransactionsChangeReport() { if (selectedTransactionsKeys.length === 0) { return; } - const policyTagList = personalPolicyID ? (allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${personalPolicyID}`] ?? {}) : {}; + const policyTagList = personalPolicyID ? allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${personalPolicyID}`] : {}; changeTransactionsReport({ transactionIDs: selectedTransactionsKeys, isASAPSubmitBetaEnabled, diff --git a/src/pages/iou/request/step/IOURequestEditReport.tsx b/src/pages/iou/request/step/IOURequestEditReport.tsx index 3ddaf82dd223..e068d5327b04 100644 --- a/src/pages/iou/request/step/IOURequestEditReport.tsx +++ b/src/pages/iou/request/step/IOURequestEditReport.tsx @@ -72,7 +72,7 @@ function IOURequestEditReport({route}: IOURequestEditReportProps) { } const newReport = report ?? allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${item.value}`]; - const policyTagList = item ? (allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${item.policyID}`] ?? {}) : {}; + const policyTagList = item ? allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${item.policyID}`] : {}; setNavigationActionToMicrotaskQueue(() => { changeTransactionsReport({ @@ -100,7 +100,7 @@ function IOURequestEditReport({route}: IOURequestEditReportProps) { if (!selectedReport || transactionIDs.length === 0) { return; } - const policyTagList = personalPolicyID ? (allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${personalPolicyID}`] ?? {}) : {}; + const policyTagList = personalPolicyID ? allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${personalPolicyID}`] : {}; changeTransactionsReport({ transactionIDs, isASAPSubmitBetaEnabled, diff --git a/src/pages/iou/request/step/IOURequestStepReport.tsx b/src/pages/iou/request/step/IOURequestStepReport.tsx index 4613db904674..feaa90dd6223 100644 --- a/src/pages/iou/request/step/IOURequestStepReport.tsx +++ b/src/pages/iou/request/step/IOURequestStepReport.tsx @@ -176,7 +176,7 @@ function IOURequestStepReport({route, transaction}: IOURequestStepReportProps) { ); if (isEditing) { - const policyTagList = item ? (allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${item.policyID}`] ?? {}) : {}; + const policyTagList = item ? allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${item.policyID}`] : {}; changeTransactionsReport({ transactionIDs: [transaction.transactionID], isASAPSubmitBetaEnabled, @@ -227,7 +227,7 @@ function IOURequestStepReport({route, transaction}: IOURequestStepReportProps) { Navigation.dismissToSuperWideRHP(); // eslint-disable-next-line @typescript-eslint/no-deprecated InteractionManager.runAfterInteractions(() => { - const policyTagList = personalPolicyID ? (allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${personalPolicyID}`] ?? {}) : {}; + const policyTagList = personalPolicyID ? allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${personalPolicyID}`] : {}; changeTransactionsReport({ transactionIDs: [transaction.transactionID], isASAPSubmitBetaEnabled, From 575feed9c73000bca6300e463819f0bca5590839 Mon Sep 17 00:00:00 2001 From: jakubstec Date: Thu, 2 Apr 2026 13:33:46 +0200 Subject: [PATCH 5/8] fix: add missing policyTagList argument in changeTransactionsReport function in TransactionTest.ts --- tests/unit/TransactionTest.ts | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/tests/unit/TransactionTest.ts b/tests/unit/TransactionTest.ts index 3c112baacd03..4fd25b3a8ba6 100644 --- a/tests/unit/TransactionTest.ts +++ b/tests/unit/TransactionTest.ts @@ -134,6 +134,7 @@ describe('Transaction', () => { allTransactions, translate: TestHelper.translateLocal, toLocaleDigit: TestHelper.toLocaleDigit, + policyTagList: undefined, }); await waitForBatchedUpdates(); const reportActions = await new Promise>((resolve) => { @@ -172,6 +173,7 @@ describe('Transaction', () => { allTransactions, translate: TestHelper.translateLocal, toLocaleDigit: TestHelper.toLocaleDigit, + policyTagList: undefined, }); await waitForBatchedUpdates(); const reportActions = await new Promise>((resolve) => { @@ -224,6 +226,7 @@ describe('Transaction', () => { allTransactions, translate: TestHelper.translateLocal, toLocaleDigit: TestHelper.toLocaleDigit, + policyTagList: undefined, }); await waitForBatchedUpdates(); @@ -278,6 +281,7 @@ describe('Transaction', () => { allTransactions, translate: TestHelper.translateLocal, toLocaleDigit: TestHelper.toLocaleDigit, + policyTagList: undefined, }); await waitForBatchedUpdates(); @@ -320,6 +324,7 @@ describe('Transaction', () => { allTransactions, translate: TestHelper.translateLocal, toLocaleDigit: TestHelper.toLocaleDigit, + policyTagList: undefined, }); await waitForBatchedUpdates(); @@ -374,6 +379,7 @@ describe('Transaction', () => { allTransactions, translate: TestHelper.translateLocal, toLocaleDigit: TestHelper.toLocaleDigit, + policyTagList: undefined, }); await waitForBatchedUpdates(); @@ -420,6 +426,7 @@ describe('Transaction', () => { allTransactions, translate: TestHelper.translateLocal, toLocaleDigit: TestHelper.toLocaleDigit, + policyTagList: undefined, }); await waitForBatchedUpdates(); @@ -463,6 +470,7 @@ describe('Transaction', () => { allTransactions, translate: TestHelper.translateLocal, toLocaleDigit: TestHelper.toLocaleDigit, + policyTagList: undefined, }); await waitForBatchedUpdates(); @@ -512,6 +520,7 @@ describe('Transaction', () => { allTransactions, translate: TestHelper.translateLocal, toLocaleDigit: TestHelper.toLocaleDigit, + policyTagList: undefined, }); await waitForBatchedUpdates(); const report = await new Promise>((resolve) => { @@ -561,6 +570,7 @@ describe('Transaction', () => { allTransactions, translate: TestHelper.translateLocal, toLocaleDigit: TestHelper.toLocaleDigit, + policyTagList: undefined, }); await waitForBatchedUpdates(); const report = await new Promise>((resolve) => { @@ -617,6 +627,7 @@ describe('Transaction', () => { allTransactions, translate: TestHelper.translateLocal, toLocaleDigit: TestHelper.toLocaleDigit, + policyTagList: undefined, }); await waitForBatchedUpdates(); const report = await new Promise>((resolve) => { @@ -672,6 +683,7 @@ describe('Transaction', () => { allTransactions, translate: TestHelper.translateLocal, toLocaleDigit: TestHelper.toLocaleDigit, + policyTagList: undefined, }); await waitForBatchedUpdates(); const report = await new Promise>((resolve) => { @@ -720,6 +732,7 @@ describe('Transaction', () => { allTransactions, translate: TestHelper.translateLocal, toLocaleDigit: TestHelper.toLocaleDigit, + policyTagList: undefined, }); await waitForBatchedUpdates(); @@ -770,6 +783,7 @@ describe('Transaction', () => { allTransactions, translate: TestHelper.translateLocal, toLocaleDigit: TestHelper.toLocaleDigit, + policyTagList: undefined, }); await waitForBatchedUpdates(); @@ -826,6 +840,7 @@ describe('Transaction', () => { allTransactions, translate: TestHelper.translateLocal, toLocaleDigit: TestHelper.toLocaleDigit, + policyTagList: undefined, }); await waitForBatchedUpdates(); @@ -882,6 +897,7 @@ describe('Transaction', () => { allTransactions, translate: TestHelper.translateLocal, toLocaleDigit: TestHelper.toLocaleDigit, + policyTagList: undefined, }); await waitForBatchedUpdates(); @@ -922,6 +938,7 @@ describe('Transaction', () => { allTransactions, translate: TestHelper.translateLocal, toLocaleDigit: TestHelper.toLocaleDigit, + policyTagList: undefined, }); await waitForBatchedUpdates(); @@ -957,6 +974,7 @@ describe('Transaction', () => { allTransactions, translate: TestHelper.translateLocal, toLocaleDigit: TestHelper.toLocaleDigit, + policyTagList: undefined, }); await waitForBatchedUpdates(); @@ -1005,6 +1023,7 @@ describe('Transaction', () => { allTransactions, translate: TestHelper.translateLocal, toLocaleDigit: TestHelper.toLocaleDigit, + policyTagList: undefined, }); await waitForBatchedUpdates(); From 2c877ad5d49d9e1ac715413eefaa295f57be8c05 Mon Sep 17 00:00:00 2001 From: jakubstec Date: Fri, 3 Apr 2026 11:16:11 +0200 Subject: [PATCH 6/8] apply review changes --- tests/actions/IOUTest.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/actions/IOUTest.ts b/tests/actions/IOUTest.ts index 9b60e7b72081..6d45ed4b72f8 100644 --- a/tests/actions/IOUTest.ts +++ b/tests/actions/IOUTest.ts @@ -6392,7 +6392,7 @@ describe('actions/IOU', () => { }, }); const reportID = draftTransaction?.reportID ?? String(CONST.DEFAULT_NUMBER_ID); - const policyTags = (await getOnyxValue(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${reportID}`)) ?? {}; + const policyTags = await getPolicyTags(reportID); const reports = getTransactionAndExpenseReports(reportID); updateSplitTransactionsFromSplitExpensesFlow({ @@ -6511,7 +6511,7 @@ describe('actions/IOU', () => { }); const reportID = draftTransaction?.reportID ?? String(CONST.DEFAULT_NUMBER_ID); - const policyTags = (await getOnyxValue(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${reportID}`)) ?? {}; + const policyTags = await getPolicyTags(reportID); const reports = getTransactionAndExpenseReports(reportID); updateSplitTransactionsFromSplitExpensesFlow({ @@ -6642,7 +6642,7 @@ describe('actions/IOU', () => { }); const reportID = draftTransaction?.reportID ?? String(CONST.DEFAULT_NUMBER_ID); - const policyTags = (await getOnyxValue(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${reportID}`)) ?? {}; + const policyTags = await getPolicyTags(reportID); const reports = getTransactionAndExpenseReports(reportID); updateSplitTransactionsFromSplitExpensesFlow({ @@ -14083,7 +14083,7 @@ describe('actions/IOU', () => { expect(result.current.report).toBeDefined(); }); - const policyTagList = await getPolicyTags(mockPolicy.id); + const policyTagList = (await getOnyxValue(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${mockPolicy.id}`)) ?? {}; changeTransactionsReport({ transactionIDs: [transaction?.transactionID], From d3e4054168cc6483f4cae9a8ab0202c22a3548f4 Mon Sep 17 00:00:00 2001 From: jakubstec Date: Thu, 16 Apr 2026 15:02:47 +0200 Subject: [PATCH 7/8] apply review changes --- src/components/AddUnreportedExpenseFooter.tsx | 3 +-- src/hooks/useUndeleteTransactions.ts | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/components/AddUnreportedExpenseFooter.tsx b/src/components/AddUnreportedExpenseFooter.tsx index 3fa89c5d1641..618ee2744dc7 100644 --- a/src/components/AddUnreportedExpenseFooter.tsx +++ b/src/components/AddUnreportedExpenseFooter.tsx @@ -58,8 +58,7 @@ function AddUnreportedExpenseFooter({selectedIds, report, reportToConfirm, repor const [quickAction] = useOnyx(ONYXKEYS.NVP_QUICK_ACTION_GLOBAL_CREATE); const [betas] = useOnyx(ONYXKEYS.BETAS); const [chatReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${report?.chatReportID}`); - const [allPolicyTags] = useOnyx(ONYXKEYS.COLLECTION.POLICY_TAGS); - const policyTagList = policy ? allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policy.id}`] : {}; + const [policyTagList] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policy?.id}`); const handleConfirm = () => { if (selectedIds.size === 0) { diff --git a/src/hooks/useUndeleteTransactions.ts b/src/hooks/useUndeleteTransactions.ts index d238fdf22b9d..6cae21b58894 100644 --- a/src/hooks/useUndeleteTransactions.ts +++ b/src/hooks/useUndeleteTransactions.ts @@ -12,8 +12,7 @@ function useUndeleteTransactions() { const isASAPSubmitBetaEnabled = isBetaEnabled(CONST.BETAS.ASAP_SUBMIT); const [personalPolicyID] = useOnyx(ONYXKEYS.PERSONAL_POLICY_ID); const [policy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${personalPolicyID}`); - const [allPolicyTags] = useOnyx(ONYXKEYS.COLLECTION.POLICY_TAGS); - const policyTagList = policy ? allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policy.id}`] : {}; + const [policyTagList] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policy?.id}`); return (transactions: Transaction[]) => { const transactionIDs = transactions.map((transaction) => transaction.transactionID); From b91e036f4a3e1267ca7070197c2c149f60040325 Mon Sep 17 00:00:00 2001 From: jakubstec Date: Tue, 21 Apr 2026 16:54:20 +0200 Subject: [PATCH 8/8] apply reviewer changes --- .../Search/SearchTransactionsChangeReport.tsx | 4 +- .../iou/request/step/IOURequestEditReport.tsx | 2 +- .../iou/request/step/IOURequestStepReport.tsx | 2 +- tests/unit/TransactionTest.ts | 113 +++++++++++++++++- 4 files changed, 116 insertions(+), 5 deletions(-) diff --git a/src/pages/Search/SearchTransactionsChangeReport.tsx b/src/pages/Search/SearchTransactionsChangeReport.tsx index 25ab4e6725c0..de6b7b52aa87 100644 --- a/src/pages/Search/SearchTransactionsChangeReport.tsx +++ b/src/pages/Search/SearchTransactionsChangeReport.tsx @@ -106,7 +106,7 @@ function SearchTransactionsChangeReport() { shouldDismissEmptyReportsConfirmation, ); const reportNextStep = allReportNextSteps?.[`${ONYXKEYS.COLLECTION.NEXT_STEP}${optimisticReport.reportID}`]; - const policyTagList = policyForMovingExpenses ? allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyForMovingExpenses.id}`] : {}; + const policyTagList = policyForMovingExpenses?.id ? allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyForMovingExpenses.id}`] : {}; setNavigationActionToMicrotaskQueue(() => { changeTransactionsReport({ transactionIDs: selectedTransactionsKeys, @@ -151,7 +151,7 @@ function SearchTransactionsChangeReport() { const reportNextStep = allReportNextSteps?.[`${ONYXKEYS.COLLECTION.NEXT_STEP}${item.value}`]; const destinationReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${item.value}`]; - const policyTagList = item ? allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${item.policyID}`] : {}; + const policyTagList = item?.policyID ? allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${item.policyID}`] : {}; changeTransactionsReport({ transactionIDs: selectedTransactionsKeys, isASAPSubmitBetaEnabled, diff --git a/src/pages/iou/request/step/IOURequestEditReport.tsx b/src/pages/iou/request/step/IOURequestEditReport.tsx index ad4eef39e683..27a7e1439a9d 100644 --- a/src/pages/iou/request/step/IOURequestEditReport.tsx +++ b/src/pages/iou/request/step/IOURequestEditReport.tsx @@ -71,7 +71,7 @@ function IOURequestEditReport({route}: IOURequestEditReportProps) { } const newReport = report ?? allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${item.value}`]; - const policyTagList = item ? allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${item.policyID}`] : {}; + const policyTagList = item?.policyID ? allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${item.policyID}`] : {}; setNavigationActionToMicrotaskQueue(() => { changeTransactionsReport({ diff --git a/src/pages/iou/request/step/IOURequestStepReport.tsx b/src/pages/iou/request/step/IOURequestStepReport.tsx index 3eb1ba634a30..27d62f645c26 100644 --- a/src/pages/iou/request/step/IOURequestStepReport.tsx +++ b/src/pages/iou/request/step/IOURequestStepReport.tsx @@ -175,7 +175,7 @@ function IOURequestStepReport({route, transaction}: IOURequestStepReportProps) { ); if (isEditing) { - const policyTagList = item ? allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${item.policyID}`] : {}; + const policyTagList = item?.policyID ? allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${item.policyID}`] : {}; changeTransactionsReport({ transactionIDs: [transaction.transactionID], isASAPSubmitBetaEnabled, diff --git a/tests/unit/TransactionTest.ts b/tests/unit/TransactionTest.ts index 681fe2dc7d02..72ebc7689f5c 100644 --- a/tests/unit/TransactionTest.ts +++ b/tests/unit/TransactionTest.ts @@ -16,7 +16,7 @@ import type {TransactionViolation} from '@src/types/onyx'; import type {Attendee} from '@src/types/onyx/IOU'; import type {ReportCollectionDataSet} from '@src/types/onyx/Report'; import * as TransactionUtils from '../../src/libs/TransactionUtils'; -import type {PersonalDetails, RecentWaypoint, Report, ReportAction, ReportActions, Transaction} from '../../src/types/onyx'; +import type {PersonalDetails, PolicyTagLists, RecentWaypoint, Report, ReportAction, ReportActions, Transaction} from '../../src/types/onyx'; import createRandomPolicy from '../utils/collections/policies'; import createRandomPolicyCategories from '../utils/collections/policyCategory'; import {createExpenseReport, createRandomReport} from '../utils/collections/reports'; @@ -1055,6 +1055,117 @@ describe('Transaction', () => { expect(updatedTransaction?.convertedAmount).toBeFalsy(); }); + + it('should add missingTag violation when moving to a paid policy with a single-level required tag and the transaction has no tag', async () => { + const policyID = '77'; + const transaction = generateTransaction({reportID: FAKE_OLD_REPORT_ID}); + const oldIOUAction = createIOUAction(transaction); + const newExpenseReport = { + ...createExpenseReport(Number(FAKE_NEW_REPORT_ID)), + policyID, + stateNum: CONST.REPORT.STATE_NUM.OPEN, + statusNum: CONST.REPORT.STATUS_NUM.OPEN, + ownerAccountID: CURRENT_USER_ID, + }; + const policy = { + ...createRandomPolicy(Number(policyID), CONST.POLICY.TYPE.TEAM), + requiresTag: true, + }; + const policyTagList: PolicyTagLists = { + Department: { + name: 'Department', + required: true, + orderWeight: 0, + tags: { + Engineering: {name: 'Engineering', enabled: true}, + Sales: {name: 'Sales', enabled: true}, + }, + }, + }; + + await Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION}${transaction.transactionID}`, transaction); + await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${FAKE_OLD_REPORT_ID}`, {[oldIOUAction.reportActionID]: oldIOUAction}); + + const allTransactions = { + [`${ONYXKEYS.COLLECTION.TRANSACTION}${transaction.transactionID}`]: transaction, + }; + + changeTransactionsReport({ + transactionIDs: [transaction.transactionID], + isASAPSubmitBetaEnabled: false, + accountID: CURRENT_USER_ID, + email: 'test@example.com', + newReport: newExpenseReport, + policy, + allTransactions, + policyTagList, + }); + await waitForBatchedUpdates(); + + const updatedViolations = await getOnyxValue(`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transaction.transactionID}`); + expect(updatedViolations?.some((violation) => violation.name === CONST.VIOLATIONS.MISSING_TAG)).toBe(true); + }); + + it('should add a missingTag violation per tag list when moving to a paid policy with dependent multi-level tags and the transaction has no tag', async () => { + const policyID = '88'; + const transaction = generateTransaction({reportID: FAKE_OLD_REPORT_ID}); + const oldIOUAction = createIOUAction(transaction); + const newExpenseReport = { + ...createExpenseReport(Number(FAKE_NEW_REPORT_ID)), + policyID, + stateNum: CONST.REPORT.STATE_NUM.OPEN, + statusNum: CONST.REPORT.STATUS_NUM.OPEN, + ownerAccountID: CURRENT_USER_ID, + }; + const policy = { + ...createRandomPolicy(Number(policyID), CONST.POLICY.TYPE.TEAM), + requiresTag: true, + hasMultipleTagLists: true, + }; + const policyTagList: PolicyTagLists = { + Region: { + name: 'Region', + required: true, + orderWeight: 0, + tags: { + California: {name: 'California', enabled: true}, + }, + }, + City: { + name: 'City', + required: true, + orderWeight: 1, + tags: { + SanFrancisco: {name: 'San Francisco', enabled: true, rules: {parentTagsFilter: '^California$'}}, + }, + }, + }; + + await Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION}${transaction.transactionID}`, transaction); + await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${FAKE_OLD_REPORT_ID}`, {[oldIOUAction.reportActionID]: oldIOUAction}); + + const allTransactions = { + [`${ONYXKEYS.COLLECTION.TRANSACTION}${transaction.transactionID}`]: transaction, + }; + + changeTransactionsReport({ + transactionIDs: [transaction.transactionID], + isASAPSubmitBetaEnabled: false, + accountID: CURRENT_USER_ID, + email: 'test@example.com', + newReport: newExpenseReport, + policy, + allTransactions, + policyTagList, + }); + await waitForBatchedUpdates(); + + const updatedViolations = await getOnyxValue(`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transaction.transactionID}`); + const missingTagViolations = updatedViolations?.filter((violation) => violation.name === CONST.VIOLATIONS.MISSING_TAG) ?? []; + expect(missingTagViolations).toHaveLength(2); + expect(missingTagViolations.some((violation) => violation.data?.tagName === 'Region')).toBe(true); + expect(missingTagViolations.some((violation) => violation.data?.tagName === 'City')).toBe(true); + }); }); describe('getAllNonDeletedTransactions', () => {