From d76244fe7103b2f90c90c791229ab33b2c484f40 Mon Sep 17 00:00:00 2001
From: adambalcerzak <abalcerzak@soldevelo.com>
Date: Wed, 9 Sep 2026 15:31:22 +0200
Subject: [PATCH] OBLS-602 User should be able to perform certain actions from
 the Choose Location screen show actions except Dashboard and Change location

---
 src/components/OptionMenu.tsx      | 34 +++++++++++++++++-------------
 src/screens/TopBar/RightHeader.tsx |  2 +-
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/src/components/OptionMenu.tsx b/src/components/OptionMenu.tsx
index 74bfc08f..74a9bf40 100644
--- a/src/components/OptionMenu.tsx
+++ b/src/components/OptionMenu.tsx
@@ -24,13 +24,15 @@ const OptionMenu = ({ route, navigation }: any) => {
           }
           onDismiss={closeMenu}
         >
-          <Menu.Item
-            title="Dashboard"
-            onPress={() => {
-              navigation.navigate('Dashboard');
-              closeMenu();
-            }}
-          />
+          {route.name !== 'Choose Location' && (
+            <Menu.Item
+              title="Dashboard"
+              onPress={() => {
+                navigation.navigate('Dashboard');
+                closeMenu();
+              }}
+            />
+          )}
           <Menu.Item
             title="User detail"
             onPress={() => {
@@ -46,14 +48,16 @@ const OptionMenu = ({ route, navigation }: any) => {
               closeMenu();
             }}
           />
-          <Menu.Item
-            style={styles.menuItem}
-            title="Change location"
-            onPress={() => {
-              navigation.navigate('Choose Location');
-              closeMenu();
-            }}
-          />
+          {route.name !== 'Choose Location' && (
+            <Menu.Item
+              style={styles.menuItem}
+              title="Change location"
+              onPress={() => {
+                navigation.navigate('Choose Location');
+                closeMenu();
+              }}
+            />
+          )}
           <Menu.Item
             style={styles.menuItem}
             title="App info / version"
diff --git a/src/screens/TopBar/RightHeader.tsx b/src/screens/TopBar/RightHeader.tsx
index 0a1c75af..389d0f79 100644
--- a/src/screens/TopBar/RightHeader.tsx
+++ b/src/screens/TopBar/RightHeader.tsx
@@ -12,7 +12,7 @@ interface HeaderRightProps {
 
 const HeaderRight = ({ route, navigation }: HeaderRightProps) => {
   const currentLocation = useSelector((state: RootState) => state.mainReducer.currentLocation);
-  const screensToHideMenu = ["Dashboard", "Choose Location"];
+  const screensToHideMenu = ["Dashboard"];
 
   return (
     <View style={styles.container}>