@ethora/chat-component-rn 26.8.5 → 26.8.7

package/lib/module/e2ee/stanza.js

@@ -0,0 +1,107 @@
+"use strict";
+
+import { Element, parse } from 'ltx';
+import { store } from '../roomStore';
+import { translateKey } from '../i18n/strings';
+import { NS_OMEMO } from './ns';
+import { omemoReady, senderJidFromMuc } from './index';
+const READY_TIMEOUT_MS = 8000;
+export function encryptedCarrier(stanza, depth = 0) {
+  if (depth > 4 || !stanza?.getChild) {
+    return undefined;
+  }
+  if (stanza.name === 'message' && stanza.getChild('encrypted', NS_OMEMO)) {
+    return stanza;
+  }
+  for (const child of stanza.children ?? []) {
+    if (typeof child === 'string') {
+      continue;
+    }
+    const found = encryptedCarrier(child, depth + 1);
+    if (found) {
+      return found;
+    }
+  }
+  return undefined;
+}
+const PLACEHOLDER_KEY = {
+  unsupported: 'e2ee.unsupportedMessage',
+  'other-device': 'e2ee.otherDevice',
+  failed: 'e2ee.undecryptable'
+};
+export function placeholderKey(error) {
+  return PLACEHOLDER_KEY[error] ?? PLACEHOLDER_KEY.failed;
+}
+function placeholder(error) {
+  const settings = store.getState()?.chatSettingStore;
+  return new Element('body', {}).t(translateKey(placeholderKey(error), settings?.config?.i18n?.locale || settings?.langSource, settings?.config?.i18n?.strings));
+}
+function mark(carrier, error) {
+  let data = carrier.getChild('data');
+  if (!data) {
+    data = new Element('data', {});
+    carrier.append(data);
+  }
+  data.attrs.omemoEncrypted = 'true';
+  if (error) {
+    data.attrs.undecryptable = 'true';
+    data.attrs.e2eeError = error;
+  }
+}
+function strip(carrier) {
+  carrier.remove('encrypted', NS_OMEMO);
+  carrier.remove('encryption', 'urn:xmpp:eme:0');
+  carrier.remove('body');
+}
+function close(carrier, error) {
+  strip(carrier);
+  carrier.append(placeholder(error));
+  mark(carrier, error);
+  return 'undecryptable';
+}
+export function rewriteEncryptedStanza(stanza) {
+  const carrier = encryptedCarrier(stanza);
+  if (!carrier) {
+    return 'not-encrypted';
+  }
+  const encrypted = carrier.getChild('encrypted', NS_OMEMO);
+  if (!encrypted?.getChild('payload')) {
+    return 'drop';
+  }
+  return close(carrier, 'unsupported');
+}
+const waitForDevice = () => {
+  let timer;
+  const timeout = new Promise(resolve => {
+    timer = setTimeout(() => resolve(undefined), READY_TIMEOUT_MS);
+  });
+  return Promise.race([omemoReady(), timeout]).finally(() => {
+    if (timer) {
+      clearTimeout(timer);
+    }
+  });
+};
+export async function decryptStanzaInPlace(stanza, domain) {
+  const carrier = encryptedCarrier(stanza);
+  if (!carrier) {
+    return 'not-encrypted';
+  }
+  const encrypted = carrier.getChild('encrypted', NS_OMEMO);
+  if (!encrypted?.getChild('payload')) {
+    return 'drop';
+  }
+  const from = String(carrier.attrs?.from || '');
+  const roomJid = from.split('/')[0];
+  const sender = senderJidFromMuc(from, domain);
+  const crypto = await waitForDevice();
+  const decrypted = sender ? await crypto?.decrypt(carrier, sender, roomJid) : undefined;
+  if (!decrypted?.content) {
+    return close(carrier, decrypted?.error === 'omemo_not_encrypted_for_this_device' ? 'other-device' : 'failed');
+  }
+  strip(carrier);
+  const wrapper = parse(`<omemo-content>${decrypted.content}</omemo-content>`);
+  carrier.append(...wrapper.children);
+  mark(carrier);
+  return 'decrypted';
+}
+//# sourceMappingURL=stanza.js.map

