@ethora/chat-component-rn 26.7.8 → 26.7.10

package/lib/commonjs/components/RoomComponents/styled/LastMessagePhoto.js

@@ -10,6 +10,7 @@ var _secureFileUrl = require("../../../helpers/secureFileUrl");
 var _native = _interopRequireDefault(require("styled-components/native"));
 var _StyledRoomComponents = require("./StyledRoomComponents");
 var _reactNative = require("react-native");
+var _getDisplayFileName = require("../../../helpers/getDisplayFileName");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const PhotoContainer = _native.default.View`
@@ -26,9 +27,19 @@ const PhotoContainer = _native.default.View`
 const LastMessagePhoto = ({
   user,
   locationPreview,
-  originalName
+  originalName,
+  fileName,
+  mimetype
 }) => {
   const fileToken = (0, _useFileToken.useFileToken)();
+  // Bug #40: prefer the sender's original name over the stored hash
+  // name; only fall back to the generic "file" label when neither is
+  // present at all (avoids a synthetic "media_<timestamp>.bin" here).
+  const displayName = originalName || fileName ? (0, _getDisplayFileName.getDisplayFileName)({
+    originalName,
+    fileName,
+    mimetype
+  }) : 'file';
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_StyledRoomComponents.LastRoomMessageContainer, {
     children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_StyledRoomComponents.LastRoomMessageName, {
       children: [user?.name || '', ":"]
@@ -45,7 +56,7 @@ const LastMessagePhoto = ({
           })
         })
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_StyledRoomComponents.LastRoomMessageText, {
-        children: originalName || 'file'
+        children: displayName
       })]
     })]
   });

