Merge pull request #675 from GetStream/vishal/content-map

added quoted_reply to messageContentOrder

Author: vishalnarkhede

src/components/Channel/Channel.tsx

@@ -487,7 +487,13 @@ const ChannelWithContext = <
     messageActions,
     MessageAvatar = MessageAvatarDefault,
     MessageContent = MessageContentDefault,
-    messageContentOrder = ['gallery', 'files', 'text', 'attachments'],
+    messageContentOrder = [
+      'quoted_reply',
+      'gallery',
+      'files',
+      'text',
+      'attachments',
+    ],
     MessageDeleted = MessageDeletedDefault,
     MessageFooter = MessageFooterDefault,
     MessageHeader,

src/components/Message/MessageSimple/MessageContent.tsx

@@ -337,14 +337,20 @@ const MessageContentWithContext = <
           ]}
           testID='message-content-wrapper'
         >
-          {message.quoted_message && quotedRepliesEnabled && (
-            <View style={[styles.replyContainer, replyContainer]}>
-              <Reply styles={{ messageContainer: { maxWidth: vw(60) } }} />
-            </View>
-          )}
           {messageContentOrder.map(
             (messageContentType, messageContentOrderIndex) => {
               switch (messageContentType) {
+                case 'quoted_reply':
+                  return (
+                    message.quoted_message &&
+                    quotedRepliesEnabled && (
+                      <View style={[styles.replyContainer, replyContainer]}>
+                        <Reply
+                          styles={{ messageContainer: { maxWidth: vw(60) } }}
+                        />
+                      </View>
+                    )
+                  );
                 case 'attachments':
                   return otherAttachments.map((attachment, attachmentIndex) => (
                     <Attachment

src/contexts/messagesContext/MessagesContext.tsx

@@ -63,7 +63,12 @@ export type MessagesConfig = {
   threadRepliesEnabled?: boolean;
 };
 
-export type MessageContentType = 'attachments' | 'files' | 'gallery' | 'text';
+export type MessageContentType =
+  | 'attachments'
+  | 'files'
+  | 'gallery'
+  | 'quoted_reply'
+  | 'text';
 
 export type MessagesContextValue<
   At extends UnknownType = DefaultAttachmentType,