Merge branch 'main' into 'feature/admin-view'

# Conflicts:
#   client/src/components/Sidebar/Sidebar.jsx
#   client/src/constants/viewKeys.js

client/src/components/Canvas/CanvasComponents/Tooltip.jsx

@@ -3,7 +3,7 @@ import { chakra, useSlotRecipe } from "@chakra-ui/react";
 
 
 export default function Tooltip ({tooltipkey, content, sidebarIsOpen, children}) {
-  const [isVisible, setIsVisible] = useState(!sidebarIsOpen);
+  const [isVisible, setIsVisible] = useState(false);
   const recipe = useSlotRecipe({ key: "sidebar" });
   const styles = recipe();
   const timeoutId = useRef(null);
@@ -41,7 +41,7 @@ export default function Tooltip ({tooltipkey, content, sidebarIsOpen, children})
             py={1}
             borderRadius="md"
             whiteSpace="nowrap"
-            zIndex={10}
+            zIndex="overlay" // zIndex = 1300
           >
             {content}
           </chakra.div>