fix: giphy with reply channel preview

Author: isekovanic

package/src/components/ChannelPreview/__tests__/ChannelLastMessagePreview.test.tsx

@@ -0,0 +1,32 @@
+import React from 'react';
+
+import { render } from '@testing-library/react-native';
+
+import { generateGiphyAttachment } from '../../../mock-builders/generator/attachment';
+import { generateMessage } from '../../../mock-builders/generator/message';
+import { generateUser } from '../../../mock-builders/generator/user';
+import { getTestClientWithUser } from '../../../mock-builders/mock';
+import { Chat } from '../../Chat/Chat';
+import { ChannelLastMessagePreview } from '../ChannelLastMessagePreview';
+
+describe('ChannelLastMessagePreview', () => {
+  it('shows Giphy instead of slash-command text for giphy attachments with quoted replies', async () => {
+    const client = await getTestClientWithUser({ id: 'preview-user' });
+    const user = generateUser();
+    const message = generateMessage({
+      attachments: [generateGiphyAttachment()],
+      quoted_message: generateMessage({ text: 'quoted message', user }),
+      text: '/giphy Cat',
+      user,
+    });
+
+    const { getByText, queryByText } = render(
+      <Chat client={client}>
+        <ChannelLastMessagePreview message={message} />
+      </Chat>,
+    );
+
+    expect(getByText('Giphy')).toBeTruthy();
+    expect(queryByText('/giphy Cat')).toBeNull();
+  });
+});

package/src/hooks/messagePreview/useMessagePreviewText.tsx

@@ -35,7 +35,6 @@ export const useMessagePreviewText = ({
   const onlyAudio = audios?.length === attachmentsLength;
   const onlyVoiceRecordings =
     voiceRecordings?.length && voiceRecordings?.length === attachmentsLength;
-
   if (message?.type === 'deleted') {
     return 'Message deleted';
   }
@@ -55,8 +54,12 @@ export const useMessagePreviewText = ({
     return 'Location';
   }
 
+  if (giphys?.length) {
+    return 'Giphy';
+  }
+
   if (message?.text) {
-    return message?.text;
+    return message.text;
   }
 
   if (onlyImages) {
@@ -91,10 +94,6 @@ export const useMessagePreviewText = ({
     }
   }
 
-  if (giphys?.length) {
-    return 'Giphy';
-  }
-
   if (onlyFiles && files?.length === 1) {
     return files?.[0]?.title;
   }