diff --git a/src/ROUTES.ts b/src/ROUTES.ts index af29a7fdbbb4..9303c2da54e9 100644 --- a/src/ROUTES.ts +++ b/src/ROUTES.ts @@ -33,8 +33,6 @@ const ROUTES = { // This route renders the list of reports. HOME: 'home', - ALL_SETTINGS: 'all-settings', - SEARCH_CENTRAL_PANE: { route: 'search', getRoute: ({query, isCustomQuery = false, policyIDs}: {query: SearchQueryString; isCustomQuery?: boolean; policyIDs?: string}) => diff --git a/src/SCREENS.ts b/src/SCREENS.ts index 74d4a628e696..1b49288e9389 100644 --- a/src/SCREENS.ts +++ b/src/SCREENS.ts @@ -12,7 +12,6 @@ const PROTECTED_SCREENS = { const SCREENS = { ...PROTECTED_SCREENS, - ALL_SETTINGS: 'AllSettings', REPORT: 'Report', PROFILE_AVATAR: 'ProfileAvatar', WORKSPACE_AVATAR: 'WorkspaceAvatar', diff --git a/src/libs/navigateAfterJoinRequest/index.desktop.ts b/src/libs/navigateAfterJoinRequest/index.desktop.ts index 47180c6a1368..cf6d009291c8 100644 --- a/src/libs/navigateAfterJoinRequest/index.desktop.ts +++ b/src/libs/navigateAfterJoinRequest/index.desktop.ts @@ -1,8 +1,12 @@ +import getIsSmallScreenWidth from '@libs/getIsSmallScreenWidth'; import Navigation from '@navigation/Navigation'; import ROUTES from '@src/ROUTES'; const navigateAfterJoinRequest = () => { Navigation.goBack(undefined, false, true); + if (getIsSmallScreenWidth()) { + Navigation.navigate(ROUTES.SETTINGS); + } Navigation.navigate(ROUTES.SETTINGS_WORKSPACES); }; export default navigateAfterJoinRequest; diff --git a/src/libs/navigateAfterJoinRequest/index.ts b/src/libs/navigateAfterJoinRequest/index.ts index b53c59d678c9..42e91d18c6ba 100644 --- a/src/libs/navigateAfterJoinRequest/index.ts +++ b/src/libs/navigateAfterJoinRequest/index.ts @@ -3,7 +3,7 @@ import ROUTES from '@src/ROUTES'; const navigateAfterJoinRequest = () => { Navigation.goBack(undefined, false, true); - Navigation.navigate(ROUTES.ALL_SETTINGS); + Navigation.navigate(ROUTES.SETTINGS); Navigation.navigate(ROUTES.SETTINGS_WORKSPACES); }; export default navigateAfterJoinRequest; diff --git a/src/libs/navigateAfterJoinRequest/index.web.ts b/src/libs/navigateAfterJoinRequest/index.web.ts index 47180c6a1368..cf6d009291c8 100644 --- a/src/libs/navigateAfterJoinRequest/index.web.ts +++ b/src/libs/navigateAfterJoinRequest/index.web.ts @@ -1,8 +1,12 @@ +import getIsSmallScreenWidth from '@libs/getIsSmallScreenWidth'; import Navigation from '@navigation/Navigation'; import ROUTES from '@src/ROUTES'; const navigateAfterJoinRequest = () => { Navigation.goBack(undefined, false, true); + if (getIsSmallScreenWidth()) { + Navigation.navigate(ROUTES.SETTINGS); + } Navigation.navigate(ROUTES.SETTINGS_WORKSPACES); }; export default navigateAfterJoinRequest;