improvements

CruGlobal · Jan 16, 2025 · b3d4928 · b3d4928
1 parent bdbe0e4
commit b3d4928
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 19 deletions.
diff --git a/src/components/Coaching/CoachingList.tsx b/src/components/Coaching/CoachingList.tsx
@@ -7,9 +7,11 @@ import { useFetchAllPages } from 'src/hooks/useFetchAllPages';
 import { CoachingRow, CoachingRowWrapper } from './CoachingRow/CoachingRow';
 import { useLoadCoachingListQuery } from './LoadCoachingList.generated';
 
-interface CoachingListProps {
-  accountListId: string;
-}
+const LoadingCoach: React.FC = () => (
+  <CoachingRowWrapper>
+    <CoachingLoading role="listitem" />
+  </CoachingRowWrapper>
+);
 
 const CoachingListWrapper = styled(Box)(({ theme }) => ({
   width: '100%',
@@ -36,6 +38,9 @@ const CoachingLoading = styled(Skeleton)(() => ({
   height: '100px',
 }));
 
+interface CoachingListProps {
+  accountListId: string;
+}
 export const CoachingList: React.FC<CoachingListProps> = ({
   accountListId,
 }) => {
@@ -45,7 +50,7 @@ export const CoachingList: React.FC<CoachingListProps> = ({
 
   const coachingAccounts = data?.coachingAccountLists;
 
-  const { loading } = useFetchAllPages({
+  useFetchAllPages({
     fetchMore,
     error,
     pageInfo: coachingAccounts?.pageInfo,
@@ -61,7 +66,7 @@ export const CoachingList: React.FC<CoachingListProps> = ({
       </CoachingTitleWrapper>
       <Divider />
       <Box>
-        {loading ? (
+        {!data && !error ? (
           <>
             <LoadingCoach />
             <LoadingCoach />
@@ -84,11 +89,3 @@ export const CoachingList: React.FC<CoachingListProps> = ({
     </CoachingListWrapper>
   );
 };
-
-const LoadingCoach: React.FC = () => (
-  <span>
-    <CoachingRowWrapper>
-      <CoachingLoading role="listitem" />
-    </CoachingRowWrapper>
-  </span>
-);
diff --git a/src/lib/apollo/cache.ts b/src/lib/apollo/cache.ts
@@ -42,12 +42,6 @@ export const createCache = () =>
         },
         merge: true,
       },
-      CoachingAccountLists: {
-        fields: {
-          contacts: paginationFieldPolicy,
-        },
-        merge: true,
-      },
       // For Options, use the key as the unique id to make it easier to find them in the cache
       Option: { keyFields: ['key'] },
       User: { merge: true },