@ethora/chat-component-rn 26.7.8 → 26.7.10

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

@@ -1 +1 @@
-{"version":3,"names":["React","useEffect","useState","isSecureFileUrl","requestFileTokenRecovery","pushLog","Container","useDispatch","setActiveFile","setActiveModal","MODAL_TYPES","ActivityIndicator","Image","TouchableOpacity","View","defaultMediaDims","fitMediaDimensions","jsx","_jsx","jsxs","_jsxs","maskToken","url","replace","FALLBACK_IMAGE","CustomMessageImage","fileURL","fileName","mimetype","locationPreview","displayURL","loading","setLoading","dims","setDims","dispatch","active","getSize","w","h","error","message","String","handleOpen","FILE_PREVIEW","style","width","children","onPress","activeOpacity","position","height","alignItems","justifyContent","zIndex","size","color","source","uri","borderRadius","backgroundColor","onLoadEnd","onError","event","usingPreview","nativeEvent","resizeMode"],"sourceRoot":"../../../../src","sources":["components/styled/MessageImage.tsx"],"mappings":";;AAAA,OAAOA,KAAK,IAAIC,SAAS,EAAEC,QAAQ,QAAQ,OAAO;AAClD,SACEC,eAAe,EACfC,wBAAwB,QACnB,6BAA6B;AACpC,SAASC,OAAO,QAAQ,uBAAuB;AAC/C,SAASC,SAAS,QAAQ,yCAAyC;AACnE,SAASC,WAAW,QAAQ,aAAa;AACzC,SACEC,aAAa,EACbC,cAAc,QACT,mCAAmC;AAC1C,SAASC,WAAW,QAAQ,qCAAqC;AACjE,SAASC,iBAAiB,EAAEC,KAAK,EAAEC,gBAAgB,EAAEC,IAAI,QAAQ,cAAc;AAC/E,SACEC,gBAAgB,EAChBC,kBAAkB,QAEb,+BAA+B;AAAC,SAAAC,GAAA,IAAAC,IAAA,EAAAC,IAAA,IAAAC,KAAA;AAgBvC;AACA,MAAMC,SAAS,GAAIC,GAAY,IAC7B,CAACA,GAAG,IAAI,EAAE,EAAEC,OAAO,CAAC,iBAAiB,EAAE,cAAc,CAAC;AAExD,MAAMC,cAAc,GAClB,gGAAgG;AAElG,MAAMC,kBAAqD,GAAGA,CAAC;EAC7DC,OAAO;EACPC,QAAQ;EACRC,QAAQ;EACRC;AACF,CAAC,KAAK;EACJ;EACA;EACA;EACA,MAAMC,UAAU,GAAGD,eAAe,IAAIH,OAAO;EAC7C,MAAM,CAACK,OAAO,EAAEC,UAAU,CAAC,GAAG9B,QAAQ,CAAC,IAAI,CAAC;EAC5C;EACA;EACA,MAAM,CAAC+B,IAAI,EAAEC,OAAO,CAAC,GAAGhC,QAAQ,CAAYa,gBAAgB,CAAC,CAAC,CAAC;EAE/D,MAAMoB,QAAQ,GAAG5B,WAAW,CAAC,CAAC;EAE9BN,SAAS,CAAC,MAAM;IACd,IAAI,CAAC6B,UAAU,EAAE;MACf;IACF;IACA,IAAIM,MAAM,GAAG,IAAI;IACjBxB,KAAK,CAACyB,OAAO,CACXP,UAAU,EACV,CAACQ,CAAC,EAAEC,CAAC,KAAK;MACR,IAAIH,MAAM,EAAE;QACVF,OAAO,CAAClB,kBAAkB,CAACsB,CAAC,EAAEC,CAAC,CAAC,CAAC;MACnC;IACF,CAAC,EACAC,KAAK,IAAK;MACT;MACA;MACA;MACAnC,OAAO,CAAC,MAAM,EAAE,uBAAuB,EAAE;QACvCiB,GAAG,EAAED,SAAS,CAACS,UAAU,CAAC;QAC1BU,KAAK,EAAGA,KAAK,EAAUC,OAAO,IAAIC,MAAM,CAACF,KAAK;MAChD,CAAC,CAAC;IACJ,CACF,CAAC;IACD,OAAO,MAAM;MACXJ,MAAM,GAAG,KAAK;IAChB,CAAC;EACH,CAAC,EAAE,CAACN,UAAU,CAAC,CAAC;EAEhB,MAAMa,UAAU,GAAGA,CAAA,KAAM;IACvBR,QAAQ,CAAC3B,aAAa,CAAC;MAAEmB,QAAQ;MAAED,OAAO;MAAEE;IAAS,CAAC,CAAC,CAAC;IACxDO,QAAQ,CAAC1B,cAAc,CAACC,WAAW,CAACkC,YAAY,CAAC,CAAC;EACpD,CAAC;EAED,oBACE1B,IAAA,CAACZ,SAAS;IAACuC,KAAK,EAAE;MAAEC,KAAK,EAAEb,IAAI,CAACa;IAAM,CAAE;IAAAC,QAAA,eACtC3B,KAAA,CAACP,gBAAgB;MAACmC,OAAO,EAAEL,UAAW;MAACM,aAAa,EAAE,GAAI;MAAAF,QAAA,GACvDhB,OAAO,iBACNb,IAAA,CAACJ,IAAI;QACH+B,KAAK,EAAE;UACLK,QAAQ,EAAE,UAAU;UACpBJ,KAAK,EAAEb,IAAI,CAACa,KAAK;UACjBK,MAAM,EAAElB,IAAI,CAACkB,MAAM;UACnBC,UAAU,EAAE,QAAQ;UACpBC,cAAc,EAAE,QAAQ;UACxBC,MAAM,EAAE;QACV,CAAE;QAAAP,QAAA,eAEF7B,IAAA,CAACP,iBAAiB;UAAC4C,IAAI,EAAC,OAAO;UAACC,KAAK,EAAC;QAAS,CAAE;MAAC,CAC9C,CACP,eACDtC,IAAA,CAACN,KAAK;QACJ6C,MAAM,EAAE;UAAEC,GAAG,EAAE5B,UAAU,IAAIN;QAAe,CAAE;QAC9CqB,KAAK,EAAE;UACLC,KAAK,EAAEb,IAAI,CAACa,KAAK;UACjBK,MAAM,EAAElB,IAAI,CAACkB,MAAM;UACnBQ,YAAY,EAAE,EAAE;UAChBC,eAAe,EAAE;QACnB,CAAE;QACFC,SAAS,EAAEA,CAAA,KAAM7B,UAAU,CAAC,KAAK,CAAE;QACnC8B,OAAO,EAAGC,KAAK,IAAK;UAClB/B,UAAU,CAAC,KAAK,CAAC;UACjB3B,OAAO,CAAC,MAAM,EAAE,oBAAoB,EAAE;YACpCiB,GAAG,EAAED,SAAS,CAACS,UAAU,CAAC;YAC1BkC,YAAY,EAAE,CAAC,CAACnC,eAAe;YAC/BW,KAAK,EAAGuB,KAAK,EAAUE,WAAW,EAAEzB;UACtC,CAAC,CAAC;UACF,IAAIrC,eAAe,CAAC2B,UAAU,CAAC,EAAE;YAC/B1B,wBAAwB,CAAC,CAAC;UAC5B;QACF;QACA;QACA;QAAA;QACA8D,UAAU,EAAC;MAAO,CACnB,CAAC;IAAA,CACc;EAAC,CACV,CAAC;AAEhB,CAAC;AAED,eAAezC,kBAAkB","ignoreList":[]}
+{"version":3,"names":["React","useEffect","useState","isSecureFileUrl","requestFileTokenRecovery","pushLog","Container","useDispatch","setActiveFile","setActiveModal","MODAL_TYPES","ActivityIndicator","Image","TouchableOpacity","View","defaultMediaDims","fitMediaDimensions","jsx","_jsx","jsxs","_jsxs","maskToken","url","replace","FALLBACK_IMAGE","CustomMessageImage","fileURL","fileName","originalName","mimetype","locationPreview","displayURL","loading","setLoading","dims","setDims","dispatch","active","getSize","w","h","error","message","String","handleOpen","FILE_PREVIEW","style","width","children","onPress","activeOpacity","position","height","alignItems","justifyContent","zIndex","size","color","source","uri","borderRadius","backgroundColor","onLoadEnd","onError","event","usingPreview","nativeEvent","resizeMode"],"sourceRoot":"../../../../src","sources":["components/styled/MessageImage.tsx"],"mappings":"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","ignoreList":[]}

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

