diff --git a/packages/ui/v2/core/layouts/SettingsLayout.tsx b/packages/ui/v2/core/layouts/SettingsLayout.tsx index 53ff1a5d7c..84c06b50f4 100644 --- a/packages/ui/v2/core/layouts/SettingsLayout.tsx +++ b/packages/ui/v2/core/layouts/SettingsLayout.tsx @@ -102,6 +102,7 @@ const useTabs = () => { const SettingsSidebarContainer = ({ className = "" }) => { const { t } = useLocale(); + const router = useRouter(); const tabsWithPermissions = useTabs(); const [teamMenuState, setTeamMenuState] = useState<{ teamId: number | undefined; teamMenuOpen: boolean }[]>(); @@ -110,10 +111,19 @@ const SettingsSidebarContainer = ({ className = "" }) => { useEffect(() => { if (teams) { - const teamStates = teams?.map((team) => ({ teamId: team.id, teamMenuOpen: false })); + const teamStates = teams?.map((team) => ({ + teamId: team.id, + teamMenuOpen: String(team.id) === router.query.id, + })); setTeamMenuState(teamStates); + setTimeout(() => { + const tabMembers = Array.from(document.getElementsByTagName("a")).filter( + (bottom) => bottom.dataset.testid === "vertical-tab-Members" + )[1]; + tabMembers?.scrollIntoView({ behavior: "smooth" }); + }, 100); } - }, [teams]); + }, [router.query.id, teams]); return (