fix: remove remnants from SCG and fix missing types

isekovanic · isekovanic · commit e49b9c0df2a8 · 2025-03-13T11:44:50.000+01:00
diff --git a/package/src/components/ChannelPreview/hooks/__tests__/useChannelPreviewDisplayName.test.tsx b/package/src/components/ChannelPreview/hooks/__tests__/useChannelPreviewDisplayName.test.tsx
@@ -20,7 +20,7 @@ import {
 
 describe('useChannelPreviewDisplayName', () => {
   const clientUser = generateUser();
-  let chatClient: StreamChat<DefaultGenerics> | StreamChat<DefaultStreamChatGenerics>;
+  let chatClient: StreamChat | StreamChat;
   const CHARACTER_LENGTH = 15;
 
   beforeEach(async () => {
@@ -34,7 +34,7 @@ describe('useChannelPreviewDisplayName', () => {
       const channelDisplayName = useChannelPreviewDisplayName(
         {
           data: { name: channelName },
-        } as unknown as Channel<DefaultGenerics>,
+        } as unknown as Channel,
         CHARACTER_LENGTH,
       );
       return <Text>{channelDisplayName}</Text>;
@@ -71,10 +71,7 @@ describe('useChannelPreviewDisplayName', () => {
       const displayName = getChannelPreviewDisplayName({
         characterLimit: characterLength,
         currentUserId,
-        members: members as unknown as Record<
-          string,
-          ChannelMemberResponse<DefaultStreamChatGenerics>
-        >,
+        members: members as unknown as Record<string, ChannelMemberResponse>,
       });
 
       expect(displayName).toEqual(expected);
diff --git a/package/src/components/ChannelPreview/hooks/__tests__/useChannelPreviewDisplayPresence.test.tsx b/package/src/components/ChannelPreview/hooks/__tests__/useChannelPreviewDisplayPresence.test.tsx
@@ -11,9 +11,9 @@ describe('useChannelPreviewDisplayPresence', () => {
   // Mock user data
   const currentUserId = 'current-user';
   const otherUserId = 'other-user';
-  let chatClient: StreamChat<DefaultStreamChatGenerics>;
+  let chatClient: StreamChat;
 
-  let mockChannel: Channel<DefaultStreamChatGenerics>;
+  let mockChannel: Channel;
 
   beforeEach(async () => {
     jest.clearAllMocks();
@@ -27,14 +27,14 @@ describe('useChannelPreviewDisplayPresence', () => {
       state: {
         members: {
           [currentUserId]: {
-            user: { id: currentUserId, online: true } as UserResponse<DefaultStreamChatGenerics>,
+            user: { id: currentUserId, online: true } as UserResponse,
           },
           [otherUserId]: {
-            user: { id: otherUserId, online: false } as UserResponse<DefaultStreamChatGenerics>,
+            user: { id: otherUserId, online: false } as UserResponse,
           },
         },
       },
-    } as unknown as Channel<DefaultStreamChatGenerics>;
+    } as unknown as Channel;
 
     // Mock the useChatContext hook
     jest
@@ -53,17 +53,17 @@ describe('useChannelPreviewDisplayPresence', () => {
       state: {
         members: {
           [currentUserId]: {
-            user: { id: currentUserId } as UserResponse<DefaultStreamChatGenerics>,
+            user: { id: currentUserId } as UserResponse,
           },
           [otherUserId]: {
-            user: { id: otherUserId } as UserResponse<DefaultStreamChatGenerics>,
+            user: { id: otherUserId } as UserResponse,
           },
           [thirdUserId]: {
-            user: { id: thirdUserId } as UserResponse<DefaultStreamChatGenerics>,
+            user: { id: thirdUserId } as UserResponse,
           },
         },
       },
-    } as unknown as Channel<DefaultStreamChatGenerics>;
+    } as unknown as Channel;
 
     const { result } = renderHook(() => useChannelPreviewDisplayPresence(channelWithThreeMembers));
     expect(result.current).toBe(false);
@@ -79,7 +79,7 @@ describe('useChannelPreviewDisplayPresence', () => {
     const onlineUser = {
       ...mockChannel.state.members[otherUserId].user,
       online: true,
-    } as UserResponse<DefaultStreamChatGenerics>;
+    } as UserResponse;
 
     mockChannel.state.members[otherUserId].user = onlineUser;
 
@@ -93,14 +93,14 @@ describe('useChannelPreviewDisplayPresence', () => {
       state: {
         members: {
           [currentUserId]: {
-            user: { id: currentUserId } as UserResponse<DefaultStreamChatGenerics>,
+            user: { id: currentUserId } as UserResponse,
           },
           'null-user': {
             user: null,
           },
         },
       },
-    } as unknown as Channel<DefaultStreamChatGenerics>;
+    } as unknown as Channel;
 
     const { result } = renderHook(() => useChannelPreviewDisplayPresence(channelWithNullUser));
     expect(result.current).toBe(false);
diff --git a/package/src/components/ChannelPreview/hooks/__tests__/useChannelPreviewMuted.test.tsx b/package/src/components/ChannelPreview/hooks/__tests__/useChannelPreviewMuted.test.tsx
@@ -10,7 +10,7 @@ import { useIsChannelMuted } from '../useIsChannelMuted';
 
 describe('useChannelPreviewMuted', () => {
   const clientUser = generateUser();
-  let chatClient: StreamChat<DefaultGenerics> | StreamChat<DefaultStreamChatGenerics>;
+  let chatClient: StreamChat | StreamChat;
 
   beforeEach(async () => {
     chatClient = await getTestClientWithUser(clientUser);
@@ -35,7 +35,7 @@ describe('useChannelPreviewMuted', () => {
       expiresAt: Date.now() + 5000,
       muted: false,
     }),
-  } as unknown as Channel<DefaultStreamChatGenerics>;
+  } as unknown as Channel;
 
   it('should return the correct mute status', () => {
     const { result } = renderHook(() => useIsChannelMuted(mockChannel));
diff --git a/package/src/components/ChannelPreview/hooks/__tests__/useLatestMessagePreview.test.tsx b/package/src/components/ChannelPreview/hooks/__tests__/useLatestMessagePreview.test.tsx
@@ -24,7 +24,7 @@ import { useLatestMessagePreview } from '../useLatestMessagePreview';
 describe('useLatestMessagePreview', () => {
   const FORCE_UPDATE = 15;
   const clientUser = generateUser();
-  let chatClient: StreamChat<DefaultGenerics> | StreamChat<DefaultStreamChatGenerics>;
+  let chatClient: StreamChat | StreamChat;
 
   beforeEach(async () => {
     chatClient = await getTestClientWithUser(clientUser);
diff --git a/package/src/components/ImageGallery/__tests__/ImageGallery.test.tsx b/package/src/components/ImageGallery/__tests__/ImageGallery.test.tsx
@@ -54,7 +54,7 @@ describe('ImageGallery', () => {
               generateVideoAttachment({ type: 'video' }),
             ],
           }),
-        ] as unknown as MessageType<DefaultStreamChatGenerics>[],
+        ] as unknown as MessageType[],
       }),
     );
 
@@ -71,7 +71,7 @@ describe('ImageGallery', () => {
     });
     render(
       getComponent({
-        messages: [message] as unknown as MessageType<DefaultStreamChatGenerics>[],
+        messages: [message] as unknown as MessageType[],
       }),
     );
 
@@ -100,7 +100,7 @@ describe('ImageGallery', () => {
           generateMessage({
             attachments: [generateVideoAttachment({ type: 'video' })],
           }),
-        ] as unknown as MessageType<DefaultStreamChatGenerics>[],
+        ] as unknown as MessageType[],
       }),
     );
 
@@ -126,7 +126,7 @@ describe('ImageGallery', () => {
 
     render(
       getComponent({
-        messages: [message] as unknown as MessageType<DefaultStreamChatGenerics>[],
+        messages: [message] as unknown as MessageType[],
       }),
     );
 
@@ -161,7 +161,7 @@ describe('ImageGallery', () => {
           generateMessage({
             attachments: [generateVideoAttachment({ type: 'video' })],
           }),
-        ] as unknown as MessageType<DefaultStreamChatGenerics>[],
+        ] as unknown as MessageType[],
       }),
     );
 
@@ -191,7 +191,7 @@ describe('ImageGallery', () => {
     });
     render(
       getComponent({
-        messages: [message] as unknown as MessageType<DefaultStreamChatGenerics>[],
+        messages: [message] as unknown as MessageType[],
       }),
     );
 
diff --git a/package/src/components/ImageGallery/__tests__/ImageGalleryFooter.test.tsx b/package/src/components/ImageGallery/__tests__/ImageGalleryFooter.test.tsx
@@ -75,7 +75,7 @@ describe('ImageGalleryFooter', () => {
                 generateMessage({
                   attachments: [generateVideoAttachment({ type: 'video' })],
                 }),
-              ] as unknown as MessageType<DefaultStreamChatGenerics>[],
+              ] as unknown as MessageType[],
             } as unknown as ImageGalleryContextValue
           }
         >
@@ -130,7 +130,7 @@ describe('ImageGalleryFooter', () => {
                 generateMessage({
                   attachments: [generateVideoAttachment({ type: 'video' })],
                 }),
-              ] as unknown as MessageType<DefaultStreamChatGenerics>[],
+              ] as unknown as MessageType[],
             } as unknown as ImageGalleryContextValue
           }
         >
@@ -173,7 +173,7 @@ describe('ImageGalleryFooter', () => {
                 generateMessage({
                   attachments: [generateImageAttachment()],
                 }),
-              ] as unknown as MessageType<DefaultStreamChatGenerics>[],
+              ] as unknown as MessageType[],
             } as unknown as ImageGalleryContextValue
           }
         >
diff --git a/package/src/components/ImageGallery/__tests__/ImageGalleryHeader.test.tsx b/package/src/components/ImageGallery/__tests__/ImageGalleryHeader.test.tsx
@@ -69,7 +69,7 @@ describe('ImageGalleryHeader', () => {
                 generateMessage({
                   attachments: [generateImageAttachment()],
                 }),
-              ] as unknown as MessageType<DefaultStreamChatGenerics>[],
+              ] as unknown as MessageType[],
             } as unknown as ImageGalleryContextValue
           }
         >
@@ -116,7 +116,7 @@ describe('ImageGalleryHeader', () => {
                 generateMessage({
                   attachments: [generateVideoAttachment({ type: 'video' })],
                 }),
-              ] as unknown as MessageType<DefaultStreamChatGenerics>[],
+              ] as unknown as MessageType[],
             } as unknown as ImageGalleryContextValue
           }
         >
@@ -156,7 +156,7 @@ describe('ImageGalleryHeader', () => {
                 generateMessage({
                   attachments: [generateImageAttachment()],
                 }),
-              ] as unknown as MessageType<DefaultStreamChatGenerics>[],
+              ] as unknown as MessageType[],
             } as unknown as ImageGalleryContextValue
           }
         >
