From eac73b211d9f8f54b71d6ddc087fbbb700375115 Mon Sep 17 00:00:00 2001
From: Bernhard Owen Josephus <bernhard.josephus@gmail.com>
Date: Tue, 23 Jul 2024 21:55:24 +0800
Subject: [PATCH 1/2] replaces old setting route with the new setting route

---
 src/ROUTES.ts                              | 2 --
 src/SCREENS.ts                             | 1 -
 src/libs/navigateAfterJoinRequest/index.ts | 2 +-
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/ROUTES.ts b/src/ROUTES.ts
index ae7781318c52..ee8b42a9f9c1 100644
--- a/src/ROUTES.ts
+++ b/src/ROUTES.ts
@@ -34,8 +34,6 @@ const ROUTES = {
     // This route renders the list of reports.
     HOME: 'home',
 
-    ALL_SETTINGS: 'all-settings',
-
     SEARCH_CENTRAL_PANE: {
         route: '/search/:query',
         getRoute: (searchQuery: SearchQuery, queryParams?: AuthScreensParamList['Search_Central_Pane']) => {
diff --git a/src/SCREENS.ts b/src/SCREENS.ts
index d7d56089876d..9bcb980c975c 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.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;

From 02da16c851eef6af4c4d1f2d3f142d8d5408b382 Mon Sep 17 00:00:00 2001
From: Bernhard Owen Josephus <bernhard.josephus@gmail.com>
Date: Mon, 29 Jul 2024 21:14:38 +0800
Subject: [PATCH 2/2] navigate to setting on small screen

---
 src/libs/navigateAfterJoinRequest/index.desktop.ts | 4 ++++
 src/libs/navigateAfterJoinRequest/index.web.ts     | 4 ++++
 2 files changed, 8 insertions(+)

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.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;