fix(client): handle messages with deleted files

danny-avila · Jan 10, 2024 · fa36f95 · fa36f95
1 parent 0908b77
commit fa36f95
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/client/src/components/Chat/Messages/Content/MessageContent.tsx b/client/src/components/Chat/Messages/Content/MessageContent.tsx
@@ -30,7 +30,7 @@ const ErrorMessage = ({ text }: TText) => {
 // Display Message Component
 const DisplayMessage = ({ text, isCreatedByUser, message, showCursor }: TDisplayProps) => {
   const imageFiles = message?.files
-    ? message.files.filter((file) => file.type.startsWith('image/'))
+    ? message.files.filter((file) => file.type && file.type.startsWith('image/'))
     : null;
   return (
     <Container>

diff --git a/client/src/utils/buildTree.ts b/client/src/utils/buildTree.ts
@@ -30,7 +30,9 @@ export default function buildTree({
       messageMap[message.messageId] = { ...message, children: [] };
 
       if (message.files && fileMap) {
-        messageMap[message.messageId].files = message.files.map(({ file_id }) => fileMap[file_id]);
+        messageMap[message.messageId].files = message.files.map(
+          (file) => fileMap[file.file_id] ?? file,
+        );
       }
 
       const parentMessage = messageMap[message.parentMessageId ?? ''];