diff --git a/package/src/components/ImageGallery/__tests__/ImageGalleryOverlay.test.tsx b/package/src/components/ImageGallery/__tests__/ImageGalleryOverlay.test.tsx
@@ -39,7 +39,7 @@ describe('ImageGalleryOverlay', () => {
                 generateMessage({
                   attachments: [generateImageAttachment()],
                 }),
-              ] as unknown as MessageType<DefaultStreamChatGenerics>[],
+              ] as unknown as MessageType[],
             } as unknown as ImageGalleryContextValue
           }
         >
diff --git a/package/src/components/MessageList/__tests__/useMessageList.test.tsx b/package/src/components/MessageList/__tests__/useMessageList.test.tsx
@@ -19,7 +19,7 @@ import { getTestClientWithUser } from '../../../mock-builders/mock';
 import { useMessageList } from '../hooks/useMessageList';
 
 const clientUser = generateUser();
-let chatClient: StreamChat<DefaultGenerics> | StreamChat<DefaultStreamChatGenerics>;
+let chatClient: StreamChat | StreamChat;
 
 beforeEach(async () => {
   chatClient = await getTestClientWithUser(clientUser);
diff --git a/package/src/contexts/messageInputContext/__tests__/sendMessage.test.tsx b/package/src/contexts/messageInputContext/__tests__/sendMessage.test.tsx
@@ -40,7 +40,7 @@ describe("MessageInputContext's sendMessage", () => {
     setSelectedFiles: jest.fn(),
     setSelectedImages: jest.fn(),
   }));
-  const message: boolean | MessageType<DefaultStreamChatGenerics> = generateMessage({
+  const message: boolean | MessageType = generateMessage({
     created_at: 'Sat Jul 02 2022 23:55:13 GMT+0530 (India Standard Time)',
     id: '7a85f744-cc89-4f82-a1d4-5456432cc8bf',
     updated_at: 'Sat Jul 02 2022 23:55:13 GMT+0530 (India Standard Time)',
@@ -49,7 +49,7 @@ describe("MessageInputContext's sendMessage", () => {
       image: 'fc86ddcb-bac4-400c-9afd-b0c0a1c0cd33',
       name: '50cbdd0e-ca7e-4478-9e2c-be0f1ac6a995',
     }),
-  }) as unknown as MessageType<DefaultStreamChatGenerics>;
+  }) as unknown as MessageType;
 
   it('exit sendMessage when file upload status failed', async () => {
     const initialProps = {
@@ -223,7 +223,7 @@ describe("MessageInputContext's sendMessage", () => {
   it('exit sendMessage when image upload has an error and catch block is executed', () => {
     const setQuotedMessageStateMock = jest.fn();
     const clearQuotedMessageStateMock = jest.fn();
-    const generatedQuotedMessage: boolean | MessageType<DefaultStreamChatGenerics> = message;
+    const generatedQuotedMessage: boolean | MessageType = message;
     const images = [
       generateImageUploadPreview({ state: FileState.UPLOADED }),
       generateImageUploadPreview({ state: FileState.FINISHED }),
@@ -268,7 +268,7 @@ describe("MessageInputContext's sendMessage", () => {
     const clearEditingStateMock = jest.fn();
     const editMessageMock = jest.fn().mockResolvedValue({ data: {} });
     const images = generateImageUploadPreview({ state: FileState.UPLOADED });
-    const generatedMessage: boolean | MessageType<DefaultStreamChatGenerics> = message;
+    const generatedMessage: boolean | MessageType = message;
     const initialProps = {
       clearEditingState: clearEditingStateMock,
       clearQuotedMessageState: clearQuotedMessageStateMock,
diff --git a/package/src/contexts/messageInputContext/__tests__/updateMessage.test.tsx b/package/src/contexts/messageInputContext/__tests__/updateMessage.test.tsx
@@ -51,7 +51,7 @@ describe("MessageInputContext's updateMessage", () => {
     setSelectedImages: jest.fn(),
   }));
   const clearEditingStateMock = jest.fn();
-  const generatedMessage: boolean | MessageType<DefaultStreamChatGenerics> = generateMessage({
+  const generatedMessage: boolean | MessageType = generateMessage({
     created_at: 'Sat Jul 02 2022 23:55:13 GMT+0530 (India Standard Time)',
     id: '7a85f744-cc89-4f82-a1d4-5456432cc8bf',
     text: 'hey',
@@ -61,7 +61,7 @@ describe("MessageInputContext's updateMessage", () => {
       image: 'fc86ddcb-bac4-400c-9afd-b0c0a1c0cd33',
       name: '50cbdd0e-ca7e-4478-9e2c-be0f1ac6a995',
     }),
-  }) as unknown as MessageType<DefaultStreamChatGenerics>;
+  }) as unknown as MessageType;
 
   it('updateMessage throws error as clearEditingState is not available', async () => {
     const initialProps = {
diff --git a/package/src/contexts/messageInputContext/__tests__/useMessageDetailsForState.test.tsx b/package/src/contexts/messageInputContext/__tests__/useMessageDetailsForState.test.tsx
@@ -41,10 +41,7 @@ describe('useMessageDetailsForState', () => {
   it('fileUploads, imageUploads and mentionedUsers are not empty when attachments are present in message', () => {
     const { result } = renderHook(
       ({ initialValue, message }) =>
-        useMessageDetailsForState(
-          message as unknown as MessageType<DefaultStreamChatGenerics> | boolean,
-          initialValue,
-        ),
+        useMessageDetailsForState(message as unknown as MessageType | boolean, initialValue),
       {
         initialProps: {
           initialValue: '',
diff --git a/package/src/mock-builders/api/channelMocks.tsx b/package/src/mock-builders/api/channelMocks.tsx

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ describe('ImageGalleryFooter', () => {`
`75`	`75`	`generateMessage({`
`76`	`76`	`attachments: [generateVideoAttachment({ type: 'video' })],`
`77`	`77`	`}),`
`78`		`- ] as unknown as MessageType<DefaultStreamChatGenerics>[],`
	`78`	`+ ] as unknown as MessageType[],`
`79`	`79`	`} as unknown as ImageGalleryContextValue`
`80`	`80`	`}`
`81`	`81`	`>`
`@@ -130,7 +130,7 @@ describe('ImageGalleryFooter', () => {`
`130`	`130`	`generateMessage({`
`131`	`131`	`attachments: [generateVideoAttachment({ type: 'video' })],`
`132`	`132`	`}),`
`133`		`- ] as unknown as MessageType<DefaultStreamChatGenerics>[],`
	`133`	`+ ] as unknown as MessageType[],`
`134`	`134`	`} as unknown as ImageGalleryContextValue`
`135`	`135`	`}`
`136`	`136`	`>`
`@@ -173,7 +173,7 @@ describe('ImageGalleryFooter', () => {`
`173`	`173`	`generateMessage({`
`174`	`174`	`attachments: [generateImageAttachment()],`
`175`	`175`	`}),`
`176`		`- ] as unknown as MessageType<DefaultStreamChatGenerics>[],`
	`176`	`+ ] as unknown as MessageType[],`
`177`	`177`	`} as unknown as ImageGalleryContextValue`
`178`	`178`	`}`
`179`	`179`	`>`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ describe('ImageGalleryHeader', () => {`
`69`	`69`	`generateMessage({`
`70`	`70`	`attachments: [generateImageAttachment()],`
`71`	`71`	`}),`
`72`		`- ] as unknown as MessageType<DefaultStreamChatGenerics>[],`
	`72`	`+ ] as unknown as MessageType[],`
`73`	`73`	`} as unknown as ImageGalleryContextValue`
`74`	`74`	`}`
`75`	`75`	`>`
`@@ -116,7 +116,7 @@ describe('ImageGalleryHeader', () => {`
`116`	`116`	`generateMessage({`
`117`	`117`	`attachments: [generateVideoAttachment({ type: 'video' })],`
`118`	`118`	`}),`
`119`		`- ] as unknown as MessageType<DefaultStreamChatGenerics>[],`
	`119`	`+ ] as unknown as MessageType[],`
`120`	`120`	`} as unknown as ImageGalleryContextValue`
`121`	`121`	`}`
`122`	`122`	`>`
`@@ -156,7 +156,7 @@ describe('ImageGalleryHeader', () => {`
`156`	`156`	`generateMessage({`
`157`	`157`	`attachments: [generateImageAttachment()],`
`158`	`158`	`}),`
`159`		`- ] as unknown as MessageType<DefaultStreamChatGenerics>[],`
	`159`	`+ ] as unknown as MessageType[],`
`160`	`160`	`} as unknown as ImageGalleryContextValue`
`161`	`161`	`}`
`162`	`162`	`>`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ describe('ImageGalleryOverlay', () => {`
`39`	`39`	`generateMessage({`
`40`	`40`	`attachments: [generateImageAttachment()],`
`41`	`41`	`}),`
`42`		`- ] as unknown as MessageType<DefaultStreamChatGenerics>[],`
	`42`	`+ ] as unknown as MessageType[],`
`43`	`43`	`} as unknown as ImageGalleryContextValue`
`44`	`44`	`}`
`45`	`45`	`>`