♻️ Add null checks

zivavu · May 11, 2024 · 8f12862 · 8f12862
1 parent 131135b
commit 8f12862
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/src/common/chatsManage/getChatLastMessage.ts b/src/common/chatsManage/getChatLastMessage.ts
@@ -2,7 +2,7 @@ import { IChat } from '@/types/chat';
 
 export default function getChatNewestMessage(chat: IChat) {
   const sortedMessages = [...chat.messages].sort(
-    (a, b) => b.createdAt.seconds - a.createdAt.seconds,
+    (a, b) => b.createdAt?.seconds - a.createdAt?.seconds,
   );
   return sortedMessages[0];
 }
diff --git a/src/common/misc/photoManagment/getPicturesSortedByDate.ts b/src/common/misc/photoManagment/getPicturesSortedByDate.ts
@@ -9,6 +9,6 @@ export default function getPicturesSortedByDate({ picturesMap, type }: IGetPictu
   return picturesMap
     ? Object.values(picturesMap[type])
         .filter((picture) => !!picture.createdAt)
-        .sort((a, b) => b.createdAt.seconds - a.createdAt.seconds)
+        .sort((a, b) => b.createdAt?.seconds - a.createdAt?.seconds)
     : [];
 }
diff --git a/src/components/molecules/Comments/Comment/index.tsx b/src/components/molecules/Comments/Comment/index.tsx
@@ -123,7 +123,7 @@ export default function Comment({
           </InteractButton>
 
           <Typography variant='body2' color={theme.palette.text.secondary}>
-            {getShortDate(comment.createdAt.seconds)}
+            {getShortDate(comment.createdAt?.seconds)}
           </Typography>
         </Stack>
       </StyledRoot>

diff --git a/src/components/molecules/Comments/index.tsx b/src/components/molecules/Comments/index.tsx
@@ -24,7 +24,7 @@ export default function Comments({
 
   const sortedComments = Object.values(comments || {})
     .filter((picture) => !!picture.createdAt)
-    .sort((a, b) => b.createdAt.seconds - a.createdAt.seconds);
+    .sort((a, b) => b.createdAt?.seconds - a.createdAt?.seconds);
 
   const commentsToRender = onlyUniqueUsers
     ? sortedComments.filter((comment, i, self) => {

diff --git a/src/components/molecules/ElementOwnerInfoDisplay/index.tsx b/src/components/molecules/ElementOwnerInfoDisplay/index.tsx
@@ -64,7 +64,7 @@ export default function ElementOwnerInfoDisplay({
             lineHeight='1rem'
           />
           <Typography variant='body2' color={theme.palette.text.secondary}>
-            {getShortDate(createdAt.seconds, 'week')}
+            {getShortDate(createdAt?.seconds, 'week')}
           </Typography>
         </Stack>
         {loggedUser?.id === element.ownerId && (

diff --git a/src/components/organisms/ChatsListPopper/ListUserButton/index.tsx b/src/components/organisms/ChatsListPopper/ListUserButton/index.tsx
@@ -23,7 +23,7 @@ export default function ListUserButton({
   const lastMessage = getChatNewestMessage(chat);
   const handleChatOpen = useHandleOpenChat(friendId);
 
-  const { largestDiff } = getDateDiffs(lastMessage.createdAt.seconds);
+  const { largestDiff } = getDateDiffs(lastMessage.createdAt?.seconds);
   return (
     <StyledRoot
       sx={sx}

diff --git a/src/components/organisms/ChatsListPopper/index.tsx b/src/components/organisms/ChatsListPopper/index.tsx
@@ -27,7 +27,7 @@ export default function ChatsListPopper({
     loggedUserChats &&
     [...loggedUserChats].sort(
       (a, b) =>
-        getChatNewestMessage(b).createdAt.seconds - getChatNewestMessage(a).createdAt.seconds,
+        getChatNewestMessage(b).createdAt?.seconds - getChatNewestMessage(a).createdAt?.seconds,
     );
 
   if (!open) return null;