Merge pull request #1000 from GetStream/develop

Next Release

Author: vishalnarkhede

package/src/components/Attachment/Attachment.tsx

@@ -84,10 +84,10 @@ const AttachmentWithContext = <
     return <FileAttachment attachment={attachment} />;
   }
 
-  if (attachment.type === 'video' && attachment.asset_url && attachment.image_url) {
+  if (attachment.type === 'video' && attachment.asset_url) {
     return (
       // TODO: Put in video component
-      <Card {...attachment} />
+      <FileAttachment attachment={attachment} />
     );
   }
 

package/src/components/Message/Message.tsx

@@ -468,7 +468,7 @@ const MessageWithContext = <
     !message.deleted_at && Array.isArray(message.attachments)
       ? message.attachments.reduce(
           (acc, cur) => {
-            if (cur.type === 'file') {
+            if (cur.type === 'file' || cur.type === 'video') {
               acc.files.push(cur);
               acc.other = []; // remove other attachments if a file exists
             } else if (cur.type === 'image' && !cur.title_link && !cur.og_scrape_url) {