Skip to content

OBLS-602 User should be able to perform certain actions from the Choose Location screen #449

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
adambalcerzak wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

OBLS-602 User should be able to perform certain actions from the Choose Location screen #449

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 19 additions & 15 deletions src/components/OptionMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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={() => {
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/screens/TopBar/RightHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}>
Expand Down