stream-chat-react-native-core 5.24.0-beta.2 → 5.24.0-beta.4

package/lib/typescript/i18n/ru.json

@@ -1,21 +1,23 @@
 {
-    "1 Reply": "1 Ответ",
-    "1 Thread Reply": "1 тема Ответить",
-    "Allow access to your Gallery": "Разрешить доступ к вашей галерее",
-    "Allow camera access in device settings": "Разрешите доступ к камере в настройках устройства.",
-    "Also send to channel": "",
+    "1 Reply": "",
+    "1 Thread Reply": "",
+    "Allow access to your Gallery": "",
+    "Allow camera access in device settings": "",
+    "Also send to channel": "Также отправить на канал",
     "Are you sure you want to permanently delete this message?": "Вы действительно хотите удалить это сообщение без возможности восстановления?",
+    "Are you sure?": "Вы уверены?",
     "Block User": "Заблокировать пользователя",
     "Cancel": "Отмена",
     "Cannot Flag Message": "Невозможно пожаловаться на сообщение",
+    "Consider how your comment might make others feel and be sure to follow our Community Guidelines": "Обдумайте, как ваш комментарий может повлиять на других, и убедитесь, что вы следуете нашим правилам сообщества",
     "Copy Message": "Копировать сообщение",
     "Delete": "удалять",
     "Delete Message": "Удалить сообщение",
-    "Device camera is used to take photos or videos.": "Камера устройства используется для съемки фотографий или видео.",
+    "Device camera is used to take photos or videos.": "",
     "Do you want to send a copy of this message to a moderator for further investigation?": "Вы хотите отправить копию этого сообщения модератору для дальнейшего изучения?",
     "Edit Message": "Редактировать сообщение",
-    "Editing Message": "Редактирование сообщения",
-    "Emoji matching": "Соответствие эмодзи",
+    "Editing Message": "",
+    "Emoji matching": "",
     "Empty message...": "",
     "Error loading": "",
     "Error loading channel list...": "",
@@ -26,14 +28,14 @@
     "Flag Message": "Пометить сообщение",
     "Flag action failed either due to a network issue or the message is already flagged": "Не удалось отправить жалобу. Возможные причины: проблема с подключением к интернету или ваша жалоба уже была принята.",
     "How about sending your first message to a friend?": "",
-    "Instant Commands": "Мгновенные Команды",
+    "Instant Commands": "",
     "Let's start chatting!": "",
     "Links are disabled": "Ссылки отключены",
-    "Loading channels...": "Загружаю каналы...",
-    "Loading messages...": "Загружаю сообщения...",
-    "Loading...": "Загружаю...",
+    "Loading channels...": "",
+    "Loading messages...": "",
+    "Loading...": "",
     "Maximum file size upload limit reached. Please upload a file below {{MAX_FILE_SIZE_TO_UPLOAD_IN_MB}} MB.": "Достигнут предел максимального размера файла для загрузки. Загрузите файл размером менее {{MAX_FILE_SIZE_TO_UPLOAD_IN_MB}} МБ.",
-    "Message Reactions": "Сообщения Реакции",
+    "Message Reactions": "",
     "Message deleted": "",
     "Message flagged": "Сообщение отмечено",
     "Mute User": "Отключить пользователя",
@@ -41,36 +43,37 @@
     "Nothing yet...": "",
     "Ok": "Oк",
     "Only visible to you": "",
-    "Open Settings": "Открыть настройки",
-    "Photo": "Фото",
-    "Photos and Videos": "Фото и видео",
+    "Open Settings": "",
+    "Photo": "",
+    "Photos and Videos": "",
     "Pin to Conversation": "Закрепить к беседе",
     "Pinned by": "",
-    "Please enable access to your photos and videos so you can share them.": "Разрешите доступ к своим фотографиям и видео, чтобы вы могли ими поделиться.",
+    "Please enable access to your photos and videos so you can share them.": "",
     "Please select a channel first": "Пожалуйста, сначала выберите канал",
     "Reconnecting...": "",
     "Reply": "Ответить",
     "Reply to Message": "",
     "Resend": "Отправить",
     "Search GIFs": "",
-    "Select More Photos": "Выбрать больше фотографий",
+    "Select More Photos": "",
+    "Send Anyway": "Всё равно отправить",
     "Send a message": "",
     "Sending links is not allowed in this conversation": "Отправка ссылок недоступна в этом чате",
     "Slow mode ON": "",
     "The message has been reported to a moderator.": "Сообщение отправлено модератору.",
     "Thread Reply": "Тема Ответить",
     "Unblock User": "Разблокировать пользователя",
-    "Unknown User": "Неизвестный пользователь",
+    "Unknown User": "",
     "Unmute User": "Включить микрофон",
     "Unpin from Conversation": "Открепить от беседы",
-    "Unread Messages": "",
-    "Video": "видео",
+    "Unread Messages": "Непрочитанные Сообщения",
+    "Video": "",
     "You": "",
-    "You can't send messages in this channel": "",
+    "You can't send messages in this channel": "Вы не можете отправлять сообщения в этот канал",
     "{{ firstUser }} and {{ nonSelfUserLength }} more are typing": "",
-    "{{ index }} of {{ photoLength }}": "{{ index }} из {{ photoLength }}",
-    "{{ replyCount }} Replies": "{{ replyCount }} Ответов",
-    "{{ replyCount }} Thread Replies": "{{replyCount}} Ответы в темах",
+    "{{ index }} of {{ photoLength }}": "",
+    "{{ replyCount }} Replies": "",
+    "{{ replyCount }} Thread Replies": "",
     "{{ user }} is typing": "",
     "🏙 Attachment...": ""
 }

