@ethora/chat-component-rn 26.7.10 → 26.8.1

package/lib/commonjs/hooks/useChatRoomFocus.js

@@ -8,7 +8,6 @@ var _react = require("react");
 var _reactRedux = require("react-redux");
 var _roomsSlice = require("../roomStore/roomsSlice");
 var _roomStore = require("../roomStore");
-var _getServerReadTimestamp = require("../helpers/getServerReadTimestamp");
 /**
  * Public hook for consumers embedding `<ChatRoom>` inside a tab-based
  * navigator. Mirrors the mount/unmount unread-tracking that ChatRoom
@@ -19,10 +18,7 @@ var _getServerReadTimestamp = require("../helpers/getServerReadTimestamp");
  * Without this hook, `useUnread()` will always return 0 for the chat
  * room because the SDK assumes "mounted == active". With this hook,
  * focus marks the room visible (clearing the badge) and blur stamps
- * `lastViewedTimestamp` to the newest SERVER-acknowledged message so
- * future messages count as unread. Deliberately not `Date.now()`: a
- * device clock running ahead would write a future marker that the
- * forward-only private-store merge could never correct again (bug #38).
+ * `lastViewedTimestamp = Date.now()` so future messages count as unread.
  *
  * Usage with React Navigation:
  *
@@ -47,51 +43,22 @@ const useChatRoomFocus = ({
     roomJID: null,
     isFocused: false
   });
-
-  // `clearBoundary`: pass true only when the room the user is leaving is
-  // genuinely being released (switching to a different room, or this
-  // hook unmounting) - not on a mere same-room blur. `<ChatRoom>`'s
-  // MessageList typically stays mounted across a same-room focus loss
-  // (the whole point of this hook is that the host keeps `<Chat>`
-  // mounted in a hidden tab), so its own scroll-tracking ref is still
-  // intact and the redux boundary must stay in sync with it - clearing
-  // it here would desync the two.
-  const leaveRoom = (jid, clearBoundary) => {
-    const state = _roomStore.store.getState();
-    const rooms = state.rooms?.rooms;
-    const boundaryTs = state.rooms?.readBoundaries?.[jid] ?? null;
-    // getReadMarkerTimestamp: honour the boundary (the newest message the
-    // user actually reached) when the user left this room scrolled up,
-    // otherwise fall back to the newest server-acked message. Only stamp
-    // when we actually have something to anchor to - skip rather than
-    // fall back to the device clock (bug #38). Ignoring the boundary here
-    // would stamp "everything read" regardless of scroll position (bug
-    // #42, a regression of #33 reintroduced by #38).
-    const timestamp = (0, _getServerReadTimestamp.getReadMarkerTimestamp)(rooms?.[jid], state.roomHeapSlice, boundaryTs);
-    if (timestamp > 0) {
-      dispatch((0, _roomsSlice.setLastViewedTimestamp)({
-        chatJID: jid,
-        timestamp
-      }));
-    }
+  const leaveRoom = jid => {
+    const timestamp = Date.now();
+    dispatch((0, _roomsSlice.setLastViewedTimestamp)({
+      chatJID: jid,
+      timestamp
+    }));
     dispatch((0, _roomsSlice.clearVisibleRoom)());
-    state.chatSettingStore?.client?.flushLastViewedToPrivateStoreStanza(rooms, {
-      visibleRoomJID: jid,
-      // Carry the same boundary to the SERVER marker - without it the
-      // flush defaults to "everything" for the visible room. Clamped
-      // through the same helper as the local stamp above.
-      visibleRoomTs: (0, _getServerReadTimestamp.getFlushBoundaryTs)(rooms?.[jid], state.roomHeapSlice, boundaryTs)
+    const rooms = _roomStore.store.getState().rooms?.rooms;
+    _roomStore.store.getState().chatSettingStore?.client?.flushLastViewedToPrivateStoreStanza(rooms, {
+      visibleRoomJID: jid
     }).catch(() => {});
-    if (clearBoundary) {
-      dispatch((0, _roomsSlice.clearReadBoundary)({
-        jid
-      }));
-    }
   };
   (0, _react.useEffect)(() => {
     const prev = prevRef.current;
     if (prev.isFocused && prev.roomJID && (prev.roomJID !== roomJID || !isFocused)) {
-      leaveRoom(prev.roomJID, prev.roomJID !== roomJID);
+      leaveRoom(prev.roomJID);
     }
     if (roomJID && isFocused) {
       dispatch((0, _roomsSlice.setCurrentRoom)({
@@ -110,7 +77,7 @@ const useChatRoomFocus = ({
     return () => {
       const prev = prevRef.current;
       if (prev.isFocused && prev.roomJID) {
-        leaveRoom(prev.roomJID, true);
+        leaveRoom(prev.roomJID);
       }
     };
   }, []);

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

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_reactRedux","_roomsSlice","_roomStore","_getServerReadTimestamp","useChatRoomFocus","roomJID","isFocused","dispatch","useDispatch","prevRef","useRef","leaveRoom","jid","clearBoundary","state","store","getState","rooms","boundaryTs","readBoundaries","timestamp","getReadMarkerTimestamp","roomHeapSlice","setLastViewedTimestamp","chatJID","clearVisibleRoom","chatSettingStore","client","flushLastViewedToPrivateStoreStanza","visibleRoomJID","visibleRoomTs","getFlushBoundaryTs","catch","clearReadBoundary","useEffect","prev","current","setCurrentRoom","setVisibleRoom","exports","_default","default"],"sourceRoot":"../../../src","sources":["hooks/useChatRoomFocus.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","require","_reactRedux","_roomsSlice","_roomStore","useChatRoomFocus","roomJID","isFocused","dispatch","useDispatch","prevRef","useRef","leaveRoom","jid","timestamp","Date","now","setLastViewedTimestamp","chatJID","clearVisibleRoom","rooms","store","getState","chatSettingStore","client","flushLastViewedToPrivateStoreStanza","visibleRoomJID","catch","useEffect","prev","current","setCurrentRoom","setVisibleRoom","exports","_default","default"],"sourceRoot":"../../../src","sources":["hooks/useChatRoomFocus.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,WAAA,GAAAD,OAAA;AACA,IAAAE,WAAA,GAAAF,OAAA;AAMA,IAAAG,UAAA,GAAAH,OAAA;AAgBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,MAAMI,gBAAgB,GAAGA,CAAC;EAC/BC,OAAO;EACPC;AACuB,CAAC,KAAK;EAC7B,MAAMC,QAAQ,GAAG,IAAAC,uBAAW,EAAC,CAAC;EAC9B,MAAMC,OAAO,GAAG,IAAAC,aAAM,EAAiD;IACrEL,OAAO,EAAE,IAAI;IACbC,SAAS,EAAE;EACb,CAAC,CAAC;EAEF,MAAMK,SAAS,GAAIC,GAAW,IAAK;IACjC,MAAMC,SAAS,GAAGC,IAAI,CAACC,GAAG,CAAC,CAAC;IAC5BR,QAAQ,CAAC,IAAAS,kCAAsB,EAAC;MAAEC,OAAO,EAAEL,GAAG;MAAEC;IAAU,CAAC,CAAC,CAAC;IAC7DN,QAAQ,CAAC,IAAAW,4BAAgB,EAAC,CAAC,CAAC;IAC5B,MAAMC,KAAK,GAAGC,gBAAK,CAACC,QAAQ,CAAC,CAAC,CAACF,KAAK,EAAEA,KAAK;IAC1CC,gBAAK,CAACC,QAAQ,CAAC,CAAC,CAACC,gBAAgB,EAAUC,MAAM,EAC9CC,mCAAmC,CAACL,KAAK,EAAE;MAAEM,cAAc,EAAEb;IAAI,CAAC,CAAC,CACpEc,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;EACpB,CAAC;EAED,IAAAC,gBAAS,EAAC,MAAM;IACd,MAAMC,IAAI,GAAGnB,OAAO,CAACoB,OAAO;IAC5B,IAAID,IAAI,CAACtB,SAAS,IAAIsB,IAAI,CAACvB,OAAO,KAAKuB,IAAI,CAACvB,OAAO,KAAKA,OAAO,IAAI,CAACC,SAAS,CAAC,EAAE;MAC9EK,SAAS,CAACiB,IAAI,CAACvB,OAAO,CAAC;IACzB;IAEA,IAAIA,OAAO,IAAIC,SAAS,EAAE;MACxBC,QAAQ,CAAC,IAAAuB,0BAAc,EAAC;QAAEzB;MAAQ,CAAC,CAAC,CAAC;MACrCE,QAAQ,CAAC,IAAAwB,0BAAc,EAAC;QAAE1B;MAAQ,CAAC,CAAC,CAAC;IACvC;IAEAI,OAAO,CAACoB,OAAO,GAAG;MAAExB,OAAO,EAAEA,OAAO,IAAI,IAAI;MAAEC;IAAU,CAAC;EAC3D,CAAC,EAAE,CAACD,OAAO,EAAEC,SAAS,EAAEC,QAAQ,CAAC,CAAC;EAElC,IAAAoB,gBAAS,EAAC,MAAM;IACd,OAAO,MAAM;MACX,MAAMC,IAAI,GAAGnB,OAAO,CAACoB,OAAO;MAC5B,IAAID,IAAI,CAACtB,SAAS,IAAIsB,IAAI,CAACvB,OAAO,EAAE;QAClCM,SAAS,CAACiB,IAAI,CAACvB,OAAO,CAAC;MACzB;IACF,CAAC;EACH,CAAC,EAAE,EAAE,CAAC;AACR,CAAC;AAAC2B,OAAA,CAAA5B,gBAAA,GAAAA,gBAAA;AAAA,IAAA6B,QAAA,GAAAD,OAAA,CAAAE,OAAA,GAEa9B,gBAAgB","ignoreList":[]}

package/lib/commonjs/hooks/useChatWrapperInit.js

@@ -6,11 +6,13 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _react = require("react");
 var _reactRedux = require("react-redux");
+var _resolveLangSource = require("../helpers/resolveLangSource");
 var _xmppProvider = require("../context/xmppProvider");
 var _chatAutoEnterer = require("../helpers/chatAutoEnterer");
 var _initRoomsPresence = require("../helpers/initRoomsPresence");
+var _updatedChatLastTimestamps = require("../helpers/updatedChatLastTimestamps");
 var _updateMessagesTillLast = require("../helpers/updateMessagesTillLast");
-var _authRefresh = require("../networking/authRefresh");
+var _apiClient = require("../networking/apiClient");
 var _chatSettingsSlice = require("../roomStore/chatSettingsSlice");
 var _roomsSlice = require("../roomStore/roomsSlice");
 var _useRoomState = require("./useRoomState");
@@ -18,7 +20,6 @@ var _useChatSettingState = require("./useChatSettingState");
 var _isChatIdPresentInArray = require("../helpers/isChatIdPresentInArray");
 var _useGetNewArchRoom = _interopRequireDefault(require("./useGetNewArchRoom"));
 var _getRoomsWithRetry = require("../helpers/getRoomsWithRetry");
-var _shallowEqual = require("../helpers/shallowEqual");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /** @format */
 
