rm isSwrDataLoading

packages/app/src/components/Sidebar.tsx

@@ -27,23 +27,14 @@ const sidebarMinWidth = 240;
 const sidebarMinimizeWidth = 20;
 const sidebarFixedWidthInDrawerMode = 320;
 
-const isSwrDataLoading = (swrData: any, swrError: Error | undefined) => {
-  return swrError == null && swrData === undefined;
-};
-
 const GlobalNavigation = () => {
   const SidebarNav = dynamic(() => import('./Sidebar/SidebarNav').then(mod => mod.SidebarNav), { ssr: false });
-  const { data: isDrawerMode, error: errorIsDrawerMode } = useDrawerMode();
-  const { data: currentContents, error: errorCurrentContents } = useCurrentSidebarContents();
-  const { data: isCollapsed, error: errorIsCollapsed, mutate: mutateSidebarCollapsed } = useSidebarCollapsed();
+  const { data: isDrawerMode } = useDrawerMode();
+  const { data: currentContents } = useCurrentSidebarContents();
+  const { data: isCollapsed, mutate: mutateSidebarCollapsed } = useSidebarCollapsed();
 
   const { scheduleToPut } = useUserUISettings();
 
-  const isLoadingIsDrawerMode = isSwrDataLoading(isDrawerMode, errorIsDrawerMode);
-  const isLoadingCurrentContents = isSwrDataLoading(currentContents, errorCurrentContents);
-  const isLoadingIsCollapsed = isSwrDataLoading(isCollapsed, errorIsCollapsed);
-  const isLoading = isLoadingIsDrawerMode || isLoadingCurrentContents || isLoadingIsCollapsed;
-
   const itemSelectedHandler = useCallback((selectedContents) => {
     if (isDrawerMode) {
       return;
@@ -62,10 +53,7 @@ const GlobalNavigation = () => {
 
   }, [currentContents, isCollapsed, isDrawerMode, mutateSidebarCollapsed, scheduleToPut]);
 
-
-  return isLoading
-    ? <SidebarNavSkeleton/>
-    : <SidebarNav onItemSelected={itemSelectedHandler} />;
+  return <SidebarNav onItemSelected={itemSelectedHandler} />;
 
 };