package/lib/typescript/i18n/tr.json

@@ -1,21 +1,23 @@
 {
-    "1 Reply": "1 Cevap",
-    "1 Thread Reply": "1 Konu Yanıtı",
-    "Allow access to your Gallery": "Galerinize erişime izin verin",
-    "Allow camera access in device settings": "Cihaz ayarlarında kamera erişimine izin ver",
-    "Also send to channel": "",
+    "1 Reply": "",
+    "1 Thread Reply": "",
+    "Allow access to your Gallery": "",
+    "Allow camera access in device settings": "",
+    "Also send to channel": "Kanala da gönder",
     "Are you sure you want to permanently delete this message?": "Bu mesajı kalıcı olarak silmek istediğinizden emin misiniz?",
+    "Are you sure?": "Emin misiniz?",
     "Block User": "Kullanıcıyı engelle",
     "Cancel": "İptal",
     "Cannot Flag Message": "Raporlama Başarısız",
+    "Consider how your comment might make others feel and be sure to follow our Community Guidelines": "Yorumunuzun diğerlerini nasıl hissettirebileceğini düşünün ve topluluk kurallarımızı takip ettiğinizden emin olun",
     "Copy Message": "Mesajı Kopyala",
     "Delete": "Sil",
     "Delete Message": "Mesajı Sil",
-    "Device camera is used to take photos or videos.": "Cihaz kamerası fotoğraf veya video çekmek için kullanılır.",
+    "Device camera is used to take photos or videos.": "",
     "Do you want to send a copy of this message to a moderator for further investigation?": "Detaylı inceleme için bu mesajın kopyasını moderatöre göndermek istiyor musunuz?",
     "Edit Message": "Mesajı Düzenle",
-    "Editing Message": "Mesaj Düzenleniyor",
-    "Emoji matching": "Emoji eşleştirme",
+    "Editing Message": "",
+    "Emoji matching": "",
     "Empty message...": "",
     "Error loading": "",
     "Error loading channel list...": "",
@@ -26,14 +28,14 @@
     "Flag Message": "Mesajı Raporla",
     "Flag action failed either due to a network issue or the message is already flagged": "Mesajın daha önce raporlanmış olması veya bir ağ bağlantısı sorunu nedeniyle raporlama işlemi başarısız oldu.",
     "How about sending your first message to a friend?": "",
-    "Instant Commands": "Anlık Komutlar",
+    "Instant Commands": "",
     "Let's start chatting!": "",
     "Links are disabled": "Bağlantılar devre dışı",
-    "Loading channels...": "Kanallar yükleniyor...",
-    "Loading messages...": "Mesajlar yükleniyor...",
-    "Loading...": "Yükleniyor...",
+    "Loading channels...": "",
+    "Loading messages...": "",
+    "Loading...": "",
     "Maximum file size upload limit reached. Please upload a file below {{MAX_FILE_SIZE_TO_UPLOAD_IN_MB}} MB.": "Maksimum dosya boyutu yükleme sınırına ulaşıldı. Lütfen {{MAX_FILE_SIZE_TO_UPLOAD_IN_MB}} MB'ın altında bir dosya yükleyin.",
-    "Message Reactions": "Mesaj Tepkileri",
+    "Message Reactions": "",
     "Message deleted": "",
     "Message flagged": "Mesaj işaretlendi",
     "Mute User": "Kullanıcıyı sessize al",
@@ -41,36 +43,37 @@
     "Nothing yet...": "",
     "Ok": "Tamam",
     "Only visible to you": "",
-    "Open Settings": "Ayarları aç",
-    "Photo": "Fotoğraf",
-    "Photos and Videos": "Fotoğraflar ve Videolar",
+    "Open Settings": "",
+    "Photo": "",
+    "Photos and Videos": "",
     "Pin to Conversation": "Konuşmaya sabitle",
     "Pinned by": "",
-    "Please enable access to your photos and videos so you can share them.": "Paylaşım yapabilmek için lutfen fotoğraflarınıza ve videolarınıza erişimi etkinleştirin.",
+    "Please enable access to your photos and videos so you can share them.": "",
     "Please select a channel first": "Lütfen önce bir kanal seçiniz",
     "Reconnecting...": "",
     "Reply": "Yanıtla",
     "Reply to Message": "",
     "Resend": "Yeniden gönder",
     "Search GIFs": "",
-    "Select More Photos": "Daha Fazla Fotoğraf Seçin",
+    "Select More Photos": "",
+    "Send Anyway": "Yine de Gönder",
     "Send a message": "",
     "Sending links is not allowed in this conversation": "Bu konuşmada bağlantı göndermek desteklenmiyor",
     "Slow mode ON": "",
     "The message has been reported to a moderator.": "Mesaj moderatöre bildirildi.",
     "Thread Reply": "Konu Yanıtı",
     "Unblock User": "Kullanıcının engelini kaldır",
-    "Unknown User": "Bilinmeyen kullanıcı",
+    "Unknown User": "",
     "Unmute User": "Kullanıcının sesini aç",
     "Unpin from Conversation": "Sabitlemeyi kaldır",
-    "Unread Messages": "",
-    "Video": "Video",
+    "Unread Messages": "Okunmamış Mesajlar",
+    "Video": "",
     "You": "",
-    "You can't send messages in this channel": "",
+    "You can't send messages in this channel": "Bu konuşmaya mesaj gönderemezsiniz",
     "{{ firstUser }} and {{ nonSelfUserLength }} more are typing": "",
-    "{{ index }} of {{ photoLength }}": "{{ index }} / {{ photoLength }}",
-    "{{ replyCount }} Replies": "{{ replyCount }} Cevap",
-    "{{ replyCount }} Thread Replies": "{{responseCount}} Konu Cevapı",
+    "{{ index }} of {{ photoLength }}": "",
+    "{{ replyCount }} Replies": "",
+    "{{ replyCount }} Thread Replies": "",
     "{{ user }} is typing": "",
     "🏙 Attachment...": ""
 }

