@planningcenter/chat-react-native 3.2.0-rc.24 → 3.2.0-rc.25

package/build/screens/conversation_screen.d.ts

@@ -1,5 +1,6 @@
 import { StaticScreenProps } from '@react-navigation/native';
 import React from 'react';
+import { MessageResource } from '../types';
 type ConversationRouteProps = {
     conversation_id: number;
     chat_group_graph_id?: string;
@@ -7,5 +8,11 @@ type ConversationRouteProps = {
 };
 export type ConversationScreenProps = StaticScreenProps<ConversationRouteProps>;
 export declare function ConversationScreen({ route }: ConversationScreenProps): React.JSX.Element;
+export type DateSeparator = {
+    type: 'DateSeparator';
+    id: string;
+    date: string;
+};
+export declare const groupMessages: (ms: MessageResource[]) => (MessageResource | DateSeparator)[];
 export {};
 //# sourceMappingURL=conversation_screen.d.ts.map

package/build/screens/conversation_screen.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"conversation_screen.d.ts","sourceRoot":"","sources":["../../src/screens/conversation_screen.tsx"],"names":[],"mappings":"AACA,OAAO,EACL,iBAAiB,EAIlB,MAAM,0BAA0B,CAAA;AACjC,OAAO,KAAiC,MAAM,OAAO,CAAA;AAUrD,KAAK,sBAAsB,GAAG;IAC5B,eAAe,EAAE,MAAM,CAAA;IACvB,mBAAmB,CAAC,EAAE,MAAM,CAAA;IAC5B,WAAW,CAAC,EAAE,OAAO,CAAA;CACtB,CAAA;AAED,MAAM,MAAM,uBAAuB,GAAG,iBAAiB,CAAC,sBAAsB,CAAC,CAAA;AAE/E,wBAAgB,kBAAkB,CAAC,EAAE,KAAK,EAAE,EAAE,uBAAuB,qBA0CpE"}
+{"version":3,"file":"conversation_screen.d.ts","sourceRoot":"","sources":["../../src/screens/conversation_screen.tsx"],"names":[],"mappings":"AAGA,OAAO,EACL,iBAAiB,EAIlB,MAAM,0BAA0B,CAAA;AAEjC,OAAO,KAAiC,MAAM,OAAO,CAAA;AAUrD,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAG1C,KAAK,sBAAsB,GAAG;IAC5B,eAAe,EAAE,MAAM,CAAA;IACvB,mBAAmB,CAAC,EAAE,MAAM,CAAA;IAC5B,WAAW,CAAC,EAAE,OAAO,CAAA;CACtB,CAAA;AAED,MAAM,MAAM,uBAAuB,GAAG,iBAAiB,CAAC,sBAAsB,CAAC,CAAA;AAE/E,wBAAgB,kBAAkB,CAAC,EAAE,KAAK,EAAE,EAAE,uBAAuB,qBAiDpE;AAED,MAAM,MAAM,aAAa,GAAG;IAAE,IAAI,EAAE,eAAe,CAAC;IAAC,EAAE,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAA;AAwC/E,eAAO,MAAM,aAAa,OAAQ,eAAe,EAAE,wCAkClD,CAAA"}

package/build/screens/conversation_screen.js

@@ -1,14 +1,19 @@
+// @ts-expect-error
+import { date as formatDate } from '@planningcenter/datetime-fmt';
 import { HeaderTitle, PlatformPressable } from '@react-navigation/elements';
 import { useNavigation, useTheme as useNavigationTheme, useRoute, } from '@react-navigation/native';
+import moment from 'moment';
 import React, { useCallback, useEffect } from 'react';
 import { FlatList, Platform, StyleSheet, View } from 'react-native';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
-import { Badge, Icon } from '../components';
+import { Badge, Icon, Text } from '../components';
 import { Message } from '../components/conversation/message';
 import { MessageForm } from '../components/conversation/message_form';
 import { KeyboardView } from '../components/display/keyboard_view';
+import { useTheme } from '../hooks';
 import { useConversation } from '../hooks/use_conversation';
 import { useConversationMessages } from '../hooks/use_conversation_messages';