package/lib/module/e2ee/stanza.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["Element","parse","store","translateKey","NS_OMEMO","omemoReady","senderJidFromMuc","READY_TIMEOUT_MS","encryptedCarrier","stanza","depth","getChild","undefined","name","child","children","found","PLACEHOLDER_KEY","unsupported","failed","placeholderKey","error","placeholder","settings","getState","chatSettingStore","t","config","i18n","locale","langSource","strings","mark","carrier","data","append","attrs","omemoEncrypted","undecryptable","e2eeError","strip","remove","close","rewriteEncryptedStanza","encrypted","waitForDevice","timer","timeout","Promise","resolve","setTimeout","race","finally","clearTimeout","decryptStanzaInPlace","domain","from","String","roomJid","split","sender","crypto","decrypted","decrypt","content","wrapper"],"sourceRoot":"../../../src","sources":["e2ee/stanza.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/e2ee/store.js

@@ -0,0 +1,35 @@
+"use strict";
+
+import { fromBase64, toBase64 } from './crypto';
+const BYTES_TAG = '$bytes';
+export function encodeValue(value) {
+  return JSON.stringify(value, (_key, item) => item instanceof Uint8Array ? {
+    [BYTES_TAG]: toBase64(item)
+  } : item);
+}
+export function decodeValue(text) {
+  return JSON.parse(text, (_key, item) => item && typeof item === 'object' && typeof item[BYTES_TAG] === 'string' ? fromBase64(item[BYTES_TAG]) : item);
+}
+export function createStore(backend, jid) {
+  const prefix = `${jid.toLowerCase()}|`;
+  return {
+    get: async key => {
+      const raw = await backend.getItem(prefix + key);
+      return raw === null ? undefined : decodeValue(raw);
+    },
+    set: (key, value) => backend.setItem(prefix + key, encodeValue(value)),
+    delete: key => backend.removeItem(prefix + key)
+  };
+}
+export function createMemoryBackend() {
+  const data = new Map();
+  return {
+    getItem: async key => data.get(key) ?? null,
+    setItem: async (key, value) => void data.set(key, value),
+    removeItem: async key => void data.delete(key)
+  };
+}
+export function createMemoryStore(jid = 'memory') {
+  return createStore(createMemoryBackend(), jid);
+}
+//# sourceMappingURL=store.js.map

package/lib/module/e2ee/store.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["fromBase64","toBase64","BYTES_TAG","encodeValue","value","JSON","stringify","_key","item","Uint8Array","decodeValue","text","parse","createStore","backend","jid","prefix","toLowerCase","get","key","raw","getItem","undefined","set","setItem","delete","removeItem","createMemoryBackend","data","Map","createMemoryStore"],"sourceRoot":"../../../src","sources":["e2ee/store.ts"],"mappings":";;AAAA,SAASA,UAAU,EAAEC,QAAQ,QAAQ,UAAU;AAQ/C,MAAMC,SAAS,GAAG,QAAQ;AAE1B,OAAO,SAASC,WAAWA,CAACC,KAAc,EAAU;EAClD,OAAOC,IAAI,CAACC,SAAS,CAACF,KAAK,EAAE,CAACG,IAAI,EAAEC,IAAI,KACtCA,IAAI,YAAYC,UAAU,GAAG;IAAE,CAACP,SAAS,GAAGD,QAAQ,CAACO,IAAI;EAAE,CAAC,GAAGA,IACjE,CAAC;AACH;AAEA,OAAO,SAASE,WAAWA,CAAIC,IAAY,EAAK;EAC9C,OAAON,IAAI,CAACO,KAAK,CAACD,IAAI,EAAE,CAACJ,IAAI,EAAEC,IAAI,KACjCA,IAAI,IAAI,OAAOA,IAAI,KAAK,QAAQ,IAAI,OAAOA,IAAI,CAACN,SAAS,CAAC,KAAK,QAAQ,GACnEF,UAAU,CAACQ,IAAI,CAACN,SAAS,CAAC,CAAC,GAC3BM,IACN,CAAC;AACH;AAQA,OAAO,SAASK,WAAWA,CAACC,OAAsB,EAAEC,GAAW,EAAc;EAC3E,MAAMC,MAAM,GAAG,GAAGD,GAAG,CAACE,WAAW,CAAC,CAAC,GAAG;EACtC,OAAO;IACLC,GAAG,EAAE,MAAUC,GAAW,IAAK;MAC7B,MAAMC,GAAG,GAAG,MAAMN,OAAO,CAACO,OAAO,CAACL,MAAM,GAAGG,GAAG,CAAC;MAC/C,OAAOC,GAAG,KAAK,IAAI,GAAGE,SAAS,GAAGZ,WAAW,CAAIU,GAAG,CAAC;IACvD,CAAC;IACDG,GAAG,EAAEA,CAACJ,GAAG,EAAEf,KAAK,KAAKU,OAAO,CAACU,OAAO,CAACR,MAAM,GAAGG,GAAG,EAAEhB,WAAW,CAACC,KAAK,CAAC,CAAC;IACtEqB,MAAM,EAAGN,GAAG,IAAKL,OAAO,CAACY,UAAU,CAACV,MAAM,GAAGG,GAAG;EAClD,CAAC;AACH;AAEA,OAAO,SAASQ,mBAAmBA,CAAA,EAAkB;EACnD,MAAMC,IAAI,GAAG,IAAIC,GAAG,CAAiB,CAAC;EACtC,OAAO;IACLR,OAAO,EAAE,MAAOF,GAAG,IAAKS,IAAI,CAACV,GAAG,CAACC,GAAG,CAAC,IAAI,IAAI;IAC7CK,OAAO,EAAE,MAAAA,CAAOL,GAAG,EAAEf,KAAK,KAAK,KAAKwB,IAAI,CAACL,GAAG,CAACJ,GAAG,EAAEf,KAAK,CAAC;IACxDsB,UAAU,EAAE,MAAOP,GAAG,IAAK,KAAKS,IAAI,CAACH,MAAM,CAACN,GAAG;EACjD,CAAC;AACH;AAEA,OAAO,SAASW,iBAAiBA,CAACf,GAAG,GAAG,QAAQ,EAAc;EAC5D,OAAOF,WAAW,CAACc,mBAAmB,CAAC,CAAC,EAAEZ,GAAG,CAAC;AAChD","ignoreList":[]}

package/lib/module/helpers/accountName.js

@@ -0,0 +1,18 @@
+"use strict";
+
+export const accountNameOf = (user, appId) => {
+  for (const raw of [user?.xmppUsername, user?.userJID, user?.id, user?._id]) {
+    const value = String(raw || '').split('@')[0].trim();
+    if (!value) {
+      continue;
+    }
+    if (value.includes('_')) {
+      return value;
+    }
+    if (appId) {
+      return `${appId}_${value}`;
+    }
+  }
+  return '';
+};
+//# sourceMappingURL=accountName.js.map

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

@@ -0,0 +1 @@
+{"version":3,"names":["accountNameOf","user","appId","raw","xmppUsername","userJID","id","_id","value","String","split","trim","includes"],"sourceRoot":"../../../src","sources":["helpers/accountName.ts"],"mappings":";;AAAA,OAAO,MAAMA,aAAa,GAAGA,CAC3BC,IAGa,EACbC,KAAa,KACF;EACX,KAAK,MAAMC,GAAG,IAAI,CAACF,IAAI,EAAEG,YAAY,EAAEH,IAAI,EAAEI,OAAO,EAAEJ,IAAI,EAAEK,EAAE,EAAEL,IAAI,EAAEM,GAAG,CAAC,EAAE;IAC1E,MAAMC,KAAK,GAAGC,MAAM,CAACN,GAAG,IAAI,EAAE,CAAC,CAACO,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAEC,IAAI,CAAC,CAAC;IACrD,IAAI,CAACH,KAAK,EAAE;MAAC;IAAS;IACtB,IAAIA,KAAK,CAACI,QAAQ,CAAC,GAAG,CAAC,EAAE;MAAC,OAAOJ,KAAK;IAAC;IACvC,IAAIN,KAAK,EAAE;MAAC,OAAO,GAAGA,KAAK,IAAIM,KAAK,EAAE;IAAC;EACzC;EACA,OAAO,EAAE;AACX,CAAC","ignoreList":[]}

package/lib/module/helpers/createMessageFromXml.js

@@ -1,5 +1,8 @@
 "use strict";
 
