chore: update how we use swr

consolelabs · Jan 16, 2023 · 919fbc0 · 919fbc0
1 parent 5e07018
commit 919fbc0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/contexts/game.tsx b/contexts/game.tsx
@@ -36,7 +36,7 @@ const GameContextProvider = ({ children }: PropsWithChildren) => {
 
   const {
     data,
-    loading: isLoadingGameState,
+    isLoading: isLoadingGameState,
     mutate: mutateGameState,
   } = useFetchWithCache(
     [GET_PATHS.gameDetail(gameId)],

diff --git a/hooks/useFetchWithCache.ts b/hooks/useFetchWithCache.ts
@@ -6,17 +6,20 @@ export function useFetchWithCache<Data = any, Error = any>(
   fn: Fetcher<Data> | null = null,
   config?: SWRConfiguration<Data, Error>
 ) {
-  const { data, error, ...rest } = useSWR<Data, Error>(key, fn, config);
+  const { data, error, isLoading, ...rest } = useSWR<Data, Error>(
+    key,
+    fn,
+    config
+  );
   const [internalData, setInternalData] = useState<Data>();
 
   const isFirstLoading = !internalData && !error;
-  const loading = !data && !error;
 
   useEffect(() => {
     if (data) {
       setInternalData(data);
     }
   }, [data]);
 
-  return { data: internalData, isFirstLoading, loading, error, ...rest };
+  return { data: internalData, isFirstLoading, isLoading, error, ...rest };
 }