add

reedoooo · Apr 9, 2024 · 1ca3d69 · 1ca3d69
1 parent 6c16f63
commit 1ca3d69
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/src/layout/collection/SelectCollectionHeader.jsx b/src/layout/collection/SelectCollectionHeader.jsx
@@ -34,7 +34,7 @@ const SelectCollectionHeader = ({ openNewDialog }) => {
       <FlexContainer>
         <SimpleSectionHeader
           sectionName="Collection Portfolio"
-          userName={user?.userBasicData?.firstName}
+          userName={user?.username}
           sectionDescription="Last updated:"
           lastUpdated={new Date().toLocaleDateString('en-US', {
             year: 'numeric',

diff --git a/src/pages/CollectionPage.js b/src/pages/CollectionPage.js
@@ -8,11 +8,19 @@ import PageLayout from '../layout/REUSABLE_COMPONENTS/PageLayout';
 import useSelectedCollection from '../context/MAIN_CONTEXT/CollectionContext/useSelectedCollection';
 import useCollectionManager from '../context/MAIN_CONTEXT/CollectionContext/useCollectionManager';
 import { useLoading } from '../context/hooks/useLoading';
+import LoadingOverlay from '../layout/REUSABLE_COMPONENTS/system-utils/LoadingOverlay';
 
 const CollectionPage = () => {
-  const { selectedCollection, allCollections, resetCollection } =
-    useSelectedCollection();
-  const { fetchCollections, hasFetchedCollections } = useCollectionManager();
+  const selectionData = useSelectedCollection();
+  if (!selectionData) {
+    return <LoadingOverlay />;
+  }
+  const { selectedCollection, allCollections, resetCollection } = selectionData;
+  const collectionData = useCollectionManager();
+  if (!collectionData) {
+    return <LoadingOverlay />;
+  }
+  const { fetchCollections, hasFetchedCollections } = collectionData;
 
   const { returnDisplay, isModalOpen, modalContent, closeModal } =
     useLoadingAndModal();