+import { isE2eeRoom } from '../e2ee';
+import { composeName } from './displayName';
+import { parseSealedMediaBody } from '../e2ee/sealedBody';
 /**
  * Build an IMessage from XML.
  *
@@ -77,11 +80,14 @@ export const createMessageFromXml = async (arg, bodyEl, positionalId, positional
   // Synthesize user.name from sender attrs (web reads usersSet from
   // redux in <Message>; we fix it once at the source so Avatar /
   // MessageHeader render the actual sender instead of "??").
-  const firstName = (merged.senderFirstName || '').toString().trim();
-  const lastName = (merged.senderLastName || '').toString().trim();
+  const firstName = (merged.senderFirstName || merged.firstName || '').toString().trim();
+  const lastName = (merged.senderLastName || merged.lastName || '').toString().trim();
   const fullName = (merged.fullName || '').toString().trim();
   const senderJID = (merged.senderJID || '').toString();
-  const senderLocal = senderJID.includes('@') ? senderJID.split('@')[0] : senderJID;
+  const senderBare = senderJID.split('/')[0] || '';
+  const senderResource = senderJID.includes('/') ? senderJID.split('/')[1] || '' : '';
+  const senderIsOccupant = !!senderResource && (senderBare === String(merged.roomJid || '') || /@conference\./i.test(senderBare));
+  const senderLocal = senderIsOccupant ? senderResource : senderBare.includes('@') ? senderBare.split('@')[0] : senderBare;
 
   // Bug #41 root cause: the resource of the MUC `from` (room@conference/
   // occupant-id) is the SAME field getDataFromXml uses to derive
@@ -100,11 +106,20 @@ export const createMessageFromXml = async (arg, bodyEl, positionalId, positional
   // 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 composed = composeName(firstName, lastName);
   const existingName = String(merged?.user?.name || '').trim();
   const resolvedName = existingName || composed || fullName || senderLocal || merged?.user?.id || '';
+  const unencrypted = merged.omemoEncrypted !== 'true' && isE2eeRoom(String(merged.roomJid || ''));
+  const sealedKeys = merged.clientEncrypted === 'true' ? parseSealedMediaBody(merged.body) : undefined;
   const message = {
     ...merged,
+    ...(unencrypted ? {
+      unencrypted: true
+    } : {}),
+    ...(sealedKeys ? {
+      e2eeKeys: sealedKeys,
+      body: 'media'
+    } : {}),
     user: {
       ...(merged.user || {}),
       id: merged?.user?.id || fromResource || senderLocal,

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","fromResource","composed","filter","Boolean","join","existingName","resolvedName","message"],"sourceRoot":"../../../src","sources":["helpers/createMessageFromXml.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["isE2eeRoom","composeName","parseSealedMediaBody","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","senderBare","senderResource","includes","senderIsOccupant","test","senderLocal","fromResource","composed","existingName","resolvedName","unencrypted","omemoEncrypted","sealedKeys","clientEncrypted","message","e2eeKeys"],"sourceRoot":"../../../src","sources":["helpers/createMessageFromXml.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/helpers/createRoomFromApi.js

@@ -1,11 +1,43 @@
 "use strict";
 
+const mapApiLastMessage = (apiLastMessage, roomJid) => {
+  const body = String(apiLastMessage?.body || '').trim();
+  if (!apiLastMessage || !body) {
+    return undefined;
+  }
+  const senderName = `${apiLastMessage.senderFirstName || ''} ${apiLastMessage.senderLastName || ''}`.trim();
+  return {
+    id: apiLastMessage.messageId || apiLastMessage.stanzaId || '',
+    xmppId: apiLastMessage.stanzaId,
+    roomJid,
+    body,
+    date: apiLastMessage.createdAt,
+    isDeleted: false,
+    user: {
+      id: apiLastMessage.fromUserId || apiLastMessage.from || '',
+      name: senderName
+    }
+  };
+};
+const seedTimestamp = seed => {
+  if (!seed) {
+    return undefined;
+  }
+  const id = Number(seed.id);
+  if (Number.isFinite(id) && id > 0) {
+    return id;
+  }
+  const ms = seed.date ? new Date(seed.date).getTime() : NaN;
+  return Number.isFinite(ms) && ms > 0 ? ms * 1000 : undefined;
+};
 export const createRoomFromApi = (room, service = 'conference.dev.xmpp.ethoradev.com', usersArrayLength = 0) => {
   try {
+    const jid = `${room?.name}@${service}` || '';
+    const lastMessage = mapApiLastMessage(room?.lastMessage, jid);
     const roomData = {
       ...room,
       id: room?._id || '',
-      jid: `${room?.name}@${service}` || '',
+      jid,
       name: room?.title || '',
       title: room?.title || '',
       usersCnt: Number(room?.members?.length || usersArrayLength + 1),
@@ -14,7 +46,9 @@ export const createRoomFromApi = (room, service = 'conference.dev.xmpp.ethoradev
       roomBg: null,
       icon: room?.picture !== 'none' ? room?.picture : null,
       unreadMessages: 0,
-      lastViewedTimestamp: 0
+      lastViewedTimestamp: 0,
+      lastMessage,
+      lastMessageTimestamp: seedTimestamp(lastMessage)
     };
     return roomData;
   } catch (error) {

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

@@ -1 +1 @@
-{"version":3,"names":["createRoomFromApi","room","service","usersArrayLength","roomData","id","_id","jid","name","title","usersCnt","Number","members","length","messages","isLoading","roomBg","icon","picture","unreadMessages","lastViewedTimestamp","error","console","log"],"sourceRoot":"../../../src","sources":["helpers/createRoomFromApi.tsx"],"mappings":";;AAEA,OAAO,MAAMA,iBAAiB,GAAGA,CAC/BC,IAAa,EACbC,OAAe,GAAG,mCAAmC,EACrDC,gBAAwB,GAAG,CAAC,KACX;EACjB,IAAI;IACF,MAAMC,QAAe,GAAG;MACtB,GAAGH,IAAI;MACPI,EAAE,EAAGJ,IAAI,EAAUK,GAAG,IAAI,EAAE;MAC5BC,GAAG,EAAE,GAAGN,IAAI,EAAEO,IAAI,IAAIN,OAAO,EAAE,IAAI,EAAE;MACrCM,IAAI,EAAEP,IAAI,EAAEQ,KAAK,IAAI,EAAE;MACvBA,KAAK,EAAER,IAAI,EAAEQ,KAAK,IAAI,EAAE;MACxBC,QAAQ,EAAEC,MAAM,CAACV,IAAI,EAAEW,OAAO,EAAEC,MAAM,IAAIV,gBAAgB,GAAG,CAAC,CAAC;MAC/DW,QAAQ,EAAE,EAAE;MACZC,SAAS,EAAE,KAAK;MAChBC,MAAM,EAAE,IAAI;MACZC,IAAI,EAAEhB,IAAI,EAAEiB,OAAO,KAAK,MAAM,GAAGjB,IAAI,EAAEiB,OAAO,GAAG,IAAI;MACrDC,cAAc,EAAE,CAAC;MACjBC,mBAAmB,EAAE;IACvB,CAAC;IACD,OAAOhB,QAAQ;EACjB,CAAC,CAAC,OAAOiB,KAAK,EAAE;IACdC,OAAO,CAACC,GAAG,CAACF,KAAK,CAAC;IAClB,OAAO,IAAI;EACb;AACF,CAAC","ignoreList":[]}
+{"version":3,"names":["mapApiLastMessage","apiLastMessage","roomJid","body","String","trim","undefined","senderName","senderFirstName","senderLastName","id","messageId","stanzaId","xmppId","date","createdAt","isDeleted","user","fromUserId","from","name","seedTimestamp","seed","Number","isFinite","ms","Date","getTime","NaN","createRoomFromApi","room","service","usersArrayLength","jid","lastMessage","roomData","_id","title","usersCnt","members","length","messages","isLoading","roomBg","icon","picture","unreadMessages","lastViewedTimestamp","lastMessageTimestamp","error","console","log"],"sourceRoot":"../../../src","sources":["helpers/createRoomFromApi.tsx"],"mappings":";;AAGA,MAAMA,iBAAiB,GAAGA,CACxBC,cAAsC,EACtCC,OAAe,KACa;EAC5B,MAAMC,IAAI,GAAGC,MAAM,CAACH,cAAc,EAAEE,IAAI,IAAI,EAAE,CAAC,CAACE,IAAI,CAAC,CAAC;EACtD,IAAI,CAACJ,cAAc,IAAI,CAACE,IAAI,EAAE;IAAC,OAAOG,SAAS;EAAC;EAChD,MAAMC,UAAU,GAAG,GAAGN,cAAc,CAACO,eAAe,IAAI,EAAE,IACxDP,cAAc,CAACQ,cAAc,IAAI,EAAE,EACnC,CAACJ,IAAI,CAAC,CAAC;EACT,OAAO;IACLK,EAAE,EAAET,cAAc,CAACU,SAAS,IAAIV,cAAc,CAACW,QAAQ,IAAI,EAAE;IAC7DC,MAAM,EAAEZ,cAAc,CAACW,QAAQ;IAC/BV,OAAO;IACPC,IAAI;IACJW,IAAI,EAAEb,cAAc,CAACc,SAAS;IAC9BC,SAAS,EAAE,KAAK;IAChBC,IAAI,EAAE;MACJP,EAAE,EAAET,cAAc,CAACiB,UAAU,IAAIjB,cAAc,CAACkB,IAAI,IAAI,EAAE;MAC1DC,IAAI,EAAEb;IACR;EACF,CAAC;AACH,CAAC;AAED,MAAMc,aAAa,GAAIC,IAA6B,IAAyB;EAC3E,IAAI,CAACA,IAAI,EAAE;IAAC,OAAOhB,SAAS;EAAC;EAC7B,MAAMI,EAAE,GAAGa,MAAM,CAACD,IAAI,CAACZ,EAAE,CAAC;EAC1B,IAAIa,MAAM,CAACC,QAAQ,CAACd,EAAE,CAAC,IAAIA,EAAE,GAAG,CAAC,EAAE;IAAC,OAAOA,EAAE;EAAC;EAC9C,MAAMe,EAAE,GAAGH,IAAI,CAACR,IAAI,GAAG,IAAIY,IAAI,CAACJ,IAAI,CAACR,IAAI,CAAC,CAACa,OAAO,CAAC,CAAC,GAAGC,GAAG;EAC1D,OAAOL,MAAM,CAACC,QAAQ,CAACC,EAAE,CAAC,IAAIA,EAAE,GAAG,CAAC,GAAGA,EAAE,GAAG,IAAI,GAAGnB,SAAS;AAC9D,CAAC;AAED,OAAO,MAAMuB,iBAAiB,GAAGA,CAC/BC,IAAa,EACbC,OAAe,GAAG,mCAAmC,EACrDC,gBAAwB,GAAG,CAAC,KACX;EACjB,IAAI;IACF,MAAMC,GAAG,GAAG,GAAGH,IAAI,EAAEV,IAAI,IAAIW,OAAO,EAAE,IAAI,EAAE;IAC5C,MAAMG,WAAW,GAAGlC,iBAAiB,CAAC8B,IAAI,EAAEI,WAAW,EAAED,GAAG,CAAC;IAC7D,MAAME,QAAe,GAAG;MACtB,GAAGL,IAAI;MACPpB,EAAE,EAAGoB,IAAI,EAAUM,GAAG,IAAI,EAAE;MAC5BH,GAAG;MACHb,IAAI,EAAEU,IAAI,EAAEO,KAAK,IAAI,EAAE;MACvBA,KAAK,EAAEP,IAAI,EAAEO,KAAK,IAAI,EAAE;MACxBC,QAAQ,EAAEf,MAAM,CAACO,IAAI,EAAES,OAAO,EAAEC,MAAM,IAAIR,gBAAgB,GAAG,CAAC,CAAC;MAC/DS,QAAQ,EAAE,EAAE;MACZC,SAAS,EAAE,KAAK;MAChBC,MAAM,EAAE,IAAI;MACZC,IAAI,EAAEd,IAAI,EAAEe,OAAO,KAAK,MAAM,GAAGf,IAAI,EAAEe,OAAO,GAAG,IAAI;MACrDC,cAAc,EAAE,CAAC;MACjBC,mBAAmB,EAAE,CAAC;MACtBb,WAAW;MACXc,oBAAoB,EAAE3B,aAAa,CAACa,WAAW;IACjD,CAAC;IACD,OAAOC,QAAQ;EACjB,CAAC,CAAC,OAAOc,KAAK,EAAE;IACdC,OAAO,CAACC,GAAG,CAACF,KAAK,CAAC;IAClB,OAAO,IAAI;EACb;AACF,CAAC","ignoreList":[]}

package/lib/module/helpers/createUserNameFromSetUser.js

@@ -1,5 +1,7 @@
 "use strict";
 
+import { composeName } from './displayName';
+
 /**
  * Cache-only lookup. Returns the literal "Deleted User" as a MISS sentinel
  * when `usersSet` has no entry for `userId` yet, callers that want a
@@ -17,7 +19,7 @@ export const createUserNameFromSetUser = (usersSet, userId) => {
   // members (no REST match yet) carry just the roster `name` attr —
   // fall back to that before giving up and returning the raw id.
   const bareName = user.name?.trim() || '';
-  return `${firstName} ${lastName}`.trim() || bareName || userId;
+  return composeName(firstName, lastName) || bareName || userId;
 };
 
 /**

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

@@ -1 +1 @@
-{"version":3,"names":["createUserNameFromSetUser","usersSet","userId","user","firstName","trim","lastName","bareName","name","resolveSenderDisplayName","message","rawUserId","String","id","localUserId","split","currentNameRaw","currentName","dataFullName","fullName","dataFirst","senderFirstName","dataLast","senderLastName","composedFromData","usersSetName","usersSetNameAlt","isUsersSetUseful"],"sourceRoot":"../../../src","sources":["helpers/createUserNameFromSetUser.ts"],"mappings":";;AAEA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMA,yBAAyB,GAAGA,CACvCC,QAAoC,EACpCC,MAAc,KACH;EACX,MAAMC,IAAI,GAAGF,QAAQ,CAACC,MAAM,CAAC;EAE7B,IAAI,CAACC,IAAI,EAAE;IAAC,OAAO,cAAc;EAAC;EAElC,MAAMC,SAAS,GAAGD,IAAI,CAACC,SAAS,EAAEC,IAAI,CAAC,CAAC,IAAI,EAAE;EAC9C,MAAMC,QAAQ,GAAGH,IAAI,CAACG,QAAQ,EAAED,IAAI,CAAC,CAAC,IAAI,EAAE;EAC5C;EACA;EACA;EACA,MAAME,QAAQ,GAAGJ,IAAI,CAACK,IAAI,EAAEH,IAAI,CAAC,CAAC,IAAI,EAAE;EAExC,OAAO,GAAGD,SAAS,IAAIE,QAAQ,EAAE,CAACD,IAAI,CAAC,CAAC,IAAIE,QAAQ,IAAIL,MAAM;AAChE,CAAC;;AAED;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMO,wBAAwB,GAAGA,CACtCC,OAIC,EACDT,QAAoC,KACzB;EACX,MAAMU,SAAS,GAAGC,MAAM,CAACF,OAAO,EAAEP,IAAI,EAAEU,EAAE,IAAI,EAAE,CAAC;EACjD,MAAMC,WAAW,GAAGH,SAAS,CAACI,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;EAC3C,MAAMC,cAAc,GAAGJ,MAAM,CAACF,OAAO,EAAEP,IAAI,EAAEK,IAAI,IAAI,EAAE,CAAC,CAACH,IAAI,CAAC,CAAC;EAC/D;EACA;EACA,MAAMY,WAAW,GAAGD,cAAc,KAAK,cAAc,GAAG,EAAE,GAAGA,cAAc;EAE3E,MAAME,YAAY,GAAGN,MAAM,CAACF,OAAO,EAAES,QAAQ,IAAI,EAAE,CAAC,CAACd,IAAI,CAAC,CAAC;EAC3D,MAAMe,SAAS,GAAGR,MAAM,CAACF,OAAO,EAAEW,eAAe,IAAI,EAAE,CAAC,CAAChB,IAAI,CAAC,CAAC;EAC/D,MAAMiB,QAAQ,GAAGV,MAAM,CAACF,OAAO,EAAEa,cAAc,IAAI,EAAE,CAAC,CAAClB,IAAI,CAAC,CAAC;EAC7D,MAAMmB,gBAAgB,GAAGN,YAAY,IAAI,GAAGE,SAAS,IAAIE,QAAQ,EAAE,CAACjB,IAAI,CAAC,CAAC;EAE1E,MAAMoB,YAAY,GAAGzB,yBAAyB,CAACC,QAAQ,EAAEa,WAAW,CAAC;EACrE,MAAMY,eAAe,GAAG1B,yBAAyB,CAACC,QAAQ,EAAEU,SAAS,CAAC;EACtE,MAAMgB,gBAAgB,GAAInB,IAAY,IAAK,CAAC,CAACA,IAAI,IAAIA,IAAI,KAAK,cAAc;EAE5E,OACES,WAAW,IACVU,gBAAgB,CAACF,YAAY,CAAC,IAAIA,YAAa,IAC/CE,gBAAgB,CAACD,eAAe,CAAC,IAAIA,eAAgB,IACtDF,gBAAgB,IAChBV,WAAW,IACXH,SAAS,IACT,cAAc;AAElB,CAAC","ignoreList":[]}
+{"version":3,"names":["composeName","createUserNameFromSetUser","usersSet","userId","user","firstName","trim","lastName","bareName","name","resolveSenderDisplayName","message","rawUserId","String","id","localUserId","split","currentNameRaw","currentName","dataFullName","fullName","dataFirst","senderFirstName","dataLast","senderLastName","composedFromData","usersSetName","usersSetNameAlt","isUsersSetUseful"],"sourceRoot":"../../../src","sources":["helpers/createUserNameFromSetUser.ts"],"mappings":";;AACA,SAASA,WAAW,QAAQ,eAAe;;AAE3C;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,yBAAyB,GAAGA,CACvCC,QAAoC,EACpCC,MAAc,KACH;EACX,MAAMC,IAAI,GAAGF,QAAQ,CAACC,MAAM,CAAC;EAE7B,IAAI,CAACC,IAAI,EAAE;IAAC,OAAO,cAAc;EAAC;EAElC,MAAMC,SAAS,GAAGD,IAAI,CAACC,SAAS,EAAEC,IAAI,CAAC,CAAC,IAAI,EAAE;EAC9C,MAAMC,QAAQ,GAAGH,IAAI,CAACG,QAAQ,EAAED,IAAI,CAAC,CAAC,IAAI,EAAE;EAC5C;EACA;EACA;EACA,MAAME,QAAQ,GAAGJ,IAAI,CAACK,IAAI,EAAEH,IAAI,CAAC,CAAC,IAAI,EAAE;EAExC,OAAON,WAAW,CAACK,SAAS,EAAEE,QAAQ,CAAC,IAAIC,QAAQ,IAAIL,MAAM;AAC/D,CAAC;;AAED;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMO,wBAAwB,GAAGA,CACtCC,OAIC,EACDT,QAAoC,KACzB;EACX,MAAMU,SAAS,GAAGC,MAAM,CAACF,OAAO,EAAEP,IAAI,EAAEU,EAAE,IAAI,EAAE,CAAC;EACjD,MAAMC,WAAW,GAAGH,SAAS,CAACI,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;EAC3C,MAAMC,cAAc,GAAGJ,MAAM,CAACF,OAAO,EAAEP,IAAI,EAAEK,IAAI,IAAI,EAAE,CAAC,CAACH,IAAI,CAAC,CAAC;EAC/D;EACA;EACA,MAAMY,WAAW,GAAGD,cAAc,KAAK,cAAc,GAAG,EAAE,GAAGA,cAAc;EAE3E,MAAME,YAAY,GAAGN,MAAM,CAACF,OAAO,EAAES,QAAQ,IAAI,EAAE,CAAC,CAACd,IAAI,CAAC,CAAC;EAC3D,MAAMe,SAAS,GAAGR,MAAM,CAACF,OAAO,EAAEW,eAAe,IAAI,EAAE,CAAC,CAAChB,IAAI,CAAC,CAAC;EAC/D,MAAMiB,QAAQ,GAAGV,MAAM,CAACF,OAAO,EAAEa,cAAc,IAAI,EAAE,CAAC,CAAClB,IAAI,CAAC,CAAC;EAC7D,MAAMmB,gBAAgB,GAAGN,YAAY,IAAI,GAAGE,SAAS,IAAIE,QAAQ,EAAE,CAACjB,IAAI,CAAC,CAAC;EAE1E,MAAMoB,YAAY,GAAGzB,yBAAyB,CAACC,QAAQ,EAAEa,WAAW,CAAC;EACrE,MAAMY,eAAe,GAAG1B,yBAAyB,CAACC,QAAQ,EAAEU,SAAS,CAAC;EACtE,MAAMgB,gBAAgB,GAAInB,IAAY,IAAK,CAAC,CAACA,IAAI,IAAIA,IAAI,KAAK,cAAc;EAE5E,OACES,WAAW,IACVU,gBAAgB,CAACF,YAAY,CAAC,IAAIA,YAAa,IAC/CE,gBAAgB,CAACD,eAAe,CAAC,IAAIA,eAAgB,IACtDF,gBAAgB,IAChBV,WAAW,IACXH,SAAS,IACT,cAAc;AAElB,CAAC","ignoreList":[]}

package/lib/module/helpers/displayName.js

@@ -0,0 +1,11 @@
+"use strict";
+
+export const composeName = (first, last) => {
+  const f = String(first ?? '').trim();
+  const l = String(last ?? '').trim();
+  if (f && f.includes('@') && f.toLowerCase() === l.toLowerCase()) {
+    return f;
+  }
+  return `${f} ${l}`.trim();
+};
+//# sourceMappingURL=displayName.js.map

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

@@ -0,0 +1 @@
+{"version":3,"names":["composeName","first","last","f","String","trim","l","includes","toLowerCase"],"sourceRoot":"../../../src","sources":["helpers/displayName.ts"],"mappings":";;AAAA,OAAO,MAAMA,WAAW,GAAGA,CACzBC,KAAqB,EACrBC,IAAoB,KACT;EACX,MAAMC,CAAC,GAAGC,MAAM,CAACH,KAAK,IAAI,EAAE,CAAC,CAACI,IAAI,CAAC,CAAC;EACpC,MAAMC,CAAC,GAAGF,MAAM,CAACF,IAAI,IAAI,EAAE,CAAC,CAACG,IAAI,CAAC,CAAC;EACnC,IAAIF,CAAC,IAAIA,CAAC,CAACI,QAAQ,CAAC,GAAG,CAAC,IAAIJ,CAAC,CAACK,WAAW,CAAC,CAAC,KAAKF,CAAC,CAACE,WAAW,CAAC,CAAC,EAAE;IAAC,OAAOL,CAAC;EAAC;EAC3E,OAAO,GAAGA,CAAC,IAAIG,CAAC,EAAE,CAACD,IAAI,CAAC,CAAC;AAC3B,CAAC","ignoreList":[]}

package/lib/module/helpers/emoji.js

@@ -0,0 +1,44 @@
+"use strict";
+
+import { EMOJI_CATEGORIES } from '../assets/emojiData';
+let byId = null;
+const index = () => {
+  if (!byId) {
+    byId = new Map();
+    for (const category of EMOJI_CATEGORIES) {
+      for (const entry of category.emojis) {
+        byId.set(entry[0], entry);
+      }
+    }
+  }
+  return byId;
+};
+export const getEmojiNativeById = id => index().get(id)?.[1] ?? id;
+export const getEmojiIdByNative = native => {
+  for (const [id, entry] of index()) {
+    if (entry[1] === native) {
+      return id;
+    }
+  }
+  return undefined;
+};
+export const DEFAULT_QUICK_REACTIONS = ['+1', 'heart', 'joy', 'open_mouth', 'cry', 'pray'];
+export const searchEmojis = (query, limit = 60) => {
+  const q = query.trim().toLowerCase();
+  if (!q) {
+    return [];
+  }
+  const out = [];
+  for (const category of EMOJI_CATEGORIES) {
+    for (const entry of category.emojis) {
+      if (entry[0].includes(q) || entry[2].includes(q)) {
+        out.push(entry);
+        if (out.length >= limit) {
+          return out;
+        }
+      }
+    }
+  }
+  return out;
+};
+//# sourceMappingURL=emoji.js.map

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

@@ -0,0 +1 @@
+{"version":3,"names":["EMOJI_CATEGORIES","byId","index","Map","category","entry","emojis","set","getEmojiNativeById","id","get","getEmojiIdByNative","native","undefined","DEFAULT_QUICK_REACTIONS","searchEmojis","query","limit","q","trim","toLowerCase","out","includes","push","length"],"sourceRoot":"../../../src","sources":["helpers/emoji.ts"],"mappings":";;AAAA,SAASA,gBAAgB,QAAyB,qBAAqB;AAEvE,IAAIC,IAAoC,GAAG,IAAI;AAC/C,MAAMC,KAAK,GAAGA,CAAA,KAA+B;EAC3C,IAAI,CAACD,IAAI,EAAE;IACTA,IAAI,GAAG,IAAIE,GAAG,CAAC,CAAC;IAChB,KAAK,MAAMC,QAAQ,IAAIJ,gBAAgB,EAAE;MACvC,KAAK,MAAMK,KAAK,IAAID,QAAQ,CAACE,MAAM,EAAE;QAACL,IAAI,CAACM,GAAG,CAACF,KAAK,CAAC,CAAC,CAAC,EAAEA,KAAK,CAAC;MAAC;IAClE;EACF;EACA,OAAOJ,IAAI;AACb,CAAC;AAED,OAAO,MAAMO,kBAAkB,GAAIC,EAAU,IAC3CP,KAAK,CAAC,CAAC,CAACQ,GAAG,CAACD,EAAE,CAAC,GAAG,CAAC,CAAC,IAAIA,EAAE;AAE5B,OAAO,MAAME,kBAAkB,GAAIC,MAAc,IAAyB;EACxE,KAAK,MAAM,CAACH,EAAE,EAAEJ,KAAK,CAAC,IAAIH,KAAK,CAAC,CAAC,EAAE;IACjC,IAAIG,KAAK,CAAC,CAAC,CAAC,KAAKO,MAAM,EAAE;MAAC,OAAOH,EAAE;IAAC;EACtC;EACA,OAAOI,SAAS;AAClB,CAAC;AAED,OAAO,MAAMC,uBAAuB,GAAG,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,CAAC;AAE1F,OAAO,MAAMC,YAAY,GAAGA,CAACC,KAAa,EAAEC,KAAK,GAAG,EAAE,KAAmB;EACvE,MAAMC,CAAC,GAAGF,KAAK,CAACG,IAAI,CAAC,CAAC,CAACC,WAAW,CAAC,CAAC;EACpC,IAAI,CAACF,CAAC,EAAE;IAAC,OAAO,EAAE;EAAC;EACnB,MAAMG,GAAiB,GAAG,EAAE;EAC5B,KAAK,MAAMjB,QAAQ,IAAIJ,gBAAgB,EAAE;IACvC,KAAK,MAAMK,KAAK,IAAID,QAAQ,CAACE,MAAM,EAAE;MACnC,IAAID,KAAK,CAAC,CAAC,CAAC,CAACiB,QAAQ,CAACJ,CAAC,CAAC,IAAIb,KAAK,CAAC,CAAC,CAAC,CAACiB,QAAQ,CAACJ,CAAC,CAAC,EAAE;QAChDG,GAAG,CAACE,IAAI,CAAClB,KAAK,CAAC;QACf,IAAIgB,GAAG,CAACG,MAAM,IAAIP,KAAK,EAAE;UAAC,OAAOI,GAAG;QAAC;MACvC;IACF;EACF;EACA,OAAOA,GAAG;AACZ,CAAC","ignoreList":[]}

package/lib/module/helpers/haptics.js

@@ -0,0 +1,24 @@
+"use strict";
+
+// expo-haptics is an OPTIONAL peer, probed the same way as expo-blur: the JS
+// package alone is not enough, the native module has to be in the binary,
+// otherwise the call throws. Without it the gesture simply has no feedback.
+let Haptics = null;
+try {
+  const {
+    requireNativeModule
+  } = require('expo-modules-core');
+  requireNativeModule('ExpoHaptics');
+  Haptics = require('expo-haptics');
+} catch {
+  Haptics = null;
+}
+
+/** Short tap, the messenger "I got your long-press" feedback. Never throws. */
+export const hapticTap = () => {
+  if (!Haptics) {
+    return;
+  }
+  Haptics.impactAsync?.(Haptics.ImpactFeedbackStyle?.Medium).catch?.(() => {});
+};
+//# sourceMappingURL=haptics.js.map

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