@@ -9,6 +9,7 @@ import { ActivityIndicator, View } from 'react-native';
 import { useChatSettingState } from '../../hooks/useChatSettingState';
 import { FileIcon } from '../../assets/icons';
 import { getExtensionForMime } from '../../helpers/mimeToExtension';
+import { getDisplayFileName } from '../../helpers/getDisplayFileName';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 const FileDownload = ({
   fileName,
@@ -26,6 +27,15 @@ const FileDownload = ({
   const {
     config
   } = 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 = getDisplayFileName({
+    originalName,
+    fileName,
+    location: fileURL,
+    mimetype
+  });
   const formatFileSize = sizeInBytes => {
     const size = parseInt(sizeInBytes, 10);
     if (isNaN(size)) {
@@ -66,9 +76,9 @@ const FileDownload = ({
     dispatch(setActiveModal(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 getExtensionForMime(mimetype).replace('.', '').toUpperCase();
   })();
@@ -87,7 +97,7 @@ const FileDownload = ({
         isUser: isUser,
         colorIsUser: config?.colors?.primary,
         colorUsers: config?.colors?.secondary,
-        children: formatFileName(fileName, 20)
+        children: formatFileName(displayName, 20)
       }), (pending || size) && /*#__PURE__*/_jsx(FileSizeContainer, {
         children: pending ? /*#__PURE__*/_jsxs(View, {
           style: {

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

@@ -1 +1 @@
-{"version":3,"names":["React","BackgroundFile","FileInformation","FileName","FileSize","FileSizeContainer","UnsupportedContainer","useDispatch","MODAL_TYPES","setActiveFile","setActiveModal","ActivityIndicator","View","useChatSettingState","FileIcon","getExtensionForMime","jsx","_jsx","jsxs","_jsxs","FileDownload","fileName","fileURL","mimetype","size","isUser","originalName","duration","waveForm","pending","placeholderIcon","dispatch","config","formatFileSize","sizeInBytes","parseInt","isNaN","toFixed","formatFileName","name","maxLength","dotIndex","lastIndexOf","extension","substring","baseName","length","shortenedBaseName","handleOpen","FILE_PREVIEW","extensionLabel","slice","toUpperCase","replace","onPress","activeOpacity","children","width","height","numberOfLines","colorIsUser","colors","primary","colorUsers","secondary","style","flexDirection","alignItems","gap","color"],"sourceRoot":"../../../../src","sources":["components/styled/UnsupportedType.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["React","BackgroundFile","FileInformation","FileName","FileSize","FileSizeContainer","UnsupportedContainer","useDispatch","MODAL_TYPES","setActiveFile","setActiveModal","ActivityIndicator","View","useChatSettingState","FileIcon","getExtensionForMime","getDisplayFileName","jsx","_jsx","jsxs","_jsxs","FileDownload","fileName","fileURL","mimetype","size","isUser","originalName","duration","waveForm","pending","placeholderIcon","dispatch","config","displayName","location","formatFileSize","sizeInBytes","parseInt","isNaN","toFixed","formatFileName","name","maxLength","dotIndex","lastIndexOf","extension","substring","baseName","length","shortenedBaseName","handleOpen","FILE_PREVIEW","extensionLabel","slice","toUpperCase","replace","onPress","activeOpacity","children","width","height","numberOfLines","colorIsUser","colors","primary","colorUsers","secondary","style","flexDirection","alignItems","gap","color"],"sourceRoot":"../../../../src","sources":["components/styled/UnsupportedType.tsx"],"mappings":";;AAAA,OAAOA,KAAK,MAAM,OAAO;AAEzB,SACEC,cAAc,EACdC,eAAe,EACfC,QAAQ,EACRC,QAAQ,EACRC,iBAAiB,EACjBC,oBAAoB,QACf,yCAAyC;AAChD,SAASC,WAAW,QAAQ,aAAa;AACzC,SAASC,WAAW,QAAQ,qCAAqC;AACjE,SACEC,aAAa,EACbC,cAAc,QACT,mCAAmC;AAC1C,SAASC,iBAAiB,EAAEC,IAAI,QAAQ,cAAc;AACtD,SAASC,mBAAmB,QAAQ,iCAAiC;AACrE,SAASC,QAAQ,QAAQ,oBAAoB;AAC7C,SAASC,mBAAmB,QAAQ,+BAA+B;AACnE,SAASC,kBAAkB,QAAQ,kCAAkC;AAAC,SAAAC,GAAA,IAAAC,IAAA,EAAAC,IAAA,IAAAC,KAAA;AAetE,MAAMC,YAAyC,GAAGA,CAAC;EACjDC,QAAQ;EACRC,OAAO;EACPC,QAAQ;EACRC,IAAI;EACJC,MAAM;EACNC,YAAY;EACZC,QAAQ;EACRC,QAAQ;EACRC,OAAO,GAAG,KAAK;EACfC;AACF,CAAC,KAAK;EACJ,MAAMC,QAAQ,GAAGzB,WAAW,CAAC,CAAC;EAC9B,MAAM;IAAE0B;EAAO,CAAC,GAAGpB,mBAAmB,CAAC,CAAC;;EAExC;EACA;EACA,MAAMqB,WAAW,GAAGlB,kBAAkB,CAAC;IACrCW,YAAY;IACZL,QAAQ;IACRa,QAAQ,EAAEZ,OAAO;IACjBC;EACF,CAAC,CAAC;EAEF,MAAMY,cAAc,GAAIC,WAAmB,IAAa;IACtD,MAAMZ,IAAI,GAAGa,QAAQ,CAACD,WAAW,EAAE,EAAE,CAAC;IAEtC,IAAIE,KAAK,CAACd,IAAI,CAAC,EAAE;MACf,OAAO,cAAc;IACvB;IAEA,IAAIA,IAAI,GAAG,IAAI,EAAE;MACf,OAAO,GAAGA,IAAI,IAAI;IACpB,CAAC,MAAM,IAAIA,IAAI,GAAG,IAAI,IAAI,CAAC,EAAE;MAC3B,OAAO,GAAG,CAACA,IAAI,GAAG,IAAI,EAAEe,OAAO,CAAC,CAAC,CAAC,KAAK;IACzC,CAAC,MAAM,IAAIf,IAAI,GAAG,IAAI,IAAI,CAAC,EAAE;MAC3B,OAAO,GAAG,CAACA,IAAI,GAAG,IAAI,IAAI,CAAC,EAAEe,OAAO,CAAC,CAAC,CAAC,KAAK;IAC9C,CAAC,MAAM;MACL,OAAO,GAAG,CAACf,IAAI,GAAG,IAAI,IAAI,CAAC,EAAEe,OAAO,CAAC,CAAC,CAAC,KAAK;IAC9C;EACF,CAAC;EAED,MAAMC,cAAc,GAAGA,CAACC,IAAY,EAAEC,SAAiB,KAAa;IAClE,MAAMC,QAAQ,GAAGF,IAAI,CAACG,WAAW,CAAC,GAAG,CAAC;IACtC,MAAMC,SAAS,GAAGF,QAAQ,KAAK,CAAC,CAAC,GAAGF,IAAI,CAACK,SAAS,CAACH,QAAQ,CAAC,GAAG,EAAE;IAEjE,MAAMI,QAAQ,GAAGJ,QAAQ,KAAK,CAAC,CAAC,GAAGF,IAAI,CAACK,SAAS,CAAC,CAAC,EAAEH,QAAQ,CAAC,GAAGF,IAAI;IAErE,IAAIM,QAAQ,CAACC,MAAM,GAAGH,SAAS,CAACG,MAAM,IAAIN,SAAS,EAAE;MACnD,OAAOD,IAAI;IACb;IAEA,MAAMQ,iBAAiB,GAAGF,QAAQ,CAACD,SAAS,CAC1C,CAAC,EACDJ,SAAS,GAAGG,SAAS,CAACG,MAAM,GAAG,CACjC,CAAC;IAED,OAAO,GAAGC,iBAAiB,MAAMJ,SAAS,EAAE;EAC9C,CAAC;EAED,MAAMK,UAAU,GAAGA,CAAA,KAAM;IACvB,IAAI,CAAC5B,OAAO,IAAIO,OAAO,EAAE;MACvB;IACF;IACAE,QAAQ,CACNvB,aAAa,CAAC;MACZa,QAAQ;MACRC,OAAO;MACPC,QAAQ;MACRG,YAAY;MACZC,QAAQ;MACRC;IACF,CAAC,CACH,CAAC;IACDG,QAAQ,CAACtB,cAAc,CAACF,WAAW,CAAC4C,YAAY,CAAC,CAAC;EACpD,CAAC;EAED,MAAMC,cAAc,GAAG,CAAC,MAAM;IAC5B,MAAMT,QAAQ,GAAGV,WAAW,CAACW,WAAW,CAAC,GAAG,CAAC;IAC7C,IAAID,QAAQ,KAAK,CAAC,CAAC,IAAIA,QAAQ,GAAGV,WAAW,CAACe,MAAM,GAAG,CAAC,EAAE;MACxD,OAAOf,WAAW,CAACoB,KAAK,CAACV,QAAQ,GAAG,CAAC,CAAC,CAACW,WAAW,CAAC,CAAC;IACtD;IACA,OAAOxC,mBAAmB,CAACS,QAAQ,CAAC,CAACgC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAACD,WAAW,CAAC,CAAC;EACrE,CAAC,EAAE,CAAC;EAEJ,oBACEnC,KAAA,CAACd,oBAAoB;IACnBoB,MAAM,EAAEA,MAAO;IACf+B,OAAO,EAAEN,UAAW;IACpBO,aAAa,EAAE5B,OAAO,GAAG,CAAC,GAAG,GAAI;IAAA6B,QAAA,gBAEjCzC,IAAA,CAACjB,cAAc;MAAA0D,QAAA,EACZ5B,eAAe,iBAAIb,IAAA,CAACJ,QAAQ;QAAC8C,KAAK,EAAE,EAAG;QAACC,MAAM,EAAE;MAAG,CAAE;IAAC,CACzC,CAAC,eACjBzC,KAAA,CAAClB,eAAe;MAAAyD,QAAA,gBACdzC,IAAA,CAACf,QAAQ;QACP2D,aAAa,EAAE,CAAE;QACjBpC,MAAM,EAAEA,MAAO;QACfqC,WAAW,EAAE9B,MAAM,EAAE+B,MAAM,EAAEC,OAAQ;QACrCC,UAAU,EAAEjC,MAAM,EAAE+B,MAAM,EAAEG,SAAU;QAAAR,QAAA,EACtClB,cAAc,CAACP,WAAW,EAAE,EAAE;MAAC,CAAW,CAAC,EAC5C,CAACJ,OAAO,IAAIL,IAAI,kBACfP,IAAA,CAACb,iBAAiB;QAAAsD,QAAA,EACf7B,OAAO,gBACNV,KAAA,CAACR,IAAI;UACHwD,KAAK,EAAE;YACLC,aAAa,EAAE,KAAK;YACpBC,UAAU,EAAE,QAAQ;YACpBC,GAAG,EAAE;UACP,CAAE;UAAAZ,QAAA,gBAEFzC,IAAA,CAACP,iBAAiB;YAACc,IAAI,EAAC,OAAO;YAAC+C,KAAK,EAAC;UAAS,CAAE,CAAC,eAClDtD,IAAA,CAACd,QAAQ;YAAAuD,QAAA,EAAC;UAAY,CAAU,CAAC;QAAA,CAC7B,CAAC,gBAEPzC,IAAA,CAACd,QAAQ;UAAAuD,QAAA,EAAEvB,cAAc,CAACX,IAAc;QAAC,CAAW;MACrD,CACgB,CACpB,EACA,CAACK,OAAO,IAAI,CAACL,IAAI,iBAChBP,IAAA,CAACb,iBAAiB;QAAAsD,QAAA,eAChBzC,IAAA,CAACd,QAAQ;UAAAuD,QAAA,EAAEN;QAAc,CAAW;MAAC,CACpB,CACpB;IAAA,CACc,CAAC;EAAA,CACE,CAAC;AAE3B,CAAC;AAED,eAAehC,YAAY","ignoreList":[]}

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

@@ -108,6 +108,7 @@ const PlaceholderVideo = ({
 };
 const CustomMessageVideo = ({
   fileName,
+  originalName,
   fileURL,
   mimetype,
   previewURL
@@ -118,7 +119,8 @@ const CustomMessageVideo = ({
     dispatch(setActiveFile({
       fileName,
       fileURL,
-      mimetype
+      mimetype,
+      originalName
     }));
     dispatch(setActiveModal(MODAL_TYPES.FILE_PREVIEW));
   };

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

@@ -1 +1 @@
-{"version":3,"names":["React","useEffect","useState","isSecureFileUrl","requestFileTokenRecovery","Image","Pressable","StyleSheet","View","useDispatch","setActiveFile","setActiveModal","MODAL_TYPES","PlayIcon","defaultMediaDims","fitMediaDimensions","jsx","_jsx","jsxs","_jsxs","PlayBadge","style","styles","overlay","pointerEvents","children","playButton","width","height","PosterVideo","previewURL","onOpen","onPosterError","dims","setDims","active","getSize","w","h","onPress","wrapper","accessibilityRole","accessibilityLabel","source","uri","video","resizeMode","onError","PlaceholderVideo","CustomMessageVideo","fileName","fileURL","mimetype","dispatch","posterFailed","setPosterFailed","handleOpen","FILE_PREVIEW","create","borderRadius","overflow","backgroundColor","absoluteFill","justifyContent","alignItems"],"sourceRoot":"../../../../src","sources":["components/styled/VideoMessage.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["React","useEffect","useState","isSecureFileUrl","requestFileTokenRecovery","Image","Pressable","StyleSheet","View","useDispatch","setActiveFile","setActiveModal","MODAL_TYPES","PlayIcon","defaultMediaDims","fitMediaDimensions","jsx","_jsx","jsxs","_jsxs","PlayBadge","style","styles","overlay","pointerEvents","children","playButton","width","height","PosterVideo","previewURL","onOpen","onPosterError","dims","setDims","active","getSize","w","h","onPress","wrapper","accessibilityRole","accessibilityLabel","source","uri","video","resizeMode","onError","PlaceholderVideo","CustomMessageVideo","fileName","originalName","fileURL","mimetype","dispatch","posterFailed","setPosterFailed","handleOpen","FILE_PREVIEW","create","borderRadius","overflow","backgroundColor","absoluteFill","justifyContent","alignItems"],"sourceRoot":"../../../../src","sources":["components/styled/VideoMessage.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/context/xmppProvider.js

@@ -14,7 +14,8 @@ import { allRoomPresences } from '../networking/xmpp/allRoomPresences.xmpp';
 import { pushSubscriptionService } from '../services/pushSubscriptionService';
 import { store } from '../roomStore';
 import { logout, setStoreClient, setConfig } from '../roomStore/chatSettingsSlice';
-import { setLogoutState, setVisibleRoom, clearVisibleRoom, setLastViewedTimestamp, deleteRoomMessage, msgSortableMs, setUnreadSyncing } from '../roomStore/roomsSlice';
+import { setLogoutState, setVisibleRoom, clearVisibleRoom, setLastViewedTimestamp, deleteRoomMessage, setUnreadSyncing } from '../roomStore/roomsSlice';
+import { getFlushBoundaryTs, getReadMarkerTimestamp } from '../helpers/getServerReadTimestamp';
 import { runHistoryPreloadScheduler } from '../helpers/historyPreloadScheduler';
 import { updateMessagesTillLast } from '../helpers/updateMessagesTillLast';
 import { secureUserStorage } from '../helpers/secureUserStorage';
@@ -537,17 +538,40 @@ export 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) {
-        store.dispatch(setLastViewedTimestamp({
-          chatJID: visibleRoomJID,
-          timestamp: Date.now()
-        }));
+        boundaryTs = state.rooms?.readBoundaries?.[visibleRoomJID] ?? null;
+        const readTs = 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) {
+          store.dispatch(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).
@@ -558,9 +582,14 @@ export const XmppProvider = ({
         store.dispatch(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 ? getFlushBoundaryTs(rooms?.[visibleRoomJID], state.roomHeapSlice, boundaryTs) : undefined
       }).catch(() => {});
     });
     return () => sub.remove();
@@ -573,11 +602,11 @@ export 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 = useRef(false);
   useEffect(() => {
@@ -596,11 +625,25 @@ export 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) {
-        store.dispatch(setLastViewedTimestamp({
-          chatJID: activeRoomJID,
-          timestamp: Date.now()
-        }));
+        const readTs = getReadMarkerTimestamp(rooms?.[activeRoomJID], state.roomHeapSlice, boundaryTs);
+        if (readTs > 0) {
+          store.dispatch(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).
         store.dispatch(deleteRoomMessage({
@@ -611,7 +654,11 @@ export const XmppProvider = ({
       store.dispatch(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 ? getFlushBoundaryTs(rooms?.[activeRoomJID], state.roomHeapSlice, boundaryTs) : undefined
         }).catch(() => {});
       }
     }
@@ -637,32 +684,44 @@ export 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 = 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 = getReadMarkerTimestamp(room, s.roomHeapSlice, boundaryTs);
+      if (!newest || newest <= lastStampedMs) {
         return;
       }
       lastStampedMs = newest;
       store.dispatch(setLastViewedTimestamp({
         chatJID: jid,
-        timestamp: Date.now()
+        timestamp: newest
       }));
       if (flushTimer) {
         clearTimeout(flushTimer);
       }
       if (client?.flushLastViewedToPrivateStoreStanza) {
         flushTimer = setTimeout(() => {
-          client.flushLastViewedToPrivateStoreStanza(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 = store.getState();
+          const freshBoundaryTs = freshState.rooms?.readBoundaries?.[jid] ?? null;
+          client.flushLastViewedToPrivateStoreStanza(freshState.rooms?.rooms, {
+            visibleRoomJID: jid,
+            visibleRoomTs: getFlushBoundaryTs(freshState.rooms?.rooms?.[jid], freshState.roomHeapSlice, freshBoundaryTs)
           }).catch(() => {});
         }, 2000);
       }

package/lib/module/context/xmppProvider.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","createContext","useCallback","useContext","useEffect","useMemo","useRef","useState","AppState","DeviceEventEmitter","NetInfo","VideoCallOverlay","XmppClient","refreshAuthTokensQuietly","buildXmppClientKey","getGlobalXmppClient","getReusableXmppClientByKey","isXmppClientReusable","setGlobalXmppClient","withXmppClientInitLock","applyResolvedUserToStore","refreshUserCredentialsForXmpp","resolveInitBeforeLoadUser","ensureScopedChatCache","getRooms","prefetchRoomsViaRest","allRoomPresences","pushSubscriptionService","store","logout","setStoreClient","setConfig","setLogoutState","setVisibleRoom","clearVisibleRoom","setLastViewedTimestamp","deleteRoomMessage","msgSortableMs","setUnreadSyncing","runHistoryPreloadScheduler","updateMessagesTillLast","secureUserStorage","clearPersistedState","pushLog","devPushLog","jsx","_jsx","jsxs","_jsxs","XmppContext","LOGOUT_EVENT","subscribeAllRoomsForPush","client","reason","rooms","Object","keys","getState","length","nick","jid","getLocal","subscribeToRooms","then","catch","e","XmppProvider","children","config","isVisible","setClient","providerBootstrapStatus","setProviderBootstrapStatus","initMode","initBeforeLoad","lastCredsRef","completedBootstrapKeyRef","inflightBootstrapKeyRef","credentialsProvider","refreshTokens","enabled","rotated","force","xmppPassword","rotatedUser","chatSettingStore","user","username","xmppUsername","defaultWallet","walletAddress","password","fresh","err","u","jwtLogin","token","userLogin","customLogin","initBeforeLoadAuth","myEndpoint","initializeClient","xmppSettings","settings","key","reusable","current","created","prevGlobal","close","newClient","setCredentialsProvider","waitForOnline","console","error","setOnOnline","underlying","finally","getChatsPrivateStoreRequestStanza","abortController","AbortController","cancelled","MAX_BOOTSTRAP_ATTEMPTS","bootstrapAttempt","BOOTSTRAP_BUDGET_MS","reachedReady","budgetTimer","setTimeout","abort","dispatch","clearBudget","clearTimeout","run","explicitUser","appId","baseUrl","devServer","join","mode","clearStoreBeforeInit","remove","undefined","resolved","signal","hasResolved","xmppPasswordPresent","connectPassword","restRoomsPromise","c","getRoomsStanza","roomCount","qos","historyQoS","activeRoomJID","defaultRoomJids","defaultRooms","map","r","filter","Boolean","selectedRoomJid","concurrency","stagedPreloadConcurrency","pageSize","stagedPreloadFirstPassSize","roomLimit","preloadTopKRooms","warn","aborted","backoff","Math","min","message","status","response","data","id","setInterval","currentState","suppressReconnect","forceReconnect","ensureStreamAlive","clearInterval","visibleBeforeBackground","suspendInBackground","keepAliveInBackground","sub","addEventListener","next","isSuspended","resume","roomJID","suspend","state","visibleRoomJID","chatJID","timestamp","Date","now","messageId","flushLastViewedToPrivateStoreStanza","chatWasVisibleRef","wasVisible","lastMessagesRef","lastStampedMs","flushTimer","advance","s","room","messages","newest","list","m","ms","unsub","subscribe","reachable","isConnected","isInternetReachable","addListener","disconnect","Provider","value","useXmppClient","context","Error","candidates","live","find","emitXmppLogout","emit"],"sourceRoot":"../../../src","sources":["context/xmppProvider.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["React","createContext","useCallback","useContext","useEffect","useMemo","useRef","useState","AppState","DeviceEventEmitter","NetInfo","VideoCallOverlay","XmppClient","refreshAuthTokensQuietly","buildXmppClientKey","getGlobalXmppClient","getReusableXmppClientByKey","isXmppClientReusable","setGlobalXmppClient","withXmppClientInitLock","applyResolvedUserToStore","refreshUserCredentialsForXmpp","resolveInitBeforeLoadUser","ensureScopedChatCache","getRooms","prefetchRoomsViaRest","allRoomPresences","pushSubscriptionService","store","logout","setStoreClient","setConfig","setLogoutState","setVisibleRoom","clearVisibleRoom","setLastViewedTimestamp","deleteRoomMessage","setUnreadSyncing","getFlushBoundaryTs","getReadMarkerTimestamp","runHistoryPreloadScheduler","updateMessagesTillLast","secureUserStorage","clearPersistedState","pushLog","devPushLog","jsx","_jsx","jsxs","_jsxs","XmppContext","LOGOUT_EVENT","subscribeAllRoomsForPush","client","reason","rooms","Object","keys","getState","length","nick","jid","getLocal","subscribeToRooms","then","catch","e","XmppProvider","children","config","isVisible","setClient","providerBootstrapStatus","setProviderBootstrapStatus","initMode","initBeforeLoad","lastCredsRef","completedBootstrapKeyRef","inflightBootstrapKeyRef","credentialsProvider","refreshTokens","enabled","rotated","force","xmppPassword","rotatedUser","chatSettingStore","user","username","xmppUsername","defaultWallet","walletAddress","password","fresh","err","u","jwtLogin","token","userLogin","customLogin","initBeforeLoadAuth","myEndpoint","initializeClient","xmppSettings","settings","key","reusable","current","created","prevGlobal","close","newClient","setCredentialsProvider","waitForOnline","console","error","setOnOnline","underlying","finally","getChatsPrivateStoreRequestStanza","abortController","AbortController","cancelled","MAX_BOOTSTRAP_ATTEMPTS","bootstrapAttempt","BOOTSTRAP_BUDGET_MS","reachedReady","budgetTimer","setTimeout","abort","dispatch","clearBudget","clearTimeout","run","explicitUser","appId","baseUrl","devServer","join","mode","clearStoreBeforeInit","remove","undefined","resolved","signal","hasResolved","xmppPasswordPresent","connectPassword","restRoomsPromise","c","getRoomsStanza","roomCount","qos","historyQoS","activeRoomJID","defaultRoomJids","defaultRooms","map","r","filter","Boolean","selectedRoomJid","concurrency","stagedPreloadConcurrency","pageSize","stagedPreloadFirstPassSize","roomLimit","preloadTopKRooms","warn","aborted","backoff","Math","min","message","status","response","data","id","setInterval","currentState","suppressReconnect","forceReconnect","ensureStreamAlive","clearInterval","visibleBeforeBackground","suspendInBackground","keepAliveInBackground","sub","addEventListener","next","isSuspended","resume","roomJID","suspend","state","visibleRoomJID","boundaryTs","readBoundaries","readTs","roomHeapSlice","chatJID","timestamp","messageId","flushLastViewedToPrivateStoreStanza","visibleRoomTs","chatWasVisibleRef","wasVisible","lastMessagesRef","lastStampedMs","flushTimer","advance","s","room","messages","newest","freshState","freshBoundaryTs","unsub","subscribe","reachable","isConnected","isInternetReachable","addListener","disconnect","Provider","value","useXmppClient","context","Error","candidates","live","find","emitXmppLogout","emit"],"sourceRoot":"../../../src","sources":["context/xmppProvider.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/helpers/createMessageFromXml.js

@@ -82,6 +82,24 @@ export const createMessageFromXml = async (arg, bodyEl, positionalId, positional
   const fullName = (merged.fullName || '').toString().trim();
   const senderJID = (merged.senderJID || '').toString();
   const senderLocal = senderJID.includes('@') ? senderJID.split('@')[0] : senderJID;
+
+  // Bug #41 root cause: the resource of the MUC `from` (room@conference/
+  // occupant-id) is the SAME field getDataFromXml uses to derive
+  // `user.id` for live messages and for the wrapped MAM convention
+  // (getHistory.xmpp.ts) - it's stamped by the server itself when the
+  // sender joined the room, so it's always present and always correct.
+  // The positional convention (onMessageHistory's MAM catch-up path)
+  // never called getDataFromXml, so it fell back to splitting the
+  // sender-supplied `<data senderJID>` attr on '@' instead - usually the
+  // same value, but WRONG (picks up the room's own id, not the
+  // sender's) whenever senderJID is absent from the stanza, and simply a
+  // different derivation than the live path even when it happens to
+  // agree. Prefer the resource-of-`from` here too so every path that
+  // reaches this function resolves the same sender identity the same
+  // way, instead of MAM catch-up rows needing a later correction once
+  // the "official" fetch lands.
+  const xmppFrom = (merged.xmppFrom || '').toString();
+  const fromResource = xmppFrom.includes('/') ? xmppFrom.split('/')[1] : '';
   const composed = [firstName, lastName].filter(Boolean).join(' ').trim();
   const existingName = String(merged?.user?.name || '').trim();
   const resolvedName = existingName || composed || fullName || senderLocal || merged?.user?.id || '';
@@ -89,7 +107,7 @@ export const createMessageFromXml = async (arg, bodyEl, positionalId, positional
     ...merged,
     user: {
       ...(merged.user || {}),
-      id: merged?.user?.id || senderLocal,
+      id: merged?.user?.id || fromResource || senderLocal,
       name: resolvedName,
       firstName: firstName || merged?.user?.firstName,
       lastName: lastName || merged?.user?.lastName

package/lib/module/helpers/createMessageFromXml.js.map

@@ -1 +1 @@
-{"version":3,"names":["createMessageFromXml","arg","bodyEl","positionalId","positionalFrom","positionalDeleted","console","log","id","body","date","user","name","roomJid","isPositional","undefined","inner","outerExtras","bodyText","getText","text","split","xmppFrom","deleted","data","merged","isDeleted","numericPart","exec","String","Date","slice","toISOString","now","firstName","senderFirstName","toString","trim","lastName","senderLastName","fullName","senderJID","senderLocal","includes","composed","filter","Boolean","join","existingName","resolvedName","message"],"sourceRoot":"../../../src","sources":["helpers/createMessageFromXml.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["createMessageFromXml","arg","bodyEl","positionalId","positionalFrom","positionalDeleted","console","log","id","body","date","user","name","roomJid","isPositional","undefined","inner","outerExtras","bodyText","getText","text","split","xmppFrom","deleted","data","merged","isDeleted","numericPart","exec","String","Date","slice","toISOString","now","firstName","senderFirstName","toString","trim","lastName","senderLastName","fullName","senderJID","senderLocal","includes","fromResource","composed","filter","Boolean","join","existingName","resolvedName","message"],"sourceRoot":"../../../src","sources":["helpers/createMessageFromXml.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/helpers/getDisplayFileName.js

@@ -0,0 +1,73 @@
+"use strict";
+
+import { ensureFilenameHasExtension, filenameFromUrl } from './mimeToExtension';
+/**
+ * Picks the best human-readable filename for a chat attachment - the
+ * single source of truth for every place a file name is rendered in the
+ * UI, saved to disk, shared, or downloaded.
+ *
+ * Priority: `originalName` (the sender's own file name, e.g. "test1.pdf")
+ * beats `fileName` (the server's stored/hashed name, e.g.
+ * "3f9a1c...c2.pdf") beats the last path segment of `location`. The
+ * stored hash name is only a fallback of last resort.
+ *
+ * Bug #40: display and save/share/download logic used to prefer the
+ * stored hash name over the original one, so an attachment sent as
+ * "test1.pdf" showed up (and got saved to the phone) as something like
+ * "3f9a1c...c2.pdf" - both directions (web -> RN and RN -> RN).
+ *
+ * Always returns a non-empty string with a valid extension: if the
+ * chosen candidate has no extension (a hash name can be `<hex>` with no
+ * extension at all, or `<hex>.<ext>`), one is appended from `mimetype`
+ * (or `.bin` as a last resort when the mime is unknown/missing too).
+ */
+export function getDisplayFileName(options) {
+  const candidate = options.originalName && options.originalName.trim() || options.fileName && options.fileName.trim() || filenameFromUrl(options.location) || '';
+  return ensureFilenameHasExtension(candidate, options.mimetype);
+}
+
+/**
+ * Makes a display name safe to use as an actual path segment when
+ * saving/sharing a file to the device: strips path separators (so an
+ * odd/hostile server-provided name can't escape the target directory)
+ * and control characters. Keeps the rest of the name - including the
+ * extension - intact.
+ */
+export function sanitizeFileNameForPath(name) {
+  const cleaned = (name || '').replace(/[\/\\]/g, '_')
+  // eslint-disable-next-line no-control-regex
+  .replace(/[\x00-\x1f\x7f]/g, '').trim();
+  return cleaned || 'file';
+}
+
+/**
+ * Resolves a filename that is safe to write into a target directory:
+ * sanitizes it, then - if `exists` reports a collision - inserts
+ * " (1)", " (2)", ... before the extension until a free name is found,
+ * so saving two different attachments that share a display name never
+ * silently overwrites the first one.
+ *
+ * `exists` is injected so callers can back it with whatever existence
+ * check makes sense for their storage API (expo-file-system,
+ * StorageAccessFramework directory listing, ...) - this function stays
+ * pure and easy to unit test.
+ */
+export async function getUniqueFileName(name, exists) {
+  const safeName = sanitizeFileNameForPath(name);
+  if (!(await exists(safeName))) {
+    return safeName;
+  }
+  const dotIndex = safeName.lastIndexOf('.');
+  const base = dotIndex > 0 ? safeName.slice(0, dotIndex) : safeName;
+  const ext = dotIndex > 0 ? safeName.slice(dotIndex) : '';
+  // 999 collisions is already a pathological case; fall back to a
+  // timestamp suffix rather than looping forever.
+  for (let i = 1; i < 1000; i += 1) {
+    const candidate = `${base} (${i})${ext}`;
+    if (!(await exists(candidate))) {
+      return candidate;
+    }
+  }
+  return `${base} (${Date.now()})${ext}`;
+}
+//# sourceMappingURL=getDisplayFileName.js.map

package/lib/module/helpers/getDisplayFileName.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["ensureFilenameHasExtension","filenameFromUrl","getDisplayFileName","options","candidate","originalName","trim","fileName","location","mimetype","sanitizeFileNameForPath","name","cleaned","replace","getUniqueFileName","exists","safeName","dotIndex","lastIndexOf","base","slice","ext","i","Date","now"],"sourceRoot":"../../../src","sources":["helpers/getDisplayFileName.ts"],"mappings":";;AAAA,SAASA,0BAA0B,EAAEC,eAAe,QAAQ,mBAAmB;AAS/E;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,kBAAkBA,CAACC,OAA+B,EAAU;EAC1E,MAAMC,SAAS,GACZD,OAAO,CAACE,YAAY,IAAIF,OAAO,CAACE,YAAY,CAACC,IAAI,CAAC,CAAC,IACnDH,OAAO,CAACI,QAAQ,IAAIJ,OAAO,CAACI,QAAQ,CAACD,IAAI,CAAC,CAAE,IAC7CL,eAAe,CAACE,OAAO,CAACK,QAAQ,CAAC,IACjC,EAAE;EACJ,OAAOR,0BAA0B,CAACI,SAAS,EAAED,OAAO,CAACM,QAAQ,CAAC;AAChE;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,uBAAuBA,CAACC,IAAY,EAAU;EAC5D,MAAMC,OAAO,GAAG,CAACD,IAAI,IAAI,EAAE,EACxBE,OAAO,CAAC,SAAS,EAAE,GAAG;EACvB;EAAA,CACCA,OAAO,CAAC,kBAAkB,EAAE,EAAE,CAAC,CAC/BP,IAAI,CAAC,CAAC;EACT,OAAOM,OAAO,IAAI,MAAM;AAC1B;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,eAAeE,iBAAiBA,CACrCH,IAAY,EACZI,MAAmD,EAClC;EACjB,MAAMC,QAAQ,GAAGN,uBAAuB,CAACC,IAAI,CAAC;EAC9C,IAAI,EAAE,MAAMI,MAAM,CAACC,QAAQ,CAAC,CAAC,EAAE;IAC7B,OAAOA,QAAQ;EACjB;EACA,MAAMC,QAAQ,GAAGD,QAAQ,CAACE,WAAW,CAAC,GAAG,CAAC;EAC1C,MAAMC,IAAI,GAAGF,QAAQ,GAAG,CAAC,GAAGD,QAAQ,CAACI,KAAK,CAAC,CAAC,EAAEH,QAAQ,CAAC,GAAGD,QAAQ;EAClE,MAAMK,GAAG,GAAGJ,QAAQ,GAAG,CAAC,GAAGD,QAAQ,CAACI,KAAK,CAACH,QAAQ,CAAC,GAAG,EAAE;EACxD;EACA;EACA,KAAK,IAAIK,CAAC,GAAG,CAAC,EAAEA,CAAC,GAAG,IAAI,EAAEA,CAAC,IAAI,CAAC,EAAE;IAChC,MAAMlB,SAAS,GAAG,GAAGe,IAAI,KAAKG,CAAC,IAAID,GAAG,EAAE;IACxC,IAAI,EAAE,MAAMN,MAAM,CAACX,SAAS,CAAC,CAAC,EAAE;MAC9B,OAAOA,SAAS;IAClB;EACF;EACA,OAAO,GAAGe,IAAI,KAAKI,IAAI,CAACC,GAAG,CAAC,CAAC,IAAIH,GAAG,EAAE;AACxC","ignoreList":[]}