@ethora/chat-component-rn 26.5.21 → 26.6.11

package/lib/commonjs/helpers/callPush.js

@@ -0,0 +1,61 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.parseCallPush = exports.isCallPush = void 0;
+// Recognise and parse an *incoming call* push notification.
+//
+// Calls normally ring via a live XMPP `call-token` stanza, which only arrives
+// while the socket is connected. On mobile the socket is dead whenever the OS
+// backgrounds or kills the app, so the backend also delivers the call over
+// push, in the same `data`-payload format as message pushes. This helper lets
+// the push layer tell a call push apart from a chat push and pull the call
+// fields out, tolerating the field-name variations backends tend to use.
+
+const pick = (data, keys) => {
+  for (const k of keys) {
+    const v = data?.[k];
+    if (v !== undefined && v !== null && String(v).trim() !== '') {
+      return String(v).trim();
+    }
+  }
+  return '';
+};
+
+/**
+ * True when a push `data` payload represents an incoming call. Matches on an
+ * explicit call marker (`type`/`pushType`/`category`/`event` === "call"-ish)
+ * or on a callId paired with a call-specific field, so a normal message push
+ * is never misread as a call.
+ */
+const isCallPush = data => {
+  if (!data) {
+    return false;
+  }
+  const marker = pick(data, ['type', 'pushType', 'category', 'messageType', 'event']).toLowerCase();
+  if (marker === 'call' || marker === 'incoming-call' || marker === 'call-token' || marker === 'call-invite') {
+    return true;
+  }
+  const callId = pick(data, ['callId', 'callid', 'callID']);
+  const hasCallField = !!pick(data, ['callToken', 'livekitToken']) || !!pick(data, ['callKind']) || pick(data, ['kind']).toLowerCase() === 'audio' || pick(data, ['kind']).toLowerCase() === 'video';
+  return !!callId && hasCallField;
+};
+exports.isCallPush = isCallPush;
+const parseCallPush = data => {
+  const d = data || {};
+  const roomRef = pick(d, ['callRoom', 'room', 'roomJid', 'jid', 'chatId']) || null;
+  const roomBareName = roomRef ? roomRef.split('@')[0] || roomRef : null;
+  const kindRaw = pick(d, ['callKind', 'kind']).toLowerCase();
+  return {
+    callId: pick(d, ['callId', 'callid', 'callID']) || null,
+    token: pick(d, ['callToken', 'livekitToken', 'token']) || null,
+    kind: kindRaw === 'audio' ? 'audio' : 'video',
+    roomBareName,
+    roomRef,
+    callerName: pick(d, ['callerName', 'callerDisplayName', 'senderName', 'title']) || null,
+    callerXmppUsername: pick(d, ['callerXmppUsername', 'callerUsername', 'userJid', 'senderJid']).split('@')[0] || null
+  };
+};
+exports.parseCallPush = parseCallPush;
+//# sourceMappingURL=callPush.js.map

package/lib/commonjs/helpers/callPush.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["pick","data","keys","k","v","undefined","String","trim","isCallPush","marker","toLowerCase","callId","hasCallField","exports","parseCallPush","d","roomRef","roomBareName","split","kindRaw","token","kind","callerName","callerXmppUsername"],"sourceRoot":"../../../src","sources":["helpers/callPush.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/helpers/constants/LANGUAGE_OPTIONS.js

@@ -4,20 +4,32 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.LANGUAGE_OPTIONS = void 0;
+/**
+ * Languages the in-chat globe picker offers.
+ *
+ * Names are AUTONYMS (each language written in itself), which is what
+ * every mainstream language picker does: a reader who only speaks French
+ * can find "Français" but not "French". Ids carry the region because the
+ * deployment's readers are Canadian and US, and the region is forwarded to
+ * the translation service so it can tell fr-CA from fr-FR. Base-language
+ * lookups (i18n tables, Translate-button visibility) strip it via
+ * toBaseLanguage, so both forms interoperate.
+ *
+ * Commented-out entries still have full string tables in i18n/strings.ts,
+ * they're just not offered to readers in the current deployment.
+ */
 const LANGUAGE_OPTIONS = exports.LANGUAGE_OPTIONS = [{
   name: 'English',
-  id: 'en'
+  id: 'en-CA'
 }, {
-  name: 'Spanish',
-  id: 'es'
+  name: 'Español',
+  id: 'es-US'
 }, {
-  name: 'Portuguese',
-  id: 'pt'
-}, {
-  name: 'Haitian Creole',
-  id: 'ht'
-}, {
-  name: 'Chinese',
-  id: 'zh'
-}];
+  name: 'Français',
+  id: 'fr-CA'
+}
+// { name: 'Português', id: 'pt' },
+// { name: 'Kreyòl ayisyen', id: 'ht' },
+// { name: '中文', id: 'zh' },
+];
 //# sourceMappingURL=LANGUAGE_OPTIONS.js.map

package/lib/commonjs/helpers/constants/LANGUAGE_OPTIONS.js.map

@@ -1 +1 @@
-{"version":3,"names":["LANGUAGE_OPTIONS","exports","name","id"],"sourceRoot":"../../../../src","sources":["helpers/constants/LANGUAGE_OPTIONS.ts"],"mappings":";;;;;;AAOO,MAAMA,gBAAkC,GAAAC,OAAA,CAAAD,gBAAA,GAAG,CAChD;EAAEE,IAAI,EAAE,SAAS;EAAEC,EAAE,EAAE;AAAK,CAAC,EAC7B;EAAED,IAAI,EAAE,SAAS;EAAEC,EAAE,EAAE;AAAK,CAAC,EAC7B;EAAED,IAAI,EAAE,YAAY;EAAEC,EAAE,EAAE;AAAK,CAAC,EAChC;EAAED,IAAI,EAAE,gBAAgB;EAAEC,EAAE,EAAE;AAAK,CAAC,EACpC;EAAED,IAAI,EAAE,SAAS;EAAEC,EAAE,EAAE;AAAK,CAAC,CAC9B","ignoreList":[]}
+{"version":3,"names":["LANGUAGE_OPTIONS","exports","name","id"],"sourceRoot":"../../../../src","sources":["helpers/constants/LANGUAGE_OPTIONS.ts"],"mappings":";;;;;;AAOA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,MAAMA,gBAAkC,GAAAC,OAAA,CAAAD,gBAAA,GAAG,CAChD;EAAEE,IAAI,EAAE,SAAS;EAAEC,EAAE,EAAE;AAAQ,CAAC,EAChC;EAAED,IAAI,EAAE,SAAS;EAAEC,EAAE,EAAE;AAAQ,CAAC,EAChC;EAAED,IAAI,EAAE,UAAU;EAAEC,EAAE,EAAE;AAAQ;AAChC;AACA;AACA;AAAA,CACD","ignoreList":[]}

package/lib/commonjs/helpers/createUserNameFromSetUser.js

