Merge pull request #1995 from GetStream/develop

v10.7.5

Author: MartinCupela

src/components/Channel/Channel.tsx

@@ -438,7 +438,7 @@ const ChannelInner = <
       const oldestID = channel.state?.messages?.[0]?.id;
 
       /**
-       * As the channel state is not normalized we re-fetch the channel data. Thus we avoid having to search for user references in the channel state.
+       * As the channel state is not normalized we re-fetch the channel data. Thus, we avoid having to search for user references in the channel state.
        */
       await channel.query({
         messages: { id_lt: oldestID, limit: DEFAULT_NEXT_CHANNEL_PAGE_SIZE },
@@ -682,8 +682,26 @@ const ChannelInner = <
         messageResponse = await channel.sendMessage(messageData);
       }
 
-      // replace it after send is completed
-      if (messageResponse?.message) {
+      let existingMessage;
+      for (let i = channel.state.messages.length - 1; i >= 0; i--) {
+        const msg = channel.state.messages[i];
+        if (msg.id === messageData.id) {
+          existingMessage = msg;
+          break;
+        }
+      }
+
+      const responseTimestamp = new Date(messageResponse?.message?.updated_at || 0).getTime();
+      const existingMessageTimestamp = existingMessage?.updated_at?.getTime() || 0;
+      const responseIsTheNewest = responseTimestamp > existingMessageTimestamp;
+
+      // Replace the message payload after send is completed
+      // We need to check for the newest message payload, because on slow network, the response can arrive later than WS events message.new, message.updated.
+      // Always override existing message in status "sending"
+      if (
+        messageResponse?.message &&
+        (responseIsTheNewest || existingMessage?.status === 'sending')
+      ) {
         updateMessage({
           ...messageResponse.message,
           status: 'received',

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

@@ -826,6 +826,87 @@ describe('Channel', () => {
         expect(await findByText(message.text)).toBeInTheDocument();
       });
 
+      it('should not overwrite the message with send response, if already updated by WS events', async () => {
+        let oldText;
+        const newText = 'new text';
+        const creationDate = new Date();
+        const created_at = creationDate.toISOString();
+        const updated_at = new Date(creationDate.getTime() + 1).toISOString();
+        let hasSent = false;
+
+        jest.spyOn(channel, 'sendMessage').mockImplementationOnce((message) => {
+          oldText = message.text;
+          const finalMessage = { ...message, created_at, updated_at: created_at };
+          useMockedApis(chatClient, [sendMessageApi(finalMessage)]);
+          // both effects have to be emitted, otherwise the original message in status "sending" will not be filtered out (done when message.new is emitted) => and the message.updated event would add the updated message as a new message.
+          createChannelEventDispatcher({
+            created_at,
+            message: {
+              ...finalMessage,
+              text: newText,
+            },
+            user,
+          })();
+          createChannelEventDispatcher({
+            created_at: updated_at,
+            message: {
+              ...finalMessage,
+              text: newText,
+              updated_at,
+              user,
+            },
+            type: 'message.updated',
+          })();
+          return channel.sendMessage(message);
+        });
+
+        const { queryByText } = renderComponent(
+          { children: <MockMessageList /> },
+          ({ sendMessage }) => {
+            if (!hasSent) {
+              sendMessage(generateMessage());
+              hasSent = true;
+            }
+          },
+        );
+
+        await waitFor(async () => {
+          expect(await queryByText(oldText, undefined, { timeout: 100 })).not.toBeInTheDocument();
+          expect(await queryByText(newText, undefined, { timeout: 100 })).toBeInTheDocument();
+        });
+      });
+
+      it('should overwrite the message of status "sending" regardless of updated_at timestamp', async () => {
+        let oldText;
+        const newText = 'new text';
+        const creationDate = new Date();
+        const created_at = creationDate.toISOString();
+        const updated_at = new Date(creationDate.getTime() - 1).toISOString();
+        let hasSent = false;
+
+        jest.spyOn(channel, 'sendMessage').mockImplementationOnce((message) => {
+          oldText = message.text;
+          const finalMessage = { ...message, created_at, text: newText, updated_at };
+          useMockedApis(chatClient, [sendMessageApi(finalMessage)]);
+          return channel.sendMessage(message);
+        });
+
+        const { queryByText } = renderComponent(
+          { children: <MockMessageList /> },
+          ({ sendMessage }) => {
+            if (!hasSent) {
+              sendMessage(generateMessage());
+              hasSent = true;
+            }
+          },
+        );
+
+        await waitFor(async () => {
+          expect(await queryByText(oldText, undefined, { timeout: 100 })).not.toBeInTheDocument();
+          expect(await queryByText(newText, undefined, { timeout: 100 })).toBeInTheDocument();
+        });
+      });
+
       it('should mark the channel as read if a new message from another user comes in and the user is looking at the page', async () => {
         const markReadSpy = jest.spyOn(channel, 'markRead');
 
@@ -862,7 +943,7 @@ describe('Channel', () => {
         const updatedThreadMessage = { ...threadMessage, text: newText };
         const dispatchUpdateMessageEvent = createChannelEventDispatcher(
           { message: updatedThreadMessage },
-          'message.update',
+          'message.updated',
         );
         let threadStarterHasUpdatedText = false;
         renderComponent({}, ({ openThread, thread }) => {

src/components/MessageInput/hooks/useCreateMessageInputContext.ts

@@ -157,6 +157,7 @@ export const useCreateMessageInputContext = <
       showCommandsList,
       showMentionsList,
       text,
+      handleSubmit,
     ],
   );