Merge branch 'master' into fix/bind-join-button-on-recall

Infomaniak · Oct 17, 2023 · e908260 · e908260
2 parents 4d8e7a0 + 419efa5
commit e908260
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/actions/websocket_actions.jsx b/actions/websocket_actions.jsx
@@ -287,8 +287,6 @@ export async function reconnect(socketId) {
 
         dispatch(loadChannelsForCurrentUser());
 
-        dispatch(resetReloadPostsInChannel());
-
         if (mostRecentPost) {
             // eslint-disable-next-line no-console
             console.log('[websocket_actions] dispatch syncPostsInChannel');

diff --git a/packages/client/src/websocket.ts b/packages/client/src/websocket.ts
@@ -207,7 +207,7 @@ export default class WebSocketClient {
         this.conn.connection.bind('state_change', (states: { current: string; previous: string }) => {
             console.log('[websocket] current state is: ', states.current);
 
-            if (states.current === 'unavailable' || states.current === 'failed') {
+            if (states.current === 'unavailable' || states.current === 'failed' || (states.previous === 'connected' && states.current === 'connecting')) {
                 this.connectFailCount++;
                 console.log('[websocket] connectFailCount updated: ', this.connectFailCount);