Skip to content

Navigate to Home instead of Inbox from NotFoundPage #85526

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
carlosmiceli merged 5 commits into from
Mar 19, 2026
Merged

Navigate to Home instead of Inbox from NotFoundPage #85526

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
457e18a
Navigate to Home page instead of Inbox when clicking 'Go back to home…
MelvinBot Mar 17, 2026
99d6c02
Merge remote-tracking branch 'origin/main' into claude-notFoundPageGo…
MelvinBot Mar 18, 2026
d1a16ad
Fix: Use goBack instead of navigate to prevent 404 staying in history
MelvinBot Mar 18, 2026
2daa9f0
Use useRoute() to scope Home navigation to NOT_FOUND screen only
MelvinBot Mar 18, 2026
6c2a31c
Rename negated variable to fix ESLint no-negated-variables rule
MelvinBot Mar 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/pages/ErrorPage/NotFoundPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import {useRoute} from '@react-navigation/native';
import React from 'react';
import type {FullPageNotFoundViewProps} from '@components/BlockingViews/FullPageNotFoundView';
import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
Expand All @@ -7,6 +8,8 @@ import useResponsiveLayout from '@hooks/useResponsiveLayout';
import Navigation from '@libs/Navigation/Navigation';
import useAbsentPageSpan from '@libs/telemetry/useAbsentPageSpan';
import ONYXKEYS from '@src/ONYXKEYS';
import ROUTES from '@src/ROUTES';
import SCREENS from '@src/SCREENS';

type NotFoundPageProps = {
onBackButtonPress?: () => void;
Expand All @@ -21,6 +24,8 @@ function NotFoundPage({onBackButtonPress = () => Navigation.goBack(), isReportRe
const {isSmallScreenWidth} = useResponsiveLayout();
const topmostReportId = Navigation.getTopmostReportId();
const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${topmostReportId}`);
const route = useRoute();
const isOnGenericErrorScreen = route.name === SCREENS.NOT_FOUND;

useAbsentPageSpan();

Expand All @@ -46,6 +51,7 @@ function NotFoundPage({onBackButtonPress = () => Navigation.goBack(), isReportRe
}}
// eslint-disable-next-line react/jsx-props-no-spreading
{...fullPageNotFoundViewProps}
onLinkPress={isOnGenericErrorScreen ? () => Navigation.goBack(ROUTES.HOME) : fullPageNotFoundViewProps.onLinkPress}
/>
</ScreenWrapper>
);
Expand Down
Loading