diff --git a/packages/webapp/components/layouts/AccountLayout/SidebarNav.tsx b/packages/webapp/components/layouts/AccountLayout/SidebarNav.tsx
index 1dfac0c0c6..eb8cf72582 100644
--- a/packages/webapp/components/layouts/AccountLayout/SidebarNav.tsx
+++ b/packages/webapp/components/layouts/AccountLayout/SidebarNav.tsx
@@ -1,20 +1,15 @@
import type { ReactElement } from 'react';
-import React, { useCallback, useContext, useEffect, useMemo } from 'react';
+import React, { useCallback, useEffect } from 'react';
import { useQuery, useQueryClient } from '@tanstack/react-query';
import classNames from 'classnames';
-import AuthContext from '@dailydotdev/shared/src/contexts/AuthContext';
+import { useAuthContext } from '@dailydotdev/shared/src/contexts/AuthContext';
import CloseButton from '@dailydotdev/shared/src/components/CloseButton';
import { disabledRefetch } from '@dailydotdev/shared/src/lib/func';
import { useRouter } from 'next/router';
import { isTouchDevice } from '@dailydotdev/shared/src/lib/tooltip';
-import Link from '@dailydotdev/shared/src/components/utilities/Link';
import SidebarNavItem from './SidebarNavItem';
-import {
- AccountPage,
- accountPage,
- accountSidebarPages,
- AccountSidebarPagesSection,
-} from './common';
+import type { AccountPage } from './common';
+import { accountPage } from './common';
interface SidebarNavProps {
className?: string;
@@ -38,19 +33,7 @@ function SidebarNav({
queryFn: () => false,
...disabledRefetch,
});
- const { user, isGdprCovered } = useContext(AuthContext);
-
- const keys = useMemo(
- () =>
- pageKeys.filter((key) => {
- if (key === AccountPage.Privacy) {
- return isGdprCovered;
- }
-
- return true;
- }),
- [isGdprCovered],
- );
+ const { user } = useAuthContext();
useEffect(() => {
if (!isTouchDevice()) {
@@ -84,7 +67,7 @@ function SidebarNav({