From 97ca7fe6aaecbba7ec4bd02d0d6f29bdf26132c8 Mon Sep 17 00:00:00 2001 From: ayesha waris <73840786+ayesha-waris@users.noreply.github.com> Date: Thu, 13 Jul 2023 15:30:16 +0500 Subject: [PATCH] fix: sidebar state remains open for all users (#1139) --- .../course/sidebar/SidebarContextProvider.jsx | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/courseware/course/sidebar/SidebarContextProvider.jsx b/src/courseware/course/sidebar/SidebarContextProvider.jsx index 87d470c9..b61c577b 100644 --- a/src/courseware/course/sidebar/SidebarContextProvider.jsx +++ b/src/courseware/course/sidebar/SidebarContextProvider.jsx @@ -5,7 +5,6 @@ import React, { } from 'react'; import { getLocalStorage, setLocalStorage } from '../../../data/localStorage'; -import { useModel } from '../../../generic/model-store'; import SidebarContext from './SidebarContext'; import { SIDEBARS } from './sidebars'; @@ -14,24 +13,18 @@ const SidebarProvider = ({ unitId, children, }) => { - const { verifiedMode } = useModel('courseHomeMeta', courseId); const shouldDisplayFullScreen = useWindowSize().width < breakpoints.large.minWidth; const shouldDisplaySidebarOpen = useWindowSize().width > breakpoints.medium.minWidth; const query = new URLSearchParams(window.location.search); - const initialSidebar = ((verifiedMode && shouldDisplaySidebarOpen) || query.get('sidebar') === 'true') - ? SIDEBARS.DISCUSSIONS.ID - : null; + const initialSidebar = (shouldDisplaySidebarOpen || query.get('sidebar') === 'true') ? SIDEBARS.DISCUSSIONS.ID : null; const [currentSidebar, setCurrentSidebar] = useState(initialSidebar); const [notificationStatus, setNotificationStatus] = useState(getLocalStorage(`notificationStatus.${courseId}`)); const [upgradeNotificationCurrentState, setUpgradeNotificationCurrentState] = useState(getLocalStorage(`upgradeNotificationCurrentState.${courseId}`)); useEffect(() => { - // As a one-off set initial sidebar if the verified mode data has just loaded - if (verifiedMode) { - setCurrentSidebar(SIDEBARS.DISCUSSIONS.ID); - } + setCurrentSidebar(SIDEBARS.DISCUSSIONS.ID); // eslint-disable-next-line react-hooks/exhaustive-deps - }, [verifiedMode, unitId]); + }, [unitId]); const onNotificationSeen = useCallback(() => { setNotificationStatus('inactive');