瀏覽代碼

reply fixes

Viktoriia 1 周之前
父節點
當前提交
3ed25355e4

+ 21 - 1
src/screens/InAppScreens/MessagesScreen/ChatScreen/index.tsx

@@ -1659,6 +1659,26 @@ const ChatScreen = ({ route }: { route: any }) => {
       return null;
     }
 
+    let replyText = currentMessage.replyMessage.text;
+
+    const replyMsg = giftedMessages.find((m) => m._id === currentMessage.replyMessage?.id);
+
+    if (replyMsg && replyMsg?.attachment && replyMsg?.attachment?.filename) {
+      replyText = replyMsg.attachment.filename;
+    }
+
+    if (replyMsg && replyMsg.image) {
+      replyText = '🏞️photo';
+    }
+
+    if (replyMsg && replyMsg.video) {
+      replyText = '📽️video';
+    }
+
+    if (replyMsg && replyMsg.attachment?.filetype === 'nomadmania/location') {
+      replyText = '📍location';
+    }
+
     return (
       <TouchableOpacity
         style={[
@@ -1692,7 +1712,7 @@ const ChatScreen = ({ route }: { route: any }) => {
               { color: currentMessage.user._id === id ? Colors.DARK_BLUE : Colors.WHITE }
             ]}
           >
-            {currentMessage.replyMessage.text}
+            {replyText}
           </Text>
         </View>
       </TouchableOpacity>

+ 21 - 5
src/screens/InAppScreens/MessagesScreen/Components/ReplyMessageBar.tsx

@@ -22,11 +22,27 @@ const ReplyMessageBar = ({
 }: ReplyMessageBarProps) => {
   if (!message && !editingMessage) return null;
 
-  const text = editingMessage
-    ? editingMessage.text
-    : message?.attachment && message?.attachment?.filename
-      ? message.attachment.filename
-      : message?.text;
+  let text = editingMessage ? editingMessage.text : message?.text;
+
+  if (!editingMessage && message?.attachment && message?.attachment?.filename) {
+    text = message.attachment.filename;
+  }
+
+  if (!editingMessage && message?.image) {
+    text = '🏞️photo';
+  }
+
+  if (!editingMessage && message?.video) {
+    text = '📽️video';
+  }
+
+  if (
+    !editingMessage &&
+    message?.attachment &&
+    message?.attachment?.filetype === 'nomadmania/location'
+  ) {
+    text = '📍location';
+  }
 
   return (
     <Animated.View

+ 22 - 2
src/screens/InAppScreens/MessagesScreen/GroupChatScreen/index.tsx

@@ -1789,6 +1789,26 @@ const GroupChatScreen = ({ route }: { route: any }) => {
       return null;
     }
 
+    let replyText = replaceMentionsWithNames(currentMessage.replyMessage.text);
+
+    const replyMsg = giftedMessages.find((m) => m._id === currentMessage.replyMessage?.id);
+
+    if (replyMsg && replyMsg?.attachment && replyMsg?.attachment?.filename) {
+      replyText = replyMsg.attachment.filename;
+    }
+
+    if (replyMsg && replyMsg.image) {
+      replyText = '🏞️photo';
+    }
+
+    if (replyMsg && replyMsg.video) {
+      replyText = '📽️video';
+    }
+
+    if (replyMsg && replyMsg.attachment?.filetype === 'nomadmania/location') {
+      replyText = '📍location';
+    }
+
     return (
       <TouchableOpacity
         style={[
@@ -1829,7 +1849,7 @@ const GroupChatScreen = ({ route }: { route: any }) => {
               }
             ]}
           >
-            {replaceMentionsWithNames(currentMessage.replyMessage.text)}
+            {replyText}
           </Text>
         </View>
       </TouchableOpacity>
@@ -2149,7 +2169,7 @@ const GroupChatScreen = ({ route }: { route: any }) => {
         <TextInput
           ref={textInputRef}
           multiline
-          textAlignVertical="center" 
+          textAlignVertical="center"
           placeholder=""
           value={props.text}
           onChangeText={props.onTextChanged}