@ethora/chat-component-rn 26.8.1 → 26.8.3

package/lib/module/hooks/useChatWrapperInit.js

@@ -8,9 +8,8 @@ import { resolveLegacyTranslatesLangSource } from '../helpers/resolveLangSource'
 import { useXmppClient } from '../context/xmppProvider';
 import { chatAutoEnterer } from '../helpers/chatAutoEnterer';
 import { initRoomsPresence } from '../helpers/initRoomsPresence';
-import { updatedChatLastTimestamps } from '../helpers/updatedChatLastTimestamps';
 import { updateMessagesTillLast } from '../helpers/updateMessagesTillLast';
-import { refresh } from '../networking/apiClient';
+import { refreshAuthTokensQuietly } from '../networking/authRefresh';
 import { setLangSource, setConfig } from '../roomStore/chatSettingsSlice';
 import { setIsLoading } from '../roomStore/roomsSlice';
 import { useRoomState } from './useRoomState';
@@ -18,6 +17,7 @@ import { useChatSettingState } from './useChatSettingState';
 import { isChatIdPresentInArray } from '../helpers/isChatIdPresentInArray';
 import useGetNewArchRoom from './useGetNewArchRoom';
 import { getRoomsWithRetry } from '../helpers/getRoomsWithRetry';
+import { shallowEqual } from '../helpers/shallowEqual';
 const useChatWrapperInit = ({
   roomJID,
   wasAutoSelected,
@@ -53,6 +53,20 @@ 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 = useRef(undefined);
+  useEffect(() => {
+    if (!shallowEqual(lastSyncedConfigRef.current, config)) {
+      lastSyncedConfigRef.current = config;
+      dispatch(setConfig(config));
+    }
+  }, [config, dispatch]);
   const getRoomsWithRertyRequest = async () => {
     setIsRetrying(true);
     const retryRooms = await getRoomsWithRetry(client, config, syncRooms, roomJID);
@@ -123,11 +137,17 @@ 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) {
-                  updatedChatLastTimestamps(roomTimestampObject, dispatch);
-                }
                 if (!hasSyncedHistoryRef.current) {
                   console.log('Updating messages till last');
                   await updateMessagesTillLast(rooms, newClient);
@@ -142,7 +162,7 @@ const useChatWrapperInit = ({
                 setConnectionLost(false);
               }
               {
-                config?.refreshTokens?.enabled && refresh();
+                config?.refreshTokens?.enabled && refreshAuthTokensQuietly();
               }
             } catch (error) {
               console.error(' Error during initialization', error);
@@ -162,11 +182,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) {
-                updatedChatLastTimestamps(roomTimestampObject, dispatch);
-              }
               if (!hasSyncedHistoryRef.current) {
                 console.log('Updating messages till last for existing client');
                 await updateMessagesTillLast(rooms, client);
@@ -181,7 +201,7 @@ const useChatWrapperInit = ({
               setConnectionLost(false);
             }
             {
-              config?.refreshTokens?.enabled && refresh();
+              config?.refreshTokens?.enabled && refreshAuthTokensQuietly();
             }
           }
         }

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

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

package/lib/module/hooks/useComposing.js

@@ -1,6 +1,7 @@
 "use strict";
 
-import { useCallback, useEffect } from 'react';
+import { useCallback, useEffect, useRef } from 'react';
+import { AppState } from 'react-native';
 import { useXmppClient } from '../context/xmppProvider';
 import { useSelector } from 'react-redux';
 import { useChatSettingState } from './useChatSettingState';
@@ -14,7 +15,15 @@ const useComposing = config => {
   const {
     user
   } = 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 = useRef(false);
   const sendStartComposing = useCallback(() => {
+    isFocusedRef.current = true;
     if (config?.disableTypingIndicator) {
       return;
     }
@@ -23,6 +32,7 @@ const useComposing = config => {
     }
   }, [activeRoomJID, client, config?.disableTypingIndicator, user.firstName, user.lastName]);
   const sendEndComposing = useCallback(() => {
+    isFocusedRef.current = false;
     if (config?.disableTypingIndicator) {
       return;
     }
@@ -36,6 +46,23 @@ 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.
+  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 = AppState.addEventListener('change', handleAppStateChange);
+    return () => subscription.remove();
+  }, [activeRoomJID, client, config?.disableTypingIndicator, user.firstName, user.lastName]);
   return {
     sendStartComposing,
     sendEndComposing

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

@@ -1 +1 @@
-{"version":3,"names":["useCallback","useEffect","useXmppClient","useSelector","useChatSettingState","useComposing","config","client","activeRoomJID","state","rooms","user","sendStartComposing","disableTypingIndicator","sendTypingRequestStanza","firstName","lastName","sendEndComposing","timerId","setTimeout","clearTimeout"],"sourceRoot":"../../../src","sources":["hooks/useComposing.tsx"],"mappings":";;AAAA,SAASA,WAAW,EAAEC,SAAS,QAAkB,OAAO;AACxD,SAASC,aAAa,QAAQ,yBAAyB;AACvD,SAASC,WAAW,QAAQ,aAAa;AAEzC,SAASC,mBAAmB,QAAQ,uBAAuB;AAG3D,MAAMC,YAAY,GAAIC,MAAgB,IAAK;EACzC,MAAM;IAAEC;EAAO,CAAC,GAAGL,aAAa,CAAC,CAAC;EAClC,MAAM;IAAEM;EAAc,CAAC,GAAGL,WAAW,CAAEM,KAAgB,IAAKA,KAAK,CAACC,KAAK,CAAC;EACxE,MAAM;IAAEC;EAAK,CAAC,GAAGP,mBAAmB,CAAC,CAAC;EAEtC,MAAMQ,kBAAkB,GAAGZ,WAAW,CAAC,MAAM;IAC3C,IAAIM,MAAM,EAAEO,sBAAsB,EAAE;MAClC;IACF;IACA,IAAIN,MAAM,EAAE;MACVA,MAAM,CAACO,uBAAuB,CAC5BN,aAAa,IAAI,EAAE,EACnB,GAAGG,IAAI,CAACI,SAAS,IAAIJ,IAAI,CAACK,QAAQ,EAAE,EACpC,IACF,CAAC;IACH;EACF,CAAC,EAAE,CAACR,aAAa,EAAED,MAAM,EAAED,MAAM,EAAEO,sBAAsB,EAAEF,IAAI,CAACI,SAAS,EAAEJ,IAAI,CAACK,QAAQ,CAAC,CAAC;EAE1F,MAAMC,gBAAgB,GAAGjB,WAAW,CAAC,MAAM;IACzC,IAAIM,MAAM,EAAEO,sBAAsB,EAAE;MAClC;IACF;IACA,IAAIN,MAAM,EAAE;MACVA,MAAM,CAACO,uBAAuB,CAC5BN,aAAa,IAAI,EAAE,EACnB,GAAGG,IAAI,CAACI,SAAS,IAAIJ,IAAI,CAACK,QAAQ,EAAE,EACpC,KACF,CAAC;IACH;EACF,CAAC,EAAE,CAACR,aAAa,EAAED,MAAM,EAAED,MAAM,EAAEO,sBAAsB,EAAEF,IAAI,CAACI,SAAS,EAAEJ,IAAI,CAACK,QAAQ,CAAC,CAAC;EAE1Ff,SAAS,CAAC,MAAM;IACd,MAAMiB,OAAO,GAAGC,UAAU,CAAC,MAAM;MAC/BF,gBAAgB,CAAC,CAAC;IACpB,CAAC,EAAE,GAAG,CAAC;IAEP,OAAO,MAAMG,YAAY,CAACF,OAAO,CAAC;EACpC,CAAC,EAAE,CAACD,gBAAgB,CAAC,CAAC;EAEtB,OAAO;IAAEL,kBAAkB;IAAEK;EAAiB,CAAC;AACjD,CAAC;AAED,eAAeZ,YAAY","ignoreList":[]}
+{"version":3,"names":["useCallback","useEffect","useRef","AppState","useXmppClient","useSelector","useChatSettingState","useComposing","config","client","activeRoomJID","state","rooms","user","isFocusedRef","sendStartComposing","current","disableTypingIndicator","sendTypingRequestStanza","firstName","lastName","sendEndComposing","timerId","setTimeout","clearTimeout","handleAppStateChange","nextState","subscription","addEventListener","remove"],"sourceRoot":"../../../src","sources":["hooks/useComposing.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/hooks/useCustomTypingIndicator.js

@@ -4,6 +4,8 @@ import { useCallback, useMemo } from 'react';
 import { useSelector } from 'react-redux';
 import { useChatSettingState } from './useChatSettingState';
 import { generateDefaultText, generateProcessingText } from '../components/styled/StyledInputComponents/CustomTypingIndicator';
+import { useTheme } from './useTheme';
+
 /**
  * Hook for managing custom typing indicator functionality
  * Provides utilities for text generation and typing state management
@@ -12,6 +14,7 @@ export const useCustomTypingIndicator = roomJID => {
   const {
     config
   } = useChatSettingState();
+  const theme = useTheme();
   const {
     rooms
   } = useSelector(state => ({
@@ -63,7 +66,8 @@ export const useCustomTypingIndicator = roomJID => {
           top: '8px',
           left: '16px',
           right: '16px',
-          background: 'rgba(255, 255, 255, 0.95)',
+          background: theme.surface,
+          color: theme.text,
           padding: '8px 12px',
           borderRadius: '8px',
           boxShadow: '0 2px 8px rgba(0, 0, 0, 0.1)',
@@ -88,7 +92,8 @@ export const useCustomTypingIndicator = roomJID => {
           position: 'fixed',
           bottom: '80px',
           right: '20px',
-          background: 'rgba(255, 255, 255, 0.95)',
+          background: theme.surface,
+          color: theme.text,
           padding: '12px 16px',
           borderRadius: '20px',
           boxShadow: '0 4px 16px rgba(0, 0, 0, 0.15)',
@@ -102,7 +107,7 @@ export const useCustomTypingIndicator = roomJID => {
           padding: '8px 0'
         };
     }
-  }, [typingConfig?.styles]);
+  }, [typingConfig?.styles, theme]);
   return {
     isComposing,
     composingList,

package/lib/module/hooks/useCustomTypingIndicator.js.map

@@ -1 +1 @@
-{"version":3,"names":["useCallback","useMemo","useSelector","useChatSettingState","generateDefaultText","generateProcessingText","useCustomTypingIndicator","roomJID","config","rooms","state","room","isComposing","composing","composingList","getTypingText","customText","getProcessingText","isCustomTypingEnabled","customTypingIndicator","enabled","typingConfig","shouldShowIndicator","length","getPositionStyles","position","baseStyles","styles","top","left","right","background","padding","borderRadius","boxShadow","backdropFilter","transform","color","bottom","createTypingIndicatorConfigs","default","processing","text","usersTyping","fontSize","fontWeight","floating","customTexts","aiProcessing","states","randomState","Math","floor","random","simple","minimal"],"sourceRoot":"../../../src","sources":["hooks/useCustomTypingIndicator.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["useCallback","useMemo","useSelector","useChatSettingState","generateDefaultText","generateProcessingText","useTheme","useCustomTypingIndicator","roomJID","config","theme","rooms","state","room","isComposing","composing","composingList","getTypingText","customText","getProcessingText","isCustomTypingEnabled","customTypingIndicator","enabled","typingConfig","shouldShowIndicator","length","getPositionStyles","position","baseStyles","styles","top","left","right","background","surface","color","text","padding","borderRadius","boxShadow","backdropFilter","transform","bottom","createTypingIndicatorConfigs","default","processing","usersTyping","fontSize","fontWeight","floating","customTexts","aiProcessing","states","randomState","Math","floor","random","simple","minimal"],"sourceRoot":"../../../src","sources":["hooks/useCustomTypingIndicator.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/hooks/useFileToken.js

@@ -0,0 +1,5 @@
+"use strict";
+
+import { useSelector } from 'react-redux';
+export const useFileToken = () => useSelector(state => state.chatSettingStore.user?.fileToken || '');
+//# sourceMappingURL=useFileToken.js.map

package/lib/module/hooks/useFileToken.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["useSelector","useFileToken","state","chatSettingStore","user","fileToken"],"sourceRoot":"../../../src","sources":["hooks/useFileToken.ts"],"mappings":";;AAAA,SAASA,WAAW,QAAQ,aAAa;AAGzC,OAAO,MAAMC,YAAY,GAAGA,CAAA,KAC1BD,WAAW,CACRE,KAAgB,IAAKA,KAAK,CAACC,gBAAgB,CAACC,IAAI,EAAEC,SAAS,IAAI,EAClE,CAAC","ignoreList":[]}

package/lib/module/hooks/useLogout.js

@@ -9,9 +9,11 @@ import { setLogoutState } from '../roomStore/roomsSlice';
 import { useCallback } from 'react';
 import { clearHeap } from '../roomStore/roomHeapSlice';
 import { pushSubscriptionService } from '../services/pushSubscriptionService';
+import { releasePushRegistration } from '../services/pushRegistration';
 import { clearRoomsRestCache } from '../networking/api-requests/rooms.api';
 import { clearPersistedState } from '../roomStore/persistence';
-import { localStorageConstants } from '../helpers/constants/LOCAL_STORAGE';
+import { secureUserStorage } from '../helpers/secureUserStorage';
+import { getFlushBoundaryTs } from '../helpers/getServerReadTimestamp';
 
 // AsyncStorage keys the library writes but that aren't cleared by any
 // slice reducer. Listed here so a single logout call wipes the full
@@ -59,9 +61,16 @@ const 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 ? 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))]);
       }
@@ -76,9 +85,15 @@ const logoutService = {
       /* non-fatal */
     }
 
-    // 2. Push: clear locally-subscribed-rooms cache. Doesn't talk to the
-    //    server — that's the host app's responsibility (it owns the FCM/
-    //    APNs token lifecycle).
+    // 2. Push. Release the device-token registration on the backend
+    //    while the access token is still valid (the token itself is kept
+    //    so the next login re-registers it), then clear the local MucSub
+    //    room cache.
+    try {
+      await releasePushRegistration();
+    } catch (e) {
+      console.warn('logoutService: push release failed', e);
+    }
     try {
       await pushSubscriptionService.reset();
     } catch (e) {
@@ -117,15 +132,23 @@ const logoutService = {
 
     // 6. Stray keys the slices don't touch.
     try {
-      await AsyncStorage.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.
-      localStorageConstants.ETHORA_USER]);
+      await AsyncStorage.multiRemove(LIBRARY_STRAY_KEYS);
     } 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 secureUserStorage().remove();
+    } catch (e) {
+      console.warn('logoutService: secure user storage clear failed', e);
+    }
   }
 };
 

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

@@ -1 +1 @@
-{"version":3,"names":["useDispatch","DeviceEventEmitter","AsyncStorage","store","logout","setLogoutState","useCallback","clearHeap","pushSubscriptionService","clearRoomsRestCache","clearPersistedState","localStorageConstants","LIBRARY_STRAY_KEYS","logoutService","performLogout","state","getState","client","chatSettingStore","rooms","visibleRoomJID","flushLastViewedToPrivateStoreStanza","Promise","race","onlyIfNoUnread","res","setTimeout","e","console","warn","emit","reset","dispatch","multiRemove","ETHORA_USER","useLogout","err"],"sourceRoot":"../../../src","sources":["hooks/useLogout.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["useDispatch","DeviceEventEmitter","AsyncStorage","store","logout","setLogoutState","useCallback","clearHeap","pushSubscriptionService","releasePushRegistration","clearRoomsRestCache","clearPersistedState","secureUserStorage","getFlushBoundaryTs","LIBRARY_STRAY_KEYS","logoutService","performLogout","state","getState","client","chatSettingStore","rooms","visibleRoomJID","boundaryTs","roomHeapSlice","readBoundaries","undefined","flushLastViewedToPrivateStoreStanza","Promise","race","visibleRoomTs","onlyIfNoUnread","res","setTimeout","e","console","warn","emit","reset","dispatch","multiRemove","remove","useLogout","err"],"sourceRoot":"../../../src","sources":["hooks/useLogout.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/hooks/usePendingNotification.js

@@ -3,7 +3,8 @@
 import { useEffect } from 'react';
 import { useSelector, useDispatch } from 'react-redux';
 import AsyncStorage from '@react-native-async-storage/async-storage';
-const PENDING_NOTIFICATION_JID_KEY = 'ethora_pending_notification_jid';
+import { setCurrentRoom, clearPendingNotificationJid } from '../roomStore/roomsSlice';
+import { PENDING_NOTIFICATION_JID_KEY, readPendingJid } from '../helpers/pushPayload';
 export function usePendingNotification() {
   const dispatch = useDispatch();
   const rooms = useSelector(state => state.rooms.rooms);
@@ -16,20 +17,16 @@ export function usePendingNotification() {
       }
       let jidToOpen = pendingNotificationJid;
       if (!jidToOpen) {
-        try {
-          const storedJid = await AsyncStorage.getItem(PENDING_NOTIFICATION_JID_KEY);
-          if (storedJid) {
-            jidToOpen = storedJid;
-            await AsyncStorage.removeItem(PENDING_NOTIFICATION_JID_KEY);
-          }
-        } catch (error) {
-          console.error('Error reading from AsyncStorage:', error);
-        }
+        jidToOpen = await readPendingJid();
       }
       if (jidToOpen) {
         const room = rooms[jidToOpen];
         if (room) {
-          return;
+          dispatch(clearPendingNotificationJid());
+          AsyncStorage.removeItem(PENDING_NOTIFICATION_JID_KEY).catch(() => undefined);
+          dispatch(setCurrentRoom({
+            roomJID: jidToOpen
+          }));
         }
       }
     };

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

@@ -1 +1 @@
-{"version":3,"names":["useEffect","useSelector","useDispatch","AsyncStorage","PENDING_NOTIFICATION_JID_KEY","usePendingNotification","dispatch","rooms","state","pendingNotificationJid","isLoading","checkPendingNotification","jidToOpen","storedJid","getItem","removeItem","error","console","room"],"sourceRoot":"../../../src","sources":["hooks/usePendingNotification.ts"],"mappings":";;AAAA,SAASA,SAAS,QAAQ,OAAO;AACjC,SAASC,WAAW,EAAEC,WAAW,QAAQ,aAAa;AACtD,OAAOC,YAAY,MAAM,2CAA2C;AAIpE,MAAMC,4BAA4B,GAAG,iCAAiC;AAEtE,OAAO,SAASC,sBAAsBA,CAAA,EAAG;EACvC,MAAMC,QAAQ,GAAGJ,WAAW,CAAC,CAAC;EAC9B,MAAMK,KAAK,GAAGN,WAAW,CAAEO,KAAgB,IAAKA,KAAK,CAACD,KAAK,CAACA,KAAK,CAAC;EAClE,MAAME,sBAAsB,GAAGR,WAAW,CACvCO,KAAgB,IAAKA,KAAK,CAACD,KAAK,CAACE,sBACpC,CAAC;EACD,MAAMC,SAAS,GAAGT,WAAW,CAAEO,KAAgB,IAAKA,KAAK,CAACD,KAAK,CAACG,SAAS,CAAC;EAE1EV,SAAS,CAAC,MAAM;IACd,MAAMW,wBAAwB,GAAG,MAAAA,CAAA,KAAY;MAC3C,IAAID,SAAS,EAAE;QAAC;MAAO;MAEvB,IAAIE,SAAS,GAAGH,sBAAsB;MAEtC,IAAI,CAACG,SAAS,EAAE;QACd,IAAI;UACF,MAAMC,SAAS,GAAG,MAAMV,YAAY,CAACW,OAAO,CAACV,4BAA4B,CAAC;UAC1E,IAAIS,SAAS,EAAE;YACbD,SAAS,GAAGC,SAAS;YACrB,MAAMV,YAAY,CAACY,UAAU,CAACX,4BAA4B,CAAC;UAC7D;QACF,CAAC,CAAC,OAAOY,KAAK,EAAE;UACdC,OAAO,CAACD,KAAK,CAAC,kCAAkC,EAAEA,KAAK,CAAC;QAC1D;MACF;MAEA,IAAIJ,SAAS,EAAE;QACb,MAAMM,IAAI,GAAGX,KAAK,CAACK,SAAS,CAAC;QAC7B,IAAIM,IAAI,EAAE;UACR;QACF;MACF;IACF,CAAC;IAEDP,wBAAwB,CAAC,CAAC;EAC5B,CAAC,EAAE,CAACJ,KAAK,EAAEE,sBAAsB,EAAEC,SAAS,EAAEJ,QAAQ,CAAC,CAAC;EAExD,OAAO;IAAEG;EAAuB,CAAC;AACnC;AAEA,eAAeJ,sBAAsB","ignoreList":[]}
+{"version":3,"names":["useEffect","useSelector","useDispatch","AsyncStorage","setCurrentRoom","clearPendingNotificationJid","PENDING_NOTIFICATION_JID_KEY","readPendingJid","usePendingNotification","dispatch","rooms","state","pendingNotificationJid","isLoading","checkPendingNotification","jidToOpen","room","removeItem","catch","undefined","roomJID"],"sourceRoot":"../../../src","sources":["hooks/usePendingNotification.ts"],"mappings":";;AAAA,SAASA,SAAS,QAAQ,OAAO;AACjC,SAASC,WAAW,EAAEC,WAAW,QAAQ,aAAa;AACtD,OAAOC,YAAY,MAAM,2CAA2C;AAEpE,SAASC,cAAc,EAAEC,2BAA2B,QAAQ,yBAAyB;AAErF,SAASC,4BAA4B,EAAEC,cAAc,QAAQ,wBAAwB;AAErF,OAAO,SAASC,sBAAsBA,CAAA,EAAG;EACvC,MAAMC,QAAQ,GAAGP,WAAW,CAAC,CAAC;EAC9B,MAAMQ,KAAK,GAAGT,WAAW,CAAEU,KAAgB,IAAKA,KAAK,CAACD,KAAK,CAACA,KAAK,CAAC;EAClE,MAAME,sBAAsB,GAAGX,WAAW,CACvCU,KAAgB,IAAKA,KAAK,CAACD,KAAK,CAACE,sBACpC,CAAC;EACD,MAAMC,SAAS,GAAGZ,WAAW,CAAEU,KAAgB,IAAKA,KAAK,CAACD,KAAK,CAACG,SAAS,CAAC;EAE1Eb,SAAS,CAAC,MAAM;IACd,MAAMc,wBAAwB,GAAG,MAAAA,CAAA,KAAY;MAC3C,IAAID,SAAS,EAAE;QAAC;MAAO;MAEvB,IAAIE,SAAS,GAAGH,sBAAsB;MAEtC,IAAI,CAACG,SAAS,EAAE;QACdA,SAAS,GAAG,MAAMR,cAAc,CAAC,CAAC;MACpC;MAEA,IAAIQ,SAAS,EAAE;QACb,MAAMC,IAAI,GAAGN,KAAK,CAACK,SAAS,CAAC;QAC7B,IAAIC,IAAI,EAAE;UACRP,QAAQ,CAACJ,2BAA2B,CAAC,CAAC,CAAC;UACvCF,YAAY,CAACc,UAAU,CAACX,4BAA4B,CAAC,CAACY,KAAK,CAAC,MAAMC,SAAS,CAAC;UAC5EV,QAAQ,CAACL,cAAc,CAAC;YAAEgB,OAAO,EAAEL;UAAU,CAAC,CAAC,CAAC;QAClD;MACF;IACF,CAAC;IAEDD,wBAAwB,CAAC,CAAC;EAC5B,CAAC,EAAE,CAACJ,KAAK,EAAEE,sBAAsB,EAAEC,SAAS,EAAEJ,QAAQ,CAAC,CAAC;EAExD,OAAO;IAAEG;EAAuB,CAAC;AACnC;AAEA,eAAeJ,sBAAsB","ignoreList":[]}

package/lib/module/hooks/useSendMessage.js

@@ -7,8 +7,8 @@ import { useXmppClient } from '../context/xmppProvider';
 import { useDispatch, useSelector, useStore } from 'react-redux';
 import { addRoomMessage, setEditAction } from '../roomStore/roomsSlice';
 import { addMessageToHeap, clearMessageFailure, markMessageFailed } from '../roomStore/roomHeapSlice';
-import { uploadFileViaFetch } from '../networking/api-requests/auth.api';
-import { enqueueOutboundSend } from '../networking/outboundQueue';
+import { uploadFileV2 } from '../networking/api-requests/auth.api';
+import { enqueueOutboundSend, removeOutboundSend } from '../networking/outboundQueue';
 import { store } from '../roomStore';
 import { getGlobalXmppClient } from '../utils/clientRegistry';
 import { useEventHandlers } from './useEventHandlers';
@@ -153,13 +153,38 @@ export 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.
-    const watchdogTimer = setTimeout(() => {
+    // 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 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 = 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.
+        removeOutboundSend(optimisticId);
         dispatch(markMessageFailed({
           kind: 'text',
           id: optimisticId,
@@ -176,7 +201,8 @@ export const useSendMessage = _configOverride => {
           messageType: 'text'
         });
       }
-    }, PENDING_WATCHDOG_MS);
+    };
+    let watchdogTimer = setTimeout(runWatchdog, 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
@@ -226,6 +252,9 @@ export 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.
+      removeOutboundSend(optimisticId);
       dispatch(markMessageFailed({
         kind: 'text',
         id: optimisticId,
@@ -340,6 +369,10 @@ export 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.
+        removeOutboundSend(id);
         dispatch(markMessageFailed({
           kind: 'media',
           id,
@@ -369,20 +402,11 @@ export 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 uploadFileViaFetch(fd);
+        return await uploadFileV2(fd, activeRoomJID);
       } catch (err) {
         if (err?.response?.status === 500) {
           console.warn('upload "files" field returned 500 — retrying with "file" (singular)', {
@@ -391,7 +415,7 @@ export const useSendMessage = _configOverride => {
           });
           const fd2 = new FormData();
           fd2.append('file', fileBlob);
-          return await uploadFileViaFetch(fd2);
+          return await uploadFileV2(fd2, activeRoomJID);
         }
         throw err;
       }
@@ -530,6 +554,18 @@ export 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(clearMessageFailure(failedId));
+      return;
+    }
     dispatch(clearMessageFailure(failedId));
     handleMessageRetry({
       messageId: failedId,
@@ -544,7 +580,7 @@ export const useSendMessage = _configOverride => {
     } else {
       await sendMedia(payload.data, payload.type, payload.roomJID, payload.isReply, payload.isChecked, payload.mainMessage, failedId);
     }
-  }, [failedMessages, dispatch, handleMessageRetry, sendMessage, sendMedia]);
+  }, [failedMessages, rooms, 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