fix: avoid edited label for failed messages

Author: isekovanic

package/src/__tests__/offline-support/optimistic-update.js

@@ -26,6 +26,7 @@ import { getTestClientWithUser } from '../../mock-builders/mock';
 import { upsertChannels } from '../../store/apis';
 import { SqliteClient } from '../../store/SqliteClient';
 import { BetterSqlite } from '../../test-utils/BetterSqlite';
+import { MessageStatusTypes } from '../../utils/utils';
 
 test('Workaround to allow exporting tests', () => expect(true).toBe(true));
 
@@ -509,6 +510,53 @@ export const OptimisticUpdates = () => {
         });
       });
 
+      it('should not set message_text_updated_at during optimistic edit of a failed message', async () => {
+        const message = channel.state.messages[0];
+        const optimisticStateSpy = jest.fn();
+
+        render(
+          <Chat client={chatClient} enableOfflineSupport>
+            <Channel
+              channel={channel}
+              doUpdateMessageRequest={() => {
+                const optimisticMessage = channel.state.findMessage(message.id);
+                optimisticStateSpy(optimisticMessage);
+
+                return {
+                  message: {
+                    ...optimisticMessage,
+                  },
+                };
+              }}
+            >
+              <CallbackEffectWithContext
+                callback={async ({ editMessage }) => {
+                  await editMessage({
+                    localMessage: {
+                      ...message,
+                      cid: channel.cid,
+                      status: MessageStatusTypes.FAILED,
+                      text: 'edited failed message',
+                    },
+                    options: {},
+                  });
+                }}
+                context={MessageInputContext}
+              >
+                <View testID='children' />
+              </CallbackEffectWithContext>
+            </Channel>
+          </Chat>,
+        );
+
+        await waitFor(() => expect(screen.getByTestId('children')).toBeTruthy());
+
+        await waitFor(() => {
+          expect(optimisticStateSpy).toHaveBeenCalled();
+          expect(optimisticStateSpy.mock.calls[0][0].message_text_updated_at).toBeUndefined();
+        });
+      });
+
       it('should keep the optimistic edit for attachment updates without auto-queueing', async () => {
         const message = channel.state.messages[0];
         const editedText = 'edited attachment message';

package/src/components/Channel/Channel.tsx

@@ -1567,13 +1567,16 @@ const ChannelWithContext = (props: PropsWithChildren<ChannelPropsWithContext>) =
 
       const cid = channel.cid;
       const currentMessage = channel.state.findMessage(localMessage.id, localMessage.parent_id);
+      const isFailedMessage =
+        currentMessage?.status === MessageStatusTypes.FAILED ||
+        localMessage.status === MessageStatusTypes.FAILED;
       const optimisticEditedAt = new Date();
       const optimisticEditedAtString = optimisticEditedAt.toISOString();
       const optimisticMessage = {
         ...currentMessage,
         ...localMessage,
         cid,
-        message_text_updated_at: optimisticEditedAtString,
+        message_text_updated_at: isFailedMessage ? undefined : optimisticEditedAtString,
         updated_at: optimisticEditedAt,
       } as unknown as LocalMessage;
 

package/src/store/apis/updatePendingTask.ts

@@ -6,9 +6,8 @@ import { SqliteClient } from '../SqliteClient';
 
 export const updatePendingTask = async ({ id, task }: DBUpdatePendingTaskType) => {
   const storableTask = mapTaskToStorable(task);
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   const { createdAt, id: taskId, ...nextTask } = storableTask;
-  void createdAt;
-  void taskId;
 
   const query = createUpdateQuery('pendingTasks', nextTask, {
     id,