@@ -0,0 +1 @@
+{"version":3,"names":["Haptics","requireNativeModule","require","hapticTap","impactAsync","ImpactFeedbackStyle","Medium","catch"],"sourceRoot":"../../../src","sources":["helpers/haptics.ts"],"mappings":";;AAAA;AACA;AACA;AACA,IAAIA,OAAY,GAAG,IAAI;AACvB,IAAI;EACF,MAAM;IAAEC;EAAoB,CAAC,GAAGC,OAAO,CAAC,mBAAmB,CAAC;EAC5DD,mBAAmB,CAAC,aAAa,CAAC;EAClCD,OAAO,GAAGE,OAAO,CAAC,cAAc,CAAC;AACnC,CAAC,CAAC,MAAM;EACNF,OAAO,GAAG,IAAI;AAChB;;AAEA;AACA,OAAO,MAAMG,SAAS,GAAGA,CAAA,KAAM;EAC7B,IAAI,CAACH,OAAO,EAAE;IACZ;EACF;EACAA,OAAO,CAACI,WAAW,GAAGJ,OAAO,CAACK,mBAAmB,EAAEC,MAAM,CAAC,CAACC,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC;AAC9E,CAAC","ignoreList":[]}

package/lib/module/helpers/historyPreloadScheduler.js