@@ -57,20 +58,6 @@ const useChatWrapperInit = ({
       }
     };
   }, [user.xmppPassword]);
-
-  // Presentational config flags (e.g. `disableHeader`) can change while the
-  // chat stays mounted — sync them to redux whenever `config` actually
-  // changes, not just at init. Shallow-equal guard: an inline object
-  // literal from the host is a fresh reference every render even when
-  // nothing in it changed, and dispatching unconditionally would re-render
-  // every config consumer on every host render.
-  const lastSyncedConfigRef = (0, _react.useRef)(undefined);
-  (0, _react.useEffect)(() => {
-    if (!(0, _shallowEqual.shallowEqual)(lastSyncedConfigRef.current, config)) {
-      lastSyncedConfigRef.current = config;
-      dispatch((0, _chatSettingsSlice.setConfig)(config));
-    }
-  }, [config, dispatch]);
   const getRoomsWithRertyRequest = async () => {
     setIsRetrying(true);
     const retryRooms = await (0, _getRoomsWithRetry.getRoomsWithRetry)(client, config, syncRooms, roomJID);
@@ -95,8 +82,9 @@ const useChatWrapperInit = ({
   (0, _react.useEffect)(() => {
     let retryTimeout;
     const initXmmpClient = async () => {
-      if (config?.translates?.enabled && !config?.translates?.translations) {
-        dispatch((0, _chatSettingsSlice.setLangSource)(config?.translates?.translations));
+      const legacyLangSource = (0, _resolveLangSource.resolveLegacyTranslatesLangSource)(config?.translates);
+      if (legacyLangSource) {
+        dispatch((0, _chatSettingsSlice.setLangSource)(legacyLangSource));
       }
       dispatch((0, _chatSettingsSlice.setConfig)(config));
       try {
@@ -140,17 +128,11 @@ const useChatWrapperInit = ({
                 }
               }
               try {
-                // getChatsPrivateStoreRequestStanza hydrates redux itself
-                // (dispatch(applyPrivateStoreMarkers(...)) internally,
-                // clamped + forward-only) - do not also apply the raw
-                // return value here. That used to double-dispatch via
-                // updatedChatLastTimestamps' unconditional
-                // setLastViewedTimestamp, which has neither the
-                // forward-only guard nor the future-marker clamp, so on
-                // every reconnect it could silently re-clobber a value
-                // the clamp had just corrected (bug #38).
                 const roomTimestampObject = await newClient.getChatsPrivateStoreRequestStanza();
                 console.log('Got chats private store', roomTimestampObject?.length || 0);
+                if (roomTimestampObject) {
+                  (0, _updatedChatLastTimestamps.updatedChatLastTimestamps)(roomTimestampObject, dispatch);
+                }
                 if (!hasSyncedHistoryRef.current) {
                   console.log('Updating messages till last');
                   await (0, _updateMessagesTillLast.updateMessagesTillLast)(rooms, newClient);
@@ -165,7 +147,7 @@ const useChatWrapperInit = ({
                 setConnectionLost(false);
               }
               {
-                config?.refreshTokens?.enabled && (0, _authRefresh.refreshAuthTokensQuietly)();
+                config?.refreshTokens?.enabled && (0, _apiClient.refresh)();
               }
             } catch (error) {
               console.error(' Error during initialization', error);
@@ -185,11 +167,11 @@ const useChatWrapperInit = ({
             setInited(true);
             console.log(' Getting chats private store for existing client');
             try {
-              // See the "new client" branch above: getChatsPrivateStoreRequestStanza
-              // already hydrates redux (clamped + forward-only); do not
-              // also apply the raw return value here.
               const roomTimestampObject = await client.getChatsPrivateStoreRequestStanza();
               console.log('Got chats private store for existing client', roomTimestampObject?.length || 0);
+              if (roomTimestampObject) {
+                (0, _updatedChatLastTimestamps.updatedChatLastTimestamps)(roomTimestampObject, dispatch);
+              }
               if (!hasSyncedHistoryRef.current) {
                 console.log('Updating messages till last for existing client');
                 await (0, _updateMessagesTillLast.updateMessagesTillLast)(rooms, client);
@@ -204,7 +186,7 @@ const useChatWrapperInit = ({
               setConnectionLost(false);
             }
             {
-              config?.refreshTokens?.enabled && (0, _authRefresh.refreshAuthTokensQuietly)();
+              config?.refreshTokens?.enabled && (0, _apiClient.refresh)();
             }
           }
         }

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

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_reactRedux","_xmppProvider","_chatAutoEnterer","_initRoomsPresence","_updateMessagesTillLast","_authRefresh","_chatSettingsSlice","_roomsSlice","_useRoomState","_useChatSettingState","_isChatIdPresentInArray","_useGetNewArchRoom","_interopRequireDefault","_getRoomsWithRetry","_shallowEqual","e","__esModule","default","useChatWrapperInit","roomJID","wasAutoSelected","config","dispatch","useDispatch","inited","setInited","useState","showModal","setShowModal","isConnectionLost","setConnectionLost","isRetrying","setIsRetrying","hasSyncedHistoryRef","useRef","client","initializeClient","setClient","useXmppClient","syncRooms","useGetNewArchRoom","rooms","useSelector","state","roomsList","useRoomState","user","useChatSettingState","useEffect","xmppPassword","console","log","close","lastSyncedConfigRef","undefined","shallowEqual","current","setConfig","getRoomsWithRertyRequest","retryRooms","getRoomsWithRetry","loadRooms","disableLoad","setIsLoading","loading","loadingText","retryTimeout","initXmmpClient","translates","enabled","translations","setLangSource","xmppUsername","error","chatAutoEnterer","newClient","defaultWallet","walletAddress","xmppSettings","status","Object","keys","length","initRoomsPresence","newArch","loadedRooms","enableRoomsRetry","isSelectedRoomPresent","isChatIdPresentInArray","getRoomsStanza","roomTimestampObject","getChatsPrivateStoreRequestStanza","updateMessagesTillLast","err","warn","refreshTokens","refreshAuthTokensQuietly","setTimeout","clearTimeout","_default","exports"],"sourceRoot":"../../../src","sources":["hooks/useChatWrapperInit.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","require","_reactRedux","_resolveLangSource","_xmppProvider","_chatAutoEnterer","_initRoomsPresence","_updatedChatLastTimestamps","_updateMessagesTillLast","_apiClient","_chatSettingsSlice","_roomsSlice","_useRoomState","_useChatSettingState","_isChatIdPresentInArray","_useGetNewArchRoom","_interopRequireDefault","_getRoomsWithRetry","e","__esModule","default","useChatWrapperInit","roomJID","wasAutoSelected","config","dispatch","useDispatch","inited","setInited","useState","showModal","setShowModal","isConnectionLost","setConnectionLost","isRetrying","setIsRetrying","hasSyncedHistoryRef","useRef","client","initializeClient","setClient","useXmppClient","syncRooms","useGetNewArchRoom","rooms","useSelector","state","roomsList","useRoomState","user","useChatSettingState","useEffect","xmppPassword","console","log","close","getRoomsWithRertyRequest","retryRooms","getRoomsWithRetry","loadRooms","disableLoad","setIsLoading","loading","loadingText","undefined","retryTimeout","initXmmpClient","legacyLangSource","resolveLegacyTranslatesLangSource","translates","setLangSource","setConfig","xmppUsername","error","chatAutoEnterer","newClient","defaultWallet","walletAddress","xmppSettings","status","Object","keys","length","initRoomsPresence","newArch","loadedRooms","enableRoomsRetry","enabled","isSelectedRoomPresent","isChatIdPresentInArray","getRoomsStanza","roomTimestampObject","getChatsPrivateStoreRequestStanza","updatedChatLastTimestamps","current","updateMessagesTillLast","err","warn","refreshTokens","refresh","setTimeout","clearTimeout","_default","exports"],"sourceRoot":"../../../src","sources":["hooks/useChatWrapperInit.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/hooks/useComposing.js

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _react = require("react");
-var _reactNative = require("react-native");
 var _xmppProvider = require("../context/xmppProvider");
 var _reactRedux = require("react-redux");
 var _useChatSettingState = require("./useChatSettingState");
@@ -19,15 +18,7 @@ const useComposing = config => {
   const {
     user
   } = (0, _useChatSettingState.useChatSettingState)();
-  // RN keeps a focused TextInput focused when the app is backgrounded or
-  // the device is locked — nothing fires `onBlur`, so without this the
-  // other participant sees "typing…" for as long as the user is away.
-  // Tracks whether the input is *currently* focused, independent of the
-  // foreground/background transition, so we know whether to resume
-  // composing on return.
-  const isFocusedRef = (0, _react.useRef)(false);
   const sendStartComposing = (0, _react.useCallback)(() => {
-    isFocusedRef.current = true;
     if (config?.disableTypingIndicator) {
       return;
     }
@@ -36,7 +27,6 @@ const useComposing = config => {
     }
   }, [activeRoomJID, client, config?.disableTypingIndicator, user.firstName, user.lastName]);
   const sendEndComposing = (0, _react.useCallback)(() => {
-    isFocusedRef.current = false;
     if (config?.disableTypingIndicator) {
       return;
     }
@@ -50,23 +40,6 @@ const useComposing = config => {
     }, 100);
     return () => clearTimeout(timerId);
   }, [sendEndComposing]);
-
-  // Foreground/background transition only — a pause in typing must NOT
-  // clear the indicator (that would flicker for a slowly-composing user),
-  // so this deliberately does not hook keystroke/idle timing at all.
-  (0, _react.useEffect)(() => {
-    const handleAppStateChange = nextState => {
-      if (nextState !== 'active') {
-        if (isFocusedRef.current && !config?.disableTypingIndicator && client) {
-          client.sendTypingRequestStanza(activeRoomJID || '', `${user.firstName} ${user.lastName}`, false);
-        }
-      } else if (isFocusedRef.current && !config?.disableTypingIndicator && client) {
-        client.sendTypingRequestStanza(activeRoomJID || '', `${user.firstName} ${user.lastName}`, true);
-      }
-    };
-    const subscription = _reactNative.AppState.addEventListener('change', handleAppStateChange);
-    return () => subscription.remove();
-  }, [activeRoomJID, client, config?.disableTypingIndicator, user.firstName, user.lastName]);
   return {
     sendStartComposing,
     sendEndComposing

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

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_reactNative","_xmppProvider","_reactRedux","_useChatSettingState","useComposing","config","client","useXmppClient","activeRoomJID","useSelector","state","rooms","user","useChatSettingState","isFocusedRef","useRef","sendStartComposing","useCallback","current","disableTypingIndicator","sendTypingRequestStanza","firstName","lastName","sendEndComposing","useEffect","timerId","setTimeout","clearTimeout","handleAppStateChange","nextState","subscription","AppState","addEventListener","remove","_default","exports","default"],"sourceRoot":"../../../src","sources":["hooks/useComposing.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","require","_xmppProvider","_reactRedux","_useChatSettingState","useComposing","config","client","useXmppClient","activeRoomJID","useSelector","state","rooms","user","useChatSettingState","sendStartComposing","useCallback","disableTypingIndicator","sendTypingRequestStanza","firstName","lastName","sendEndComposing","useEffect","timerId","setTimeout","clearTimeout","_default","exports","default"],"sourceRoot":"../../../src","sources":["hooks/useComposing.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,aAAA,GAAAD,OAAA;AACA,IAAAE,WAAA,GAAAF,OAAA;AAEA,IAAAG,oBAAA,GAAAH,OAAA;AAGA,MAAMI,YAAY,GAAIC,MAAgB,IAAK;EACzC,MAAM;IAAEC;EAAO,CAAC,GAAG,IAAAC,2BAAa,EAAC,CAAC;EAClC,MAAM;IAAEC;EAAc,CAAC,GAAG,IAAAC,uBAAW,EAAEC,KAAgB,IAAKA,KAAK,CAACC,KAAK,CAAC;EACxE,MAAM;IAAEC;EAAK,CAAC,GAAG,IAAAC,wCAAmB,EAAC,CAAC;EAEtC,MAAMC,kBAAkB,GAAG,IAAAC,kBAAW,EAAC,MAAM;IAC3C,IAAIV,MAAM,EAAEW,sBAAsB,EAAE;MAClC;IACF;IACA,IAAIV,MAAM,EAAE;MACVA,MAAM,CAACW,uBAAuB,CAC5BT,aAAa,IAAI,EAAE,EACnB,GAAGI,IAAI,CAACM,SAAS,IAAIN,IAAI,CAACO,QAAQ,EAAE,EACpC,IACF,CAAC;IACH;EACF,CAAC,EAAE,CAACX,aAAa,EAAEF,MAAM,EAAED,MAAM,EAAEW,sBAAsB,EAAEJ,IAAI,CAACM,SAAS,EAAEN,IAAI,CAACO,QAAQ,CAAC,CAAC;EAE1F,MAAMC,gBAAgB,GAAG,IAAAL,kBAAW,EAAC,MAAM;IACzC,IAAIV,MAAM,EAAEW,sBAAsB,EAAE;MAClC;IACF;IACA,IAAIV,MAAM,EAAE;MACVA,MAAM,CAACW,uBAAuB,CAC5BT,aAAa,IAAI,EAAE,EACnB,GAAGI,IAAI,CAACM,SAAS,IAAIN,IAAI,CAACO,QAAQ,EAAE,EACpC,KACF,CAAC;IACH;EACF,CAAC,EAAE,CAACX,aAAa,EAAEF,MAAM,EAAED,MAAM,EAAEW,sBAAsB,EAAEJ,IAAI,CAACM,SAAS,EAAEN,IAAI,CAACO,QAAQ,CAAC,CAAC;EAE1F,IAAAE,gBAAS,EAAC,MAAM;IACd,MAAMC,OAAO,GAAGC,UAAU,CAAC,MAAM;MAC/BH,gBAAgB,CAAC,CAAC;IACpB,CAAC,EAAE,GAAG,CAAC;IAEP,OAAO,MAAMI,YAAY,CAACF,OAAO,CAAC;EACpC,CAAC,EAAE,CAACF,gBAAgB,CAAC,CAAC;EAEtB,OAAO;IAAEN,kBAAkB;IAAEM;EAAiB,CAAC;AACjD,CAAC;AAAC,IAAAK,QAAA,GAAAC,OAAA,CAAAC,OAAA,GAEavB,YAAY","ignoreList":[]}

package/lib/commonjs/hooks/useLogout.js

@@ -15,8 +15,7 @@ var _roomHeapSlice = require("../roomStore/roomHeapSlice");
 var _pushSubscriptionService = require("../services/pushSubscriptionService");
 var _rooms = require("../networking/api-requests/rooms.api");
 var _persistence = require("../roomStore/persistence");
-var _secureUserStorage = require("../helpers/secureUserStorage");
-var _getServerReadTimestamp = require("../helpers/getServerReadTimestamp");
+var _LOCAL_STORAGE = require("../helpers/constants/LOCAL_STORAGE");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 // AsyncStorage keys the library writes but that aren't cleared by any
 // slice reducer. Listed here so a single logout call wipes the full
@@ -64,16 +63,9 @@ const logoutService = exports.logoutService = {
       const client = state.chatSettingStore?.client;
       const rooms = state.rooms?.rooms;
       const visibleRoomJID = state.rooms?.visibleRoomJID || null;
-      // The visible room is exempt from `onlyIfNoUnread`'s skip (it's
-      // meant to write "read up to now" for whatever's open), so if the
-      // user is logging out while scrolled up with unread messages
-      // above, the boundary must still be carried through here - same
-      // reasoning as every other "leaving a room" path (bug #42).
-      const boundaryTs = visibleRoomJID ? (0, _getServerReadTimestamp.getFlushBoundaryTs)(rooms?.[visibleRoomJID], state.roomHeapSlice, state.rooms?.readBoundaries?.[visibleRoomJID] ?? null) : undefined;
       if (client?.flushLastViewedToPrivateStoreStanza) {
         await Promise.race([client.flushLastViewedToPrivateStoreStanza(rooms, {
           visibleRoomJID,
-          visibleRoomTs: boundaryTs,
           onlyIfNoUnread: true
         }), new Promise(res => setTimeout(res, 2000))]);
       }
@@ -129,23 +121,15 @@ const logoutService = exports.logoutService = {
 
     // 6. Stray keys the slices don't touch.
     try {
-      await _asyncStorage.default.multiRemove(LIBRARY_STRAY_KEYS);
+      await _asyncStorage.default.multiRemove([...LIBRARY_STRAY_KEYS,
+      // Belt-and-suspenders: the chat slice's `logout` reducer
+      // schedules an async remove of ETHORA_USER fire-and-forget;
+      // re-issue it here so the disk is provably clean before this
+      // Promise resolves.
+      _LOCAL_STORAGE.localStorageConstants.ETHORA_USER]);
     } catch (e) {
       console.warn('logoutService: stray-key clear failed', e);
     }
-
-    // 7. Belt-and-suspenders: the chat slice's `logout` reducer already
-    //    fires an async ETHORA_USER removal, but re-issue it here (via
-    //    the same secureUserStorage split the reducer uses) so BOTH the
-    //    plain-AsyncStorage profile half AND the Keychain/Keystore
-    //    secrets are provably gone before this Promise resolves — a bare
-    //    `AsyncStorage.removeItem(ETHORA_USER)` here would only clear the
-    //    profile half and leave the tokens behind.
-    try {
-      await (0, _secureUserStorage.secureUserStorage)().remove();
-    } catch (e) {
-      console.warn('logoutService: secure user storage clear failed', e);
-    }
   }
 };
 

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

@@ -1 +1 @@
-{"version":3,"names":["_reactRedux","require","_reactNative","_asyncStorage","_interopRequireDefault","_roomStore","_chatSettingsSlice","_roomsSlice","_react","_roomHeapSlice","_pushSubscriptionService","_rooms","_persistence","_secureUserStorage","_getServerReadTimestamp","e","__esModule","default","LIBRARY_STRAY_KEYS","logoutService","exports","performLogout","state","store","getState","client","chatSettingStore","rooms","visibleRoomJID","boundaryTs","getFlushBoundaryTs","roomHeapSlice","readBoundaries","undefined","flushLastViewedToPrivateStoreStanza","Promise","race","visibleRoomTs","onlyIfNoUnread","res","setTimeout","console","warn","DeviceEventEmitter","emit","pushSubscriptionService","reset","clearRoomsRestCache","dispatch","setLogoutState","clearHeap","logout","clearPersistedState","AsyncStorage","multiRemove","secureUserStorage","remove","useLogout","useDispatch","useCallback","err"],"sourceRoot":"../../../src","sources":["hooks/useLogout.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_reactRedux","require","_reactNative","_asyncStorage","_interopRequireDefault","_roomStore","_chatSettingsSlice","_roomsSlice","_react","_roomHeapSlice","_pushSubscriptionService","_rooms","_persistence","_LOCAL_STORAGE","e","__esModule","default","LIBRARY_STRAY_KEYS","logoutService","exports","performLogout","state","store","getState","client","chatSettingStore","rooms","visibleRoomJID","flushLastViewedToPrivateStoreStanza","Promise","race","onlyIfNoUnread","res","setTimeout","console","warn","DeviceEventEmitter","emit","pushSubscriptionService","reset","clearRoomsRestCache","dispatch","setLogoutState","clearHeap","logout","clearPersistedState","AsyncStorage","multiRemove","localStorageConstants","ETHORA_USER","useLogout","useDispatch","useCallback","err"],"sourceRoot":"../../../src","sources":["hooks/useLogout.tsx"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/hooks/usePendingNotification.js

@@ -8,9 +8,8 @@ exports.usePendingNotification = usePendingNotification;
 var _react = require("react");
 var _reactRedux = require("react-redux");
 var _asyncStorage = _interopRequireDefault(require("@react-native-async-storage/async-storage"));
-var _roomsSlice = require("../roomStore/roomsSlice");
-var _pushPayload = require("../helpers/pushPayload");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+const PENDING_NOTIFICATION_JID_KEY = 'ethora_pending_notification_jid';
 function usePendingNotification() {
   const dispatch = (0, _reactRedux.useDispatch)();
   const rooms = (0, _reactRedux.useSelector)(state => state.rooms.rooms);
@@ -23,16 +22,20 @@ function usePendingNotification() {
       }
       let jidToOpen = pendingNotificationJid;
       if (!jidToOpen) {
-        jidToOpen = await (0, _pushPayload.readPendingJid)();
+        try {
+          const storedJid = await _asyncStorage.default.getItem(PENDING_NOTIFICATION_JID_KEY);
+          if (storedJid) {
+            jidToOpen = storedJid;
+            await _asyncStorage.default.removeItem(PENDING_NOTIFICATION_JID_KEY);
+          }
+        } catch (error) {
+          console.error('Error reading from AsyncStorage:', error);
+        }
       }
       if (jidToOpen) {
         const room = rooms[jidToOpen];
         if (room) {
-          dispatch((0, _roomsSlice.clearPendingNotificationJid)());
-          _asyncStorage.default.removeItem(_pushPayload.PENDING_NOTIFICATION_JID_KEY).catch(() => undefined);
-          dispatch((0, _roomsSlice.setCurrentRoom)({
-            roomJID: jidToOpen
-          }));
+          return;
         }
       }
     };

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

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_reactRedux","_asyncStorage","_interopRequireDefault","_roomsSlice","_pushPayload","e","__esModule","default","usePendingNotification","dispatch","useDispatch","rooms","useSelector","state","pendingNotificationJid","isLoading","useEffect","checkPendingNotification","jidToOpen","readPendingJid","room","clearPendingNotificationJid","AsyncStorage","removeItem","PENDING_NOTIFICATION_JID_KEY","catch","undefined","setCurrentRoom","roomJID","_default","exports"],"sourceRoot":"../../../src","sources":["hooks/usePendingNotification.ts"],"mappings":";;;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,WAAA,GAAAD,OAAA;AACA,IAAAE,aAAA,GAAAC,sBAAA,CAAAH,OAAA;AAEA,IAAAI,WAAA,GAAAJ,OAAA;AAEA,IAAAK,YAAA,GAAAL,OAAA;AAAsF,SAAAG,uBAAAG,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAE/E,SAASG,sBAAsBA,CAAA,EAAG;EACvC,MAAMC,QAAQ,GAAG,IAAAC,uBAAW,EAAC,CAAC;EAC9B,MAAMC,KAAK,GAAG,IAAAC,uBAAW,EAAEC,KAAgB,IAAKA,KAAK,CAACF,KAAK,CAACA,KAAK,CAAC;EAClE,MAAMG,sBAAsB,GAAG,IAAAF,uBAAW,EACvCC,KAAgB,IAAKA,KAAK,CAACF,KAAK,CAACG,sBACpC,CAAC;EACD,MAAMC,SAAS,GAAG,IAAAH,uBAAW,EAAEC,KAAgB,IAAKA,KAAK,CAACF,KAAK,CAACI,SAAS,CAAC;EAE1E,IAAAC,gBAAS,EAAC,MAAM;IACd,MAAMC,wBAAwB,GAAG,MAAAA,CAAA,KAAY;MAC3C,IAAIF,SAAS,EAAE;QAAC;MAAO;MAEvB,IAAIG,SAAS,GAAGJ,sBAAsB;MAEtC,IAAI,CAACI,SAAS,EAAE;QACdA,SAAS,GAAG,MAAM,IAAAC,2BAAc,EAAC,CAAC;MACpC;MAEA,IAAID,SAAS,EAAE;QACb,MAAME,IAAI,GAAGT,KAAK,CAACO,SAAS,CAAC;QAC7B,IAAIE,IAAI,EAAE;UACRX,QAAQ,CAAC,IAAAY,uCAA2B,EAAC,CAAC,CAAC;UACvCC,qBAAY,CAACC,UAAU,CAACC,yCAA4B,CAAC,CAACC,KAAK,CAAC,MAAMC,SAAS,CAAC;UAC5EjB,QAAQ,CAAC,IAAAkB,0BAAc,EAAC;YAAEC,OAAO,EAAEV;UAAU,CAAC,CAAC,CAAC;QAClD;MACF;IACF,CAAC;IAEDD,wBAAwB,CAAC,CAAC;EAC5B,CAAC,EAAE,CAACN,KAAK,EAAEG,sBAAsB,EAAEC,SAAS,EAAEN,QAAQ,CAAC,CAAC;EAExD,OAAO;IAAEK;EAAuB,CAAC;AACnC;AAAC,IAAAe,QAAA,GAAAC,OAAA,CAAAvB,OAAA,GAEcC,sBAAsB","ignoreList":[]}
+{"version":3,"names":["_react","require","_reactRedux","_asyncStorage","_interopRequireDefault","e","__esModule","default","PENDING_NOTIFICATION_JID_KEY","usePendingNotification","dispatch","useDispatch","rooms","useSelector","state","pendingNotificationJid","isLoading","useEffect","checkPendingNotification","jidToOpen","storedJid","AsyncStorage","getItem","removeItem","error","console","room","_default","exports"],"sourceRoot":"../../../src","sources":["hooks/usePendingNotification.ts"],"mappings":";;;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,WAAA,GAAAD,OAAA;AACA,IAAAE,aAAA,GAAAC,sBAAA,CAAAH,OAAA;AAAqE,SAAAG,uBAAAC,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAIrE,MAAMG,4BAA4B,GAAG,iCAAiC;AAE/D,SAASC,sBAAsBA,CAAA,EAAG;EACvC,MAAMC,QAAQ,GAAG,IAAAC,uBAAW,EAAC,CAAC;EAC9B,MAAMC,KAAK,GAAG,IAAAC,uBAAW,EAAEC,KAAgB,IAAKA,KAAK,CAACF,KAAK,CAACA,KAAK,CAAC;EAClE,MAAMG,sBAAsB,GAAG,IAAAF,uBAAW,EACvCC,KAAgB,IAAKA,KAAK,CAACF,KAAK,CAACG,sBACpC,CAAC;EACD,MAAMC,SAAS,GAAG,IAAAH,uBAAW,EAAEC,KAAgB,IAAKA,KAAK,CAACF,KAAK,CAACI,SAAS,CAAC;EAE1E,IAAAC,gBAAS,EAAC,MAAM;IACd,MAAMC,wBAAwB,GAAG,MAAAA,CAAA,KAAY;MAC3C,IAAIF,SAAS,EAAE;QAAC;MAAO;MAEvB,IAAIG,SAAS,GAAGJ,sBAAsB;MAEtC,IAAI,CAACI,SAAS,EAAE;QACd,IAAI;UACF,MAAMC,SAAS,GAAG,MAAMC,qBAAY,CAACC,OAAO,CAACd,4BAA4B,CAAC;UAC1E,IAAIY,SAAS,EAAE;YACbD,SAAS,GAAGC,SAAS;YACrB,MAAMC,qBAAY,CAACE,UAAU,CAACf,4BAA4B,CAAC;UAC7D;QACF,CAAC,CAAC,OAAOgB,KAAK,EAAE;UACdC,OAAO,CAACD,KAAK,CAAC,kCAAkC,EAAEA,KAAK,CAAC;QAC1D;MACF;MAEA,IAAIL,SAAS,EAAE;QACb,MAAMO,IAAI,GAAGd,KAAK,CAACO,SAAS,CAAC;QAC7B,IAAIO,IAAI,EAAE;UACR;QACF;MACF;IACF,CAAC;IAEDR,wBAAwB,CAAC,CAAC;EAC5B,CAAC,EAAE,CAACN,KAAK,EAAEG,sBAAsB,EAAEC,SAAS,EAAEN,QAAQ,CAAC,CAAC;EAExD,OAAO;IAAEK;EAAuB,CAAC;AACnC;AAAC,IAAAY,QAAA,GAAAC,OAAA,CAAArB,OAAA,GAEcE,sBAAsB","ignoreList":[]}

package/lib/commonjs/hooks/useSendMessage.js

@@ -157,38 +157,13 @@ const useSendMessage = _configOverride => {
     // PENDING_WATCHDOG_MS, flip the bubble to "failed → tap to
     // retry". We check at fire-time whether the message is still
     // pending and not already marked failed by the catch path.
-    // One-shot extension for the case below. Declared outside the
-    // timer so the rescheduled run can't extend again.
-    let watchdogExtended = false;
-    const runWatchdog = () => {
+    const watchdogTimer = setTimeout(() => {
       const state = reduxStore.getState();
       const roomMsgs = state.rooms?.rooms?.[activeRoomJID]?.messages || [];
       const stillPending = roomMsgs.find(m => m.id === optimisticId && m.pending);
       const alreadyFailed = state.roomHeapSlice?.failedMessages?.[optimisticId];
-
-      // Don't call it a failure while the stream is still coming back.
-      // A reconnect tears the old client down and builds a new one, and
-      // any echo in flight during that window is simply lost — the
-      // message may well have been delivered (it has been observed
-      // arriving twice on the receiving side). Failing it here shows a
-      // red "tap to retry" under a message that actually went through.
-      // Give the reconnect one more window to produce an echo, once.
-      const streamOnline = (0, _clientRegistry.getGlobalXmppClient)()?.status === 'online';
-      if (stillPending && !alreadyFailed && !streamOnline && !watchdogExtended) {
-        watchdogExtended = true;
-        console.warn(`Send watchdog — ${optimisticId} still pending but the stream is not online; extending one window`);
-        watchdogTimer = setTimeout(runWatchdog, PENDING_WATCHDOG_MS);
-        return;
-      }
       if (stillPending && !alreadyFailed) {
         console.warn(`Send watchdog fired — message ${optimisticId} stuck pending > ${PENDING_WATCHDOG_MS}ms; marking failed`);
-        // Drop the buffered replay now that the bubble is showing
-        // "failed / tap to retry" — a later onOnline flush must not
-        // silently resend it behind the user's back. If the original
-        // send actually lands after this point, the server echo still
-        // flips the bubble back to delivered (newMessageMidlleware);
-        // only an explicit tap-to-retry should trigger another send.
-        (0, _outboundQueue.removeOutboundSend)(optimisticId);
         dispatch((0, _roomHeapSlice.markMessageFailed)({
           kind: 'text',
           id: optimisticId,
@@ -205,8 +180,7 @@ const useSendMessage = _configOverride => {
           messageType: 'text'
         });
       }
-    };
-    let watchdogTimer = setTimeout(runWatchdog, PENDING_WATCHDOG_MS);
+    }, PENDING_WATCHDOG_MS);
     try {
       // The single send closure, used both for the immediate send and for
       // the buffered replay. Passing the optimistic id as the stanza id
@@ -256,9 +230,6 @@ const useSendMessage = _configOverride => {
       });
     } catch (error) {
       clearTimeout(watchdogTimer);
-      // Same reasoning as the watchdog: once the bubble shows failed,
-      // only an explicit tap-to-retry should resend it.
-      (0, _outboundQueue.removeOutboundSend)(optimisticId);
       dispatch((0, _roomHeapSlice.markMessageFailed)({
         kind: 'text',
         id: optimisticId,
@@ -373,10 +344,6 @@ const useSendMessage = _configOverride => {
       const alreadyFailed = state.roomHeapSlice?.failedMessages?.[id];
       if (stillPending && !alreadyFailed) {
         console.warn(`Media-send watchdog fired — ${id} stuck pending > ${PENDING_WATCHDOG_MS}ms; marking failed`);
-        // See the text-send watchdog above: drop the buffered replay so
-        // a later onOnline flush can't silently resend behind the
-        // "failed / tap to retry" bubble.
-        (0, _outboundQueue.removeOutboundSend)(id);
         dispatch((0, _roomHeapSlice.markMessageFailed)({
           kind: 'media',
           id,
@@ -406,11 +373,20 @@ const useSendMessage = _configOverride => {
       type: data?.type || data?.mimeType || type || 'application/octet-stream',
       name: data?.name || data?.fileName || `media_${Date.now()}`
     };
+
+    // Mirror the web client: a single multipart POST to /files/ with
+    // the file under the plural "files" field. We send it via fetch
+    // (not axios) because RN's fetch sets the multipart boundary on the
+    // Content-Type header correctly. The previous axios fallback omitted
+    // a valid boundary, so the server mis-parsed one file as many and
+    // rejected the request with HTTP 413 "TOO_MANY_FILES". The only
+    // retry is the documented singular-"file" fallback for deployments
+    // that 500 on the plural field (bug #10).
     const tryUpload = async () => {
       const fd = new FormData();
       fd.append('files', fileBlob);
       try {
-        return await (0, _auth.uploadFileV2)(fd, activeRoomJID);
+        return await (0, _auth.uploadFileViaFetch)(fd);
       } catch (err) {
         if (err?.response?.status === 500) {
           console.warn('upload "files" field returned 500 — retrying with "file" (singular)', {
@@ -419,7 +395,7 @@ const useSendMessage = _configOverride => {
           });
           const fd2 = new FormData();
           fd2.append('file', fileBlob);
-          return await (0, _auth.uploadFileV2)(fd2, activeRoomJID);
+          return await (0, _auth.uploadFileViaFetch)(fd2);
         }
         throw err;
       }
@@ -558,18 +534,6 @@ const useSendMessage = _configOverride => {
     if (!payload) {
       return;
     }
-
-    // The server may have accepted the original send even though its
-    // echo arrived too late to beat the watchdog — the bubble shows
-    // failed, but a confirmed (non-pending) copy is already sitting in
-    // the room. Resending here would deliver a genuine duplicate; just
-    // clear the failure and let the existing copy stand.
-    const roomMsgs = rooms?.[payload.roomJID]?.messages || [];
-    const alreadyDelivered = roomMsgs.some(m => !m.pending && (m.id === failedId || m.xmppId === failedId));
-    if (alreadyDelivered) {
-      dispatch((0, _roomHeapSlice.clearMessageFailure)(failedId));
-      return;
-    }
     dispatch((0, _roomHeapSlice.clearMessageFailure)(failedId));
     handleMessageRetry({
       messageId: failedId,
@@ -584,7 +548,7 @@ const useSendMessage = _configOverride => {
     } else {
       await sendMedia(payload.data, payload.type, payload.roomJID, payload.isReply, payload.isChecked, payload.mainMessage, failedId);
     }
-  }, [failedMessages, rooms, dispatch, handleMessageRetry, sendMessage, sendMedia]);
+  }, [failedMessages, dispatch, handleMessageRetry, sendMessage, sendMedia]);
 
   // ChatRoom/ThreadWrapper consume this as the "edit branch" of send.
   // It mirrors the edit path inside `sendMessage` so callers can wire it