Skip to content
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

Jump to bottom

fix(Settings): navigation fix #143

Merged
merged 1 commit into from
Oct 27, 2023
Merged

fix(Settings): navigation fix #143

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
4 changes: 2 additions & 2 deletions client/src/components/navigation/UserDropdown.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ const UserDropdown: React.FC<UserDropdownProps> = ({
{showAvatar && <Image src={`${user.avatar}`} avatar />}
<Dropdown text={user.firstName + " " + user.lastName}>
<Dropdown.Menu direction="left">
<Dropdown.Item as={Link} to="/account">
<Dropdown.Item as={Link} to="/account/overview">
<Icon name="settings" />
Settings
</Dropdown.Item>
Expand All @@ -45,7 +45,7 @@ const UserDropdown: React.FC<UserDropdownProps> = ({

return (
<Menu.Menu className="!mt-2 !pl-0">
<Menu.Item as={Link} to="/account">
<Menu.Item as={Link} to="/account/overview">
<Icon name="settings" />
Settings
</Menu.Item>
Expand Down
9 changes: 0 additions & 9 deletions client/src/screens/conductor/AccountSettings/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,15 +60,6 @@ const AccountSettings = () => {
setLoading(false);
}, [setAccount, setLoading, handleGlobalError]);

/**
* Activate the default pane if one is not yet active.
*/
useEffect(() => {
if (!activePane) {
history.push(`/account/${DEFAULT_ACTIVE_PANE}`);
}
}, [activePane, history]);

/**
* Set the page title and gather data from the server on load.
*/
Expand Down