package/lib/commonjs/components/RoomComponents/styled/LastMessagePhoto.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","_interopRequireDefault","require","_useFileToken","_secureFileUrl","_native","_StyledRoomComponents","_reactNative","_jsxRuntime","e","__esModule","default","PhotoContainer","styled","View","LastMessagePhoto","user","locationPreview","originalName","fileToken","useFileToken","jsxs","LastRoomMessageContainer","children","LastRoomMessageName","name","style","display","flexDirection","gap","jsx","ShadeWrapper","LastMessageImg","src","appendFileToken","LastRoomMessageText","_default","exports"],"sourceRoot":"../../../../../src","sources":["components/RoomComponents/styled/LastMessagePhoto.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,aAAA,GAAAD,OAAA;AACA,IAAAE,cAAA,GAAAF,OAAA;AACA,IAAAG,OAAA,GAAAJ,sBAAA,CAAAC,OAAA;AAEA,IAAAI,qBAAA,GAAAJ,OAAA;AAOA,IAAAK,YAAA,GAAAL,OAAA;AAAoC,IAAAM,WAAA,GAAAN,OAAA;AAAA,SAAAD,uBAAAQ,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAEpC,MAAMG,cAAc,GAAGC,eAAM,CAACC,IAAI;AAClC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,CAAC;AAKD,MAAMC,gBAA2C,GAAGA,CAAC;EACnDC,IAAI;EACJC,eAAe;EACfC;AACF,CAAC,KAAK;EACJ,MAAMC,SAAS,GAAG,IAAAC,0BAAY,EAAC,CAAC;EAChC,oBACE,IAAAZ,WAAA,CAAAa,IAAA,EAACf,qBAAA,CAAAgB,wBAAwB;IAAAC,QAAA,gBACvB,IAAAf,WAAA,CAAAa,IAAA,EAACf,qBAAA,CAAAkB,mBAAmB;MAAAD,QAAA,GAAEP,IAAI,EAAES,IAAI,IAAI,EAAE,EAAC,GAAC;IAAA,CAAqB,CAAC,eAC9D,IAAAjB,WAAA,CAAAa,IAAA,EAACd,YAAA,CAAAO,IAAI;MACHY,KAAK,EAAE;QACLC,OAAO,EAAE,MAAM;QACfC,aAAa,EAAE,KAAK;QACpBC,GAAG,EAAE;MACP,CAAE;MAAAN,QAAA,gBAEF,IAAAf,WAAA,CAAAsB,GAAA,EAAClB,cAAc;QAAAW,QAAA,eACb,IAAAf,WAAA,CAAAsB,GAAA,EAACxB,qBAAA,CAAAyB,YAAY;UAAAR,QAAA,eACX,IAAAf,WAAA,CAAAsB,GAAA,EAACxB,qBAAA,CAAA0B,cAAc;YAACC,GAAG,EAAE,IAAAC,8BAAe,EAACjB,eAAe,EAAEE,SAAS;UAAE,CAAE;QAAC,CACxD;MAAC,CACD,CAAC,eACjB,IAAAX,WAAA,CAAAsB,GAAA,EAACxB,qBAAA,CAAA6B,mBAAmB;QAAAZ,QAAA,EAAEL,YAAY,IAAI;MAAM,CAAsB,CAAC;IAAA,CAC/D,CAAC;EAAA,CACiB,CAAC;AAE/B,CAAC;AAAC,IAAAkB,QAAA,GAAAC,OAAA,CAAA1B,OAAA,GAEaI,gBAAgB","ignoreList":[]}
+{"version":3,"names":["_react","_interopRequireDefault","require","_useFileToken","_secureFileUrl","_native","_StyledRoomComponents","_reactNative","_getDisplayFileName","_jsxRuntime","e","__esModule","default","PhotoContainer","styled","View","LastMessagePhoto","user","locationPreview","originalName","fileName","mimetype","fileToken","useFileToken","displayName","getDisplayFileName","jsxs","LastRoomMessageContainer","children","LastRoomMessageName","name","style","display","flexDirection","gap","jsx","ShadeWrapper","LastMessageImg","src","appendFileToken","LastRoomMessageText","_default","exports"],"sourceRoot":"../../../../../src","sources":["components/RoomComponents/styled/LastMessagePhoto.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,aAAA,GAAAD,OAAA;AACA,IAAAE,cAAA,GAAAF,OAAA;AACA,IAAAG,OAAA,GAAAJ,sBAAA,CAAAC,OAAA;AAEA,IAAAI,qBAAA,GAAAJ,OAAA;AAOA,IAAAK,YAAA,GAAAL,OAAA;AACA,IAAAM,mBAAA,GAAAN,OAAA;AAAyE,IAAAO,WAAA,GAAAP,OAAA;AAAA,SAAAD,uBAAAS,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAEzE,MAAMG,cAAc,GAAGC,eAAM,CAACC,IAAI;AAClC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,CAAC;AAQD,MAAMC,gBAA2C,GAAGA,CAAC;EACnDC,IAAI;EACJC,eAAe;EACfC,YAAY;EACZC,QAAQ;EACRC;AACF,CAAC,KAAK;EACJ,MAAMC,SAAS,GAAG,IAAAC,0BAAY,EAAC,CAAC;EAChC;EACA;EACA;EACA,MAAMC,WAAW,GAAGL,YAAY,IAAIC,QAAQ,GACxC,IAAAK,sCAAkB,EAAC;IAAEN,YAAY;IAAEC,QAAQ;IAAEC;EAAS,CAAC,CAAC,GACxD,MAAM;EACV,oBACE,IAAAZ,WAAA,CAAAiB,IAAA,EAACpB,qBAAA,CAAAqB,wBAAwB;IAAAC,QAAA,gBACvB,IAAAnB,WAAA,CAAAiB,IAAA,EAACpB,qBAAA,CAAAuB,mBAAmB;MAAAD,QAAA,GAAEX,IAAI,EAAEa,IAAI,IAAI,EAAE,EAAC,GAAC;IAAA,CAAqB,CAAC,eAC9D,IAAArB,WAAA,CAAAiB,IAAA,EAACnB,YAAA,CAAAQ,IAAI;MACHgB,KAAK,EAAE;QACLC,OAAO,EAAE,MAAM;QACfC,aAAa,EAAE,KAAK;QACpBC,GAAG,EAAE;MACP,CAAE;MAAAN,QAAA,gBAEF,IAAAnB,WAAA,CAAA0B,GAAA,EAACtB,cAAc;QAAAe,QAAA,eACb,IAAAnB,WAAA,CAAA0B,GAAA,EAAC7B,qBAAA,CAAA8B,YAAY;UAAAR,QAAA,eACX,IAAAnB,WAAA,CAAA0B,GAAA,EAAC7B,qBAAA,CAAA+B,cAAc;YAACC,GAAG,EAAE,IAAAC,8BAAe,EAACrB,eAAe,EAAEI,SAAS;UAAE,CAAE;QAAC,CACxD;MAAC,CACD,CAAC,eACjB,IAAAb,WAAA,CAAA0B,GAAA,EAAC7B,qBAAA,CAAAkC,mBAAmB;QAAAZ,QAAA,EAAEJ;MAAW,CAAsB,CAAC;IAAA,CACpD,CAAC;EAAA,CACiB,CAAC;AAE/B,CAAC;AAAC,IAAAiB,QAAA,GAAAC,OAAA,CAAA9B,OAAA,GAEaI,gBAAgB","ignoreList":[]}

package/lib/commonjs/components/RoomComponents/styled/LastMessageVideo.js

@@ -10,6 +10,7 @@ var _secureFileUrl = require("../../../helpers/secureFileUrl");
 var _native = _interopRequireDefault(require("styled-components/native"));
 var _StyledRoomComponents = require("./StyledRoomComponents");
 var _reactNative = require("react-native");
+var _getDisplayFileName = require("../../../helpers/getDisplayFileName");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const VideoContainer = _native.default.View`
@@ -40,9 +41,19 @@ const PlayButton = _native.default.View`
 const LastMessageVideo = ({
   user,
   location,
-  originalName
+  originalName,
+  fileName,
+  mimetype
 }) => {
   const fileToken = (0, _useFileToken.useFileToken)();
+  // Bug #40: prefer the sender's original name over the stored hash
+  // name; only fall back to the generic "file" label when neither is
+  // present at all (avoids a synthetic "media_<timestamp>.bin" here).
+  const displayName = originalName || fileName ? (0, _getDisplayFileName.getDisplayFileName)({
+    originalName,
+    fileName,
+    mimetype
+  }) : 'file';
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_StyledRoomComponents.LastRoomMessageContainer, {
     children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_StyledRoomComponents.LastRoomMessageName, {
       children: [user?.name || '', ":"]
@@ -63,7 +74,7 @@ const LastMessageVideo = ({
           })
         })]
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_StyledRoomComponents.LastRoomMessageText, {
-        children: originalName || 'file'
+        children: displayName
       })]
     })]
   });

