@ethora/chat-component-rn 26.5.7 → 26.5.11

package/lib/module/components/MainComponents/ChatWrapper.js

@@ -6,6 +6,7 @@ import ChatRoom from './ChatRoom';
 import { setActiveModal, setConfig, setDeleteModal, setStoreClient } from '../../roomStore/chatSettingsSlice';
 import { ChatWrapperBox } from '../styled/ChatWrapperBox';
 import { Overlay } from '../styled/MediaModal';
+import ConnectionBanner from './ConnectionBanner';
 import { Message } from '../MessageBubble/Message';
 import { useXmppClient } from '../../context/xmppProvider';
 import LoginForm from '../AuthForms/Login';
@@ -19,6 +20,8 @@ import { ModalWrapper } from '../Modals/ModalWrapper/ModalWrapper';
 import { useChatSettingState } from '../../hooks/useChatSettingState';
 import { DeviceEventEmitter, Pressable, Text, View } from 'react-native';
 import { pushLog as devPushLog } from '../../utils/devLogger';
+import { normalizeRoomJid } from '../../helpers/normalizeRoomJid';
+import { InteractionsOverlayProvider } from '../MessageBubble/InteractionsOverlay';
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 const ChatWrapper = ({
   MainComponentStyles,
@@ -111,7 +114,7 @@ const ChatWrapper = ({
   useEffect(() => {
     if (roomJID) {
       dispatch(setCurrentRoom({
-        roomJID: roomJID
+        roomJID: normalizeRoomJid(roomJID, config?.xmppSettings?.conference)
       }));
     }
     const initXmmpClient = async () => {
@@ -159,40 +162,54 @@ const ChatWrapper = ({
         setErrorMsg(null);
         if (!client && !storedClient) {
           devPushLog('rn', 'ChatWrapper: initing xmpp client (legacy path)');
-          await initializeClient(user.xmppUsername || user.defaultWallet?.walletAddress, user.xmppPassword, config?.xmppSettings).then(c => {
-            c.getRoomsStanza().then(() => {
-              c.getChatsPrivateStoreRequestStanza();
+          // The outer `.then(c => {...})` used to lack a `.catch()` —
+          // if initializeClient rejected (network / SASL), the outer
+          // try/catch couldn't see it because the rejection happens in
+          // the .then handler, not in the awaited promise itself.
+          // Convert to await + try/catch.
+          try {
+            const c = await initializeClient(user.xmppUsername || user.defaultWallet?.walletAddress, user.xmppPassword, config?.xmppSettings);
+            try {
+              await c.getRoomsStanza();
+              c.getChatsPrivateStoreRequestStanza().catch(err => console.warn('getChatsPrivateStoreRequestStanza failed', err));
               dispatch(setStoreClient(c));
               setClient(c);
-            }).catch(err => console.warn('getRoomsStanza failed', err));
-          });
+            } catch (err) {
+              console.warn('getRoomsStanza failed', err);
+            }
+          } catch (err) {
+            devPushLog('warn', 'initializeClient failed (legacy path)', err);
+          }
           setInited(true);
           if (config?.refreshTokens?.enabled) {
-            refresh();
+            // refresh() is fire-and-forget but rejects on bad
+            // refreshToken / network — surface via .catch instead of
+            // leaving the rejection unhandled (was bug #4, id:2).
+            refresh().catch(err => console.warn('refresh failed', err));
           }
         } else if (storedClient) {
           devPushLog('rn', 'ChatWrapper: reusing storedClient');
           setClient(storedClient);
           if (!activeRoomJID) {
             storedClient.getRoomsStanza().then(() => {
-              storedClient.getChatsPrivateStoreRequestStanza();
+              storedClient.getChatsPrivateStoreRequestStanza().catch(err => console.warn('getChatsPrivateStoreRequestStanza failed', err));
             }).catch(err => console.warn('getRoomsStanza failed', err));
           }
           setInited(true);
           if (config?.refreshTokens?.enabled) {
-            refresh();
+            refresh().catch(err => console.warn('refresh failed', err));
           }
         } else if (client) {
           devPushLog('rn', 'ChatWrapper: reusing provider client');
           if (!activeRoomJID) {
             client.getRoomsStanza().then(() => {
-              client.getChatsPrivateStoreRequestStanza();
+              client.getChatsPrivateStoreRequestStanza().catch(err => console.warn('getChatsPrivateStoreRequestStanza failed', err));
             }).catch(err => console.warn('getRoomsStanza failed', err));
           }
-          client.getChatsPrivateStoreRequestStanza();
+          client.getChatsPrivateStoreRequestStanza().catch(err => console.warn('getChatsPrivateStoreRequestStanza failed', err));
           setInited(true);
           if (config?.refreshTokens?.enabled) {
-            refresh();
+            refresh().catch(err => console.warn('refresh failed', err));
           }
         }
         dispatch(setIsLoading({
@@ -212,6 +229,34 @@ const ChatWrapper = ({
     initXmmpClient();
   }, [user.xmppPassword, user.defaultWallet, providerBootstrapStatus, initMode, config?.initBeforeLoad]);
 
+  // Cache-first display (initBeforeLoad). The main effect above only marks
+  // the chat `inited` once the provider bootstrap reaches 'ready' — which
+  // waits on the cold XMPP connect. On re-entry that left the user staring
+  // at a loader while fully-cached rooms/messages sat in redux-persist
+  // ("pulls a new connection for 100 years"). Here we render the cached
+  // content the instant rehydration lands; the live client gets wired by
+  // the main effect when the connect completes (send/loadMore activate
+  // then). Mirrors web showing cached rooms immediately + refreshing in
+  // the background.
+  useEffect(() => {
+    if (!config?.initBeforeLoad || initMode !== 'provider') {
+      return;
+    }
+    if (isInited || showModal) {
+      return;
+    }
+    if (providerBootstrapStatus === 'failed') {
+      return;
+    }
+    const haveCachedRooms = !!rooms && Object.keys(rooms).length > 0;
+    const haveUser = !!user?.xmppUsername || !!user?.defaultWallet?.walletAddress;
+    if (haveCachedRooms && haveUser) {
+      devPushLog('rn', 'ChatWrapper: cache-first — showing persisted rooms while provider connects');
+      setShowModal(false);
+      setInited(true);
+    }
+  }, [config?.initBeforeLoad, initMode, isInited, showModal, providerBootstrapStatus, rooms, user?.xmppUsername, user?.defaultWallet?.walletAddress]);
+
   // Skip the legacy email/password LoginForm entirely when XmppProvider
   // is driving auth via initBeforeLoad — the bootstrap effect will
   // populate the user shortly. Showing LoginForm here causes a flicker
@@ -228,7 +273,7 @@ const ChatWrapper = ({
   // the list. With `roomJID` or `disableRooms`, skip the list entirely.
   const showRoomList = !config?.disableRooms && !roomJID && !activeRoomJID;
   return /*#__PURE__*/_jsxs(_Fragment, {
-    children: [showModal && /*#__PURE__*/_jsx(Overlay, {
+    children: [showModal && config?.disableConnectionErrorOverlay && /*#__PURE__*/_jsx(ConnectionBanner, {}), showModal && !config?.disableConnectionErrorOverlay && /*#__PURE__*/_jsx(Overlay, {
       children: /*#__PURE__*/_jsxs(View, {
         style: {
           padding: 20,
@@ -285,20 +330,22 @@ const ChatWrapper = ({
         style: {
           ...MainComponentStyles
         },
-        children: [showRoomList ? /*#__PURE__*/_jsx(RoomList, {
-          chats: Object.values(rooms),
-          onRoomClick: handleChangeChat
-        }) : /*#__PURE__*/_jsx(ChatWrapperBox, {
-          style: {
-            ...MainComponentStyles
-          },
-          children: /*#__PURE__*/_jsx(ChatRoom, {
-            CustomMessageComponent: CustomMessageComponent || Message,
-            handleBackClick: roomJID || config?.disableRooms ? undefined : () => {
-              dispatch(setCurrentRoom({
-                roomJID: ''
-              }));
-            }
+        children: [/*#__PURE__*/_jsx(InteractionsOverlayProvider, {
+          children: showRoomList ? /*#__PURE__*/_jsx(RoomList, {
+            chats: Object.values(rooms),
+            onRoomClick: handleChangeChat
+          }) : /*#__PURE__*/_jsx(ChatWrapperBox, {
+            style: {
+              ...MainComponentStyles
+            },
+            children: /*#__PURE__*/_jsx(ChatRoom, {
+              CustomMessageComponent: CustomMessageComponent || Message,
+              handleBackClick: roomJID || config?.disableRooms ? undefined : () => {
+                dispatch(setCurrentRoom({
+                  roomJID: ''
+                }));
+              }
+            })
           })
         }), /*#__PURE__*/_jsx(Modal, {
           modal: activeModal,

package/lib/module/components/MainComponents/ChatWrapper.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","useEffect","useMemo","useState","useDispatch","useSelector","ChatRoom","setActiveModal","setConfig","setDeleteModal","setStoreClient","ChatWrapperBox","Overlay","Message","useXmppClient","LoginForm","Loader","setCurrentRoom","setEditAction","setIsLoading","refresh","RoomList","StyledLoaderWrapper","Modal","ModalWrapper","useChatSettingState","DeviceEventEmitter","Pressable","Text","View","pushLog","devPushLog","jsx","_jsx","jsxs","_jsxs","Fragment","_Fragment","ChatWrapper","MainComponentStyles","CustomMessageComponent","room","config","roomJID","user","activeModal","deleteModal","client","storedClient","isInited","setInited","showModal","setShowModal","errorMsg","setErrorMsg","isChatVisible","setIsChatVisible","isSmallScreen","setIsSmallScreen","handleItemClick","value","dispatch","initializeClient","setClient","providerBootstrapStatus","initMode","rooms","activeRoomJID","state","activeMessage","messages","find","message","handleChangeChat","chat","jid","chatJID","loading","isEdit","handleDeleteClick","roomJid","messageId","isDeleteModal","deleteMessageStanza","handleCloseDeleteModal","xmppPassword","console","log","close","setActiveRoomJid","initXmmpClient","hasUser","defaultWallet","walletAddress","initBeforeLoad","xmppUsername","xmppSettings","then","c","getRoomsStanza","getChatsPrivateStoreRequestStanza","catch","err","warn","refreshTokens","enabled","error","msg","response","data","String","showRoomList","disableRooms","children","style","padding","backgroundColor","borderRadius","maxWidth","alignItems","fontSize","fontWeight","marginBottom","color","onPress","emit","pressed","paddingVertical","paddingHorizontal","chats","Object","values","onRoomClick","handleBackClick","undefined","modal","setOpenModal","title","description","buttonText","backgroundColorButton","handleClick","handleCloseModal","compact","colors","primary"],"sourceRoot":"../../../../src","sources":["components/MainComponents/ChatWrapper.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["React","useEffect","useMemo","useState","useDispatch","useSelector","ChatRoom","setActiveModal","setConfig","setDeleteModal","setStoreClient","ChatWrapperBox","Overlay","ConnectionBanner","Message","useXmppClient","LoginForm","Loader","setCurrentRoom","setEditAction","setIsLoading","refresh","RoomList","StyledLoaderWrapper","Modal","ModalWrapper","useChatSettingState","DeviceEventEmitter","Pressable","Text","View","pushLog","devPushLog","normalizeRoomJid","InteractionsOverlayProvider","jsx","_jsx","jsxs","_jsxs","Fragment","_Fragment","ChatWrapper","MainComponentStyles","CustomMessageComponent","room","config","roomJID","user","activeModal","deleteModal","client","storedClient","isInited","setInited","showModal","setShowModal","errorMsg","setErrorMsg","isChatVisible","setIsChatVisible","isSmallScreen","setIsSmallScreen","handleItemClick","value","dispatch","initializeClient","setClient","providerBootstrapStatus","initMode","rooms","activeRoomJID","state","activeMessage","messages","find","message","handleChangeChat","chat","jid","chatJID","loading","isEdit","handleDeleteClick","roomJid","messageId","isDeleteModal","deleteMessageStanza","handleCloseDeleteModal","xmppPassword","console","log","close","setActiveRoomJid","xmppSettings","conference","initXmmpClient","hasUser","defaultWallet","walletAddress","initBeforeLoad","c","xmppUsername","getRoomsStanza","getChatsPrivateStoreRequestStanza","catch","err","warn","refreshTokens","enabled","then","error","msg","response","data","String","haveCachedRooms","Object","keys","length","haveUser","showRoomList","disableRooms","children","disableConnectionErrorOverlay","style","padding","backgroundColor","borderRadius","maxWidth","alignItems","fontSize","fontWeight","marginBottom","color","onPress","emit","pressed","paddingVertical","paddingHorizontal","chats","values","onRoomClick","handleBackClick","undefined","modal","setOpenModal","title","description","buttonText","backgroundColorButton","handleClick","handleCloseModal","compact","colors","primary"],"sourceRoot":"../../../../src","sources":["components/MainComponents/ChatWrapper.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/components/MainComponents/MediaMessage.js

@@ -6,13 +6,14 @@ import CustomMessageImage from '../styled/MessageImage';
 import CustomMessageVideo from '../styled/VideoMessage';
 import AudioMessage from '../styled/AudioMessage';
 import { Text } from 'react-native';
-import { deriveDisplayFilename } from '../../helpers/mimeToExtension';
+import { deriveDisplayFilename, isLikelyAudio } from '../../helpers/mimeToExtension';
 import { jsx as _jsx } from "react/jsx-runtime";
 const MediaMessage = ({
   mimeType,
   location,
   messageText,
-  message
+  message,
+  isUser
 }) => {
   if (mimeType) {
     const displayName = deriveDisplayFilename({
@@ -42,20 +43,24 @@ const MediaMessage = ({
         }
       default:
         {
-          // Many backends tag binary payloads (PDFs, DOCX, archives) as
-          // application/octet-stream; sniff the filename extension for the
-          // legitimate audio case before falling through to FileDownload.
-          if (mimeType.includes('application/octet-stream')) {
-            if (/\.(mp3|m4a|wav|aac|ogg|flac)$/i.test(displayName)) {
-              return /*#__PURE__*/_jsx(AudioMessage, {
-                src: location || ''
-              });
-            }
+          // Some senders (notably the web app's voice-message uploader)
+          // ship audio as `application/octet-stream` with no audio file
+          // extension. `isLikelyAudio` recognises those via the URL path,
+          // filename, or voice-message naming hints (voicemail-,
+          // voice-note-, recording-, …) so we still render the AudioMessage
+          // player instead of falling through to the generic FileDownload
+          // card (where the voicemail rendered as a broken `.bin`
+          // attachment). Customer-reported #9 voicemail fix.
+          if (isLikelyAudio(mimeType, displayName, location)) {
+            return /*#__PURE__*/_jsx(AudioMessage, {
+              src: location || ''
+            });
           }
           return /*#__PURE__*/_jsx(FileDownload, {
             fileURL: location ? location : '',
             fileName: displayName,
-            mimetype: mimeType
+            mimetype: mimeType,
+            isUser: isUser
           });
         }
     }

package/lib/module/components/MainComponents/MediaMessage.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","FileDownload","CustomMessageImage","CustomMessageVideo","AudioMessage","Text","deriveDisplayFilename","jsx","_jsx","MediaMessage","mimeType","location","messageText","message","displayName","fileName","originalName","url","mime","startsWith","fileURL","mimetype","src","includes","test","children"],"sourceRoot":"../../../../src","sources":["components/MainComponents/MediaMessage.tsx"],"mappings":";;AAAA,OAAOA,KAAK,MAAM,OAAO;AAEzB,OAAOC,YAAY,MAAM,2BAA2B;AACpD,OAAOC,kBAAkB,MAAM,wBAAwB;AACvD,OAAOC,kBAAkB,MAAM,wBAAwB;AACvD,OAAOC,YAAY,MAAM,wBAAwB;AACjD,SAASC,IAAI,QAAQ,cAAc;AACnC,SAASC,qBAAqB,QAAQ,+BAA+B;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAStE,MAAMC,YAAyC,GAAGA,CAAC;EACjDC,QAAQ;EACRC,QAAQ;EACRC,WAAW;EACXC;AACF,CAAC,KAAK;EACJ,IAAIH,QAAQ,EAAE;IACZ,MAAMI,WAAW,GAAGR,qBAAqB,CAAC;MACxCS,QAAQ,EAAEF,OAAO,EAAEE,QAAQ;MAC3BC,YAAY,EAAGH,OAAO,EAAUG,YAAY;MAC5CC,GAAG,EAAEN,QAAQ,IAAIC,WAAW;MAC5BM,IAAI,EAAER;IACR,CAAC,CAAC;IACF,QAAQ,IAAI;MACV,KAAKA,QAAQ,CAACS,UAAU,CAAC,QAAQ,CAAC;QAChC,oBACEX,IAAA,CAACN,kBAAkB;UACjBa,QAAQ,EAAED,WAAY;UACtBM,OAAO,EAAER,WAAW,IAAI,EAAG;UAC3BS,QAAQ,EAAEX;QAAS,CACpB,CAAC;MAEN,KAAKA,QAAQ,CAACS,UAAU,CAAC,QAAQ,CAAC;QAChC,oBACEX,IAAA,CAACL,kBAAkB;UACjBY,QAAQ,EAAED,WAAY;UACtBM,OAAO,EAAET,QAAQ,IAAI,EAAG;UACxBU,QAAQ,EAAEX;QAAS,CACpB,CAAC;MAEN,KAAKA,QAAQ,CAACS,UAAU,CAAC,QAAQ,CAAC;QAAE;UAClC,oBAAOX,IAAA,CAACJ,YAAY;YAACkB,GAAG,EAAEX,QAAQ,IAAI;UAAG,CAAE,CAAC;QAC9C;MACA;QAAS;UACP;UACA;UACA;UACA,IAAID,QAAQ,CAACa,QAAQ,CAAC,0BAA0B,CAAC,EAAE;YACjD,IAAI,gCAAgC,CAACC,IAAI,CAACV,WAAW,CAAC,EAAE;cACtD,oBAAON,IAAA,CAACJ,YAAY;gBAACkB,GAAG,EAAEX,QAAQ,IAAI;cAAG,CAAE,CAAC;YAC9C;UACF;UACA,oBACEH,IAAA,CAACP,YAAY;YACXmB,OAAO,EAAET,QAAQ,GAAGA,QAAQ,GAAG,EAAG;YAClCI,QAAQ,EAAED,WAAY;YACtBO,QAAQ,EAAEX;UAAS,CACpB,CAAC;QAEN;IACF;EACF;EACA,oBAAOF,IAAA,CAACH,IAAI;IAAAoB,QAAA,EAAC;EAAsB,CAAM,CAAC;AAC5C,CAAC;AAED,eAAehB,YAAY","ignoreList":[]}
+{"version":3,"names":["React","FileDownload","CustomMessageImage","CustomMessageVideo","AudioMessage","Text","deriveDisplayFilename","isLikelyAudio","jsx","_jsx","MediaMessage","mimeType","location","messageText","message","isUser","displayName","fileName","originalName","url","mime","startsWith","fileURL","mimetype","src","children"],"sourceRoot":"../../../../src","sources":["components/MainComponents/MediaMessage.tsx"],"mappings":";;AAAA,OAAOA,KAAK,MAAM,OAAO;AAEzB,OAAOC,YAAY,MAAM,2BAA2B;AACpD,OAAOC,kBAAkB,MAAM,wBAAwB;AACvD,OAAOC,kBAAkB,MAAM,wBAAwB;AACvD,OAAOC,YAAY,MAAM,wBAAwB;AACjD,SAASC,IAAI,QAAQ,cAAc;AACnC,SAASC,qBAAqB,EAAEC,aAAa,QAAQ,+BAA+B;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAUrF,MAAMC,YAAyC,GAAGA,CAAC;EACjDC,QAAQ;EACRC,QAAQ;EACRC,WAAW;EACXC,OAAO;EACPC;AACF,CAAC,KAAK;EACJ,IAAIJ,QAAQ,EAAE;IACZ,MAAMK,WAAW,GAAGV,qBAAqB,CAAC;MACxCW,QAAQ,EAAEH,OAAO,EAAEG,QAAQ;MAC3BC,YAAY,EAAGJ,OAAO,EAAUI,YAAY;MAC5CC,GAAG,EAAEP,QAAQ,IAAIC,WAAW;MAC5BO,IAAI,EAAET;IACR,CAAC,CAAC;IACF,QAAQ,IAAI;MACV,KAAKA,QAAQ,CAACU,UAAU,CAAC,QAAQ,CAAC;QAChC,oBACEZ,IAAA,CAACP,kBAAkB;UACjBe,QAAQ,EAAED,WAAY;UACtBM,OAAO,EAAET,WAAW,IAAI,EAAG;UAC3BU,QAAQ,EAAEZ;QAAS,CACpB,CAAC;MAEN,KAAKA,QAAQ,CAACU,UAAU,CAAC,QAAQ,CAAC;QAChC,oBACEZ,IAAA,CAACN,kBAAkB;UACjBc,QAAQ,EAAED,WAAY;UACtBM,OAAO,EAAEV,QAAQ,IAAI,EAAG;UACxBW,QAAQ,EAAEZ;QAAS,CACpB,CAAC;MAEN,KAAKA,QAAQ,CAACU,UAAU,CAAC,QAAQ,CAAC;QAAE;UAClC,oBAAOZ,IAAA,CAACL,YAAY;YAACoB,GAAG,EAAEZ,QAAQ,IAAI;UAAG,CAAE,CAAC;QAC9C;MACA;QAAS;UACP;UACA;UACA;UACA;UACA;UACA;UACA;UACA;UACA,IAAIL,aAAa,CAACI,QAAQ,EAAEK,WAAW,EAAEJ,QAAQ,CAAC,EAAE;YAClD,oBAAOH,IAAA,CAACL,YAAY;cAACoB,GAAG,EAAEZ,QAAQ,IAAI;YAAG,CAAE,CAAC;UAC9C;UACA,oBACEH,IAAA,CAACR,YAAY;YACXqB,OAAO,EAAEV,QAAQ,GAAGA,QAAQ,GAAG,EAAG;YAClCK,QAAQ,EAAED,WAAY;YACtBO,QAAQ,EAAEZ,QAAS;YACnBI,MAAM,EAAEA;UAAO,CAChB,CAAC;QAEN;IACF;EACF;EACA,oBAAON,IAAA,CAACJ,IAAI;IAAAoB,QAAA,EAAC;EAAsB,CAAM,CAAC;AAC5C,CAAC;AAED,eAAef,YAAY","ignoreList":[]}

package/lib/module/components/MainComponents/MessageContainer.js

@@ -40,7 +40,7 @@ export const MessageContainer = ({
       })]
     }, message.id);
   }
-  if (message?.id === 'delimiter-new') {
+  if (String(message?.id || '').startsWith('delimiter-new')) {
     return CustomNewMessageLabel ? /*#__PURE__*/_jsx(CustomNewMessageLabel, {
       color: config?.colors?.primary
     }) : /*#__PURE__*/_jsx(NewMessageLabel, {
@@ -49,7 +49,7 @@ export const MessageContainer = ({
   }
   const MessageComponent = CustomMessage || Message;
   return /*#__PURE__*/_jsxs(View, {
-    children: [showDateLabel && !activeMessage && message.id !== 'delimiter-new' ? CustomDaySeparator ? /*#__PURE__*/_jsx(CustomDaySeparator, {
+    children: [showDateLabel && !activeMessage && !String(message.id || '').startsWith('delimiter-new') ? CustomDaySeparator ? /*#__PURE__*/_jsx(CustomDaySeparator, {
       date: messageDate,
       formattedDate: messageDate.toLocaleDateString()
     }) : /*#__PURE__*/_jsx(DateLabel, {

package/lib/module/components/MainComponents/MessageContainer.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","Fragment","DateLabel","SystemMessage","NewMessageLabel","Message","MessageText","MessageTimestamp","UserName","View","jsx","_jsx","jsxs","_jsxs","_Fragment","MessageContainer","CustomMessage","CustomDaySeparator","CustomNewMessageLabel","message","activeMessage","config","walletAddress","showDateLabel","isReply","className","isUser","user","id","messageDate","Date","date","isSystemMessage","SystemMessageComponent","customSystemMessage","children","formattedDate","toLocaleDateString","colors","messageText","body","color","primary","MessageComponent","toLocaleTimeString","name"],"sourceRoot":"../../../../src","sources":["components/MainComponents/MessageContainer.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["React","Fragment","DateLabel","SystemMessage","NewMessageLabel","Message","MessageText","MessageTimestamp","UserName","View","jsx","_jsx","jsxs","_jsxs","_Fragment","MessageContainer","CustomMessage","CustomDaySeparator","CustomNewMessageLabel","message","activeMessage","config","walletAddress","showDateLabel","isReply","className","isUser","user","id","messageDate","Date","date","isSystemMessage","SystemMessageComponent","customSystemMessage","children","formattedDate","toLocaleDateString","colors","messageText","body","String","startsWith","color","primary","MessageComponent","toLocaleTimeString","name"],"sourceRoot":"../../../../src","sources":["components/MainComponents/MessageContainer.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/components/MainComponents/MessageList.js

@@ -3,7 +3,8 @@
 /** @format */
 
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
-import { View, StyleSheet, FlatList, Image, TouchableOpacity } from 'react-native';
+import { View, Text, StyleSheet, FlatList, Image, TouchableOpacity } from 'react-native';
+import { msgSortableMs } from '../../roomStore/roomsSlice';
 import Composing from '../styled/StyledInputComponents/Composing';
 import TreadLabel from '../styled/TreadLabel';
 import { MessageContainer } from './MessageContainer';
@@ -31,10 +32,24 @@ const MessageList = ({
   } = useRoomState(roomJID).room;
   const [isUserAtBottom, setIsUserAtBottom] = useState(true);
   const [showNewMessageIndicator, setShowNewMessageIndicator] = useState(false);
-  const [isContentOffset, setIsContentOffset] = useState(false);
   const [isLoadingMore, setIsLoadingMore] = useState(false);
   const [isScrollBlocked, setIsScrollBlocked] = useState(false);
-  const [hasUserScrolled, setHasUserScrolled] = useState(false);
+  // Count of messages that arrived while the user was scrolled up.
+  // Renders as a badge on the scroll-to-bottom arrow so they know how
+  // much they're missing without having to scroll to find out.
+  const [unreadWhileScrolledUp, setUnreadWhileScrolledUp] = useState(0);
+  // Newest message timestamp at the moment the user scrolled away from
+  // the bottom. The badge counts only messages NEWER than this, so
+  // back-pagination (loading OLDER history while scrolled up) never
+  // inflates the count. Was previously a message-COUNT snapshot, which
+  // wrongly counted back-paginated old messages as "new" (Android repro).
+  const newestSeenTsRef = useRef(null);
+  // Refs mirror the viewport state synchronously. The auto-follow logic
+  // runs from FlatList callbacks where setState hasn't necessarily
+  // committed yet; relying on stale React state is what caused the chat
+  // to jump back to the bottom when a new message landed mid-scroll.
+  const isUserAtBottomRef = useRef(true);
+  const hasUserScrolledRef = useRef(false);
   const flatListRef = useRef(null);
   const addReplyMessages = useMemo(() => {
     return messages.map(message => {
@@ -94,15 +109,64 @@ const MessageList = ({
     }
   }, [memoizedMessages, loadMoreMessages, loading, isLoadingMore, isScrollBlocked, roomJID]);
   const dataMessages = useMemo(() => {
-    return memoizedMessages.slice().reverse();
-  }, [memoizedMessages]);
+    const base = memoizedMessages.slice().reverse();
+    const boundaryTs = newestSeenTsRef.current;
+    if (isUserAtBottomRef.current || boundaryTs === null || unreadWhileScrolledUp === 0) {
+      return base;
+    }
+    let lastNewIndex = -1;
+    for (let i = 0; i < base.length; i++) {
+      if (msgSortableMs(base[i]) > boundaryTs) {
+        lastNewIndex = i;
+      } else {
+        break;
+      }
+    }
+    if (lastNewIndex === -1) {
+      return base;
+    }
+    const withDivider = base.slice();
+    withDivider.splice(lastNewIndex + 1, 0, {
+      id: 'delimiter-new-local',
+      user: {
+        id: 'system',
+        name: undefined,
+        token: '',
+        refreshToken: ''
+      },
+      date: new Date(boundaryTs).toISOString(),
+      body: 'New Messages',
+      roomJid: roomJID
+    });
+    return withDivider;
+  }, [memoizedMessages, isUserAtBottom, roomJID, unreadWhileScrolledUp]);
   const renderMessage = useCallback(({
     item,
     index
   }) => {
+    if (String(item.id).startsWith('delimiter-new')) {
+      return /*#__PURE__*/_jsx(MessageContainer, {
+        CustomMessage: CustomMessage,
+        CustomDaySeparator: CustomDaySeparator,
+        CustomNewMessageLabel: CustomNewMessageLabel,
+        message: item,
+        activeMessage: activeMessage,
+        config: config,
+        walletAddress: user.xmppUsername || user.walletAddress,
+        isReply: isReply,
+        showDateLabel: false
+      });
+    }
     const messageDate = new Date(item.date).toDateString();
     let showDateLabel = false;
-    const nextMessage = index < dataMessages.length - 1 ? dataMessages[index + 1] : null;
+    let nextMessage = null;
+    for (let i = index + 1; i < dataMessages.length; i++) {
+      const candidate = dataMessages[i];
+      if (!String(candidate.id).startsWith('delimiter-new')) {
+        nextMessage = candidate;
+        break;
+      }
+    }
     const nextMessageDate = nextMessage ? new Date(nextMessage.date).toDateString() : null;
     if (!nextMessage || messageDate !== nextMessageDate) {
       showDateLabel = true;
@@ -118,7 +182,7 @@ const MessageList = ({
       isReply: isReply,
       showDateLabel: showDateLabel
     });
-  }, [activeMessage, config, user.xmppUsername, user.walletAddress, isReply, memoizedMessages.length]);
+  }, [activeMessage, config, CustomDaySeparator, CustomMessage, CustomNewMessageLabel, dataMessages, isReply, user.xmppUsername, user.walletAddress]);
   const scrollToBottom = useCallback(() => {
     if (flatListRef.current) {
       flatListRef.current.scrollToOffset({
@@ -128,16 +192,12 @@ const MessageList = ({
     }
   }, [flatListRef]);
   const handleContentSizeChange = useCallback(() => {
-    if (isContentOffset) {
-      scrollToBottom();
-      setIsContentOffset(false);
-    }
-    if (!isLoadingMore && flatListRef.current && isUserAtBottom) {
+    if (!isLoadingMore && flatListRef.current && isUserAtBottomRef.current) {
       scrollToBottom();
-    } else if (!isLoadingMore && hasUserScrolled) {
+    } else if (!isLoadingMore && hasUserScrolledRef.current) {
       setShowNewMessageIndicator(true);
     }
-  }, [isUserAtBottom, scrollToBottom, isLoadingMore, hasUserScrolled]);
+  }, [scrollToBottom, isLoadingMore]);
   const handleScroll = useCallback(event => {
     const contentOffset = event.nativeEvent.contentOffset.y;
 
@@ -146,34 +206,70 @@ const MessageList = ({
     // to a long thread feel broken. Drag-to-dismiss still works via
     // FlatList's keyboardDismissMode="interactive" below.
 
-    if (contentOffset > 150 && !hasUserScrolled) {
-      setHasUserScrolled(true);
+    if (contentOffset > 150 && !hasUserScrolledRef.current) {
+      hasUserScrolledRef.current = true;
     }
     if (contentOffset < 150) {
-      setIsContentOffset(true);
+      isUserAtBottomRef.current = true;
       setShowNewMessageIndicator(false);
       setIsUserAtBottom(true);
+      // Back at the bottom — clear the unread-while-scrolled-up
+      // counter so the badge disappears with the arrow.
+      setUnreadWhileScrolledUp(0);
+      newestSeenTsRef.current = null;
     } else {
-      setIsContentOffset(false);
-      if (hasUserScrolled) {
+      isUserAtBottomRef.current = false;
+      if (hasUserScrolledRef.current) {
         setShowNewMessageIndicator(true);
       }
+      if (newestSeenTsRef.current === null) {
+        // Snapshot the NEWEST message's timestamp the moment the user
+        // first leaves the bottom. Anything newer than this that
+        // arrives later is genuinely "new"; older history loaded by
+        // back-pagination is < this and never counts.
+        newestSeenTsRef.current = memoizedMessages.reduce((mx, m) => {
+          const t = msgSortableMs(m);
+          return t > mx ? t : mx;
+        }, 0);
+      }
       setIsUserAtBottom(false);
     }
-  }, [hasUserScrolled]);
+  }, [memoizedMessages]);
+
+  // Keep the badge in sync with messages that arrive while the user is
+  // scrolled up. Count ONLY messages newer than the newest-seen snapshot
+  // — so loading older history (back-pagination) doesn't inflate it.
+  useEffect(() => {
+    if (isUserAtBottomRef.current) {
+      return;
+    }
+    if (newestSeenTsRef.current === null) {
+      return;
+    }
+    const since = newestSeenTsRef.current;
+    const count = memoizedMessages.reduce((n, m) => msgSortableMs(m) > since ? n + 1 : n, 0);
+    setUnreadWhileScrolledUp(count);
+  }, [memoizedMessages, isUserAtBottom]);
   const handleLayout = () => {
-    setIsContentOffset(true);
+    isUserAtBottomRef.current = true;
+    hasUserScrolledRef.current = false;
     setIsUserAtBottom(true);
   };
   const handleNewMessageIndicatorPress = () => {
+    isUserAtBottomRef.current = true;
     setShowNewMessageIndicator(false);
     setIsUserAtBottom(true);
+    setUnreadWhileScrolledUp(0);
+    newestSeenTsRef.current = null;
     scrollToBottom();
   };
   useEffect(() => {
-    setHasUserScrolled(false);
+    hasUserScrolledRef.current = false;
+    isUserAtBottomRef.current = true;
     setShowNewMessageIndicator(false);
     setIsUserAtBottom(true);
+    setUnreadWhileScrolledUp(0);
+    newestSeenTsRef.current = null;
   }, [roomJID]);
   const BackgroundImage = useMemo(() => {
     const image = config?.backgroundChat?.image;
@@ -209,7 +305,7 @@ const MessageList = ({
       })]
     }), /*#__PURE__*/_jsx(FlatList, {
       ref: flatListRef,
-      data: memoizedMessages.slice().reverse(),
+      data: dataMessages,
       renderItem: renderMessage,
       keyExtractor: item => item.id.toString(),
       onEndReached: handleLoadMore,
@@ -225,12 +321,22 @@ const MessageList = ({
       ListFooterComponent: loading && memoizedMessages.length > 15 ? /*#__PURE__*/_jsx(Loader, {
         color: config?.colors?.primary
       }) : null
-    }), showNewMessageIndicator && /*#__PURE__*/_jsx(TouchableOpacity, {
+    }), showNewMessageIndicator && /*#__PURE__*/_jsxs(TouchableOpacity, {
       style: [styles.newMessageIndicator, {
-        backgroundColor: config?.colors?.secondary
+        backgroundColor: config?.colors?.primary || '#0052CD'
       }],
       onPress: handleNewMessageIndicatorPress,
-      children: /*#__PURE__*/_jsx(ArowDownIcon, {})
+      children: [/*#__PURE__*/_jsx(ArowDownIcon, {
+        color: "#FFFFFF",
+        width: 22,
+        height: 22
+      }), unreadWhileScrolledUp > 0 && /*#__PURE__*/_jsx(View, {
+        style: styles.newMessageBadge,
+        children: /*#__PURE__*/_jsx(Text, {
+          style: styles.newMessageBadgeText,
+          children: unreadWhileScrolledUp > 99 ? '99+' : unreadWhileScrolledUp
+        })
+      })]
     }), config?.customTypingIndicator?.enabled && composing && /*#__PURE__*/_jsx(CustomTypingIndicator, {
       usersTyping: composingList || ['User'],
       text: config.customTypingIndicator.text,
@@ -280,13 +386,44 @@ const styles = StyleSheet.create({
     height: 40,
     bottom: 20,
     right: 20,
-    backgroundColor: '#007AFF',
-    padding: 10,
-    borderRadius: 20
+    backgroundColor: '#0052CD',
+    borderRadius: 20,
+    justifyContent: 'center',
+    alignItems: 'center',
+    // Lift the FAB off the chat background so it reads as a button.
+    shadowColor: '#000',
+    shadowOffset: {
+      width: 0,
+      height: 2
+    },
+    shadowOpacity: 0.2,
+    shadowRadius: 3,
+    elevation: 4
   },
   newMessageText: {
     color: '#fff',
     fontWeight: 'bold'
+  },
+  newMessageBadge: {
+    position: 'absolute',
+    top: -6,
+    right: -6,
+    minWidth: 20,
+    height: 20,
+    paddingHorizontal: 6,
+    borderRadius: 10,
+    justifyContent: 'center',
+    alignItems: 'center',
+    // Fixed red so it stays distinct from the (primary-coloured) FAB,
+    // with a white ring to separate the two.
+    backgroundColor: '#E53935',
+    borderWidth: 2,
+    borderColor: '#fff'
+  },
+  newMessageBadgeText: {
+    color: '#fff',
+    fontWeight: 'bold',
+    fontSize: 11
   }
 });
 //# sourceMappingURL=MessageList.js.map