Merge branch 'develop' into V7

# Conflicts:
#	package/expo-package/yarn.lock
#	package/native-package/yarn.lock
#	package/src/components/Channel/Channel.tsx

Author: isekovanic

package/src/components/Channel/Channel.tsx

@@ -731,14 +731,33 @@ const ChannelWithContext = (props: PropsWithChildren<ChannelPropsWithContext>) =
     channel,
   });
 
-  /**
-   * Since we copy the current channel state all together, we need to find the greatest time among the below two and apply it as the throttling time for copying the channel state.
-   * This is done until we remove the newMessageStateUpdateThrottleInterval prop.
-   */
-  const copyChannelStateThrottlingTime =
-    newMessageStateUpdateThrottleInterval > stateUpdateThrottleInterval
-      ? newMessageStateUpdateThrottleInterval
-      : stateUpdateThrottleInterval;
+  const setReadThrottled = useMemo(
+    () =>
+      throttle(
+        () => {
+          if (channel) {
+            setRead(channel);
+          }
+        },
+        stateUpdateThrottleInterval,
+        throttleOptions,
+      ),
+    [channel, stateUpdateThrottleInterval, setRead],
+  );
+
+  const copyMessagesStateFromChannelThrottled = useMemo(
+    () =>
+      throttle(
+        () => {
+          if (channel) {
+            copyMessagesStateFromChannel(channel);
+          }
+        },
+        newMessageStateUpdateThrottleInterval,
+        throttleOptions,
+      ),
+    [channel, newMessageStateUpdateThrottleInterval, copyMessagesStateFromChannel],
+  );
 
   const copyChannelState = useMemo(
     () =>
@@ -749,10 +768,10 @@ const ChannelWithContext = (props: PropsWithChildren<ChannelPropsWithContext>) =
             copyMessagesStateFromChannel(channel);
           }
         },
-        copyChannelStateThrottlingTime,
+        stateUpdateThrottleInterval,
         throttleOptions,
       ),
-    [channel, copyChannelStateThrottlingTime, copyMessagesStateFromChannel, copyStateFromChannel],
+    [stateUpdateThrottleInterval, channel, copyStateFromChannel, copyMessagesStateFromChannel],
   );
 
   const handleEvent: EventHandler = (event) => {
@@ -809,6 +828,16 @@ const ChannelWithContext = (props: PropsWithChildren<ChannelPropsWithContext>) =
 
       // only update channel state if the events are not the previously subscribed useEffect's subscription events
       if (channel && channel.initialized) {
+        if (event.type === 'message.new') {
+          copyMessagesStateFromChannelThrottled();
+          return;
+        }
+
+        if (event.type === 'message.read' || event.type === 'notification.mark_read') {
+          setReadThrottled();
+          return;
+        }
+
         copyChannelState();
       }
     }
@@ -819,7 +848,7 @@ const ChannelWithContext = (props: PropsWithChildren<ChannelPropsWithContext>) =
     const initChannel = async () => {
       setLastRead(new Date());
       const unreadCount = channel.countUnread();
-      if (!channel || !shouldSyncChannel || channel.offlineMode) {
+      if (!channel || !shouldSyncChannel) {
         return;
       }
       let errored = false;
@@ -890,20 +919,6 @@ const ChannelWithContext = (props: PropsWithChildren<ChannelPropsWithContext>) =
     return unsubscribe;
   }, [channel?.cid, client]);
 
-  /**
-   * Subscription to the Notification mark_read event.
-   */
-  useEffect(() => {
-    const handleEvent: EventHandler = (event) => {
-      if (channel.cid === event.cid) {
-        setRead(channel);
-      }
-    };
-
-    const { unsubscribe } = client.on('notification.mark_read', handleEvent);
-    return unsubscribe;
-  }, [channel, client, setRead]);
-
   const threadPropsExists = !!threadProps;
 
   useEffect(() => {

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

@@ -356,7 +356,7 @@ describe('Channel initial load useEffect', () => {
     cleanup();
   });
 
-  it('should not call channel.watch if channel is not initialized', async () => {
+  it('should still call channel.watch if we are online and DB channels are loaded', async () => {
     const messages = Array.from({ length: 10 }, (_, i) => generateMessage({ id: i }));
     const mockedChannel = generateChannelResponse({
       messages,
@@ -366,13 +366,18 @@ describe('Channel initial load useEffect', () => {
     const channel = chatClient.channel('messaging', mockedChannel.id);
     await channel.watch();
     channel.offlineMode = true;
-    channel.state = channelInitialState;
+    channel.state = {
+      ...channelInitialState,
+      messagePagination: {
+        hasPrev: true,
+      },
+    };
     const watchSpy = jest.fn();
     channel.watch = watchSpy;
 
     renderComponent({ channel });
 
-    await waitFor(() => expect(watchSpy).not.toHaveBeenCalled());
+    await waitFor(() => expect(watchSpy).toHaveBeenCalledTimes(1));
   });
 
   it("should call channel.watch if channel is initialized and it's not in offline mode", async () => {