package/lib/commonjs/components/RoomComponents/styled/LastMessageVideo.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","_interopRequireDefault","require","_useFileToken","_secureFileUrl","_native","_StyledRoomComponents","_reactNative","_jsxRuntime","e","__esModule","default","VideoContainer","styled","View","Thumbnail","Image","PlayButton","LastMessageVideo","user","location","originalName","fileToken","useFileToken","jsxs","LastRoomMessageContainer","children","LastRoomMessageName","name","style","display","flexDirection","gap","jsx","ShadeWrapper","src","appendFileToken","Text","LastRoomMessageText","_default","exports"],"sourceRoot":"../../../../../src","sources":["components/RoomComponents/styled/LastMessageVideo.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,aAAA,GAAAD,OAAA;AACA,IAAAE,cAAA,GAAAF,OAAA;AACA,IAAAG,OAAA,GAAAJ,sBAAA,CAAAC,OAAA;AAEA,IAAAI,qBAAA,GAAAJ,OAAA;AAMA,IAAAK,YAAA,GAAAL,OAAA;AAA0C,IAAAM,WAAA,GAAAN,OAAA;AAAA,SAAAD,uBAAAQ,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAE1C,MAAMG,cAAc,GAAGC,eAAM,CAACC,IAAI;AAClC;AACA;AACA;AACA;AACA;AACA,CAAC;AAED,MAAMC,SAAS,GAAGF,eAAM,CAACG,KAAK;AAC9B;AACA;AACA;AACA,CAAC;AAED,MAAMC,UAAU,GAAGJ,eAAM,CAACC,IAAI;AAC9B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,CAAC;AAKD,MAAMI,gBAA2C,GAAGA,CAAC;EACnDC,IAAI;EACJC,QAAQ;EACRC;AACF,CAAC,KAAK;EACJ,MAAMC,SAAS,GAAG,IAAAC,0BAAY,EAAC,CAAC;EAChC,oBACE,IAAAf,WAAA,CAAAgB,IAAA,EAAClB,qBAAA,CAAAmB,wBAAwB;IAAAC,QAAA,gBACvB,IAAAlB,WAAA,CAAAgB,IAAA,EAAClB,qBAAA,CAAAqB,mBAAmB;MAAAD,QAAA,GAAEP,IAAI,EAAES,IAAI,IAAI,EAAE,EAAC,GAAC;IAAA,CAAqB,CAAC,eAC9D,IAAApB,WAAA,CAAAgB,IAAA,EAACjB,YAAA,CAAAO,IAAI;MACHe,KAAK,EAAE;QACLC,OAAO,EAAE,MAAM;QACfC,aAAa,EAAE,KAAK;QACpBC,GAAG,EAAE;MACP,CAAE;MAAAN,QAAA,gBAEF,IAAAlB,WAAA,CAAAgB,IAAA,EAACZ,cAAc;QAAAc,QAAA,gBACb,IAAAlB,WAAA,CAAAyB,GAAA,EAAC3B,qBAAA,CAAA4B,YAAY;UAAAR,QAAA,eACX,IAAAlB,WAAA,CAAAyB,GAAA,EAAClB,SAAS;YAACoB,GAAG,EAAE,IAAAC,8BAAe,EAAChB,QAAQ,EAAEE,SAAS;UAAE,CAAE;QAAC,CAC5C,CAAC,eACf,IAAAd,WAAA,CAAAyB,GAAA,EAAChB,UAAU;UAAAS,QAAA,eAAC,IAAAlB,WAAA,CAAAyB,GAAA,EAAC1B,YAAA,CAAA8B,IAAI;YAAAX,QAAA,EAAC;UAAC,CAAM;QAAC,CAAY,CAAC;MAAA,CACzB,CAAC,eACjB,IAAAlB,WAAA,CAAAyB,GAAA,EAAC3B,qBAAA,CAAAgC,mBAAmB;QAAAZ,QAAA,EAAEL,YAAY,IAAI;MAAM,CAAsB,CAAC;IAAA,CAC/D,CAAC;EAAA,CACiB,CAAC;AAE/B,CAAC;AAAC,IAAAkB,QAAA,GAAAC,OAAA,CAAA7B,OAAA,GAEaO,gBAAgB","ignoreList":[]}
+{"version":3,"names":["_react","_interopRequireDefault","require","_useFileToken","_secureFileUrl","_native","_StyledRoomComponents","_reactNative","_getDisplayFileName","_jsxRuntime","e","__esModule","default","VideoContainer","styled","View","Thumbnail","Image","PlayButton","LastMessageVideo","user","location","originalName","fileName","mimetype","fileToken","useFileToken","displayName","getDisplayFileName","jsxs","LastRoomMessageContainer","children","LastRoomMessageName","name","style","display","flexDirection","gap","jsx","ShadeWrapper","src","appendFileToken","Text","LastRoomMessageText","_default","exports"],"sourceRoot":"../../../../../src","sources":["components/RoomComponents/styled/LastMessageVideo.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,aAAA,GAAAD,OAAA;AACA,IAAAE,cAAA,GAAAF,OAAA;AACA,IAAAG,OAAA,GAAAJ,sBAAA,CAAAC,OAAA;AAEA,IAAAI,qBAAA,GAAAJ,OAAA;AAMA,IAAAK,YAAA,GAAAL,OAAA;AACA,IAAAM,mBAAA,GAAAN,OAAA;AAAyE,IAAAO,WAAA,GAAAP,OAAA;AAAA,SAAAD,uBAAAS,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAEzE,MAAMG,cAAc,GAAGC,eAAM,CAACC,IAAI;AAClC;AACA;AACA;AACA;AACA;AACA,CAAC;AAED,MAAMC,SAAS,GAAGF,eAAM,CAACG,KAAK;AAC9B;AACA;AACA;AACA,CAAC;AAED,MAAMC,UAAU,GAAGJ,eAAM,CAACC,IAAI;AAC9B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,CAAC;AAQD,MAAMI,gBAA2C,GAAGA,CAAC;EACnDC,IAAI;EACJC,QAAQ;EACRC,YAAY;EACZC,QAAQ;EACRC;AACF,CAAC,KAAK;EACJ,MAAMC,SAAS,GAAG,IAAAC,0BAAY,EAAC,CAAC;EAChC;EACA;EACA;EACA,MAAMC,WAAW,GAAGL,YAAY,IAAIC,QAAQ,GACxC,IAAAK,sCAAkB,EAAC;IAAEN,YAAY;IAAEC,QAAQ;IAAEC;EAAS,CAAC,CAAC,GACxD,MAAM;EACV,oBACE,IAAAf,WAAA,CAAAoB,IAAA,EAACvB,qBAAA,CAAAwB,wBAAwB;IAAAC,QAAA,gBACvB,IAAAtB,WAAA,CAAAoB,IAAA,EAACvB,qBAAA,CAAA0B,mBAAmB;MAAAD,QAAA,GAAEX,IAAI,EAAEa,IAAI,IAAI,EAAE,EAAC,GAAC;IAAA,CAAqB,CAAC,eAC9D,IAAAxB,WAAA,CAAAoB,IAAA,EAACtB,YAAA,CAAAQ,IAAI;MACHmB,KAAK,EAAE;QACLC,OAAO,EAAE,MAAM;QACfC,aAAa,EAAE,KAAK;QACpBC,GAAG,EAAE;MACP,CAAE;MAAAN,QAAA,gBAEF,IAAAtB,WAAA,CAAAoB,IAAA,EAAChB,cAAc;QAAAkB,QAAA,gBACb,IAAAtB,WAAA,CAAA6B,GAAA,EAAChC,qBAAA,CAAAiC,YAAY;UAAAR,QAAA,eACX,IAAAtB,WAAA,CAAA6B,GAAA,EAACtB,SAAS;YAACwB,GAAG,EAAE,IAAAC,8BAAe,EAACpB,QAAQ,EAAEI,SAAS;UAAE,CAAE;QAAC,CAC5C,CAAC,eACf,IAAAhB,WAAA,CAAA6B,GAAA,EAACpB,UAAU;UAAAa,QAAA,eAAC,IAAAtB,WAAA,CAAA6B,GAAA,EAAC/B,YAAA,CAAAmC,IAAI;YAAAX,QAAA,EAAC;UAAC,CAAM;QAAC,CAAY,CAAC;MAAA,CACzB,CAAC,eACjB,IAAAtB,WAAA,CAAA6B,GAAA,EAAChC,qBAAA,CAAAqC,mBAAmB;QAAAZ,QAAA,EAAEJ;MAAW,CAAsB,CAAC;IAAA,CACpD,CAAC;EAAA,CACiB,CAAC;AAE/B,CAAC;AAAC,IAAAiB,QAAA,GAAAC,OAAA,CAAAjC,OAAA,GAEaO,gBAAgB","ignoreList":[]}

package/lib/commonjs/components/styled/MessageImage.js

@@ -21,6 +21,7 @@ const FALLBACK_IMAGE = 'https://as2.ftcdn.net/v2/jpg/02/51/95/53/1000_F_25195535
 const CustomMessageImage = ({
   fileURL,
   fileName,
+  originalName,
   mimetype,
   locationPreview
 }) => {
@@ -59,7 +60,8 @@ const CustomMessageImage = ({
     dispatch((0, _chatSettingsSlice.setActiveFile)({
       fileName,
       fileURL,
-      mimetype
+      mimetype,
+      originalName
     }));
     dispatch((0, _chatSettingsSlice.setActiveModal)(_MODAL_TYPES.MODAL_TYPES.FILE_PREVIEW));
   };

package/lib/commonjs/components/styled/MessageImage.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","_interopRequireWildcard","require","_secureFileUrl","_devLogger","_MediaComponents","_reactRedux","_chatSettingsSlice","_MODAL_TYPES","_reactNative","_mediaDimensions","_jsxRuntime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","maskToken","url","replace","FALLBACK_IMAGE","CustomMessageImage","fileURL","fileName","mimetype","locationPreview","displayURL","loading","setLoading","useState","dims","setDims","defaultMediaDims","dispatch","useDispatch","useEffect","active","Image","getSize","w","h","fitMediaDimensions","error","pushLog","message","String","handleOpen","setActiveFile","setActiveModal","MODAL_TYPES","FILE_PREVIEW","jsx","Container","style","width","children","jsxs","TouchableOpacity","onPress","activeOpacity","View","position","height","alignItems","justifyContent","zIndex","ActivityIndicator","size","color","source","uri","borderRadius","backgroundColor","onLoadEnd","onError","event","usingPreview","nativeEvent","isSecureFileUrl","requestFileTokenRecovery","resizeMode","_default","exports"],"sourceRoot":"../../../../src","sources":["components/styled/MessageImage.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","_interopRequireWildcard","require","_secureFileUrl","_devLogger","_MediaComponents","_reactRedux","_chatSettingsSlice","_MODAL_TYPES","_reactNative","_mediaDimensions","_jsxRuntime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","maskToken","url","replace","FALLBACK_IMAGE","CustomMessageImage","fileURL","fileName","originalName","mimetype","locationPreview","displayURL","loading","setLoading","useState","dims","setDims","defaultMediaDims","dispatch","useDispatch","useEffect","active","Image","getSize","w","h","fitMediaDimensions","error","pushLog","message","String","handleOpen","setActiveFile","setActiveModal","MODAL_TYPES","FILE_PREVIEW","jsx","Container","style","width","children","jsxs","TouchableOpacity","onPress","activeOpacity","View","position","height","alignItems","justifyContent","zIndex","ActivityIndicator","size","color","source","uri","borderRadius","backgroundColor","onLoadEnd","onError","event","usingPreview","nativeEvent","isSecureFileUrl","requestFileTokenRecovery","resizeMode","_default","exports"],"sourceRoot":"../../../../src","sources":["components/styled/MessageImage.tsx"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/components/styled/UnsupportedType.js

@@ -13,6 +13,7 @@ var _reactNative = require("react-native");
 var _useChatSettingState = require("../../hooks/useChatSettingState");
 var _icons = require("../../assets/icons");
 var _mimeToExtension = require("../../helpers/mimeToExtension");
+var _getDisplayFileName = require("../../helpers/getDisplayFileName");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const FileDownload = ({
@@ -31,6 +32,15 @@ const FileDownload = ({
   const {
     config
   } = (0, _useChatSettingState.useChatSettingState)();
+
+  // Bug #40: prefer the sender's original name over the server's stored
+  // hash name for both the visible label and the extension badge below.
+  const displayName = (0, _getDisplayFileName.getDisplayFileName)({
+    originalName,
+    fileName,
+    location: fileURL,
+    mimetype
+  });
   const formatFileSize = sizeInBytes => {
     const size = parseInt(sizeInBytes, 10);
     if (isNaN(size)) {
@@ -71,9 +81,9 @@ const FileDownload = ({
     dispatch((0, _chatSettingsSlice.setActiveModal)(_MODAL_TYPES.MODAL_TYPES.FILE_PREVIEW));
   };
   const extensionLabel = (() => {
-    const dotIndex = fileName.lastIndexOf('.');
-    if (dotIndex !== -1 && dotIndex < fileName.length - 1) {
-      return fileName.slice(dotIndex + 1).toUpperCase();
+    const dotIndex = displayName.lastIndexOf('.');
+    if (dotIndex !== -1 && dotIndex < displayName.length - 1) {
+      return displayName.slice(dotIndex + 1).toUpperCase();
     }
     return (0, _mimeToExtension.getExtensionForMime)(mimetype).replace('.', '').toUpperCase();
   })();
@@ -92,7 +102,7 @@ const FileDownload = ({
         isUser: isUser,
         colorIsUser: config?.colors?.primary,
         colorUsers: config?.colors?.secondary,
-        children: formatFileName(fileName, 20)
+        children: formatFileName(displayName, 20)
       }), (pending || size) && /*#__PURE__*/(0, _jsxRuntime.jsx)(_MediaComponents.FileSizeContainer, {
         children: pending ? /*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactNative.View, {
           style: {

package/lib/commonjs/components/styled/UnsupportedType.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","_interopRequireDefault","require","_MediaComponents","_reactRedux","_MODAL_TYPES","_chatSettingsSlice","_reactNative","_useChatSettingState","_icons","_mimeToExtension","_jsxRuntime","e","__esModule","default","FileDownload","fileName","fileURL","mimetype","size","isUser","originalName","duration","waveForm","pending","placeholderIcon","dispatch","useDispatch","config","useChatSettingState","formatFileSize","sizeInBytes","parseInt","isNaN","toFixed","formatFileName","name","maxLength","dotIndex","lastIndexOf","extension","substring","baseName","length","shortenedBaseName","handleOpen","setActiveFile","setActiveModal","MODAL_TYPES","FILE_PREVIEW","extensionLabel","slice","toUpperCase","getExtensionForMime","replace","jsxs","UnsupportedContainer","onPress","activeOpacity","children","jsx","BackgroundFile","FileIcon","width","height","FileInformation","FileName","numberOfLines","colorIsUser","colors","primary","colorUsers","secondary","FileSizeContainer","View","style","flexDirection","alignItems","gap","ActivityIndicator","color","FileSize","_default","exports"],"sourceRoot":"../../../../src","sources":["components/styled/UnsupportedType.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","_interopRequireDefault","require","_MediaComponents","_reactRedux","_MODAL_TYPES","_chatSettingsSlice","_reactNative","_useChatSettingState","_icons","_mimeToExtension","_getDisplayFileName","_jsxRuntime","e","__esModule","default","FileDownload","fileName","fileURL","mimetype","size","isUser","originalName","duration","waveForm","pending","placeholderIcon","dispatch","useDispatch","config","useChatSettingState","displayName","getDisplayFileName","location","formatFileSize","sizeInBytes","parseInt","isNaN","toFixed","formatFileName","name","maxLength","dotIndex","lastIndexOf","extension","substring","baseName","length","shortenedBaseName","handleOpen","setActiveFile","setActiveModal","MODAL_TYPES","FILE_PREVIEW","extensionLabel","slice","toUpperCase","getExtensionForMime","replace","jsxs","UnsupportedContainer","onPress","activeOpacity","children","jsx","BackgroundFile","FileIcon","width","height","FileInformation","FileName","numberOfLines","colorIsUser","colors","primary","colorUsers","secondary","FileSizeContainer","View","style","flexDirection","alignItems","gap","ActivityIndicator","color","FileSize","_default","exports"],"sourceRoot":"../../../../src","sources":["components/styled/UnsupportedType.tsx"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/components/styled/VideoMessage.js

@@ -113,6 +113,7 @@ const PlaceholderVideo = ({
 };
 const CustomMessageVideo = ({
   fileName,
+  originalName,
   fileURL,
   mimetype,
   previewURL
@@ -123,7 +124,8 @@ const CustomMessageVideo = ({
     dispatch((0, _chatSettingsSlice.setActiveFile)({
       fileName,
       fileURL,
-      mimetype
+      mimetype,
+      originalName
     }));
     dispatch((0, _chatSettingsSlice.setActiveModal)(_MODAL_TYPES.MODAL_TYPES.FILE_PREVIEW));
   };

package/lib/commonjs/components/styled/VideoMessage.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","_interopRequireWildcard","require","_secureFileUrl","_reactNative","_reactRedux","_chatSettingsSlice","_MODAL_TYPES","_icons","_mediaDimensions","_jsxRuntime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","PlayBadge","jsx","View","style","styles","overlay","pointerEvents","children","playButton","PlayIcon","width","height","PosterVideo","previewURL","onOpen","onPosterError","dims","setDims","useState","defaultMediaDims","useEffect","active","Image","getSize","w","h","fitMediaDimensions","jsxs","Pressable","onPress","wrapper","accessibilityRole","accessibilityLabel","source","uri","video","resizeMode","onError","PlaceholderVideo","CustomMessageVideo","fileName","fileURL","mimetype","dispatch","useDispatch","posterFailed","setPosterFailed","handleOpen","setActiveFile","setActiveModal","MODAL_TYPES","FILE_PREVIEW","isSecureFileUrl","requestFileTokenRecovery","_default","exports","StyleSheet","create","borderRadius","overflow","backgroundColor","absoluteFill","justifyContent","alignItems"],"sourceRoot":"../../../../src","sources":["components/styled/VideoMessage.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","_interopRequireWildcard","require","_secureFileUrl","_reactNative","_reactRedux","_chatSettingsSlice","_MODAL_TYPES","_icons","_mediaDimensions","_jsxRuntime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","PlayBadge","jsx","View","style","styles","overlay","pointerEvents","children","playButton","PlayIcon","width","height","PosterVideo","previewURL","onOpen","onPosterError","dims","setDims","useState","defaultMediaDims","useEffect","active","Image","getSize","w","h","fitMediaDimensions","jsxs","Pressable","onPress","wrapper","accessibilityRole","accessibilityLabel","source","uri","video","resizeMode","onError","PlaceholderVideo","CustomMessageVideo","fileName","originalName","fileURL","mimetype","dispatch","useDispatch","posterFailed","setPosterFailed","handleOpen","setActiveFile","setActiveModal","MODAL_TYPES","FILE_PREVIEW","isSecureFileUrl","requestFileTokenRecovery","_default","exports","StyleSheet","create","borderRadius","overflow","backgroundColor","absoluteFill","justifyContent","alignItems"],"sourceRoot":"../../../../src","sources":["components/styled/VideoMessage.tsx"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/context/xmppProvider.js

@@ -21,6 +21,7 @@ var _pushSubscriptionService = require("../services/pushSubscriptionService");
 var _roomStore = require("../roomStore");
 var _chatSettingsSlice = require("../roomStore/chatSettingsSlice");
 var _roomsSlice = require("../roomStore/roomsSlice");
+var _getServerReadTimestamp = require("../helpers/getServerReadTimestamp");
 var _historyPreloadScheduler = require("../helpers/historyPreloadScheduler");
 var _updateMessagesTillLast = require("../helpers/updateMessagesTillLast");
 var _secureUserStorage = require("../helpers/secureUserStorage");
@@ -545,17 +546,40 @@ const XmppProvider = ({
       // Mark the open room "not visible" while backgrounded so messages
       // that arrive (or MAM-replay on reconnect) count as unread instead
       // of being silently treated as read — the "mounted == visible ==
-      // read" gap. Stamp lastViewed=now as the read baseline, clear
-      // visibility, then flush that marker to the server private store.
-      // Restored on the next 'active' transition above. Handled here in
-      // the provider so consumers using the component as a package get
-      // correct unread without reaching into the chat store themselves.
+      // read" gap. Stamp lastViewed=<the read boundary, if the user left
+      // scrolled up, else the newest server-acked message>, not
+      // Date.now(), as the read baseline: a device clock running ahead
+      // would otherwise write a future marker that the forward-only
+      // private-store merge can never correct again (bug #38). Then
+      // clear visibility and flush that marker to the server private
+      // store. Restored on the next 'active' transition above. Handled
+      // here in the provider so consumers using the component as a
+      // package get correct unread without reaching into the chat store
+      // themselves.
+      //
+      // The read boundary (rooms.readBoundaries) is deliberately left
+      // untouched here - MessageList normally stays mounted through a
+      // simple background/foreground cycle, so its own scroll-tracking
+      // ref (the only thing that could re-derive this value) is still
+      // intact, and clearing the redux copy would desync the two. It's
+      // only USED here for the one-shot stamp+flush, matching customer
+      // #42: leaving (or backgrounding) a room while scrolled up must not
+      // mark messages the user never reached as read.
       visibleBeforeBackground = visibleRoomJID;
+      let boundaryTs = null;
       if (visibleRoomJID) {
-        _roomStore.store.dispatch((0, _roomsSlice.setLastViewedTimestamp)({
-          chatJID: visibleRoomJID,
-          timestamp: Date.now()
-        }));
+        boundaryTs = state.rooms?.readBoundaries?.[visibleRoomJID] ?? null;
+        const readTs = (0, _getServerReadTimestamp.getReadMarkerTimestamp)(rooms?.[visibleRoomJID], state.roomHeapSlice, boundaryTs);
+        // Nothing to anchor to yet (no known messages, no prior marker)
+        // - skip the local stamp rather than fall back to the device
+        // clock. The flush below still runs so the visibility clear
+        // isn't blocked on this.
+        if (readTs > 0) {
+          _roomStore.store.dispatch((0, _roomsSlice.setLastViewedTimestamp)({
+            chatJID: visibleRoomJID,
+            timestamp: readTs
+          }));
+        }
         // Drop the "New messages" divider for the room we're leaving so it
         // doesn't linger when the user comes back (mirrors ChatRoom's
         // unmount cleanup, which never runs while the pane stays mounted).
@@ -566,9 +590,14 @@ const XmppProvider = ({
         _roomStore.store.dispatch((0, _roomsSlice.clearVisibleRoom)());
       }
       // Fire-and-forget — we're going to the background and don't
-      // care about the resolution path.
+      // care about the resolution path. `visibleRoomTs` carries the same
+      // boundary to the SERVER marker - without it the flush defaults to
+      // "everything" for the visible room, overriding a correct smaller
+      // local count.
       c.flushLastViewedToPrivateStoreStanza(rooms, {
-        visibleRoomJID
+        visibleRoomJID,
+        // Clamped through the same helper as the local stamp above.
+        visibleRoomTs: visibleRoomJID ? (0, _getServerReadTimestamp.getFlushBoundaryTs)(rooms?.[visibleRoomJID], state.roomHeapSlice, boundaryTs) : undefined
       }).catch(() => {});
     });
     return () => sub.remove();
@@ -581,11 +610,11 @@ const XmppProvider = ({
   // "shown" from "hidden", so the unread middleware would keep the open
   // room's badge at 0 and messages arriving while you're elsewhere look
   // already-read. When the host passes `isVisible`, mirror the AppState
-  // background/foreground handling: hidden → stamp lastViewed=now + clear
-  // room visibility (so later messages count) + flush; shown → restore
-  // visibility for the open room. Doing it here means consumers never
-  // touch the chat store themselves. (Undefined = host unmounts on hide,
-  // nothing to do.)
+  // background/foreground handling: hidden → stamp lastViewed=<newest
+  // server-acked message> + clear room visibility (so later messages
+  // count) + flush; shown → restore visibility for the open room. Doing
+  // it here means consumers never touch the chat store themselves.
+  // (Undefined = host unmounts on hide, nothing to do.)
   // -----------------------------------------------------------
   const chatWasVisibleRef = (0, _react.useRef)(false);
   (0, _react.useEffect)(() => {
@@ -604,11 +633,25 @@ const XmppProvider = ({
         }));
       }
     } else {
+      // The read boundary (rooms.readBoundaries) is USED for the stamp
+      // and flush below but deliberately left in place - a host using
+      // `isVisible` keeps <Chat> mounted while hidden, so MessageList's
+      // own scroll-tracking ref is still intact and the redux copy must
+      // stay in sync with it. Only consumed, never Date.now(): a fast
+      // device clock would write a future marker that the forward-only
+      // private-store merge could then never correct (bug #38). And
+      // never "the newest acked message" unconditionally either - that
+      // silently marks messages the user scrolled past and never reached
+      // as read (bug #42, a regression of #33).
+      const boundaryTs = activeRoomJID ? state.rooms?.readBoundaries?.[activeRoomJID] ?? null : null;
       if (wasVisible && activeRoomJID) {
-        _roomStore.store.dispatch((0, _roomsSlice.setLastViewedTimestamp)({
-          chatJID: activeRoomJID,
-          timestamp: Date.now()
-        }));
+        const readTs = (0, _getServerReadTimestamp.getReadMarkerTimestamp)(rooms?.[activeRoomJID], state.roomHeapSlice, boundaryTs);
+        if (readTs > 0) {
+          _roomStore.store.dispatch((0, _roomsSlice.setLastViewedTimestamp)({
+            chatJID: activeRoomJID,
+            timestamp: readTs
+          }));
+        }
         // Drop the "New messages" divider so it's gone when the user
         // returns to the chat (mirrors ChatRoom's unmount cleanup).
         _roomStore.store.dispatch((0, _roomsSlice.deleteRoomMessage)({
@@ -619,7 +662,11 @@ const XmppProvider = ({
       _roomStore.store.dispatch((0, _roomsSlice.clearVisibleRoom)());
       if (wasVisible && client?.flushLastViewedToPrivateStoreStanza) {
         client.flushLastViewedToPrivateStoreStanza(rooms, {
-          visibleRoomJID: activeRoomJID
+          visibleRoomJID: activeRoomJID,
+          // Carry the same boundary to the SERVER marker - without it
+          // the flush defaults to "everything" for the visible room.
+          // Clamped exactly like the local stamp above.
+          visibleRoomTs: activeRoomJID ? (0, _getServerReadTimestamp.getFlushBoundaryTs)(rooms?.[activeRoomJID], state.roomHeapSlice, boundaryTs) : undefined
         }).catch(() => {});
       }
     }
@@ -645,32 +692,44 @@ const XmppProvider = ({
         return;
       }
       lastMessagesRef = room.messages;
-      let newest = 0;
-      const list = room.messages || [];
-      for (const m of list) {
-        if (!m || m.id === 'delimiter-new') {
-          continue;
-        }
-        const ms = (0, _roomsSlice.msgSortableMs)(m);
-        if (ms > newest) {
-          newest = ms;
-        }
-      }
-      if (newest <= lastStampedMs) {
+
+      // getReadMarkerTimestamp (not a hand-rolled scan + Date.now()):
+      // it excludes pending/optimistic messages, which carry the DEVICE
+      // send time via `date` until the server echoes them back - a
+      // manual scan without that exclusion could pick up a pending
+      // message's device timestamp here and write a future marker the
+      // same way a raw Date.now() would (bug #38). And when the user has
+      // scrolled up (a boundary is set for this room), it clamps to that
+      // boundary instead of the newest message - without this, every
+      // incoming message while scrolled up advanced the marker to
+      // "newest" regardless of scroll position, and the later, smaller
+      // boundary write on leave was rejected by the forward-only
+      // private-store merge, leaving 0 unread even after a restart
+      // (customer #42, a regression of #33 reintroduced by #38).
+      const boundaryTs = s.rooms?.readBoundaries?.[jid] ?? null;
+      const newest = (0, _getServerReadTimestamp.getReadMarkerTimestamp)(room, s.roomHeapSlice, boundaryTs);
+      if (!newest || newest <= lastStampedMs) {
         return;
       }
       lastStampedMs = newest;
       _roomStore.store.dispatch((0, _roomsSlice.setLastViewedTimestamp)({
         chatJID: jid,
-        timestamp: Date.now()
+        timestamp: newest
       }));
       if (flushTimer) {
         clearTimeout(flushTimer);
       }
       if (client?.flushLastViewedToPrivateStoreStanza) {
         flushTimer = setTimeout(() => {
-          client.flushLastViewedToPrivateStoreStanza(_roomStore.store.getState().rooms?.rooms, {
-            visibleRoomJID: jid
+          // Re-read fresh state rather than closing over `boundaryTs`:
+          // the user may have scrolled back to the bottom (clearing the
+          // boundary) in the 2s between the stamp and this flush, and
+          // the flush should reflect that.
+          const freshState = _roomStore.store.getState();
+          const freshBoundaryTs = freshState.rooms?.readBoundaries?.[jid] ?? null;
+          client.flushLastViewedToPrivateStoreStanza(freshState.rooms?.rooms, {
+            visibleRoomJID: jid,
+            visibleRoomTs: (0, _getServerReadTimestamp.getFlushBoundaryTs)(freshState.rooms?.rooms?.[jid], freshState.roomHeapSlice, freshBoundaryTs)
           }).catch(() => {});
         }, 2000);
       }