From b1a71fceec56ca3760278f8336f542ab22ffc28c Mon Sep 17 00:00:00 2001 From: Vit Horacek Date: Tue, 14 Oct 2025 16:28:04 +0100 Subject: [PATCH] Revert "Merge pull request #70227 from thelullabyy/fix/67103-part-5" This reverts commit 44a26e5b17900698de42d1b4113afed1eaf42d9f, reversing changes made to 26a5b902f2653194b3a69aaf237c50ec89b06807. --- src/Expensify.tsx | 2 - src/components/MoneyReportHeader.tsx | 17 +-- src/components/MoneyRequestHeader.tsx | 18 +-- .../MoneyRequestReceiptView.tsx | 6 +- src/hooks/useGetIOUReportFromReportAction.ts | 19 --- src/hooks/useSelectedTransactionsActions.ts | 41 +------ src/libs/OptionsListUtils/index.ts | 4 +- src/libs/ReportUtils.ts | 6 +- src/libs/actions/IOU.ts | 108 +++++++----------- src/libs/actions/Report.ts | 15 +++ src/libs/registerPaginationConfig.ts | 52 --------- src/pages/ReportDetailsPage.tsx | 42 +------ .../PopoverReportActionContextMenu.tsx | 30 +---- src/pages/iou/SplitExpensePage.tsx | 24 +--- tests/actions/IOUTest.ts | 34 +++--- tests/unit/OptionsListUtilsTest.tsx | 15 +-- tests/unit/ReportUtilsTest.ts | 3 +- 17 files changed, 98 insertions(+), 338 deletions(-) delete mode 100644 src/hooks/useGetIOUReportFromReportAction.ts delete mode 100644 src/libs/registerPaginationConfig.ts diff --git a/src/Expensify.tsx b/src/Expensify.tsx index 9603c06a7d74..9ee57669ce18 100644 --- a/src/Expensify.tsx +++ b/src/Expensify.tsx @@ -37,8 +37,6 @@ import NavigationRoot from './libs/Navigation/NavigationRoot'; import NetworkConnection from './libs/NetworkConnection'; import PushNotification from './libs/Notification/PushNotification'; import './libs/Notification/PushNotification/subscribeToPushNotifications'; -// This lib needs to be imported, but it has nothing to export since all it contains is an Onyx connection -import './libs/registerPaginationConfig'; import setCrashlyticsUserId from './libs/setCrashlyticsUserId'; import StartupTimer from './libs/StartupTimer'; // This lib needs to be imported, but it has nothing to export since all it contains is an Onyx connection diff --git a/src/components/MoneyReportHeader.tsx b/src/components/MoneyReportHeader.tsx index b39dc4f3b7ca..6aded735a415 100644 --- a/src/components/MoneyReportHeader.tsx +++ b/src/components/MoneyReportHeader.tsx @@ -7,7 +7,6 @@ import type {OnyxEntry} from 'react-native-onyx'; import type {ValueOf} from 'type-fest'; import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails'; import useDuplicateTransactionsAndViolations from '@hooks/useDuplicateTransactionsAndViolations'; -import useGetIOUReportFromReportAction from '@hooks/useGetIOUReportFromReportAction'; import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset'; import useLoadingBarVisibility from '@hooks/useLoadingBarVisibility'; import useLocalize from '@hooks/useLocalize'; @@ -213,7 +212,6 @@ function MoneyReportHeader({ } return reportActions.find((action): action is OnyxTypes.ReportAction => action.reportActionID === transactionThreadReport.parentReportActionID); }, [reportActions, transactionThreadReport?.parentReportActionID]); - const {iouReport, chatReport: chatIOUReport, isChatIOUReportArchived} = useGetIOUReportFromReportAction(requestParentReportAction); const {transactions: reportTransactions, violations} = useTransactionsAndViolationsForReport(moneyRequestReport?.reportID); @@ -1361,21 +1359,10 @@ function MoneyReportHeader({ // Money request should be deleted when interactions are done, to not show the not found page before navigating to goBackRoute // eslint-disable-next-line deprecation/deprecation InteractionManager.runAfterInteractions(() => { - deleteMoneyRequest( - transaction?.transactionID, - requestParentReportAction, - duplicateTransactions, - duplicateTransactionViolations, - iouReport, - chatIOUReport, - false, - undefined, - undefined, - isChatIOUReportArchived, - ); + deleteMoneyRequest(transaction?.transactionID, requestParentReportAction, duplicateTransactions, duplicateTransactionViolations); removeTransaction(transaction.transactionID); }); - goBackRoute = getNavigationUrlOnMoneyRequestDelete(transaction.transactionID, requestParentReportAction, iouReport, chatIOUReport, false, isChatIOUReportArchived); + goBackRoute = getNavigationUrlOnMoneyRequestDelete(transaction.transactionID, requestParentReportAction, false); } if (goBackRoute) { diff --git a/src/components/MoneyRequestHeader.tsx b/src/components/MoneyRequestHeader.tsx index a0d8d94d6431..f638ab9c3b6e 100644 --- a/src/components/MoneyRequestHeader.tsx +++ b/src/components/MoneyRequestHeader.tsx @@ -6,7 +6,6 @@ import type {OnyxEntry} from 'react-native-onyx'; import type {ValueOf} from 'type-fest'; import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails'; import useDuplicateTransactionsAndViolations from '@hooks/useDuplicateTransactionsAndViolations'; -import useGetIOUReportFromReportAction from '@hooks/useGetIOUReportFromReportAction'; import useLoadingBarVisibility from '@hooks/useLoadingBarVisibility'; import useLocalize from '@hooks/useLocalize'; import useOnyx from '@hooks/useOnyx'; @@ -120,7 +119,6 @@ function MoneyRequestHeader({report, parentReportAction, policy, onBackButtonPre const isFromReviewDuplicates = !!route.params.backTo?.replace(/\?.*/g, '').endsWith('/duplicates/review'); const shouldDisplayTransactionNavigation = !!(reportID && isReportInRHP); const isParentReportArchived = useReportIsArchived(report?.parentReportID); - const {iouReport, chatReport, isChatIOUReportArchived} = useGetIOUReportFromReportAction(parentReportAction); const {isBetaEnabled} = usePermissions(); @@ -454,27 +452,13 @@ function MoneyRequestHeader({report, parentReportAction, policy, onBackButtonPre report?.parentReportID, transaction.transactionID, parentReportAction, - iouReport, - chatReport, duplicateTransactions, duplicateTransactionViolations, true, isParentReportArchived, - isChatIOUReportArchived, ); } else { - deleteMoneyRequest( - transaction.transactionID, - parentReportAction, - duplicateTransactions, - duplicateTransactionViolations, - iouReport, - chatReport, - true, - undefined, - undefined, - isChatIOUReportArchived, - ); + deleteMoneyRequest(transaction.transactionID, parentReportAction, duplicateTransactions, duplicateTransactionViolations, true); removeTransaction(transaction.transactionID); } onBackButtonPress(); diff --git a/src/components/ReportActionItem/MoneyRequestReceiptView.tsx b/src/components/ReportActionItem/MoneyRequestReceiptView.tsx index 3fa2251d2d41..ab586c8cc583 100644 --- a/src/components/ReportActionItem/MoneyRequestReceiptView.tsx +++ b/src/components/ReportActionItem/MoneyRequestReceiptView.tsx @@ -8,7 +8,6 @@ import OfflineWithFeedback from '@components/OfflineWithFeedback'; import ReceiptAudit, {ReceiptAuditMessages} from '@components/ReceiptAudit'; import ReceiptEmptyState from '@components/ReceiptEmptyState'; import useActiveRoute from '@hooks/useActiveRoute'; -import useGetIOUReportFromReportAction from '@hooks/useGetIOUReportFromReportAction'; import useLocalize from '@hooks/useLocalize'; import useOnyx from '@hooks/useOnyx'; import useReportIsArchived from '@hooks/useReportIsArchived'; @@ -110,7 +109,6 @@ function MoneyRequestReceiptView({ const [isLoading, setIsLoading] = useState(true); const parentReportAction = report?.parentReportActionID ? parentReportActions?.[report.parentReportActionID] : undefined; - const {iouReport, chatReport: chatIOUReport, isChatIOUReportArchived} = useGetIOUReportFromReportAction(parentReportAction); const isTrackExpense = isTrackExpenseReport(report); const moneyRequestReport = parentReport; const linkedTransactionID = useMemo(() => { @@ -208,7 +206,7 @@ function MoneyRequestReceiptView({ return; } if (parentReportAction) { - cleanUpMoneyRequest(transaction?.transactionID ?? linkedTransactionID, parentReportAction, report.reportID, iouReport, chatIOUReport, true, isChatIOUReportArchived); + cleanUpMoneyRequest(transaction?.transactionID ?? linkedTransactionID, parentReportAction, report.reportID, true); return; } } @@ -223,7 +221,7 @@ function MoneyRequestReceiptView({ revert(transaction, getLastModifiedExpense(report?.reportID)); clearError(transaction.transactionID); clearAllRelatedReportActionErrors(report.reportID, parentReportAction); - }, [transaction, chatReport, parentReportAction, isChatIOUReportArchived, linkedTransactionID, report?.reportID, iouReport, chatIOUReport]); + }, [transaction, chatReport, parentReportAction, linkedTransactionID, report?.reportID]); let receiptStyle: StyleProp; diff --git a/src/hooks/useGetIOUReportFromReportAction.ts b/src/hooks/useGetIOUReportFromReportAction.ts deleted file mode 100644 index 4505b6e08df6..000000000000 --- a/src/hooks/useGetIOUReportFromReportAction.ts +++ /dev/null @@ -1,19 +0,0 @@ -import {getOriginalMessage, isMoneyRequestAction} from '@libs/ReportActionsUtils'; -import ONYXKEYS from '@src/ONYXKEYS'; -import type * as OnyxTypes from '@src/types/onyx'; -import useOnyx from './useOnyx'; -import useReportIsArchived from './useReportIsArchived'; - -function useGetIOUReportFromReportAction(reportAction: OnyxTypes.ReportAction | null | undefined): { - iouReport: OnyxTypes.Report | undefined; - chatReport: OnyxTypes.Report | undefined; - isChatIOUReportArchived: boolean; -} { - const iouReportID = isMoneyRequestAction(reportAction) ? getOriginalMessage(reportAction)?.IOUReportID : undefined; - const [iouReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${iouReportID}`, {canBeMissing: true}) ?? null; - const isChatIOUReportArchived = useReportIsArchived(iouReportID); - const [chatReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${iouReport?.chatReportID}`, {canBeMissing: true}); - return {iouReport, chatReport, isChatIOUReportArchived}; -} - -export default useGetIOUReportFromReportAction; diff --git a/src/hooks/useSelectedTransactionsActions.ts b/src/hooks/useSelectedTransactionsActions.ts index f7a2e4bfd84b..555e1c8d55af 100644 --- a/src/hooks/useSelectedTransactionsActions.ts +++ b/src/hooks/useSelectedTransactionsActions.ts @@ -15,12 +15,10 @@ import { canEditFieldOfMoneyRequest, canHoldUnholdReportAction, canUserPerformWriteAction as canUserPerformWriteActionReportUtils, - isArchivedReport, isInvoiceReport, isMoneyRequestReport as isMoneyRequestReportUtils, isTrackExpenseReport, } from '@libs/ReportUtils'; -import type {ArchivedReportsIDSet} from '@libs/SearchUIUtils'; import type {IOUType} from '@src/CONST'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; @@ -61,7 +59,6 @@ function useSelectedTransactionsActions({ const {selectedTransactionIDs, clearSelectedTransactions} = useSearchContext(); const [allTransactions] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION, {canBeMissing: false}); const [outstandingReportsByPolicyID] = useOnyx(ONYXKEYS.DERIVED.OUTSTANDING_REPORTS_BY_POLICY_ID, {canBeMissing: true}); - const [allReports] = useOnyx(ONYXKEYS.COLLECTION.REPORT, {canBeMissing: true}); const [lastVisitedPath] = useOnyx(ONYXKEYS.LAST_VISITED_PATH, {canBeMissing: true}); const [integrationsExportTemplates] = useOnyx(ONYXKEYS.NVP_INTEGRATION_SERVER_EXPORT_TEMPLATES, {canBeMissing: true}); @@ -86,23 +83,6 @@ function useSelectedTransactionsActions({ const isTrackExpenseThread = isTrackExpenseReport(report); const isInvoice = isInvoiceReport(report); - const [archivedReportsIdSet = new Set()] = useOnyx(ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS, { - canBeMissing: true, - selector: (all): ArchivedReportsIDSet => { - const ids = new Set(); - if (!all) { - return ids; - } - - for (const [key, value] of Object.entries(all)) { - if (isArchivedReport(value)) { - ids.add(key); - } - } - return ids; - }, - }); - let iouType: IOUType = CONST.IOU.TYPE.SUBMIT; if (isTrackExpenseThread) { @@ -128,23 +108,8 @@ function useSelectedTransactionsActions({ if (!action) { return; } - const iouReportID = isMoneyRequestAction(action) ? getOriginalMessage(action)?.IOUReportID : undefined; - const iouReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${iouReportID}`]; - const chatReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${iouReport?.chatReportID}`]; - const chatIOUReportID = chatReport?.reportID; - const isChatIOUReportArchived = archivedReportsIdSet.has(`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${chatIOUReportID}`); - deleteMoneyRequest( - transactionID, - action, - duplicateTransactions, - duplicateTransactionViolations, - iouReport, - chatReport, - false, - deletedTransactionIDs, - selectedTransactionIDs, - isChatIOUReportArchived, - ); + + deleteMoneyRequest(transactionID, action, duplicateTransactions, duplicateTransactionViolations, false, deletedTransactionIDs, selectedTransactionIDs); deletedTransactionIDs.push(transactionID); if (action.childReportID) { deletedTransactionThreadReportIDs.add(action.childReportID); @@ -153,7 +118,7 @@ function useSelectedTransactionsActions({ clearSelectedTransactions(true); setIsDeleteModalVisible(false); Navigation.removeReportScreen(deletedTransactionThreadReportIDs); - }, [duplicateTransactions, duplicateTransactionViolations, allReports, reportActions, selectedTransactionIDs, clearSelectedTransactions, archivedReportsIdSet]); + }, [duplicateTransactions, duplicateTransactionViolations, reportActions, selectedTransactionIDs, clearSelectedTransactions]); const showDeleteModal = useCallback(() => { setIsDeleteModalVisible(true); diff --git a/src/libs/OptionsListUtils/index.ts b/src/libs/OptionsListUtils/index.ts index ca10db6f6bed..5af263ef2079 100644 --- a/src/libs/OptionsListUtils/index.ts +++ b/src/libs/OptionsListUtils/index.ts @@ -284,9 +284,7 @@ Onyx.connect({ lastReportActions[reportID] = firstReportAction; } - const reportNameValuePairs = allReportNameValuePairs?.[`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${reportID}`]; - const isReportArchived = !!reportNameValuePairs?.private_isArchived; - const isWriteActionAllowed = canUserPerformWriteAction(report, isReportArchived); + const isWriteActionAllowed = canUserPerformWriteAction(report); // The report is only visible if it is the last action not deleted that // does not match a closed or created state. diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts index f7e6111024c6..47a239b1b5e3 100644 --- a/src/libs/ReportUtils.ts +++ b/src/libs/ReportUtils.ts @@ -10987,10 +10987,10 @@ function prepareOnboardingOnyxData( hasOutstandingChildTask: false, }; const report = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${targetChatReportID}`]; - const canUserPerformWriteActionVariable = canUserPerformWriteAction(report); - const {lastMessageText = ''} = getLastVisibleMessageActionUtils(targetChatReportID, canUserPerformWriteActionVariable); + const canUserPerformWriteAction1 = canUserPerformWriteAction(report); + const {lastMessageText = ''} = getLastVisibleMessageActionUtils(targetChatReportID, canUserPerformWriteAction1); if (lastMessageText) { - const lastVisibleAction = getLastVisibleAction(targetChatReportID, canUserPerformWriteActionVariable); + const lastVisibleAction = getLastVisibleAction(targetChatReportID, canUserPerformWriteAction1); const prevLastVisibleActionCreated = lastVisibleAction?.created; const lastActorAccountID = lastVisibleAction?.actorAccountID; failureReport = { diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts index c0e797db5ad4..17fd8084f9fe 100644 --- a/src/libs/actions/IOU.ts +++ b/src/libs/actions/IOU.ts @@ -8143,15 +8143,14 @@ function updateMoneyRequestAmountAndCurrency({ function prepareToCleanUpMoneyRequest( transactionID: string, reportAction: OnyxTypes.ReportAction, - iouReport: OnyxEntry, - chatReport: OnyxEntry, shouldRemoveIOUTransactionID = true, transactionIDsPendingDeletion?: string[], selectedTransactionIDs?: string[], - isChatReportArchived = false, ) { // STEP 1: Get all collections we're updating - const iouReportID = iouReport?.reportID; + const iouReportID = isMoneyRequestAction(reportAction) ? getOriginalMessage(reportAction)?.IOUReportID : undefined; + const iouReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${iouReportID}`] ?? null; + const chatReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${iouReport?.chatReportID}`]; const reportPreviewAction = getReportPreviewAction(iouReport?.chatReportID, iouReport?.reportID); const transaction = allTransactions[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`]; const isTransactionOnHold = isOnHold(transaction); @@ -8192,7 +8191,7 @@ function prepareToCleanUpMoneyRequest( let canUserPerformWriteAction = true; if (chatReport) { - canUserPerformWriteAction = !!canUserPerformWriteActionReportUtils(chatReport, isChatReportArchived); + canUserPerformWriteAction = !!canUserPerformWriteActionReportUtils(chatReport); } // If we are deleting the last transaction on a report, then delete the report too const shouldDeleteIOUReport = getReportTransactions(iouReportID).filter((trans) => !transactionIDsPendingDeletion?.includes(trans.transactionID)).length === 1; @@ -8227,7 +8226,7 @@ function prepareToCleanUpMoneyRequest( } } // STEP 4: Update the iouReport and reportPreview with new totals and messages if it wasn't deleted - let updatedIOUReport; + let updatedIOUReport: OnyxInputValue; const currency = getCurrency(transaction); const updatedReportPreviewAction: Partial> = cloneDeep(reportPreviewAction ?? {}); updatedReportPreviewAction.pendingAction = shouldDeleteIOUReport ? CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE : CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE; @@ -8312,9 +8311,11 @@ function prepareToCleanUpMoneyRequest( updatedReportPreviewAction, transactionThreadID, transactionThread, + chatReport, transaction, transactionViolations, reportPreviewAction, + iouReport, }; } @@ -8325,28 +8326,12 @@ function prepareToCleanUpMoneyRequest( * @param isSingleTransactionView - whether we are in the transaction thread report * @returns The URL to navigate to */ -function getNavigationUrlOnMoneyRequestDelete( - transactionID: string | undefined, - reportAction: OnyxTypes.ReportAction, - iouReport: OnyxEntry, - chatReport: OnyxEntry, - isSingleTransactionView = false, - isChatReportArchived = false, -): Route | undefined { +function getNavigationUrlOnMoneyRequestDelete(transactionID: string | undefined, reportAction: OnyxTypes.ReportAction, isSingleTransactionView = false): Route | undefined { if (!transactionID) { return undefined; } - const {shouldDeleteTransactionThread, shouldDeleteIOUReport} = prepareToCleanUpMoneyRequest( - transactionID, - reportAction, - iouReport, - chatReport, - undefined, - undefined, - undefined, - isChatReportArchived, - ); + const {shouldDeleteTransactionThread, shouldDeleteIOUReport, iouReport} = prepareToCleanUpMoneyRequest(transactionID, reportAction); // Determine which report to navigate back to if (iouReport && isSingleTransactionView && shouldDeleteTransactionThread && !shouldDeleteIOUReport) { @@ -8372,18 +8357,17 @@ function getNavigationUrlAfterTrackExpenseDelete( chatReportID: string | undefined, transactionID: string | undefined, reportAction: OnyxTypes.ReportAction, - iouReport: OnyxEntry, - chatReport: OnyxEntry, isSingleTransactionView = false, - isChatReportArchived = false, ): Route | undefined { if (!chatReportID || !transactionID) { return undefined; } + const chatReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${chatReportID}`] ?? null; + // If not a self DM, handle it as a regular money request if (!isSelfDM(chatReport)) { - return getNavigationUrlOnMoneyRequestDelete(transactionID, reportAction, iouReport, chatReport, isSingleTransactionView, isChatReportArchived); + return getNavigationUrlOnMoneyRequestDelete(transactionID, reportAction, isSingleTransactionView); } // Only navigate if in single transaction view and the thread will be deleted @@ -8402,19 +8386,20 @@ function getNavigationUrlAfterTrackExpenseDelete( * @param isSingleTransactionView - whether we are in the transaction thread report * @return the url to navigate back once the money request is deleted */ -function cleanUpMoneyRequest( - transactionID: string, - reportAction: OnyxTypes.ReportAction, - reportID: string, - iouReport: OnyxEntry, - chatReport: OnyxEntry, - isSingleTransactionView = false, - isChatIOUReportArchived = false, -) { - const {shouldDeleteTransactionThread, shouldDeleteIOUReport, updatedReportAction, updatedIOUReport, updatedReportPreviewAction, transactionThreadID, reportPreviewAction} = - prepareToCleanUpMoneyRequest(transactionID, reportAction, iouReport, chatReport, false, undefined, undefined, isChatIOUReportArchived); +function cleanUpMoneyRequest(transactionID: string, reportAction: OnyxTypes.ReportAction, reportID: string, isSingleTransactionView = false) { + const { + shouldDeleteTransactionThread, + shouldDeleteIOUReport, + updatedReportAction, + updatedIOUReport, + updatedReportPreviewAction, + transactionThreadID, + chatReport, + iouReport, + reportPreviewAction, + } = prepareToCleanUpMoneyRequest(transactionID, reportAction, false); - const urlToNavigateBack = getNavigationUrlOnMoneyRequestDelete(transactionID, reportAction, iouReport, chatReport, isSingleTransactionView, isChatIOUReportArchived); + const urlToNavigateBack = getNavigationUrlOnMoneyRequestDelete(transactionID, reportAction, isSingleTransactionView); // build Onyx data // Onyx operations to delete the transaction, update the IOU report action and chat report action @@ -8507,7 +8492,7 @@ function cleanUpMoneyRequest( if (shouldDeleteIOUReport) { let canUserPerformWriteAction = true; if (chatReport) { - canUserPerformWriteAction = !!canUserPerformWriteActionReportUtils(chatReport, isChatIOUReportArchived); + canUserPerformWriteAction = !!canUserPerformWriteActionReportUtils(chatReport); } const lastMessageText = getLastVisibleMessage( @@ -8565,12 +8550,9 @@ function deleteMoneyRequest( reportAction: OnyxTypes.ReportAction, transactions: OnyxCollection, violations: OnyxCollection, - iouReport: OnyxEntry, - chatReport: OnyxEntry, isSingleTransactionView = false, transactionIDsPendingDeletion?: string[], selectedTransactionIDs?: string[], - isChatIOUReportArchived = false, ) { if (!transactionID) { return; @@ -8585,12 +8567,14 @@ function deleteMoneyRequest( updatedReportPreviewAction, transactionThreadID, transactionThread, + chatReport, transaction, transactionViolations, + iouReport, reportPreviewAction, - } = prepareToCleanUpMoneyRequest(transactionID, reportAction, iouReport, chatReport, false, transactionIDsPendingDeletion, selectedTransactionIDs, isChatIOUReportArchived); + } = prepareToCleanUpMoneyRequest(transactionID, reportAction, false, transactionIDsPendingDeletion, selectedTransactionIDs); - const urlToNavigateBack = getNavigationUrlOnMoneyRequestDelete(transactionID, reportAction, iouReport, chatReport, isSingleTransactionView, isChatIOUReportArchived); + const urlToNavigateBack = getNavigationUrlOnMoneyRequestDelete(transactionID, reportAction, isSingleTransactionView); // STEP 2: Build Onyx data // The logic mostly resembles the cleanUpMoneyRequest function @@ -8683,7 +8667,7 @@ function deleteMoneyRequest( if (shouldDeleteIOUReport) { let canUserPerformWriteAction = true; if (chatReport) { - canUserPerformWriteAction = !!canUserPerformWriteActionReportUtils(chatReport, isChatIOUReportArchived); + canUserPerformWriteAction = !!canUserPerformWriteActionReportUtils(chatReport); } const lastMessageText = getLastVisibleMessage( @@ -8868,23 +8852,21 @@ function deleteTrackExpense( chatReportID: string | undefined, transactionID: string | undefined, reportAction: OnyxTypes.ReportAction, - iouReport: OnyxEntry, - chatReport: OnyxEntry, transactions: OnyxCollection, violations: OnyxCollection, isSingleTransactionView = false, isChatReportArchived = false, - isChatIOUReportArchived = false, ) { if (!chatReportID || !transactionID) { return; } - const urlToNavigateBack = getNavigationUrlAfterTrackExpenseDelete(chatReportID, transactionID, reportAction, iouReport, chatReport, isSingleTransactionView, isChatIOUReportArchived); + const urlToNavigateBack = getNavigationUrlAfterTrackExpenseDelete(chatReportID, transactionID, reportAction, isSingleTransactionView); // STEP 1: Get all collections we're updating + const chatReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${chatReportID}`] ?? null; if (!isSelfDM(chatReport)) { - deleteMoneyRequest(transactionID, reportAction, transactions, violations, iouReport, chatReport, isSingleTransactionView, undefined, undefined, isChatIOUReportArchived); + deleteMoneyRequest(transactionID, reportAction, transactions, violations, isSingleTransactionView); return urlToNavigateBack; } @@ -13299,23 +13281,20 @@ function clearSplitTransactionDraftErrors(transactionID: string | undefined) { } function saveSplitTransactions( - originalTransactionID: string, draftTransaction: OnyxEntry, hash: number, policyCategories: OnyxTypes.PolicyCategories | undefined, policy: OnyxTypes.Policy | undefined, policyRecentlyUsedCategories: OnyxTypes.RecentlyUsedCategories | undefined, - iouReport: OnyxEntry, - chatReport: OnyxEntry, - firstIOU: OnyxEntry | undefined, - isChatReportArchived = false, ) { const transactionReport = getReportOrDraftReport(draftTransaction?.reportID); const parentTransactionReport = getReportOrDraftReport(transactionReport?.parentReportID); const expenseReport = transactionReport?.type === CONST.REPORT.TYPE.EXPENSE ? transactionReport : parentTransactionReport; + const originalTransactionID = draftTransaction?.comment?.originalTransactionID ?? CONST.IOU.OPTIMISTIC_TRANSACTION_ID; const originalTransaction = allTransactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${originalTransactionID}`]; const originalTransactionDetails = getTransactionDetails(originalTransaction); + const iouActions = getIOUActionForTransactions([originalTransactionID], expenseReport?.reportID); const policyTags = getPolicyTagsData(expenseReport?.policyID); const participants = getMoneyRequestParticipantsFromReport(expenseReport); @@ -13546,17 +13525,9 @@ function saveSplitTransactions( value: originalTransaction, }); + const firstIOU = iouActions.at(0); if (firstIOU) { - const {updatedReportAction, transactionThread} = prepareToCleanUpMoneyRequest( - originalTransactionID, - firstIOU, - iouReport, - chatReport, - undefined, - undefined, - undefined, - isChatReportArchived, - ); + const {updatedReportAction, iouReport, transactionThread} = prepareToCleanUpMoneyRequest(originalTransactionID, firstIOU); optimisticData.push({ onyxMethod: Onyx.METHOD.MERGE, key: `${ONYXKEYS.COLLECTION.REPORT}${firstIOU?.childReportID}`, @@ -13637,7 +13608,7 @@ function saveSplitTransactions( InteractionManager.runAfterInteractions(() => removeDraftSplitTransaction(originalTransactionID)); const isSearchPageTopmostFullScreenRoute = isSearchTopmostFullScreenRoute(); - const transactionThreadReportID = firstIOU?.childReportID; + const transactionThreadReportID = iouActions.at(0)?.childReportID; const transactionThreadReportScreen = Navigation.getReportRouteByID(transactionThreadReportID); if (isSearchPageTopmostFullScreenRoute || !transactionReport?.parentReportID) { @@ -13911,7 +13882,6 @@ export { assignReportToMe, getPerDiemExpenseInformation, getSendInvoiceInformation, - getIOUActionForTransactions, addReportApprover, hasOutstandingChildRequest, getUpdateMoneyRequestParams, diff --git a/src/libs/actions/Report.ts b/src/libs/actions/Report.ts index eadc14d0d6af..8657c0aceb9b 100644 --- a/src/libs/actions/Report.ts +++ b/src/libs/actions/Report.ts @@ -75,6 +75,7 @@ import isPublicScreenRoute from '@libs/isPublicScreenRoute'; import * as Localize from '@libs/Localize'; import Log from '@libs/Log'; import {isEmailPublicDomain} from '@libs/LoginUtils'; +import {registerPaginationConfig} from '@libs/Middleware/Pagination'; import {getMovedReportID} from '@libs/ModifiedExpenseMessage'; import {isOnboardingFlowName} from '@libs/Navigation/helpers/isNavigatorName'; import type {LinkToOptions} from '@libs/Navigation/helpers/linkTo/types'; @@ -474,6 +475,20 @@ getEnvironment().then((env) => { environment = env; }); +registerPaginationConfig({ + initialCommand: WRITE_COMMANDS.OPEN_REPORT, + previousCommand: READ_COMMANDS.GET_OLDER_ACTIONS, + nextCommand: READ_COMMANDS.GET_NEWER_ACTIONS, + resourceCollectionKey: ONYXKEYS.COLLECTION.REPORT_ACTIONS, + pageCollectionKey: ONYXKEYS.COLLECTION.REPORT_ACTIONS_PAGES, + sortItems: (reportActions, reportID) => { + const report = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`]; + const canUserPerformWriteAction = canUserPerformWriteActionReportUtils(report); + return ReportActionsUtils.getSortedReportActionsForDisplay(reportActions, canUserPerformWriteAction, true); + }, + getItemID: (reportAction) => reportAction.reportActionID, +}); + function clearGroupChat() { Onyx.set(ONYXKEYS.NEW_GROUP_CHAT_DRAFT, null); } diff --git a/src/libs/registerPaginationConfig.ts b/src/libs/registerPaginationConfig.ts deleted file mode 100644 index a05c1474a706..000000000000 --- a/src/libs/registerPaginationConfig.ts +++ /dev/null @@ -1,52 +0,0 @@ -import type {OnyxCollection} from 'react-native-onyx'; -import Onyx from 'react-native-onyx'; -import ONYXKEYS from '@src/ONYXKEYS'; -import type {Report, ReportNameValuePairs} from '@src/types/onyx'; -import {READ_COMMANDS, WRITE_COMMANDS} from './API/types'; -import {registerPaginationConfig} from './Middleware/Pagination'; -import {getSortedReportActionsForDisplay} from './ReportActionsUtils'; -import {canUserPerformWriteAction as canUserPerformWriteActionReportUtils} from './ReportUtils'; - -/** - * This connection is exclusively used within the `registerPaginationConfig` function. - * Using connectWithoutView() is appropriate here since these values are not directly - * bound to any UI components. - */ -let allReports: OnyxCollection; -Onyx.connectWithoutView({ - key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, - callback: (value) => { - allReports = value; - }, -}); - -let allReportNameValuePairs: OnyxCollection; -/** - * This connection is exclusively used within the `registerPaginationConfig` function. - * Using connectWithoutView() is appropriate here since these values are not directly - * bound to any UI components. - */ -Onyx.connectWithoutView({ - key: ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS, - waitForCollectionCallback: true, - callback: (value) => { - allReportNameValuePairs = value; - }, -}); - -registerPaginationConfig({ - initialCommand: WRITE_COMMANDS.OPEN_REPORT, - previousCommand: READ_COMMANDS.GET_OLDER_ACTIONS, - nextCommand: READ_COMMANDS.GET_NEWER_ACTIONS, - resourceCollectionKey: ONYXKEYS.COLLECTION.REPORT_ACTIONS, - pageCollectionKey: ONYXKEYS.COLLECTION.REPORT_ACTIONS_PAGES, - sortItems: (reportActions, reportID) => { - const report = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`]; - const reportNameValuePairs = allReportNameValuePairs?.[`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${reportID}`]; - const isReportArchived = !!reportNameValuePairs?.private_isArchived; - const canUserPerformWriteAction = canUserPerformWriteActionReportUtils(report, isReportArchived); - return getSortedReportActionsForDisplay(reportActions, canUserPerformWriteAction, true); - }, - getItemID: (reportAction) => reportAction.reportActionID, -}); diff --git a/src/pages/ReportDetailsPage.tsx b/src/pages/ReportDetailsPage.tsx index 62cada0dbcf2..2cc95f36b770 100644 --- a/src/pages/ReportDetailsPage.tsx +++ b/src/pages/ReportDetailsPage.tsx @@ -23,7 +23,6 @@ import ScreenWrapper from '@components/ScreenWrapper'; import ScrollView from '@components/ScrollView'; import {useSearchContext} from '@components/Search/SearchContext'; import useDuplicateTransactionsAndViolations from '@hooks/useDuplicateTransactionsAndViolations'; -import useGetIOUReportFromReportAction from '@hooks/useGetIOUReportFromReportAction'; import useLocalize from '@hooks/useLocalize'; import useNetwork from '@hooks/useNetwork'; import useOnyx from '@hooks/useOnyx'; @@ -258,7 +257,6 @@ function ReportDetailsPage({policy, report, route, reportMetadata}: ReportDetail } return parentReportAction; }, [caseID, parentReportAction, reportActions, transactionThreadReport?.parentReportActionID]); - const {iouReport, chatReport: chatIOUReport, isChatIOUReportArchived} = useGetIOUReportFromReportAction(requestParentReportAction); const isActionOwner = typeof requestParentReportAction?.actorAccountID === 'number' && typeof session?.accountID === 'number' && requestParentReportAction.actorAccountID === session?.accountID; @@ -796,27 +794,13 @@ function ReportDetailsPage({policy, report, route, reportMetadata}: ReportDetail moneyRequestReport?.reportID, iouTransactionID, requestParentReportAction, - iouReport, - chatIOUReport, duplicateTransactions, duplicateTransactionViolations, isSingleTransactionView, isMoneyRequestReportArchived, - isChatIOUReportArchived, ); } else { - deleteMoneyRequest( - iouTransactionID, - requestParentReportAction, - duplicateTransactions, - duplicateTransactionViolations, - iouReport, - chatIOUReport, - isSingleTransactionView, - undefined, - undefined, - isChatIOUReportArchived, - ); + deleteMoneyRequest(iouTransactionID, requestParentReportAction, duplicateTransactions, duplicateTransactionViolations, isSingleTransactionView); removeTransaction(iouTransactionID); } }, [ @@ -830,10 +814,7 @@ function ReportDetailsPage({policy, report, route, reportMetadata}: ReportDetail report, requestParentReportAction, isReportArchived, - isChatIOUReportArchived, isMoneyRequestReportArchived, - iouReport, - chatIOUReport, ]); // A flag to indicate whether the user chose to delete the transaction or not @@ -864,24 +845,9 @@ function ReportDetailsPage({policy, report, route, reportMetadata}: ReportDetail if (!isEmptyObject(requestParentReportAction)) { const isTrackExpense = isTrackExpenseAction(requestParentReportAction); if (isTrackExpense) { - urlToNavigateBack = getNavigationUrlAfterTrackExpenseDelete( - moneyRequestReport?.reportID, - iouTransactionID, - requestParentReportAction, - iouReport, - chatIOUReport, - isSingleTransactionView, - isChatIOUReportArchived, - ); + urlToNavigateBack = getNavigationUrlAfterTrackExpenseDelete(moneyRequestReport?.reportID, iouTransactionID, requestParentReportAction, isSingleTransactionView); } else { - urlToNavigateBack = getNavigationUrlOnMoneyRequestDelete( - iouTransactionID, - requestParentReportAction, - iouReport, - chatIOUReport, - isSingleTransactionView, - isChatIOUReportArchived, - ); + urlToNavigateBack = getNavigationUrlOnMoneyRequestDelete(iouTransactionID, requestParentReportAction, isSingleTransactionView); } } @@ -891,7 +857,7 @@ function ReportDetailsPage({policy, report, route, reportMetadata}: ReportDetail setDeleteTransactionNavigateBackUrl(urlToNavigateBack); navigateBackOnDeleteTransaction(urlToNavigateBack as Route, true); } - }, [iouTransactionID, requestParentReportAction, isSingleTransactionView, isTransactionDeleted, moneyRequestReport?.reportID, isChatIOUReportArchived, iouReport, chatIOUReport]); + }, [iouTransactionID, requestParentReportAction, isSingleTransactionView, isTransactionDeleted, moneyRequestReport?.reportID]); const mentionReportContextValue = useMemo(() => ({currentReportID: report.reportID, exactlyMatch: true}), [report.reportID]); diff --git a/src/pages/home/report/ContextMenu/PopoverReportActionContextMenu.tsx b/src/pages/home/report/ContextMenu/PopoverReportActionContextMenu.tsx index 9b3b41b1e6fe..d4dcf840e310 100644 --- a/src/pages/home/report/ContextMenu/PopoverReportActionContextMenu.tsx +++ b/src/pages/home/report/ContextMenu/PopoverReportActionContextMenu.tsx @@ -10,7 +10,6 @@ import {Actions, ActionSheetAwareScrollViewContext} from '@components/ActionShee import ConfirmModal from '@components/ConfirmModal'; import PopoverWithMeasuredContent from '@components/PopoverWithMeasuredContent'; import useDuplicateTransactionsAndViolations from '@hooks/useDuplicateTransactionsAndViolations'; -import useGetIOUReportFromReportAction from '@hooks/useGetIOUReportFromReportAction'; import useLocalize from '@hooks/useLocalize'; import useReportIsArchived from '@hooks/useReportIsArchived'; import {deleteMoneyRequest, deleteTrackExpense} from '@libs/actions/IOU'; @@ -299,38 +298,15 @@ function PopoverReportActionContextMenu({ref}: PopoverReportActionContextMenuPro const {duplicateTransactions, duplicateTransactionViolations} = useDuplicateTransactionsAndViolations(transactionIDs); - const {iouReport, chatReport, isChatIOUReportArchived} = useGetIOUReportFromReportAction(reportActionRef.current); - const confirmDeleteAndHideModal = useCallback(() => { callbackWhenDeleteModalHide.current = runAndResetCallback(onConfirmDeleteModal.current); const reportAction = reportActionRef.current; if (isMoneyRequestAction(reportAction)) { const originalMessage = getOriginalMessage(reportAction); if (isTrackExpenseAction(reportAction)) { - deleteTrackExpense( - reportIDRef.current, - originalMessage?.IOUTransactionID, - reportAction, - iouReport, - chatReport, - duplicateTransactions, - duplicateTransactionViolations, - undefined, - isChatIOUReportArchived, - ); + deleteTrackExpense(reportIDRef.current, originalMessage?.IOUTransactionID, reportAction, duplicateTransactions, duplicateTransactionViolations, isReportArchived); } else { - deleteMoneyRequest( - originalMessage?.IOUTransactionID, - reportAction, - duplicateTransactions, - duplicateTransactionViolations, - iouReport, - chatReport, - undefined, - undefined, - undefined, - isChatIOUReportArchived, - ); + deleteMoneyRequest(originalMessage?.IOUTransactionID, reportAction, duplicateTransactions, duplicateTransactionViolations); } } else if (isReportPreviewAction(reportAction)) { deleteAppReport(reportAction.childReportID); @@ -343,7 +319,7 @@ function PopoverReportActionContextMenu({ref}: PopoverReportActionContextMenuPro DeviceEventEmitter.emit(`deletedReportAction_${reportIDRef.current}`, reportAction?.reportActionID); setIsDeleteCommentConfirmModalVisible(false); - }, [duplicateTransactions, duplicateTransactionViolations, isReportArchived, isOriginalReportArchived, isChatIOUReportArchived, iouReport, chatReport]); + }, [duplicateTransactions, duplicateTransactionViolations, isReportArchived, isOriginalReportArchived]); const hideDeleteModal = () => { callbackWhenDeleteModalHide.current = () => (onCancelDeleteModal.current = runAndResetCallback(onCancelDeleteModal.current)); diff --git a/src/pages/iou/SplitExpensePage.tsx b/src/pages/iou/SplitExpensePage.tsx index dd84fd21c01e..013e258c476d 100644 --- a/src/pages/iou/SplitExpensePage.tsx +++ b/src/pages/iou/SplitExpensePage.tsx @@ -13,7 +13,6 @@ import {useSearchContext} from '@components/Search/SearchContext'; import SelectionList from '@components/SelectionListWithSections'; import type {SectionListDataType, SplitListItemType} from '@components/SelectionListWithSections/types'; import useDisplayFocusedInputUnderKeyboard from '@hooks/useDisplayFocusedInputUnderKeyboard'; -import useGetIOUReportFromReportAction from '@hooks/useGetIOUReportFromReportAction'; import useLocalize from '@hooks/useLocalize'; import useOnyx from '@hooks/useOnyx'; import usePermissions from '@hooks/usePermissions'; @@ -23,7 +22,6 @@ import useThemeStyles from '@hooks/useThemeStyles'; import { addSplitExpenseField, clearSplitTransactionDraftErrors, - getIOUActionForTransactions, getIOURequestPolicyID, initDraftSplitExpenseDataForEdit, initSplitExpenseItemData, @@ -90,10 +88,6 @@ function SplitExpensePage({route}: SplitExpensePageProps) { const isPerDiem = isPerDiemRequest(transaction); const isCard = isCardTransaction(transaction); - const originalTransactionID = draftTransaction?.comment?.originalTransactionID ?? CONST.IOU.OPTIMISTIC_TRANSACTION_ID; - const iouActions = getIOUActionForTransactions([originalTransactionID], expenseReport?.reportID); - const {iouReport, chatReport, isChatIOUReportArchived} = useGetIOUReportFromReportAction(iouActions.at(0)); - const childTransactions = useMemo(() => getChildTransactions(transactionID), [transactionID]); const splitFieldDataFromChildTransactions = useMemo(() => childTransactions.map((currentTransaction) => initSplitExpenseItemData(currentTransaction)), [childTransactions]); const splitFieldDataFromOriginalTransaction = useMemo(() => initSplitExpenseItemData(transaction), [transaction]); @@ -160,18 +154,7 @@ function SplitExpensePage({route}: SplitExpensePageProps) { return; } - saveSplitTransactions( - originalTransactionID, - draftTransaction, - currentSearchHash, - policyCategories, - expenseReportPolicy, - policyRecentlyUsedCategories, - iouReport, - chatReport, - iouActions.at(0), - isChatIOUReportArchived, - ); + saveSplitTransactions(draftTransaction, currentSearchHash, policyCategories, expenseReportPolicy, policyRecentlyUsedCategories); }, [ splitExpenses, childTransactions.length, @@ -190,11 +173,6 @@ function SplitExpensePage({route}: SplitExpensePageProps) { translate, transactionID, transactionDetails?.currency, - isChatIOUReportArchived, - iouReport, - iouActions, - chatReport, - originalTransactionID, ]); const onSplitExpenseAmountChange = useCallback( diff --git a/tests/actions/IOUTest.ts b/tests/actions/IOUTest.ts index fb74a0580066..a69a6bdd0ef1 100644 --- a/tests/actions/IOUTest.ts +++ b/tests/actions/IOUTest.ts @@ -2708,7 +2708,7 @@ describe('actions/IOU', () => { originalTransactionID: transaction.transactionID, }, }; - saveSplitTransactions(transaction.transactionID, draftTransaction, 1, undefined, undefined, [], {} as OnyxEntry, {} as OnyxEntry, iouAction); + saveSplitTransactions(draftTransaction, 1, undefined, undefined, []); await waitForBatchedUpdates(); @@ -2767,7 +2767,7 @@ describe('actions/IOU', () => { // When splitting the expense const hash = 1; - saveSplitTransactions(transaction.transactionID, draftTransaction, hash, undefined, undefined, [], {} as OnyxEntry, {} as OnyxEntry, undefined); + saveSplitTransactions(draftTransaction, hash, undefined, undefined, []); await waitForBatchedUpdates(); @@ -2841,7 +2841,7 @@ describe('actions/IOU', () => { // When splitting the expense const hash = 1; - saveSplitTransactions(transaction.transactionID, draftTransaction, hash, undefined, undefined, [], {} as OnyxEntry, {} as OnyxEntry, undefined); + saveSplitTransactions(draftTransaction, hash, undefined, undefined, []); await waitForBatchedUpdates(); @@ -3668,7 +3668,7 @@ describe('actions/IOU', () => { if (transaction && createIOUAction) { // When the expense is deleted - deleteMoneyRequest(transaction?.transactionID, createIOUAction, {}, {}, iouReport, chatReport, true); + deleteMoneyRequest(transaction?.transactionID, createIOUAction, {}, {}, true); } await waitForBatchedUpdates(); @@ -3747,7 +3747,7 @@ describe('actions/IOU', () => { if (transaction && createIOUAction) { // When the IOU expense is deleted - deleteMoneyRequest(transaction?.transactionID, createIOUAction, {}, {}, iouReport, chatReport, true); + deleteMoneyRequest(transaction?.transactionID, createIOUAction, {}, {}, true); } await waitForBatchedUpdates(); @@ -3809,7 +3809,7 @@ describe('actions/IOU', () => { // When we attempt to delete an expense from the IOU report mockFetch?.pause?.(); if (transaction && createIOUAction) { - deleteMoneyRequest(transaction?.transactionID, createIOUAction, {}, {}, iouReport, chatReport); + deleteMoneyRequest(transaction?.transactionID, createIOUAction, {}, {}); } await waitForBatchedUpdates(); @@ -3904,7 +3904,7 @@ describe('actions/IOU', () => { if (transaction && createIOUAction) { // When Deleting an expense - deleteMoneyRequest(transaction?.transactionID, createIOUAction, {}, {}, iouReport, chatReport); + deleteMoneyRequest(transaction?.transactionID, createIOUAction, {}, {}); } await waitForBatchedUpdates(); @@ -4029,7 +4029,7 @@ describe('actions/IOU', () => { if (transaction && createIOUAction) { // When Deleting an expense - deleteMoneyRequest(transaction?.transactionID, createIOUAction, {}, {}, iouReport, chatReport); + deleteMoneyRequest(transaction?.transactionID, createIOUAction, {}, {}); } await waitForBatchedUpdates(); @@ -4103,7 +4103,7 @@ describe('actions/IOU', () => { if (transaction && createIOUAction) { // When deleting expense - deleteMoneyRequest(transaction?.transactionID, createIOUAction, {}, {}, iouReport, chatReport); + deleteMoneyRequest(transaction?.transactionID, createIOUAction, {}, {}); } await waitForBatchedUpdates(); @@ -4254,7 +4254,7 @@ describe('actions/IOU', () => { mockFetch?.pause?.(); if (transaction && createIOUAction) { // When we delete the expense - deleteMoneyRequest(transaction.transactionID, createIOUAction, {}, {}, iouReport, chatReport); + deleteMoneyRequest(transaction.transactionID, createIOUAction, {}, {}); } await waitForBatchedUpdates(); @@ -4346,7 +4346,7 @@ describe('actions/IOU', () => { mockFetch?.pause?.(); jest.advanceTimersByTime(10); if (transaction && createIOUAction) { - deleteMoneyRequest(transaction.transactionID, createIOUAction, {}, {}, iouReport, chatReport); + deleteMoneyRequest(transaction.transactionID, createIOUAction, {}, {}); } await waitForBatchedUpdates(); @@ -4422,7 +4422,7 @@ describe('actions/IOU', () => { let navigateToAfterDelete; if (transaction && createIOUAction) { - navigateToAfterDelete = deleteMoneyRequest(transaction.transactionID, createIOUAction, {}, {}, iouReport, chatReport, true); + navigateToAfterDelete = deleteMoneyRequest(transaction.transactionID, createIOUAction, {}, {}, true); } let allReports = await new Promise>((resolve) => { @@ -4470,7 +4470,7 @@ describe('actions/IOU', () => { let navigateToAfterDelete; if (transaction && createIOUAction) { // When we delete the expense and we should delete the IOU report - navigateToAfterDelete = deleteMoneyRequest(transaction.transactionID, createIOUAction, {}, {}, iouReport, chatReport); + navigateToAfterDelete = deleteMoneyRequest(transaction.transactionID, createIOUAction, {}, {}); } // Then we expect to navigate to the chat report expect(chatReport?.reportID).not.toBeUndefined(); @@ -4534,8 +4534,8 @@ describe('actions/IOU', () => { await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${expenseReport.reportID}`, expenseReport); const selectedTransactionIDs = [transaction1.transactionID, transaction2.transactionID]; - deleteMoneyRequest(transaction1.transactionID, moneyRequestAction1, {}, {}, expenseReport, expenseReport, undefined, [], selectedTransactionIDs); - deleteMoneyRequest(transaction2.transactionID, moneyRequestAction2, {}, {}, expenseReport, expenseReport, undefined, [transaction1.transactionID], selectedTransactionIDs); + deleteMoneyRequest(transaction1.transactionID, moneyRequestAction1, {}, {}, undefined, [], selectedTransactionIDs); + deleteMoneyRequest(transaction2.transactionID, moneyRequestAction2, {}, {}, undefined, [transaction1.transactionID], selectedTransactionIDs); await waitForBatchedUpdates(); @@ -7204,7 +7204,7 @@ describe('actions/IOU', () => { }, }; - saveSplitTransactions(originalTransactionID ?? CONST.IOU.OPTIMISTIC_TRANSACTION_ID, draftTransaction, -2, undefined, undefined, [], expenseReport, chatReport, undefined); + saveSplitTransactions(draftTransaction, -2, undefined, undefined, []); await waitForBatchedUpdates(); const split1 = await getOnyxValue(`${ONYXKEYS.COLLECTION.TRANSACTION}235`); @@ -7304,7 +7304,7 @@ describe('actions/IOU', () => { }, }; - saveSplitTransactions(originalTransactionID ?? CONST.IOU.OPTIMISTIC_TRANSACTION_ID, draftTransaction, -2, undefined, undefined, [], expenseReport, chatReport, undefined); + saveSplitTransactions(draftTransaction, -2, undefined, undefined, []); await waitForBatchedUpdates(); const split1 = await getOnyxValue(`${ONYXKEYS.COLLECTION.TRANSACTION}235`); diff --git a/tests/unit/OptionsListUtilsTest.tsx b/tests/unit/OptionsListUtilsTest.tsx index 33148be9323c..f430bc19e452 100644 --- a/tests/unit/OptionsListUtilsTest.tsx +++ b/tests/unit/OptionsListUtilsTest.tsx @@ -1,12 +1,11 @@ /* eslint-disable @typescript-eslint/naming-convention */ -import {render, renderHook} from '@testing-library/react-native'; +import {render} from '@testing-library/react-native'; import {View} from 'react-native'; import type {OnyxCollection} from 'react-native-onyx'; import Onyx from 'react-native-onyx'; import ComposeProviders from '@components/ComposeProviders'; import {LocaleContextProvider} from '@components/LocaleContextProvider'; import OnyxListItemProvider from '@components/OnyxListItemProvider'; -import useReportIsArchived from '@hooks/useReportIsArchived'; import DateUtils from '@libs/DateUtils'; import type {OptionList, Options, SearchOption} from '@libs/OptionsListUtils'; import { @@ -1188,8 +1187,7 @@ describe('OptionsListUtils', () => { // Given a set of filtered current Reports (as we do in the component) before getting share destination options const filteredReports = Object.values(OPTIONS.reports).reduce((filtered, option) => { const report = option.item; - const {result: isReportArchived} = renderHook(() => useReportIsArchived(report.reportID)); - if (canUserPerformWriteAction(report, isReportArchived.current) && canCreateTaskInReport(report) && !isCanceledTaskReport(report)) { + if (canUserPerformWriteAction(report) && canCreateTaskInReport(report) && !isCanceledTaskReport(report)) { filtered.push(option); } return filtered; @@ -1223,9 +1221,8 @@ describe('OptionsListUtils', () => { // Given a set of filtered current Reports (as we do in the component) with workspace rooms before getting share destination options const filteredReportsWithWorkspaceRooms = Object.values(OPTIONS_WITH_WORKSPACE_ROOM.reports).reduce((filtered, option) => { const report = option.item; - const {result: isReportArchived} = renderHook(() => useReportIsArchived(report.reportID)); // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing - if (canUserPerformWriteAction(report, isReportArchived.current) || isExpensifyOnlyParticipantInReport(report)) { + if (canUserPerformWriteAction(report) || isExpensifyOnlyParticipantInReport(report)) { filtered.push(option); } return filtered; @@ -1539,7 +1536,7 @@ describe('OptionsListUtils', () => { // Given a set of filtered current Reports (as we do in the component) before getting share destination options const filteredReports = Object.values(OPTIONS.reports).reduce((filtered, option) => { const report = option.item; - if (canUserPerformWriteAction(report, false) && canCreateTaskInReport(report) && !isCanceledTaskReport(report)) { + if (canUserPerformWriteAction(report) && canCreateTaskInReport(report) && !isCanceledTaskReport(report)) { filtered.push(option); } return filtered; @@ -1575,7 +1572,7 @@ describe('OptionsListUtils', () => { const filteredReportsWithWorkspaceRooms = Object.values(OPTIONS_WITH_WORKSPACE_ROOM.reports).reduce((filtered, option) => { const report = option.item; // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing - if (canUserPerformWriteAction(report, false) || isExpensifyOnlyParticipantInReport(report)) { + if (canUserPerformWriteAction(report) || isExpensifyOnlyParticipantInReport(report)) { filtered.push(option); } return filtered; @@ -1612,7 +1609,7 @@ describe('OptionsListUtils', () => { const filteredReportsWithWorkspaceRooms = Object.values(OPTIONS_WITH_WORKSPACE_ROOM.reports).reduce((filtered, option) => { const report = option.item; // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing - if (canUserPerformWriteAction(report, false) || isExpensifyOnlyParticipantInReport(report)) { + if (canUserPerformWriteAction(report) || isExpensifyOnlyParticipantInReport(report)) { filtered.push(option); } return filtered; diff --git a/tests/unit/ReportUtilsTest.ts b/tests/unit/ReportUtilsTest.ts index 5ba0e6a7b86d..b903990b70c1 100644 --- a/tests/unit/ReportUtilsTest.ts +++ b/tests/unit/ReportUtilsTest.ts @@ -5827,8 +5827,7 @@ describe('ReportUtils', () => { await Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${workspace.id}`, workspace); - const {result: isReportArchived} = renderHook(() => useReportIsArchived(policyAnnounceRoom.reportID)); - const result = canUserPerformWriteAction(policyAnnounceRoom, isReportArchived.current); + const result = canUserPerformWriteAction(policyAnnounceRoom); // Then it should return false expect(result).toBe(false);