Merge pull request #42239 from bernhardoj/fix/41514-back-nav-loop-fro…

…m-details-page

Fix go back from details page remove the linked report action

src/pages/FlagCommentPage.tsx

@@ -19,7 +19,6 @@ import * as ReportUtils from '@libs/ReportUtils';
 import * as Report from '@userActions/Report';
 import * as Session from '@userActions/Session';
 import CONST from '@src/CONST';
-import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
 import type * as OnyxTypes from '@src/types/onyx';
 import withReportAndReportActionOrNotFound from './home/report/withReportAndReportActionOrNotFound';
@@ -160,14 +159,7 @@ function FlagCommentPage({parentReportAction, route, report, parentReport, repor
  >
  {({safeAreaPaddingBottomStyle}) => (
  <FullPageNotFoundView shouldShow={!ReportUtils.shouldShowFlagComment(getActionToFlag(), report)}>
- <HeaderWithBackButton
- title={translate('reportActionContextMenu.flagAsOffensive')}
- shouldNavigateToTopMostReport
- onBackButtonPress={() => {
- Navigation.goBack();
- Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(report?.reportID ?? ''));
- }}
- />
+ <HeaderWithBackButton title={translate('reportActionContextMenu.flagAsOffensive')} />
  <ScrollView
  contentContainerStyle={safeAreaPaddingBottomStyle}
  style={styles.settingsPageBackground}

src/pages/ReportDetailsPage.tsx

@@ -1,4 +1,3 @@
-import {useRoute} from '@react-navigation/native';
 import type {StackScreenProps} from '@react-navigation/stack';
 import React, {useCallback, useEffect, useMemo, useState} from 'react';
 import {View} from 'react-native';
@@ -66,7 +65,6 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
  const {translate} = useLocalize();
  const {isOffline} = useNetwork();
  const styles = useThemeStyles();
- const route = useRoute();
  const [isLastMemberLeavingGroupModalVisible, setIsLastMemberLeavingGroupModalVisible] = useState(false);
  const policy = useMemo(() => policies?.[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID ?? ''}`], [policies, report?.policyID]);
  const isPolicyAdmin = useMemo(() => PolicyUtils.isPolicyAdmin(policy ?? null), [policy]);
@@ -312,11 +310,7 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
  return (
  <ScreenWrapper testID={ReportDetailsPage.displayName}>
  <FullPageNotFoundView shouldShow={isEmptyObject(report)}>
- <HeaderWithBackButton
- title={translate('common.details')}
- onBackButtonPress={Navigation.goBack}
- shouldNavigateToTopMostReport={!(route.params && 'backTo' in route.params)}
- />
+ <HeaderWithBackButton title={translate('common.details')} />
  <ScrollView style={[styles.flex1]}>
  <View style={styles.reportDetailsTitleContainer}>
  {renderedAvatar}