Skip to content

Commit d3bb0cc

Browse files
committed
pass requestParentReportAction and transaction from parent
1 parent 405df26 commit d3bb0cc

2 files changed

Lines changed: 7 additions & 18 deletions

File tree

src/components/MoneyReportHeader.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2313,8 +2313,9 @@ function MoneyReportHeader({reportID: reportIDProp, shouldDisplayBackButton = fa
23132313
onClose={() => setIsDownloadErrorModalVisible(false)}
23142314
/>
23152315
<MoneyReportHeaderEducationalModals
2316+
requestParentReportAction={requestParentReportAction}
2317+
transaction={transaction}
23162318
reportID={moneyRequestReport?.reportID}
2317-
transactionThreadReportID={transactionThreadReportID}
23182319
isHoldEducationalVisible={isHoldEducationalModalVisible}
23192320
rejectModalAction={rejectModalAction}
23202321
onHoldEducationalDismissed={() => setIsHoldEducationalModalVisible(false)}

src/components/MoneyReportHeaderEducationalModals.tsx

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
import {shouldFailAllRequestsSelector} from '@selectors/Network';
2+
import type {OnyxEntry} from 'react-native-onyx';
23
import type {ValueOf} from 'type-fest';
34
import useNetwork from '@hooks/useNetwork';
45
import useOnyx from '@hooks/useOnyx';
5-
import usePaginatedReportActions from '@hooks/usePaginatedReportActions';
66
import {setNameValuePair} from '@libs/actions/User';
7-
import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID';
87
import Navigation from '@libs/Navigation/Navigation';
9-
import {getFilteredReportActionsForReportView, getOriginalMessage, isMoneyRequestAction} from '@libs/ReportActionsUtils';
108
import {changeMoneyRequestHoldStatus, rejectMoneyRequestReason} from '@libs/ReportUtils';
119
import {dismissRejectUseExplanation} from '@userActions/IOU';
1210
import CONST from '@src/CONST';
@@ -21,17 +19,19 @@ type RejectModalAction = ValueOf<
2119
>;
2220

2321
type MoneyReportHeaderEducationalModalsProps = {
22+
requestParentReportAction: OnyxTypes.ReportAction | null | undefined;
23+
transaction: OnyxEntry<OnyxTypes.Transaction>;
2424
reportID: string | undefined;
25-
transactionThreadReportID: string | undefined;
2625
isHoldEducationalVisible: boolean;
2726
rejectModalAction: RejectModalAction | null;
2827
onHoldEducationalDismissed: () => void;
2928
onRejectModalDismissed: () => void;
3029
};
3130

3231
function MoneyReportHeaderEducationalModals({
32+
requestParentReportAction,
33+
transaction,
3334
reportID,
34-
transactionThreadReportID,
3535
isHoldEducationalVisible,
3636
rejectModalAction,
3737
onHoldEducationalDismissed,
@@ -40,18 +40,6 @@ function MoneyReportHeaderEducationalModals({
4040
const {isOffline} = useNetwork();
4141
const [shouldFailAllRequests] = useOnyx(ONYXKEYS.NETWORK, {selector: shouldFailAllRequestsSelector});
4242

43-
const [transactionThreadReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReportID}`);
44-
const {reportActions: unfilteredReportActions} = usePaginatedReportActions(reportID);
45-
const reportActions = getFilteredReportActionsForReportView(unfilteredReportActions);
46-
47-
const requestParentReportAction =
48-
reportActions && transactionThreadReport?.parentReportActionID
49-
? reportActions.find((action): action is OnyxTypes.ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.IOU> => action.reportActionID === transactionThreadReport.parentReportActionID)
50-
: null;
51-
52-
const iouTransactionID = isMoneyRequestAction(requestParentReportAction) ? getOriginalMessage(requestParentReportAction)?.IOUTransactionID : undefined;
53-
const [transaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${getNonEmptyStringOnyxID(iouTransactionID)}`);
54-
5543
const dismissModalAndUpdateUseHold = () => {
5644
onHoldEducationalDismissed();
5745
setNameValuePair(ONYXKEYS.NVP_DISMISSED_HOLD_USE_EXPLANATION, true, false, !shouldFailAllRequests);

0 commit comments

Comments
 (0)