@messenger-box/platform-mobile 10.0.3-alpha.19 → 10.0.3-alpha.22

package/src/screens/inbox/containers/ThreadConversationView.tsx

@@ -64,10 +64,23 @@ const {
 
 const createdAtText = (value: string) => {
     if (!value) return '';
-    let date = new Date(value);
-    if (isToday(date)) return 'Today';
-    if (isYesterday(date)) return 'Yesterday';
-    return format(new Date(value), 'MMM dd, yyyy');
+
+    try {
+        // Validate the date before processing
+        const timestamp = new Date(value).getTime();
+        if (isNaN(timestamp)) {
+            console.warn(`Invalid date value in createdAtText: ${value}`);
+            return 'Unknown date';
+        }
+
+        let date = new Date(value);
+        if (isToday(date)) return 'Today';
+        if (isYesterday(date)) return 'Yesterday';
+        return format(date, 'MMM dd, yyyy');
+    } catch (error) {
+        console.error(`Error processing date in createdAtText: ${value}`, error);
+        return 'Unknown date';
+    }
 };
 
 // Create a safer version of useMachine to handle potential errors
@@ -296,24 +309,47 @@ function useSafeMachine(machine) {
 
                     // Debug: Log the dates of the messages for troubleshooting
                     if (newMessages.length > 0) {
-                        console.log('First new message date:', new Date(newMessages[0].createdAt).toISOString());
-                        console.log(
-                            'Last new message date:',
-                            new Date(newMessages[newMessages.length - 1].createdAt).toISOString(),
-                        );
+                        try {
+                            console.log(
+                                'First new message date:',
+                                !isNaN(new Date(newMessages[0].createdAt).getTime())
+                                    ? new Date(newMessages[0].createdAt).toISOString()
+                                    : 'Invalid date',
+                            );
+                            console.log(
+                                'Last new message date:',
+                                !isNaN(new Date(newMessages[newMessages.length - 1].createdAt).getTime())
+                                    ? new Date(newMessages[newMessages.length - 1].createdAt).toISOString()
+                                    : 'Invalid date',
+                            );
+                        } catch (error) {
+                            console.error('Error logging new message dates:', error);
+                        }
                     }
 
                     if (prev.context.threadMessages.length > 0) {
-                        console.log(
-                            'First existing message date:',
-                            new Date(prev.context.threadMessages[0].createdAt).toISOString(),
-                        );
-                        console.log(
-                            'Last existing message date:',
-                            new Date(
-                                prev.context.threadMessages[prev.context.threadMessages.length - 1].createdAt,
-                            ).toISOString(),
-                        );
+                        try {
+                            console.log(
+                                'First existing message date:',
+                                !isNaN(new Date(prev.context.threadMessages[0].createdAt).getTime())
+                                    ? new Date(prev.context.threadMessages[0].createdAt).toISOString()
+                                    : 'Invalid date',
+                            );
+                            console.log(
+                                'Last existing message date:',
+                                !isNaN(
+                                    new Date(
+                                        prev.context.threadMessages[prev.context.threadMessages.length - 1].createdAt,
+                                    ).getTime(),
+                                )
+                                    ? new Date(
+                                          prev.context.threadMessages[prev.context.threadMessages.length - 1].createdAt,
+                                      ).toISOString()
+                                    : 'Invalid date',
+                            );
+                        } catch (error) {
+                            console.error('Error logging existing message dates:', error);
+                        }
                     }
 
                     // If no new messages returned but total count says there should be more
@@ -338,7 +374,19 @@ function useSafeMachine(machine) {
                     // GiftedChat expects messages sorted by date (newest first)
                     const sortedMessages = orderBy(
                         combinedMessages,
-                        [(msg) => new Date(msg.createdAt).getTime()],
+                        [
+                            (msg) => {
+                                try {
+                                    // Safely access and convert date
+                                    return !isNaN(new Date(msg.createdAt).getTime())
+                                        ? new Date(msg.createdAt).getTime()
+                                        : 0; // Default to oldest if invalid
+                                } catch (error) {
+                                    console.error(`Error sorting message by date: ${msg.id}`, error);
+                                    return 0; // Default to oldest if error
+                                }
+                            },
+                        ],
                         ['desc'],
                     );
 
@@ -1275,10 +1323,39 @@ const ThreadConversationViewComponent = ({ channelId, postParentId, isPostParent
                     // Generate a unique _id if needed by combining id and createdAt
                     const uniqueId = msg.id || `${Date.now()}-${Math.random().toString(36).substr(2, 9)}`;
 
+                    // Safely create a Date object with validation
+                    let messageDate;
+                    try {
+                        // Check if createdAt is a valid date string
+                        if (msg.createdAt && !isNaN(new Date(msg.createdAt).getTime())) {
+                            messageDate = new Date(msg.createdAt);
+                        } else {
+                            // Use current time as fallback if date is invalid
+                            console.warn(`Invalid date value for message ${msg.id}: ${msg.createdAt}`);
+                            messageDate = new Date();
+                        }
+                    } catch (error) {
+                        console.error(`Error creating date for message ${msg.id}:`, error);
+                        messageDate = new Date(); // Fallback to current time
+                    }
+
+                    // Extract image URL from files data
+                    let imageUrl = null;
+                    if (msg.files?.data && msg.files.data.length > 0) {
+                        const fileData = msg.files.data[0];
+                        if (fileData && fileData.url) {
+                            imageUrl = fileData.url;
+                            console.log('📷 Found image URL for message', msg.id, ':', imageUrl);
+                        }
+                    }
+
+                    // Get the message text without adding "File attachment" for image-only messages
+                    let messageText = msg.message || '';
+
                     let message: IMessageProps = {
                         _id: uniqueId,
-                        text: msg.message || '',
-                        createdAt: new Date(msg.createdAt),
+                        text: messageText,
+                        createdAt: messageDate,
                         user: {
                             _id: msg?.author?.id ?? auth?.profile?.id,
                             name:
@@ -1288,7 +1365,7 @@ const ThreadConversationViewComponent = ({ channelId, postParentId, isPostParent
                             avatar: msg?.author?.picture ?? auth?.profile?.picture,
                         },
                         type: msg?.type || '',
-                        image: msg?.files?.data?.[0]?.url,
+                        image: imageUrl,
                         sent: msg?.isDelivered || true,
                         received: msg?.isRead || false,
                         propsConfiguration: msg?.propsConfiguration,
@@ -1298,16 +1375,37 @@ const ThreadConversationViewComponent = ({ channelId, postParentId, isPostParent
         }
 
         // Sort messages by date (newest first as required by GiftedChat)
-        const sortedMessages = orderBy(res, [(msg) => new Date(msg.createdAt).getTime()], ['desc']);
+        // Use a safer getTime() approach with error handling
+        const sortedMessages = orderBy(
+            res,
+            [
+                (msg) => {
+                    try {
+                        return msg.createdAt instanceof Date ? msg.createdAt.getTime() : new Date().getTime();
+                    } catch (error) {
+                        console.error('Error sorting message by date:', error);
+                        return 0; // Fallback to a default value
+                    }
+                },
+            ],
+            ['desc'],
+        );
 
         // Log message dates to help with debugging
         if (sortedMessages.length > 0) {
-            console.log(
-                'Message date range:',
-                new Date(sortedMessages[sortedMessages.length - 1].createdAt).toISOString(),
-                'to',
-                new Date(sortedMessages[0].createdAt).toISOString(),
-            );
+            try {
+                const firstMsg = sortedMessages[0];
+                const lastMsg = sortedMessages[sortedMessages.length - 1];
+
+                console.log(
+                    'Message date range:',
+                    lastMsg.createdAt instanceof Date ? lastMsg.createdAt.toISOString() : 'invalid date',
+                    'to',
+                    firstMsg.createdAt instanceof Date ? firstMsg.createdAt.toISOString() : 'invalid date',
+                );
+            } catch (error) {
+                console.error('Error logging message date range:', error);
+            }
         }
 
         return sortedMessages;
@@ -1351,6 +1449,8 @@ const ThreadConversationViewComponent = ({ channelId, postParentId, isPostParent
 
     const renderMessageText = (props: any) => {
         const { currentMessage } = props;
+
+        // For ALERT type messages with call to action
         if (currentMessage.type === 'ALERT') {
             const attachment = currentMessage?.propsConfiguration?.contents?.attachment;
             let action: string = '';
@@ -1406,7 +1506,14 @@ const ThreadConversationViewComponent = ({ channelId, postParentId, isPostParent
                     )}
                 </>
             );
-        } else {
+        }
+        // For file attachment messages, don't show the "File attachment" text
+        else if (currentMessage.text === '📎 File attachment') {
+            // Return null to not render any text for these messages
+            return null;
+        }
+        // Default text rendering
+        else {
             return <MessageText {...props} textStyle={{ left: { marginLeft: 5 } }} />;
         }
     };
@@ -1943,10 +2050,19 @@ const ThreadConversationViewComponent = ({ channelId, postParentId, isPostParent
                                         </Text>
                                         <Text className="pl-0 color-gray-500">
                                             {createdAtText(safeContextProperty('threadPost')[0]?.createdAt)} at{' '}
-                                            {format(
-                                                new Date(safeContextProperty('threadPost')[0]?.createdAt),
-                                                'hh:ss:a',
-                                            )}
+                                            {(() => {
+                                                try {
+                                                    const createdAt = safeContextProperty('threadPost')[0]?.createdAt;
+                                                    if (createdAt && !isNaN(new Date(createdAt).getTime())) {
+                                                        return format(new Date(createdAt), 'hh:mm:a');
+                                                    } else {
+                                                        return 'unknown time';
+                                                    }
+                                                } catch (error) {
+                                                    console.error('Error formatting thread post time:', error);
+                                                    return 'unknown time';
+                                                }
+                                            })()}
                                         </Text>
                                     </Box>
                                 </HStack>