From cd4ccdb401f0e3097f8748b14c528bd51e5b274e Mon Sep 17 00:00:00 2001 From: huutech <20178761+huult@users.noreply.github.com> Date: Thu, 12 Mar 2026 23:18:04 +0700 Subject: [PATCH 1/4] migrate REPORT_SETTINGS_VISIBILITY --- src/ROUTES.ts | 10 ++++------ src/SCREENS.ts | 2 +- .../AppNavigator/ModalStackNavigators/index.tsx | 2 +- src/libs/Navigation/linkingConfig/config.ts | 1 + src/libs/Navigation/types.ts | 8 +++----- src/pages/inbox/report/withReportOrNotFound.tsx | 1 + ...ibilityPage.tsx => DynamicVisibilityPage.tsx} | 16 +++++++--------- src/pages/settings/Report/ReportSettingsPage.tsx | 2 +- 8 files changed, 19 insertions(+), 23 deletions(-) rename src/pages/settings/Report/{VisibilityPage.tsx => DynamicVisibilityPage.tsx} (84%) diff --git a/src/ROUTES.ts b/src/ROUTES.ts index ef525cbf8fc57..8d6c77d81ad3b 100644 --- a/src/ROUTES.ts +++ b/src/ROUTES.ts @@ -99,6 +99,10 @@ const DYNAMIC_ROUTES = { path: 'owner-selector', entryScreens: [], }, + REPORT_SETTINGS_VISIBILITY: { + path: 'settings/visibility', + entryScreens: [SCREENS.REPORT_DETAILS.ROOT, SCREENS.RIGHT_MODAL.REPORT_SETTINGS, SCREENS.REPORT, SCREENS.RIGHT_MODAL.SEARCH_REPORT, SCREENS.SEARCH.ROOT], + }, ADDRESS_COUNTRY: { path: 'country', entryScreens: [ @@ -810,12 +814,6 @@ const ROUTES = { // eslint-disable-next-line no-restricted-syntax -- Legacy route generation getRoute: (reportID: string, backTo?: string) => getUrlWithBackToParam(`r/${reportID}/settings/who-can-post` as const, backTo), }, - REPORT_SETTINGS_VISIBILITY: { - route: 'r/:reportID/settings/visibility', - - // eslint-disable-next-line no-restricted-syntax -- Legacy route generation - getRoute: (reportID: string, backTo?: string) => getUrlWithBackToParam(`r/${reportID}/settings/visibility` as const, backTo), - }, REPORT_CHANGE_APPROVER: { route: 'r/:reportID/change-approver', diff --git a/src/SCREENS.ts b/src/SCREENS.ts index 6c2599a91dc50..b92b9d9aa466a 100644 --- a/src/SCREENS.ts +++ b/src/SCREENS.ts @@ -444,9 +444,9 @@ const SCREENS = { REPORT_SETTINGS: { ROOT: 'Report_Settings_Root', NAME: 'Report_Settings_Name', + DYNAMIC_SETTINGS_VISIBILITY: 'Dynamic_Report_Settings_Visibility', NOTIFICATION_PREFERENCES: 'Report_Settings_Notification_Preferences', WRITE_CAPABILITY: 'Report_Settings_Write_Capability', - VISIBILITY: 'Report_Settings_Visibility', REPORT_LAYOUT: 'Report_Settings_Report_Layout', COLUMNS: 'Report_Settings_Columns', }, diff --git a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx index 30d5ba47887e8..2768b86f0823a 100644 --- a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx +++ b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx @@ -278,9 +278,9 @@ const ReportChangeApproverModalStackNavigator = createModalStackNavigator({ [SCREENS.REPORT_SETTINGS.ROOT]: () => require('../../../../pages/settings/Report/ReportSettingsPage').default, [SCREENS.REPORT_SETTINGS.NAME]: () => require('../../../../pages/settings/Report/NamePage').default, + [SCREENS.REPORT_SETTINGS.DYNAMIC_SETTINGS_VISIBILITY]: () => require('../../../../pages/settings/Report/DynamicVisibilityPage').default, [SCREENS.REPORT_SETTINGS.NOTIFICATION_PREFERENCES]: () => require('../../../../pages/settings/Report/NotificationPreferencePage').default, [SCREENS.REPORT_SETTINGS.WRITE_CAPABILITY]: () => require('../../../../pages/settings/Report/WriteCapabilityPage').default, - [SCREENS.REPORT_SETTINGS.VISIBILITY]: () => require('../../../../pages/settings/Report/VisibilityPage').default, [SCREENS.REPORT_SETTINGS.REPORT_LAYOUT]: () => require('../../../../pages/settings/Report/ReportLayoutPage').default, [SCREENS.REPORT_SETTINGS.COLUMNS]: () => require('../../../../pages/settings/Report/ReportDetailsColumnsPage').default, }); diff --git a/src/libs/Navigation/linkingConfig/config.ts b/src/libs/Navigation/linkingConfig/config.ts index 79d1cb30c4aaa..031d72a86c0e9 100644 --- a/src/libs/Navigation/linkingConfig/config.ts +++ b/src/libs/Navigation/linkingConfig/config.ts @@ -1399,6 +1399,7 @@ const config: LinkingOptions['config'] = { [SCREENS.REPORT_SETTINGS.NAME]: { path: ROUTES.REPORT_SETTINGS_NAME.route, }, + [SCREENS.REPORT_SETTINGS.DYNAMIC_SETTINGS_VISIBILITY]: DYNAMIC_ROUTES.REPORT_SETTINGS_VISIBILITY.path, [SCREENS.REPORT_SETTINGS.NOTIFICATION_PREFERENCES]: { path: ROUTES.REPORT_SETTINGS_NOTIFICATION_PREFERENCES.route, }, diff --git a/src/libs/Navigation/types.ts b/src/libs/Navigation/types.ts index aeb5f3e5899f4..0c93c2981d1c9 100644 --- a/src/libs/Navigation/types.ts +++ b/src/libs/Navigation/types.ts @@ -1688,17 +1688,15 @@ type ReportSettingsNavigatorParamList = { // eslint-disable-next-line no-restricted-syntax -- `backTo` usages in this file are legacy. Do not add new `backTo` params to screens. See contributingGuides/NAVIGATION.md backTo?: Routes; }; - [SCREENS.REPORT_SETTINGS.NOTIFICATION_PREFERENCES]: { + [SCREENS.REPORT_SETTINGS.DYNAMIC_SETTINGS_VISIBILITY]: { reportID: string; - // eslint-disable-next-line no-restricted-syntax -- `backTo` usages in this file are legacy. Do not add new `backTo` params to screens. See contributingGuides/NAVIGATION.md - backTo?: Routes; }; - [SCREENS.REPORT_SETTINGS.WRITE_CAPABILITY]: { + [SCREENS.REPORT_SETTINGS.NOTIFICATION_PREFERENCES]: { reportID: string; // eslint-disable-next-line no-restricted-syntax -- `backTo` usages in this file are legacy. Do not add new `backTo` params to screens. See contributingGuides/NAVIGATION.md backTo?: Routes; }; - [SCREENS.REPORT_SETTINGS.VISIBILITY]: { + [SCREENS.REPORT_SETTINGS.WRITE_CAPABILITY]: { reportID: string; // eslint-disable-next-line no-restricted-syntax -- `backTo` usages in this file are legacy. Do not add new `backTo` params to screens. See contributingGuides/NAVIGATION.md backTo?: Routes; diff --git a/src/pages/inbox/report/withReportOrNotFound.tsx b/src/pages/inbox/report/withReportOrNotFound.tsx index 22d47b46b8bf8..fd0436b432306 100644 --- a/src/pages/inbox/report/withReportOrNotFound.tsx +++ b/src/pages/inbox/report/withReportOrNotFound.tsx @@ -52,6 +52,7 @@ type ScreenProps = | PlatformStackScreenProps | PlatformStackScreenProps | PlatformStackScreenProps + | PlatformStackScreenProps | PlatformStackScreenProps | PlatformStackScreenProps | PlatformStackScreenProps; diff --git a/src/pages/settings/Report/VisibilityPage.tsx b/src/pages/settings/Report/DynamicVisibilityPage.tsx similarity index 84% rename from src/pages/settings/Report/VisibilityPage.tsx rename to src/pages/settings/Report/DynamicVisibilityPage.tsx index 4cbbe57f3ab6c..0f4b670dfa76a 100644 --- a/src/pages/settings/Report/VisibilityPage.tsx +++ b/src/pages/settings/Report/DynamicVisibilityPage.tsx @@ -1,4 +1,3 @@ -import {useRoute} from '@react-navigation/native'; import React, {useMemo} from 'react'; import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView'; import HeaderWithBackButton from '@components/HeaderWithBackButton'; @@ -7,26 +6,25 @@ import ScreenWrapper from '@components/ScreenWrapper'; import SelectionList from '@components/SelectionList'; import RadioListItem from '@components/SelectionList/ListItem/RadioListItem'; import useConfirmModal from '@hooks/useConfirmModal'; +import useDynamicBackPath from '@hooks/useDynamicBackPath'; import useLocalize from '@hooks/useLocalize'; import useReportIsArchived from '@hooks/useReportIsArchived'; import setNavigationActionToMicrotaskQueue from '@libs/Navigation/helpers/setNavigationActionToMicrotaskQueue'; -import type {PlatformStackRouteProp, PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types'; -import type {ReportSettingsNavigatorParamList} from '@libs/Navigation/types'; import {goBackToDetailsPage, isArchivedNonExpenseReport} from '@libs/ReportUtils'; import type {WithReportOrNotFoundProps} from '@pages/inbox/report/withReportOrNotFound'; import withReportOrNotFound from '@pages/inbox/report/withReportOrNotFound'; import {updateRoomVisibility} from '@userActions/Report'; import CONST from '@src/CONST'; -import type SCREENS from '@src/SCREENS'; +import {DYNAMIC_ROUTES} from '@src/ROUTES'; import type {RoomVisibility} from '@src/types/onyx/Report'; -type VisibilityProps = WithReportOrNotFoundProps & PlatformStackScreenProps; +type DynamicVisibilityProps = WithReportOrNotFoundProps; -function VisibilityPage({report}: VisibilityProps) { - const route = useRoute>(); +function DynamicVisibilityPage({report}: DynamicVisibilityProps) { const isReportArchived = useReportIsArchived(report?.reportID); const shouldDisableVisibility = isArchivedNonExpenseReport(report, isReportArchived); const {translate} = useLocalize(); + const backPath = useDynamicBackPath(DYNAMIC_ROUTES.REPORT_SETTINGS_VISIBILITY.path); const {showConfirmModal} = useConfirmModal(); @@ -45,7 +43,7 @@ function VisibilityPage({report}: VisibilityProps) { ); const goBack = () => { - goBackToDetailsPage(report, route.params.backTo); + goBackToDetailsPage(report, backPath); }; const changeVisibility = (newVisibility: RoomVisibility) => { @@ -100,4 +98,4 @@ function VisibilityPage({report}: VisibilityProps) { ); } -export default withReportOrNotFound()(VisibilityPage); +export default withReportOrNotFound()(DynamicVisibilityPage); diff --git a/src/pages/settings/Report/ReportSettingsPage.tsx b/src/pages/settings/Report/ReportSettingsPage.tsx index bfa7608ae2fbb..86b13462ccfab 100644 --- a/src/pages/settings/Report/ReportSettingsPage.tsx +++ b/src/pages/settings/Report/ReportSettingsPage.tsx @@ -103,7 +103,7 @@ function ReportSettingsPage({report, policy, route}: ReportSettingsPageProps) { shouldShowRightIcon title={translate(`newRoomPage.visibilityOptions.${report.visibility}`)} description={translate('newRoomPage.visibility')} - onPress={() => Navigation.navigate(ROUTES.REPORT_SETTINGS_VISIBILITY.getRoute(report.reportID, backTo))} + onPress={() => Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.REPORT_SETTINGS_VISIBILITY.path))} /> ) : ( From e0e94d175f1e309221cef0bc0cefbb46d3b6e4c7 Mon Sep 17 00:00:00 2001 From: huutech <20178761+huult@users.noreply.github.com> Date: Sun, 15 Mar 2026 22:22:08 +0700 Subject: [PATCH 2/4] update migrte report setting visibility --- src/ROUTES.ts | 2 +- src/SCREENS.ts | 2 +- .../Navigation/AppNavigator/ModalStackNavigators/index.tsx | 2 +- src/libs/Navigation/linkingConfig/config.ts | 5 +---- src/libs/Navigation/types.ts | 6 +++--- src/pages/settings/Report/DynamicVisibilityPage.tsx | 5 +++-- src/pages/settings/Report/ReportSettingsPage.tsx | 7 +++++-- 7 files changed, 15 insertions(+), 14 deletions(-) diff --git a/src/ROUTES.ts b/src/ROUTES.ts index 0b149c7fdd039..0c2ace010b19c 100644 --- a/src/ROUTES.ts +++ b/src/ROUTES.ts @@ -100,7 +100,7 @@ const DYNAMIC_ROUTES = { entryScreens: [], }, REPORT_SETTINGS_VISIBILITY: { - path: 'settings/visibility', + path: 'visibility', entryScreens: [SCREENS.REPORT_DETAILS.ROOT, SCREENS.RIGHT_MODAL.REPORT_SETTINGS, SCREENS.REPORT, SCREENS.RIGHT_MODAL.SEARCH_REPORT, SCREENS.SEARCH.ROOT], }, ADDRESS_COUNTRY: { diff --git a/src/SCREENS.ts b/src/SCREENS.ts index b92b9d9aa466a..7ebd0d3e60517 100644 --- a/src/SCREENS.ts +++ b/src/SCREENS.ts @@ -444,9 +444,9 @@ const SCREENS = { REPORT_SETTINGS: { ROOT: 'Report_Settings_Root', NAME: 'Report_Settings_Name', - DYNAMIC_SETTINGS_VISIBILITY: 'Dynamic_Report_Settings_Visibility', NOTIFICATION_PREFERENCES: 'Report_Settings_Notification_Preferences', WRITE_CAPABILITY: 'Report_Settings_Write_Capability', + DYNAMIC_SETTINGS_VISIBILITY: 'Dynamic_Report_Settings_Visibility', REPORT_LAYOUT: 'Report_Settings_Report_Layout', COLUMNS: 'Report_Settings_Columns', }, diff --git a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx index 2768b86f0823a..8adb81a3ccfb3 100644 --- a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx +++ b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx @@ -278,9 +278,9 @@ const ReportChangeApproverModalStackNavigator = createModalStackNavigator({ [SCREENS.REPORT_SETTINGS.ROOT]: () => require('../../../../pages/settings/Report/ReportSettingsPage').default, [SCREENS.REPORT_SETTINGS.NAME]: () => require('../../../../pages/settings/Report/NamePage').default, - [SCREENS.REPORT_SETTINGS.DYNAMIC_SETTINGS_VISIBILITY]: () => require('../../../../pages/settings/Report/DynamicVisibilityPage').default, [SCREENS.REPORT_SETTINGS.NOTIFICATION_PREFERENCES]: () => require('../../../../pages/settings/Report/NotificationPreferencePage').default, [SCREENS.REPORT_SETTINGS.WRITE_CAPABILITY]: () => require('../../../../pages/settings/Report/WriteCapabilityPage').default, + [SCREENS.REPORT_SETTINGS.DYNAMIC_SETTINGS_VISIBILITY]: () => require('../../../../pages/settings/Report/DynamicVisibilityPage').default, [SCREENS.REPORT_SETTINGS.REPORT_LAYOUT]: () => require('../../../../pages/settings/Report/ReportLayoutPage').default, [SCREENS.REPORT_SETTINGS.COLUMNS]: () => require('../../../../pages/settings/Report/ReportDetailsColumnsPage').default, }); diff --git a/src/libs/Navigation/linkingConfig/config.ts b/src/libs/Navigation/linkingConfig/config.ts index 9864ae1c9afee..b82e7e8e6e9d5 100644 --- a/src/libs/Navigation/linkingConfig/config.ts +++ b/src/libs/Navigation/linkingConfig/config.ts @@ -1399,16 +1399,13 @@ const config: LinkingOptions['config'] = { [SCREENS.REPORT_SETTINGS.NAME]: { path: ROUTES.REPORT_SETTINGS_NAME.route, }, - [SCREENS.REPORT_SETTINGS.DYNAMIC_SETTINGS_VISIBILITY]: DYNAMIC_ROUTES.REPORT_SETTINGS_VISIBILITY.path, [SCREENS.REPORT_SETTINGS.NOTIFICATION_PREFERENCES]: { path: ROUTES.REPORT_SETTINGS_NOTIFICATION_PREFERENCES.route, }, [SCREENS.REPORT_SETTINGS.WRITE_CAPABILITY]: { path: ROUTES.REPORT_SETTINGS_WRITE_CAPABILITY.route, }, - [SCREENS.REPORT_SETTINGS.VISIBILITY]: { - path: ROUTES.REPORT_SETTINGS_VISIBILITY.route, - }, + [SCREENS.REPORT_SETTINGS.DYNAMIC_SETTINGS_VISIBILITY]: DYNAMIC_ROUTES.REPORT_SETTINGS_VISIBILITY.path, [SCREENS.REPORT_SETTINGS.REPORT_LAYOUT]: { path: ROUTES.REPORT_SETTINGS_REPORT_LAYOUT.route, }, diff --git a/src/libs/Navigation/types.ts b/src/libs/Navigation/types.ts index 704882f7850b3..955a794d0df79 100644 --- a/src/libs/Navigation/types.ts +++ b/src/libs/Navigation/types.ts @@ -1688,9 +1688,6 @@ type ReportSettingsNavigatorParamList = { // eslint-disable-next-line no-restricted-syntax -- `backTo` usages in this file are legacy. Do not add new `backTo` params to screens. See contributingGuides/NAVIGATION.md backTo?: Routes; }; - [SCREENS.REPORT_SETTINGS.DYNAMIC_SETTINGS_VISIBILITY]: { - reportID: string; - }; [SCREENS.REPORT_SETTINGS.NOTIFICATION_PREFERENCES]: { reportID: string; // eslint-disable-next-line no-restricted-syntax -- `backTo` usages in this file are legacy. Do not add new `backTo` params to screens. See contributingGuides/NAVIGATION.md @@ -1701,6 +1698,9 @@ type ReportSettingsNavigatorParamList = { // eslint-disable-next-line no-restricted-syntax -- `backTo` usages in this file are legacy. Do not add new `backTo` params to screens. See contributingGuides/NAVIGATION.md backTo?: Routes; }; + [SCREENS.REPORT_SETTINGS.DYNAMIC_SETTINGS_VISIBILITY]: { + reportID: string; + }; [SCREENS.REPORT_SETTINGS.REPORT_LAYOUT]: { reportID: string; }; diff --git a/src/pages/settings/Report/DynamicVisibilityPage.tsx b/src/pages/settings/Report/DynamicVisibilityPage.tsx index 0f4b670dfa76a..1edc72dd93f54 100644 --- a/src/pages/settings/Report/DynamicVisibilityPage.tsx +++ b/src/pages/settings/Report/DynamicVisibilityPage.tsx @@ -10,7 +10,8 @@ import useDynamicBackPath from '@hooks/useDynamicBackPath'; import useLocalize from '@hooks/useLocalize'; import useReportIsArchived from '@hooks/useReportIsArchived'; import setNavigationActionToMicrotaskQueue from '@libs/Navigation/helpers/setNavigationActionToMicrotaskQueue'; -import {goBackToDetailsPage, isArchivedNonExpenseReport} from '@libs/ReportUtils'; +import Navigation from '@libs/Navigation/Navigation'; +import {isArchivedNonExpenseReport} from '@libs/ReportUtils'; import type {WithReportOrNotFoundProps} from '@pages/inbox/report/withReportOrNotFound'; import withReportOrNotFound from '@pages/inbox/report/withReportOrNotFound'; import {updateRoomVisibility} from '@userActions/Report'; @@ -43,7 +44,7 @@ function DynamicVisibilityPage({report}: DynamicVisibilityProps) { ); const goBack = () => { - goBackToDetailsPage(report, backPath); + Navigation.goBack(backPath); }; const changeVisibility = (newVisibility: RoomVisibility) => { diff --git a/src/pages/settings/Report/ReportSettingsPage.tsx b/src/pages/settings/Report/ReportSettingsPage.tsx index 86b13462ccfab..a1afbbb319ead 100644 --- a/src/pages/settings/Report/ReportSettingsPage.tsx +++ b/src/pages/settings/Report/ReportSettingsPage.tsx @@ -9,6 +9,7 @@ import Text from '@components/Text'; import useLocalize from '@hooks/useLocalize'; import useReportIsArchived from '@hooks/useReportIsArchived'; import useThemeStyles from '@hooks/useThemeStyles'; +import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute'; import Navigation from '@libs/Navigation/Navigation'; import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types'; import { @@ -25,7 +26,7 @@ import type {ReportSettingsNavigatorParamList} from '@navigation/types'; import withReportOrNotFound from '@pages/inbox/report/withReportOrNotFound'; import type {WithReportOrNotFoundProps} from '@pages/inbox/report/withReportOrNotFound'; import CONST from '@src/CONST'; -import ROUTES from '@src/ROUTES'; +import ROUTES, {DYNAMIC_ROUTES} from '@src/ROUTES'; import type SCREENS from '@src/SCREENS'; import {isEmptyObject} from '@src/types/utils/EmptyObject'; @@ -103,7 +104,9 @@ function ReportSettingsPage({report, policy, route}: ReportSettingsPageProps) { shouldShowRightIcon title={translate(`newRoomPage.visibilityOptions.${report.visibility}`)} description={translate('newRoomPage.visibility')} - onPress={() => Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.REPORT_SETTINGS_VISIBILITY.path))} + onPress={() => { + Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.REPORT_SETTINGS_VISIBILITY.path)); + }} /> ) : ( From d86fe953aaa47a492a9be33a867d0fcfed6d680c Mon Sep 17 00:00:00 2001 From: huutech <20178761+huult@users.noreply.github.com> Date: Sun, 15 Mar 2026 22:34:44 +0700 Subject: [PATCH 3/4] update entry --- src/ROUTES.ts | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/ROUTES.ts b/src/ROUTES.ts index 0c2ace010b19c..d591a68ebbd9a 100644 --- a/src/ROUTES.ts +++ b/src/ROUTES.ts @@ -101,7 +101,14 @@ const DYNAMIC_ROUTES = { }, REPORT_SETTINGS_VISIBILITY: { path: 'visibility', - entryScreens: [SCREENS.REPORT_DETAILS.ROOT, SCREENS.RIGHT_MODAL.REPORT_SETTINGS, SCREENS.REPORT, SCREENS.RIGHT_MODAL.SEARCH_REPORT, SCREENS.SEARCH.ROOT], + entryScreens: [ + SCREENS.REPORT_DETAILS.ROOT, + SCREENS.RIGHT_MODAL.REPORT_SETTINGS, + SCREENS.REPORT_SETTINGS.ROOT, + SCREENS.REPORT, + SCREENS.RIGHT_MODAL.SEARCH_REPORT, + SCREENS.SEARCH.ROOT, + ], }, ADDRESS_COUNTRY: { path: 'country', From f931ff912338457b481f163c1ae5268676047e3c Mon Sep 17 00:00:00 2001 From: huutech <20178761+huult@users.noreply.github.com> Date: Sun, 15 Mar 2026 23:21:36 +0700 Subject: [PATCH 4/4] update entry screen --- src/ROUTES.ts | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/ROUTES.ts b/src/ROUTES.ts index d591a68ebbd9a..e86fa3887ed7f 100644 --- a/src/ROUTES.ts +++ b/src/ROUTES.ts @@ -101,14 +101,7 @@ const DYNAMIC_ROUTES = { }, REPORT_SETTINGS_VISIBILITY: { path: 'visibility', - entryScreens: [ - SCREENS.REPORT_DETAILS.ROOT, - SCREENS.RIGHT_MODAL.REPORT_SETTINGS, - SCREENS.REPORT_SETTINGS.ROOT, - SCREENS.REPORT, - SCREENS.RIGHT_MODAL.SEARCH_REPORT, - SCREENS.SEARCH.ROOT, - ], + entryScreens: [SCREENS.REPORT_SETTINGS.ROOT], }, ADDRESS_COUNTRY: { path: 'country',