Merge remote-tracking branch 'origin/develop' into setttingssync

src/components/status_body/status_body.js

@@ -4,8 +4,6 @@ import RichContent from 'src/components/rich_content/rich_content.jsx'
 
 import { useSyncConfigStore } from 'src/stores/sync_config.js'
 
-import fileType from 'src/services/file_type/file_type.service'
-
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
   faFile,
@@ -106,7 +104,7 @@ const StatusBody = {
     },
     attachmentTypes() {
       return this.status.attachments.map((file) =>
-        fileType.fileType(file.mimetype),
+        file.type,
       )
     },
     collapsedStatus() {