Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/smart-components/Thread/context/ThreadProvider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ export const ThreadProvider: React.FC<ThreadProviderProps> = (props: ThreadProvi
sdkInit,
currentChannel,
parentMessage,
}, { logger, pubSub, threadDispatcher })
}, { logger, pubSub, threadDispatcher });

// callbacks
const fetchPrevThreads = useGetPrevThreadsCallback({
Expand Down
18 changes: 12 additions & 6 deletions src/smart-components/Thread/context/__test__/utils.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,20 @@ import { UserMessage } from "@sendbird/chat/message";
import { getParentMessageFrom, isParentMessage, isThreadMessage } from "../utils";

const mockParentMessage = {
messageId: 1,
messageId: 111111,
parentMessage: null,
parentMessageId: null,
parentMessageId: 0,
threadInfo: {
lastRepliedAt: 100000,
lastRepliedAt: 1000,
replyCount: 1,
mostRepliedUsers: [],
updatedAt: 100000,
updatedAt: 1000,
},
};
const mockThreadMessage = {
messageId: 2,
messageId: 111112,
parentMessage: mockParentMessage,
parentMessageId: 1,
parentMessageId: 111111,
threadInfo: null,
};

Expand All @@ -26,6 +26,9 @@ describe('Thread/utils - isParentMessage', () => {
it('should confirm if the message is not a parent message', () => {
expect(isParentMessage(mockThreadMessage as UserMessage)).toBe(false);
});
it('should check type of the parentMessageId', () => {
expect(isParentMessage({ ...mockParentMessage, parentMessageId: '1' } as UserMessage)).toBe(false);
});
});

describe('Thread/utils - isThreadMessage', () => {
Expand All @@ -35,6 +38,9 @@ describe('Thread/utils - isThreadMessage', () => {
it('should comfirm if the message is not a thread message', () => {
expect(isThreadMessage(mockParentMessage as UserMessage)).toBe(false);
});
it('should check type of the parentMessageId', () => {
expect(isThreadMessage({ ...mockThreadMessage, parentMessageId: '1' } as UserMessage)).toBe(false);
});
});

describe('Thread/utils - getParentMessageFrom', () => {
Expand Down
7 changes: 4 additions & 3 deletions src/smart-components/Thread/context/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,16 @@ export const getParentMessageFrom = (message: UserMessage | FileMessage): UserMe
export const isParentMessage = (message: UserMessage | FileMessage): boolean => {
return (
message?.parentMessage === null
&& message?.parentMessageId === null
&& message?.threadInfo !== null
&& typeof message?.parentMessageId === 'number'
&& !message?.parentMessageId
);
};

export const isThreadMessage = (message: UserMessage | FileMessage): boolean => {
return (
message?.parentMessage !== null
&& message?.parentMessageId !== null
&& typeof message?.parentMessageId === 'number'
&& message?.parentMessageId > 0
&& message?.threadInfo === null
);
};
Expand Down