From 31d3fd730c41fe0c8db4670a0e37282a204d5899 Mon Sep 17 00:00:00 2001
From: Richard Wei <54336863+WaysonWei@users.noreply.github.com>
Date: Thu, 4 Aug 2022 09:23:38 +1200
Subject: [PATCH] fix(ui): fix users teams missing from menu for teamlead
 EE-3761 (#7381)

* fix users & teams missing from menu for teamlead
---
 app/react/sidebar/SettingsSidebar.tsx | 5 +++--
 app/react/sidebar/Sidebar.tsx         | 6 ++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/react/sidebar/SettingsSidebar.tsx b/app/react/sidebar/SettingsSidebar.tsx
index 9a51b44bc..58608cff6 100644
--- a/app/react/sidebar/SettingsSidebar.tsx
+++ b/app/react/sidebar/SettingsSidebar.tsx
@@ -14,15 +14,16 @@ import { SidebarSection } from './SidebarSection';
 
 interface Props {
   isAdmin: boolean;
+  isTeamLeader?: boolean;
 }
 
-export function SettingsSidebar({ isAdmin }: Props) {
+export function SettingsSidebar({ isAdmin, isTeamLeader }: Props) {
   const teamSyncQuery = usePublicSettings<boolean>({
     select: (settings) => settings.TeamSync,
   });
 
   const showUsersSection =
-    !window.ddExtension && (isAdmin || teamSyncQuery.data);
+    !window.ddExtension && (isAdmin || (isTeamLeader && !teamSyncQuery.data));
 
   return (
     <SidebarSection title="Settings">
diff --git a/app/react/sidebar/Sidebar.tsx b/app/react/sidebar/Sidebar.tsx
index 3902c83d6..ddee15394 100644
--- a/app/react/sidebar/Sidebar.tsx
+++ b/app/react/sidebar/Sidebar.tsx
@@ -16,7 +16,7 @@ import { SidebarProvider } from './useSidebarState';
 
 export function Sidebar() {
   const { isAdmin, user } = useUser();
-  const isTeamLeader = useIsTeamLeader(user);
+  const isTeamLeader = useIsTeamLeader(user) as boolean;
 
   const settingsQuery = usePublicSettings();
 
@@ -52,7 +52,9 @@ export function Sidebar() {
 
             {isAdmin && EnableEdgeComputeFeatures && <EdgeComputeSidebar />}
 
-            {(isAdmin || isTeamLeader) && <SettingsSidebar isAdmin={isAdmin} />}
+            {(isAdmin || isTeamLeader) && (
+              <SettingsSidebar isAdmin={isAdmin} isTeamLeader={isTeamLeader} />
+            )}
           </ul>
         </div>