From b23b320148625a99615e4b894b52ccedb7780237 Mon Sep 17 00:00:00 2001
From: Ivan Sekovanikj <ivan.sekovanikj@getstream.io>
Date: Fri, 15 Nov 2024 13:14:52 +0100
Subject: [PATCH] fix: edge cases and test

---
 .../hooks/__tests__/useChannelPreviewMuted.test.tsx      | 9 +++++++--
 .../ChannelPreview/hooks/useChannelPreviewData.ts        | 2 +-
 .../components/ChannelPreview/hooks/useIsChannelMuted.ts | 6 +++---
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/package/src/components/ChannelPreview/hooks/__tests__/useChannelPreviewMuted.test.tsx b/package/src/components/ChannelPreview/hooks/__tests__/useChannelPreviewMuted.test.tsx
index f39d28316..1d52486f2 100644
--- a/package/src/components/ChannelPreview/hooks/__tests__/useChannelPreviewMuted.test.tsx
+++ b/package/src/components/ChannelPreview/hooks/__tests__/useChannelPreviewMuted.test.tsx
@@ -29,12 +29,17 @@ describe('useChannelPreviewMuted', () => {
   });
 
   const mockChannel = {
-    muteStatus: jest.fn().mockReturnValue(false),
+    initialized: true,
+    muteStatus: jest.fn().mockReturnValue({
+      createdAt: Date.now(),
+      expiresAt: Date.now() + 5000,
+      muted: false,
+    }),
   } as unknown as Channel<DefaultStreamChatGenerics>;
 
   it('should return the correct mute status', () => {
     const { result } = renderHook(() => useIsChannelMuted(mockChannel));
-    expect(result.current).toBe(false);
+    expect(result.current.muted).toBe(false);
   });
 
   it("should update the mute status when the notification.channel_mutes_updated event is emitted'", () => {
diff --git a/package/src/components/ChannelPreview/hooks/useChannelPreviewData.ts b/package/src/components/ChannelPreview/hooks/useChannelPreviewData.ts
index 943ac5888..5fe2dae30 100644
--- a/package/src/components/ChannelPreview/hooks/useChannelPreviewData.ts
+++ b/package/src/components/ChannelPreview/hooks/useChannelPreviewData.ts
@@ -19,7 +19,7 @@ export const useChannelPreviewData = <
     | MessageResponse<StreamChatGenerics>
   >(channel.state.messages[channel.state.messages.length - 1]);
   const [unread, setUnread] = useState(channel.countUnread());
-  const muted = useIsChannelMuted(channel);
+  const { muted } = useIsChannelMuted(channel);
 
   /**
    * This effect listens for the `notification.mark_read` event and sets the unread count to 0
diff --git a/package/src/components/ChannelPreview/hooks/useIsChannelMuted.ts b/package/src/components/ChannelPreview/hooks/useIsChannelMuted.ts
index 766b1eecd..580bd0c41 100644
--- a/package/src/components/ChannelPreview/hooks/useIsChannelMuted.ts
+++ b/package/src/components/ChannelPreview/hooks/useIsChannelMuted.ts
@@ -14,16 +14,16 @@ export const useIsChannelMuted = <
   const { client } = useChatContext<StreamChatGenerics>();
   const initialized = channel?.initialized;
 
-  const [muted, setMuted] = useState(() => initialized && channel.muteStatus()?.muted);
+  const [muted, setMuted] = useState(() => initialized && channel.muteStatus());
 
   useEffect(() => {
     const handleEvent = () => {
-      setMuted(initialized && channel.muteStatus()?.muted);
+      setMuted(initialized && channel.muteStatus());
     };
 
     client.on('notification.channel_mutes_updated', handleEvent);
     return () => client.off('notification.channel_mutes_updated', handleEvent);
   }, [channel, client, initialized, muted]);
 
-  return muted;
+  return muted || { createdAt: null, expiresAt: null, muted: false };
 };