package/lib/typescript/utils/Streami18n.d.ts

@@ -119,9 +119,11 @@ export declare class Streami18n {
                 "Allow camera access in device settings": string;
                 "Also send to channel": string;
                 "Are you sure you want to permanently delete this message?": string;
+                "Are you sure?": string;
                 "Block User": string;
                 Cancel: string;
                 "Cannot Flag Message": string;
+                "Consider how your comment might make others feel and be sure to follow our Community Guidelines": string;
                 "Copy Message": string;
                 Delete: string;
                 "Delete Message": string;
@@ -168,6 +170,7 @@ export declare class Streami18n {
                 Resend: string;
                 "Search GIFs": string;
                 "Select More Photos": string;
+                "Send Anyway": string;
                 "Send a message": string;
                 "Sending links is not allowed in this conversation": string;
                 "Slow mode ON": string;

package/lib/typescript/utils/removeReservedFields.d.ts

@@ -1,3 +1,4 @@
+import type { MessageResponse } from 'stream-chat';
 import type { MessageType } from '../components/MessageList/hooks/useMessageList';
 import type { DefaultStreamChatGenerics } from '../types/types';
-export declare const removeReservedFields: <StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics>(message: MessageType<StreamChatGenerics>) => MessageType<StreamChatGenerics>;
+export declare const removeReservedFields: <StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics>(message: MessageType<StreamChatGenerics> | MessageResponse<StreamChatGenerics>) => MessageType<StreamChatGenerics> | MessageResponse<StreamChatGenerics>;

package/lib/typescript/utils/utils.d.ts

@@ -33,7 +33,18 @@ export declare const MessageStatusTypes: {
 export declare type FileStateValue = typeof FileState[keyof typeof FileState];
 declare type Progress = ValueOf<typeof ProgressIndicatorTypes>;
 export declare const getIndicatorTypeForFileState: (fileState: FileStateValue, enableOfflineSupport: boolean) => Progress | null;
+/**
+ * Utility to check if the message is a Blocked message.
+ * @param message
+ * @returns boolean
+ */
 export declare const isBlockedMessage: <StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics>(message: TableRowJoinedUser<"messages"> | MessageType<StreamChatGenerics>) => boolean | "" | undefined;
+/**
+ *  Utility to check if the message is a Bounced message.
+ * @param message
+ * @returns boolean
+ */
+export declare const isBouncedMessage: <StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics>(message: MessageType<StreamChatGenerics>) => boolean;
 export declare const queryMembersDebounced: DebouncedFunc<(<StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics>(channel: Channel<StreamChatGenerics>, query: SuggestionUser<StreamChatGenerics>["name"], onReady?: ((users: SuggestionUser<StreamChatGenerics>[]) => void) | undefined, options?: {
     limit?: number;
 }) => Promise<void>)>;
@@ -110,7 +121,6 @@ export declare const getUrlWithoutParams: (url?: string | undefined) => string |
 export declare const isLocalUrl: (url: string) => boolean;
 export declare const generateRandomId: (a?: string) => string;
 export declare const hasOnlyEmojis: (text: string) => boolean;
-export declare const urlRegex: RegExp;
 /**
  * Reduces a list of messages to strings that are used in useEffect & useMemo
  * @param {messages} messages - the array of messages to be compared

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "stream-chat-react-native-core",
   "description": "The official React Native and Expo components for Stream Chat, a service for building chat applications",
-  "version": "5.24.0-beta.2",
+  "version": "5.24.0-beta.4",
   "author": {
     "company": "Stream.io Inc",
     "name": "Stream.io Inc"
@@ -80,7 +80,7 @@
     "path": "0.12.7",
     "react-native-markdown-package": "1.8.2",
     "react-native-url-polyfill": "^1.3.0",
-    "stream-chat": "8.14.4"
+    "stream-chat": "8.15.0"
   },
   "peerDependencies": {
     "react-native-quick-sqlite": ">=5.1.0",

package/src/components/Channel/Channel.tsx

@@ -82,7 +82,14 @@ import { compressedImageURI } from '../../utils/compressImage';
 import { DBSyncManager } from '../../utils/DBSyncManager';
 import { patchMessageTextCommand } from '../../utils/patchMessageTextCommand';
 import { removeReactionFromLocalState } from '../../utils/removeReactionFromLocalState';
-import { generateRandomId, isLocalUrl, MessageStatusTypes, ReactionData } from '../../utils/utils';
+import { removeReservedFields } from '../../utils/removeReservedFields';
+import {
+  generateRandomId,
+  isBouncedMessage,
+  isLocalUrl,
+  MessageStatusTypes,
+  ReactionData,
+} from '../../utils/utils';
 import { Attachment as AttachmentDefault } from '../Attachment/Attachment';
 import { AttachmentActions as AttachmentActionsDefault } from '../Attachment/AttachmentActions';
 import { AudioAttachment as AudioAttachmentDefault } from '../Attachment/AudioAttachment';
@@ -107,6 +114,7 @@ import { LoadingIndicator as LoadingIndicatorDefault } from '../Indicators/Loadi
 import { KeyboardCompatibleView as KeyboardCompatibleViewDefault } from '../KeyboardCompatibleView/KeyboardCompatibleView';
 import { Message as MessageDefault } from '../Message/Message';
 import { MessageAvatar as MessageAvatarDefault } from '../Message/MessageSimple/MessageAvatar';
+import { MessageBounce as MessageBounceDefault } from '../Message/MessageSimple/MessageBounce';
 import { MessageContent as MessageContentDefault } from '../Message/MessageSimple/MessageContent';
 import { MessageDeleted as MessageDeletedDefault } from '../Message/MessageSimple/MessageDeleted';
 import { MessageError as MessageErrorDefault } from '../Message/MessageSimple/MessageError';
@@ -273,6 +281,7 @@ export type ChannelPropsWithContext<
       | 'Message'
       | 'messageActions'
       | 'MessageAvatar'
+      | 'MessageBounce'
       | 'MessageContent'
       | 'messageContentOrder'
       | 'MessageDeleted'
@@ -495,6 +504,7 @@ const ChannelWithContext = <
     Message = MessageDefault,
     messageActions,
     MessageAvatar = MessageAvatarDefault,
+    MessageBounce = MessageBounceDefault,
     MessageContent = MessageContentDefault,
     messageContentOrder = ['quoted_reply', 'gallery', 'files', 'text', 'attachments'],
     MessageDeleted = MessageDeletedDefault,
@@ -564,7 +574,7 @@ const ChannelWithContext = <
     },
   } = useTheme();
   const [deleted, setDeleted] = useState(false);
-  const [editing, setEditing] = useState<boolean | MessageType<StreamChatGenerics>>(false);
+  const [editing, setEditing] = useState<MessageType<StreamChatGenerics> | undefined>(undefined);
   const [error, setError] = useState<Error | boolean>(false);
   const [hasMore, setHasMore] = useState(true);
   const [lastRead, setLastRead] = useState<ChannelContextValue<StreamChatGenerics>['lastRead']>();
@@ -1679,9 +1689,17 @@ const ChannelWithContext = <
       status: MessageStatusTypes.SENDING,
     };
 
-    updateMessage(statusPendingMessage);
+    const messageWithoutReservedFields = removeReservedFields(statusPendingMessage);
+
+    // For bounced messages, we don't need to update the message, instead always send a new message.
+    if (!isBouncedMessage(message)) {
+      updateMessage(messageWithoutReservedFields as MessageResponse<StreamChatGenerics>);
+    }
 
-    await sendMessageRequest(statusPendingMessage, true);
+    await sendMessageRequest(
+      messageWithoutReservedFields as MessageResponse<StreamChatGenerics>,
+      true,
+    );
   };
 
   // hard limit to prevent you from scrolling faster than 1 page per 2 seconds
@@ -1843,10 +1861,10 @@ const ChannelWithContext = <
       : client.updateMessage(updatedMessage);
 
   const setEditingState: MessagesContextValue<StreamChatGenerics>['setEditingState'] = (
-    messageOrBoolean,
+    message,
   ) => {
     clearQuotedMessageState();
-    setEditing(messageOrBoolean);
+    setEditing(message);
   };
 
   const setQuotedMessageState: MessagesContextValue<StreamChatGenerics>['setQuotedMessageState'] = (
@@ -1856,7 +1874,7 @@ const ChannelWithContext = <
   };
 
   const clearEditingState: InputMessageInputContextValue<StreamChatGenerics>['clearEditingState'] =
-    () => setEditing(false);
+    () => setEditing(undefined);
 
   const clearQuotedMessageState: InputMessageInputContextValue<StreamChatGenerics>['clearQuotedMessageState'] =
     () => setQuotedMessage(false);
@@ -2223,6 +2241,7 @@ const ChannelWithContext = <
     Message,
     messageActions,
     MessageAvatar,
+    MessageBounce,
     MessageContent,
     messageContentOrder,
     MessageDeleted,

package/src/components/Channel/hooks/useCreateMessagesContext.ts

@@ -54,6 +54,7 @@ export const useCreateMessagesContext = <
   Message,
   messageActions,
   MessageAvatar,
+  MessageBounce,
   MessageContent,
   messageContentOrder,
   MessageDeleted,
@@ -149,6 +150,7 @@ export const useCreateMessagesContext = <
       Message,
       messageActions,
       MessageAvatar,
+      MessageBounce,
       MessageContent,
       messageContentOrder,
       MessageDeleted,

package/src/components/ChannelList/hooks/usePaginatedChannels.ts

@@ -168,7 +168,9 @@ export const usePaginatedChannels = <
     await queryChannels('refresh');
   };
 
-  const reloadList = () => queryChannels('reload');
+  const reloadList = async () => {
+    await queryChannels('reload');
+  };
 
   /**
    * Equality check using stringified filters/sort ensure that we don't make un-necessary queryChannels api calls
@@ -219,10 +221,11 @@ export const usePaginatedChannels = <
     if (enableOfflineSupport) {
       // Any time DB is synced, we need to update the UI with local DB channels first,
       // and then call queryChannels to ensure any new channels are added to UI.
-      listener = DBSyncManager.onSyncStatusChange((syncStatus) => {
+      listener = DBSyncManager.onSyncStatusChange(async (syncStatus) => {
         if (syncStatus) {
           loadOfflineChannels();
-          reloadList();
+          await reloadList();
+          setForceUpdate((u) => u + 1);
         }
       });
       // On start, load the channels from local db.

package/src/components/ChannelPreview/ChannelPreview.tsx

@@ -16,7 +16,7 @@ import type { DefaultStreamChatGenerics } from '../../types/types';
 export type ChannelPreviewPropsWithContext<
   StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
 > = Pick<ChatContextValue<StreamChatGenerics>, 'client'> &
-  Pick<ChannelsContextValue<StreamChatGenerics>, 'Preview'> & {
+  Pick<ChannelsContextValue<StreamChatGenerics>, 'Preview' | 'forceUpdate'> & {
     /**
      * The previewed channel
      */
@@ -32,7 +32,7 @@ const ChannelPreviewWithContext = <
 >(
   props: ChannelPreviewPropsWithContext<StreamChatGenerics>,
 ) => {
-  const { channel, client, Preview } = props;
+  const { channel, client, forceUpdate: channelListForceUpdate, Preview } = props;
 
   const [lastMessage, setLastMessage] = useState<
     | ReturnType<ChannelState<StreamChatGenerics>['formatMessage']>
@@ -70,7 +70,7 @@ const ChannelPreviewWithContext = <
 
     const newUnreadCount = channel.countUnread();
     setUnread(newUnreadCount);
-  }, [channelLastMessageString]);
+  }, [channelLastMessageString, channelListForceUpdate]);
 
   useEffect(() => {
     const handleNewMessageEvent = (event: Event<StreamChatGenerics>) => {
@@ -126,7 +126,7 @@ export const ChannelPreview = <
   props: ChannelPreviewProps<StreamChatGenerics>,
 ) => {
   const { client } = useChatContext<StreamChatGenerics>();
-  const { Preview } = useChannelsContext<StreamChatGenerics>();
+  const { forceUpdate, Preview } = useChannelsContext<StreamChatGenerics>();
 
-  return <ChannelPreviewWithContext {...{ client, Preview }} {...props} />;
+  return <ChannelPreviewWithContext {...{ client, forceUpdate, Preview }} {...props} />;
 };

package/src/components/Message/Message.tsx

@@ -1,4 +1,4 @@
-import React, { useMemo } from 'react';
+import React, { useMemo, useState } from 'react';
 import { GestureResponderEvent, Keyboard, StyleProp, View, ViewStyle } from 'react-native';
 
 import type { Attachment, UserResponse } from 'stream-chat';
@@ -44,7 +44,12 @@ import {
 
 import { isVideoPackageAvailable, triggerHaptic } from '../../native';
 import type { DefaultStreamChatGenerics } from '../../types/types';
-import { hasOnlyEmojis, isBlockedMessage, MessageStatusTypes } from '../../utils/utils';
+import {
+  hasOnlyEmojis,
+  isBlockedMessage,
+  isBouncedMessage,
+  MessageStatusTypes,
+} from '../../utils/utils';
 
 import {
   isMessageWithStylesReadByAndDateSeparator,
@@ -141,6 +146,7 @@ export type MessagePropsWithContext<
     | 'isAttachmentEqual'
     | 'messageActions'
     | 'messageContentOrder'
+    | 'MessageBounce'
     | 'MessageSimple'
     | 'onLongPressMessage'
     | 'onPressInMessage'
@@ -217,6 +223,7 @@ const MessageWithContext = <
 >(
   props: MessagePropsWithContext<StreamChatGenerics>,
 ) => {
+  const [isBounceDialogOpen, setIsBounceDialogOpen] = useState(false);
   const isMessageTypeDeleted = props.message.type === 'deleted';
 
   const {
@@ -249,6 +256,7 @@ const MessageWithContext = <
     messageActions: messageActionsProp = defaultMessageActions,
     messageContentOrder: messageContentOrderProp,
     messagesContext,
+    MessageBounce,
     MessageSimple,
     onLongPress: onLongPressProp,
     onLongPressMessage: onLongPressMessageProp,
@@ -319,9 +327,19 @@ const MessageWithContext = <
     }
     const quotedMessage = message.quoted_message as MessageType<StreamChatGenerics>;
     if (error) {
+      /**
+       * If its a Blocked message, we don't do anything as per specs.
+       */
       if (isBlockedMessage(message)) {
         return;
       }
+      /**
+       * If its a Bounced message, we open the message bounced options modal.
+       */
+      if (isBouncedMessage(message)) {
+        setIsBounceDialogOpen(true);
+        return;
+      }
       showMessageOverlay(false, true);
     } else if (quotedMessage) {
       onPressQuotedMessage(quotedMessage);
@@ -622,6 +640,11 @@ const MessageWithContext = <
           })
       : enableLongPress
       ? () => {
+          // If a message is bounced, on long press the message bounce options modal should open.
+          if (isBouncedMessage(message)) {
+            setIsBounceDialogOpen(true);
+            return;
+          }
           triggerHaptic('impactMedium');
           showMessageOverlay(false);
         }
@@ -730,6 +753,7 @@ const MessageWithContext = <
         >
           <MessageProvider value={messageContext}>
             <MessageSimple />
+            {isBounceDialogOpen && <MessageBounce setIsBounceDialogOpen={setIsBounceDialogOpen} />}
           </MessageProvider>
         </View>
       </View>

package/src/components/Message/MessageSimple/MessageBounce.tsx

@@ -0,0 +1,119 @@
+import React from 'react';
+import { Alert } from 'react-native';
+
+import {
+  MessageContextValue,
+  useMessageContext,
+} from '../../../contexts/messageContext/MessageContext';
+import {
+  MessagesContextValue,
+  useMessagesContext,
+} from '../../../contexts/messagesContext/MessagesContext';
+import { useTranslationContext } from '../../../contexts/translationContext/TranslationContext';
+
+import type { DefaultStreamChatGenerics } from '../../../types/types';
+
+export type MessageBouncePropsWithContext<
+  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
+> = Pick<
+  MessagesContextValue<StreamChatGenerics>,
+  'setEditingState' | 'removeMessage' | 'retrySendMessage'
+> &
+  Pick<MessageContextValue<StreamChatGenerics>, 'message'> & {
+    setIsBounceDialogOpen: React.Dispatch<React.SetStateAction<boolean>>;
+  };
+
+export const MessageBounceWithContext = <
+  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
+>(
+  props: MessageBouncePropsWithContext<StreamChatGenerics>,
+) => {
+  const { t } = useTranslationContext();
+  const { message, removeMessage, retrySendMessage, setEditingState, setIsBounceDialogOpen } =
+    props;
+
+  const handleEditMessage = () => {
+    setEditingState(message);
+    if (setIsBounceDialogOpen) {
+      setIsBounceDialogOpen(false);
+    }
+  };
+
+  const handleResend = () => {
+    retrySendMessage(message);
+    if (setIsBounceDialogOpen) {
+      setIsBounceDialogOpen(false);
+    }
+  };
+
+  const handleRemoveMessage = () => {
+    removeMessage(message);
+    if (setIsBounceDialogOpen) {
+      setIsBounceDialogOpen(false);
+    }
+  };
+
+  return (
+    <>
+      {Alert.alert(
+        t('Are you sure?'),
+        t(
+          'Consider how your comment might make others feel and be sure to follow our Community Guidelines',
+        ),
+        [
+          { onPress: handleResend, text: t('Send Anyway') },
+          { onPress: handleEditMessage, text: t('Edit Message') },
+          { onPress: handleRemoveMessage, text: t('Delete Message') },
+        ],
+        { cancelable: true },
+      )}
+    </>
+  );
+};
+
+const areEqual = <StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics>(
+  prevProps: MessageBouncePropsWithContext<StreamChatGenerics>,
+  nextProps: MessageBouncePropsWithContext<StreamChatGenerics>,
+) => {
+  const { message: prevMessage } = prevProps;
+  const { message: nextMessage } = nextProps;
+  const messageEqual =
+    prevMessage.cid === nextMessage.cid &&
+    prevMessage.type === nextMessage.type &&
+    prevMessage.text === nextMessage.text;
+  if (!messageEqual) return false;
+
+  return true;
+};
+
+const MemoizedMessageBounce = React.memo(
+  MessageBounceWithContext,
+  areEqual,
+) as typeof MessageBounceWithContext;
+
+export type MessageBounceProps<
+  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
+> = Partial<MessageBouncePropsWithContext<StreamChatGenerics>> & {
+  setIsBounceDialogOpen: React.Dispatch<React.SetStateAction<boolean>>;
+};
+
+export const MessageBounce = <
+  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
+>(
+  props: MessageBounceProps<StreamChatGenerics>,
+) => {
+  const { message } = useMessageContext<StreamChatGenerics>();
+  const { removeMessage, retrySendMessage, setEditingState } =
+    useMessagesContext<StreamChatGenerics>();
+  return (
+    <MemoizedMessageBounce<StreamChatGenerics>
+      {...{
+        message,
+        removeMessage,
+        retrySendMessage,
+        setEditingState,
+      }}
+      {...props}
+    />
+  );
+};