diff --git a/src/components/AddUnreportedExpenseFooter.tsx b/src/components/AddUnreportedExpenseFooter.tsx index 80ff3519cc02..618ee2744dc7 100644 --- a/src/components/AddUnreportedExpenseFooter.tsx +++ b/src/components/AddUnreportedExpenseFooter.tsx @@ -58,6 +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 [policyTagList] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policy?.id}`); const handleConfirm = () => { if (selectedIds.size === 0) { @@ -93,6 +94,7 @@ function AddUnreportedExpenseFooter({selectedIds, report, reportToConfirm, repor reportNextStep, policyCategories, allTransactions: selectedTransactions, + policyTagList, }); } }); diff --git a/src/hooks/useUndeleteTransactions.ts b/src/hooks/useUndeleteTransactions.ts index d132d4ceb1c9..6cae21b58894 100644 --- a/src/hooks/useUndeleteTransactions.ts +++ b/src/hooks/useUndeleteTransactions.ts @@ -12,6 +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 [policyTagList] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policy?.id}`); return (transactions: Transaction[]) => { const transactionIDs = transactions.map((transaction) => transaction.transactionID); @@ -24,6 +25,7 @@ function useUndeleteTransactions() { email: currentUserPersonalDetails.email ?? '', policy, allTransactions, + policyTagList, }); }; } diff --git a/src/libs/actions/Transaction.ts b/src/libs/actions/Transaction.ts index b6ac675109df..d0ca80597f86 100644 --- a/src/libs/actions/Transaction.ts +++ b/src/libs/actions/Transaction.ts @@ -49,6 +49,7 @@ import type { PersonalDetails, Policy, PolicyCategories, + PolicyTagLists, RecentWaypoint, Report, ReportAction, @@ -63,7 +64,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({ @@ -95,16 +95,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'); @@ -842,6 +832,7 @@ type ChangeTransactionsReportProps = { reportNextStep?: OnyxEntry; policyCategories?: OnyxEntry; allTransactions: OnyxCollection; + policyTagList: OnyxEntry; }; function changeTransactionsReport({ @@ -854,6 +845,7 @@ function changeTransactionsReport({ reportNextStep, policyCategories, allTransactions, + policyTagList, }: ChangeTransactionsReportProps) { const reportID = newReport?.reportID ?? CONST.REPORT.UNREPORTED_REPORT_ID; @@ -990,9 +982,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 @@ -1125,7 +1114,7 @@ function changeTransactionsReport({ transaction, currentTransactionViolations[transaction.transactionID] ?? [], policy, - policyTagList, + policyTagList ?? {}, policyCategories ?? {}, policyHasDependentTags, false, @@ -1516,7 +1505,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 8813717e577c..8ab5291e50b0 100644 --- a/src/pages/NewReportWorkspaceSelectionPage.tsx +++ b/src/pages/NewReportWorkspaceSelectionPage.tsx @@ -82,6 +82,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) { @@ -121,6 +123,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, @@ -132,6 +135,7 @@ function NewReportWorkspaceSelectionPage({route}: NewReportWorkspaceSelectionPag reportNextStep, policyCategories: undefined, allTransactions, + 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 02e233b21b23..de6b7b52aa87 100644 --- a/src/pages/Search/SearchTransactionsChangeReport.tsx +++ b/src/pages/Search/SearchTransactionsChangeReport.tsx @@ -51,6 +51,7 @@ function SearchTransactionsChangeReport() { const [ownerBillingGracePeriodEnd] = useOnyx(ONYXKEYS.NVP_PRIVATE_OWNER_BILLING_GRACE_PERIOD_END); const [amountOwed] = useOnyx(ONYXKEYS.NVP_PRIVATE_AMOUNT_OWED); 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(); @@ -105,6 +106,7 @@ function SearchTransactionsChangeReport() { shouldDismissEmptyReportsConfirmation, ); const reportNextStep = allReportNextSteps?.[`${ONYXKEYS.COLLECTION.NEXT_STEP}${optimisticReport.reportID}`]; + const policyTagList = policyForMovingExpenses?.id ? allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyForMovingExpenses.id}`] : {}; setNavigationActionToMicrotaskQueue(() => { changeTransactionsReport({ transactionIDs: selectedTransactionsKeys, @@ -116,6 +118,7 @@ function SearchTransactionsChangeReport() { reportNextStep, policyCategories: allPolicyCategories?.[`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyForMovingExpensesID}`], allTransactions: transactions, + policyTagList, }); clearSelectedTransactions(); }); @@ -148,6 +151,7 @@ function SearchTransactionsChangeReport() { const reportNextStep = allReportNextSteps?.[`${ONYXKEYS.COLLECTION.NEXT_STEP}${item.value}`]; const destinationReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${item.value}`]; + const policyTagList = item?.policyID ? allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${item.policyID}`] : {}; changeTransactionsReport({ transactionIDs: selectedTransactionsKeys, isASAPSubmitBetaEnabled, @@ -158,6 +162,7 @@ function SearchTransactionsChangeReport() { reportNextStep, policyCategories: allPolicyCategories?.[`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${item.policyID}`], allTransactions: transactions, + policyTagList, }); // eslint-disable-next-line @typescript-eslint/no-deprecated InteractionManager.runAfterInteractions(() => { @@ -171,6 +176,7 @@ function SearchTransactionsChangeReport() { if (selectedTransactionsKeys.length === 0) { return; } + const policyTagList = personalPolicyID ? allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${personalPolicyID}`] : {}; changeTransactionsReport({ transactionIDs: selectedTransactionsKeys, isASAPSubmitBetaEnabled, @@ -178,6 +184,7 @@ function SearchTransactionsChangeReport() { email: session?.email ?? '', policy: allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${personalPolicyID}`], allTransactions: transactions, + policyTagList, }); clearSelectedTransactions(); Navigation.goBack(); diff --git a/src/pages/iou/request/step/IOURequestEditReport.tsx b/src/pages/iou/request/step/IOURequestEditReport.tsx index ca2436b3bc37..27a7e1439a9d 100644 --- a/src/pages/iou/request/step/IOURequestEditReport.tsx +++ b/src/pages/iou/request/step/IOURequestEditReport.tsx @@ -48,6 +48,7 @@ function IOURequestEditReport({route}: IOURequestEditReportProps) { const [amountOwed] = useOnyx(ONYXKEYS.NVP_PRIVATE_AMOUNT_OWED); 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, @@ -70,6 +71,7 @@ function IOURequestEditReport({route}: IOURequestEditReportProps) { } const newReport = report ?? allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${item.value}`]; + const policyTagList = item?.policyID ? allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${item.policyID}`] : {}; setNavigationActionToMicrotaskQueue(() => { changeTransactionsReport({ @@ -82,6 +84,7 @@ function IOURequestEditReport({route}: IOURequestEditReportProps) { reportNextStep, policyCategories: allPolicyCategories?.[`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${item.policyID}`], allTransactions, + policyTagList, }); turnOffMobileSelectionMode(); clearSelectedTransactions(true); @@ -94,6 +97,7 @@ function IOURequestEditReport({route}: IOURequestEditReportProps) { if (!selectedReport || transactionIDs.length === 0) { return; } + const policyTagList = personalPolicyID ? allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${personalPolicyID}`] : {}; changeTransactionsReport({ transactionIDs, isASAPSubmitBetaEnabled, @@ -101,6 +105,7 @@ function IOURequestEditReport({route}: IOURequestEditReportProps) { email: session?.email ?? '', policy: allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${personalPolicyID}`], allTransactions, + policyTagList, }); if (shouldTurnOffSelectionMode) { turnOffMobileSelectionMode(); diff --git a/src/pages/iou/request/step/IOURequestStepReport.tsx b/src/pages/iou/request/step/IOURequestStepReport.tsx index 8f3c3fea190c..27d62f645c26 100644 --- a/src/pages/iou/request/step/IOURequestStepReport.tsx +++ b/src/pages/iou/request/step/IOURequestStepReport.tsx @@ -56,6 +56,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 [userBillingGracePeriodEnds] = useOnyx(ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_USER_BILLING_GRACE_PERIOD_END); const [ownerBillingGracePeriodEnd] = useOnyx(ONYXKEYS.NVP_PRIVATE_OWNER_BILLING_GRACE_PERIOD_END); const [amountOwed] = useOnyx(ONYXKEYS.NVP_PRIVATE_AMOUNT_OWED); @@ -174,6 +175,7 @@ function IOURequestStepReport({route, transaction}: IOURequestStepReportProps) { ); if (isEditing) { + const policyTagList = item?.policyID ? allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${item.policyID}`] : {}; changeTransactionsReport({ transactionIDs: [transaction.transactionID], isASAPSubmitBetaEnabled, @@ -184,6 +186,7 @@ function IOURequestStepReport({route, transaction}: IOURequestStepReportProps) { reportNextStep: undefined, policyCategories: allPolicyCategories?.[`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${item.policyID}`], allTransactions, + policyTagList, }); removeTransaction(transaction.transactionID); } @@ -221,6 +224,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, @@ -228,6 +232,7 @@ function IOURequestStepReport({route, transaction}: IOURequestStepReportProps) { email: session?.email ?? '', policy: allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${personalPolicyID}`], allTransactions, + policyTagList, }); removeTransaction(transaction.transactionID); }); diff --git a/tests/actions/IOUTest.ts b/tests/actions/IOUTest.ts index 841660f39803..8e39d8cfd89f 100644 --- a/tests/actions/IOUTest.ts +++ b/tests/actions/IOUTest.ts @@ -6172,6 +6172,8 @@ describe('actions/IOU', () => { expect(result.current.report).toBeDefined(); }); + const policyTagList = (await getOnyxValue(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${mockPolicy.id}`)) ?? {}; + changeTransactionsReport({ transactionIDs: [transaction?.transactionID], isASAPSubmitBetaEnabled: false, @@ -6180,6 +6182,7 @@ describe('actions/IOU', () => { newReport: result.current.report, policy: mockPolicy, allTransactions, + policyTagList, }); let updatedTransaction: OnyxEntry; @@ -6360,7 +6363,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({ @@ -6536,7 +6539,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({ @@ -6725,7 +6728,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 @@ -6938,7 +6941,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 71952a667a7e..72ebc7689f5c 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'; @@ -15,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'; @@ -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}); @@ -127,6 +132,7 @@ describe('Transaction', () => { newReport: report, policy: undefined, allTransactions, + policyTagList: undefined, }); await waitForBatchedUpdates(); const reportActions = await new Promise>((resolve) => { @@ -146,19 +152,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}); @@ -175,6 +169,7 @@ describe('Transaction', () => { newReport: report, policy: undefined, allTransactions, + policyTagList: undefined, }); await waitForBatchedUpdates(); const reportActions = await new Promise>((resolve) => { @@ -196,19 +191,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, @@ -237,6 +220,7 @@ describe('Transaction', () => { policy: undefined, reportNextStep: mockReportNextStep, allTransactions, + policyTagList: undefined, }); await waitForBatchedUpdates(); @@ -259,19 +243,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, @@ -301,6 +273,7 @@ describe('Transaction', () => { policy: undefined, reportNextStep: mockReportNextStep, allTransactions, + policyTagList: undefined, }); await waitForBatchedUpdates(); @@ -323,19 +296,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}); @@ -353,6 +314,7 @@ describe('Transaction', () => { policy: undefined, reportNextStep: undefined, allTransactions, + policyTagList: undefined, }); await waitForBatchedUpdates(); @@ -378,19 +340,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, @@ -417,6 +367,7 @@ describe('Transaction', () => { newReport: report, policy: undefined, allTransactions, + policyTagList: undefined, }); await waitForBatchedUpdates(); @@ -444,19 +395,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}); @@ -473,6 +412,7 @@ describe('Transaction', () => { newReport: report, policy: undefined, allTransactions, + policyTagList: undefined, }); await waitForBatchedUpdates(); @@ -494,19 +434,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}); @@ -526,6 +454,7 @@ describe('Transaction', () => { newReport: report, policy: undefined, allTransactions, + policyTagList: undefined, }); await waitForBatchedUpdates(); @@ -550,19 +479,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, @@ -585,6 +502,7 @@ describe('Transaction', () => { newReport: expenseReport, policy: undefined, allTransactions, + policyTagList: undefined, }); await waitForBatchedUpdates(); const report = await new Promise>((resolve) => { @@ -609,19 +527,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, @@ -644,6 +550,7 @@ describe('Transaction', () => { newReport: expenseReport, policy: undefined, allTransactions, + policyTagList: undefined, }); await waitForBatchedUpdates(); const report = await new Promise>((resolve) => { @@ -674,19 +581,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, @@ -710,6 +605,7 @@ describe('Transaction', () => { newReport: newExpenseReport, policy: undefined, allTransactions, + policyTagList: undefined, }); await waitForBatchedUpdates(); const report = await new Promise>((resolve) => { @@ -739,19 +635,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, @@ -775,6 +659,7 @@ describe('Transaction', () => { newReport: newExpenseReport, policy: undefined, allTransactions, + policyTagList: undefined, }); await waitForBatchedUpdates(); const report = await new Promise>((resolve) => { @@ -804,19 +689,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}); @@ -833,6 +706,7 @@ describe('Transaction', () => { newReport: fakeReport, policy: undefined, allTransactions, + policyTagList: undefined, }); await waitForBatchedUpdates(); @@ -864,19 +738,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}); @@ -893,6 +755,7 @@ describe('Transaction', () => { newReport: fakeReport, policy: undefined, allTransactions, + policyTagList: undefined, }); await waitForBatchedUpdates(); @@ -947,6 +810,7 @@ describe('Transaction', () => { reportNextStep: undefined, policyCategories, allTransactions, + policyTagList: undefined, }); await waitForBatchedUpdates(); @@ -1000,6 +864,7 @@ describe('Transaction', () => { reportNextStep: undefined, policyCategories: undefined, allTransactions, + policyTagList: undefined, }); await waitForBatchedUpdates(); @@ -1010,6 +875,297 @@ describe('Transaction', () => { expect(updatedSourceReport?.transactionCount).toBe(0); expect(updatedDestinationReport?.transactionCount).toBe(1); }); + + 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 = createIOUAction(transaction1); + const oldIOUAction2 = createIOUAction(transaction2); + + 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, + policyTagList: undefined, + }); + 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, + policyTagList: undefined, + }); + 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 = createIOUAction(transaction); + 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, + policyTagList: undefined, + }); + 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 = createIOUAction(transaction); + 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, + policyTagList: undefined, + }); + 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(); + }); + + 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', () => {