@@ -4,18 +4,10 @@ import { AppState } from 'react-native';
 import { store } from '../roomStore';
 import { applyRoomsPreloadBatch, setUnreadSyncing, RUNTIME_MESSAGE_LIMIT } from '../roomStore/roomsSlice';
 const DEFAULT_CONCURRENCY = 3;
-// Fetch the most recent ~20 on re-entry (mirrors web). A larger first page
-// also means more id-overlap with cache, so the merge in
-// `mergeHistoryIntoCache` rarely has to fall back to clear-and-replace.
-const DEFAULT_PAGE_SIZE = 20;
+const DEFAULT_PAGE_SIZE = 10;
 const DEFAULT_RETRY_LIMIT = 2;
-// When the first page is entirely unread (every fetched message is newer
-// than `lastViewedTimestamp`), the true unread count could be far bigger
-// than `pageSize` — `useUnread()` only ever sees what's been loaded. Page
-// further back, up to this many extra fetches, until we either find the
-// boundary or give up (`unreadCapped` then stays true so callers at least
-// know the count is a floor, not exact). Customer-reported #34.
-const MAX_UNREAD_CATCHUP_PAGES = 8;
+const DEFAULT_FIRST_WAVE = 30;
+const BACKGROUND_BATCH_PAUSE_MS = 400;
 const sleep = ms => new Promise(resolve => setTimeout(resolve, ms));
 const messageTimestamp = m => {
   if (!m) {
@@ -32,10 +24,10 @@ const messageTimestamp = m => {
   return 0;
 };
 const getRoomLastActivityScore = room => {
-  if (!room?.messages?.length) {
-    return 0;
-  }
-  return room.messages.reduce((max, m) => Math.max(max, messageTimestamp(m)), 0);
+  const fromMessages = room?.messages?.length ? room.messages.reduce((max, m) => Math.max(max, messageTimestamp(m)), 0) : 0;
+  const fromStamp = Number(room?.lastMessageTimestamp) || 0;
+  const fromSeed = Number(room?.lastMessage?.id) || 0;
+  return Math.max(fromMessages, fromStamp, fromSeed);
 };
 const computeUnreadCapped = (room, messages, pageSize) => {
   if (!room) {
@@ -52,8 +44,11 @@ const computeUnreadCapped = (room, messages, pageSize) => {
     return false;
   }
   const lastViewed = Number(room.lastViewedTimestamp) || 0;
+  // No read marker yet (the private-store markers often land after the
+  // first preload page): the count is unknown, not "more than a page".
+  // Claiming capped here showed "10+" on rooms with a single unread.
   if (lastViewed <= 0) {
-    return true;
+    return false;
   }
   const oldestTs = countable.reduce((minTs, m) => {
     const ts = messageTimestamp(m);
@@ -94,6 +89,7 @@ export const runHistoryPreloadScheduler = async options => {
     pageSize = DEFAULT_PAGE_SIZE,
     retryLimit = DEFAULT_RETRY_LIMIT,
     roomLimit,
+    firstWave = DEFAULT_FIRST_WAVE,
     selectedRoomJid = null,
     defaultRoomJids = [],
     forceReload = false
@@ -101,6 +97,13 @@ export const runHistoryPreloadScheduler = async options => {
   if (signal?.aborted) {
     return;
   }
+  const startedAt = Date.now();
+  let firstWaveLogged = false;
+  const devLog = msg => {
+    if (typeof __DEV__ !== 'undefined' && __DEV__) {
+      console.log(msg);
+    }
+  };
   store.dispatch(setUnreadSyncing(true));
   try {
     const state = store.getState();
@@ -124,6 +127,8 @@ export const runHistoryPreloadScheduler = async options => {
     const queue = roomLimit && roomLimit > 0 ? sortedQueue.slice(0, roomLimit) : sortedQueue;
     const inFlightByRoom = new Map();
     let consecutiveErrorCount = 0;
+    let started = 0;
+    devLog(`[preload] ${queue.length} rooms queued, first wave ${Math.min(firstWave, queue.length)}, page ${pageSize}`);
     while (queue.length > 0) {
       if (signal?.aborted) {
         return;
@@ -143,6 +148,12 @@ export const runHistoryPreloadScheduler = async options => {
         continue;
       }
       const batch = readyItems.slice(0, Math.max(1, concurrency));
+      const inBackgroundWave = started >= firstWave;
+      if (inBackgroundWave && !firstWaveLogged) {
+        firstWaveLogged = true;
+        devLog(`[preload] first wave done in ${Date.now() - startedAt}ms`);
+      }
+      started += batch.length;
 
       // Snapshot each room's historyPreloadState BEFORE marking the
       // batch as 'loading'. Without this snapshot the per-task
@@ -178,7 +189,8 @@ export const runHistoryPreloadScheduler = async options => {
             const fetchedMessages = await client.getHistoryStanza(item.jid, pageSize, undefined, undefined, {
               coalesceRoom: true,
               skipIfPreloaded: !forceReload,
-              source: 'background'
+              source: 'background',
+              selfApplied: true
             });
             if (signal?.aborted) {
               return;
@@ -187,52 +199,7 @@ export const runHistoryPreloadScheduler = async options => {
               throw new Error('history_timeout');
             }
             const nextRoom = store.getState().rooms.rooms[item.jid];
-            let combined = fetchedMessages || [];
-            const lastViewed = Number(nextRoom?.lastViewedTimestamp) || 0;
-
-            // The first page was entirely unread — keep paging older until
-            // we find a message at/before `lastViewedTimestamp` (the true
-            // boundary) or run out of catch-up budget, so the count isn't
-            // silently truncated at `pageSize`.
-            if (lastViewed > 0 && computeUnreadCapped(nextRoom, combined, pageSize)) {
-              let lastPageLen = combined.length;
-              let extraPages = 0;
-              while (extraPages < MAX_UNREAD_CATCHUP_PAGES && lastPageLen >= pageSize && !signal?.aborted) {
-                const oldestId = combined.reduce((min, m) => {
-                  const idNum = Number(m?.id);
-                  if (!Number.isFinite(idNum)) {
-                    return min;
-                  }
-                  return min === null || idNum < min ? idNum : min;
-                }, null);
-                if (oldestId === null) {
-                  break;
-                }
-                let older;
-                try {
-                  older = await client.getHistoryStanza(item.jid, pageSize, oldestId, undefined, {
-                    coalesceRoom: true,
-                    skipIfPreloaded: !forceReload,
-                    source: 'background'
-                  });
-                } catch {
-                  break;
-                }
-                if (!older || !older.length) {
-                  break;
-                }
-                combined = [...older, ...combined];
-                lastPageLen = older.length;
-                extraPages++;
-                const oldestTs = combined.reduce((minTs, m) => {
-                  const ts = messageTimestamp(m);
-                  return ts > 0 ? Math.min(minTs, ts) : minTs;
-                }, Number.MAX_SAFE_INTEGER);
-                if (oldestTs !== Number.MAX_SAFE_INTEGER && oldestTs <= lastViewed) {
-                  break;
-                }
-              }
-            }
+            const combined = fetchedMessages || [];
 
             // `mergeHistoryIntoCache` (roomsSlice) caps whatever we dispatch
             // here to the newest RUNTIME_MESSAGE_LIMIT messages before it
@@ -282,11 +249,10 @@ export const runHistoryPreloadScheduler = async options => {
         inFlightByRoom.set(item.jid, task);
         await task.finally(() => inFlightByRoom.delete(item.jid));
       }));
-
-      // Yield to JS event loop (no requestIdleCallback in RN).
-      await new Promise(r => setTimeout(r, 0));
+      await sleep(inBackgroundWave ? BACKGROUND_BATCH_PAUSE_MS : 0);
     }
   } finally {
+    devLog(`[preload] finished in ${Date.now() - startedAt}ms`);
     store.dispatch(setUnreadSyncing(false));
   }
 };