@@ -3,7 +3,13 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.createUserNameFromSetUser = void 0;
+exports.resolveSenderDisplayName = exports.createUserNameFromSetUser = void 0;
+/**
+ * Cache-only lookup. Returns the literal "Deleted User" as a MISS sentinel
+ * when `usersSet` has no entry for `userId` yet, callers that want a
+ * better fallback (e.g. resolveSenderDisplayName below) check for that
+ * exact string rather than treating it as a real name.
+ */
 const createUserNameFromSetUser = (usersSet, userId) => {
   const user = usersSet[userId];
   if (!user) {
@@ -11,7 +17,50 @@ const createUserNameFromSetUser = (usersSet, userId) => {
   }
   const firstName = user.firstName?.trim() || '';
   const lastName = user.lastName?.trim() || '';
-  return `${firstName} ${lastName}`.trim() || userId;
+  // REST-loaded members carry firstName/lastName; XMPP-roster-only
+  // 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;
 };
+
+/**
+ * The sender's display name, resolved WITHOUT depending on `usersSet`
+ * having already been hydrated.
+ *
+ * `usersSet` is populated by a separate fetch (member list / presence) that
+ * can still be in flight when a message arrives, most reliably right after
+ * reconnect, when a burst of catch-up messages can land before that fetch
+ * resolves. A cache-only lookup shows the literal "Deleted User" for every
+ * one of those messages, even though the sender is very much not deleted.
+ * On mobile this is the common case, not the rare one: every return from
+ * background reconnects.
+ *
+ * The message itself already carries the sender's name on the wire: every
+ * client that sends through this SDK stamps `senderFirstName` /
+ * `senderLastName` / `fullName` onto the outgoing stanza's `<data>` element
+ * (see sendTextMessage.xmpp.ts / sendTextMessageWithTranslateTag.xmpp.ts),
+ * and createMessageFromXml spreads those onto the top-level message object.
+ * Preferring that over the cache removes the timing dependency entirely for
+ * the common case, and "Deleted User" becomes what it should have always
+ * been: a rare last resort, not "usersSet hasn't loaded yet".
+ */
 exports.createUserNameFromSetUser = createUserNameFromSetUser;
+const resolveSenderDisplayName = (message, usersSet) => {
+  const rawUserId = String(message?.user?.id || '');
+  const localUserId = rawUserId.split('@')[0];
+  const currentNameRaw = String(message?.user?.name || '').trim();
+  // A previously-resolved "Deleted User" is itself a miss sentinel, not a
+  // real name, don't let it short-circuit the fallback chain below.
+  const currentName = currentNameRaw === 'Deleted User' ? '' : currentNameRaw;
+  const dataFullName = String(message?.fullName || '').trim();
+  const dataFirst = String(message?.senderFirstName || '').trim();
+  const dataLast = String(message?.senderLastName || '').trim();
+  const composedFromData = dataFullName || `${dataFirst} ${dataLast}`.trim();
+  const usersSetName = createUserNameFromSetUser(usersSet, localUserId);
+  const usersSetNameAlt = createUserNameFromSetUser(usersSet, rawUserId);
+  const isUsersSetUseful = name => !!name && name !== 'Deleted User';
+  return currentName || isUsersSetUseful(usersSetName) && usersSetName || isUsersSetUseful(usersSetNameAlt) && usersSetNameAlt || composedFromData || localUserId || rawUserId || 'Deleted User';
+};
+exports.resolveSenderDisplayName = resolveSenderDisplayName;
 //# sourceMappingURL=createUserNameFromSetUser.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["createUserNameFromSetUser","usersSet","userId","user","firstName","trim","lastName","exports"],"sourceRoot":"../../../src","sources":["helpers/createUserNameFromSetUser.ts"],"mappings":";;;;;;AAEO,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;EAE5C,OAAO,GAAGD,SAAS,IAAIE,QAAQ,EAAE,CAACD,IAAI,CAAC,CAAC,IAAIH,MAAM;AACpD,CAAC;AAACK,OAAA,CAAAP,yBAAA,GAAAA,yBAAA","ignoreList":[]}
+{"version":3,"names":["createUserNameFromSetUser","usersSet","userId","user","firstName","trim","lastName","bareName","name","exports","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;AACO,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;AApBAO,OAAA,CAAAT,yBAAA,GAAAA,yBAAA;AAqBO,MAAMU,wBAAwB,GAAGA,CACtCC,OAIC,EACDV,QAAoC,KACzB;EACX,MAAMW,SAAS,GAAGC,MAAM,CAACF,OAAO,EAAER,IAAI,EAAEW,EAAE,IAAI,EAAE,CAAC;EACjD,MAAMC,WAAW,GAAGH,SAAS,CAACI,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;EAC3C,MAAMC,cAAc,GAAGJ,MAAM,CAACF,OAAO,EAAER,IAAI,EAAEK,IAAI,IAAI,EAAE,CAAC,CAACH,IAAI,CAAC,CAAC;EAC/D;EACA;EACA,MAAMa,WAAW,GAAGD,cAAc,KAAK,cAAc,GAAG,EAAE,GAAGA,cAAc;EAE3E,MAAME,YAAY,GAAGN,MAAM,CAACF,OAAO,EAAES,QAAQ,IAAI,EAAE,CAAC,CAACf,IAAI,CAAC,CAAC;EAC3D,MAAMgB,SAAS,GAAGR,MAAM,CAACF,OAAO,EAAEW,eAAe,IAAI,EAAE,CAAC,CAACjB,IAAI,CAAC,CAAC;EAC/D,MAAMkB,QAAQ,GAAGV,MAAM,CAACF,OAAO,EAAEa,cAAc,IAAI,EAAE,CAAC,CAACnB,IAAI,CAAC,CAAC;EAC7D,MAAMoB,gBAAgB,GAAGN,YAAY,IAAI,GAAGE,SAAS,IAAIE,QAAQ,EAAE,CAAClB,IAAI,CAAC,CAAC;EAE1E,MAAMqB,YAAY,GAAG1B,yBAAyB,CAACC,QAAQ,EAAEc,WAAW,CAAC;EACrE,MAAMY,eAAe,GAAG3B,yBAAyB,CAACC,QAAQ,EAAEW,SAAS,CAAC;EACtE,MAAMgB,gBAAgB,GAAIpB,IAAY,IAAK,CAAC,CAACA,IAAI,IAAIA,IAAI,KAAK,cAAc;EAE5E,OACEU,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;AAACH,OAAA,CAAAC,wBAAA,GAAAA,wBAAA","ignoreList":[]}

package/lib/commonjs/helpers/getDataFromXml.js

@@ -5,6 +5,23 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getDataFromXml = void 0;
 var _transformTranslatations = require("./transformTranslatations");
+// Tolerant JSON parse: a malformed `translations` attr must not reject the
+// whole stanza (which would silently drop the message). Mirrors the web
+// SDK's safeJsonParse.
+const safeJsonParse = (value, fallback) => {
+  if (typeof value !== 'string' || !value) {
+    return fallback;
+  }
+  try {
+    return JSON.parse(value);
+  } catch {
+    return fallback;
+  }
+};
+
+// Keep only well-formed translation entries (drops partial/garbage items),
+// same shape guard the web SDK applies before transformArrayToObject.
+const normalizeTranslations = value => Array.isArray(value) ? value.filter(item => !!item && typeof item === 'object' && typeof item.translatedText === 'string' && typeof item.language === 'string' && typeof item.languageName === 'string') : [];
 const extractTimestamp = (str, stanza) => {
   if (!str) {
     return null;
@@ -27,7 +44,8 @@ const getDataFromXml = async stanza => {
   }
   const body = fullData?.getChild('body')?.getText() || undefined;
   const deleted = !!fullData?.getChild('deleted');
-  const translations = fullData?.getChild('translations')?.attrs?.value ? (0, _transformTranslatations.transformArrayToObject)(JSON.parse(fullData.getChild('translations').attrs.value).translates) : undefined;
+  const translationPayload = safeJsonParse(fullData?.getChild('translations')?.attrs?.value, {});
+  const translations = fullData?.getChild('translations')?.attrs?.value ? (0, _transformTranslatations.transformArrayToObject)(normalizeTranslations(translationPayload.translates)) : undefined;
   const langSource = fullData?.getChild('translate')?.attrs?.source;
   const numericPart = /\d{13,}/.exec(id || '')?.[0];
   const date = numericPart ? new Date(+numericPart.slice(0, 13)).toISOString() : new Date().toISOString();

package/lib/commonjs/helpers/getDataFromXml.js.map

@@ -1 +1 @@
-{"version":3,"names":["_transformTranslatations","require","extractTimestamp","str","stanza","console","log","toString","timestamp","slice","getDataFromXml","fullData","getChild","xmppId","attrs","id","xmppFrom","from","roomJid","userWallet","split","Date","now","body","getText","undefined","deleted","translations","value","transformArrayToObject","JSON","parse","translates","langSource","source","numericPart","exec","date","toISOString","data","photoURL","photo","user","dataAttrs","exports"],"sourceRoot":"../../../src","sources":["helpers/getDataFromXml.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_transformTranslatations","require","safeJsonParse","value","fallback","JSON","parse","normalizeTranslations","Array","isArray","filter","item","translatedText","language","languageName","extractTimestamp","str","stanza","console","log","toString","timestamp","slice","getDataFromXml","fullData","getChild","xmppId","attrs","id","xmppFrom","from","roomJid","userWallet","split","Date","now","body","getText","undefined","deleted","translationPayload","translations","transformArrayToObject","translates","langSource","source","numericPart","exec","date","toISOString","data","photoURL","photo","user","dataAttrs","exports"],"sourceRoot":"../../../src","sources":["helpers/getDataFromXml.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/helpers/incomingCallFromPush.js

@@ -0,0 +1,74 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.handleCallPush = void 0;
+var _roomStore = require("../roomStore");
+var _callSlice = require("../roomStore/callSlice");
+var _callPush = require("./callPush");
+/**
+ * Turn an incoming-call push into a ringing call.
+ *
+ * On mobile the XMPP socket dies whenever the OS backgrounds or kills the
+ * app, and the `call-token` stanza that normally opens the ring screen is
+ * lost with it. The backend also delivers the call as a data push, so this
+ * is the path every call takes when the app was not in the foreground.
+ *
+ * Returns true when the payload WAS a call push (whether or not it could
+ * be rung), so the caller knows to stop and not also show it as a chat
+ * notification. A user should never get a "new message: call-state" toast.
+ */
+const handleCallPush = data => {
+  if (!(0, _callPush.isCallPush)(data)) {
+    return false;
+  }
+  const parsed = (0, _callPush.parseCallPush)(data);
+  const state = _roomStore.store.getState();
+
+  // Calls off in this deployment: swallow the push rather than ringing a
+  // screen the host never opted into.
+  if (state.chatSettingStore.config?.videoCalls?.enabled !== true) {
+    return true;
+  }
+
+  // Already ringing or in this exact call (the push raced the stanza, or
+  // two pushes arrived). Re-dispatching would reset startedAt and restart
+  // the ring, so leave the existing call alone.
+  const current = state.call;
+  if (current.phase !== 'idle') {
+    const sameCall = !!parsed.callId && parsed.callId === current.callId || !!parsed.roomBareName && parsed.roomBareName === current.roomBareName;
+    if (sameCall || current.phase === 'in-call') {
+      return true;
+    }
+  }
+
+  // Without a LiveKit token there is nothing to accept: the push is only
+  // an alert. Ringing anyway would give the user an Accept button that
+  // cannot work, so treat it as handled and let the stanza (once the
+  // socket is back up) open the real ring screen.
+  if (!parsed.token) {
+    return true;
+  }
+
+  // Resolve the full room JID from the local room map. The push carries
+  // the bare name; callSlice and the hangup signal both want the JID.
+  const rooms = state.rooms.rooms || {};
+  const resolved = Object.values(rooms).find(room => (room?.jid || '').split('@')[0] === parsed.roomBareName || room?.jid === parsed.roomRef);
+  const roomJid = resolved?.jid || (parsed.roomRef && parsed.roomRef.includes('@') ? parsed.roomRef : '');
+  if (!roomJid) {
+    return true;
+  }
+  _roomStore.store.dispatch((0, _callSlice.setIncomingCallToken)({
+    roomJid,
+    roomName: parsed.callerName || resolved?.name || null,
+    roomBareName: parsed.roomBareName,
+    token: parsed.token,
+    kind: parsed.kind,
+    callId: parsed.callId,
+    peerXmppUsername: parsed.callerXmppUsername
+  }));
+  return true;
+};
+exports.handleCallPush = handleCallPush;
+//# sourceMappingURL=incomingCallFromPush.js.map

package/lib/commonjs/helpers/incomingCallFromPush.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_roomStore","require","_callSlice","_callPush","handleCallPush","data","isCallPush","parsed","parseCallPush","state","store","getState","chatSettingStore","config","videoCalls","enabled","current","call","phase","sameCall","callId","roomBareName","token","rooms","resolved","Object","values","find","room","jid","split","roomRef","roomJid","includes","dispatch","setIncomingCallToken","roomName","callerName","name","kind","peerXmppUsername","callerXmppUsername","exports"],"sourceRoot":"../../../src","sources":["helpers/incomingCallFromPush.ts"],"mappings":";;;;;;AAAA,IAAAA,UAAA,GAAAC,OAAA;AACA,IAAAC,UAAA,GAAAD,OAAA;AACA,IAAAE,SAAA,GAAAF,OAAA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,MAAMG,cAAc,GACzBC,IAA4C,IAChC;EACZ,IAAI,CAAC,IAAAC,oBAAU,EAACD,IAAI,CAAC,EAAE;IACrB,OAAO,KAAK;EACd;EAEA,MAAME,MAAM,GAAG,IAAAC,uBAAa,EAACH,IAAI,CAAC;EAClC,MAAMI,KAAK,GAAGC,gBAAK,CAACC,QAAQ,CAAC,CAAC;;EAE9B;EACA;EACA,IAAIF,KAAK,CAACG,gBAAgB,CAACC,MAAM,EAAEC,UAAU,EAAEC,OAAO,KAAK,IAAI,EAAE;IAC/D,OAAO,IAAI;EACb;;EAEA;EACA;EACA;EACA,MAAMC,OAAO,GAAGP,KAAK,CAACQ,IAAI;EAC1B,IAAID,OAAO,CAACE,KAAK,KAAK,MAAM,EAAE;IAC5B,MAAMC,QAAQ,GACX,CAAC,CAACZ,MAAM,CAACa,MAAM,IAAIb,MAAM,CAACa,MAAM,KAAKJ,OAAO,CAACI,MAAM,IACnD,CAAC,CAACb,MAAM,CAACc,YAAY,IAAId,MAAM,CAACc,YAAY,KAAKL,OAAO,CAACK,YAAa;IACzE,IAAIF,QAAQ,IAAIH,OAAO,CAACE,KAAK,KAAK,SAAS,EAAE;MAC3C,OAAO,IAAI;IACb;EACF;;EAEA;EACA;EACA;EACA;EACA,IAAI,CAACX,MAAM,CAACe,KAAK,EAAE;IACjB,OAAO,IAAI;EACb;;EAEA;EACA;EACA,MAAMC,KAAK,GAAGd,KAAK,CAACc,KAAK,CAACA,KAAK,IAAI,CAAC,CAAC;EACrC,MAAMC,QAAQ,GAAGC,MAAM,CAACC,MAAM,CAACH,KAAK,CAAC,CAACI,IAAI,CACvCC,IAAS,IACR,CAACA,IAAI,EAAEC,GAAG,IAAI,EAAE,EAAEC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAKvB,MAAM,CAACc,YAAY,IACvDO,IAAI,EAAEC,GAAG,KAAKtB,MAAM,CAACwB,OACzB,CAAgD;EAEhD,MAAMC,OAAO,GACXR,QAAQ,EAAEK,GAAG,KACZtB,MAAM,CAACwB,OAAO,IAAIxB,MAAM,CAACwB,OAAO,CAACE,QAAQ,CAAC,GAAG,CAAC,GAAG1B,MAAM,CAACwB,OAAO,GAAG,EAAE,CAAC;EACxE,IAAI,CAACC,OAAO,EAAE;IACZ,OAAO,IAAI;EACb;EAEAtB,gBAAK,CAACwB,QAAQ,CACZ,IAAAC,+BAAoB,EAAC;IACnBH,OAAO;IACPI,QAAQ,EAAE7B,MAAM,CAAC8B,UAAU,IAAIb,QAAQ,EAAEc,IAAI,IAAI,IAAI;IACrDjB,YAAY,EAAEd,MAAM,CAACc,YAAY;IACjCC,KAAK,EAAEf,MAAM,CAACe,KAAK;IACnBiB,IAAI,EAAEhC,MAAM,CAACgC,IAAI;IACjBnB,MAAM,EAAEb,MAAM,CAACa,MAAM;IACrBoB,gBAAgB,EAAEjC,MAAM,CAACkC;EAC3B,CAAC,CACH,CAAC;EAED,OAAO,IAAI;AACb,CAAC;AAACC,OAAA,CAAAtC,cAAA,GAAAA,cAAA","ignoreList":[]}

package/lib/commonjs/helpers/insertMessageWithDelimiter.js

@@ -56,6 +56,18 @@ function insertMessageWithDelimiter(roomMessages, message, lastViewedTimestamp)
     if (lastViewedTimestamp && !roomMessages.some(msg => msg.id === 'delimiter-new') && (0, _dateComparison.isDateAfter)(newMessageDate.toString(), lastViewedTimestamp.toString())) {
       const delimiterIndex = roomMessages.findIndex(msg => (0, _dateComparison.isDateAfter)(msg.date?.toString() ?? '', lastViewedTimestamp.toString()));
       if (delimiterIndex !== -1) {
+        // The divider's date is what ORDERS it: roomsSlice re-sorts every
+        // merged page by timestamp (see `byMs`), so a divider stamped with
+        // `new Date()` — i.e. now — sorted past every real message and
+        // rendered at the very bottom, BELOW the new messages it is
+        // supposed to introduce. Anchor it a hair before the first unread
+        // instead, which is where it belongs and where any later sort keeps
+        // it. Derived from that message rather than from
+        // lastViewedTimestamp so it works whatever format the caller passes.
+        const firstUnreadMs = Date.parse(String(roomMessages[delimiterIndex]?.date ?? ''));
+        const rawLastViewed = lastViewedTimestamp.toString();
+        const lastViewedMs = Date.parse(rawLastViewed) || Number(rawLastViewed) || Date.now();
+        const anchorMs = Number.isFinite(firstUnreadMs) ? firstUnreadMs - 1 : lastViewedMs;
         roomMessages.splice(delimiterIndex, 0, {
           id: 'delimiter-new',
           user: {
@@ -64,7 +76,7 @@ function insertMessageWithDelimiter(roomMessages, message, lastViewedTimestamp)
             token: '',
             refreshToken: ''
           },
-          date: new Date().toString(),
+          date: new Date(anchorMs).toISOString(),
           body: 'New Messages',
           roomJid: ''
         });

package/lib/commonjs/helpers/insertMessageWithDelimiter.js.map

@@ -1 +1 @@
-{"version":3,"names":["_dateComparison","require","deepMerge","target","source","key","Array","isArray","insertMessageWithDelimiter","roomMessages","message","lastViewedTimestamp","existingIndex","findIndex","msg","id","xmppId","existing","preservedUserId","user","merged","pending","newMessageDate","date","lastMessage","length","firstMessage","isDateAfter","toString","index","push","some","delimiterIndex","splice","name","undefined","token","refreshToken","Date","body","roomJid","isDateBefore","unshift","i"],"sourceRoot":"../../../src","sources":["helpers/insertMessageWithDelimiter.ts"],"mappings":";;;;;;AACA,IAAAA,eAAA,GAAAC,OAAA;AAEA,SAASC,SAASA,CAACC,MAAW,EAAEC,MAAW,EAAO;EAChD,KAAK,MAAMC,GAAG,IAAID,MAAM,EAAE;IACxB,IACEA,MAAM,CAACC,GAAG,CAAC,IACX,OAAOD,MAAM,CAACC,GAAG,CAAC,KAAK,QAAQ,IAC/B,CAACC,KAAK,CAACC,OAAO,CAACH,MAAM,CAACC,GAAG,CAAC,CAAC,EAC3B;MACAF,MAAM,CAACE,GAAG,CAAC,GAAGH,SAAS,CAACC,MAAM,CAACE,GAAG,CAAC,IAAI,CAAC,CAAC,EAAED,MAAM,CAACC,GAAG,CAAC,CAAC;IACzD,CAAC,MAAM;MACLF,MAAM,CAACE,GAAG,CAAC,GAAGD,MAAM,CAACC,GAAG,CAAC;IAC3B;EACF;EACA,OAAOF,MAAM;AACf;AAEO,SAASK,0BAA0BA,CACxCC,YAAiC,EACjCC,OAAiB,EACjBC,mBAAsD,EACtD;EACA,MAAMC,aAAa,GAAGH,YAAY,CAACI,SAAS,CACzCC,GAAG,IACFA,GAAG,CAACC,EAAE,KAAKL,OAAO,CAACK,EAAE,IACpBL,OAAO,CAACM,MAAM,IAAIF,GAAG,CAACC,EAAE,KAAKL,OAAO,CAACM,MAAO,IAC5CF,GAAG,CAACE,MAAM,IAAIF,GAAG,CAACE,MAAM,KAAKN,OAAO,CAACK,EAC1C,CAAC;EAED,IAAIH,aAAa,KAAK,CAAC,CAAC,EAAE;IACxB,MAAMK,QAAQ,GAAGR,YAAY,CAACG,aAAa,CAAC;IAC5C;IACA;IACA;IACA;IACA;IACA;IACA;IACA,MAAMM,eAAe,GAClBD,QAAQ,EAAUE,IAAI,EAAEJ,EAAE,IAAKL,OAAO,EAAUS,IAAI,EAAEJ,EAAE;IAC3D,MAAMK,MAAM,GAAGlB,SAAS,CAAC;MAAE,GAAGe;IAAS,CAAC,EAAE;MAAE,GAAGP,OAAO;MAAEW,OAAO,EAAE;IAAM,CAAC,CAAC;IACzE,IAAID,MAAM,CAACD,IAAI,IAAID,eAAe,EAAE;MAClCE,MAAM,CAACD,IAAI,CAACJ,EAAE,GAAGG,eAAe;IAClC;IACAT,YAAY,CAACG,aAAa,CAAC,GAAGQ,MAAM;IACpC;EACF;EAEA,MAAME,cAAc,GAAGZ,OAAO,CAACa,IAAI;EACnC,MAAMC,WAAW,GAAGf,YAAY,CAACA,YAAY,CAACgB,MAAM,GAAG,CAAC,CAAC;EACzD,MAAMC,YAAY,GAAGjB,YAAY,CAAC,CAAC,CAAC;EAEpC,IAAI,IAAAkB,2BAAW,EAACL,cAAc,CAACM,QAAQ,CAAC,CAAC,EAAEJ,WAAW,EAAED,IAAI,EAAEK,QAAQ,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE;IAC/E,MAAMC,KAAK,GAAGpB,YAAY,CAACI,SAAS,CACjCC,GAAG,IAAKA,GAAG,CAACC,EAAE,KAAKL,OAAO,CAACM,MAAM,IAAIF,GAAG,CAACC,EAAE,KAAKL,OAAO,CAACK,EAC3D,CAAC;IAED,IAAIc,KAAK,KAAK,CAAC,CAAC,EAAE;MAChBpB,YAAY,CAACoB,KAAK,CAAC,GAAG;QAAE,GAAGnB,OAAO;QAAEK,EAAE,EAAEL,OAAO,CAACK,EAAE;QAAEM,OAAO,EAAE;MAAM,CAAC;IACtE,CAAC,MAAM;MACLZ,YAAY,CAACqB,IAAI,CAACpB,OAAO,CAAC;IAC5B;IAEA,IACEC,mBAAmB,IACnB,CAACF,YAAY,CAACsB,IAAI,CAAEjB,GAAG,IAAKA,GAAG,CAACC,EAAE,KAAK,eAAe,CAAC,IACvD,IAAAY,2BAAW,EAACL,cAAc,CAACM,QAAQ,CAAC,CAAC,EAAEjB,mBAAmB,CAACiB,QAAQ,CAAC,CAAC,CAAC,EACtE;MACA,MAAMI,cAAc,GAAGvB,YAAY,CAACI,SAAS,CAAEC,GAAG,IAChD,IAAAa,2BAAW,EAACb,GAAG,CAACS,IAAI,EAAEK,QAAQ,CAAC,CAAC,IAAI,EAAE,EAAEjB,mBAAmB,CAACiB,QAAQ,CAAC,CAAC,CACxE,CAAC;MAEC,IAAII,cAAc,KAAK,CAAC,CAAC,EAAE;QACzBvB,YAAY,CAACwB,MAAM,CAACD,cAAc,EAAE,CAAC,EAAE;UACrCjB,EAAE,EAAE,eAAe;UACnBI,IAAI,EAAE;YACNJ,EAAE,EAAE,QAAQ;YACZmB,IAAI,EAAEC,SAAS;YACfC,KAAK,EAAE,EAAE;YACTC,YAAY,EAAE;UAChB,CAAC;UACDd,IAAI,EAAE,IAAIe,IAAI,CAAC,CAAC,CAACV,QAAQ,CAAC,CAAC;UACzBW,IAAI,EAAE,cAAc;UACpBC,OAAO,EAAE;QACX,CAAC,CAAC;MACJ;IACF;EACJ,CAAC,MAAM,IACL,IAAAC,4BAAY,EAACnB,cAAc,CAACM,QAAQ,CAAC,CAAC,EAAEF,YAAY,EAAEH,IAAI,EAAEK,QAAQ,CAAC,CAAC,IAAI,EAAE,CAAC,EAC7E;IACAnB,YAAY,CAACiC,OAAO,CAAChC,OAAO,CAAC;EAC/B,CAAC,MAAM;IACL,KAAK,IAAIiC,CAAC,GAAG,CAAC,EAAEA,CAAC,GAAGlC,YAAY,CAACgB,MAAM,EAAEkB,CAAC,EAAE,EAAE;MAC5C,IACE,IAAAF,4BAAY,EAACnB,cAAc,CAACM,QAAQ,CAAC,CAAC,EAAEnB,YAAY,CAACkC,CAAC,CAAC,CAACpB,IAAI,EAAEK,QAAQ,CAAC,CAAC,IAAI,EAAE,CAAC,EAC/E;QACAnB,YAAY,CAACwB,MAAM,CAACU,CAAC,EAAE,CAAC,EAAEjC,OAAO,CAAC;QAClC;MACF;IACF;EACF;AACF","ignoreList":[]}
+{"version":3,"names":["_dateComparison","require","deepMerge","target","source","key","Array","isArray","insertMessageWithDelimiter","roomMessages","message","lastViewedTimestamp","existingIndex","findIndex","msg","id","xmppId","existing","preservedUserId","user","merged","pending","newMessageDate","date","lastMessage","length","firstMessage","isDateAfter","toString","index","push","some","delimiterIndex","firstUnreadMs","Date","parse","String","rawLastViewed","lastViewedMs","Number","now","anchorMs","isFinite","splice","name","undefined","token","refreshToken","toISOString","body","roomJid","isDateBefore","unshift","i"],"sourceRoot":"../../../src","sources":["helpers/insertMessageWithDelimiter.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/helpers/isUnresolvedSenderId.js

@@ -0,0 +1,32 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.isUnresolvedSenderId = void 0;
+/**
+ * Whether a resolved sender "name" is really just an unresolved id.
+ *
+ * The name chain ends at the sender's JID localpart when `usersSet` has no
+ * entry and the wire carried no name. For a real member that never happens
+ * for long — the REST roster fills the cache in. But some senders are not
+ * members at all: a broadcast posted by the app itself arrives with the
+ * ROOM's own id as its occupant resource (e.g.
+ * `646cc8dc96d4a4dc8f7b2f2d_67f6823cf5995841ba431f06`), so no roster will
+ * ever resolve it and the bubble ends up captioned with 50 characters of
+ * hex.
+ *
+ * Ethora ids are `<24-hex appId>_<24-hex objectId>`, which is what this
+ * matches. A raw objectId on its own is matched too, since some senders
+ * carry only that half.
+ */
+const ETHORA_ID = /^[0-9a-f]{24}(_[0-9a-f]{24})?$/i;
+const isUnresolvedSenderId = name => {
+  const trimmed = String(name || '').trim();
+  if (!trimmed) {
+    return true;
+  }
+  return ETHORA_ID.test(trimmed);
+};
+exports.isUnresolvedSenderId = isUnresolvedSenderId;
+//# sourceMappingURL=isUnresolvedSenderId.js.map

package/lib/commonjs/helpers/isUnresolvedSenderId.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["ETHORA_ID","isUnresolvedSenderId","name","trimmed","String","trim","test","exports"],"sourceRoot":"../../../src","sources":["helpers/isUnresolvedSenderId.ts"],"mappings":";;;;;;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,MAAMA,SAAS,GAAG,iCAAiC;AAE5C,MAAMC,oBAAoB,GAAIC,IAAa,IAAc;EAC9D,MAAMC,OAAO,GAAGC,MAAM,CAACF,IAAI,IAAI,EAAE,CAAC,CAACG,IAAI,CAAC,CAAC;EACzC,IAAI,CAACF,OAAO,EAAE;IACZ,OAAO,IAAI;EACb;EACA,OAAOH,SAAS,CAACM,IAAI,CAACH,OAAO,CAAC;AAChC,CAAC;AAACI,OAAA,CAAAN,oBAAA,GAAAA,oBAAA","ignoreList":[]}

package/lib/commonjs/hooks/useChatSettingState.js

@@ -14,6 +14,7 @@ const useChatSettingState = () => {
   const selectedUser = (0, _reactRedux.useSelector)(state => state.chatSettingStore.selectedUser);
   const langSource = (0, _reactRedux.useSelector)(state => state.chatSettingStore.langSource);
   const client = (0, _reactRedux.useSelector)(state => state.chatSettingStore.client);
+  const translateMode = (0, _reactRedux.useSelector)(state => state.chatSettingStore.translateMode);
   return {
     user,
     activeFile,
@@ -22,6 +23,7 @@ const useChatSettingState = () => {
     deleteModal,
     selectedUser,
     langSource,
+    translateMode,
     client
   };
 };

package/lib/commonjs/hooks/useChatSettingState.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactRedux","require","useChatSettingState","user","useSelector","state","chatSettingStore","activeFile","activeModal","config","deleteModal","selectedUser","langSource","client","exports"],"sourceRoot":"../../../src","sources":["hooks/useChatSettingState.tsx"],"mappings":";;;;;;AAAA,IAAAA,WAAA,GAAAC,OAAA;AAGO,MAAMC,mBAAmB,GAAGA,CAAA,KAAM;EACvC,MAAMC,IAAI,GAAG,IAAAC,uBAAW,EAAEC,KAAgB,IAAKA,KAAK,CAACC,gBAAgB,CAACH,IAAI,CAAC;EAC3E,MAAMI,UAAU,GAAG,IAAAH,uBAAW,EAC3BC,KAAgB,IAAKA,KAAK,CAACC,gBAAgB,CAACC,UAC/C,CAAC;EACD,MAAMC,WAAW,GAAG,IAAAJ,uBAAW,EAC5BC,KAAgB,IAAKA,KAAK,CAACC,gBAAgB,CAACE,WAC/C,CAAC;EACD,MAAMC,MAAM,GAAG,IAAAL,uBAAW,EACvBC,KAAgB,IAAKA,KAAK,CAACC,gBAAgB,CAACG,MAC/C,CAAC;EACD,MAAMC,WAAW,GAAG,IAAAN,uBAAW,EAC5BC,KAAgB,IAAKA,KAAK,CAACC,gBAAgB,CAACI,WAC/C,CAAC;EACD,MAAMC,YAAY,GAAG,IAAAP,uBAAW,EAC7BC,KAAgB,IAAKA,KAAK,CAACC,gBAAgB,CAACK,YAC/C,CAAC;EACD,MAAMC,UAAU,GAAG,IAAAR,uBAAW,EAC3BC,KAAgB,IAAKA,KAAK,CAACC,gBAAgB,CAACM,UAC/C,CAAC;EACD,MAAMC,MAAM,GAAG,IAAAT,uBAAW,EACvBC,KAAgB,IAAKA,KAAK,CAACC,gBAAgB,CAACO,MAC/C,CAAC;EAED,OAAO;IACLV,IAAI;IACJI,UAAU;IACVC,WAAW;IACXC,MAAM;IACNC,WAAW;IACXC,YAAY;IACZC,UAAU;IACVC;EACF,CAAC;AACH,CAAC;AAACC,OAAA,CAAAZ,mBAAA,GAAAA,mBAAA","ignoreList":[]}
+{"version":3,"names":["_reactRedux","require","useChatSettingState","user","useSelector","state","chatSettingStore","activeFile","activeModal","config","deleteModal","selectedUser","langSource","client","translateMode","exports"],"sourceRoot":"../../../src","sources":["hooks/useChatSettingState.tsx"],"mappings":";;;;;;AAAA,IAAAA,WAAA,GAAAC,OAAA;AAGO,MAAMC,mBAAmB,GAAGA,CAAA,KAAM;EACvC,MAAMC,IAAI,GAAG,IAAAC,uBAAW,EAAEC,KAAgB,IAAKA,KAAK,CAACC,gBAAgB,CAACH,IAAI,CAAC;EAC3E,MAAMI,UAAU,GAAG,IAAAH,uBAAW,EAC3BC,KAAgB,IAAKA,KAAK,CAACC,gBAAgB,CAACC,UAC/C,CAAC;EACD,MAAMC,WAAW,GAAG,IAAAJ,uBAAW,EAC5BC,KAAgB,IAAKA,KAAK,CAACC,gBAAgB,CAACE,WAC/C,CAAC;EACD,MAAMC,MAAM,GAAG,IAAAL,uBAAW,EACvBC,KAAgB,IAAKA,KAAK,CAACC,gBAAgB,CAACG,MAC/C,CAAC;EACD,MAAMC,WAAW,GAAG,IAAAN,uBAAW,EAC5BC,KAAgB,IAAKA,KAAK,CAACC,gBAAgB,CAACI,WAC/C,CAAC;EACD,MAAMC,YAAY,GAAG,IAAAP,uBAAW,EAC7BC,KAAgB,IAAKA,KAAK,CAACC,gBAAgB,CAACK,YAC/C,CAAC;EACD,MAAMC,UAAU,GAAG,IAAAR,uBAAW,EAC3BC,KAAgB,IAAKA,KAAK,CAACC,gBAAgB,CAACM,UAC/C,CAAC;EACD,MAAMC,MAAM,GAAG,IAAAT,uBAAW,EACvBC,KAAgB,IAAKA,KAAK,CAACC,gBAAgB,CAACO,MAC/C,CAAC;EACD,MAAMC,aAAa,GAAG,IAAAV,uBAAW,EAC9BC,KAAgB,IAAKA,KAAK,CAACC,gBAAgB,CAACQ,aAC/C,CAAC;EAED,OAAO;IACLX,IAAI;IACJI,UAAU;IACVC,WAAW;IACXC,MAAM;IACNC,WAAW;IACXC,YAAY;IACZC,UAAU;IACVE,aAAa;IACbD;EACF,CAAC;AACH,CAAC;AAACE,OAAA,CAAAb,mBAAA,GAAAA,mBAAA","ignoreList":[]}

package/lib/commonjs/hooks/useMessageTranslation.js

@@ -0,0 +1,51 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useMessageTranslation = void 0;
+var _strings = require("../i18n/strings");
+// "42", "+1 (555) 123-4567", "3.14159" — text with no actual letters has
+// nothing to translate.
+const hasNoLetters = text => !/\p{L}/u.test(text);
+
+/**
+ * Translation for ONE message, into the reader's language only. Ported
+ * verbatim from the web SDK (src/hooks/useMessageTranslation.ts).
+ *
+ * Pure and synchronous — no HTTP call. Every translation this client ever
+ * shows arrives over XMPP already: the sender tags outgoing messages with
+ * `<translate source="xx"/>` (see sendTextMessageWithTranslateTag) and
+ * whatever process attaches actual translations does so server-side,
+ * landing on `message.translations` when the stanza is parsed (see
+ * getDataFromXml). This function only ever reads that — it never calls a
+ * translation service itself, so there's nothing to fail when one isn't
+ * reachable, and nothing to await.
+ */
+const useMessageTranslation = (message, readerLocale, enabled = true) => {
+  const originalText = message?.body || '';
+  const source = message?.langSource;
+  const targetBase = (0, _strings.toBaseLanguage)(readerLocale || 'en');
+  const sourceBase = (0, _strings.toBaseLanguage)(source);
+
+  // Nothing to do when we don't know the source language, the message is
+  // already in the reader's language (region ignored: en-US vs en-CA is the
+  // same language, not a translation job), or there's no actual text to
+  // translate (a bare number, a phone number, an emoji-only reaction).
+  const trimmedText = originalText.trim();
+  const needsTranslation = enabled && !!trimmedText && !!source && sourceBase !== targetBase && !hasNoLetters(trimmedText);
+  const result = needsTranslation ? message?.translations?.[readerLocale || '']?.translatedText || message?.translations?.[targetBase]?.translatedText : undefined;
+
+  // A "translation" that's byte-identical to the original (mistagged
+  // langSource, a no-op from the source, matching proper nouns/numbers in
+  // otherwise-different text) is worse than nothing: it renders the same
+  // sentence twice. Treat identical-after-trim as "nothing to show".
+  const isRealTranslation = !!result && result.trim() !== originalText.trim();
+  return {
+    hasTranslation: isRealTranslation,
+    originalText,
+    displayText: isRealTranslation ? result : originalText
+  };
+};
+exports.useMessageTranslation = useMessageTranslation;
+//# sourceMappingURL=useMessageTranslation.js.map

package/lib/commonjs/hooks/useMessageTranslation.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_strings","require","hasNoLetters","text","test","useMessageTranslation","message","readerLocale","enabled","originalText","body","source","langSource","targetBase","toBaseLanguage","sourceBase","trimmedText","trim","needsTranslation","result","translations","translatedText","undefined","isRealTranslation","hasTranslation","displayText","exports"],"sourceRoot":"../../../src","sources":["hooks/useMessageTranslation.ts"],"mappings":";;;;;;AACA,IAAAA,QAAA,GAAAC,OAAA;AAYA;AACA;AACA,MAAMC,YAAY,GAAIC,IAAY,IAAc,CAAC,QAAQ,CAACC,IAAI,CAACD,IAAI,CAAC;;AAEpE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,MAAME,qBAAqB,GAAGA,CACnCC,OAA+D,EAC/DC,YAAqB,EACrBC,OAAO,GAAG,IAAI,KACc;EAC5B,MAAMC,YAAY,GAAGH,OAAO,EAAEI,IAAI,IAAI,EAAE;EACxC,MAAMC,MAAM,GAAGL,OAAO,EAAEM,UAAU;EAClC,MAAMC,UAAU,GAAG,IAAAC,uBAAc,EAACP,YAAY,IAAI,IAAI,CAAC;EACvD,MAAMQ,UAAU,GAAG,IAAAD,uBAAc,EAACH,MAAM,CAAC;;EAEzC;EACA;EACA;EACA;EACA,MAAMK,WAAW,GAAGP,YAAY,CAACQ,IAAI,CAAC,CAAC;EACvC,MAAMC,gBAAgB,GACpBV,OAAO,IACP,CAAC,CAACQ,WAAW,IACb,CAAC,CAACL,MAAM,IACRI,UAAU,KAAKF,UAAU,IACzB,CAACX,YAAY,CAACc,WAAW,CAAC;EAE5B,MAAMG,MAAM,GAAGD,gBAAgB,GAC3BZ,OAAO,EAAEc,YAAY,GAAGb,YAAY,IAAI,EAAE,CAAC,EAAEc,cAAc,IAC3Df,OAAO,EAAEc,YAAY,GAAGP,UAAU,CAAC,EAAEQ,cAAc,GACnDC,SAAS;;EAEb;EACA;EACA;EACA;EACA,MAAMC,iBAAiB,GACrB,CAAC,CAACJ,MAAM,IAAIA,MAAM,CAACF,IAAI,CAAC,CAAC,KAAKR,YAAY,CAACQ,IAAI,CAAC,CAAC;EAEnD,OAAO;IACLO,cAAc,EAAED,iBAAiB;IACjCd,YAAY;IACZgB,WAAW,EAAEF,iBAAiB,GAAIJ,MAAM,GAAcV;EACxD,CAAC;AACH,CAAC;AAACiB,OAAA,CAAArB,qBAAA,GAAAA,qBAAA","ignoreList":[]}

package/lib/commonjs/hooks/usePushNotifications.js

@@ -11,6 +11,7 @@ var _pushSubscriptionService = require("../services/pushSubscriptionService");
 var _reactRedux = require("react-redux");
 var _useLocalStorage = require("./useLocalStorage");
 var _roomsSlice = require("../roomStore/roomsSlice");
+var _incomingCallFromPush = require("../helpers/incomingCallFromPush");
 function usePushNotifications() {
   const [fcmToken, setFcmToken] = (0, _react.useState)(null);
   const [notification, setNotification] = (0, _react.useState)(null);
@@ -25,7 +26,11 @@ function usePushNotifications() {
     get
   } = (0, _useLocalStorage.useLocalStorage)('fcmToken');
   const handleNotificationPress = remoteMessage => {
-    console.log('[usePushNotifications] Notification pressed:', JSON.stringify(remoteMessage, null, 2));
+    // Tapping a call notification (or launching the app from one) should
+    // land on the ring screen, not on the chat room.
+    if ((0, _incomingCallFromPush.handleCallPush)(remoteMessage?.data)) {
+      return;
+    }
     const jid = remoteMessage?.data?.jid || remoteMessage?.data?.chatJid || remoteMessage?.jid;
     if (jid) {
       dispatch((0, _roomsSlice.setPendingNotificationJid)(jid));
@@ -54,10 +59,15 @@ function usePushNotifications() {
     // synchronous throw before the try-block ran would still leak.
     initToken().catch(err => console.warn('[usePushNotifications] initToken rejected', err));
     const unsubscribeForeground = (0, _pushNotifications.onForegroundMessage)(message => {
+      // Calls first: a call push must open the ring screen, never an
+      // "OK / Open" alert. handleCallPush returns true for anything
+      // call-shaped, so we bail before the chat-notification path.
+      if ((0, _incomingCallFromPush.handleCallPush)(message?.data)) {
+        return;
+      }
       setNotification(message);
       const {
-        notification: notif,
-        data
+        notification: notif
       } = message;
       if (notif) {
         _reactNative.Alert.alert(notif.title || 'Notification', notif.body || '', [{

package/lib/commonjs/hooks/usePushNotifications.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_reactNative","_pushNotifications","_pushSubscriptionService","_reactRedux","_useLocalStorage","_roomsSlice","usePushNotifications","fcmToken","setFcmToken","useState","notification","setNotification","user","config","useSelector","state","chatSettingStore","rooms","dispatch","useDispatch","set","get","useLocalStorage","handleNotificationPress","remoteMessage","console","log","JSON","stringify","jid","data","chatJid","setPendingNotificationJid","warn","initToken","token","newToken","initPushNotifications","error","useEffect","catch","err","unsubscribeForeground","onForegroundMessage","message","notif","Alert","alert","title","body","text","onPress","unsubscribeOpened","onNotificationOpenedApp","getInitialNotification","then","xmppPassword","defaultWallet","walletAddress","pushSubscriptionService","subscribeToPush","projectName"],"sourceRoot":"../../../src","sources":["hooks/usePushNotifications.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AACA,IAAAE,kBAAA,GAAAF,OAAA;AAMA,IAAAG,wBAAA,GAAAH,OAAA;AACA,IAAAI,WAAA,GAAAJ,OAAA;AAEA,IAAAK,gBAAA,GAAAL,OAAA;AACA,IAAAM,WAAA,GAAAN,OAAA;AAEO,SAASO,oBAAoBA,CAAA,EAAG;EACrC,MAAM,CAACC,QAAQ,EAAEC,WAAW,CAAC,GAAG,IAAAC,eAAQ,EAAgB,IAAI,CAAC;EAC7D,MAAM,CAACC,YAAY,EAAEC,eAAe,CAAC,GAAG,IAAAF,eAAQ,EAAM,IAAI,CAAC;EAC3D,MAAM;IAAEG,IAAI;IAAEC;EAAO,CAAC,GAAG,IAAAC,uBAAW,EAAEC,KAAgB,IAAKA,KAAK,CAACC,gBAAgB,CAAC;EAClF,MAAMC,KAAK,GAAG,IAAAH,uBAAW,EAAEC,KAAgB,IAAKA,KAAK,CAACE,KAAK,CAACA,KAAK,CAAC;EAClE,MAAMC,QAAQ,GAAG,IAAAC,uBAAW,EAAC,CAAC;EAE9B,MAAM;IAAEC,GAAG;IAAEC;EAAI,CAAC,GAAG,IAAAC,gCAAe,EAAC,UAAU,CAAC;EAEhD,MAAMC,uBAAuB,GAAIC,aAAkB,IAAK;IACtDC,OAAO,CAACC,GAAG,CAAC,8CAA8C,EAAEC,IAAI,CAACC,SAAS,CAACJ,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IAEnG,MAAMK,GAAG,GAAGL,aAAa,EAAEM,IAAI,EAAED,GAAG,IAAIL,aAAa,EAAEM,IAAI,EAAEC,OAAO,IAAIP,aAAa,EAAEK,GAAG;IAE1F,IAAIA,GAAG,EAAE;MACPX,QAAQ,CAAC,IAAAc,qCAAyB,EAACH,GAAG,CAAC,CAAC;IAC1C,CAAC,MAAM;MACLJ,OAAO,CAACQ,IAAI,CAAC,oCAAoC,EAAET,aAAa,EAAEM,IAAI,CAAC;IACzE;EACF,CAAC;EAED,MAAMI,SAAS,GAAG,MAAAA,CAAA,KAAY;IAC5B,IAAI;MAEF,MAAMC,KAAK,GAAG,MAAMd,GAAG,CAAC,CAAC;MACzB,IAAIc,KAAK,EAAE;QACT3B,WAAW,CAAC2B,KAAe,CAAC;QAC5B;MACF;MACA,MAAMC,QAAQ,GAAG,MAAM,IAAAC,wCAAqB,EAAC,CAAC;MAE9C7B,WAAW,CAAC4B,QAAQ,CAAC;MACrBhB,GAAG,CAACgB,QAAkB,CAAC;IACzB,CAAC,CAAC,OAAOE,KAAK,EAAE;MACdb,OAAO,CAACa,KAAK,CAAC,uBAAuB,EAAEA,KAAK,CAAC;IAC/C;EACF,CAAC;EAED,IAAAC,gBAAS,EAAC,MAAM;IACd;IACA;IACA;IACA;IACAL,SAAS,CAAC,CAAC,CAACM,KAAK,CAAEC,GAAG,IACpBhB,OAAO,CAACQ,IAAI,CAAC,2CAA2C,EAAEQ,GAAG,CAC/D,CAAC;IAED,MAAMC,qBAAqB,GAAG,IAAAC,sCAAmB,EAAEC,OAAO,IAAK;MAC7DjC,eAAe,CAACiC,OAAO,CAAC;MAExB,MAAM;QAAElC,YAAY,EAAEmC,KAAK;QAAEf;MAAK,CAAC,GAAGc,OAAO;MAC7C,IAAIC,KAAK,EAAE;QACTC,kBAAK,CAACC,KAAK,CACTF,KAAK,CAACG,KAAK,IAAI,cAAc,EAC7BH,KAAK,CAACI,IAAI,IAAI,EAAE,EAChB,CACE;UAAEC,IAAI,EAAE;QAAK,CAAC,EACd;UACEA,IAAI,EAAE,MAAM;UACZC,OAAO,EAAEA,CAAA,KAAM5B,uBAAuB,CAACqB,OAAO;QAChD,CAAC,CAEL,CAAC;MACH;IACF,CAAC,CAAC;IAEF,MAAMQ,iBAAiB,GAAG,IAAAC,0CAAuB,EAAET,OAAO,IAAK;MAC7DnB,OAAO,CAACC,GAAG,CAAC,sDAAsD,EAAEC,IAAI,CAACC,SAAS,CAACgB,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;MACrGjC,eAAe,CAACiC,OAAO,CAAC;MACxBrB,uBAAuB,CAACqB,OAAO,CAAC;IAClC,CAAC,CAAC;IAEF,IAAAU,yCAAsB,EAAC,CAAC,CACrBC,IAAI,CAAEX,OAAO,IAAK;MACjB,IAAIA,OAAO,EAAE;QACXnB,OAAO,CAACC,GAAG,CAAC,8CAA8C,EAAEC,IAAI,CAACC,SAAS,CAACgB,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;QAC7FjC,eAAe,CAACiC,OAAO,CAAC;QACxBrB,uBAAuB,CAACqB,OAAO,CAAC;MAClC;IACF,CAAC,CAAC,CACDJ,KAAK,CAAEC,GAAG,IACThB,OAAO,CAACQ,IAAI,CACV,sDAAsD,EACtDQ,GACF,CACF,CAAC;IAEH,OAAO,MAAM;MACXC,qBAAqB,CAAC,CAAC;MACvBU,iBAAiB,CAAC,CAAC;IACrB,CAAC;EACH,CAAC,EAAE,CAACnC,KAAK,CAAC,CAAC;EAEX,IAAAsB,gBAAS,EAAC,MAAM;IACd,IAAIhC,QAAQ,IAAIK,IAAI,IAAIA,IAAI,CAAC4C,YAAY,IAAI5C,IAAI,CAAC6C,aAAa,EAAEC,aAAa,EAAE;MAC9EC,gDAAuB,CACpBC,eAAe,CAACrD,QAAQ,EAAEK,IAAI,EAAEC,MAAM,EAAEgD,WAAW,IAAI,EAAE,CAAC,CAC1DrB,KAAK,CAAEF,KAAK,IAAK;QAChBb,OAAO,CAACa,KAAK,CAAC,8BAA8B,EAAEA,KAAK,CAAC;MACtD,CAAC,CAAC;IACN;EACF,CAAC,EAAE,CAAC/B,QAAQ,EAAEK,IAAI,EAAE6C,aAAa,EAAEC,aAAa,EAAE9C,IAAI,EAAE4C,YAAY,CAAC,CAAC;EAEtE,OAAO;IAAEjD,QAAQ;IAAEG;EAAa,CAAC;AACnC","ignoreList":[]}
+{"version":3,"names":["_react","require","_reactNative","_pushNotifications","_pushSubscriptionService","_reactRedux","_useLocalStorage","_roomsSlice","_incomingCallFromPush","usePushNotifications","fcmToken","setFcmToken","useState","notification","setNotification","user","config","useSelector","state","chatSettingStore","rooms","dispatch","useDispatch","set","get","useLocalStorage","handleNotificationPress","remoteMessage","handleCallPush","data","jid","chatJid","setPendingNotificationJid","console","warn","initToken","token","newToken","initPushNotifications","error","useEffect","catch","err","unsubscribeForeground","onForegroundMessage","message","notif","Alert","alert","title","body","text","onPress","unsubscribeOpened","onNotificationOpenedApp","log","JSON","stringify","getInitialNotification","then","xmppPassword","defaultWallet","walletAddress","pushSubscriptionService","subscribeToPush","projectName"],"sourceRoot":"../../../src","sources":["hooks/usePushNotifications.ts"],"mappings":"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","ignoreList":[]}