@droppii-org/chat-mobile 0.2.16 → 0.2.17

package/lib/module/services/attachmentHandlers/videoAttachmentHandler.js

@@ -1,7 +1,7 @@
 "use strict";
 
 export class VideoAttachmentHandler {
-  static MAX_VIDEO_SIZE = 100 * 1024 * 1024; // 100MB
+  static MAX_VIDEO_SIZE = 200 * 1024 * 1024; // 200MB
   static SUPPORTED_TYPES = ['video/mp4', 'video/quicktime'];
   validate(attachment) {
     if (attachment.type !== 'video') {

package/lib/module/translation/resources/i18n.js

@@ -5,6 +5,7 @@ const i18nKey = {
   'thread_card_fallback_name': 'Người dùng',
   'chat:image_preview': 'Xem trước ảnh',
   'chat:image_too_large': 'Ảnh quá lớn. Tối đa 5MB',
+  'chat:video_too_large': 'Video quá lớn. Tối đa 200MB',
   'chat:image_sent': 'Đã gửi ảnh',
   'chat:image_upload_failed': 'Lỗi tải ảnh',
   'chat:failed_to_send_message': 'Không thể gửi tin nhắn. Thử lại?',

package/lib/module/translation/resources/i18n.js.map

@@ -1 +1 @@
-{"version":3,"names":["i18nKey","vi"],"sourceRoot":"../../../../src","sources":["translation/resources/i18n.ts"],"mappings":";;AAAA,MAAMA,OAA+B,GAAG;EACtC,0BAA0B,EAAE,gBAAgB;EAC5C,2BAA2B,EAAE,YAAY;EACzC,oBAAoB,EAAE,eAAe;EACrC,sBAAsB,EAAE,yBAAyB;EACjD,iBAAiB,EAAE,YAAY;EAC/B,0BAA0B,EAAE,aAAa;EACzC,6BAA6B,EAAE,kCAAkC;EACjE,eAAe,EAAE,SAAS;EAC1B,gBAAgB,EAAE,YAAY;EAC9B,iBAAiB,EAAE,SAAS;EAC5B,WAAW,EAAE,KAAK;EAClB,YAAY,EAAE,SAAS;EACvB,2BAA2B,EAAE,6BAA6B;EAC1D,mBAAmB,EAAE,kBAAkB;EACvC,yBAAyB,EAAE,kBAAkB;EAC7C,qBAAqB,EAAE,0BAA0B;EACjD,gBAAgB,EAAE,YAAY;EAC9B,gBAAgB,EAAE,kBAAkB;EACpC,gBAAgB,EAAE,SAAS;EAC3B,eAAe,EAAE,iBAAiB;EAClC,eAAe,EAAE,YAAY;EAC7B,iBAAiB,EAAE,qBAAqB;EACxC,OAAO,EAAE,SAAS;EAClB,SAAS,EAAE;AACb,CAAC;AAED,eAAe;EACbC,EAAE,EAAED;AACN,CAAC","ignoreList":[]}
+{"version":3,"names":["i18nKey","vi"],"sourceRoot":"../../../../src","sources":["translation/resources/i18n.ts"],"mappings":";;AAAA,MAAMA,OAA+B,GAAG;EACtC,0BAA0B,EAAE,gBAAgB;EAC5C,2BAA2B,EAAE,YAAY;EACzC,oBAAoB,EAAE,eAAe;EACrC,sBAAsB,EAAE,yBAAyB;EACjD,sBAAsB,EAAE,6BAA6B;EACrD,iBAAiB,EAAE,YAAY;EAC/B,0BAA0B,EAAE,aAAa;EACzC,6BAA6B,EAAE,kCAAkC;EACjE,eAAe,EAAE,SAAS;EAC1B,gBAAgB,EAAE,YAAY;EAC9B,iBAAiB,EAAE,SAAS;EAC5B,WAAW,EAAE,KAAK;EAClB,YAAY,EAAE,SAAS;EACvB,2BAA2B,EAAE,6BAA6B;EAC1D,mBAAmB,EAAE,kBAAkB;EACvC,yBAAyB,EAAE,kBAAkB;EAC7C,qBAAqB,EAAE,0BAA0B;EACjD,gBAAgB,EAAE,YAAY;EAC9B,gBAAgB,EAAE,kBAAkB;EACpC,gBAAgB,EAAE,SAAS;EAC3B,eAAe,EAAE,iBAAiB;EAClC,eAAe,EAAE,YAAY;EAC7B,iBAAiB,EAAE,qBAAqB;EACxC,OAAO,EAAE,SAAS;EAClB,SAAS,EAAE;AACb,CAAC;AAED,eAAe;EACbC,EAAE,EAAED;AACN,CAAC","ignoreList":[]}

package/lib/module/utils/videoThumbnail.js

@@ -1,7 +1,66 @@
 "use strict";
 
+import { Platform } from 'react-native';
 import RNFS from 'react-native-fs';
 import { createThumbnail } from 'react-native-create-thumbnail';
+/**
+ * Routes the video source so react-native-create-thumbnail picks the correct
+ * native MediaMetadataRetriever.setDataSource overload.
+ *
+ * Root cause of the Android crash: CreateThumbnailModule.getBitmapAtTime branches
+ * on the URL scheme —
+ *   - "file://..."  -> setDataSource(String)            ✅ works for local files
+ *   - "content://"  -> setDataSource(Context, Uri)
+ *   - otherwise     -> setDataSource(String, Map headers) ❌ this overload is for
+ *                      REMOTE URIs; a bare local path makes it throw an uncaught
+ *                      RuntimeException (status 0xFFFFFFEA / EINVAL) → app crash.
+ * The app strips "file://" before calling, so local videos fall into the broken
+ * branch. The fix is to KEEP the file:// scheme so the working overload is used.
+ *
+ * For Android photo-picker synthetic paths we additionally copy the file into the
+ * app cache first (a clean, app-private file the retriever can always open) and
+ * still hand it back with a file:// prefix. Returns the path to pass to
+ * createThumbnail plus a raw cleanup path for any temp copy.
+ */
+const ensureRetrievableVideoPath = async videoPath => {
+  // iOS (and any non-Android platform) is left completely untouched.
+  if (Platform.OS !== 'android') {
+    return {
+      path: videoPath,
+      cleanupPath: null
+    };
+  }
+
+  // content:// is handled by a dedicated native branch — pass through unchanged.
+  if (videoPath.startsWith('content://')) {
+    return {
+      path: videoPath,
+      cleanupPath: null
+    };
+  }
+  const rawPath = videoPath.startsWith('file://') ? videoPath.replace('file://', '') : videoPath;
+  const isSynthetic = rawPath.includes('/.transforms/') || rawPath.includes('/synthetic/');
+  if (isSynthetic) {
+    const ext = (rawPath.split('.').pop() || 'mp4').split('?')[0];
+    const dest = `${RNFS.CachesDirectoryPath}/video-thumb-src-${Date.now()}-${Math.floor(Math.random() * 1e6)}.${ext}`;
+    console.log('[VideoThumbnail] Copying picker video to cache before thumbnail', {
+      from: rawPath,
+      to: dest
+    });
+    await RNFS.copyFile(rawPath, dest);
+    return {
+      path: `file://${dest}`,
+      cleanupPath: dest
+    };
+  }
+
+  // Any other local path: ensure the file:// scheme so the native module routes
+  // to setDataSource(String) instead of the broken (String, Map) overload.
+  return {
+    path: `file://${rawPath}`,
+    cleanupPath: null
+  };
+};
 export const VideoThumbnailUtil = {
   generateThumbnail: async (videoPath, options = {}) => {
     const {
@@ -10,19 +69,28 @@ export const VideoThumbnailUtil = {
       cacheId
     } = options; // time in milliseconds
 
+    let tempSourcePath = null;
     try {
+      // Normalize the source so the native MediaMetadataRetriever can open it.
+      // Android picker paths crash the app otherwise (see ensureRetrievableVideoPath).
+      const {
+        path: retrievablePath,
+        cleanupPath
+      } = await ensureRetrievableVideoPath(videoPath);
+      tempSourcePath = cleanupPath;
+
       // Generate unique cache name per video to avoid conflicts with concurrent generations
       // Uses provided cacheId or generates one from videoPath filename
-      const fileName = videoPath.split('/').pop() || String(Date.now());
+      const fileName = retrievablePath.split('/').pop() || String(Date.now());
       const cacheName = cacheId || `thumb-${fileName.replace(/[^a-zA-Z0-9-_]/g, '')}-${Math.abs(fileName.charCodeAt(0) + fileName.charCodeAt(fileName.length - 1))}`;
       console.log('[VideoThumbnail] Generating thumbnail', {
-        videoPath,
+        videoPath: retrievablePath,
         timeMs: time,
         quality,
         cacheName
       });
       const result = await createThumbnail({
-        url: videoPath,
+        url: retrievablePath,
         timeStamp: time,
         format: 'png',
         dirSize: 100,
@@ -42,6 +110,11 @@ export const VideoThumbnailUtil = {
     } catch (error) {
       console.error('[VideoThumbnail] Failed to generate thumbnail', error);
       return null;
+    } finally {
+      // Remove the temporary video copy made for synthetic/content sources.
+      if (tempSourcePath) {
+        RNFS.unlink(tempSourcePath).catch(err => console.warn('[VideoThumbnail] Temp source cleanup failed:', err));
+      }
     }
   },
   cleanupThumbnail: async thumbnailPath => {

package/lib/module/utils/videoThumbnail.js.map

@@ -1 +1 @@
-{"version":3,"names":["RNFS","createThumbnail","VideoThumbnailUtil","generateThumbnail","videoPath","options","time","quality","cacheId","fileName","split","pop","String","Date","now","cacheName","replace","Math","abs","charCodeAt","length","console","log","timeMs","result","url","timeStamp","format","dirSize","path","width","height","error","cleanupThumbnail","thumbnailPath","unlink","err","warn","batchGenerateThumbnails","videoPaths","results","thumbnail","push"],"sourceRoot":"../../../src","sources":["utils/videoThumbnail.ts"],"mappings":";;AAAA,OAAOA,IAAI,MAAM,iBAAiB;AAClC,SAASC,eAAe,QAAQ,+BAA+B;AAc/D,OAAO,MAAMC,kBAAkB,GAAG;EAChCC,iBAAiB,EAAE,MAAAA,CACjBC,SAAiB,EACjBC,OAAyB,GAAG,CAAC,CAAC,KACM;IACpC,MAAM;MAAEC,IAAI,GAAG,GAAG;MAAEC,OAAO,GAAG,EAAE;MAAEC;IAAQ,CAAC,GAAGH,OAAO,CAAC,CAAC;;IAEvD,IAAI;MACF;MACA;MACA,MAAMI,QAAQ,GAAGL,SAAS,CAACM,KAAK,CAAC,GAAG,CAAC,CAACC,GAAG,CAAC,CAAC,IAAIC,MAAM,CAACC,IAAI,CAACC,GAAG,CAAC,CAAC,CAAC;MACjE,MAAMC,SAAS,GACbP,OAAO,IACP,SAASC,QAAQ,CAACO,OAAO,CAAC,iBAAiB,EAAE,EAAE,CAAC,IAAIC,IAAI,CAACC,GAAG,CAC1DT,QAAQ,CAACU,UAAU,CAAC,CAAC,CAAC,GAAGV,QAAQ,CAACU,UAAU,CAACV,QAAQ,CAACW,MAAM,GAAG,CAAC,CAClE,CAAC,EAAE;MAELC,OAAO,CAACC,GAAG,CAAC,uCAAuC,EAAE;QACnDlB,SAAS;QACTmB,MAAM,EAAEjB,IAAI;QACZC,OAAO;QACPQ;MACF,CAAC,CAAC;MAEF,MAAMS,MAAM,GAAG,MAAMvB,eAAe,CAAC;QACnCwB,GAAG,EAAErB,SAAS;QACdsB,SAAS,EAAEpB,IAAI;QACfqB,MAAM,EAAE,KAAK;QACbC,OAAO,EAAE,GAAG;QACZb;MACF,CAAC,CAAC;MAEFM,OAAO,CAACC,GAAG,CAAC,oCAAoC,EAAEE,MAAM,CAACK,IAAI,CAAC;MAC9DR,OAAO,CAACC,GAAG,CAAC,sCAAsC,EAAE;QAClDO,IAAI,EAAEL,MAAM,CAACK,IAAI;QACjBC,KAAK,EAAEN,MAAM,CAACM,KAAK,IAAI,CAAC;QACxBC,MAAM,EAAEP,MAAM,CAACO,MAAM,IAAI;MAC3B,CAAC,CAAC;MAEF,OAAO;QACLF,IAAI,EAAEL,MAAM,CAACK,IAAI;QACjBC,KAAK,EAAEN,MAAM,CAACM,KAAK,IAAI,CAAC;QACxBC,MAAM,EAAEP,MAAM,CAACO,MAAM,IAAI;MAC3B,CAAC;IACH,CAAC,CAAC,OAAOC,KAAK,EAAE;MACdX,OAAO,CAACW,KAAK,CAAC,+CAA+C,EAAEA,KAAK,CAAC;MACrE,OAAO,IAAI;IACb;EACF,CAAC;EAEDC,gBAAgB,EAAE,MAAOC,aAAqB,IAAoB;IAChE,IAAI;MACF,IAAI,CAACA,aAAa,EAAE;MACpB,MAAMlC,IAAI,CAACmC,MAAM,CAACD,aAAa,CAAC;MAChCb,OAAO,CAACC,GAAG,CAAC,8BAA8B,EAAEY,aAAa,CAAC;IAC5D,CAAC,CAAC,OAAOE,GAAG,EAAE;MACZf,OAAO,CAACgB,IAAI,CAAC,kCAAkC,EAAED,GAAG,CAAC;IACvD;EACF,CAAC;EAEDE,uBAAuB,EAAE,MAAAA,CACvBC,UAAoB,EACpBlC,OAAyB,GAAG,CAAC,CAAC,KACC;IAC/B,MAAMmC,OAA0B,GAAG,EAAE;IAErC,KAAK,MAAMpC,SAAS,IAAImC,UAAU,EAAE;MAClC,MAAME,SAAS,GAAG,MAAMvC,kBAAkB,CAACC,iBAAiB,CAC1DC,SAAS,EACTC,OACF,CAAC;MACD,IAAIoC,SAAS,EAAE;QACbD,OAAO,CAACE,IAAI,CAACD,SAAS,CAAC;MACzB;IACF;IAEA,OAAOD,OAAO;EAChB;AACF,CAAC;AAED,eAAetC,kBAAkB","ignoreList":[]}
+{"version":3,"names":["Platform","RNFS","createThumbnail","ensureRetrievableVideoPath","videoPath","OS","path","cleanupPath","startsWith","rawPath","replace","isSynthetic","includes","ext","split","pop","dest","CachesDirectoryPath","Date","now","Math","floor","random","console","log","from","to","copyFile","VideoThumbnailUtil","generateThumbnail","options","time","quality","cacheId","tempSourcePath","retrievablePath","fileName","String","cacheName","abs","charCodeAt","length","timeMs","result","url","timeStamp","format","dirSize","width","height","error","unlink","catch","err","warn","cleanupThumbnail","thumbnailPath","batchGenerateThumbnails","videoPaths","results","thumbnail","push"],"sourceRoot":"../../../src","sources":["utils/videoThumbnail.ts"],"mappings":";;AAAA,SAASA,QAAQ,QAAQ,cAAc;AACvC,OAAOC,IAAI,MAAM,iBAAiB;AAClC,SAASC,eAAe,QAAQ,+BAA+B;AAc/D;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,MAAMC,0BAA0B,GAAG,MACjCC,SAAiB,IACyC;EAC1D;EACA,IAAIJ,QAAQ,CAACK,EAAE,KAAK,SAAS,EAAE;IAC7B,OAAO;MAAEC,IAAI,EAAEF,SAAS;MAAEG,WAAW,EAAE;IAAK,CAAC;EAC/C;;EAEA;EACA,IAAIH,SAAS,CAACI,UAAU,CAAC,YAAY,CAAC,EAAE;IACtC,OAAO;MAAEF,IAAI,EAAEF,SAAS;MAAEG,WAAW,EAAE;IAAK,CAAC;EAC/C;EAEA,MAAME,OAAO,GAAGL,SAAS,CAACI,UAAU,CAAC,SAAS,CAAC,GAC3CJ,SAAS,CAACM,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,GAChCN,SAAS;EAEb,MAAMO,WAAW,GACfF,OAAO,CAACG,QAAQ,CAAC,eAAe,CAAC,IAAIH,OAAO,CAACG,QAAQ,CAAC,aAAa,CAAC;EAEtE,IAAID,WAAW,EAAE;IACf,MAAME,GAAG,GAAG,CAACJ,OAAO,CAACK,KAAK,CAAC,GAAG,CAAC,CAACC,GAAG,CAAC,CAAC,IAAI,KAAK,EAAED,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAC7D,MAAME,IAAI,GAAG,GAAGf,IAAI,CAACgB,mBAAmB,oBAAoBC,IAAI,CAACC,GAAG,CAAC,CAAC,IAAIC,IAAI,CAACC,KAAK,CAClFD,IAAI,CAACE,MAAM,CAAC,CAAC,GAAG,GAClB,CAAC,IAAIT,GAAG,EAAE;IAEVU,OAAO,CAACC,GAAG,CACT,iEAAiE,EACjE;MAAEC,IAAI,EAAEhB,OAAO;MAAEiB,EAAE,EAAEV;IAAK,CAC5B,CAAC;IACD,MAAMf,IAAI,CAAC0B,QAAQ,CAAClB,OAAO,EAAEO,IAAI,CAAC;IAClC,OAAO;MAAEV,IAAI,EAAE,UAAUU,IAAI,EAAE;MAAET,WAAW,EAAES;IAAK,CAAC;EACtD;;EAEA;EACA;EACA,OAAO;IAAEV,IAAI,EAAE,UAAUG,OAAO,EAAE;IAAEF,WAAW,EAAE;EAAK,CAAC;AACzD,CAAC;AAED,OAAO,MAAMqB,kBAAkB,GAAG;EAChCC,iBAAiB,EAAE,MAAAA,CACjBzB,SAAiB,EACjB0B,OAAyB,GAAG,CAAC,CAAC,KACM;IACpC,MAAM;MAAEC,IAAI,GAAG,GAAG;MAAEC,OAAO,GAAG,EAAE;MAAEC;IAAQ,CAAC,GAAGH,OAAO,CAAC,CAAC;;IAEvD,IAAII,cAA6B,GAAG,IAAI;IAExC,IAAI;MACF;MACA;MACA,MAAM;QAAE5B,IAAI,EAAE6B,eAAe;QAAE5B;MAAY,CAAC,GAC1C,MAAMJ,0BAA0B,CAACC,SAAS,CAAC;MAC7C8B,cAAc,GAAG3B,WAAW;;MAE5B;MACA;MACA,MAAM6B,QAAQ,GAAGD,eAAe,CAACrB,KAAK,CAAC,GAAG,CAAC,CAACC,GAAG,CAAC,CAAC,IAAIsB,MAAM,CAACnB,IAAI,CAACC,GAAG,CAAC,CAAC,CAAC;MACvE,MAAMmB,SAAS,GACbL,OAAO,IACP,SAASG,QAAQ,CAAC1B,OAAO,CAAC,iBAAiB,EAAE,EAAE,CAAC,IAAIU,IAAI,CAACmB,GAAG,CAC1DH,QAAQ,CAACI,UAAU,CAAC,CAAC,CAAC,GAAGJ,QAAQ,CAACI,UAAU,CAACJ,QAAQ,CAACK,MAAM,GAAG,CAAC,CAClE,CAAC,EAAE;MAELlB,OAAO,CAACC,GAAG,CAAC,uCAAuC,EAAE;QACnDpB,SAAS,EAAE+B,eAAe;QAC1BO,MAAM,EAAEX,IAAI;QACZC,OAAO;QACPM;MACF,CAAC,CAAC;MAEF,MAAMK,MAAM,GAAG,MAAMzC,eAAe,CAAC;QACnC0C,GAAG,EAAET,eAAe;QACpBU,SAAS,EAAEd,IAAI;QACfe,MAAM,EAAE,KAAK;QACbC,OAAO,EAAE,GAAG;QACZT;MACF,CAAC,CAAC;MAEFf,OAAO,CAACC,GAAG,CAAC,oCAAoC,EAAEmB,MAAM,CAACrC,IAAI,CAAC;MAC9DiB,OAAO,CAACC,GAAG,CAAC,sCAAsC,EAAE;QAClDlB,IAAI,EAAEqC,MAAM,CAACrC,IAAI;QACjB0C,KAAK,EAAEL,MAAM,CAACK,KAAK,IAAI,CAAC;QACxBC,MAAM,EAAEN,MAAM,CAACM,MAAM,IAAI;MAC3B,CAAC,CAAC;MAEF,OAAO;QACL3C,IAAI,EAAEqC,MAAM,CAACrC,IAAI;QACjB0C,KAAK,EAAEL,MAAM,CAACK,KAAK,IAAI,CAAC;QACxBC,MAAM,EAAEN,MAAM,CAACM,MAAM,IAAI;MAC3B,CAAC;IACH,CAAC,CAAC,OAAOC,KAAK,EAAE;MACd3B,OAAO,CAAC2B,KAAK,CAAC,+CAA+C,EAAEA,KAAK,CAAC;MACrE,OAAO,IAAI;IACb,CAAC,SAAS;MACR;MACA,IAAIhB,cAAc,EAAE;QAClBjC,IAAI,CAACkD,MAAM,CAACjB,cAAc,CAAC,CAACkB,KAAK,CAAEC,GAAG,IACpC9B,OAAO,CAAC+B,IAAI,CAAC,8CAA8C,EAAED,GAAG,CAClE,CAAC;MACH;IACF;EACF,CAAC;EAEDE,gBAAgB,EAAE,MAAOC,aAAqB,IAAoB;IAChE,IAAI;MACF,IAAI,CAACA,aAAa,EAAE;MACpB,MAAMvD,IAAI,CAACkD,MAAM,CAACK,aAAa,CAAC;MAChCjC,OAAO,CAACC,GAAG,CAAC,8BAA8B,EAAEgC,aAAa,CAAC;IAC5D,CAAC,CAAC,OAAOH,GAAG,EAAE;MACZ9B,OAAO,CAAC+B,IAAI,CAAC,kCAAkC,EAAED,GAAG,CAAC;IACvD;EACF,CAAC;EAEDI,uBAAuB,EAAE,MAAAA,CACvBC,UAAoB,EACpB5B,OAAyB,GAAG,CAAC,CAAC,KACC;IAC/B,MAAM6B,OAA0B,GAAG,EAAE;IAErC,KAAK,MAAMvD,SAAS,IAAIsD,UAAU,EAAE;MAClC,MAAME,SAAS,GAAG,MAAMhC,kBAAkB,CAACC,iBAAiB,CAC1DzB,SAAS,EACT0B,OACF,CAAC;MACD,IAAI8B,SAAS,EAAE;QACbD,OAAO,CAACE,IAAI,CAACD,SAAS,CAAC;MACzB;IACF;IAEA,OAAOD,OAAO;EAChB;AACF,CAAC;AAED,eAAe/B,kBAAkB","ignoreList":[]}

package/lib/typescript/src/components/AttachmentPreview.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AttachmentPreview.d.ts","sourceRoot":"","sources":["../../../../src/components/AttachmentPreview.tsx"],"names":[],"mappings":"AAIA,KAAK,cAAc,GAAG,OAAO,GAAG,OAAO,GAAG,OAAO,GAAG,UAAU,GAAG,MAAM,CAAC;AAExE,UAAU,kBAAkB;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,UAAU,cAAc;IACtB,QAAQ,EAAE,kBAAkB,CAAC;IAC7B,cAAc,EAAE,MAAM,CAAC;IACvB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,WAAW,EAAE,OAAO,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,UAAU,sBAAsB;IAC9B,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,CAAC,EAAE,KAAK,CAAC,cAAc,GAAG;QAAE,IAAI,EAAE,cAAc,CAAA;KAAE,CAAC,CAAC;IAC/D,QAAQ,EAAE,CAAC,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CACzD;AAwBD,eAAO,MAAM,iBAAiB,2EACS,sBAAsB,iCA4J5D,CAAC"}
+{"version":3,"file":"AttachmentPreview.d.ts","sourceRoot":"","sources":["../../../../src/components/AttachmentPreview.tsx"],"names":[],"mappings":"AAIA,KAAK,cAAc,GAAG,OAAO,GAAG,OAAO,GAAG,OAAO,GAAG,UAAU,GAAG,MAAM,CAAC;AAExE,UAAU,kBAAkB;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,UAAU,cAAc;IACtB,QAAQ,EAAE,kBAAkB,CAAC;IAC7B,cAAc,EAAE,MAAM,CAAC;IACvB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,WAAW,EAAE,OAAO,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,UAAU,sBAAsB;IAC9B,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,CAAC,EAAE,KAAK,CAAC,cAAc,GAAG;QAAE,IAAI,EAAE,cAAc,CAAA;KAAE,CAAC,CAAC;IAC/D,QAAQ,EAAE,CAAC,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CACzD;AA2BD,eAAO,MAAM,iBAAiB,2EACS,sBAAsB,iCA4J5D,CAAC"}

package/lib/typescript/src/components/MergedImageGrid.d.ts

@@ -8,8 +8,8 @@ interface MergedImageGridProps {
 }
 /**
  * Generic image grid for merged messages
- * Layout: 1 image (1x1), 2 images (1x2), 3 images (1x3), 4+ images (2x2)
- * Shows "+N more" overlay on last cell if images exceed limit
+ * Layout: always a single horizontal row (1xN), N capped at maxDisplay (default 3)
+ * Shows "+N more" overlay on last cell if images exceed limit (e.g. 4 images → 3 + "+1")
  */
 export declare const MergedImageGrid: import("react").MemoExoticComponent<({ images, maxDisplay, onMediaPress }: MergedImageGridProps) => import("react").JSX.Element>;
 export {};

package/lib/typescript/src/components/MergedImageGrid.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MergedImageGrid.d.ts","sourceRoot":"","sources":["../../../../src/components/MergedImageGrid.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAEzD,UAAU,oBAAoB;IAC5B,MAAM,EAAE,KAAK,CAAC;QACZ,WAAW,CAAC,EAAE,GAAG,CAAC;KACnB,CAAC,CAAC;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE,KAAK,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;CAC7D;AAED;;;;GAIG;AACH,eAAO,MAAM,eAAe,6EACiB,oBAAoB,iCAkLhE,CAAC"}
+{"version":3,"file":"MergedImageGrid.d.ts","sourceRoot":"","sources":["../../../../src/components/MergedImageGrid.tsx"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAEzD,UAAU,oBAAoB;IAC5B,MAAM,EAAE,KAAK,CAAC;QACZ,WAAW,CAAC,EAAE,GAAG,CAAC;KACnB,CAAC,CAAC;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE,KAAK,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;CAC7D;AAED;;;;GAIG;AACH,eAAO,MAAM,eAAe,6EACiB,oBAAoB,iCAyLhE,CAAC"}

package/lib/typescript/src/components/messages/mergedMessage/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/components/messages/mergedMessage/index.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,UAAU,CAAC;AAEvD,eAAO,MAAM,aAAa,8EACgB,sBAAsB,iCAmC/D,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/components/messages/mergedMessage/index.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,UAAU,CAAC;AAEvD,eAAO,MAAM,aAAa,8EACgB,sBAAsB,iCAiC/D,CAAC"}

package/lib/typescript/src/hooks/useImageAttachment.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useImageAttachment.d.ts","sourceRoot":"","sources":["../../../../src/hooks/useImageAttachment.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,IAAI,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAQ3E,UAAU,qBAAqB;IAC7B,KAAK,EAAE,WAAW,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;IACvB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,WAAW,EAAE,OAAO,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,wBAAwB;IACvC,cAAc,EAAE,qBAAqB,EAAE,CAAC;IACxC,qBAAqB,EAAE,OAAO,CAAC;IAC/B,iBAAiB,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACvC,iBAAiB,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAC3C,cAAc,EAAE,MAAM,IAAI,CAAC;CAC5B;AAED,eAAO,MAAM,kBAAkB,QAAO,wBAuSrC,CAAC"}
+{"version":3,"file":"useImageAttachment.d.ts","sourceRoot":"","sources":["../../../../src/hooks/useImageAttachment.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,IAAI,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAQ3E,UAAU,qBAAqB;IAC7B,KAAK,EAAE,WAAW,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;IACvB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,WAAW,EAAE,OAAO,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,wBAAwB;IACvC,cAAc,EAAE,qBAAqB,EAAE,CAAC;IACxC,qBAAqB,EAAE,OAAO,CAAC;IAC/B,iBAAiB,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACvC,iBAAiB,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAC3C,cAAc,EAAE,MAAM,IAAI,CAAC;CAC5B;AAED,eAAO,MAAM,kBAAkB,QAAO,wBAiTrC,CAAC"}

package/lib/typescript/src/screens/MediaView/VideoPlayer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"VideoPlayer.d.ts","sourceRoot":"","sources":["../../../../../src/screens/MediaView/VideoPlayer.tsx"],"names":[],"mappings":"AAUA,OAAc,EAA0B,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAK/E,UAAU,KAAK;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CAC1B;AAUD,QAAA,MAAM,WAAW,8CAAgB,KAAK,iCA8IpC,CAAC;AAGH,eAAe,WAAW,CAAC"}
+{"version":3,"file":"VideoPlayer.d.ts","sourceRoot":"","sources":["../../../../../src/screens/MediaView/VideoPlayer.tsx"],"names":[],"mappings":"AAUA,OAAc,EAA0B,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAK/E,UAAU,KAAK;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CAC1B;AAUD,QAAA,MAAM,WAAW,8CAAgB,KAAK,iCA+IpC,CAAC;AAGH,eAAe,WAAW,CAAC"}

package/lib/typescript/src/screens/MediaView/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/screens/MediaView/index.tsx"],"names":[],"mappings":"AA+BA,UAAU,iBAAiB;IACzB,MAAM,EAAE,GAAG,EAAE,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,SAAS,CAAC,EAAE,GAAG,CAAC;IAChB,SAAS,EAAE,MAAM,IAAI,CAAC;CACvB;AAED,QAAA,MAAM,iBAAiB,GAAI,OAAO,iBAAiB,gCA0LlD,CAAC;AAIF,eAAe,iBAAiB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/screens/MediaView/index.tsx"],"names":[],"mappings":"AAgCA,UAAU,iBAAiB;IACzB,MAAM,EAAE,GAAG,EAAE,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,SAAS,CAAC,EAAE,GAAG,CAAC;IAChB,SAAS,EAAE,MAAM,IAAI,CAAC;CACvB;AAED,QAAA,MAAM,iBAAiB,GAAI,OAAO,iBAAiB,gCA0LlD,CAAC;AAIF,eAAe,iBAAiB,CAAC"}

package/lib/typescript/src/screens/chat-detail/ChatListLegend.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ChatListLegend.d.ts","sourceRoot":"","sources":["../../../../../src/screens/chat-detail/ChatListLegend.tsx"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAW7C,eAAO,MAAM,cAAc,kNActB,aAAa,iCAmWjB,CAAC"}
+{"version":3,"file":"ChatListLegend.d.ts","sourceRoot":"","sources":["../../../../../src/screens/chat-detail/ChatListLegend.tsx"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAW7C,eAAO,MAAM,cAAc,kNActB,aAAa,iCA0WjB,CAAC"}

package/lib/typescript/src/translation/resources/i18n.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i18n.d.ts","sourceRoot":"","sources":["../../../../../src/translation/resources/i18n.ts"],"names":[],"mappings":";;;AA2BA,wBAEE"}
+{"version":3,"file":"i18n.d.ts","sourceRoot":"","sources":["../../../../../src/translation/resources/i18n.ts"],"names":[],"mappings":";;;AA4BA,wBAEE"}

package/lib/typescript/src/utils/videoThumbnail.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"videoThumbnail.d.ts","sourceRoot":"","sources":["../../../../src/utils/videoThumbnail.ts"],"names":[],"mappings":"AAGA,UAAU,gBAAgB;IACxB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,UAAU,eAAe;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,eAAO,MAAM,kBAAkB;mCAEhB,MAAM,YACR,gBAAgB,KACxB,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC;sCA8CM,MAAM,KAAG,OAAO,CAAC,IAAI,CAAC;0CAWhD,MAAM,EAAE,YACX,gBAAgB,KACxB,OAAO,CAAC,eAAe,EAAE,CAAC;CAe9B,CAAC;AAEF,eAAe,kBAAkB,CAAC"}
+{"version":3,"file":"videoThumbnail.d.ts","sourceRoot":"","sources":["../../../../src/utils/videoThumbnail.ts"],"names":[],"mappings":"AAIA,UAAU,gBAAgB;IACxB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,UAAU,eAAe;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB;AA4DD,eAAO,MAAM,kBAAkB;mCAEhB,MAAM,YACR,gBAAgB,KACxB,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC;sCA6DM,MAAM,KAAG,OAAO,CAAC,IAAI,CAAC;0CAWhD,MAAM,EAAE,YACX,gBAAgB,KACxB,OAAO,CAAC,eAAe,EAAE,CAAC;CAe9B,CAAC;AAEF,eAAe,kBAAkB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@droppii-org/chat-mobile",
-  "version": "0.2.16",
+  "version": "0.2.17",
   "description": "Droppii chat mobile",
   "keywords": [
     "react-native",

package/src/components/AttachmentPreview.tsx

@@ -30,9 +30,12 @@ interface AttachmentPreviewProps {
 }
 
 const formatDuration = (seconds: number): string => {
-  const mins = Math.floor(seconds / 60);
-  const secs = seconds % 60;
-  return `${mins}:${secs.toString().padStart(2, '0')}`;
+  const totalSecs = Math.floor(seconds);
+  const mins = Math.floor(totalSecs / 60);
+  const secs = totalSecs % 60;
+  return `${mins.toString().padStart(2, '0')}:${secs
+    .toString()
+    .padStart(2, '0')}`;
 };
 
 const getAttachmentIcon = (type: AttachmentType): string => {
@@ -72,7 +75,7 @@ export const AttachmentPreview = memo(
               horizontal
               showsHorizontalScrollIndicator={false}
               scrollEventThrottle={16}
-              contentContainerStyle={{ alignItems: 'center' }}
+              contentContainerStyle={styles.scrollContent}
             >
               {attachments.map((item, index) => {
                 const {
@@ -134,7 +137,7 @@ export const AttachmentPreview = memo(
                       )}
 
                       {/* Video duration badge */}
-                      {isVideo && metadata.duration && (
+                      {isVideo && !!metadata.duration && (
                         <KContainer.View style={styles.durationBadge} center>
                           <KLabel.Text
                             typo="TextXsNormal"
@@ -216,6 +219,9 @@ const styles = StyleSheet.create({
   container: {
     // minHeight: 80,
   },
+  scrollContent: {
+    alignItems: 'center',
+  },
   thumbnail: {
     position: 'relative',
     width: 48,

package/src/components/MergedImageGrid.tsx

@@ -1,6 +1,12 @@
 import { memo, useMemo, useState, useCallback } from 'react';
 import { StyleSheet, useWindowDimensions } from 'react-native';
-import { KContainer, KImage, KLabel, KColors } from '@droppii/libs';
+import {
+  KContainer,
+  KImage,
+  KLabel,
+  KColors,
+  KSpacingValue,
+} from '@droppii/libs';
 import ChatImageDimens from '../utils/chatImageDimens';
 import type { MediaItem } from '../hooks/useMediaViewer';
 
@@ -14,11 +20,11 @@ interface MergedImageGridProps {
 
 /**
  * Generic image grid for merged messages
- * Layout: 1 image (1x1), 2 images (1x2), 3 images (1x3), 4+ images (2x2)
- * Shows "+N more" overlay on last cell if images exceed limit
+ * Layout: always a single horizontal row (1xN), N capped at maxDisplay (default 3)
+ * Shows "+N more" overlay on last cell if images exceed limit (e.g. 4 images → 3 + "+1")
  */
 export const MergedImageGrid = memo(
-  ({ images, maxDisplay = 4, onMediaPress }: MergedImageGridProps) => {
+  ({ images, maxDisplay = 3, onMediaPress }: MergedImageGridProps) => {
     const windowWidth = useWindowDimensions().width;
     const [loadingState, setLoadingState] = useState<Record<number, boolean>>(
       {}
@@ -106,26 +112,33 @@ export const MergedImageGrid = memo(
       return null;
     }
 
-    // Calculate columns based on image count
-    let columns = 1;
-    if (displayedImages.length === 2) {
-      columns = 2; // 2 images: horizontal layout (1x2)
-    } else if (displayedImages.length === 3) {
-      columns = 3; // 3 images: horizontal layout (1x3)
-    } else if (displayedImages.length >= 4) {
-      columns = 2; // 4+ images: grid layout (2x2)
-    }
+    // Always lay out images in a single horizontal row (1xN)
+    const columns = displayedImages.length;
 
-    // Use calculated aspect ratio for single image, 100x100 for multiple images
-    const cellSize =
-      displayedImages.length === 1 && singleImageSize
-        ? singleImageSize.width
-        : 100;
-    const cellHeight =
-      displayedImages.length === 1 && singleImageSize
-        ? singleImageSize.height
-        : cellSize;
     const gap = 4;
+
+    // Mirror the parent layout chain so the row never exceeds its container:
+    //   messageRow: width 100% with 0.75rem horizontal padding (both sides)
+    //   bubble wrapper: maxWidth 80% of that
+    //   bubble: another 0.75rem horizontal padding (both sides)
+    const rowPaddingH = KSpacingValue['0.75rem'] * 2;
+    const bubblePaddingH = KSpacingValue['0.75rem'] * 2;
+    const availableWidth = (windowWidth - rowPaddingH) * 0.8 - bubblePaddingH;
+
+    // Single image keeps its aspect-ratio size; multiple images share the row
+    // width so the whole row fits inside the bubble (cell capped at 100px).
+    let cellSize: number;
+    let cellHeight: number;
+    if (displayedImages.length === 1 && singleImageSize) {
+      cellSize = singleImageSize.width;
+      cellHeight = singleImageSize.height;
+    } else {
+      const fitted = Math.floor(
+        (availableWidth - gap * (columns - 1)) / columns
+      );
+      cellSize = Math.min(100, fitted);
+      cellHeight = cellSize;
+    }
     const totalWidth = cellSize * columns + gap * (columns - 1);
 
     return (
@@ -203,7 +216,7 @@ MergedImageGrid.displayName = 'MergedImageGrid';
 const styles = StyleSheet.create({
   grid: {
     flexDirection: 'row',
-    flexWrap: 'wrap',
+    flexWrap: 'nowrap',
     gap: 4,
     justifyContent: 'flex-start',
     alignItems: 'flex-start',

package/src/components/messages/mergedMessage/index.tsx

@@ -28,13 +28,11 @@ export const MergedMessage = memo(
           ]}
         >
           {imageMessages.length > 0 && (
-            <KContainer.View marginB="0.5rem">
-              <MergedImageGrid
-                images={imageMessages}
-                maxDisplay={4}
-                onMediaPress={onMediaPress}
-              />
-            </KContainer.View>
+            <MergedImageGrid
+              images={imageMessages}
+              maxDisplay={3}
+              onMediaPress={onMediaPress}
+            />
           )}
         </KContainer.View>
       </KContainer.View>

package/src/hooks/useImageAttachment.ts

@@ -237,23 +237,33 @@ export const useImageAttachment = (): UseImageAttachmentReturn => {
           count: images.length,
         });
 
-        const MAX_FILE_SIZE = 5 * 1024 * 1024;
-        const oversizedImages = images.filter(
-          (img) => (img.size || 0) > MAX_FILE_SIZE
-        );
+        // The gallery picker can return both images and videos. Apply the
+        // correct size limit per type: 5MB for images, 200MB for videos.
+        const MAX_IMAGE_SIZE = 5 * 1024 * 1024;
+        const MAX_VIDEO_SIZE = 200 * 1024 * 1024;
+        const isWithinLimit = (item: PickedImage) => {
+          const maxSize = isVideoFromPicker(item)
+            ? MAX_VIDEO_SIZE
+            : MAX_IMAGE_SIZE;
+          return (item.size || 0) <= maxSize;
+        };
 
-        if (oversizedImages.length > 0) {
-          console.warn('ImageAttach', 'Step 5: Some images too large', {
-            count: oversizedImages.length,
-            maxSize: MAX_FILE_SIZE,
+        const oversizedItems = images.filter((img) => !isWithinLimit(img));
+
+        if (oversizedItems.length > 0) {
+          const hasOversizedVideo = oversizedItems.some(isVideoFromPicker);
+          console.warn('ImageAttach', 'Step 5: Some files too large', {
+            count: oversizedItems.length,
           });
           UIUtils.toast.open({
-            title: trans('chat:image_too_large'),
+            title: trans(
+              hasOversizedVideo
+                ? 'chat:video_too_large'
+                : 'chat:image_too_large'
+            ),
             theme: 'danger',
           });
-          const validImages = images.filter(
-            (img) => (img.size || 0) <= MAX_FILE_SIZE
-          );
+          const validImages = images.filter(isWithinLimit);
           if (validImages.length === 0) return;
           images.splice(0, images.length, ...validImages);
         }

package/src/hooks/useVideoAttachment.ts

@@ -260,7 +260,7 @@ export const useVideoAttachment = (): UseVideoAttachmentReturn => {
         count: videos.length,
       });
 
-      const MAX_FILE_SIZE = 100 * 1024 * 1024; // 100MB for videos
+      const MAX_FILE_SIZE = 200 * 1024 * 1024; // 200MB for videos
       const oversizedVideos = videos.filter(
         (vid) => (vid.size || 0) > MAX_FILE_SIZE
       );

package/src/screens/MediaView/VideoPlayer.tsx

@@ -140,6 +140,7 @@ const VideoPlayer = memo((props: Props) => {
     <KContainer.View
       style={[styles.videoContainer, memoHeight]}
       collapsable={false}
+      edges={['bottom']}
       onLayout={handleContainerLayout}
     >
       {renderIndicator()}

package/src/screens/MediaView/index.tsx

@@ -7,6 +7,7 @@ import {
   FlatList,
   type ListRenderItemInfo,
   type ViewToken,
+  StatusBar,
 } from 'react-native';
 
 import LinearGradient from 'react-native-linear-gradient';
@@ -58,12 +59,12 @@ const MediaViewerScreen = (props: MediaViewerParams) => {
 
   const onDownload = useCallback(() => {}, []);
 
-  //   useEffect(() => {
-  //     StatusBar.setHidden(true);
-  //     return () => {
-  //       StatusBar.setHidden(false);
-  //     };
-  //   }, []);
+  useEffect(() => {
+    StatusBar.setHidden(true);
+    return () => {
+      StatusBar.setHidden(false);
+    };
+  }, []);
 
   useEffect(() => {
     if (Platform.OS === 'android') {

package/src/screens/chat-detail/ChatListLegend.tsx

@@ -191,12 +191,19 @@ export const ChatListLegend = memo(
         on: {
           dataChange: !isLoadingEarlier,
           layout: !isLoadingEarlier,
-          itemLayout: true,
+          // Must be disabled while prepending older history; otherwise re-measuring
+          // the freshly prepended items snaps the list back to the bottom.
+          itemLayout: !isLoadingEarlier,
         },
       }),
       [isLoadingEarlier]
     );
 
+    // Stable config so the native maintainVisibleContentPosition prop isn't toggled
+    // mid-prepend (toggling forces an extra layout recompute). `data` anchoring keeps
+    // the viewport pinned to the item being read when older messages are added on top.
+    const maintainVisiblePositionConfig = useMemo(() => ({ data: true }), []);
+
     const handleStartReached = useCallback(() => {
       if (__DEV__) {
         console.log('[LegendList] onStartReached triggered', {
@@ -349,7 +356,7 @@ export const ChatListLegend = memo(
               : undefined
           }
           alignItemsAtEnd
-          maintainVisibleContentPosition={!isLoadingEarlier}
+          maintainVisibleContentPosition={maintainVisiblePositionConfig}
           maintainScrollAtEnd={maintainScrollConfig}
           scrollEventThrottle={16}
           onScroll={handleScroll}

package/src/services/attachmentHandlers/videoAttachmentHandler.ts

@@ -18,7 +18,7 @@ interface VideoPicInfo {
 }
 
 export class VideoAttachmentHandler implements IAttachmentHandler {
-  private static readonly MAX_VIDEO_SIZE = 100 * 1024 * 1024; // 100MB
+  private static readonly MAX_VIDEO_SIZE = 200 * 1024 * 1024; // 200MB
   private static readonly SUPPORTED_TYPES = ['video/mp4', 'video/quicktime'];
 
   validate(

package/src/translation/resources/i18n.ts

@@ -3,6 +3,7 @@ const i18nKey: Record<string, string> = {
   'thread_card_fallback_name': 'Người dùng',
   'chat:image_preview': 'Xem trước ảnh',
   'chat:image_too_large': 'Ảnh quá lớn. Tối đa 5MB',
+  'chat:video_too_large': 'Video quá lớn. Tối đa 200MB',
   'chat:image_sent': 'Đã gửi ảnh',
   'chat:image_upload_failed': 'Lỗi tải ảnh',
   'chat:failed_to_send_message': 'Không thể gửi tin nhắn. Thử lại?',