@ethora/chat-component-rn 26.7.9 → 26.8.1

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

@@ -1,144 +1,86 @@
 "use strict";
 
 import React, { useEffect, useState } from 'react';
-import { isSecureFileUrl, requestFileTokenRecovery } from '../../helpers/secureFileUrl';
-import { Image, Pressable, StyleSheet, View } from 'react-native';
+import { Pressable, StyleSheet, View } from 'react-native';
+import { useVideoPlayer, VideoView } from 'expo-video';
 import { useDispatch } from 'react-redux';
 import { setActiveFile, setActiveModal } from '../../roomStore/chatSettingsSlice';
 import { MODAL_TYPES } from '../../helpers/constants/MODAL_TYPES';
 import { PlayIcon } from '../../assets/icons';
 import { defaultMediaDims, fitMediaDimensions } from '../../helpers/mediaDimensions';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-const PlayBadge = () => /*#__PURE__*/_jsx(View, {
-  style: styles.overlay,
-  pointerEvents: "none",
-  children: /*#__PURE__*/_jsx(View, {
-    style: styles.playButton,
-    children: /*#__PURE__*/_jsx(PlayIcon, {
-      width: 28,
-      height: 28
-    })
-  })
-});
-
-/**
- * Poster path — taken whenever the message carries a `locationPreview`.
- *
- * A chat row only ever needs a still and a play affordance; actual
- * playback happens in the full-screen preview. Drawing that still with a
- * plain <Image> keeps the whole bubble inside the RN view hierarchy, so
- * the play badge is guaranteed to composite on top of it.
- */
-const PosterVideo = ({
-  previewURL,
-  onOpen,
-  onPosterError
-}) => {
-  const [dims, setDims] = useState(defaultMediaDims());
-  useEffect(() => {
-    if (!previewURL) {
-      return;
-    }
-    let active = true;
-    Image.getSize(previewURL, (w, h) => {
-      if (active) {
-        setDims(fitMediaDimensions(w, h));
-      }
-    }, () => {
-      /* keep the default box if the size probe fails */
-    });
-    return () => {
-      active = false;
-    };
-  }, [previewURL]);
-  return /*#__PURE__*/_jsxs(Pressable, {
-    onPress: onOpen,
-    style: [styles.wrapper, {
-      width: dims.width,
-      height: dims.height
-    }],
-    accessibilityRole: "button",
-    accessibilityLabel: "Play video",
-    children: [/*#__PURE__*/_jsx(Image, {
-      source: {
-        uri: previewURL
-      },
-      style: styles.video,
-      resizeMode: "cover"
-      // Not every backend returns a real still — some set
-      // locationPreview to the video URL itself, which decodes to
-      // nothing. Rather than show an empty box, fall back to the
-      // static placeholder branch.
-      ,
-      onError: onPosterError
-    }), /*#__PURE__*/_jsx(PlayBadge, {})]
-  });
-};
-
-/**
- * Fallback for messages with no usable poster frame: a static dark
- * placeholder behind the play badge.
- *
- * This branch used to mount an expo-video player purely to paint the
- * first frame (`VideoView` + `surfaceType="textureView"`). That never
- * composited reliably: on Android (Pixel, Android 16, New Architecture)
- * the native video surface draws ABOVE sibling RN views, swallowing the
- * play badge — the video looked like a plain photo. There is no
- * surfaceType/zIndex combination that guarantees ordering across SDK 54
- * and 57, so we don't fight it: no live surface in the bubble at all.
- * The badge is plain RN views over a plain RN background, which cannot
- * be occluded, and we drop the per-row player instance as a bonus.
- * Actual playback (and the real first frame) happens in the full-screen
- * preview modal.
- */
-const PlaceholderVideo = ({
-  onOpen
-}) => {
-  const dims = defaultMediaDims();
-  return /*#__PURE__*/_jsx(Pressable, {
-    onPress: onOpen,
-    style: [styles.wrapper, {
-      width: dims.width,
-      height: dims.height
-    }],
-    accessibilityRole: "button",
-    accessibilityLabel: "Play video",
-    children: /*#__PURE__*/_jsx(PlayBadge, {})
-  });
-};
 const CustomMessageVideo = ({
   fileName,
-  originalName,
   fileURL,
-  mimetype,
-  previewURL
+  mimetype
 }) => {
   const dispatch = useDispatch();
-  const [posterFailed, setPosterFailed] = useState(false);
+  const [dims, setDims] = useState(defaultMediaDims());
+  const player = useVideoPlayer(fileURL, p => {
+    p.muted = true;
+  });
+  useEffect(() => {
+    const sub = player.addListener('statusChange', () => {
+      const size = player.videoTrack?.size;
+      if (size?.width && size?.height) {
+        setDims(fitMediaDimensions(size.width, size.height));
+      }
+    });
+    return () => sub.remove();
+  }, [player]);
   const handleOpen = () => {
     dispatch(setActiveFile({
       fileName,
       fileURL,
-      mimetype,
-      originalName
+      mimetype
     }));
     dispatch(setActiveModal(MODAL_TYPES.FILE_PREVIEW));
   };
-  if (previewURL && !posterFailed) {
-    return /*#__PURE__*/_jsx(PosterVideo, {
-      previewURL: previewURL,
-      onOpen: handleOpen,
-      onPosterError: () => {
-        if (isSecureFileUrl(previewURL)) {
-          requestFileTokenRecovery();
-        }
-        setPosterFailed(true);
-      }
-    });
-  }
-  return /*#__PURE__*/_jsx(PlaceholderVideo, {
-    onOpen: handleOpen
-  });
+  return (
+    /*#__PURE__*/
+    // Capture-overlay pattern: VideoView sits underneath without ANY
+    // touch participation; a transparent absolute-fill <Pressable> on
+    // top owns the tap. Previously we wrapped VideoView in a
+    // TouchableOpacity and set `pointerEvents="none"` on the inner
+    // VideoView — but on some expo-video versions / iOS the native
+    // VideoView still intercepted gestures despite that hint, so
+    // tapping the poster did nothing. Customer-reported #9 (video
+    // preview unresponsive). The Pressable now guarantees the tap
+    // reaches `handleOpen`.
+    _jsxs(View, {
+      style: [styles.wrapper, {
+        width: dims.width,
+        height: dims.height
+      }],
+      children: [/*#__PURE__*/_jsx(VideoView, {
+        player: player,
+        style: styles.video,
+        contentFit: "cover",
+        nativeControls: false,
+        surfaceType: "textureView",
+        pointerEvents: "none"
+      }), /*#__PURE__*/_jsx(View, {
+        style: styles.overlay,
+        pointerEvents: "none",
+        children: /*#__PURE__*/_jsx(View, {
+          style: styles.playButton,
+          children: /*#__PURE__*/_jsx(PlayIcon, {
+            width: 28,
+            height: 28
+          })
+        })
+      }), /*#__PURE__*/_jsx(Pressable, {
+        onPress: handleOpen
+        // Sits ON TOP of VideoView + the play-button overlay; transparent
+        // so the poster + play icon show through. Captures the tap and
+        // routes to handleOpen → setActiveModal(FILE_PREVIEW).
+        ,
+        style: StyleSheet.absoluteFill,
+        accessibilityRole: "button",
+        accessibilityLabel: "Play video"
+      })]
+    })
+  );
 };
 export default CustomMessageVideo;
 const styles = StyleSheet.create({

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","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":[]}
+{"version":3,"names":["React","useEffect","useState","Pressable","StyleSheet","View","useVideoPlayer","VideoView","useDispatch","setActiveFile","setActiveModal","MODAL_TYPES","PlayIcon","defaultMediaDims","fitMediaDimensions","jsx","_jsx","jsxs","_jsxs","CustomMessageVideo","fileName","fileURL","mimetype","dispatch","dims","setDims","player","p","muted","sub","addListener","size","videoTrack","width","height","remove","handleOpen","FILE_PREVIEW","style","styles","wrapper","children","video","contentFit","nativeControls","surfaceType","pointerEvents","overlay","playButton","onPress","absoluteFill","accessibilityRole","accessibilityLabel","create","borderRadius","overflow","backgroundColor","justifyContent","alignItems"],"sourceRoot":"../../../../src","sources":["components/styled/VideoMessage.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/context/xmppProvider.js

@@ -5,33 +5,23 @@ import { AppState, DeviceEventEmitter } from 'react-native';
 import NetInfo from '@react-native-community/netinfo';
 import { VideoCallOverlay } from '../components/VideoCalls/VideoCallOverlay';
 import XmppClient from '../networking/xmppClient';
-import { refreshAuthTokensQuietly } from '../networking/authRefresh';
+import { refreshTokens } from '../roomStore/chatSettingsSlice';
 import { buildXmppClientKey, getGlobalXmppClient, getReusableXmppClientByKey, isXmppClientReusable, setGlobalXmppClient, withXmppClientInitLock } from '../utils/clientRegistry';
 import { applyResolvedUserToStore, refreshUserCredentialsForXmpp, resolveInitBeforeLoadUser } from '../helpers/resolveInitBeforeLoadUser';
 import { ensureScopedChatCache } from '../helpers/ensureScopedChatCache';
 import { getRooms as prefetchRoomsViaRest } from '../networking/api-requests/rooms.api';
 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, setUnreadSyncing } from '../roomStore/roomsSlice';
-import { getServerReadTimestamp } from '../helpers/getServerReadTimestamp';
+import { setLogoutState, setVisibleRoom, clearVisibleRoom, setLastViewedTimestamp, deleteRoomMessage, msgSortableMs, setUnreadSyncing } from '../roomStore/roomsSlice';
 import { runHistoryPreloadScheduler } from '../helpers/historyPreloadScheduler';
-import { updateMessagesTillLast } from '../helpers/updateMessagesTillLast';
-import { secureUserStorage } from '../helpers/secureUserStorage';
+import { asyncLocalStorage } from '../hooks/useLocalStorage';
+import { localStorageConstants } from '../helpers/constants/LOCAL_STORAGE';
 import { clearPersistedState } from '../roomStore/persistence';
 import { pushLog as devPushLog } from '../utils/devLogger';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 const XmppContext = /*#__PURE__*/createContext(null);
 const LOGOUT_EVENT = 'ethora-xmpp-logout';
-const subscribeAllRoomsForPush = (client, reason) => {
-  const rooms = Object.keys(store.getState().rooms.rooms || {});
-  if (!client || !rooms.length) {
-    return;
-  }
-  const nick = client.jid?.getLocal();
-  pushSubscriptionService.subscribeToRooms(client, rooms, nick).then(() => devPushLog('xmpp', `${reason}: mucsub ok for ${rooms.length} rooms`)).catch(e => devPushLog('warn', `${reason}: mucsub subscribe failed`, e));
-};
 export const XmppProvider = ({
   children,
   config,
@@ -58,23 +48,21 @@ export const XmppProvider = ({
   // the XmppClient at least doesn't crash on `undefined.password`.
   const credentialsProvider = useMemo(() => {
     return async () => {
-      // 1. Make sure the REST tokens are fresh before re-minting XMPP
-      //    creds. This used to call `config.refreshTokens.refreshFunction`
-      //    directly and then fall into step 2, which refreshes again —
-      //    two rotations back to back, which the new backend scheme
-      //    reads as a race at best and token reuse at worst. One call to
-      //    the shared rotation point covers both the consumer-supplied
-      //    function and the built-in endpoint.
-      if (config?.refreshTokens?.enabled) {
-        const rotated = await refreshAuthTokensQuietly({
-          force: true
-        });
-        if (rotated?.xmppPassword) {
-          const rotatedUser = store.getState().chatSettingStore.user;
-          return {
-            username: rotatedUser?.xmppUsername || rotatedUser?.defaultWallet?.walletAddress || '',
-            password: rotated.xmppPassword
-          };
+      // 1. Consumer-supplied REST refresh (when wired). This runs
+      //    before the SDK's own refresh chain so non-Ethora backends
+      //    can keep auth state in sync with their own token endpoint.
+      const customRefresh = config?.refreshTokens?.refreshFunction;
+      if (customRefresh) {
+        try {
+          const result = await customRefresh();
+          if (result?.accessToken) {
+            store.dispatch(refreshTokens({
+              token: result.accessToken,
+              refreshToken: result.refreshToken || ''
+            }));
+          }
+        } catch (err) {
+          devPushLog('warn', 'XMPP creds refresh: customRefresh failed', err);
         }
       }
 
@@ -106,7 +94,7 @@ export const XmppProvider = ({
         password: u?.xmppPassword || ''
       };
     };
-  }, [config?.jwtLogin?.enabled, config?.jwtLogin?.token, config?.refreshTokens?.enabled, config?.userLogin?.enabled, config?.customLogin?.enabled, config?.initBeforeLoadAuth?.myEndpoint]);
+  }, [config?.jwtLogin?.enabled, config?.jwtLogin?.token, config?.refreshTokens?.refreshFunction, config?.userLogin?.enabled, config?.customLogin?.enabled, config?.initBeforeLoadAuth?.myEndpoint]);
   const initializeClient = useCallback(async (username, password, xmppSettings) => {
     const settings = xmppSettings || config?.xmppSettings;
     const key = buildXmppClientKey(username, settings);
@@ -172,22 +160,11 @@ export const XmppProvider = ({
       if (!underlying) {
         return;
       }
-      allRoomPresences(underlying).catch(e => devPushLog('warn', 'reconnect: allRoomPresences re-join failed', e)).finally(() => subscribeAllRoomsForPush(underlying, 'reconnect'));
+      allRoomPresences(underlying).catch(e => devPushLog('warn', 'reconnect: allRoomPresences re-join failed', e));
       // Also refresh the private store so unread / lastViewed markers
       // are accurate after a long reconnect — the MUC re-join above only
       // restores delivery, not unread state. Idempotent on first connect.
       created.getChatsPrivateStoreRequestStanza().catch(e => devPushLog('warn', 'reconnect: privateStore refresh failed', e));
-      // Pull whatever landed in each room's archive while the stream was
-      // down. MUC presence re-join above only restores delivery for
-      // messages sent AFTER this reconnect — anything sent during the
-      // offline window has no live stanza to catch, and previously only
-      // came back on a full app restart (fresh useChatWrapperInit mount
-      // re-running its own one-shot boot sync). Safe on the very first
-      // connect too: rooms have no `lastMessageTimestamp` yet at that
-      // point, so this is a no-op until the bootstrap's own history load
-      // populates it. Customer-reported #32.
-      const rooms = store.getState().rooms?.rooms || {};
-      updateMessagesTillLast(rooms, created).catch(e => devPushLog('warn', 'reconnect: offline catch-up sync failed', e));
     });
     setClient(created);
     lastCredsRef.current = {
@@ -260,7 +237,7 @@ export const XmppProvider = ({
           devPushLog('rn', 'initBeforeLoad: clearStoreBeforeInit');
           store.dispatch(setLogoutState());
           store.dispatch(logout());
-          await secureUserStorage().remove().catch(() => undefined);
+          await asyncLocalStorage(localStorageConstants.ETHORA_USER).remove().catch(() => undefined);
         }
         await ensureScopedChatCache(config);
         devPushLog('rn', 'initBeforeLoad: scope ok, resolving user…');
@@ -288,40 +265,13 @@ export const XmppProvider = ({
           store.dispatch(setConfig(config));
         }
 
-        // Rotate BEFORE the first XMPP connect. On the rotating backend
-        // the xmpp password is a short-lived JWT that only the newest
-        // rotation knows, and each rotation invalidates its predecessors
-        // — so a snapshot's password (a host's cached `userLogin.user`,
-        // a persisted session) is usually already dead at boot. Without
-        // this, the first SASL attempt fails `not-authorized`, all three
-        // bootstrap retries re-present the same dead password, and the
-        // user dead-ends on the Connection error modal even though one
-        // rotation away a perfectly good session existed. The rotation
-        // also lands the fileToken pre-render, so secure media never
-        // paints blank first. Quiet + deduped; when it can't rotate
-        // (no refresh material, non-rotating backend) we just connect
-        // with what the snapshot has, exactly as before.
-        // jwtLogin is skipped: /users/client just minted fresh creds.
-        let connectPassword = resolved.xmppPassword;
-        if (config?.refreshTokens?.enabled && !config?.jwtLogin?.enabled) {
-          const rotated = await refreshAuthTokensQuietly({
-            force: true
-          });
-          if (cancelled) {
-            return;
-          }
-          if (rotated?.xmppPassword) {
-            connectPassword = rotated.xmppPassword;
-          }
-        }
-
         // Kick off REST /chats/my; allRoomPresences below needs the
         // room list to be in redux, otherwise it joins 0 MUCs and the
         // user receives zero realtime messages until they manually tap
         // into each room. Track the promise so we can await it before
         // joining presences.
         const restRoomsPromise = prefetchRoomsViaRest().catch(() => undefined);
-        const c = await initializeClient(resolved.xmppUsername, connectPassword, config?.xmppSettings);
+        const c = await initializeClient(resolved.xmppUsername, resolved.xmppPassword, config?.xmppSettings);
         if (cancelled) {
           return;
         }
@@ -357,7 +307,6 @@ export const XmppProvider = ({
         } catch (e) {
           devPushLog('warn', 'initBeforeLoad: allRoomPresences failed', e);
         }
-        subscribeAllRoomsForPush(c.client, 'initBeforeLoad');
         store.dispatch(setStoreClient(c));
         completedBootstrapKeyRef.current = key;
         inflightBootstrapKeyRef.current = '';
@@ -490,14 +439,9 @@ export const XmppProvider = ({
     // be re-marked visible on return. Lives in the effect closure (one per
     // client) — persists across the listener's many invocations.
     let visibleBeforeBackground = null;
-    const suspendInBackground = !config?.xmppSettings?.keepAliveInBackground;
     const sub = AppState.addEventListener('change', next => {
       const c = client;
       if (next === 'active') {
-        if (c?.isSuspended) {
-          devPushLog('rn', 'AppState active: resuming suspended XMPP client');
-          c.resume();
-        }
         // Returned to foreground. If the socket died while backgrounded
         // (iOS suspends the WebSocket; long background kills it), the
         // status may still read 'online' until xmpp.js notices the dead
@@ -529,37 +473,23 @@ export const XmppProvider = ({
       if (!c) {
         return;
       }
-      if (next === 'background' && suspendInBackground) {
-        c.suspend().catch(() => undefined);
-      }
       const state = store.getState();
       const rooms = state.rooms?.rooms;
       const visibleRoomJID = state.rooms?.visibleRoomJID || null;
       // 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=<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.
+      // 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.
       visibleBeforeBackground = visibleRoomJID;
       if (visibleRoomJID) {
-        const readTs = getServerReadTimestamp(rooms?.[visibleRoomJID], state.roomHeapSlice);
-        // 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
-          }));
-        }
+        store.dispatch(setLastViewedTimestamp({
+          chatJID: visibleRoomJID,
+          timestamp: Date.now()
+        }));
         // 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).
@@ -576,7 +506,7 @@ export const XmppProvider = ({
       }).catch(() => {});
     });
     return () => sub.remove();
-  }, [client, config?.xmppSettings?.keepAliveInBackground]);
+  }, [client]);
 
   // -----------------------------------------------------------
   // Consumer visibility signal (`isVisible` prop). For hosts that keep
@@ -585,11 +515,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=<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.)
+  // 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.)
   // -----------------------------------------------------------
   const chatWasVisibleRef = useRef(false);
   useEffect(() => {
@@ -609,16 +539,10 @@ export const XmppProvider = ({
       }
     } else {
       if (wasVisible && activeRoomJID) {
-        // 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).
-        const readTs = getServerReadTimestamp(rooms?.[activeRoomJID], state.roomHeapSlice);
-        if (readTs > 0) {
-          store.dispatch(setLastViewedTimestamp({
-            chatJID: activeRoomJID,
-            timestamp: readTs
-          }));
-        }
+        store.dispatch(setLastViewedTimestamp({
+          chatJID: activeRoomJID,
+          timestamp: Date.now()
+        }));
         // Drop the "New messages" divider so it's gone when the user
         // returns to the chat (mirrors ChatRoom's unmount cleanup).
         store.dispatch(deleteRoomMessage({
@@ -655,21 +579,24 @@ export const XmppProvider = ({
         return;
       }
       lastMessagesRef = room.messages;
-
-      // getServerReadTimestamp (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).
-      const newest = getServerReadTimestamp(room, s.roomHeapSlice);
-      if (!newest || newest <= lastStampedMs) {
+      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) {
         return;
       }
       lastStampedMs = newest;
       store.dispatch(setLastViewedTimestamp({
         chatJID: jid,
-        timestamp: newest
+        timestamp: Date.now()
       }));
       if (flushTimer) {
         clearTimeout(flushTimer);