Skip to content

Commit 02686c5

Browse files
authored
Merge pull request Expensify#65872 from Expensify/revert-65622-fix/64033-infinite-load-after-delete-moved-tx
[CP Staging] Revert "Fix infinite loading after deleting moved transaction"
2 parents aaad748 + 260d551 commit 02686c5

1 file changed

Lines changed: 11 additions & 1 deletion

File tree

src/pages/home/ReportScreen.tsx

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,8 @@ function ReportScreen({route, navigation}: ReportScreenProps) {
276276
const [isBannerVisible, setIsBannerVisible] = useState(true);
277277
const [scrollPosition, setScrollPosition] = useState<ScrollPosition>({});
278278

279+
const wasReportAccessibleRef = useRef(false);
280+
279281
const [isComposerFocus, setIsComposerFocus] = useState(false);
280282
const shouldAdjustScrollView = useMemo(() => isComposerFocus && !modal?.willAlertModalBecomeVisible, [isComposerFocus, modal]);
281283
const viewportOffsetTop = useViewportOffsetTop(shouldAdjustScrollView);
@@ -323,6 +325,14 @@ function ReportScreen({route, navigation}: ReportScreenProps) {
323325
hideEmojiPicker(true);
324326
}, [prevIsFocused, isFocused]);
325327

328+
useEffect(() => {
329+
if (!report?.reportID) {
330+
wasReportAccessibleRef.current = false;
331+
return;
332+
}
333+
wasReportAccessibleRef.current = true;
334+
}, [report]);
335+
326336
const backTo = route?.params?.backTo as string;
327337
const onBackButtonPress = useCallback(() => {
328338
if (backTo === SCREENS.SEARCH.REPORT_RHP) {
@@ -441,7 +451,7 @@ function ReportScreen({route, navigation}: ReportScreenProps) {
441451
}
442452

443453
// eslint-disable-next-line react-compiler/react-compiler
444-
if (!firstRenderRef.current && !reportID && !isOptimisticDelete && !reportMetadata?.isLoadingInitialReportActions && !userLeavingStatus) {
454+
if (!wasReportAccessibleRef.current && !firstRenderRef.current && !reportID && !isOptimisticDelete && !reportMetadata?.isLoadingInitialReportActions && !userLeavingStatus) {
445455
// eslint-disable-next-line react-compiler/react-compiler
446456
return true;
447457
}

0 commit comments

Comments
 (0)