stream-chat-react-native-core 4.13.0-beta.2 → 4.13.1-beta.1

package/lib/commonjs/components/ChannelList/hooks/listeners/useNewMessage.js

@@ -23,11 +23,23 @@ var useNewMessage = function useNewMessage(_ref) {
   (0, _react.useEffect)(function () {
     var handleEvent = function handleEvent(event) {
       setChannels(function (channels) {
-        if (!lockChannelOrder && event.cid) {
-          return (0, _utils.moveChannelUp)({
-            channels: channels,
-            cid: event.cid
+        if (!lockChannelOrder && event.cid && event.channel_type && event.channel_id) {
+          var targetChannelIndex = channels.findIndex(function (c) {
+            return c.cid === event.cid;
           });
+
+          if (targetChannelIndex >= 0) {
+            return (0, _utils.moveChannelUp)({
+              channels: channels,
+              cid: event.cid
+            });
+          }
+
+          var channel = client.channel(event.channel_type, event.channel_id);
+
+          if (channel.initialized) {
+            return [channel].concat((0, _toConsumableArray2["default"])(channels));
+          }
         }
 
         return (0, _toConsumableArray2["default"])(channels);

package/lib/commonjs/components/ChannelList/hooks/listeners/useNewMessage.js.map

@@ -1 +1 @@
-{"version":3,"sources":["useNewMessage.ts"],"names":["useNewMessage","lockChannelOrder","setChannels","client","handleEvent","event","channels","cid","on","off"],"mappings":";;;;;;;;;AAAA;;AAIA;;AAGA;;AAQO,IAAMA,aAAa,GAAG,SAAhBA,aAAgB,OAKS;AAAA,MAFpCC,gBAEoC,QAFpCA,gBAEoC;AAAA,MADpCC,WACoC,QADpCA,WACoC;;AACpC,wBAAmB,kCAAnB;AAAA,MAAQC,MAAR,mBAAQA,MAAR;;AAEA,wBAAU,YAAM;AACd,QAAMC,WAAW,GAAG,SAAdA,WAAc,CAACC,KAAD,EAAsC;AACxDH,MAAAA,WAAW,CAAC,UAACI,QAAD,EAAc;AACxB,YAAI,CAACL,gBAAD,IAAqBI,KAAK,CAACE,GAA/B,EAAoC;AAClC,iBAAO,0BAAkC;AACvCD,YAAAA,QAAQ,EAARA,QADuC;AAEvCC,YAAAA,GAAG,EAAEF,KAAK,CAACE;AAF4B,WAAlC,CAAP;AAID;;AACD,mDAAWD,QAAX;AACD,OARU,CAAX;AASD,KAVD;;AAYAH,IAAAA,MAAM,CAACK,EAAP,CAAU,aAAV,EAAyBJ,WAAzB;AACA,WAAO;AAAA,aAAMD,MAAM,CAACM,GAAP,CAAW,aAAX,EAA0BL,WAA1B,CAAN;AAAA,KAAP;AACD,GAfD,EAeG,EAfH;AAgBD,CAxBM","sourcesContent":["import { useEffect } from 'react';\n\nimport type { Channel, Event } from 'stream-chat';\n\nimport { useChatContext } from '../../../../contexts/chatContext/ChatContext';\n\nimport type { DefaultStreamChatGenerics } from '../../../../types/types';\nimport { moveChannelUp } from '../../utils';\n\ntype Parameters<StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics> =\n  {\n    lockChannelOrder: boolean;\n    setChannels: React.Dispatch<React.SetStateAction<Channel<StreamChatGenerics>[]>>;\n  };\n\nexport const useNewMessage = <\n  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,\n>({\n  lockChannelOrder,\n  setChannels,\n}: Parameters<StreamChatGenerics>) => {\n  const { client } = useChatContext<StreamChatGenerics>();\n\n  useEffect(() => {\n    const handleEvent = (event: Event<StreamChatGenerics>) => {\n      setChannels((channels) => {\n        if (!lockChannelOrder && event.cid) {\n          return moveChannelUp<StreamChatGenerics>({\n            channels,\n            cid: event.cid,\n          });\n        }\n        return [...channels];\n      });\n    };\n\n    client.on('message.new', handleEvent);\n    return () => client.off('message.new', handleEvent);\n  }, []);\n};\n"]}
+{"version":3,"sources":["useNewMessage.ts"],"names":["useNewMessage","lockChannelOrder","setChannels","client","handleEvent","event","channels","cid","channel_type","channel_id","targetChannelIndex","findIndex","c","channel","initialized","on","off"],"mappings":";;;;;;;;;AAAA;;AAIA;;AAGA;;AAQO,IAAMA,aAAa,GAAG,SAAhBA,aAAgB,OAKS;AAAA,MAFpCC,gBAEoC,QAFpCA,gBAEoC;AAAA,MADpCC,WACoC,QADpCA,WACoC;;AACpC,wBAAmB,kCAAnB;AAAA,MAAQC,MAAR,mBAAQA,MAAR;;AAEA,wBAAU,YAAM;AACd,QAAMC,WAAW,GAAG,SAAdA,WAAc,CAACC,KAAD,EAAsC;AACxDH,MAAAA,WAAW,CAAC,UAACI,QAAD,EAAc;AACxB,YAAI,CAACL,gBAAD,IAAqBI,KAAK,CAACE,GAA3B,IAAkCF,KAAK,CAACG,YAAxC,IAAwDH,KAAK,CAACI,UAAlE,EAA8E;AAC5E,cAAMC,kBAAkB,GAAGJ,QAAQ,CAACK,SAAT,CAAmB,UAACC,CAAD;AAAA,mBAAOA,CAAC,CAACL,GAAF,KAAUF,KAAK,CAACE,GAAvB;AAAA,WAAnB,CAA3B;;AAEA,cAAIG,kBAAkB,IAAI,CAA1B,EAA6B;AAC3B,mBAAO,0BAAkC;AACvCJ,cAAAA,QAAQ,EAARA,QADuC;AAEvCC,cAAAA,GAAG,EAAEF,KAAK,CAACE;AAF4B,aAAlC,CAAP;AAID;;AAKD,cAAMM,OAAO,GAAGV,MAAM,CAACU,OAAP,CAAeR,KAAK,CAACG,YAArB,EAAmCH,KAAK,CAACI,UAAzC,CAAhB;;AAEA,cAAII,OAAO,CAACC,WAAZ,EAAyB;AACvB,oBAAQD,OAAR,6CAAoBP,QAApB;AACD;AACF;;AAED,mDAAWA,QAAX;AACD,OAtBU,CAAX;AAuBD,KAxBD;;AA0BAH,IAAAA,MAAM,CAACY,EAAP,CAAU,aAAV,EAAyBX,WAAzB;AACA,WAAO;AAAA,aAAMD,MAAM,CAACa,GAAP,CAAW,aAAX,EAA0BZ,WAA1B,CAAN;AAAA,KAAP;AACD,GA7BD,EA6BG,EA7BH;AA8BD,CAtCM","sourcesContent":["import { useEffect } from 'react';\n\nimport type { Channel, Event } from 'stream-chat';\n\nimport { useChatContext } from '../../../../contexts/chatContext/ChatContext';\n\nimport type { DefaultStreamChatGenerics } from '../../../../types/types';\nimport { moveChannelUp } from '../../utils';\n\ntype Parameters<StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics> =\n  {\n    lockChannelOrder: boolean;\n    setChannels: React.Dispatch<React.SetStateAction<Channel<StreamChatGenerics>[]>>;\n  };\n\nexport const useNewMessage = <\n  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,\n>({\n  lockChannelOrder,\n  setChannels,\n}: Parameters<StreamChatGenerics>) => {\n  const { client } = useChatContext<StreamChatGenerics>();\n\n  useEffect(() => {\n    const handleEvent = (event: Event<StreamChatGenerics>) => {\n      setChannels((channels) => {\n        if (!lockChannelOrder && event.cid && event.channel_type && event.channel_id) {\n          const targetChannelIndex = channels.findIndex((c) => c.cid === event.cid);\n\n          if (targetChannelIndex >= 0) {\n            return moveChannelUp<StreamChatGenerics>({\n              channels,\n              cid: event.cid,\n            });\n          }\n\n          // If channel doesn't exist in existing list, check in activeChannels as well.\n          // It may happen that channel was hidden using channel.hide(). In that case\n          // We remove it from `channels` state, but its still being watched and exists in client.activeChannels.\n          const channel = client.channel(event.channel_type, event.channel_id);\n\n          if (channel.initialized) {\n            return [channel, ...channels];\n          }\n        }\n\n        return [...channels];\n      });\n    };\n\n    client.on('message.new', handleEvent);\n    return () => client.off('message.new', handleEvent);\n  }, []);\n};\n"]}

package/lib/commonjs/mock-builders/event/messageNew.js

@@ -7,6 +7,8 @@ var _default = function _default(client, newMessage) {
   var channel = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   client.dispatchEvent({
     channel: channel,
+    channel_id: channel.id,
+    channel_type: channel.type,
     cid: channel.cid,
     message: newMessage,
     type: 'message.new'

package/lib/commonjs/mock-builders/event/messageNew.js.map

@@ -1 +1 @@
-{"version":3,"sources":["messageNew.js"],"names":["client","newMessage","channel","dispatchEvent","cid","message","type"],"mappings":";;;;;eAAe,kBAACA,MAAD,EAASC,UAAT,EAAsC;AAAA,MAAjBC,OAAiB,uEAAP,EAAO;AACnDF,EAAAA,MAAM,CAACG,aAAP,CAAqB;AACnBD,IAAAA,OAAO,EAAPA,OADmB;AAEnBE,IAAAA,GAAG,EAAEF,OAAO,CAACE,GAFM;AAGnBC,IAAAA,OAAO,EAAEJ,UAHU;AAInBK,IAAAA,IAAI,EAAE;AAJa,GAArB;AAMD,C","sourcesContent":["export default (client, newMessage, channel = {}) => {\n  client.dispatchEvent({\n    channel,\n    cid: channel.cid,\n    message: newMessage,\n    type: 'message.new',\n  });\n};\n"]}
+{"version":3,"sources":["messageNew.js"],"names":["client","newMessage","channel","dispatchEvent","channel_id","id","channel_type","type","cid","message"],"mappings":";;;;;eAAe,kBAACA,MAAD,EAASC,UAAT,EAAsC;AAAA,MAAjBC,OAAiB,uEAAP,EAAO;AACnDF,EAAAA,MAAM,CAACG,aAAP,CAAqB;AACnBD,IAAAA,OAAO,EAAPA,OADmB;AAEnBE,IAAAA,UAAU,EAAEF,OAAO,CAACG,EAFD;AAGnBC,IAAAA,YAAY,EAAEJ,OAAO,CAACK,IAHH;AAInBC,IAAAA,GAAG,EAAEN,OAAO,CAACM,GAJM;AAKnBC,IAAAA,OAAO,EAAER,UALU;AAMnBM,IAAAA,IAAI,EAAE;AANa,GAArB;AAQD,C","sourcesContent":["export default (client, newMessage, channel = {}) => {\n  client.dispatchEvent({\n    channel,\n    channel_id: channel.id,\n    channel_type: channel.type,\n    cid: channel.cid,\n    message: newMessage,\n    type: 'message.new',\n  });\n};\n"]}

package/lib/commonjs/version.json

@@ -1,3 +1,3 @@
 {
-  "version": "4.13.0-beta.2"
+  "version": "4.13.1-beta.1"
 }

package/lib/module/components/ChannelList/hooks/listeners/useNewMessage.js

@@ -23,11 +23,23 @@ var useNewMessage = function useNewMessage(_ref) {
   (0, _react.useEffect)(function () {
     var handleEvent = function handleEvent(event) {
       setChannels(function (channels) {
-        if (!lockChannelOrder && event.cid) {
-          return (0, _utils.moveChannelUp)({
-            channels: channels,
-            cid: event.cid
+        if (!lockChannelOrder && event.cid && event.channel_type && event.channel_id) {
+          var targetChannelIndex = channels.findIndex(function (c) {
+            return c.cid === event.cid;
           });
+
+          if (targetChannelIndex >= 0) {
+            return (0, _utils.moveChannelUp)({
+              channels: channels,
+              cid: event.cid
+            });
+          }
+
+          var channel = client.channel(event.channel_type, event.channel_id);
+
+          if (channel.initialized) {
+            return [channel].concat((0, _toConsumableArray2["default"])(channels));
+          }
         }
 
         return (0, _toConsumableArray2["default"])(channels);

package/lib/module/components/ChannelList/hooks/listeners/useNewMessage.js.map

@@ -1 +1 @@
-{"version":3,"sources":["useNewMessage.ts"],"names":["useNewMessage","lockChannelOrder","setChannels","client","handleEvent","event","channels","cid","on","off"],"mappings":";;;;;;;;;AAAA;;AAIA;;AAGA;;AAQO,IAAMA,aAAa,GAAG,SAAhBA,aAAgB,OAKS;AAAA,MAFpCC,gBAEoC,QAFpCA,gBAEoC;AAAA,MADpCC,WACoC,QADpCA,WACoC;;AACpC,wBAAmB,kCAAnB;AAAA,MAAQC,MAAR,mBAAQA,MAAR;;AAEA,wBAAU,YAAM;AACd,QAAMC,WAAW,GAAG,SAAdA,WAAc,CAACC,KAAD,EAAsC;AACxDH,MAAAA,WAAW,CAAC,UAACI,QAAD,EAAc;AACxB,YAAI,CAACL,gBAAD,IAAqBI,KAAK,CAACE,GAA/B,EAAoC;AAClC,iBAAO,0BAAkC;AACvCD,YAAAA,QAAQ,EAARA,QADuC;AAEvCC,YAAAA,GAAG,EAAEF,KAAK,CAACE;AAF4B,WAAlC,CAAP;AAID;;AACD,mDAAWD,QAAX;AACD,OARU,CAAX;AASD,KAVD;;AAYAH,IAAAA,MAAM,CAACK,EAAP,CAAU,aAAV,EAAyBJ,WAAzB;AACA,WAAO;AAAA,aAAMD,MAAM,CAACM,GAAP,CAAW,aAAX,EAA0BL,WAA1B,CAAN;AAAA,KAAP;AACD,GAfD,EAeG,EAfH;AAgBD,CAxBM","sourcesContent":["import { useEffect } from 'react';\n\nimport type { Channel, Event } from 'stream-chat';\n\nimport { useChatContext } from '../../../../contexts/chatContext/ChatContext';\n\nimport type { DefaultStreamChatGenerics } from '../../../../types/types';\nimport { moveChannelUp } from '../../utils';\n\ntype Parameters<StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics> =\n  {\n    lockChannelOrder: boolean;\n    setChannels: React.Dispatch<React.SetStateAction<Channel<StreamChatGenerics>[]>>;\n  };\n\nexport const useNewMessage = <\n  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,\n>({\n  lockChannelOrder,\n  setChannels,\n}: Parameters<StreamChatGenerics>) => {\n  const { client } = useChatContext<StreamChatGenerics>();\n\n  useEffect(() => {\n    const handleEvent = (event: Event<StreamChatGenerics>) => {\n      setChannels((channels) => {\n        if (!lockChannelOrder && event.cid) {\n          return moveChannelUp<StreamChatGenerics>({\n            channels,\n            cid: event.cid,\n          });\n        }\n        return [...channels];\n      });\n    };\n\n    client.on('message.new', handleEvent);\n    return () => client.off('message.new', handleEvent);\n  }, []);\n};\n"]}
+{"version":3,"sources":["useNewMessage.ts"],"names":["useNewMessage","lockChannelOrder","setChannels","client","handleEvent","event","channels","cid","channel_type","channel_id","targetChannelIndex","findIndex","c","channel","initialized","on","off"],"mappings":";;;;;;;;;AAAA;;AAIA;;AAGA;;AAQO,IAAMA,aAAa,GAAG,SAAhBA,aAAgB,OAKS;AAAA,MAFpCC,gBAEoC,QAFpCA,gBAEoC;AAAA,MADpCC,WACoC,QADpCA,WACoC;;AACpC,wBAAmB,kCAAnB;AAAA,MAAQC,MAAR,mBAAQA,MAAR;;AAEA,wBAAU,YAAM;AACd,QAAMC,WAAW,GAAG,SAAdA,WAAc,CAACC,KAAD,EAAsC;AACxDH,MAAAA,WAAW,CAAC,UAACI,QAAD,EAAc;AACxB,YAAI,CAACL,gBAAD,IAAqBI,KAAK,CAACE,GAA3B,IAAkCF,KAAK,CAACG,YAAxC,IAAwDH,KAAK,CAACI,UAAlE,EAA8E;AAC5E,cAAMC,kBAAkB,GAAGJ,QAAQ,CAACK,SAAT,CAAmB,UAACC,CAAD;AAAA,mBAAOA,CAAC,CAACL,GAAF,KAAUF,KAAK,CAACE,GAAvB;AAAA,WAAnB,CAA3B;;AAEA,cAAIG,kBAAkB,IAAI,CAA1B,EAA6B;AAC3B,mBAAO,0BAAkC;AACvCJ,cAAAA,QAAQ,EAARA,QADuC;AAEvCC,cAAAA,GAAG,EAAEF,KAAK,CAACE;AAF4B,aAAlC,CAAP;AAID;;AAKD,cAAMM,OAAO,GAAGV,MAAM,CAACU,OAAP,CAAeR,KAAK,CAACG,YAArB,EAAmCH,KAAK,CAACI,UAAzC,CAAhB;;AAEA,cAAII,OAAO,CAACC,WAAZ,EAAyB;AACvB,oBAAQD,OAAR,6CAAoBP,QAApB;AACD;AACF;;AAED,mDAAWA,QAAX;AACD,OAtBU,CAAX;AAuBD,KAxBD;;AA0BAH,IAAAA,MAAM,CAACY,EAAP,CAAU,aAAV,EAAyBX,WAAzB;AACA,WAAO;AAAA,aAAMD,MAAM,CAACa,GAAP,CAAW,aAAX,EAA0BZ,WAA1B,CAAN;AAAA,KAAP;AACD,GA7BD,EA6BG,EA7BH;AA8BD,CAtCM","sourcesContent":["import { useEffect } from 'react';\n\nimport type { Channel, Event } from 'stream-chat';\n\nimport { useChatContext } from '../../../../contexts/chatContext/ChatContext';\n\nimport type { DefaultStreamChatGenerics } from '../../../../types/types';\nimport { moveChannelUp } from '../../utils';\n\ntype Parameters<StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics> =\n  {\n    lockChannelOrder: boolean;\n    setChannels: React.Dispatch<React.SetStateAction<Channel<StreamChatGenerics>[]>>;\n  };\n\nexport const useNewMessage = <\n  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,\n>({\n  lockChannelOrder,\n  setChannels,\n}: Parameters<StreamChatGenerics>) => {\n  const { client } = useChatContext<StreamChatGenerics>();\n\n  useEffect(() => {\n    const handleEvent = (event: Event<StreamChatGenerics>) => {\n      setChannels((channels) => {\n        if (!lockChannelOrder && event.cid && event.channel_type && event.channel_id) {\n          const targetChannelIndex = channels.findIndex((c) => c.cid === event.cid);\n\n          if (targetChannelIndex >= 0) {\n            return moveChannelUp<StreamChatGenerics>({\n              channels,\n              cid: event.cid,\n            });\n          }\n\n          // If channel doesn't exist in existing list, check in activeChannels as well.\n          // It may happen that channel was hidden using channel.hide(). In that case\n          // We remove it from `channels` state, but its still being watched and exists in client.activeChannels.\n          const channel = client.channel(event.channel_type, event.channel_id);\n\n          if (channel.initialized) {\n            return [channel, ...channels];\n          }\n        }\n\n        return [...channels];\n      });\n    };\n\n    client.on('message.new', handleEvent);\n    return () => client.off('message.new', handleEvent);\n  }, []);\n};\n"]}

package/lib/module/mock-builders/event/messageNew.js

@@ -7,6 +7,8 @@ var _default = function _default(client, newMessage) {
   var channel = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   client.dispatchEvent({
     channel: channel,
+    channel_id: channel.id,
+    channel_type: channel.type,
     cid: channel.cid,
     message: newMessage,
     type: 'message.new'

package/lib/module/mock-builders/event/messageNew.js.map

@@ -1 +1 @@
-{"version":3,"sources":["messageNew.js"],"names":["client","newMessage","channel","dispatchEvent","cid","message","type"],"mappings":";;;;;eAAe,kBAACA,MAAD,EAASC,UAAT,EAAsC;AAAA,MAAjBC,OAAiB,uEAAP,EAAO;AACnDF,EAAAA,MAAM,CAACG,aAAP,CAAqB;AACnBD,IAAAA,OAAO,EAAPA,OADmB;AAEnBE,IAAAA,GAAG,EAAEF,OAAO,CAACE,GAFM;AAGnBC,IAAAA,OAAO,EAAEJ,UAHU;AAInBK,IAAAA,IAAI,EAAE;AAJa,GAArB;AAMD,C","sourcesContent":["export default (client, newMessage, channel = {}) => {\n  client.dispatchEvent({\n    channel,\n    cid: channel.cid,\n    message: newMessage,\n    type: 'message.new',\n  });\n};\n"]}
+{"version":3,"sources":["messageNew.js"],"names":["client","newMessage","channel","dispatchEvent","channel_id","id","channel_type","type","cid","message"],"mappings":";;;;;eAAe,kBAACA,MAAD,EAASC,UAAT,EAAsC;AAAA,MAAjBC,OAAiB,uEAAP,EAAO;AACnDF,EAAAA,MAAM,CAACG,aAAP,CAAqB;AACnBD,IAAAA,OAAO,EAAPA,OADmB;AAEnBE,IAAAA,UAAU,EAAEF,OAAO,CAACG,EAFD;AAGnBC,IAAAA,YAAY,EAAEJ,OAAO,CAACK,IAHH;AAInBC,IAAAA,GAAG,EAAEN,OAAO,CAACM,GAJM;AAKnBC,IAAAA,OAAO,EAAER,UALU;AAMnBM,IAAAA,IAAI,EAAE;AANa,GAArB;AAQD,C","sourcesContent":["export default (client, newMessage, channel = {}) => {\n  client.dispatchEvent({\n    channel,\n    channel_id: channel.id,\n    channel_type: channel.type,\n    cid: channel.cid,\n    message: newMessage,\n    type: 'message.new',\n  });\n};\n"]}

package/lib/module/version.json

@@ -1,3 +1,3 @@
 {
-  "version": "4.13.0-beta.2"
+  "version": "4.13.1-beta.1"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "stream-chat-react-native-core",
   "description": "The official React Native and Expo components for Stream Chat, a service for building chat applications",
-  "version": "4.13.0-beta.2",
+  "version": "4.13.1-beta.1",
   "author": {
     "company": "Stream.io Inc",
     "name": "Stream.io Inc"
@@ -78,7 +78,7 @@
     "mime-types": "^2.1.34",
     "path": "0.12.7",
     "react-art": "^17.0.2",
-    "react-native-markdown-package": "1.8.1",
+    "react-native-markdown-package": "1.8.2",
     "react-native-url-polyfill": "^1.3.0",
     "stream-chat": "6.7.0"
   },

package/src/components/ChannelList/__tests__/ChannelList.test.js

@@ -246,6 +246,34 @@ describe('ChannelList', () => {
         });
       });
 
+      it('should add channel to top if channel is hidden from the list', async () => {
+        const { getAllByRole, getByTestId, getByText } = render(
+          <Chat client={chatClient}>
+            <ChannelList {...props} />
+          </Chat>,
+        );
+
+        await waitFor(() => expect(getByTestId('channel-list')).toBeTruthy());
+        act(() => dispatchChannelHiddenEvent(chatClient, testChannel3.channel));
+
+        const newItems = getAllByRole('list-item');
+        await waitFor(() => {
+          expect(newItems).toHaveLength(2);
+        });
+
+        const newMessage = sendNewMessageOnChannel3();
+
+        await waitFor(() => {
+          expect(getByText(newMessage.text)).toBeTruthy();
+        });
+
+        const items = getAllByRole('list-item');
+
+        await waitFor(() => {
+          expect(within(items[0]).getByText(newMessage.text)).toBeTruthy();
+        });
+      });
+
       it('should not alter order if `lockChannelOrder` prop is true', async () => {
         const { getAllByRole, getByTestId, getByText } = render(
           <Chat client={chatClient}>

package/src/components/ChannelList/hooks/listeners/useNewMessage.ts

@@ -24,12 +24,26 @@ export const useNewMessage = <
   useEffect(() => {
     const handleEvent = (event: Event<StreamChatGenerics>) => {
       setChannels((channels) => {
-        if (!lockChannelOrder && event.cid) {
-          return moveChannelUp<StreamChatGenerics>({
-            channels,
-            cid: event.cid,
-          });
+        if (!lockChannelOrder && event.cid && event.channel_type && event.channel_id) {
+          const targetChannelIndex = channels.findIndex((c) => c.cid === event.cid);
+
+          if (targetChannelIndex >= 0) {
+            return moveChannelUp<StreamChatGenerics>({
+              channels,
+              cid: event.cid,
+            });
+          }
+
+          // If channel doesn't exist in existing list, check in activeChannels as well.
+          // It may happen that channel was hidden using channel.hide(). In that case
+          // We remove it from `channels` state, but its still being watched and exists in client.activeChannels.
+          const channel = client.channel(event.channel_type, event.channel_id);
+
+          if (channel.initialized) {
+            return [channel, ...channels];
+          }
         }
+
         return [...channels];
       });
     };

package/src/mock-builders/event/messageNew.js

@@ -1,6 +1,8 @@
 export default (client, newMessage, channel = {}) => {
   client.dispatchEvent({
     channel,
+    channel_id: channel.id,
+    channel_type: channel.type,
     cid: channel.cid,
     message: newMessage,
     type: 'message.new',

package/src/version.json

@@ -1,3 +1,3 @@
 {
-  "version": "4.13.0-beta.2"
+  "version": "4.13.1-beta.1"
 }