+import { getRelativeDateStatus } from '../utils/date';
 export function ConversationScreen({ route }) {
     const styles = useStyles();
     const navigation = useNavigation();
@@ -17,6 +22,7 @@ export function ConversationScreen({ route }) {
     const { messages, refetch, isRefetching, fetchNextPage } = useConversationMessages({
         conversation_id,
     });
+    const messagesWithSeparators = groupMessages(messages);
     // Seems to be necessary to define this way so we get the route picked up
     const headerTitle = useCallback((props) => <PressableHeaderTitle {...props}/>, []);
     useEffect(() => {
@@ -24,7 +30,12 @@ export function ConversationScreen({ route }) {
     }, [conversation, conversation_id, navigation, headerTitle, conversation?.title]);
     return (<View style={styles.container}>
       <KeyboardView style={styles.keyboardView}>
-        <FlatList inverted contentContainerStyle={styles.listContainer} refreshing={isRefetching} onRefresh={refetch} data={messages} keyExtractor={item => item.id} renderItem={({ item }) => <Message {...item} conversation_id={conversation_id}/>} onEndReached={() => fetchNextPage()}/>
+        <FlatList inverted contentContainerStyle={styles.listContainer} refreshing={isRefetching} onRefresh={refetch} data={messagesWithSeparators} keyExtractor={item => item.id} renderItem={({ item }) => {
+            if (item.type === 'DateSeparator') {
+                return <InlineDateSeparator {...item}/>;
+            }
+            return <Message {...item} conversation_id={conversation_id}/>;
+        }} onEndReached={() => fetchNextPage()}/>
         <MessageForm.Root conversation={conversation}>
           {/* <MessageForm.AttachmentPicker /> */}
           <MessageForm.Commands />
@@ -34,6 +45,69 @@ export function ConversationScreen({ route }) {
       </KeyboardView>
     </View>);
 }
+function InlineDateSeparator({ date }) {
+    const styles = useDateSeparatorStyles();
+    const { isThisYear } = getRelativeDateStatus(date);
+    const showYear = !isThisYear;
+    const dateStamp = formatDate(date, { style: 'long', year: showYear });
+    return (<View style={styles.container}>
+      <View style={styles.separator}/>
+      <Text variant="footnote" style={styles.dateText}>
+        {dateStamp}
+      </Text>
+      <View style={styles.separator}/>
+    </View>);
+}
+const useDateSeparatorStyles = () => {
+    const theme = useTheme();
+    return StyleSheet.create({
+        container: {
+            alignItems: 'center',
+            flexDirection: 'row',
+            paddingHorizontal: 16,
+            paddingVertical: 16,
+        },
+        separator: {
+            flex: 1,
+            height: 1,
+            borderTopWidth: 1,
+            borderTopColor: theme.colors.borderColorDefaultBase,
+        },
+        dateText: {
+            paddingHorizontal: 8,
+        },
+    });
+};
+export const groupMessages = (ms) => {
+    let enrichedMessages = [];
+    let encounteredOneOfMyMessages = false;
+    ms.forEach((message, i) => {
+        const prevMessage = ms[i + 1];
+        const nextMessage = ms[i - 1];
+        const date = moment(message.createdAt).format('YYYY-MM-DD');
+        const prevMessageDifferentAuthor = message.author?.id !== prevMessage?.author?.id;
+        const nextMessageDifferentAuthor = message.author?.id !== nextMessage?.author?.id;
+        const prevMessageMoreThan5Minutes = prevMessage &&
+            new Date(message.createdAt).getTime() - new Date(prevMessage.createdAt).getTime() > 60000 * 5;
+        const nextMessageMoreThan5Minutes = nextMessage &&
+            new Date(nextMessage.createdAt).getTime() - new Date(message.createdAt).getTime() > 60000 * 5;
+        if (message.mine && !encounteredOneOfMyMessages) {
+            encounteredOneOfMyMessages = true;
+            message.myLatestInConversation = true;
+        }
+        else {
+            message.myLatestInConversation = false;
+        }
+        message.lastInGroup = !nextMessage || nextMessageDifferentAuthor || nextMessageMoreThan5Minutes;
+        message.renderAuthor =
+            !message.mine && (!prevMessage || prevMessageDifferentAuthor || prevMessageMoreThan5Minutes);
+        enrichedMessages.push(message);
+        if (!prevMessage || date !== moment(prevMessage.createdAt).format('YYYY-MM-DD')) {
+            enrichedMessages.push({ type: 'DateSeparator', id: `day-divider-${message.id}`, date });
+        }
+    });
+    return enrichedMessages;
+};
 const PressableHeaderTitle = ({ style, children }) => {
     const styles = usePressableHeaderStyle();
     const navigation = useNavigation();

package/build/screens/conversation_screen.js.map

@@ -1 +1 @@
-{"version":3,"file":"conversation_screen.js","sourceRoot":"","sources":["../../src/screens/conversation_screen.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAoB,iBAAiB,EAAE,MAAM,4BAA4B,CAAA;AAC7F,OAAO,EAEL,aAAa,EACb,QAAQ,IAAI,kBAAkB,EAC9B,QAAQ,GACT,MAAM,0BAA0B,CAAA;AACjC,OAAO,KAAK,EAAE,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AACrD,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,cAAc,CAAA;AACnE,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAA;AAClE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,eAAe,CAAA;AAC3C,OAAO,EAAE,OAAO,EAAE,MAAM,oCAAoC,CAAA;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,yCAAyC,CAAA;AACrE,OAAO,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAA;AAClE,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAC3D,OAAO,EAAE,uBAAuB,EAAE,MAAM,oCAAoC,CAAA;AAU5E,MAAM,UAAU,kBAAkB,CAAC,EAAE,KAAK,EAA2B;IACnE,MAAM,MAAM,GAAG,SAAS,EAAE,CAAA;IAC1B,MAAM,UAAU,GAAG,aAAa,EAAE,CAAA;IAElC,MAAM,EAAE,eAAe,EAAE,GAAG,KAAK,CAAC,MAAM,CAAA;IACxC,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,GAAG,eAAe,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;IAC5D,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,GAAG,uBAAuB,CAAC;QACjF,eAAe;KAChB,CAAC,CAAA;IAEF,yEAAyE;IACzE,MAAM,WAAW,GAAG,WAAW,CAC7B,CAAC,KAAuB,EAAE,EAAE,CAAC,CAAC,oBAAoB,CAAC,IAAI,KAAK,CAAC,EAAG,EAChE,EAAE,CACH,CAAA;IAED,SAAS,CAAC,GAAG,EAAE;QACb,UAAU,CAAC,UAAU,CAAC,EAAE,WAAW,EAAE,KAAK,EAAE,YAAY,EAAE,KAAK,EAAE,CAAC,CAAA;IACpE,CAAC,EAAE,CAAC,YAAY,EAAE,eAAe,EAAE,UAAU,EAAE,WAAW,EAAE,YAAY,EAAE,KAAK,CAAC,CAAC,CAAA;IAEjF,OAAO,CACL,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAC5B;MAAA,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CACvC;QAAA,CAAC,QAAQ,CACP,QAAQ,CACR,qBAAqB,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,CAC5C,UAAU,CAAC,CAAC,YAAY,CAAC,CACzB,SAAS,CAAC,CAAC,OAAO,CAAC,CACnB,IAAI,CAAC,CAAC,QAAQ,CAAC,CACf,YAAY,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAC9B,UAAU,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,CAAC,eAAe,CAAC,CAAC,eAAe,CAAC,EAAG,CAAC,CAClF,YAAY,CAAC,CAAC,GAAG,EAAE,CAAC,aAAa,EAAE,CAAC,EAEtC;QAAA,CAAC,WAAW,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,YAAY,CAAC,CAC3C;UAAA,CAAC,sCAAsC,CACvC;UAAA,CAAC,WAAW,CAAC,QAAQ,CAAC,AAAD,EACrB;UAAA,CAAC,WAAW,CAAC,SAAS,CAAC,AAAD,EACtB;UAAA,CAAC,WAAW,CAAC,YAAY,CAAC,AAAD,EAC3B;QAAA,EAAE,WAAW,CAAC,IAAI,CACpB;MAAA,EAAE,YAAY,CAChB;IAAA,EAAE,IAAI,CAAC,CACR,CAAA;AACH,CAAC;AAED,MAAM,oBAAoB,GAAG,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAoB,EAAE,EAAE;IACrE,MAAM,MAAM,GAAG,uBAAuB,EAAE,CAAA;IACxC,MAAM,UAAU,GAAG,aAAa,EAAE,CAAA;IAElC,MAAM,KAAK,GAAG,QAAQ,EAAsC,CAAA;IAE5D,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,GAAG,eAAe,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;IAC5D,MAAM,KAAK,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAA;IACtC,MAAM,YAAY,GAAG,KAAK,EAAE,eAAe,IAAI,EAAE,CAAA;IACjD,MAAM,WAAW,GAAG,KAAK,EAAE,OAAO,CAAA;IAClC,MAAM,IAAI,GAAG,KAAK,EAAE,IAAI,IAAI,SAAS,CAAA;IAErC,OAAO,CACL,CAAC,iBAAiB,CAChB,KAAK,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CACxB,OAAO,CAAC,CAAC,GAAG,EAAE,CACZ,UAAU,CAAC,QAAQ,CAAC,qBAAqB,EAAE,EAAE,eAAe,EAAE,YAAY,EAAE,EAAE,EAAE,CAClF,CAAC,CAED;MAAA,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAC/B;QAAA,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,WAAW,CAClE;QAAA,CAAC,IAAI,CAAC,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAC5C;MAAA,EAAE,IAAI,CACN;MAAA,CAAC,KAAK,CACJ,OAAO,CAAC,YAAY,CACpB,eAAe,CAAC,CAAC,WAAW,CAAC,CAC7B,KAAK,CAAC,CAAC,YAAY,CAAC,CACpB,SAAS,CAAC,CAAC,IAAI,CAAC,CAChB,KAAK,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAExB;IAAA,EAAE,iBAAiB,CAAC,CACrB,CAAA;AACH,CAAC,CAAA;AAED,MAAM,uBAAuB,GAAG,GAAG,EAAE;IACnC,OAAO,UAAU,CAAC,MAAM,CAAC;QACvB,SAAS,EAAE;YACT,UAAU,EAAE,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC;SAC1E;QACD,YAAY,EAAE;YACZ,UAAU,EAAE,QAAQ;YACpB,SAAS,EAAE,CAAC;YACZ,aAAa,EAAE,KAAK;SACrB;QACD,KAAK,EAAE;YACL,OAAO,EAAE,CAAC;YACV,MAAM,EAAE,CAAC;SACV;QACD,KAAK,EAAE;YACL,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC;YACxE,SAAS,EAAE,CAAC;SACb;KACF,CAAC,CAAA;AACJ,CAAC,CAAA;AAED,MAAM,SAAS,GAAG,GAAG,EAAE;IACrB,MAAM,eAAe,GAAG,kBAAkB,EAAE,CAAA;IAC5C,MAAM,EAAE,MAAM,EAAE,GAAG,iBAAiB,EAAE,CAAA;IAEtC,OAAO,UAAU,CAAC,MAAM,CAAC;QACvB,SAAS,EAAE;YACT,IAAI,EAAE,CAAC;YACP,cAAc,EAAE,QAAQ;YACxB,eAAe,EAAE,eAAe,CAAC,MAAM,CAAC,IAAI;YAC5C,aAAa,EAAE,MAAM;SACtB;QACD,YAAY,EAAE;YACZ,IAAI,EAAE,CAAC;SACR;QACD,aAAa,EAAE;YACb,GAAG,EAAE,EAAE;YACP,iBAAiB,EAAE,EAAE;YACrB,eAAe,EAAE,EAAE;SACpB;KACF,CAAC,CAAA;AACJ,CAAC,CAAA","sourcesContent":["import { HeaderTitle, HeaderTitleProps, PlatformPressable } from '@react-navigation/elements'\nimport {\n  StaticScreenProps,\n  useNavigation,\n  useTheme as useNavigationTheme,\n  useRoute,\n} from '@react-navigation/native'\nimport React, { useCallback, useEffect } from 'react'\nimport { FlatList, Platform, StyleSheet, View } from 'react-native'\nimport { useSafeAreaInsets } from 'react-native-safe-area-context'\nimport { Badge, Icon } from '../components'\nimport { Message } from '../components/conversation/message'\nimport { MessageForm } from '../components/conversation/message_form'\nimport { KeyboardView } from '../components/display/keyboard_view'\nimport { useConversation } from '../hooks/use_conversation'\nimport { useConversationMessages } from '../hooks/use_conversation_messages'\n\ntype ConversationRouteProps = {\n  conversation_id: number\n  chat_group_graph_id?: string\n  clear_input?: boolean\n}\n\nexport type ConversationScreenProps = StaticScreenProps<ConversationRouteProps>\n\nexport function ConversationScreen({ route }: ConversationScreenProps) {\n  const styles = useStyles()\n  const navigation = useNavigation()\n\n  const { conversation_id } = route.params\n  const { data: conversation } = useConversation(route.params)\n  const { messages, refetch, isRefetching, fetchNextPage } = useConversationMessages({\n    conversation_id,\n  })\n\n  // Seems to be necessary to define this way so we get the route picked up\n  const headerTitle = useCallback(\n    (props: HeaderTitleProps) => <PressableHeaderTitle {...props} />,\n    []\n  )\n\n  useEffect(() => {\n    navigation.setOptions({ headerTitle, title: conversation?.title })\n  }, [conversation, conversation_id, navigation, headerTitle, conversation?.title])\n\n  return (\n    <View style={styles.container}>\n      <KeyboardView style={styles.keyboardView}>\n        <FlatList\n          inverted\n          contentContainerStyle={styles.listContainer}\n          refreshing={isRefetching}\n          onRefresh={refetch}\n          data={messages}\n          keyExtractor={item => item.id}\n          renderItem={({ item }) => <Message {...item} conversation_id={conversation_id} />}\n          onEndReached={() => fetchNextPage()}\n        />\n        <MessageForm.Root conversation={conversation}>\n          {/* <MessageForm.AttachmentPicker /> */}\n          <MessageForm.Commands />\n          <MessageForm.TextInput />\n          <MessageForm.SubmitButton />\n        </MessageForm.Root>\n      </KeyboardView>\n    </View>\n  )\n}\n\nconst PressableHeaderTitle = ({ style, children }: HeaderTitleProps) => {\n  const styles = usePressableHeaderStyle()\n  const navigation = useNavigation()\n\n  const route = useRoute() as ConversationScreenProps['route']\n\n  const { data: conversation } = useConversation(route.params)\n  const badge = conversation.badges?.[0]\n  const resourceType = badge?.pcoResourceType || ''\n  const productName = badge?.appName\n  const name = badge?.text || undefined\n\n  return (\n    <PlatformPressable\n      style={styles.container}\n      onPress={() =>\n        navigation.navigate('ConversationDetails', { conversation_id: conversation?.id })\n      }\n    >\n      <View style={styles.titleWrapper}>\n        <HeaderTitle style={[styles.title, style]}>{children}</HeaderTitle>\n        <Icon name=\"general.downChevron\" size={12} />\n      </View>\n      <Badge\n        variant=\"metaSubtle\"\n        productLogoName={productName}\n        label={resourceType}\n        metaLabel={name}\n        style={styles.badge}\n      />\n    </PlatformPressable>\n  )\n}\n\nconst usePressableHeaderStyle = () => {\n  return StyleSheet.create({\n    container: {\n      alignItems: Platform.select({ android: 'flex-start', default: 'center' }),\n    },\n    titleWrapper: {\n      alignItems: 'center',\n      columnGap: 4,\n      flexDirection: 'row',\n    },\n    title: {\n      padding: 0,\n      margin: 0,\n    },\n    badge: {\n      alignSelf: Platform.select({ android: 'flex-start', default: 'center' }),\n      marginTop: 2,\n    },\n  })\n}\n\nconst useStyles = () => {\n  const navigationTheme = useNavigationTheme()\n  const { bottom } = useSafeAreaInsets()\n\n  return StyleSheet.create({\n    container: {\n      flex: 1,\n      justifyContent: 'center',\n      backgroundColor: navigationTheme.colors.card,\n      paddingBottom: bottom,\n    },\n    keyboardView: {\n      flex: 1,\n    },\n    listContainer: {\n      gap: 12,\n      paddingHorizontal: 16,\n      paddingVertical: 12,\n    },\n  })\n}\n"]}
+{"version":3,"file":"conversation_screen.js","sourceRoot":"","sources":["../../src/screens/conversation_screen.tsx"],"names":[],"mappings":"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","sourcesContent":["// @ts-expect-error\nimport { date as formatDate } from '@planningcenter/datetime-fmt'\nimport { HeaderTitle, HeaderTitleProps, PlatformPressable } from '@react-navigation/elements'\nimport {\n  StaticScreenProps,\n  useNavigation,\n  useTheme as useNavigationTheme,\n  useRoute,\n} from '@react-navigation/native'\nimport moment from 'moment'\nimport React, { useCallback, useEffect } from 'react'\nimport { FlatList, Platform, StyleSheet, View } from 'react-native'\nimport { useSafeAreaInsets } from 'react-native-safe-area-context'\nimport { Badge, Icon, Text } from '../components'\nimport { Message } from '../components/conversation/message'\nimport { MessageForm } from '../components/conversation/message_form'\nimport { KeyboardView } from '../components/display/keyboard_view'\nimport { useTheme } from '../hooks'\nimport { useConversation } from '../hooks/use_conversation'\nimport { useConversationMessages } from '../hooks/use_conversation_messages'\nimport { MessageResource } from '../types'\nimport { getRelativeDateStatus } from '../utils/date'\n\ntype ConversationRouteProps = {\n  conversation_id: number\n  chat_group_graph_id?: string\n  clear_input?: boolean\n}\n\nexport type ConversationScreenProps = StaticScreenProps<ConversationRouteProps>\n\nexport function ConversationScreen({ route }: ConversationScreenProps) {\n  const styles = useStyles()\n  const navigation = useNavigation()\n\n  const { conversation_id } = route.params\n  const { data: conversation } = useConversation(route.params)\n  const { messages, refetch, isRefetching, fetchNextPage } = useConversationMessages({\n    conversation_id,\n  })\n  const messagesWithSeparators = groupMessages(messages)\n\n  // Seems to be necessary to define this way so we get the route picked up\n  const headerTitle = useCallback(\n    (props: HeaderTitleProps) => <PressableHeaderTitle {...props} />,\n    []\n  )\n\n  useEffect(() => {\n    navigation.setOptions({ headerTitle, title: conversation?.title })\n  }, [conversation, conversation_id, navigation, headerTitle, conversation?.title])\n\n  return (\n    <View style={styles.container}>\n      <KeyboardView style={styles.keyboardView}>\n        <FlatList\n          inverted\n          contentContainerStyle={styles.listContainer}\n          refreshing={isRefetching}\n          onRefresh={refetch}\n          data={messagesWithSeparators}\n          keyExtractor={item => item.id}\n          renderItem={({ item }) => {\n            if (item.type === 'DateSeparator') {\n              return <InlineDateSeparator {...item} />\n            }\n\n            return <Message {...item} conversation_id={conversation_id} />\n          }}\n          onEndReached={() => fetchNextPage()}\n        />\n        <MessageForm.Root conversation={conversation}>\n          {/* <MessageForm.AttachmentPicker /> */}\n          <MessageForm.Commands />\n          <MessageForm.TextInput />\n          <MessageForm.SubmitButton />\n        </MessageForm.Root>\n      </KeyboardView>\n    </View>\n  )\n}\n\nexport type DateSeparator = { type: 'DateSeparator'; id: string; date: string }\n\nfunction InlineDateSeparator({ date }: DateSeparator) {\n  const styles = useDateSeparatorStyles()\n  const { isThisYear } = getRelativeDateStatus(date)\n  const showYear = !isThisYear\n  const dateStamp = formatDate(date, { style: 'long', year: showYear })\n\n  return (\n    <View style={styles.container}>\n      <View style={styles.separator} />\n      <Text variant=\"footnote\" style={styles.dateText}>\n        {dateStamp}\n      </Text>\n      <View style={styles.separator} />\n    </View>\n  )\n}\n\nconst useDateSeparatorStyles = () => {\n  const theme = useTheme()\n  return StyleSheet.create({\n    container: {\n      alignItems: 'center',\n      flexDirection: 'row',\n      paddingHorizontal: 16,\n      paddingVertical: 16,\n    },\n    separator: {\n      flex: 1,\n      height: 1,\n      borderTopWidth: 1,\n      borderTopColor: theme.colors.borderColorDefaultBase,\n    },\n    dateText: {\n      paddingHorizontal: 8,\n    },\n  })\n}\n\nexport const groupMessages = (ms: MessageResource[]) => {\n  let enrichedMessages: (MessageResource | DateSeparator)[] = []\n  let encounteredOneOfMyMessages = false\n\n  ms.forEach((message, i) => {\n    const prevMessage = ms[i + 1]\n    const nextMessage = ms[i - 1]\n    const date = moment(message.createdAt).format('YYYY-MM-DD')\n    const prevMessageDifferentAuthor = message.author?.id !== prevMessage?.author?.id\n    const nextMessageDifferentAuthor = message.author?.id !== nextMessage?.author?.id\n    const prevMessageMoreThan5Minutes =\n      prevMessage &&\n      new Date(message.createdAt).getTime() - new Date(prevMessage.createdAt).getTime() > 60000 * 5\n    const nextMessageMoreThan5Minutes =\n      nextMessage &&\n      new Date(nextMessage.createdAt).getTime() - new Date(message.createdAt).getTime() > 60000 * 5\n\n    if (message.mine && !encounteredOneOfMyMessages) {\n      encounteredOneOfMyMessages = true\n      message.myLatestInConversation = true\n    } else {\n      message.myLatestInConversation = false\n    }\n    message.lastInGroup = !nextMessage || nextMessageDifferentAuthor || nextMessageMoreThan5Minutes\n    message.renderAuthor =\n      !message.mine && (!prevMessage || prevMessageDifferentAuthor || prevMessageMoreThan5Minutes)\n\n    enrichedMessages.push(message)\n    if (!prevMessage || date !== moment(prevMessage.createdAt).format('YYYY-MM-DD')) {\n      enrichedMessages.push({ type: 'DateSeparator', id: `day-divider-${message.id}`, date })\n    }\n  })\n\n  return enrichedMessages\n}\n\nconst PressableHeaderTitle = ({ style, children }: HeaderTitleProps) => {\n  const styles = usePressableHeaderStyle()\n  const navigation = useNavigation()\n\n  const route = useRoute() as ConversationScreenProps['route']\n\n  const { data: conversation } = useConversation(route.params)\n  const badge = conversation.badges?.[0]\n  const resourceType = badge?.pcoResourceType || ''\n  const productName = badge?.appName\n  const name = badge?.text || undefined\n\n  return (\n    <PlatformPressable\n      style={styles.container}\n      onPress={() =>\n        navigation.navigate('ConversationDetails', { conversation_id: conversation?.id })\n      }\n    >\n      <View style={styles.titleWrapper}>\n        <HeaderTitle style={[styles.title, style]}>{children}</HeaderTitle>\n        <Icon name=\"general.downChevron\" size={12} />\n      </View>\n      <Badge\n        variant=\"metaSubtle\"\n        productLogoName={productName}\n        label={resourceType}\n        metaLabel={name}\n        style={styles.badge}\n      />\n    </PlatformPressable>\n  )\n}\n\nconst usePressableHeaderStyle = () => {\n  return StyleSheet.create({\n    container: {\n      alignItems: Platform.select({ android: 'flex-start', default: 'center' }),\n    },\n    titleWrapper: {\n      alignItems: 'center',\n      columnGap: 4,\n      flexDirection: 'row',\n    },\n    title: {\n      padding: 0,\n      margin: 0,\n    },\n    badge: {\n      alignSelf: Platform.select({ android: 'flex-start', default: 'center' }),\n      marginTop: 2,\n    },\n  })\n}\n\nconst useStyles = () => {\n  const navigationTheme = useNavigationTheme()\n  const { bottom } = useSafeAreaInsets()\n\n  return StyleSheet.create({\n    container: {\n      flex: 1,\n      justifyContent: 'center',\n      backgroundColor: navigationTheme.colors.card,\n      paddingBottom: bottom,\n    },\n    keyboardView: {\n      flex: 1,\n    },\n    listContainer: {\n      gap: 12,\n      paddingHorizontal: 16,\n      paddingVertical: 12,\n    },\n  })\n}\n"]}

package/build/types/resources/message.d.ts

@@ -15,5 +15,7 @@ export interface MessageResource {
     reactionCounts: ReactionCountResource[];
     renderAuthor?: boolean;
     renderTime?: boolean;
+    myLatestInConversation?: boolean;
+    lastInGroup?: boolean;
 }
 //# sourceMappingURL=message.d.ts.map

package/build/types/resources/message.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"message.d.ts","sourceRoot":"","sources":["../../../src/types/resources/message.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,8BAA8B,EAAE,MAAM,oCAAoC,CAAA;AACnF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,UAAU,CAAA;AAC9C,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAA;AAEvD,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,SAAS,CAAA;IACf,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;IACZ,SAAS,EAAE,MAAM,CAAA;IACjB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAA;IACxB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAA;IAC3B,IAAI,EAAE,OAAO,CAAA;IACb,WAAW,EAAE,8BAA8B,EAAE,CAAA;IAC7C,MAAM,EAAE,cAAc,CAAA;IACtB,cAAc,EAAE,qBAAqB,EAAE,CAAA;IAGvC,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,UAAU,CAAC,EAAE,OAAO,CAAA;CACrB"}
+{"version":3,"file":"message.d.ts","sourceRoot":"","sources":["../../../src/types/resources/message.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,8BAA8B,EAAE,MAAM,oCAAoC,CAAA;AACnF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,UAAU,CAAA;AAC9C,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAA;AAEvD,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,SAAS,CAAA;IACf,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;IACZ,SAAS,EAAE,MAAM,CAAA;IACjB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAA;IACxB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAA;IAC3B,IAAI,EAAE,OAAO,CAAA;IACb,WAAW,EAAE,8BAA8B,EAAE,CAAA;IAC7C,MAAM,EAAE,cAAc,CAAA;IACtB,cAAc,EAAE,qBAAqB,EAAE,CAAA;IAGvC,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,sBAAsB,CAAC,EAAE,OAAO,CAAA;IAChC,WAAW,CAAC,EAAE,OAAO,CAAA;CACtB"}

package/build/types/resources/message.js.map

@@ -1 +1 @@
-{"version":3,"file":"message.js","sourceRoot":"","sources":["../../../src/types/resources/message.ts"],"names":[],"mappings":"","sourcesContent":["import { DenormalizedAttachmentResource } from './denormalized_attachment_resource'\nimport type { PersonResource } from './person'\nimport type { ReactionCountResource } from './reaction'\n\nexport interface MessageResource {\n  type: 'Message'\n  id: string\n  text: string\n  html: string\n  createdAt: string\n  deletedAt: string | null\n  textEditedAt: string | null\n  mine: boolean\n  attachments: DenormalizedAttachmentResource[]\n  author: PersonResource\n  reactionCounts: ReactionCountResource[]\n\n  // Custom Local Properties we set for rendering\n  renderAuthor?: boolean\n  renderTime?: boolean\n}\n"]}
+{"version":3,"file":"message.js","sourceRoot":"","sources":["../../../src/types/resources/message.ts"],"names":[],"mappings":"","sourcesContent":["import { DenormalizedAttachmentResource } from './denormalized_attachment_resource'\nimport type { PersonResource } from './person'\nimport type { ReactionCountResource } from './reaction'\n\nexport interface MessageResource {\n  type: 'Message'\n  id: string\n  text: string\n  html: string\n  createdAt: string\n  deletedAt: string | null\n  textEditedAt: string | null\n  mine: boolean\n  attachments: DenormalizedAttachmentResource[]\n  author: PersonResource\n  reactionCounts: ReactionCountResource[]\n\n  // Custom Local Properties we set for rendering\n  renderAuthor?: boolean\n  renderTime?: boolean\n  myLatestInConversation?: boolean\n  lastInGroup?: boolean\n}\n"]}

package/build/utils/date.d.ts

@@ -1,4 +1,9 @@
 type DateProps = string | number | Date;
 export declare function formatDatePreview(date?: DateProps): any;
+export declare function getRelativeDateStatus(date: DateProps): {
+    isToday: boolean;
+    isThisWeek: boolean;
+    isThisYear: boolean;
+};
 export {};
 //# sourceMappingURL=date.d.ts.map

package/build/utils/date.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"date.d.ts","sourceRoot":"","sources":["../../src/utils/date.ts"],"names":[],"mappings":"AAIA,KAAK,SAAS,GAAG,MAAM,GAAG,MAAM,GAAG,IAAI,CAAA;AAEvC,wBAAgB,iBAAiB,CAAC,IAAI,CAAC,EAAE,SAAS,OAcjD"}
+{"version":3,"file":"date.d.ts","sourceRoot":"","sources":["../../src/utils/date.ts"],"names":[],"mappings":"AAIA,KAAK,SAAS,GAAG,MAAM,GAAG,MAAM,GAAG,IAAI,CAAA;AAEvC,wBAAgB,iBAAiB,CAAC,IAAI,CAAC,EAAE,SAAS,OAcjD;AAOD,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,SAAS;;;;EAQpD"}

package/build/utils/date.js

@@ -1,4 +1,4 @@
-// @ts-ignore
+// @ts-expect-error
 import { date as formatDate } from '@planningcenter/datetime-fmt';
 import moment from 'moment-timezone';
 export function formatDatePreview(date) {
@@ -21,4 +21,11 @@ const formatShorterDate = (date) => {
     // Drop the century from the year
     return formatDate(date, { style: 'short', year: true }).replace(/20(\d{2})/, '$1');
 };
+export function getRelativeDateStatus(date) {
+    const now = moment();
+    const isToday = now.isSame(date, 'day');
+    const isThisWeek = now.isSame(date, 'week');
+    const isThisYear = now.isSame(date, 'year');
+    return { isToday, isThisWeek, isThisYear };
+}
 //# sourceMappingURL=date.js.map

package/build/utils/date.js.map

@@ -1 +1 @@
-{"version":3,"file":"date.js","sourceRoot":"","sources":["../../src/utils/date.ts"],"names":[],"mappings":"AAAA,aAAa;AACb,OAAO,EAAE,IAAI,IAAI,UAAU,EAAE,MAAM,8BAA8B,CAAA;AACjE,OAAO,MAAM,MAAM,iBAAiB,CAAA;AAIpC,MAAM,UAAU,iBAAiB,CAAC,IAAgB;IAChD,IAAI,CAAC,IAAI;QAAE,OAAO,EAAE,CAAA;IAEpB,MAAM,GAAG,GAAG,MAAM,EAAE,CAAA;IACpB,MAAM,OAAO,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,CAAA;IACvC,MAAM,UAAU,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;IAC3C,MAAM,UAAU,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;IAE3C,IAAI,OAAO;QAAE,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;IACjD,IAAI,UAAU;QAAE,OAAO,UAAU,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,gBAAgB,EAAE,CAAC,CAAA;IACpE,IAAI,UAAU;QAAE,OAAO,UAAU,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,aAAa,EAAE,CAAC,CAAA;IAEjE,wBAAwB;IACxB,OAAO,iBAAiB,CAAC,IAAI,CAAC,CAAA;AAChC,CAAC;AAED,MAAM,iBAAiB,GAAG,CAAC,IAAe,EAAE,EAAE;IAC5C,iCAAiC;IACjC,OAAO,UAAU,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,WAAW,EAAE,IAAI,CAAC,CAAA;AACpF,CAAC,CAAA","sourcesContent":["// @ts-ignore\nimport { date as formatDate } from '@planningcenter/datetime-fmt'\nimport moment from 'moment-timezone'\n\ntype DateProps = string | number | Date\n\nexport function formatDatePreview(date?: DateProps) {\n  if (!date) return ''\n\n  const now = moment()\n  const isToday = now.isSame(date, 'day')\n  const isThisWeek = now.isSame(date, 'week')\n  const isThisYear = now.isSame(date, 'year')\n\n  if (isToday) return moment(date).format('h:mm a')\n  if (isThisWeek) return formatDate(date, { style: 'relative-short' })\n  if (isThisYear) return formatDate(date, { style: 'abbreviated' })\n\n  // TODO: Org date format\n  return formatShorterDate(date)\n}\n\nconst formatShorterDate = (date: DateProps) => {\n  // Drop the century from the year\n  return formatDate(date, { style: 'short', year: true }).replace(/20(\\d{2})/, '$1')\n}\n"]}
+{"version":3,"file":"date.js","sourceRoot":"","sources":["../../src/utils/date.ts"],"names":[],"mappings":"AAAA,mBAAmB;AACnB,OAAO,EAAE,IAAI,IAAI,UAAU,EAAE,MAAM,8BAA8B,CAAA;AACjE,OAAO,MAAM,MAAM,iBAAiB,CAAA;AAIpC,MAAM,UAAU,iBAAiB,CAAC,IAAgB;IAChD,IAAI,CAAC,IAAI;QAAE,OAAO,EAAE,CAAA;IAEpB,MAAM,GAAG,GAAG,MAAM,EAAE,CAAA;IACpB,MAAM,OAAO,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,CAAA;IACvC,MAAM,UAAU,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;IAC3C,MAAM,UAAU,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;IAE3C,IAAI,OAAO;QAAE,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;IACjD,IAAI,UAAU;QAAE,OAAO,UAAU,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,gBAAgB,EAAE,CAAC,CAAA;IACpE,IAAI,UAAU;QAAE,OAAO,UAAU,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,aAAa,EAAE,CAAC,CAAA;IAEjE,wBAAwB;IACxB,OAAO,iBAAiB,CAAC,IAAI,CAAC,CAAA;AAChC,CAAC;AAED,MAAM,iBAAiB,GAAG,CAAC,IAAe,EAAE,EAAE;IAC5C,iCAAiC;IACjC,OAAO,UAAU,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,WAAW,EAAE,IAAI,CAAC,CAAA;AACpF,CAAC,CAAA;AAED,MAAM,UAAU,qBAAqB,CAAC,IAAe;IACnD,MAAM,GAAG,GAAG,MAAM,EAAE,CAAA;IAEpB,MAAM,OAAO,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,CAAA;IACvC,MAAM,UAAU,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;IAC3C,MAAM,UAAU,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;IAE3C,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,CAAA;AAC5C,CAAC","sourcesContent":["// @ts-expect-error\nimport { date as formatDate } from '@planningcenter/datetime-fmt'\nimport moment from 'moment-timezone'\n\ntype DateProps = string | number | Date\n\nexport function formatDatePreview(date?: DateProps) {\n  if (!date) return ''\n\n  const now = moment()\n  const isToday = now.isSame(date, 'day')\n  const isThisWeek = now.isSame(date, 'week')\n  const isThisYear = now.isSame(date, 'year')\n\n  if (isToday) return moment(date).format('h:mm a')\n  if (isThisWeek) return formatDate(date, { style: 'relative-short' })\n  if (isThisYear) return formatDate(date, { style: 'abbreviated' })\n\n  // TODO: Org date format\n  return formatShorterDate(date)\n}\n\nconst formatShorterDate = (date: DateProps) => {\n  // Drop the century from the year\n  return formatDate(date, { style: 'short', year: true }).replace(/20(\\d{2})/, '$1')\n}\n\nexport function getRelativeDateStatus(date: DateProps) {\n  const now = moment()\n\n  const isToday = now.isSame(date, 'day')\n  const isThisWeek = now.isSame(date, 'week')\n  const isThisYear = now.isSame(date, 'year')\n\n  return { isToday, isThisWeek, isThisYear }\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@planningcenter/chat-react-native",
-  "version": "3.2.0-rc.24",
+  "version": "3.2.0-rc.25",
   "description": "",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -55,5 +55,5 @@
     "prettier": "^3.4.2",
     "typescript": "<5.6.0"
   },
-  "gitHead": "95297a29c653d2904fa975bc4f1e655d3ccc1366"
+  "gitHead": "5341fc7d2489707a08f20ce39b3fef50cbe9d5c5"
 }

package/src/screens/conversation_screen.tsx

@@ -1,3 +1,5 @@
+// @ts-expect-error
+import { date as formatDate } from '@planningcenter/datetime-fmt'
 import { HeaderTitle, HeaderTitleProps, PlatformPressable } from '@react-navigation/elements'
 import {
   StaticScreenProps,
@@ -5,15 +7,19 @@ import {
   useTheme as useNavigationTheme,
   useRoute,
 } from '@react-navigation/native'
+import moment from 'moment'
 import React, { useCallback, useEffect } from 'react'
 import { FlatList, Platform, StyleSheet, View } from 'react-native'
 import { useSafeAreaInsets } from 'react-native-safe-area-context'
-import { Badge, Icon } from '../components'
+import { Badge, Icon, Text } from '../components'
 import { Message } from '../components/conversation/message'
 import { MessageForm } from '../components/conversation/message_form'
 import { KeyboardView } from '../components/display/keyboard_view'
+import { useTheme } from '../hooks'
 import { useConversation } from '../hooks/use_conversation'
 import { useConversationMessages } from '../hooks/use_conversation_messages'
+import { MessageResource } from '../types'
+import { getRelativeDateStatus } from '../utils/date'
 
 type ConversationRouteProps = {
   conversation_id: number
@@ -32,6 +38,7 @@ export function ConversationScreen({ route }: ConversationScreenProps) {
   const { messages, refetch, isRefetching, fetchNextPage } = useConversationMessages({
     conversation_id,
   })
+  const messagesWithSeparators = groupMessages(messages)
 
   // Seems to be necessary to define this way so we get the route picked up
   const headerTitle = useCallback(
@@ -51,9 +58,15 @@ export function ConversationScreen({ route }: ConversationScreenProps) {
           contentContainerStyle={styles.listContainer}
           refreshing={isRefetching}
           onRefresh={refetch}
-          data={messages}
+          data={messagesWithSeparators}
           keyExtractor={item => item.id}
-          renderItem={({ item }) => <Message {...item} conversation_id={conversation_id} />}
+          renderItem={({ item }) => {
+            if (item.type === 'DateSeparator') {
+              return <InlineDateSeparator {...item} />
+            }
+
+            return <Message {...item} conversation_id={conversation_id} />
+          }}
           onEndReached={() => fetchNextPage()}
         />
         <MessageForm.Root conversation={conversation}>
@@ -67,6 +80,82 @@ export function ConversationScreen({ route }: ConversationScreenProps) {
   )
 }
 
+export type DateSeparator = { type: 'DateSeparator'; id: string; date: string }
+
+function InlineDateSeparator({ date }: DateSeparator) {
+  const styles = useDateSeparatorStyles()
+  const { isThisYear } = getRelativeDateStatus(date)
+  const showYear = !isThisYear
+  const dateStamp = formatDate(date, { style: 'long', year: showYear })
+
+  return (
+    <View style={styles.container}>
+      <View style={styles.separator} />
+      <Text variant="footnote" style={styles.dateText}>
+        {dateStamp}
+      </Text>
+      <View style={styles.separator} />
+    </View>
+  )
+}
+
+const useDateSeparatorStyles = () => {
+  const theme = useTheme()
+  return StyleSheet.create({
+    container: {
+      alignItems: 'center',
+      flexDirection: 'row',
+      paddingHorizontal: 16,
+      paddingVertical: 16,
+    },
+    separator: {
+      flex: 1,
+      height: 1,
+      borderTopWidth: 1,
+      borderTopColor: theme.colors.borderColorDefaultBase,
+    },
+    dateText: {
+      paddingHorizontal: 8,
+    },
+  })
+}
+
+export const groupMessages = (ms: MessageResource[]) => {
+  let enrichedMessages: (MessageResource | DateSeparator)[] = []
+  let encounteredOneOfMyMessages = false
+
+  ms.forEach((message, i) => {
+    const prevMessage = ms[i + 1]
+    const nextMessage = ms[i - 1]
+    const date = moment(message.createdAt).format('YYYY-MM-DD')
+    const prevMessageDifferentAuthor = message.author?.id !== prevMessage?.author?.id
+    const nextMessageDifferentAuthor = message.author?.id !== nextMessage?.author?.id
+    const prevMessageMoreThan5Minutes =
+      prevMessage &&
+      new Date(message.createdAt).getTime() - new Date(prevMessage.createdAt).getTime() > 60000 * 5
+    const nextMessageMoreThan5Minutes =
+      nextMessage &&
+      new Date(nextMessage.createdAt).getTime() - new Date(message.createdAt).getTime() > 60000 * 5
+
+    if (message.mine && !encounteredOneOfMyMessages) {
+      encounteredOneOfMyMessages = true
+      message.myLatestInConversation = true
+    } else {
+      message.myLatestInConversation = false
+    }
+    message.lastInGroup = !nextMessage || nextMessageDifferentAuthor || nextMessageMoreThan5Minutes
+    message.renderAuthor =
+      !message.mine && (!prevMessage || prevMessageDifferentAuthor || prevMessageMoreThan5Minutes)
+
+    enrichedMessages.push(message)
+    if (!prevMessage || date !== moment(prevMessage.createdAt).format('YYYY-MM-DD')) {
+      enrichedMessages.push({ type: 'DateSeparator', id: `day-divider-${message.id}`, date })
+    }
+  })
+
+  return enrichedMessages
+}
+
 const PressableHeaderTitle = ({ style, children }: HeaderTitleProps) => {
   const styles = usePressableHeaderStyle()
   const navigation = useNavigation()

package/src/types/resources/message.ts

@@ -18,4 +18,6 @@ export interface MessageResource {
   // Custom Local Properties we set for rendering
   renderAuthor?: boolean
   renderTime?: boolean
+  myLatestInConversation?: boolean
+  lastInGroup?: boolean
 }

package/src/utils/date.ts

@@ -1,4 +1,4 @@
-// @ts-ignore
+// @ts-expect-error
 import { date as formatDate } from '@planningcenter/datetime-fmt'
 import moment from 'moment-timezone'
 
@@ -24,3 +24,13 @@ const formatShorterDate = (date: DateProps) => {
   // Drop the century from the year
   return formatDate(date, { style: 'short', year: true }).replace(/20(\d{2})/, '$1')
 }
+
+export function getRelativeDateStatus(date: DateProps) {
+  const now = moment()
+
+  const isToday = now.isSame(date, 'day')
+  const isThisWeek = now.isSame(date, 'week')
+  const isThisYear = now.isSame(date, 'year')
+
+  return { isToday, isThisWeek, isThisYear }
+}