@ethora/chat-component-rn 26.7.10 → 26.8.1

package/lib/module/roomStore/persistence.js

@@ -1,7 +1,6 @@
 "use strict";
 
 import AsyncStorage from '@react-native-async-storage/async-storage';
-import { encryptForPersist, decryptFromPersist } from '../helpers/persistCrypto';
 // -------------------------------------------------------------------
 // Lightweight RN persistence layer. Mirrors what redux-persist gives
 // the web component:
@@ -11,32 +10,16 @@ import { encryptForPersist, decryptFromPersist } from '../helpers/persistCrypto'
 //   - cap each room's messages to the most recent MESSAGE_LIMIT (100)
 //   - debounced writes (200ms) on relevant action types
 //
-// AES-256-CBC at rest (see `helpers/persistCrypto.ts`): the JSON blob
-// under each key below is encrypted before it reaches AsyncStorage, with
-// the symmetric key held in the platform Keychain/Keystore. `user` here
-// is already secret-free (see `sanitizeUser`) — the encryption is for
-// the message bodies in `rooms`, which aren't.
+// Not encrypted. We rely on AsyncStorage's per-app sandbox.
 // -------------------------------------------------------------------
 
 const KEY_CHAT = '@ethora/persist:chatSettingStore';
 const KEY_ROOMS = '@ethora/persist:rooms';
-// bug #39: a failed send needs to survive a relaunch as "failed / tap
-// to retry", not silently render as delivered. `roomHeapStore.failedMessages`
-// is the map the bubble reads (`isFailed = failedMessages[id]`, see
-// Message.tsx / useMessageHeapState): it lives in a separate, previously
-// non-persisted slice from `rooms`, so it gets its own key here.
-const KEY_HEAP = '@ethora/persist:roomHeap';
 
 // Per-room message cap on disk. Mirror this value in `roomsSlice`'s
 // in-memory cap (see `enforceMessageCap`) so the runtime and persisted
 // shapes stay aligned.
 export const MESSAGE_LIMIT = 100;
