diff --git a/src/components/AddExistingExpenseFooter.tsx b/src/components/AddExistingExpenseFooter.tsx index e5c4c11abf9a..5433f0cbd8ac 100644 --- a/src/components/AddExistingExpenseFooter.tsx +++ b/src/components/AddExistingExpenseFooter.tsx @@ -1,3 +1,4 @@ +import useChangeTransactionsReportReports from '@hooks/useChangeTransactionsReportReports'; import {useCurrencyListActions} from '@hooks/useCurrencyList'; import useDelegateAccountID from '@hooks/useDelegateAccountID'; import useLocalize from '@hooks/useLocalize'; @@ -56,7 +57,6 @@ function AddExistingExpenseFooter({selectedIds, report, reportToConfirm, policy, const delegateAccountID = useDelegateAccountID(); const personalPolicy = usePersonalPolicy(); const [transactionViolations] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS); - const [allReports] = useOnyx(ONYXKEYS.COLLECTION.REPORT); const [policyRecentlyUsedCurrencies] = useOnyx(ONYXKEYS.RECENTLY_USED_CURRENCIES); const [quickAction] = useOnyx(ONYXKEYS.NVP_QUICK_ACTION_GLOBAL_CREATE); const [betas] = useOnyx(ONYXKEYS.BETAS); @@ -68,6 +68,7 @@ function AddExistingExpenseFooter({selectedIds, report, reportToConfirm, policy, const [isTrackIntentUser] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED, {selector: isTrackIntentUserSelector}); const [transactions] = useTransactionsByID([...selectedIds]); + const reports = useChangeTransactionsReportReports(transactions, reportToConfirm?.reportID); const handleConfirm = () => { if (selectedIds.size === 0) { @@ -107,7 +108,7 @@ function AddExistingExpenseFooter({selectedIds, report, reportToConfirm, policy, policyTagList, transactions, allTransactionViolation: transactionViolations, - allReports, + reports, isTrackIntentUser, personalPolicyOutputCurrency: personalPolicy?.outputCurrency, selfDMReportActions, diff --git a/src/hooks/useChangeTransactionsReportReports.ts b/src/hooks/useChangeTransactionsReportReports.ts new file mode 100644 index 000000000000..1e0ad34affbe --- /dev/null +++ b/src/hooks/useChangeTransactionsReportReports.ts @@ -0,0 +1,65 @@ +import {getIOUActionForReportID} from '@libs/ReportActionsUtils'; +import {findSelfDMReportID} from '@libs/ReportUtils'; +import {isDeletedTransaction} from '@libs/TransactionUtils'; + +import CONST from '@src/CONST'; +import ONYXKEYS from '@src/ONYXKEYS'; +import type {Report, Transaction} from '@src/types/onyx'; + +import type {OnyxCollection} from 'react-native-onyx'; + +import useOnyx from './useOnyx'; + +/** + * Resolve the REPORT subset that `changeTransactionsReport` looks up — keyed like the full collection so the action + * can do `reports?.[\`${KEY}${id}\`]`. Includes: + * - the unreported-report sentinel, looked up for transactions moving out of personal space + * - the self-DM report, if one exists + * - the destination report (`newReportID`) + * - each transaction's current report + * - for non-deleted transactions, the old IOU action's transaction-thread report (`childReportID`) + */ +function useChangeTransactionsReportReports(transactions: Transaction[], newReportID: string | undefined): OnyxCollection { + const ids = new Set(); + ids.add(CONST.REPORT.UNREPORTED_REPORT_ID); + const selfDMReportID = findSelfDMReportID(); + if (selfDMReportID) { + ids.add(selfDMReportID); + } + if (newReportID) { + ids.add(newReportID); + } + for (const transaction of transactions) { + if (transaction.reportID) { + ids.add(transaction.reportID); + } + if (isDeletedTransaction(transaction)) { + continue; + } + const isUnreportedExpense = !transaction.reportID || transaction.reportID === CONST.REPORT.UNREPORTED_REPORT_ID; + const source = isUnreportedExpense ? selfDMReportID : transaction.reportID; + if (!source) { + continue; + } + const iouAction = getIOUActionForReportID(source, transaction.transactionID); + if (iouAction?.childReportID) { + ids.add(iouAction.childReportID); + } + } + const [reports] = useOnyx(ONYXKEYS.COLLECTION.REPORT, { + selector: (allReports) => { + const result: Record = {}; + for (const id of ids) { + const key = `${ONYXKEYS.COLLECTION.REPORT}${id}` as const; + const report = allReports?.[key]; + if (report) { + result[key] = report; + } + } + return result as OnyxCollection; + }, + }); + return reports; +} + +export default useChangeTransactionsReportReports; diff --git a/src/hooks/useUndeleteTransactions.ts b/src/hooks/useUndeleteTransactions.ts index bf2af16e2800..5b8300a584c9 100644 --- a/src/hooks/useUndeleteTransactions.ts +++ b/src/hooks/useUndeleteTransactions.ts @@ -21,7 +21,7 @@ function useUndeleteTransactions() { const [policy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${personalPolicyID}`); const [policyTagList] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policy?.id}`); const [transactionViolations] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS); - const [allReports] = useOnyx(ONYXKEYS.COLLECTION.REPORT); + const [reports] = useOnyx(ONYXKEYS.COLLECTION.REPORT); const [selfDMReportID] = useOnyx(ONYXKEYS.SELF_DM_REPORT_ID); const [selfDMReportActions] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${getNonEmptyStringOnyxID(selfDMReportID)}`); const [isTrackIntentUser] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED, {selector: isTrackIntentUserSelector}); @@ -38,7 +38,7 @@ function useUndeleteTransactions() { policyTagList, transactions, allTransactionViolation: transactionViolations, - allReports, + reports, selfDMReportActions, isTrackIntentUser, personalPolicyOutputCurrency: policy?.outputCurrency, diff --git a/src/libs/actions/Report/index.ts b/src/libs/actions/Report/index.ts index d36b5df82d5b..c7e446e86701 100644 --- a/src/libs/actions/Report/index.ts +++ b/src/libs/actions/Report/index.ts @@ -8273,7 +8273,7 @@ function mergeReports({ policyTagList: policyTagList ?? {}, transactions: transactionsToMove, allTransactionViolation, - allReports: reports, + reports, skippedReportIDs: sourceReportIDs, isTrackIntentUser, personalPolicyOutputCurrency, diff --git a/src/libs/actions/Transaction.ts b/src/libs/actions/Transaction.ts index 2b3832a69dbb..51ece13c6111 100644 --- a/src/libs/actions/Transaction.ts +++ b/src/libs/actions/Transaction.ts @@ -96,17 +96,6 @@ import Onyx from 'react-native-onyx'; import {getAllTransactions} from './IOU'; -let allReports: OnyxCollection = {}; -Onyx.connect({ - key: ONYXKEYS.COLLECTION.REPORT, - callback: (value) => { - if (!value) { - return; - } - allReports = value; - }, -}); - type SaveWaypointProps = { transactionID: string; index: string; @@ -827,7 +816,7 @@ type ChangeTransactionsReportProps = { policyTagList: OnyxEntry; transactions: Transaction[]; allTransactionViolation?: OnyxCollection; - allReports: OnyxCollection; + reports: OnyxCollection; /** Report IDs that should be skipped when generating Onyx updates (e.g. because they are being deleted) */ skippedReportIDs?: string[]; isTrackIntentUser: boolean | undefined; @@ -847,14 +836,13 @@ function getChangeTransactionsReportOnyxData({ policyTagList, transactions, allTransactionViolation = {}, - allReports: allReportsParam, + reports, skippedReportIDs, isTrackIntentUser, personalPolicyOutputCurrency, selfDMReportActions, getCurrencyDecimals, }: ChangeTransactionsReportProps) { - const reports = allReportsParam ?? allReports; const reportID = newReport?.reportID ?? CONST.REPORT.UNREPORTED_REPORT_ID; const transactionIDToReportActionAndThreadData: Record = {}; @@ -1551,7 +1539,7 @@ function getChangeTransactionsReportOnyxData({ value: { parentReportID: isUnreportedExpense ? selfDMReportID : oldReportID, parentReportActionID: oldIOUAction.reportActionID, - policyID: reports?.[`${ONYXKEYS.COLLECTION.REPORT}${oldIOUAction.reportActionID}`]?.policyID, + policyID: reports?.[`${ONYXKEYS.COLLECTION.REPORT}${oldIOUAction.childReportID}`]?.policyID, }, }); } @@ -1785,8 +1773,8 @@ function getChangeTransactionsReportOnyxData({ onyxMethod: Onyx.METHOD.MERGE, key: `${ONYXKEYS.COLLECTION.REPORT}${reportIDToUpdate}`, value: { - stateNum: allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${reportIDToUpdate}`]?.stateNum, - statusNum: allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${reportIDToUpdate}`]?.statusNum, + stateNum: reports?.[`${ONYXKEYS.COLLECTION.REPORT}${reportIDToUpdate}`]?.stateNum, + statusNum: reports?.[`${ONYXKEYS.COLLECTION.REPORT}${reportIDToUpdate}`]?.statusNum, }, }); } @@ -1804,7 +1792,7 @@ function getChangeTransactionsReportOnyxData({ failureData.push({ onyxMethod: Onyx.METHOD.MERGE, key: `${ONYXKEYS.COLLECTION.REPORT}${reportIDToUpdate}`, - value: {reimbursableTotal: allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${reportIDToUpdate}`]?.reimbursableTotal}, + value: {reimbursableTotal: reports?.[`${ONYXKEYS.COLLECTION.REPORT}${reportIDToUpdate}`]?.reimbursableTotal}, }); } @@ -1822,7 +1810,7 @@ function getChangeTransactionsReportOnyxData({ onyxMethod: Onyx.METHOD.MERGE, key: `${ONYXKEYS.COLLECTION.REPORT}${reportIDToUpdate}`, value: { - unheldReimbursableTotal: allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${reportIDToUpdate}`]?.unheldReimbursableTotal, + unheldReimbursableTotal: reports?.[`${ONYXKEYS.COLLECTION.REPORT}${reportIDToUpdate}`]?.unheldReimbursableTotal, }, }); } diff --git a/src/pages/DynamicNewReportWorkspaceSelectionPage.tsx b/src/pages/DynamicNewReportWorkspaceSelectionPage.tsx index 7adcf8af51c0..0cca96337eac 100644 --- a/src/pages/DynamicNewReportWorkspaceSelectionPage.tsx +++ b/src/pages/DynamicNewReportWorkspaceSelectionPage.tsx @@ -7,6 +7,7 @@ import UserListItem from '@components/SelectionList/ListItem/UserListItem'; import type {ListItem} from '@components/SelectionList/types'; import Text from '@components/Text'; +import useChangeTransactionsReportReports from '@hooks/useChangeTransactionsReportReports'; import useCreateEmptyReportConfirmation from '@hooks/useCreateEmptyReportConfirmation'; import useCreateNewReport from '@hooks/useCreateNewReport'; import {useCurrencyListActions} from '@hooks/useCurrencyList'; @@ -84,7 +85,6 @@ function DynamicNewReportWorkspaceSelectionPage({route}: NewReportWorkspaceSelec const [userBillingGracePeriods] = useOnyx(ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_USER_BILLING_GRACE_PERIOD_END); const [amountOwed] = useOnyx(ONYXKEYS.NVP_PRIVATE_AMOUNT_OWED); const [policies, fetchStatus] = useOnyx(ONYXKEYS.COLLECTION.POLICY); - const [allReports] = useOnyx(ONYXKEYS.COLLECTION.REPORT); const [allTransactions] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION); const [transactionViolations] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS); const [selfDMReportID] = useOnyx(ONYXKEYS.SELF_DM_REPORT_ID); @@ -96,6 +96,7 @@ function DynamicNewReportWorkspaceSelectionPage({route}: NewReportWorkspaceSelec const selectedTransactionsKeys = Object.keys(selectedTransactions); const transactionIDs = selectedTransactionsKeys.length ? selectedTransactionsKeys : selectedTransactionIDs; const [transactions] = useTransactionsByID(transactionIDs); + const reports = useChangeTransactionsReportReports(transactions, undefined); const isAppLoadPending = useIsAppLoadPending(); const shouldShowLoadingIndicator = isAppLoadPending && !isOffline; @@ -129,6 +130,10 @@ function DynamicNewReportWorkspaceSelectionPage({route}: NewReportWorkspaceSelec if (isMovingExpenses && (!!selectedTransactionsKeys.length || !!selectedTransactionIDs.length)) { const policyTagList = policyID ? allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`] : {}; + const reportsForCall = { + ...reports, + [`${ONYXKEYS.COLLECTION.REPORT}${optimisticReport.reportID}`]: {...optimisticReport, transactionCount: 0, unheldNonReimbursableTotal: 0}, + }; setNavigationActionToMicrotaskQueue(() => { changeTransactionsReport({ transactionIDs, @@ -141,7 +146,7 @@ function DynamicNewReportWorkspaceSelectionPage({route}: NewReportWorkspaceSelec policyTagList, transactions, allTransactionViolation: transactionViolations, - allReports, + reports: reportsForCall, isTrackIntentUser, personalPolicyOutputCurrency: personalPolicy?.outputCurrency, selfDMReportActions, diff --git a/src/pages/Search/SearchTransactionsChangeReport.tsx b/src/pages/Search/SearchTransactionsChangeReport.tsx index d8d06ae4252d..7ad0c8f737cb 100644 --- a/src/pages/Search/SearchTransactionsChangeReport.tsx +++ b/src/pages/Search/SearchTransactionsChangeReport.tsx @@ -2,6 +2,7 @@ import {usePersonalDetails, useSession} from '@components/OnyxListItemProvider'; import {useSearchResultsContext, useSearchSelectionActions, useSearchSelectionContext} from '@components/Search/SearchContext'; import type {ListItem} from '@components/SelectionList/types'; +import useChangeTransactionsReportReports from '@hooks/useChangeTransactionsReportReports'; import useConditionalCreateEmptyReportConfirmation from '@hooks/useConditionalCreateEmptyReportConfirmation'; import {useCurrencyListActions} from '@hooks/useCurrencyList'; import useHasPerDiemTransactions from '@hooks/useHasPerDiemTransactions'; @@ -61,6 +62,7 @@ function SearchTransactionsChangeReport() { const managedCardTransactionID = transactions.find((transaction) => isUnreportedManagedCardTransaction(transaction))?.transactionID; const hasUnreportedManagedCardTransactions = !!managedCardTransactionID; const [transactionViolations] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS); + const reports = useChangeTransactionsReportReports(transactions, undefined); const [isTrackIntentUser] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED, {selector: isTrackIntentUserSelector}); const {isBetaEnabled} = usePermissions(); const isASAPSubmitBetaEnabled = isBetaEnabled(CONST.BETAS.ASAP_SUBMIT); @@ -163,6 +165,10 @@ function SearchTransactionsChangeReport() { {managedCardTransactionID}, ); const policyTagList = policyForMovingExpenses?.id ? allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyForMovingExpenses.id}`] : {}; + const reportsForCall = { + ...reports, + [`${ONYXKEYS.COLLECTION.REPORT}${optimisticReport.reportID}`]: {...optimisticReport, transactionCount: 0, unheldNonReimbursableTotal: 0}, + }; setNavigationActionToMicrotaskQueue(() => { changeTransactionsReport({ transactionIDs: selectedTransactionsKeys, @@ -175,7 +181,7 @@ function SearchTransactionsChangeReport() { policyTagList, transactions, allTransactionViolation: transactionViolations, - allReports, + reports: reportsForCall, isTrackIntentUser, personalPolicyOutputCurrency: personalPolicy?.outputCurrency, selfDMReportActions, @@ -244,6 +250,12 @@ function SearchTransactionsChangeReport() { const destinationReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${item.value}`]; const policyTagList = item?.policyID ? allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${item.policyID}`] : {}; + const reportsForCall = destinationReport?.reportID + ? { + [`${ONYXKEYS.COLLECTION.REPORT}${destinationReport.reportID}`]: destinationReport, + ...reports, + } + : reports; changeTransactionsReport({ transactionIDs: selectedTransactionsKeys, isASAPSubmitBetaEnabled, @@ -255,7 +267,7 @@ function SearchTransactionsChangeReport() { policyTagList, transactions, allTransactionViolation: transactionViolations, - allReports, + reports: reportsForCall, isTrackIntentUser, personalPolicyOutputCurrency: personalPolicy?.outputCurrency, selfDMReportActions, @@ -278,7 +290,7 @@ function SearchTransactionsChangeReport() { policyTagList, transactions, allTransactionViolation: transactionViolations, - allReports, + reports, isTrackIntentUser, personalPolicyOutputCurrency: personalPolicy?.outputCurrency, selfDMReportActions, diff --git a/src/pages/iou/request/step/DynamicIOURequestEditReport.tsx b/src/pages/iou/request/step/DynamicIOURequestEditReport.tsx index 9e432f26c692..4a996d7c78e1 100644 --- a/src/pages/iou/request/step/DynamicIOURequestEditReport.tsx +++ b/src/pages/iou/request/step/DynamicIOURequestEditReport.tsx @@ -2,6 +2,7 @@ import {usePersonalDetails} from '@components/OnyxListItemProvider'; import {useSearchSelectionActions, useSearchSelectionContext} from '@components/Search/SearchContext'; import type {ListItem} from '@components/SelectionList/types'; +import useChangeTransactionsReportReports from '@hooks/useChangeTransactionsReportReports'; import useConditionalCreateEmptyReportConfirmation from '@hooks/useConditionalCreateEmptyReportConfirmation'; import {useCurrencyListActions} from '@hooks/useCurrencyList'; import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails'; @@ -89,6 +90,7 @@ function DynamicIOURequestEditReport({route}: DynamicIOURequestEditReportProps) const hasViolations = hasViolationsReportUtils(undefined, transactionViolations, currentUserPersonalDetails.accountID ?? CONST.DEFAULT_NUMBER_ID, currentUserPersonalDetails.email ?? ''); const policyForMovingExpenses = policyForMovingExpensesID ? allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${policyForMovingExpensesID}`] : undefined; const [betas] = useOnyx(ONYXKEYS.BETAS); + const reports = useChangeTransactionsReportReports(transactions, selectedReport?.reportID); const [selfDMReportID] = useOnyx(ONYXKEYS.SELF_DM_REPORT_ID); const [selfDMReportActions] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${getNonEmptyStringOnyxID(selfDMReportID)}`); const [isTrackIntentUser] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED, {selector: isTrackIntentUserSelector}); @@ -101,6 +103,7 @@ function DynamicIOURequestEditReport({route}: DynamicIOURequestEditReportProps) const newReport = report ?? allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${item.value}`]; const policyTagList = item?.policyID ? allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${item.policyID}`] : {}; + const reportsForCall = newReport?.reportID ? {[`${ONYXKEYS.COLLECTION.REPORT}${newReport.reportID}`]: newReport, ...reports} : reports; setNavigationActionToMicrotaskQueue(() => { changeTransactionsReport({ @@ -114,7 +117,7 @@ function DynamicIOURequestEditReport({route}: DynamicIOURequestEditReportProps) policyTagList, transactions, allTransactionViolation: transactionViolations, - allReports, + reports: reportsForCall, isTrackIntentUser, personalPolicyOutputCurrency: personalPolicy?.outputCurrency, selfDMReportActions, @@ -141,7 +144,7 @@ function DynamicIOURequestEditReport({route}: DynamicIOURequestEditReportProps) policyTagList, transactions, allTransactionViolation: transactionViolations, - allReports, + reports, isTrackIntentUser, personalPolicyOutputCurrency: personalPolicy?.outputCurrency, selfDMReportActions, @@ -177,7 +180,7 @@ function DynamicIOURequestEditReport({route}: DynamicIOURequestEditReportProps) keyForList: optimisticReport.reportID, policyID: policyForMovingExpenses?.id, }, - optimisticReport, + {...optimisticReport, transactionCount: 0, unheldNonReimbursableTotal: 0}, ); }; diff --git a/src/pages/iou/request/step/IOURequestStepReport/hooks/useReportSelectionActions.ts b/src/pages/iou/request/step/IOURequestStepReport/hooks/useReportSelectionActions.ts index db6e48dfeb69..5b2d44b3bdca 100644 --- a/src/pages/iou/request/step/IOURequestStepReport/hooks/useReportSelectionActions.ts +++ b/src/pages/iou/request/step/IOURequestStepReport/hooks/useReportSelectionActions.ts @@ -1,6 +1,7 @@ import {useSearchSelectionActions} from '@components/Search/SearchContext'; import type {ListItem} from '@components/SelectionList/types'; +import useChangeTransactionsReportReports from '@hooks/useChangeTransactionsReportReports'; import {useCurrencyListActions} from '@hooks/useCurrencyList'; import useOnyx from '@hooks/useOnyx'; import usePermissions from '@hooks/usePermissions'; @@ -115,6 +116,7 @@ function useReportSelectionActions({ const {removeTransaction} = useSearchSelectionActions(); const {isBetaEnabled} = usePermissions(); const isNewManualExpenseFlowEnabled = isBetaEnabled(CONST.BETAS.NEW_MANUAL_EXPENSE_FLOW); + const reports = useChangeTransactionsReportReports(transaction ? [transaction] : [], undefined); const [isTrackIntentUser] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED, {selector: isTrackIntentUserSelector}); const {getCurrencyDecimals} = useCurrencyListActions(); @@ -205,6 +207,7 @@ function useReportSelectionActions({ if (isEditing) { const policyTagList = item?.policyID ? allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${item.policyID}`] : {}; + const reportsForCall = report?.reportID ? {[`${ONYXKEYS.COLLECTION.REPORT}${report.reportID}`]: report, ...reports} : reports; changeTransactionsReport({ transactionIDs: targetTransactionIDs, isASAPSubmitBetaEnabled, @@ -216,7 +219,7 @@ function useReportSelectionActions({ policyTagList, transactions: targetTransactions, allTransactionViolation: transactionViolations, - allReports, + reports: reportsForCall, isTrackIntentUser, personalPolicyOutputCurrency: allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${personalPolicyID}`]?.outputCurrency, selfDMReportActions, @@ -244,7 +247,7 @@ function useReportSelectionActions({ policyTagList, transactions: targetTransactions, allTransactionViolation: transactionViolations, - allReports, + reports, isTrackIntentUser, personalPolicyOutputCurrency: allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${personalPolicyID}`]?.outputCurrency, selfDMReportActions, diff --git a/src/pages/iou/request/step/IOURequestStepUpgrade.tsx b/src/pages/iou/request/step/IOURequestStepUpgrade.tsx index 6da83761fda5..c19c73c91c42 100644 --- a/src/pages/iou/request/step/IOURequestStepUpgrade.tsx +++ b/src/pages/iou/request/step/IOURequestStepUpgrade.tsx @@ -8,6 +8,7 @@ import WorkspaceConfirmationForm from '@components/WorkspaceConfirmationForm'; import type {WorkspaceConfirmationSubmitFunctionParams} from '@components/WorkspaceConfirmationForm'; import useActivePolicy from '@hooks/useActivePolicy'; +import useChangeTransactionsReportReports from '@hooks/useChangeTransactionsReportReports'; import useCreateNewReport from '@hooks/useCreateNewReport'; import {useCurrencyListActions} from '@hooks/useCurrencyList'; import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails'; @@ -101,7 +102,6 @@ function IOURequestStepUpgrade({ const [allPolicies] = useOnyx(ONYXKEYS.COLLECTION.POLICY); const [session] = useOnyx(ONYXKEYS.SESSION); const [allPolicyTags] = useOnyx(ONYXKEYS.COLLECTION.POLICY_TAGS); - const [allReports] = useOnyx(ONYXKEYS.COLLECTION.REPORT); const [selfDMReportID] = useOnyx(ONYXKEYS.SELF_DM_REPORT_ID); const [selfDMReportActions] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${getNonEmptyStringOnyxID(selfDMReportID)}`); const isTrackIntentUser = isTrackOnboardingChoice(introSelected?.choice); @@ -114,6 +114,7 @@ function IOURequestStepUpgrade({ const {isBetaEnabled} = usePermissions(); const isASAPSubmitBetaEnabled = isBetaEnabled(CONST.BETAS.ASAP_SUBMIT); + const reports = useChangeTransactionsReportReports(transactions, undefined); const hasViolations = hasViolationsReportUtils(undefined, transactionViolations, session?.accountID ?? CONST.DEFAULT_NUMBER_ID, session?.email ?? ''); const ownerAccountID = selectedReport?.ownerAccountID ?? currentUserPersonalDetails.accountID; @@ -142,6 +143,10 @@ function IOURequestStepUpgrade({ const optimisticReport = createNewReport(ownerPersonalDetails, hasViolations, isASAPSubmitBetaEnabled, newPolicy, betas, isTrackIntentUser, getCurrencyDecimals); const policyTagList = policyID ? allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`] : {}; + const reportsForCall = { + ...reports, + [`${ONYXKEYS.COLLECTION.REPORT}${optimisticReport.reportID}`]: {...optimisticReport, transactionCount: 0, unheldNonReimbursableTotal: 0}, + }; // Move ALL selected transactions to the new report changeTransactionsReport({ @@ -155,7 +160,7 @@ function IOURequestStepUpgrade({ policyTagList, transactions, allTransactionViolation: transactionViolations, - allReports, + reports: reportsForCall, selfDMReportActions, isTrackIntentUser, // Expenses move to the upgraded workspace (newPolicy), whose currency drives any distance calculation, so the personal-policy currency is never read here. @@ -264,7 +269,7 @@ function IOURequestStepUpgrade({ allPolicyTags, createReportForCurrentUser, transactionViolations, - allReports, + reports, selfDMReportActions, isTrackIntentUser, getCurrencyDecimals, diff --git a/tests/actions/TransactionTest.ts b/tests/actions/TransactionTest.ts index 35493bb64177..827945dd3853 100644 --- a/tests/actions/TransactionTest.ts +++ b/tests/actions/TransactionTest.ts @@ -305,6 +305,14 @@ describe('actions/Transaction', () => { const policyTagList = (await getOnyxValue(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${mockPolicy.id}`)) ?? {}; + let reports: OnyxCollection; + await getOnyxData({ + key: ONYXKEYS.COLLECTION.REPORT, + callback: (value) => { + reports = value; + }, + }); + changeTransactionsReport({ transactionIDs: [transaction?.transactionID], isASAPSubmitBetaEnabled: false, @@ -314,8 +322,8 @@ describe('actions/Transaction', () => { policy: mockPolicy, allTransactions, policyTagList, + reports, transactionViolations: {}, - allReports: undefined, selfDMReportActions, isTrackIntentUser: false, }); @@ -435,8 +443,8 @@ describe('actions/Transaction', () => { allTransactions: {[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`]: transaction}, policyTagList: undefined, transactionViolations: {}, - allReports: undefined, personalPolicyOutputCurrency: 'EUR', + reports: undefined, isTrackIntentUser: false, }); await waitForBatchedUpdates(); @@ -512,6 +520,14 @@ describe('actions/Transaction', () => { await Onyx.set(`${ONYXKEYS.COLLECTION.TRANSACTION}${TRANSACTION_ID}`, transaction); await waitForBatchedUpdates(); + let reports: OnyxCollection; + await getOnyxData({ + key: ONYXKEYS.COLLECTION.REPORT, + callback: (value) => { + reports = value; + }, + }); + changeTransactionsReport({ transactionIDs: [TRANSACTION_ID], isASAPSubmitBetaEnabled: false, @@ -522,7 +538,7 @@ describe('actions/Transaction', () => { allTransactions: {[`${ONYXKEYS.COLLECTION.TRANSACTION}${TRANSACTION_ID}`]: transaction}, policyTagList: undefined, transactionViolations: {}, - allReports: undefined, + reports, isTrackIntentUser: false, }); await waitForBatchedUpdates(); diff --git a/tests/unit/TransactionTest.ts b/tests/unit/TransactionTest.ts index c7ed333b88a8..4015a738e7b3 100644 --- a/tests/unit/TransactionTest.ts +++ b/tests/unit/TransactionTest.ts @@ -152,6 +152,19 @@ describe('Transaction', () => { }); describe('changeTransactionsReport', () => { + let reports: OnyxCollection; + + async function loadReports() { + await TestHelper.getOnyxData({ + key: ONYXKEYS.COLLECTION.REPORT, + callback: (value) => { + reports = value; + }, + }); + } + + beforeEach(loadReports); + function createIOUAction(transaction: Transaction, reportID = transaction.reportID, type: ValueOf = CONST.IOU.REPORT_ACTION_TYPE.CREATE) { return { reportActionID: rand64(), @@ -190,8 +203,8 @@ describe('Transaction', () => { policy: undefined, allTransactions, policyTagList: undefined, + reports, transactionViolations: {}, - allReports: undefined, isTrackIntentUser: false, }); await waitForBatchedUpdates(); @@ -230,8 +243,8 @@ describe('Transaction', () => { policy: undefined, allTransactions, policyTagList: undefined, + reports, transactionViolations: {}, - allReports: undefined, isTrackIntentUser: false, }); await waitForBatchedUpdates(); @@ -264,6 +277,7 @@ describe('Transaction', () => { 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.REPORT}${FAKE_NEW_REPORT_ID}`, {nextStep: mockReportNextStep}); + await loadReports(); const report = await getReportFromUseOnyx(FAKE_NEW_REPORT_ID); const allTransactions = { @@ -279,8 +293,8 @@ describe('Transaction', () => { policy: undefined, allTransactions, policyTagList: undefined, + reports, transactionViolations: {}, - allReports: undefined, isTrackIntentUser: false, }); await waitForBatchedUpdates(); @@ -314,6 +328,7 @@ describe('Transaction', () => { 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.REPORT}${FAKE_SELF_DM_REPORT_ID}`, {nextStep: mockReportNextStep}); + await loadReports(); const report = await getReportFromUseOnyx(CONST.REPORT.UNREPORTED_REPORT_ID); const allTransactions = { @@ -329,8 +344,8 @@ describe('Transaction', () => { policy: undefined, allTransactions, policyTagList: undefined, + reports, transactionViolations: {}, - allReports: undefined, isTrackIntentUser: false, }); await waitForBatchedUpdates(); @@ -394,7 +409,7 @@ describe('Transaction', () => { [`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transaction.transactionID}`]: [duplicateViolation], [`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${siblingTransaction.transactionID}`]: [siblingDuplicateViolation, missingCategoryViolation], }, - allReports: undefined, + reports: undefined, isTrackIntentUser: false, }); await waitForBatchedUpdates(); @@ -473,7 +488,7 @@ describe('Transaction', () => { [`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${secondTransaction.transactionID}`]: [secondDuplicateViolation], [`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${siblingTransaction.transactionID}`]: [siblingDuplicateViolation, missingCategoryViolation], }, - allReports: undefined, + reports: undefined, isTrackIntentUser: false, }); await waitForBatchedUpdates(); @@ -516,8 +531,8 @@ describe('Transaction', () => { policy: undefined, allTransactions, policyTagList: undefined, + reports, transactionViolations: {}, - allReports: undefined, isTrackIntentUser: false, }); await waitForBatchedUpdates(); @@ -563,6 +578,7 @@ describe('Transaction', () => { [`${ONYXKEYS.COLLECTION.TRANSACTION}${transaction.transactionID}`]: transaction, }; + await loadReports(); changeTransactionsReport({ transactionIDs: [transaction.transactionID], isASAPSubmitBetaEnabled: false, @@ -572,8 +588,8 @@ describe('Transaction', () => { policy: undefined, allTransactions, policyTagList: undefined, + reports, transactionViolations: {}, - allReports: undefined, isTrackIntentUser: false, }); await waitForBatchedUpdates(); @@ -626,8 +642,8 @@ describe('Transaction', () => { policy: undefined, allTransactions, policyTagList: undefined, + reports, transactionViolations: {}, - allReports: undefined, isTrackIntentUser: false, }); await waitForBatchedUpdates(); @@ -671,8 +687,8 @@ describe('Transaction', () => { policy: undefined, allTransactions, policyTagList: undefined, + reports, transactionViolations: {}, - allReports: undefined, isTrackIntentUser: false, }); await waitForBatchedUpdates(); @@ -722,8 +738,8 @@ describe('Transaction', () => { policy: undefined, allTransactions, policyTagList: undefined, + reports, transactionViolations: {}, - allReports: undefined, isTrackIntentUser: false, }); await waitForBatchedUpdates(); @@ -773,8 +789,8 @@ describe('Transaction', () => { policy: undefined, allTransactions, policyTagList: undefined, + reports, transactionViolations: {}, - allReports: undefined, isTrackIntentUser: false, }); await waitForBatchedUpdates(); @@ -831,8 +847,8 @@ describe('Transaction', () => { policy: undefined, allTransactions, policyTagList: undefined, + reports, transactionViolations: {}, - allReports: undefined, isTrackIntentUser: false, }); await waitForBatchedUpdates(); @@ -879,6 +895,7 @@ describe('Transaction', () => { [`${ONYXKEYS.COLLECTION.TRANSACTION}${transaction.transactionID}`]: transaction, }; + await loadReports(); changeTransactionsReport({ transactionIDs: [transaction.transactionID], isASAPSubmitBetaEnabled: false, @@ -888,8 +905,8 @@ describe('Transaction', () => { policy: undefined, allTransactions, policyTagList: undefined, + reports, transactionViolations: {}, - allReports: undefined, isTrackIntentUser: false, }); await waitForBatchedUpdates(); @@ -931,6 +948,7 @@ describe('Transaction', () => { const allTransactions = { [`${ONYXKEYS.COLLECTION.TRANSACTION}${transaction.transactionID}`]: transaction, }; + await loadReports(); changeTransactionsReport({ transactionIDs: [transaction.transactionID], isASAPSubmitBetaEnabled: false, @@ -940,8 +958,8 @@ describe('Transaction', () => { policy: undefined, allTransactions, policyTagList: undefined, + reports, transactionViolations: {}, - allReports: undefined, isTrackIntentUser: false, }); await waitForBatchedUpdates(); @@ -985,6 +1003,7 @@ describe('Transaction', () => { const allTransactions = { [`${ONYXKEYS.COLLECTION.TRANSACTION}${transaction.transactionID}`]: transaction, }; + await loadReports(); changeTransactionsReport({ transactionIDs: [transaction.transactionID], isASAPSubmitBetaEnabled: false, @@ -994,8 +1013,8 @@ describe('Transaction', () => { policy: undefined, allTransactions, policyTagList: undefined, + reports, transactionViolations: {}, - allReports: undefined, isTrackIntentUser: false, }); await waitForBatchedUpdates(); @@ -1053,6 +1072,7 @@ describe('Transaction', () => { [`${ONYXKEYS.COLLECTION.TRANSACTION}${firstTransaction.transactionID}`]: firstTransaction, [`${ONYXKEYS.COLLECTION.TRANSACTION}${secondTransaction.transactionID}`]: secondTransaction, }; + await loadReports(); changeTransactionsReport({ transactionIDs: [firstTransaction.transactionID, secondTransaction.transactionID], isASAPSubmitBetaEnabled: false, @@ -1062,7 +1082,7 @@ describe('Transaction', () => { policy: undefined, allTransactions, policyTagList: undefined, - allReports: undefined, + reports, isTrackIntentUser: false, }); await waitForBatchedUpdates(); @@ -1148,6 +1168,7 @@ describe('Transaction', () => { await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${destinationExpenseReport.reportID}`, destinationExpenseReport); await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${sourceExpenseReport.reportID}`, sourceIOUActions); + await loadReports(); changeTransactionsReport({ transactionIDs: [usdTransaction.transactionID, movedBgnTransaction.transactionID], isASAPSubmitBetaEnabled: false, @@ -1157,8 +1178,8 @@ describe('Transaction', () => { policy: undefined, allTransactions, policyTagList: undefined, + reports, transactionViolations: {}, - allReports: undefined, isTrackIntentUser: false, }); @@ -1224,8 +1245,8 @@ describe('Transaction', () => { policyCategories, allTransactions, policyTagList: undefined, + reports, transactionViolations: {}, - allReports: undefined, isTrackIntentUser: false, }); @@ -1267,6 +1288,7 @@ describe('Transaction', () => { [`${ONYXKEYS.COLLECTION.TRANSACTION}${transaction.transactionID}`]: transaction, }; + await loadReports(); changeTransactionsReport({ transactionIDs: [transaction.transactionID], isASAPSubmitBetaEnabled: false, @@ -1277,8 +1299,8 @@ describe('Transaction', () => { policyCategories: undefined, allTransactions, policyTagList: undefined, + reports, transactionViolations: {}, - allReports: undefined, isTrackIntentUser: false, }); @@ -1335,8 +1357,8 @@ describe('Transaction', () => { policy: undefined, allTransactions, policyTagList: undefined, + reports, transactionViolations: {}, - allReports: undefined, isTrackIntentUser: false, }); await waitForBatchedUpdates(); @@ -1377,8 +1399,8 @@ describe('Transaction', () => { policy: undefined, allTransactions, policyTagList: undefined, + reports, transactionViolations: {}, - allReports: undefined, isTrackIntentUser: false, }); await waitForBatchedUpdates(); @@ -1414,8 +1436,8 @@ describe('Transaction', () => { policy: undefined, allTransactions, policyTagList: undefined, + reports, transactionViolations: {}, - allReports: undefined, isTrackIntentUser: false, }); await waitForBatchedUpdates(); @@ -1464,8 +1486,8 @@ describe('Transaction', () => { policy: undefined, allTransactions, policyTagList: undefined, + reports, transactionViolations: {}, - allReports: undefined, isTrackIntentUser: false, }); await waitForBatchedUpdates(); @@ -1526,8 +1548,8 @@ describe('Transaction', () => { policy, allTransactions, policyTagList, + reports, transactionViolations: {}, - allReports: undefined, isTrackIntentUser: false, }); await waitForBatchedUpdates(); @@ -1575,7 +1597,7 @@ describe('Transaction', () => { allTransactions, policyTagList: undefined, transactionViolations: {[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transaction.transactionID}`]: [receiptNoticeViolation]}, - allReports: undefined, + reports, isTrackIntentUser: false, }); await waitForBatchedUpdates(); @@ -1638,8 +1660,8 @@ describe('Transaction', () => { policy, allTransactions, policyTagList, + reports, transactionViolations: {}, - allReports: undefined, isTrackIntentUser: false, }); await waitForBatchedUpdates(); @@ -1688,7 +1710,7 @@ describe('Transaction', () => { policy, allTransactions, policyTagList: {}, - allReports: undefined, + reports, isTrackIntentUser: false, }); await waitForBatchedUpdates(); @@ -1765,8 +1787,8 @@ describe('Transaction', () => { policy, allTransactions, policyTagList: undefined, + reports, transactionViolations: {}, - allReports: undefined, isTrackIntentUser: false, }); await waitForBatchedUpdates(); @@ -1852,8 +1874,8 @@ describe('Transaction', () => { policy, allTransactions, policyTagList: undefined, + reports, transactionViolations: {}, - allReports: undefined, isTrackIntentUser: false, }); await waitForBatchedUpdates(); @@ -1930,8 +1952,8 @@ describe('Transaction', () => { policy, allTransactions, policyTagList: undefined, + reports, transactionViolations: {}, - allReports: undefined, isTrackIntentUser: false, }); await waitForBatchedUpdates(); @@ -2009,8 +2031,8 @@ describe('Transaction', () => { policy, allTransactions, policyTagList: undefined, + reports, transactionViolations: {}, - allReports: undefined, isTrackIntentUser: false, }); await waitForBatchedUpdates(); diff --git a/tests/unit/hooks/useChangeTransactionsReportReports.test.ts b/tests/unit/hooks/useChangeTransactionsReportReports.test.ts new file mode 100644 index 000000000000..a399a0e22fe2 --- /dev/null +++ b/tests/unit/hooks/useChangeTransactionsReportReports.test.ts @@ -0,0 +1,141 @@ +import {renderHook, waitFor} from '@testing-library/react-native'; + +import useChangeTransactionsReportReports from '@hooks/useChangeTransactionsReportReports'; + +import DateUtils from '@libs/DateUtils'; +import {rand64} from '@libs/NumberUtils'; + +import CONST from '@src/CONST'; +import ONYXKEYS from '@src/ONYXKEYS'; +import type {ReportAction, Transaction} from '@src/types/onyx'; + +import Onyx from 'react-native-onyx'; + +import createRandomTransaction from '../../utils/collections/transaction'; +import waitForBatchedUpdates from '../../utils/waitForBatchedUpdates'; + +const CURRENT_USER_ID = 1; +const SELF_DM_REPORT_ID = 'selfDM1'; +const OLD_REPORT_ID = 'oldReport1'; +const NEW_REPORT_ID = 'newReport1'; +const DESTINATION_REPORT_ID = 'destinationReport1'; +const UNRELATED_REPORT_ID = 'unrelatedReport1'; + +function generateTransaction(values: Partial = {}): Transaction { + return {...createRandomTransaction(1), transactionID: 'transaction1', ...values}; +} + +function generateIOUAction(transaction: Transaction, reportID: string, childReportID?: string): ReportAction { + return { + reportActionID: rand64(), + reportID, + childReportID, + actionName: CONST.REPORT.ACTIONS.TYPE.IOU, + actorAccountID: CURRENT_USER_ID, + created: DateUtils.getDBTime(), + originalMessage: { + IOUTransactionID: transaction.transactionID, + amount: transaction.amount, + currency: transaction.currency, + type: CONST.IOU.REPORT_ACTION_TYPE.CREATE, + }, + }; +} + +describe('useChangeTransactionsReportReports', () => { + beforeAll(() => { + Onyx.init({keys: ONYXKEYS}); + }); + + beforeEach(async () => { + await Onyx.clear(); + await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${SELF_DM_REPORT_ID}`, {reportID: SELF_DM_REPORT_ID, chatType: CONST.REPORT.CHAT_TYPE.SELF_DM}); + await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${UNRELATED_REPORT_ID}`, {reportID: UNRELATED_REPORT_ID}); + await waitForBatchedUpdates(); + }); + + it('always includes the self-DM report and the destination report, even with no transactions', async () => { + const {result} = renderHook(() => useChangeTransactionsReportReports([], DESTINATION_REPORT_ID)); + + await waitFor(() => { + expect(result.current).toBeDefined(); + }); + + expect(Object.keys(result.current ?? {})).toEqual(expect.arrayContaining([`${ONYXKEYS.COLLECTION.REPORT}${SELF_DM_REPORT_ID}`])); + expect(result.current?.[`${ONYXKEYS.COLLECTION.REPORT}${UNRELATED_REPORT_ID}`]).toBeUndefined(); + }); + + it('looks up the IOU action under the transaction current report, not the self-DM report, for a reported transaction', async () => { + const transaction = generateTransaction({reportID: OLD_REPORT_ID}); + const realAction = generateIOUAction(transaction, OLD_REPORT_ID, 'realThread1'); + // Decoy: an IOU action for the SAME transactionID sitting under the self-DM report (e.g. stale data from + // before the transaction was ever reported). A source-selection regression that checks both reportID and + // selfDMReportID unconditionally would incorrectly pick this up too. + const decoyAction = generateIOUAction(transaction, SELF_DM_REPORT_ID, 'decoyThread1'); + + await Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION}${transaction.transactionID}`, transaction); + await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${OLD_REPORT_ID}`, {[realAction.reportActionID]: realAction}); + await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${SELF_DM_REPORT_ID}`, {[decoyAction.reportActionID]: decoyAction}); + await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${OLD_REPORT_ID}`, {reportID: OLD_REPORT_ID}); + await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}realThread1`, {reportID: 'realThread1'}); + await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}decoyThread1`, {reportID: 'decoyThread1'}); + await waitForBatchedUpdates(); + + const {result} = renderHook(() => useChangeTransactionsReportReports([transaction], NEW_REPORT_ID)); + + await waitFor(() => { + expect(result.current?.[`${ONYXKEYS.COLLECTION.REPORT}realThread1`]).toBeDefined(); + }); + + expect(result.current?.[`${ONYXKEYS.COLLECTION.REPORT}decoyThread1`]).toBeUndefined(); + }); + + it('looks up the IOU action under the self-DM report for an unreported transaction', async () => { + const transaction = generateTransaction({reportID: CONST.REPORT.UNREPORTED_REPORT_ID}); + const trackAction = generateIOUAction(transaction, SELF_DM_REPORT_ID, 'trackThread1'); + + await Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION}${transaction.transactionID}`, transaction); + await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${SELF_DM_REPORT_ID}`, {[trackAction.reportActionID]: trackAction}); + await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}trackThread1`, {reportID: 'trackThread1'}); + await waitForBatchedUpdates(); + + const {result} = renderHook(() => useChangeTransactionsReportReports([transaction], undefined)); + + await waitFor(() => { + expect(result.current?.[`${ONYXKEYS.COLLECTION.REPORT}trackThread1`]).toBeDefined(); + }); + }); + + it('skips the IOU action lookup entirely for a deleted (trashed) transaction', async () => { + const transaction = generateTransaction({reportID: CONST.REPORT.TRASH_REPORT_ID}); + const staleAction = generateIOUAction(transaction, SELF_DM_REPORT_ID, 'staleThread1'); + + await Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION}${transaction.transactionID}`, transaction); + await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${SELF_DM_REPORT_ID}`, {[staleAction.reportActionID]: staleAction}); + await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}staleThread1`, {reportID: 'staleThread1'}); + await waitForBatchedUpdates(); + + const {result} = renderHook(() => useChangeTransactionsReportReports([transaction], undefined)); + + await waitFor(() => { + expect(result.current).toBeDefined(); + }); + + expect(result.current?.[`${ONYXKEYS.COLLECTION.REPORT}staleThread1`]).toBeUndefined(); + }); + + it('narrows the result to only the computed ids, excluding unrelated reports in the collection', async () => { + const transaction = generateTransaction({reportID: OLD_REPORT_ID}); + await Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION}${transaction.transactionID}`, transaction); + await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${OLD_REPORT_ID}`, {reportID: OLD_REPORT_ID}); + await waitForBatchedUpdates(); + + const {result} = renderHook(() => useChangeTransactionsReportReports([transaction], undefined)); + + await waitFor(() => { + expect(result.current?.[`${ONYXKEYS.COLLECTION.REPORT}${OLD_REPORT_ID}`]).toBeDefined(); + }); + + expect(result.current?.[`${ONYXKEYS.COLLECTION.REPORT}${UNRELATED_REPORT_ID}`]).toBeUndefined(); + }); +});