From 0c50a261da3789f17ced0de24c96e264fa51e200 Mon Sep 17 00:00:00 2001 From: Tomasz Misiukiewicz Date: Thu, 28 May 2026 12:51:44 +0200 Subject: [PATCH 1/3] extract money report transaction thread into context --- Mobile-Expensify | 2 +- .../MoneyReportHeaderActions/index.tsx | 4 +- .../MoneyReportHeaderEducationalModals.tsx | 26 +-------- src/components/MoneyReportHeaderModals.tsx | 27 +++++----- .../MoneyReportHeaderMoreContent.tsx | 24 +-------- .../MoneyReportTransactionThreadContext.tsx | 53 +++++++++++++++++++ src/hooks/useExpenseActions.ts | 11 ++-- src/hooks/useHoldRejectActions.ts | 13 ++--- src/hooks/useReportPrimaryAction.ts | 4 +- 9 files changed, 83 insertions(+), 81 deletions(-) create mode 100644 src/components/MoneyReportTransactionThreadContext.tsx diff --git a/Mobile-Expensify b/Mobile-Expensify index 7d7267bac7ea..3c67caa84793 160000 --- a/Mobile-Expensify +++ b/Mobile-Expensify @@ -1 +1 @@ -Subproject commit 7d7267bac7ea22f82cbce8d573de566839ff1c4a +Subproject commit 3c67caa847937284500ebf8d7b3777a31092517c diff --git a/src/components/MoneyReportHeaderActions/index.tsx b/src/components/MoneyReportHeaderActions/index.tsx index e74a6b646a3b..834f7b4ebd95 100644 --- a/src/components/MoneyReportHeaderActions/index.tsx +++ b/src/components/MoneyReportHeaderActions/index.tsx @@ -3,13 +3,13 @@ import {View} from 'react-native'; import type {ValueOf} from 'type-fest'; import type {ButtonWithDropdownMenuRef} from '@components/ButtonWithDropdownMenu/types'; import MoneyReportHeaderPrimaryAction from '@components/MoneyReportHeaderPrimaryAction'; +import {useMoneyReportTransactionThread} from '@components/MoneyReportTransactionThreadContext'; import {useSearchSelectionActions, useSearchSelectionContext} from '@components/Search/SearchContext'; import useExportAgainModal from '@hooks/useExportAgainModal'; import useOnyx from '@hooks/useOnyx'; import useResponsiveLayout from '@hooks/useResponsiveLayout'; import useResponsiveLayoutOnWideRHP from '@hooks/useResponsiveLayoutOnWideRHP'; import useThemeStyles from '@hooks/useThemeStyles'; -import useTransactionThreadReport from '@hooks/useTransactionThreadReport'; import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; @@ -40,7 +40,7 @@ function MoneyReportHeaderActions({reportID, primaryAction, isReportInSearch, ba const [moneyRequestReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`); const [chatReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${getNonEmptyStringOnyxID(moneyRequestReport?.chatReportID)}`); - const {transactionThreadReportID} = useTransactionThreadReport(reportID); + const {transactionThreadReportID} = useMoneyReportTransactionThread(); const {triggerExportOrConfirm} = useExportAgainModal(moneyRequestReport?.reportID, moneyRequestReport?.policyID); diff --git a/src/components/MoneyReportHeaderEducationalModals.tsx b/src/components/MoneyReportHeaderEducationalModals.tsx index a30a41c7ffad..f03a161aeafb 100644 --- a/src/components/MoneyReportHeaderEducationalModals.tsx +++ b/src/components/MoneyReportHeaderEducationalModals.tsx @@ -5,21 +5,17 @@ import type {ValueOf} from 'type-fest'; import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails'; import useNetwork from '@hooks/useNetwork'; import useOnyx from '@hooks/useOnyx'; -import usePaginatedReportActions from '@hooks/usePaginatedReportActions'; -import useTransactionsAndViolationsForReport from '@hooks/useTransactionsAndViolationsForReport'; import {setNameValuePair} from '@libs/actions/User'; import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID'; -import {getAllNonDeletedTransactions} from '@libs/MoneyRequestReportUtils'; import Navigation from '@libs/Navigation/Navigation'; -import {getFilteredReportActionsForReportView, getOneTransactionThreadReportID, getOriginalMessage, isMoneyRequestAction} from '@libs/ReportActionsUtils'; import {changeMoneyRequestHoldStatus, rejectMoneyRequestReason} from '@libs/ReportUtils'; import {dismissRejectUseExplanation} from '@userActions/IOU/RejectMoneyRequest'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; import ROUTES from '@src/ROUTES'; -import type * as OnyxTypes from '@src/types/onyx'; import HoldOrRejectEducationalModal from './HoldOrRejectEducationalModal'; import HoldSubmitterEducationalModal from './HoldSubmitterEducationalModal'; +import {useMoneyReportTransactionThread} from './MoneyReportTransactionThreadContext'; type RejectModalAction = ValueOf< typeof CONST.REPORT.TRANSACTION_SECONDARY_ACTIONS.HOLD | typeof CONST.REPORT.TRANSACTION_SECONDARY_ACTIONS.REJECT | typeof CONST.REPORT.TRANSACTION_SECONDARY_ACTIONS.REJECT_BULK @@ -42,27 +38,9 @@ function MoneyReportHeaderEducationalModals({reportID, ref}: MoneyReportHeaderEd const {isOffline} = useNetwork(); const [shouldFailAllRequests] = useOnyx(ONYXKEYS.NETWORK, {selector: shouldFailAllRequestsSelector}); - // Fetch report data needed for educational modals - const [moneyRequestReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`); - const [chatReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${moneyRequestReport?.chatReportID}`); - const {reportActions: unfilteredReportActions} = usePaginatedReportActions(moneyRequestReport?.reportID); - const reportActions = getFilteredReportActionsForReportView(unfilteredReportActions); - const {transactions: reportTransactions} = useTransactionsAndViolationsForReport(moneyRequestReport?.reportID); const {login: currentUserLogin, accountID: currentUserAccountID} = useCurrentUserPersonalDetails(); - // Derive transaction thread and parent action - const nonDeletedTransactions = getAllNonDeletedTransactions(reportTransactions, reportActions, isOffline, true); - const visibleTransactionsForThreadID = nonDeletedTransactions?.filter((t) => isOffline || t.pendingAction !== 'delete'); - const reportTransactionIDs = visibleTransactionsForThreadID?.map((t) => t.transactionID); - const transactionThreadReportID = getOneTransactionThreadReportID(moneyRequestReport, chatReport, reportActions ?? [], isOffline, reportTransactionIDs); - const [transactionThreadReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReportID}`); - - const requestParentReportAction = - reportActions && transactionThreadReport?.parentReportActionID - ? reportActions.find((action): action is OnyxTypes.ReportAction => action.reportActionID === transactionThreadReport.parentReportActionID) - : null; - - const iouTransactionID = isMoneyRequestAction(requestParentReportAction) ? getOriginalMessage(requestParentReportAction)?.IOUTransactionID : undefined; + const {iouTransactionID, requestParentReportAction} = useMoneyReportTransactionThread(); const [transaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${getNonEmptyStringOnyxID(iouTransactionID)}`); useImperativeHandle(ref, () => ({ diff --git a/src/components/MoneyReportHeaderModals.tsx b/src/components/MoneyReportHeaderModals.tsx index d38c9f08d221..95c23aa35315 100644 --- a/src/components/MoneyReportHeaderModals.tsx +++ b/src/components/MoneyReportHeaderModals.tsx @@ -18,6 +18,7 @@ import MoneyReportHeaderEducationalModals from './MoneyReportHeaderEducationalMo import type {MoneyReportHeaderEducationalModalsHandle, RejectModalAction} from './MoneyReportHeaderEducationalModals'; import MoneyReportHeaderModalsContext from './MoneyReportHeaderModalsContext'; import type {HoldMenuParams} from './MoneyReportHeaderModalsContext'; +import {MoneyReportTransactionThreadProvider} from './MoneyReportTransactionThreadContext'; import ReportPDFDownloadModal from './ReportPDFDownloadModal'; type MoneyReportHeaderModalsProps = { @@ -109,18 +110,20 @@ function MoneyReportHeaderModals({reportID, children}: MoneyReportHeaderModalsPr return ( - {children} - - - - setIsPDFModalVisible(false)} - /> + + {children} + + + + setIsPDFModalVisible(false)} + /> + ); } diff --git a/src/components/MoneyReportHeaderMoreContent.tsx b/src/components/MoneyReportHeaderMoreContent.tsx index eeb69cf959f4..5a4f0e24524e 100644 --- a/src/components/MoneyReportHeaderMoreContent.tsx +++ b/src/components/MoneyReportHeaderMoreContent.tsx @@ -4,18 +4,13 @@ import {View} from 'react-native'; import type {OnyxEntry} from 'react-native-onyx'; import type {ValueOf} from 'type-fest'; import useMoneyReportHeaderStatusBar from '@hooks/useMoneyReportHeaderStatusBar'; -import useNetwork from '@hooks/useNetwork'; import useOnyx from '@hooks/useOnyx'; -import usePaginatedReportActions from '@hooks/usePaginatedReportActions'; -import useReportTransactionsCollection from '@hooks/useReportTransactionsCollection'; import useResponsiveLayout from '@hooks/useResponsiveLayout'; import useResponsiveLayoutOnWideRHP from '@hooks/useResponsiveLayoutOnWideRHP'; import useThemeStyles from '@hooks/useThemeStyles'; import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID'; -import {getAllNonDeletedTransactions} from '@libs/MoneyRequestReportUtils'; import type {PlatformStackRouteProp} from '@libs/Navigation/PlatformStackNavigation/types'; import type {ReportsSplitNavigatorParamList, RightModalNavigatorParamList} from '@libs/Navigation/types'; -import {getFilteredReportActionsForReportView, getOneTransactionThreadReportID, getOriginalMessage, isMoneyRequestAction} from '@libs/ReportActionsUtils'; import {isInvoiceReport as isInvoiceReportUtil} from '@libs/ReportUtils'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; @@ -23,6 +18,7 @@ import SCREENS from '@src/SCREENS'; import type * as OnyxTypes from '@src/types/onyx'; import MoneyReportHeaderNextStep from './MoneyReportHeaderNextStep'; import MoneyReportHeaderStatusBarSection from './MoneyReportHeaderStatusBarSection'; +import {useMoneyReportTransactionThread} from './MoneyReportTransactionThreadContext'; import MoneyRequestReportNavigation from './MoneyRequestReportView/MoneyRequestReportNavigation'; type MoneyReportHeaderMoreContentProps = { @@ -76,29 +72,13 @@ type MoneyReportHeaderMoreContentBodyProps = { function MoneyReportHeaderMoreContentBody({moneyRequestReport, statusBarType, isReportInSearch, shouldShowNextStep}: MoneyReportHeaderMoreContentBodyProps) { const styles = useThemeStyles(); - const {isOffline} = useNetwork(); const {shouldUseNarrowLayout, isMediumScreenWidth} = useResponsiveLayout(); const shouldDisplayNarrowVersion = shouldUseNarrowLayout || isMediumScreenWidth; const {isWideRHPDisplayedOnWideLayout, isSuperWideRHPDisplayedOnWideLayout} = useResponsiveLayoutOnWideRHP(); const shouldDisplayNarrowMoreButton = !shouldDisplayNarrowVersion || isWideRHPDisplayedOnWideLayout || isSuperWideRHPDisplayedOnWideLayout; const reportID = moneyRequestReport?.reportID; - const [chatReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${moneyRequestReport?.chatReportID}`); - - const {reportActions: unfilteredReportActions} = usePaginatedReportActions(reportID); - const reportActions = getFilteredReportActionsForReportView(unfilteredReportActions); - - const allReportTransactions = useReportTransactionsCollection(reportID); - const nonDeletedTransactions = getAllNonDeletedTransactions(allReportTransactions, reportActions, isOffline, true); - const visibleTransactionsForThreadID = nonDeletedTransactions?.filter((t) => isOffline || t.pendingAction !== 'delete'); - const reportTransactionIDs = visibleTransactionsForThreadID?.map((t) => t.transactionID); - const transactionThreadReportID = getOneTransactionThreadReportID(moneyRequestReport, chatReport, reportActions ?? [], isOffline, reportTransactionIDs); - const [transactionThreadReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReportID}`); - - const requestParentReportAction = - reportActions && transactionThreadReport?.parentReportActionID ? reportActions.find((action) => action.reportActionID === transactionThreadReport.parentReportActionID) : null; - - const iouTransactionID = isMoneyRequestAction(requestParentReportAction) ? getOriginalMessage(requestParentReportAction)?.IOUTransactionID : undefined; + const {iouTransactionID} = useMoneyReportTransactionThread(); return ( diff --git a/src/components/MoneyReportTransactionThreadContext.tsx b/src/components/MoneyReportTransactionThreadContext.tsx new file mode 100644 index 000000000000..adeb9c574a8b --- /dev/null +++ b/src/components/MoneyReportTransactionThreadContext.tsx @@ -0,0 +1,53 @@ +import React, {createContext, useContext} from 'react'; +import type {ReactNode} from 'react'; +import useTransactionThreadReport from '@hooks/useTransactionThreadReport'; +import {getOriginalMessage, isMoneyRequestAction} from '@libs/ReportActionsUtils'; +import type CONST from '@src/CONST'; +import type * as OnyxTypes from '@src/types/onyx'; + +type MoneyReportTransactionThreadContextValue = { + iouTransactionID: string | undefined; + requestParentReportAction: OnyxTypes.ReportAction | null; + transactionThreadReportID: string | undefined; + reportActions: OnyxTypes.ReportAction[]; +}; + +const defaultValue: MoneyReportTransactionThreadContextValue = { + iouTransactionID: undefined, + requestParentReportAction: null, + transactionThreadReportID: undefined, + reportActions: [], +}; + +const MoneyReportTransactionThreadContext = createContext(defaultValue); + +type MoneyReportTransactionThreadProviderProps = { + reportID: string | undefined; + children: ReactNode; +}; + +function MoneyReportTransactionThreadProvider({reportID, children}: MoneyReportTransactionThreadProviderProps) { + const {transactionThreadReportID, transactionThreadReport, reportActions} = useTransactionThreadReport(reportID); + + const requestParentReportAction = + reportActions?.find((action): action is OnyxTypes.ReportAction => action.reportActionID === transactionThreadReport?.parentReportActionID) ?? + null; + + const iouTransactionID = isMoneyRequestAction(requestParentReportAction) ? getOriginalMessage(requestParentReportAction)?.IOUTransactionID : undefined; + + const value: MoneyReportTransactionThreadContextValue = { + iouTransactionID, + requestParentReportAction: requestParentReportAction ?? null, + transactionThreadReportID, + reportActions: reportActions ?? [], + }; + + return {children}; +} + +function useMoneyReportTransactionThread() { + return useContext(MoneyReportTransactionThreadContext); +} + +export default MoneyReportTransactionThreadContext; +export {MoneyReportTransactionThreadProvider, useMoneyReportTransactionThread}; diff --git a/src/hooks/useExpenseActions.ts b/src/hooks/useExpenseActions.ts index f9e92ea9c98a..18dd07378004 100644 --- a/src/hooks/useExpenseActions.ts +++ b/src/hooks/useExpenseActions.ts @@ -8,6 +8,7 @@ import type {ValueOf} from 'type-fest'; import type {DropdownOption} from '@components/ButtonWithDropdownMenu/types'; import {ModalActions} from '@components/Modal/Global/ModalContext'; import type {SecondaryActionEntry} from '@components/MoneyReportHeaderActions/types'; +import {useMoneyReportTransactionThread} from '@components/MoneyReportTransactionThreadContext'; import {useSearchQueryContext, useSearchSelectionActions} from '@components/Search/SearchContext'; import {duplicateReport as duplicateReportAction, duplicateExpenseTransaction as duplicateTransactionAction} from '@libs/actions/IOU/Duplicate'; import {setupMergeTransactionDataAndNavigate} from '@libs/actions/MergeTransaction'; @@ -19,7 +20,7 @@ import Log from '@libs/Log'; import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute'; import Navigation from '@libs/Navigation/Navigation'; import {isPolicyAccessible} from '@libs/PolicyUtils'; -import {getIOUActionForTransactionID, getOriginalMessage, isMoneyRequestAction} from '@libs/ReportActionsUtils'; +import {getIOUActionForTransactionID} from '@libs/ReportActionsUtils'; import { canEditFieldOfMoneyRequest, canUserPerformWriteAction as canUserPerformWriteActionReportUtils, @@ -62,7 +63,6 @@ import useReportIsArchived from './useReportIsArchived'; import useTheme from './useTheme'; import useThrottledButtonState from './useThrottledButtonState'; import useTransactionsAndViolationsForReport from './useTransactionsAndViolationsForReport'; -import useTransactionThreadReport from './useTransactionThreadReport'; import useTransactionViolations from './useTransactionViolations'; type UseExpenseActionsParams = { @@ -96,7 +96,7 @@ function useExpenseActions({reportID, isReportInSearch = false, backTo, onDuplic const [policy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${getNonEmptyStringOnyxID(moneyRequestReport?.policyID)}`); const [chatReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${getNonEmptyStringOnyxID(moneyRequestReport?.chatReportID)}`); - const {transactionThreadReportID, transactionThreadReport, reportActions} = useTransactionThreadReport(reportID); + const {iouTransactionID, requestParentReportAction, transactionThreadReportID, reportActions} = useMoneyReportTransactionThread(); const {transactions: reportTransactions} = useTransactionsAndViolationsForReport(moneyRequestReport?.reportID); @@ -110,11 +110,6 @@ function useExpenseActions({reportID, isReportInSearch = false, backTo, onDuplic } const currentTransaction = transactions.at(0); - const requestParentReportAction = - reportActions?.find((action): action is OnyxTypes.ReportAction => action.reportActionID === transactionThreadReport?.parentReportActionID) ?? - null; - - const iouTransactionID = isMoneyRequestAction(requestParentReportAction) ? getOriginalMessage(requestParentReportAction)?.IOUTransactionID : undefined; const [transaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${getNonEmptyStringOnyxID(iouTransactionID)}`); const [originalTransaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${getNonEmptyStringOnyxID(transaction?.comment?.originalTransactionID)}`); const {iouReport, chatReport: chatIOUReport, isChatIOUReportArchived} = useGetIOUReportFromReportAction(requestParentReportAction); diff --git a/src/hooks/useHoldRejectActions.ts b/src/hooks/useHoldRejectActions.ts index c904c51451c2..14e767ba8519 100644 --- a/src/hooks/useHoldRejectActions.ts +++ b/src/hooks/useHoldRejectActions.ts @@ -2,9 +2,9 @@ import type {ValueOf} from 'type-fest'; import {useDelegateNoAccessActions, useDelegateNoAccessState} from '@components/DelegateNoAccessModalProvider'; import type {SecondaryActionEntry} from '@components/MoneyReportHeaderActions/types'; import type {RejectModalAction} from '@components/MoneyReportHeaderEducationalModals'; +import {useMoneyReportTransactionThread} from '@components/MoneyReportTransactionThreadContext'; import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID'; import Navigation from '@libs/Navigation/Navigation'; -import {getOriginalMessage, isMoneyRequestAction} from '@libs/ReportActionsUtils'; import {changeMoneyRequestHoldStatus, isCurrentUserSubmitter, isDM} from '@libs/ReportUtils'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; @@ -15,7 +15,6 @@ import {useMemoizedLazyExpensifyIcons} from './useLazyAsset'; import useLocalize from './useLocalize'; import useNetwork from './useNetwork'; import useOnyx from './useOnyx'; -import useTransactionThreadReport from './useTransactionThreadReport'; type UseHoldRejectActionsParams = { reportID: string | undefined; @@ -38,18 +37,12 @@ function useHoldRejectActions({reportID, onHoldEducationalOpen, onRejectModalOpe const [moneyRequestReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`); const [chatReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${getNonEmptyStringOnyxID(moneyRequestReport?.chatReportID)}`); - const {transactionThreadReport} = useTransactionThreadReport(reportID); + const {iouTransactionID, requestParentReportAction} = useMoneyReportTransactionThread(); const {login: currentUserLogin, accountID: currentUserAccountID} = useCurrentUserPersonalDetails(); - const [reportActionsForParent] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${getNonEmptyStringOnyxID(moneyRequestReport?.reportID)}`); - const requestParentReportAction = transactionThreadReport?.parentReportActionID ? reportActionsForParent?.[transactionThreadReport.parentReportActionID] : undefined; - const {chatReport: chatIOUReport} = useGetIOUReportFromReportAction(requestParentReportAction); - const iouTransactionID = isMoneyRequestAction(requestParentReportAction) - ? (getOriginalMessage(requestParentReportAction)?.IOUTransactionID ?? CONST.DEFAULT_NUMBER_ID) - : CONST.DEFAULT_NUMBER_ID; - const [transaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${iouTransactionID}`); + const [transaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${getNonEmptyStringOnyxID(iouTransactionID)}`); const [dismissedRejectUseExplanation] = useOnyx(ONYXKEYS.NVP_DISMISSED_REJECT_USE_EXPLANATION); const [dismissedHoldUseExplanation] = useOnyx(ONYXKEYS.NVP_DISMISSED_HOLD_USE_EXPLANATION); diff --git a/src/hooks/useReportPrimaryAction.ts b/src/hooks/useReportPrimaryAction.ts index 44443f6ced76..7a6623ee1f16 100644 --- a/src/hooks/useReportPrimaryAction.ts +++ b/src/hooks/useReportPrimaryAction.ts @@ -1,4 +1,5 @@ import type {ValueOf} from 'type-fest'; +import {useMoneyReportTransactionThread} from '@components/MoneyReportTransactionThreadContext'; import {usePaymentAnimationsContext} from '@components/PaymentAnimationsContext'; import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID'; import {isPaidGroupPolicy} from '@libs/PolicyUtils'; @@ -11,7 +12,6 @@ import useCurrentUserPersonalDetails from './useCurrentUserPersonalDetails'; import useOnyx from './useOnyx'; import useReportIsArchived from './useReportIsArchived'; import useTransactionsAndViolationsForReport from './useTransactionsAndViolationsForReport'; -import useTransactionThreadReport from './useTransactionThreadReport'; function useReportPrimaryAction(reportID: string | undefined): ValueOf | '' { const {isPaidAnimationRunning, isApprovedAnimationRunning, isSubmittingAnimationRunning} = usePaymentAnimationsContext(); @@ -27,7 +27,7 @@ function useReportPrimaryAction(reportID: string | undefined): ValueOf Date: Thu, 28 May 2026 15:14:46 +0200 Subject: [PATCH 2/3] fix: resolve parent report action from raw Onyx collection Use direct REPORT_ACTIONS key lookup for requestParentReportAction so Hold/Unhold keep working when the parent IOU is filtered or unpaginated. Co-authored-by: Cursor --- .../MoneyReportTransactionThreadContext.tsx | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/components/MoneyReportTransactionThreadContext.tsx b/src/components/MoneyReportTransactionThreadContext.tsx index adeb9c574a8b..e7e6b8bd2e82 100644 --- a/src/components/MoneyReportTransactionThreadContext.tsx +++ b/src/components/MoneyReportTransactionThreadContext.tsx @@ -1,8 +1,11 @@ import React, {createContext, useContext} from 'react'; import type {ReactNode} from 'react'; +import useOnyx from '@hooks/useOnyx'; import useTransactionThreadReport from '@hooks/useTransactionThreadReport'; +import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID'; import {getOriginalMessage, isMoneyRequestAction} from '@libs/ReportActionsUtils'; import type CONST from '@src/CONST'; +import ONYXKEYS from '@src/ONYXKEYS'; import type * as OnyxTypes from '@src/types/onyx'; type MoneyReportTransactionThreadContextValue = { @@ -28,10 +31,12 @@ type MoneyReportTransactionThreadProviderProps = { function MoneyReportTransactionThreadProvider({reportID, children}: MoneyReportTransactionThreadProviderProps) { const {transactionThreadReportID, transactionThreadReport, reportActions} = useTransactionThreadReport(reportID); + const [reportActionsForParent] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${getNonEmptyStringOnyxID(reportID)}`); - const requestParentReportAction = - reportActions?.find((action): action is OnyxTypes.ReportAction => action.reportActionID === transactionThreadReport?.parentReportActionID) ?? - null; + // Parent lookup uses the raw Onyx collection so Hold/Unhold still work when the parent IOU is + // filtered from the report view (e.g. deleted money request) or outside the paginated window. + const parentReportAction = transactionThreadReport?.parentReportActionID ? reportActionsForParent?.[transactionThreadReport.parentReportActionID] : undefined; + const requestParentReportAction = isMoneyRequestAction(parentReportAction) ? parentReportAction : null; const iouTransactionID = isMoneyRequestAction(requestParentReportAction) ? getOriginalMessage(requestParentReportAction)?.IOUTransactionID : undefined; From 3ee125bd5fbb141a9a5408fcfc0b023e6813e0d4 Mon Sep 17 00:00:00 2001 From: Tomasz Misiukiewicz Date: Fri, 29 May 2026 14:25:04 +0200 Subject: [PATCH 3/3] add tests & docs --- .../MoneyReportTransactionThreadContext.tsx | 6 + ...neyReportTransactionThreadContext.test.tsx | 189 ++++++++++++++++++ 2 files changed, 195 insertions(+) create mode 100644 tests/unit/components/MoneyReportTransactionThreadContext.test.tsx diff --git a/src/components/MoneyReportTransactionThreadContext.tsx b/src/components/MoneyReportTransactionThreadContext.tsx index e7e6b8bd2e82..a7c780e72d17 100644 --- a/src/components/MoneyReportTransactionThreadContext.tsx +++ b/src/components/MoneyReportTransactionThreadContext.tsx @@ -9,9 +9,13 @@ import ONYXKEYS from '@src/ONYXKEYS'; import type * as OnyxTypes from '@src/types/onyx'; type MoneyReportTransactionThreadContextValue = { + /** The transaction ID from the parent IOU report action */ iouTransactionID: string | undefined; + /** The parent IOU report action for the transaction thread */ requestParentReportAction: OnyxTypes.ReportAction | null; + /** The transaction thread report ID */ transactionThreadReportID: string | undefined; + /** Filtered report actions for the transaction thread */ reportActions: OnyxTypes.ReportAction[]; }; @@ -25,7 +29,9 @@ const defaultValue: MoneyReportTransactionThreadContextValue = { const MoneyReportTransactionThreadContext = createContext(defaultValue); type MoneyReportTransactionThreadProviderProps = { + /** The money request report ID */ reportID: string | undefined; + /** The children */ children: ReactNode; }; diff --git a/tests/unit/components/MoneyReportTransactionThreadContext.test.tsx b/tests/unit/components/MoneyReportTransactionThreadContext.test.tsx new file mode 100644 index 000000000000..044df3590d0d --- /dev/null +++ b/tests/unit/components/MoneyReportTransactionThreadContext.test.tsx @@ -0,0 +1,189 @@ +import {renderHook} from '@testing-library/react-native'; +import React from 'react'; +import type {PropsWithChildren} from 'react'; +import type {OnyxKey, ResultMetadata, UseOnyxResult} from 'react-native-onyx'; +import {MoneyReportTransactionThreadProvider, useMoneyReportTransactionThread} from '@components/MoneyReportTransactionThreadContext'; +import useOnyx from '@hooks/useOnyx'; +import useTransactionThreadReport from '@hooks/useTransactionThreadReport'; +import CONST from '@src/CONST'; +import ONYXKEYS from '@src/ONYXKEYS'; +import type {Report, ReportAction, ReportActions} from '@src/types/onyx'; + +jest.mock('@hooks/useOnyx', () => ({ + __esModule: true, + default: jest.fn(), +})); + +jest.mock('@hooks/useTransactionThreadReport', () => ({ + __esModule: true, + default: jest.fn(), +})); + +const mockUseOnyx = jest.mocked(useOnyx); +const mockUseTransactionThreadReport = jest.mocked(useTransactionThreadReport); + +const MONEY_REPORT_ID = '10001'; +const THREAD_REPORT_ID = '10002'; +const PARENT_ACTION_ID = '9001'; +const IOU_TRANSACTION_ID = '3106135972713435169'; + +const loadedMetadata: ResultMetadata = {status: 'loaded'}; + +function asReportActionsOnyxResult(reportActions: ReportActions | undefined): UseOnyxResult { + return [reportActions, loadedMetadata]; +} + +function createIOUReportAction(reportActionID: string, transactionID: string = IOU_TRANSACTION_ID): ReportAction { + return { + reportActionID, + actionName: CONST.REPORT.ACTIONS.TYPE.IOU, + originalMessage: { + IOUTransactionID: transactionID, + type: CONST.IOU.REPORT_ACTION_TYPE.CREATE, + }, + created: '2025-02-14 08:12:05.165', + actorAccountID: 1, + person: [{type: 'TEXT', style: 'strong', text: 'Test'}], + message: [{type: 'COMMENT', html: '', text: '', isEdited: false, whisperedTo: [], isDeletedParentAction: false}], + } as ReportAction; +} + +function createTransactionThreadReport(parentReportActionID: string | undefined): Report { + return { + reportID: THREAD_REPORT_ID, + parentReportActionID, + } as Report; +} + +function renderContextHook(reportID: string | undefined = MONEY_REPORT_ID) { + function wrapper({children}: PropsWithChildren) { + return {children}; + } + + return renderHook(() => useMoneyReportTransactionThread(), {wrapper}); +} + +describe('MoneyReportTransactionThreadContext', () => { + beforeEach(() => { + jest.clearAllMocks(); + mockUseOnyx.mockReturnValue(asReportActionsOnyxResult(undefined)); + mockUseTransactionThreadReport.mockReturnValue({ + transactionThreadReportID: undefined, + transactionThreadReport: undefined, + reportActions: [], + }); + }); + + it('returns default values when used outside the provider', () => { + const {result} = renderHook(() => useMoneyReportTransactionThread()); + + expect(result.current).toEqual({ + iouTransactionID: undefined, + requestParentReportAction: null, + transactionThreadReportID: undefined, + reportActions: [], + }); + }); + + it('exposes transaction thread data and resolves the IOU transaction ID from the parent action', () => { + const parentReportAction = createIOUReportAction(PARENT_ACTION_ID); + const filteredReportActions: ReportAction[] = [ + { + reportActionID: 'filtered-action', + actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT, + created: '2025-02-14 08:12:05.165', + actorAccountID: 1, + person: [{type: 'TEXT', style: 'strong', text: 'Test'}], + message: [{type: 'COMMENT', html: '', text: '', isEdited: false, whisperedTo: [], isDeletedParentAction: false}], + }, + ]; + const reportActionsForParent: ReportActions = { + [PARENT_ACTION_ID]: parentReportAction, + }; + + mockUseTransactionThreadReport.mockReturnValue({ + transactionThreadReportID: THREAD_REPORT_ID, + transactionThreadReport: createTransactionThreadReport(PARENT_ACTION_ID), + reportActions: filteredReportActions, + }); + mockUseOnyx.mockImplementation((key: OnyxKey) => { + if (key === `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${MONEY_REPORT_ID}`) { + return asReportActionsOnyxResult(reportActionsForParent); + } + return asReportActionsOnyxResult(undefined); + }); + + const {result} = renderContextHook(); + + expect(mockUseTransactionThreadReport).toHaveBeenCalledWith(MONEY_REPORT_ID); + expect(result.current.transactionThreadReportID).toBe(THREAD_REPORT_ID); + expect(result.current.reportActions).toEqual(filteredReportActions); + expect(result.current.requestParentReportAction).toEqual(parentReportAction); + expect(result.current.iouTransactionID).toBe(IOU_TRANSACTION_ID); + }); + + it('resolves the parent action from the raw Onyx collection even when it is absent from filtered report actions', () => { + const parentReportAction = createIOUReportAction(PARENT_ACTION_ID); + const reportActionsForParent: ReportActions = { + [PARENT_ACTION_ID]: parentReportAction, + }; + + mockUseTransactionThreadReport.mockReturnValue({ + transactionThreadReportID: THREAD_REPORT_ID, + transactionThreadReport: createTransactionThreadReport(PARENT_ACTION_ID), + reportActions: [], + }); + mockUseOnyx.mockImplementation((key: OnyxKey) => { + if (key === `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${MONEY_REPORT_ID}`) { + return asReportActionsOnyxResult(reportActionsForParent); + } + return asReportActionsOnyxResult(undefined); + }); + + const {result} = renderContextHook(); + + expect(result.current.requestParentReportAction).toEqual(parentReportAction); + expect(result.current.iouTransactionID).toBe(IOU_TRANSACTION_ID); + }); + + it('returns null requestParentReportAction when the parent action is not a money request action', () => { + const nonIOUParentAction: ReportAction = { + reportActionID: PARENT_ACTION_ID, + actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT, + created: '2025-02-14 08:12:05.165', + actorAccountID: 1, + person: [{type: 'TEXT', style: 'strong', text: 'Test'}], + message: [{type: 'COMMENT', html: '', text: '', isEdited: false, whisperedTo: [], isDeletedParentAction: false}], + }; + + mockUseTransactionThreadReport.mockReturnValue({ + transactionThreadReportID: THREAD_REPORT_ID, + transactionThreadReport: createTransactionThreadReport(PARENT_ACTION_ID), + reportActions: [], + }); + mockUseOnyx.mockImplementation((key: OnyxKey) => { + if (key === `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${MONEY_REPORT_ID}`) { + return asReportActionsOnyxResult({[PARENT_ACTION_ID]: nonIOUParentAction}); + } + return asReportActionsOnyxResult(undefined); + }); + + const {result} = renderContextHook(); + + expect(result.current.requestParentReportAction).toBeNull(); + expect(result.current.iouTransactionID).toBeUndefined(); + }); + + it('returns null requestParentReportAction when the transaction thread has no parent action ID', () => { + mockUseTransactionThreadReport.mockReturnValue({ + transactionThreadReportID: THREAD_REPORT_ID, + transactionThreadReport: createTransactionThreadReport(undefined), + reportActions: [], + }); + + const {result} = renderContextHook(); + + expect(result.current.requestParentReportAction).toBeNull(); + expect(result.current.iouTransactionID).toBeUndefined(); + }); +});