-
-// Defensive cap on the number of failed-message payloads written to
-// disk. In practice this map only grows while the user is actively
-// sending offline, but a runaway sender (or a bug that never clears an
-// entry) must not turn this key into an unbounded write.
-export const MAX_PERSISTED_FAILED_MESSAGES = 200;
 const sanitizeUser = user => {
   if (!user) {
     return null;
@@ -61,14 +44,23 @@ const sanitizeUser = user => {
 // on reload before MAM catches up. That needs the fields the bubbles and
 // room-list previews actually read, nothing else. Everything outside this
 // list is either re-derived on render or re-fetched from the server.
-const PERSISTED_MESSAGE_FIELDS = ['id', 'xmppId', 'xmppFrom', 'body', 'date', 'timestamp', 'roomJid', 'isSystemMessage', 'isMediafile', 'isDeleted', 'isEdited', 'isReply', 'showInChannel', 'mainMessage', 'mimetype', 'location', 'locationPreview', 'fileName', 'originalName', 'size', 'langSource', 'callLog',
-// bug #39: without this, a message that was still in flight (no
-// server echo yet) at kill time comes back from disk indistinguishable
-// from a normal delivered message, so the bubble renders it as sent.
-// Persisting `pending` lets the boot-time scan (see
-// computeBootTimeFailures below) find exactly the messages that never
-// got confirmed and flip them to failed instead.
-'pending'];
+const PERSISTED_MESSAGE_FIELDS = ['id', 'xmppId', 'xmppFrom', 'body', 'date', 'timestamp', 'roomJid', 'isSystemMessage', 'isMediafile', 'isDeleted', 'isEdited', 'isReply', 'showInChannel', 'mainMessage', 'mimetype', 'location', 'locationPreview', 'fileName', 'originalName', 'size', 'langSource',
+// `translations` MUST be here. A previous version of this list dropped
+// it, on the theory that it mirrored the web SDK's persist contract —
+// it doesn't: web's redux-persist config (web/src/roomStore/index.ts)
+// has no per-field message whitelist at all, it persists whatever is in
+// `room.messages` (capped to the last 50) and that includes
+// `translations` verbatim. Field-picking is an RN-only mechanism, so
+// "same as web" was never true for this key.
+//
+// Dropping it meant every cold start painted the cached transcript in
+// the ORIGINAL language and only flipped to the translation once MAM
+// re-sent the history a few seconds later (onMessageHistory re-parses
+// <translations> off the wire) — visible on every launch, for every
+// translated message, since the cache never had a translation to show
+// in the first place. Persisting it here is what lets the very first
+// paint already be translated, the way the live path already is.
+'translations', 'callLog'];
 
 // The sender identity that rides along on every message over the wire
 // (senderFirstName / senderLastName / photo, which createMessageFromXml
@@ -159,167 +151,6 @@ const sanitizeRooms = rooms => {
   }
   return out;
 };
-
-// Only the fields retryMessage actually needs to replay the send (see
-// FailedMessagePayload / useSendMessage.retryMessage). In particular, the
-// media `data` blob is trimmed to `uri/type/name/size` (the picker never
-// hands us auth material, but this stays defensive against a future
-// picker change smuggling extra fields, or a huge inline payload, into
-// `data`).
-const sanitizeMediaData = data => {
-  if (!data || typeof data !== 'object') {
-    return {};
-  }
-  const out = {};
-  if (typeof data.uri === 'string') {
-    out.uri = data.uri;
-  }
-  if (typeof data.type === 'string') {
-    out.type = data.type;
-  }
-  if (typeof data.name === 'string') {
-    out.name = data.name;
-  }
-  if (typeof data.size === 'number') {
-    out.size = data.size;
-  }
-  return out;
-};
-const sanitizeFailedMessagePayload = payload => {
-  if (!payload || typeof payload !== 'object') {
-    return null;
-  }
-  if (!payload.id || typeof payload.id !== 'string') {
-    return null;
-  }
-  if (!payload.roomJID || typeof payload.roomJID !== 'string') {
-    return null;
-  }
-  if (payload.kind === 'media') {
-    return {
-      kind: 'media',
-      id: payload.id,
-      roomJID: payload.roomJID,
-      data: sanitizeMediaData(payload.data),
-      type: typeof payload.type === 'string' ? payload.type : '',
-      isReply: payload.isReply,
-      isChecked: payload.isChecked,
-      mainMessage: payload.mainMessage
-    };
-  }
-  if (payload.kind === 'text') {
-    return {
-      kind: 'text',
-      id: payload.id,
-      roomJID: payload.roomJID,
-      body: typeof payload.body === 'string' ? payload.body : '',
-      isReply: payload.isReply,
-      isChecked: payload.isChecked,
-      mainMessage: payload.mainMessage
-    };
-  }
-  return null;
-};
-const sanitizeFailedMessages = failedMessages => {
-  if (!failedMessages || typeof failedMessages !== 'object') {
-    return {};
-  }
-  const out = {};
-  let count = 0;
-  for (const [id, payload] of Object.entries(failedMessages)) {
-    if (count >= MAX_PERSISTED_FAILED_MESSAGES) {
-      break;
-    }
-    const clean = sanitizeFailedMessagePayload(payload);
-    if (clean) {
-      out[id] = clean;
-      count++;
-    }
-  }
-  return out;
-};
-
-// -------------------------------------------------------------------
-// Boot-time pending -> failed conversion (bug #39).
-//
-// `messageHeap` (the "still sending" buffer) is intentionally NOT
-// persisted: it's a process-lifetime thing. That means on a cold start
-// there is no such thing as "still sending": a persisted message that
-// carries `pending: true` never got a server echo NOR got the chance to
-// trip the in-session watchdog (see PENDING_WATCHDOG_MS in
-// useSendMessage.tsx) before the process died. It must render as failed
-// with a working retry, not as delivered and not as stuck "sending...".
-//
-// Reconstructs the same FailedMessagePayload shape the live send path
-// builds in useSendMessage (markMessageFailed calls), from the fields we
-// persist per message.
-// -------------------------------------------------------------------
-
-export function reconstructFailedMessagePayload(message, roomJID) {
-  if (!message?.id || !roomJID) {
-    return null;
-  }
-  const isReply = !!message.isReply;
-  const isChecked = message.showInChannel === 'true';
-  const mainMessage = message.mainMessage;
-  if (message.isMediafile === 'true') {
-    return {
-      kind: 'media',
-      id: message.id,
-      roomJID,
-      data: sanitizeMediaData({
-        uri: message.location,
-        name: message.fileName,
-        type: message.mimetype,
-        size: message.size !== undefined && message.size !== null ? Number(message.size) : undefined
-      }),
-      type: message.mimetype || '',
-      isReply,
-      isChecked,
-      mainMessage
-    };
-  }
-  return {
-    kind: 'text',
-    id: message.id,
-    roomJID,
-    body: message.body || '',
-    isReply,
-    isChecked,
-    mainMessage
-  };
-}
-
-/**
- * Scan every persisted room for messages still `pending: true` that
- * DON'T already have a restored failure entry (those are handled by the
- * caller separately, from the persisted `failedMessages` map), and
- * synthesize a retry-able FailedMessagePayload for each. Pure function:
- * the caller (roomStore/index.ts) is responsible for dispatching
- * `markMessageFailed` for the results.
- */
-export function computeBootTimeFailures(rooms, alreadyFailed) {
-  if (!rooms || typeof rooms !== 'object') {
-    return [];
-  }
-  const out = [];
-  for (const [jid, room] of Object.entries(rooms)) {
-    const messages = Array.isArray(room?.messages) ? room.messages : [];
-    for (const message of messages) {
-      if (!message || !message.pending) {
-        continue;
-      }
-      if (alreadyFailed && alreadyFailed[message.id]) {
-        continue;
-      }
-      const payload = reconstructFailedMessagePayload(message, jid);
-      if (payload) {
-        out.push(payload);
-      }
-    }
-  }
-  return out;
-}
 let writeTimer = null;
 
 /**
@@ -329,31 +160,25 @@ let writeTimer = null;
 export const persistenceMiddleware = storeAPI => next => action => {
   const result = next(action);
   const type = action?.type || '';
-  if (!type.startsWith('roomMessages/') && !type.startsWith('roomHeapStore/') && !type.startsWith('chat/setUser') && !type.startsWith('chat/updateUser') && !type.startsWith('chat/refreshTokens') && !type.startsWith('chat/logout')) {
+  if (!type.startsWith('roomMessages/') && !type.startsWith('chat/setUser') && !type.startsWith('chat/updateUser') && !type.startsWith('chat/refreshTokens') && !type.startsWith('chat/logout')) {
     return result;
   }
   if (writeTimer) {
     clearTimeout(writeTimer);
   }
   writeTimer = setTimeout(() => {
-    (async () => {
-      try {
-        const state = storeAPI.getState();
-        const chatPayload = {
-          user: sanitizeUser(state.chatSettingStore?.user)
-        };
-        const roomsPayload = {
-          rooms: sanitizeRooms(state.rooms?.rooms || {})
-        };
-        const heapPayload = {
-          failedMessages: sanitizeFailedMessages(state.roomHeapSlice?.failedMessages)
-        };
-        const [chatCipher, roomsCipher, heapCipher] = await Promise.all([encryptForPersist(JSON.stringify(chatPayload)), encryptForPersist(JSON.stringify(roomsPayload)), encryptForPersist(JSON.stringify(heapPayload))]);
-        await AsyncStorage.multiSet([[KEY_CHAT, chatCipher], [KEY_ROOMS, roomsCipher], [KEY_HEAP, heapCipher]]);
-      } catch (e) {
-        console.warn('persist write failed', e);
-      }
-    })();
+    try {
+      const state = storeAPI.getState();
+      const chatPayload = {
+        user: sanitizeUser(state.chatSettingStore?.user)
+      };
+      const roomsPayload = {
+        rooms: sanitizeRooms(state.rooms?.rooms || {})
+      };
+      AsyncStorage.multiSet([[KEY_CHAT, JSON.stringify(chatPayload)], [KEY_ROOMS, JSON.stringify(roomsPayload)]]).catch(e => console.warn('persist write failed', e));
+    } catch (e) {
+      console.warn('persist serialize failed', e);
+    }
   }, 200);
   return result;
 };
@@ -365,40 +190,30 @@ export const persistenceMiddleware = storeAPI => next => action => {
  */
 export async function readPersistedState() {
   try {
-    const [chatRaw, roomsRaw, heapRaw] = await AsyncStorage.multiGet([KEY_CHAT, KEY_ROOMS, KEY_HEAP]);
-    const [chatPlain, roomsPlain, heapPlain] = await Promise.all([chatRaw[1] ? decryptFromPersist(chatRaw[1]) : Promise.resolve(null), roomsRaw[1] ? decryptFromPersist(roomsRaw[1]) : Promise.resolve(null), heapRaw[1] ? decryptFromPersist(heapRaw[1]) : Promise.resolve(null)]);
-    // `decryptFromPersist` returns null both for "nothing stored" and
-    // for "stored value isn't a valid envelope for the current key" —
-    // notably a plaintext blob left over from a pre-encryption install.
-    // Either way there is nothing safe to parse, so the caller treats it
-    // as a cold start and re-hydrates from the server.
-    const chat = chatPlain ? JSON.parse(chatPlain) : null;
-    const rooms = roomsPlain ? JSON.parse(roomsPlain) : null;
-    const heap = heapPlain ? JSON.parse(heapPlain) : null;
+    const [chatRaw, roomsRaw] = await AsyncStorage.multiGet([KEY_CHAT, KEY_ROOMS]);
+    const chat = chatRaw[1] ? JSON.parse(chatRaw[1]) : null;
+    const rooms = roomsRaw[1] ? JSON.parse(roomsRaw[1]) : null;
     return {
       chat,
-      rooms,
-      heap
+      rooms
     };
   } catch (e) {
     console.warn('persist read failed', e);
     return {
       chat: null,
-      rooms: null,
-      heap: null
+      rooms: null
     };
   }
 }
 export async function clearPersistedState() {
   try {
-    await AsyncStorage.multiRemove([KEY_CHAT, KEY_ROOMS, KEY_HEAP]);
+    await AsyncStorage.multiRemove([KEY_CHAT, KEY_ROOMS]);
   } catch (e) {
     console.warn('persist clear failed', e);
   }
 }
 export const PERSIST_KEYS = {
   KEY_CHAT,
-  KEY_ROOMS,
-  KEY_HEAP
+  KEY_ROOMS
 };
 //# sourceMappingURL=persistence.js.map

package/lib/module/roomStore/persistence.js.map

@@ -1 +1 @@
-{"version":3,"names":["AsyncStorage","encryptForPersist","decryptFromPersist","KEY_CHAT","KEY_ROOMS","KEY_HEAP","MESSAGE_LIMIT","MAX_PERSISTED_FAILED_MESSAGES","sanitizeUser","user","token","_token","refreshToken","_refreshToken","xmppPassword","_xmppPassword","rest","PERSISTED_MESSAGE_FIELDS","PERSISTED_MESSAGE_USER_FIELDS","REFETCHED_ROOM_FIELDS","pickDefined","source","keys","out","key","value","undefined","compactMessageForPersist","message","compact","sanitizeMessages","messages","Array","isArray","capped","length","slice","map","sanitizeRooms","rooms","jid","room","Object","entries","includes","compactRoom","usersCnt","members","field","composing","composingList","isLoading","historyPreloadState","sanitizeMediaData","data","uri","type","name","size","sanitizeFailedMessagePayload","payload","id","roomJID","kind","isReply","isChecked","mainMessage","body","sanitizeFailedMessages","failedMessages","count","clean","reconstructFailedMessagePayload","showInChannel","isMediafile","location","fileName","mimetype","Number","computeBootTimeFailures","alreadyFailed","pending","push","writeTimer","persistenceMiddleware","storeAPI","next","action","result","startsWith","clearTimeout","setTimeout","state","getState","chatPayload","chatSettingStore","roomsPayload","heapPayload","roomHeapSlice","chatCipher","roomsCipher","heapCipher","Promise","all","JSON","stringify","multiSet","e","console","warn","readPersistedState","chatRaw","roomsRaw","heapRaw","multiGet","chatPlain","roomsPlain","heapPlain","resolve","chat","parse","heap","clearPersistedState","multiRemove","PERSIST_KEYS"],"sourceRoot":"../../../src","sources":["roomStore/persistence.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["AsyncStorage","KEY_CHAT","KEY_ROOMS","MESSAGE_LIMIT","sanitizeUser","user","token","_token","refreshToken","_refreshToken","xmppPassword","_xmppPassword","rest","PERSISTED_MESSAGE_FIELDS","PERSISTED_MESSAGE_USER_FIELDS","REFETCHED_ROOM_FIELDS","pickDefined","source","keys","out","key","value","undefined","compactMessageForPersist","message","compact","sanitizeMessages","messages","Array","isArray","capped","length","slice","map","sanitizeRooms","rooms","jid","room","Object","entries","includes","compactRoom","usersCnt","members","field","composing","composingList","isLoading","historyPreloadState","writeTimer","persistenceMiddleware","storeAPI","next","action","result","type","startsWith","clearTimeout","setTimeout","state","getState","chatPayload","chatSettingStore","roomsPayload","multiSet","JSON","stringify","catch","e","console","warn","readPersistedState","chatRaw","roomsRaw","multiGet","chat","parse","clearPersistedState","multiRemove","PERSIST_KEYS"],"sourceRoot":"../../../src","sources":["roomStore/persistence.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/roomStore/roomsSlice.js

@@ -2,7 +2,6 @@
 
 import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
 import { insertMessageWithDelimiter } from '../helpers/insertMessageWithDelimiter';
-import { msgSortableMs } from '../helpers/msgSortableMs';
 // Per-room runtime message cap. Mirrors the persistence layer's
 // MESSAGE_LIMIT so what's in memory matches what's on disk; otherwise
 // long sessions grow the array unbounded (memory leak) and reload
@@ -12,7 +11,7 @@ import { msgSortableMs } from '../helpers/msgSortableMs';
 // older history added via unshift/splice is exempt, so the user can
 // page backward arbitrarily far without instantly losing what they
 // just fetched. After cap eviction we drop from the head (oldest).
-export const RUNTIME_MESSAGE_LIMIT = 100;
+const RUNTIME_MESSAGE_LIMIT = 100;
 
 // Body strings the server uses for call signaling broadcasts (call-token,
 // call-state ringing/ended, etc). These should never reach the chat
@@ -128,6 +127,7 @@ function mergeHistoryIntoCache(existing, fetched) {
   // fetched MAM page (the live-stream swallow doesn't cover history).
   const ex = stripCallSignals(existing);
   const fe = stripCallSignals(fetched);
+  const pending = ex.filter(m => m?.pending);
   const realExisting = ex.filter(m => m && !m.pending && m.id !== 'delimiter-new');
   const realFetched = fe.filter(m => m && m.id !== 'delimiter-new');
 
@@ -135,28 +135,6 @@ function mergeHistoryIntoCache(existing, fetched) {
   if (realFetched.length === 0) {
     return ex;
   }
-
-  // Optimistic sends are preserved across a history merge - EXCEPT the
-  // ones the fetched page proves the server already has. That happens
-  // whenever a send reached the server but its echo did not reach us
-  // before the process died: the optimistic bubble is restored from disk
-  // still `pending: true` (and, since bug #39, flagged failed at boot),
-  // while MAM hands back the very same message under its ARCHIVE id.
-  // Keying only on `id` never matched those two, so the room ended up
-  // showing the message twice - once for real and once as a bubble stuck
-  // on "sending…"/"Failed" that nothing could ever clear. The archived
-  // copy carries our original stanza id as `xmppId` (getDataFromXml), so
-  // match on that too and drop the local ghost.
-  const fetchedKeys = new Set();
-  for (const m of realFetched) {
-    if (m?.id != null) {
-      fetchedKeys.add(String(m.id));
-    }
-    if (m?.xmppId) {
-      fetchedKeys.add(String(m.xmppId));
-    }
-  }
-  const pending = ex.filter(m => m?.pending && !fetchedKeys.has(String(m.id)) && !(m.xmppId && fetchedKeys.has(String(m.xmppId))));
   const byMs = (a, b) => msgSortableMs(a) - msgSortableMs(b);
   const capTail = arr => arr.length > RUNTIME_MESSAGE_LIMIT ? arr.slice(-RUNTIME_MESSAGE_LIMIT) : arr;
   const existingIds = new Set(realExisting.map(m => String(m.id)));
@@ -200,8 +178,7 @@ const initialState = {
     text: ''
   },
   pendingNotificationJid: null,
-  privateStoreMarkers: {},
-  readBoundaries: {}
+  privateStoreMarkers: {}
 };
 const isValidRoomJid = jid => {
   if (typeof jid !== 'string' || !jid) return false;
@@ -287,8 +264,6 @@ const reducers = {
     const existingMessages = Array.isArray(existing?.messages) ? existing.messages : [];
     state.rooms[roomData.jid] = {
       ...roomData,
-      icon: roomData.icon !== undefined ? roomData.icon : existing?.icon,
-      roomBg: roomData.roomBg !== undefined ? roomData.roomBg : existing?.roomBg,
       messages: existingMessages.length > 0 ? existingMessages : incomingMessages,
       lastViewedTimestamp: lastViewed,
       unreadMessages: roomData.unreadMessages ?? existing?.unreadMessages ?? 0,
@@ -446,7 +421,7 @@ const reducers = {
       roomMessages.unshift(message);
     } else {
       const lastViewedValue = state.rooms[roomJID].lastViewedTimestamp;
-      const lastViewedTimestamp = state.visibleRoomJID === roomJID ? null : lastViewedValue ? lastViewedValue : null;
+      const lastViewedTimestamp = state.visibleRoomJID === roomJID ? null : lastViewedValue ? new Date(lastViewedValue) : null;
       insertMessageWithDelimiter(roomMessages, message, lastViewedTimestamp);
     }
 
@@ -462,7 +437,6 @@ const reducers = {
     state.rooms = {};
     state.visibleRoomJID = null;
     state.privateStoreMarkers = {};
-    state.readBoundaries = {};
     state.isUnreadSyncing = false;
   },
   setComposing(state, action) {
@@ -521,19 +495,7 @@ const reducers = {
    *
    * Monotonic: a marker only ever moves a baseline FORWARD, so a stale
    * server value can't resurrect already-read messages and a more-recent
-   * local read (tab blur stamping the server read timestamp) always wins.
-   *
-   * Bug #38 self-heal: forward-only is correct for a SANE existing
-   * value, but a device whose clock was ahead may have already stamped
-   * a marker in the future (either persisted locally from a previous
-   * session, or fetched from the server before this fix existed). To
-   * "only ever move forward" from a corrupt future value is to never
-   * move at all - the room would stay stuck at `unreadMessages: 0`
-   * forever. When the room is loaded, detect a marker that sits well
-   * past the newest message we actually know it has and waive the
-   * forward-only check for that one comparison, so the incoming
-   * (already-clamped, see xmppClient.getChatsPrivateStoreRequestStanza)
-   * value can correct it even though it's numerically smaller.
+   * local read (tab blur stamping Date.now()) always wins.
    */
   applyPrivateStoreMarkers: (state, action) => {
     const markers = action.payload;
@@ -548,73 +510,20 @@ const reducers = {
       if (!jid || !Number.isFinite(ts) || ts <= 0) {
         continue;
       }
-      const room = state.rooms[jid];
-      const newestKnownMs = room ? newestAckedMessageMs(room.messages) : 0;
-      // Mirrors isCorruptFutureReadMarker in helpers/getServerReadTimestamp.ts
-      // (duplicated to avoid a roomStore <-> helpers import cycle):
-      // BOTH signals are required. "Further ahead than the newest
-      // message this room has locally" happens all the time on a room
-      // whose history hasn't synced yet, and healing on that alone
-      // would drop a legitimate marker another device wrote after
-      // reading newer messages. A real read marker can never be ahead
-      // of real time, so that second signal is what distinguishes a
-      // stale cache from a wrong clock.
-      const nowMs = Date.now();
-      const looksCorrupt = existing => newestKnownMs > 0 && existing > newestKnownMs + FUTURE_MARKER_TOLERANCE_MS && existing > nowMs + FUTURE_MARKER_TOLERANCE_MS;
-
       // Remember the marker so rooms that load LATER (via addRoom)
       // inherit it even though they don't exist in the store yet.
-      const cachedMarker = state.privateStoreMarkers[jid] || 0;
-      if (ts > cachedMarker || looksCorrupt(cachedMarker)) {
+      if (ts > (state.privateStoreMarkers[jid] || 0)) {
         state.privateStoreMarkers[jid] = ts;
       }
       // Upgrade an already-loaded room's baseline + recompute its badge.
-      // Forward-only, unless the room's CURRENT baseline is itself the
-      // corrupt value being corrected.
-      if (room && (ts > (room.lastViewedTimestamp || 0) || looksCorrupt(room.lastViewedTimestamp || 0))) {
+      // Only ever forward, so a later local read isn't clobbered.
+      const room = state.rooms[jid];
+      if (room && ts > (room.lastViewedTimestamp || 0)) {
         room.lastViewedTimestamp = ts;
         room.unreadMessages = countNewerMessages(room.messages, ts);
       }
     }
   },
-  /**
-   * Set (or clear) the "read up to here, but not further" boundary for
-   * a room - see `readBoundaries` on `RoomMessagesState` for the full
-   * contract. `ts` is the msgSortableMs of the newest message the user
-   * actually reached before scrolling away from the bottom; `null`/`0`
-   * clears it (the user is at the bottom, or nothing was reached yet).
-   */
-  setReadBoundary: (state, action) => {
-    const {
-      jid,
-      ts
-    } = action.payload;
-    if (!jid) {
-      return;
-    }
-    if (!state.readBoundaries) {
-      state.readBoundaries = {};
-    }
-    if (typeof ts === 'number' && Number.isFinite(ts) && ts > 0) {
-      state.readBoundaries[jid] = ts;
-    } else {
-      delete state.readBoundaries[jid];
-    }
-  },
-  /**
-   * Release a room's read boundary once it has been consumed by a
-   * genuine "leave" (ChatRoom unmount, or a tab-navigator focus hook
-   * switching to a different room) - see `readBoundaries` for why the
-   * background/`isVisible=false` paths deliberately do NOT call this.
-   */
-  clearReadBoundary: (state, action) => {
-    const {
-      jid
-    } = action.payload;
-    if (jid && state.readBoundaries) {
-      delete state.readBoundaries[jid];
-    }
-  },
   setRoomRole: (state, action) => {
     const {
       chatJID,
@@ -694,7 +603,6 @@ const reducers = {
     state.isLoading = false;
     state.isUnreadSyncing = false;
     state.privateStoreMarkers = {};
-    state.readBoundaries = {};
   },
   setActiveMessage: (state, action) => {
     const {
@@ -797,13 +705,31 @@ export const roomsStore = createSlice({
   reducers
 });
 
-// Re-exported for backward compatibility - every existing call site
-// imports `msgSortableMs` from here. The implementation now lives in
-// helpers/msgSortableMs.ts (imported above), so insertMessageWithDelimiter.ts
-// (which this file itself imports) can use the SAME ordering source
-// without a roomStore <-> helpers import cycle. See that file for the
-// full rationale (server id vs. client `date`).
-export { msgSortableMs };
+// Count messages strictly newer than the given millisecond timestamp.
+// Uses `msg.id` (server-authoritative microsecond timestamp prefixed by
+// 13-digit millis — see helpers/dateComparison `getHighResolutionTimestamp`)
+// because `msg.date` can be derived client-side (createMessageFromXml
+// falls back to `Date.now()` for realtime stanzas without a `date`
+// attr), which makes the comparison drift vs what the server assigned.
+// Excludes the "delimiter-new" sentinel, pending sends, and the current
+// user's own messages (parity with unreadMiddleware's isOwnMessage
+// filter — without this, the reducer and the middleware disagree about
+// the count and we get a flicker as the badge gets written twice with
+// different values on every message).
+export const msgSortableMs = msg => {
+  const id = String(msg?.id || '');
+  const m = /^(\d{13})/.exec(id);
+  if (m) {
+    return Number(m[1]);
+  }
+  if (msg?.date) {
+    const t = new Date(msg.date).getTime();
+    if (Number.isFinite(t)) {
+      return t;
+    }
+  }
+  return 0;
+};
 const norm = s => {
   if (s == null) {
     return '';
@@ -829,35 +755,6 @@ const isOwn = (msg, selfXmpp, selfWallet) => {
   }
   return false;
 };
-
-// Bug #38 tolerance: a stored read marker more than this far past the
-// newest message a room actually has is not "the user is a little
-// ahead" - it's a leftover from a device whose clock was wrong when it
-// stamped the marker. Kept in sync with (but duplicated from, to avoid
-// a roomStore ↔ helpers import cycle) FUTURE_READ_MARKER_TOLERANCE_MS
-// in helpers/getServerReadTimestamp.ts.
-const FUTURE_MARKER_TOLERANCE_MS = 5 * 60 * 1000;
-
-// Newest message in `messages` this room actually has proof the server
-// accepted - used only to sanity-check an already-stored read marker
-// against reality (see applyPrivateStoreMarkers's self-heal). Excludes
-// pending/optimistic sends via the `pending` flag alone: unlike
-// getServerReadTimestamp, this runs inside a reducer and can't reach
-// across to the roomHeapSlice slice, but `pending` already identifies
-// every optimistic send that matters for this comparison.
-const newestAckedMessageMs = messages => {
-  let newest = 0;
-  for (const m of messages || []) {
-    if (!m || m.id === 'delimiter-new' || m.pending) {
-      continue;
-    }
-    const ms = msgSortableMs(m);
-    if (ms > newest) {
-      newest = ms;
-    }
-  }
-  return newest;
-};
 const countNewerMessages = (messages, timestamp, selfXmpp = '', selfWallet = '') => {
   if (!messages?.length || !timestamp) {
     return 0;
@@ -890,8 +787,6 @@ export const {
   setUnreadSyncing,
   setLastViewedTimestamp,
   applyPrivateStoreMarkers,
-  setReadBoundary,
-  clearReadBoundary,
   setRoomNoMessages,
   setCurrentRoom,
   setVisibleRoom,