chore(merge): fixed merge issues

equinor · Oct 12, 2023 · 0456139 · 0456139
1 parent 164e837
commit 0456139
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 83 deletions.
diff --git a/src/hooks/useAnalogueModels.tsx b/src/hooks/useAnalogueModels.tsx
diff --git a/src/pages/ModelPages/Model/Model.tsx b/src/pages/ModelPages/Model/Model.tsx
@@ -8,12 +8,12 @@ import { AnalogueModelsService } from '../../../api/generated';
 export const Model = () => {
   const { id } = useParams<{ id: string }>();
 
-  const { data } = useQuery({
+  const { data, isLoading } = useQuery({
     queryKey: ['analogue-models', id],
     queryFn: () => AnalogueModelsService.getApiAnalogueModels1(id as string),
   });
 
-  if (model.isLoading) <p>Loading.....</p>;
+  if (isLoading) <p>Loading.....</p>;
 
   return (
     <>