Merge branch 'develop' into feat/app-store-reviews

app/javascript/shared/constants/messages.js

@@ -39,12 +39,14 @@ export const ALLOWED_FILE_TYPES =
   'audio/*,' +
   'video/*,' +
   '.3gpp,' +
+  '.xls, .xlsx, .xml, .pfx,' +
   'text/csv, text/plain, application/json, application/pdf, text/rtf,' +
   'application/xml, text/xml,' +
   'application/zip, application/x-7z-compressed application/vnd.rar application/x-tar,' +
   'application/msword, application/vnd.ms-excel, application/vnd.ms-powerpoint, application/vnd.oasis.opendocument.text,' +
   'application/vnd.openxmlformats-officedocument.presentationml.presentation, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,' +
-  'application/vnd.openxmlformats-officedocument.wordprocessingml.document,';
+  'application/vnd.openxmlformats-officedocument.wordprocessingml.document,' +
+  'application/x-pkcs12, application/pkcs12,';
 
 export const CSAT_RATINGS = [
   {

app/javascript/shared/helpers/FileHelper.js

@@ -1,6 +1,5 @@
 import { getAllowedFileTypesByChannel } from '@chatwoot/utils';
 import { INBOX_TYPES } from 'dashboard/helper/inbox';
-import { ALLOWED_FILE_TYPES } from 'shared/constants/messages';
 
 export const DEFAULT_MAXIMUM_FILE_UPLOAD_SIZE = 40;
 
@@ -58,9 +57,8 @@ export const isFileTypeAllowedForChannel = (file, options = {}) => {
     isOnPrivateNote,
   } = options;
 
-  // Use broader file types for private notes (matches file picker behavior)
   const allowedFileTypes = isOnPrivateNote
-    ? ALLOWED_FILE_TYPES
+    ? getAllowedFileTypesByChannel()
     : getAllowedFileTypesByChannel({
         channelType:
           isInstagramChannel || conversationType === 'instagram_direct_message'