From 7440d48a6139a517c8127f4d636f2ca0290afce3 Mon Sep 17 00:00:00 2001 From: Wojciech Boman Date: Fri, 5 Sep 2025 09:15:06 +0200 Subject: [PATCH] Revert "Merge pull request #69790 from software-mansion-labs/fix-report-loading-infinitely" This reverts commit 90e314e6a0ba3c847b9adf6d811084c1952bdfab, reversing changes made to 5cd66787acacec09d314ca296b0da3dc2cb9a126. --- src/pages/home/ReportScreen.tsx | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/src/pages/home/ReportScreen.tsx b/src/pages/home/ReportScreen.tsx index c6a3d94bb118..c3003d829105 100644 --- a/src/pages/home/ReportScreen.tsx +++ b/src/pages/home/ReportScreen.tsx @@ -1,5 +1,5 @@ import {PortalHost} from '@gorhom/portal'; -import {useFocusEffect, useIsFocused} from '@react-navigation/native'; +import {useIsFocused} from '@react-navigation/native'; import {deepEqual} from 'fast-equals'; import React, {memo, useCallback, useEffect, useMemo, useRef, useState} from 'react'; import type {FlatList, ViewStyle} from 'react-native'; @@ -198,25 +198,6 @@ function ReportScreen({route, navigation}: ReportScreenProps) { navigation.setParams({reportID: lastAccessedReportID}); }, [isBetaEnabled, navigation, route]); - // This hook redirects to the correct report ID when the current report is not found. This happens, for example, after deleting an expense from the Reports tab and returning to Inbox. - useFocusEffect( - useCallback(() => { - if (firstRenderRef.current || isInNarrowPaneModal) { - return; - } - - if (reportIDFromRoute && (!reportOnyx?.reportID || reportOnyx.errorFields?.notFound)) { - const lastAccessedReportID = findLastAccessedReport(false, !!route.params?.openOnAdminRoom, undefined, reportIDFromRoute)?.reportID; - if (lastAccessedReportID) { - const lastAccessedReportRoute = ROUTES.REPORT_WITH_ID.getRoute(lastAccessedReportID); - Navigation.navigate(lastAccessedReportRoute, {forceReplace: true}); - return; - } - navigateToConciergeChat(false, () => true, {forceReplace: true}); - } - }, [isInNarrowPaneModal, reportIDFromRoute, reportOnyx?.errorFields?.notFound, reportOnyx?.reportID, route.params?.openOnAdminRoom]), - ); - const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {canBeMissing: true}); const chatWithAccountManagerText = useMemo(() => { if (accountManagerReportID) {