@planningcenter/chat-react-native 4.0.1-qa-staging.2 → 4.0.1-rc.1

package/build/utils/group_messages.js.map

@@ -1 +1 @@
-{"version":3,"file":"group_messages.js","names":["dayjs","isSystemMessage","FIVE_MINUTES_MS","groupMessages","ms","inReplyScreen","items","messagesById","Map","map","message","id","myLatestSeen","nextNeighborEnriched","forEach","i","prev","neighborsOf","next","enriched","enrichSystemMessage","push","datesDifferBetween","dateSeparator","isMyLatest","mine","enrichRegularMessage","replyRoot","resolveReplyRoot","shadow","replyShadowFor","arr","replyRootId","get","myLatestInConversation","lastInGroup","renderAuthor","nextRendersAuthor","isReplyShadowMessage","nextIsReplyShadowMessage","threadPosition","inThread","showThreadDetails","startsNewGroup","nextIntroducesReplyShadow","threadPositionFor","prevIsMyReply","undefined","nextIsMyReply","a","b","author","differsByMoreThan5Min","Math","abs","toMillis","createdAt","iso","Date","getTime","dateKey","format","type","date","isThreadRoot","isLast","current","nextInThread","nextIsThreadRoot","differentThread","enteringNewThread","messageId"],"sources":["../../src/utils/group_messages.ts"],"sourcesContent":["import type { MessageResource } from '../types/resources/message'\nimport dayjs from './dayjs'\nimport { isSystemMessage } from './system_messages'\n\nconst FIVE_MINUTES_MS = 5 * 60 * 1000\n\nexport type DateSeparator = { type: 'DateSeparator'; id: string; date: string }\n\nexport type ReplyShadowMessage = {\n  type: 'ReplyShadowMessage'\n  id: string\n  messageId: string\n  replyRoot: MessageResource | null\n  isReplyShadowMessage: boolean\n  nextRendersAuthor: boolean\n}\n\nexport type EnrichedMessage = MessageResource | DateSeparator | ReplyShadowMessage\n\ninterface GroupMessagesProps {\n  ms: MessageResource[]\n  inReplyScreen?: boolean\n}\n\nexport function groupMessages({ ms, inReplyScreen }: GroupMessagesProps): EnrichedMessage[] {\n  const items: EnrichedMessage[] = []\n  const messagesById = new Map(ms.map(message => [message.id, message]))\n  let myLatestSeen = false\n  let nextNeighborEnriched: MessageResource | undefined\n\n  ms.forEach((message, i) => {\n    const { prev } = neighborsOf(ms, i)\n    const next = nextNeighborEnriched\n\n    if (isSystemMessage(message)) {\n      const enriched = enrichSystemMessage(message, next)\n      items.push(enriched)\n      if (datesDifferBetween(message, prev)) items.push(dateSeparator(message))\n      nextNeighborEnriched = enriched\n      return\n    }\n\n    const isMyLatest = !myLatestSeen && message.mine\n    if (isMyLatest) myLatestSeen = true\n\n    const enriched = enrichRegularMessage(\n      { ...message, replyRoot: resolveReplyRoot(message, messagesById) },\n      prev,\n      next,\n      isMyLatest,\n      !!inReplyScreen\n    )\n    items.push(enriched)\n\n    const shadow = replyShadowFor(enriched, prev)\n    if (shadow) items.push(shadow)\n\n    if (!prev || datesDifferBetween(message, prev)) {\n      items.push(dateSeparator(message))\n    }\n\n    nextNeighborEnriched = enriched\n  })\n\n  return items\n}\n\nfunction neighborsOf<T>(arr: T[], i: number): { prev: T | undefined; next: T | undefined } {\n  return { prev: arr[i + 1], next: arr[i - 1] }\n}\n\nfunction resolveReplyRoot(\n  message: MessageResource,\n  messagesById: Map<string, MessageResource>\n): MessageResource | null {\n  if (!message.replyRootId || message.replyRootId === message.id) return null\n  return messagesById.get(message.replyRootId) ?? message.replyRoot ?? null\n}\n\nfunction enrichSystemMessage(\n  message: MessageResource,\n  next: MessageResource | undefined\n): MessageResource {\n  return {\n    ...message,\n    myLatestInConversation: false,\n    lastInGroup: true,\n    renderAuthor: false,\n    nextRendersAuthor: next?.renderAuthor,\n    isReplyShadowMessage: false,\n    nextIsReplyShadowMessage: false,\n    threadPosition: null,\n  }\n}\n\nfunction enrichRegularMessage(\n  message: MessageResource,\n  prev: MessageResource | undefined,\n  next: MessageResource | undefined,\n  isMyLatest: boolean,\n  inReplyScreen: boolean\n): MessageResource {\n  const inThread = message.replyRootId !== null\n  const showThreadDetails = !inReplyScreen && inThread\n\n  return {\n    ...message,\n    myLatestInConversation: isMyLatest,\n    lastInGroup: !next || startsNewGroup(next, message),\n    renderAuthor: !message.mine && (!prev || startsNewGroup(message, prev)),\n    nextRendersAuthor: next?.renderAuthor,\n    isReplyShadowMessage: false,\n    nextIsReplyShadowMessage: nextIntroducesReplyShadow(next, message),\n    threadPosition: showThreadDetails ? threadPositionFor(message, next) : null,\n    prevIsMyReply: showThreadDetails ? prev?.mine : undefined,\n    nextIsMyReply: showThreadDetails ? next?.mine : undefined,\n  }\n}\n\nfunction startsNewGroup(a: MessageResource, b: MessageResource): boolean {\n  return (\n    a.author?.id !== b.author?.id ||\n    differsByMoreThan5Min(a, b) ||\n    a.replyRootId !== b.replyRootId ||\n    datesDifferBetween(a, b)\n  )\n}\n\nfunction differsByMoreThan5Min(a: MessageResource, b: MessageResource): boolean {\n  return Math.abs(toMillis(a.createdAt) - toMillis(b.createdAt)) > FIVE_MINUTES_MS\n}\n\nfunction toMillis(iso: string): number {\n  return new Date(iso).getTime()\n}\n\nfunction datesDifferBetween(a: MessageResource, b: MessageResource | undefined): boolean {\n  if (!b) return false\n  return dateKey(a) !== dateKey(b)\n}\n\nfunction dateKey(message: MessageResource): string {\n  return dayjs(message.createdAt).format('YYYY-MM-DD')\n}\n\nfunction dateSeparator(message: MessageResource): DateSeparator {\n  return { type: 'DateSeparator', id: `day-divider-${message.id}`, date: dateKey(message) }\n}\n\nfunction threadPositionFor(\n  message: MessageResource,\n  next: MessageResource | undefined\n): 'first' | 'center' | 'last' | null {\n  const isThreadRoot = message.replyRootId === message.id\n  const isLast =\n    !next || next.replyRootId !== message.replyRootId || datesDifferBetween(next, message)\n\n  if (isThreadRoot && isLast) return null\n  if (isThreadRoot) return 'first'\n  if (isLast) return 'last'\n  return 'center'\n}\n\nfunction nextIntroducesReplyShadow(\n  next: MessageResource | undefined,\n  current: MessageResource\n): boolean {\n  if (!next) return false\n  const nextInThread = next.replyRootId !== null\n  const nextIsThreadRoot = next.replyRootId === next.id\n  const differentThread = next.replyRootId !== current.replyRootId\n  return nextInThread && !nextIsThreadRoot && (differentThread || datesDifferBetween(next, current))\n}\n\nfunction replyShadowFor(\n  message: MessageResource,\n  prev: MessageResource | undefined\n): ReplyShadowMessage | undefined {\n  if (!message.replyRootId) return undefined\n  if (message.replyRootId === message.id) return undefined\n\n  const enteringNewThread =\n    !prev || prev.replyRootId !== message.replyRootId || datesDifferBetween(prev, message)\n  if (!enteringNewThread) return undefined\n\n  return {\n    type: 'ReplyShadowMessage',\n    id: `${message.id}-${message.replyRootId}`,\n    messageId: message.replyRootId,\n    replyRoot: message.replyRoot ?? null,\n    isReplyShadowMessage: true,\n    nextRendersAuthor: message.renderAuthor ?? false,\n  }\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"group_messages.js","names":["dayjs","isSystemMessage","FIVE_MINUTES_MS","groupMessages","ms","inReplyScreen","items","myLatestSeen","nextNeighborEnriched","forEach","message","i","prev","neighborsOf","next","enriched","enrichSystemMessage","push","datesDifferBetween","dateSeparator","isMyLatest","mine","enrichRegularMessage","shadow","replyShadowFor","arr","myLatestInConversation","lastInGroup","renderAuthor","nextRendersAuthor","isReplyShadowMessage","nextIsReplyShadowMessage","threadPosition","inThread","replyRootId","showThreadDetails","startsNewGroup","nextIntroducesReplyShadow","threadPositionFor","prevIsMyReply","undefined","nextIsMyReply","a","b","author","id","differsByMoreThan5Min","Math","abs","toMillis","createdAt","iso","Date","getTime","dateKey","format","type","date","isThreadRoot","isLast","current","nextInThread","nextIsThreadRoot","differentThread","enteringNewThread","messageId"],"sources":["../../src/utils/group_messages.ts"],"sourcesContent":["import type { MessageResource } from '../types/resources/message'\nimport dayjs from './dayjs'\nimport { isSystemMessage } from './system_messages'\n\nconst FIVE_MINUTES_MS = 5 * 60 * 1000\n\nexport type DateSeparator = { type: 'DateSeparator'; id: string; date: string }\n\nexport type ReplyShadowMessage = {\n  type: 'ReplyShadowMessage'\n  id: string\n  messageId: string\n  isReplyShadowMessage: boolean\n  nextRendersAuthor: boolean\n}\n\nexport type EnrichedMessage = MessageResource | DateSeparator | ReplyShadowMessage\n\ninterface GroupMessagesProps {\n  ms: MessageResource[]\n  inReplyScreen?: boolean\n}\n\nexport function groupMessages({ ms, inReplyScreen }: GroupMessagesProps): EnrichedMessage[] {\n  const items: EnrichedMessage[] = []\n  let myLatestSeen = false\n  let nextNeighborEnriched: MessageResource | undefined\n\n  ms.forEach((message, i) => {\n    const { prev } = neighborsOf(ms, i)\n    const next = nextNeighborEnriched\n\n    if (isSystemMessage(message)) {\n      const enriched = enrichSystemMessage(message, next)\n      items.push(enriched)\n      if (datesDifferBetween(message, prev)) items.push(dateSeparator(message))\n      nextNeighborEnriched = enriched\n      return\n    }\n\n    const isMyLatest = !myLatestSeen && message.mine\n    if (isMyLatest) myLatestSeen = true\n\n    const enriched = enrichRegularMessage(message, prev, next, isMyLatest, !!inReplyScreen)\n    items.push(enriched)\n\n    const shadow = replyShadowFor(enriched, prev)\n    if (shadow) items.push(shadow)\n\n    if (!prev || datesDifferBetween(message, prev)) {\n      items.push(dateSeparator(message))\n    }\n\n    nextNeighborEnriched = enriched\n  })\n\n  return items\n}\n\nfunction neighborsOf<T>(arr: T[], i: number): { prev: T | undefined; next: T | undefined } {\n  return { prev: arr[i + 1], next: arr[i - 1] }\n}\n\nfunction enrichSystemMessage(\n  message: MessageResource,\n  next: MessageResource | undefined\n): MessageResource {\n  return {\n    ...message,\n    myLatestInConversation: false,\n    lastInGroup: true,\n    renderAuthor: false,\n    nextRendersAuthor: next?.renderAuthor,\n    isReplyShadowMessage: false,\n    nextIsReplyShadowMessage: false,\n    threadPosition: null,\n  }\n}\n\nfunction enrichRegularMessage(\n  message: MessageResource,\n  prev: MessageResource | undefined,\n  next: MessageResource | undefined,\n  isMyLatest: boolean,\n  inReplyScreen: boolean\n): MessageResource {\n  const inThread = message.replyRootId !== null\n  const showThreadDetails = !inReplyScreen && inThread\n\n  return {\n    ...message,\n    myLatestInConversation: isMyLatest,\n    lastInGroup: !next || startsNewGroup(next, message),\n    renderAuthor: !message.mine && (!prev || startsNewGroup(message, prev)),\n    nextRendersAuthor: next?.renderAuthor,\n    isReplyShadowMessage: false,\n    nextIsReplyShadowMessage: nextIntroducesReplyShadow(next, message),\n    threadPosition: showThreadDetails ? threadPositionFor(message, next) : null,\n    prevIsMyReply: showThreadDetails ? prev?.mine : undefined,\n    nextIsMyReply: showThreadDetails ? next?.mine : undefined,\n  }\n}\n\nfunction startsNewGroup(a: MessageResource, b: MessageResource): boolean {\n  return (\n    a.author?.id !== b.author?.id ||\n    differsByMoreThan5Min(a, b) ||\n    a.replyRootId !== b.replyRootId ||\n    datesDifferBetween(a, b)\n  )\n}\n\nfunction differsByMoreThan5Min(a: MessageResource, b: MessageResource): boolean {\n  return Math.abs(toMillis(a.createdAt) - toMillis(b.createdAt)) > FIVE_MINUTES_MS\n}\n\nfunction toMillis(iso: string): number {\n  return new Date(iso).getTime()\n}\n\nfunction datesDifferBetween(a: MessageResource, b: MessageResource | undefined): boolean {\n  if (!b) return false\n  return dateKey(a) !== dateKey(b)\n}\n\nfunction dateKey(message: MessageResource): string {\n  return dayjs(message.createdAt).format('YYYY-MM-DD')\n}\n\nfunction dateSeparator(message: MessageResource): DateSeparator {\n  return { type: 'DateSeparator', id: `day-divider-${message.id}`, date: dateKey(message) }\n}\n\nfunction threadPositionFor(\n  message: MessageResource,\n  next: MessageResource | undefined\n): 'first' | 'center' | 'last' | null {\n  const isThreadRoot = message.replyRootId === message.id\n  const isLast =\n    !next || next.replyRootId !== message.replyRootId || datesDifferBetween(next, message)\n\n  if (isThreadRoot && isLast) return null\n  if (isThreadRoot) return 'first'\n  if (isLast) return 'last'\n  return 'center'\n}\n\nfunction nextIntroducesReplyShadow(\n  next: MessageResource | undefined,\n  current: MessageResource\n): boolean {\n  if (!next) return false\n  const nextInThread = next.replyRootId !== null\n  const nextIsThreadRoot = next.replyRootId === next.id\n  const differentThread = next.replyRootId !== current.replyRootId\n  return nextInThread && !nextIsThreadRoot && (differentThread || datesDifferBetween(next, current))\n}\n\nfunction replyShadowFor(\n  message: MessageResource,\n  prev: MessageResource | undefined\n): ReplyShadowMessage | undefined {\n  if (!message.replyRootId) return undefined\n  if (message.replyRootId === message.id) return undefined\n\n  const enteringNewThread =\n    !prev || prev.replyRootId !== message.replyRootId || datesDifferBetween(prev, message)\n  if (!enteringNewThread) return undefined\n\n  return {\n    type: 'ReplyShadowMessage',\n    id: `${message.id}-${message.replyRootId}`,\n    messageId: message.replyRootId,\n    isReplyShadowMessage: true,\n    nextRendersAuthor: message.renderAuthor ?? false,\n  }\n}\n"],"mappings":"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","ignoreList":[]}

package/build/utils/jolt/transform_message_event_data_to_message_resource.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transform_message_event_data_to_message_resource.d.ts","sourceRoot":"","sources":["../../../src/utils/jolt/transform_message_event_data_to_message_resource.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAC7C,OAAO,EAAE,mBAAmB,EAAE,MAAM,wCAAwC,CAAA;AAI5E,wBAAgB,0CAA0C,CAAC,EACzD,IAAI,EACJ,eAAe,GAChB,EAAE;IACD,IAAI,EAAE,mBAAmB,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAA;IACzC,eAAe,EAAE,MAAM,CAAA;CACxB,GAAG,eAAe,CA+BlB"}
+{"version":3,"file":"transform_message_event_data_to_message_resource.d.ts","sourceRoot":"","sources":["../../../src/utils/jolt/transform_message_event_data_to_message_resource.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAC7C,OAAO,EAAE,mBAAmB,EAAE,MAAM,wCAAwC,CAAA;AAI5E,wBAAgB,0CAA0C,CAAC,EACzD,IAAI,EACJ,eAAe,GAChB,EAAE;IACD,IAAI,EAAE,mBAAmB,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAA;IACzC,eAAe,EAAE,MAAM,CAAA;CACxB,GAAG,eAAe,CA8BlB"}

package/build/utils/jolt/transform_message_event_data_to_message_resource.js

@@ -22,7 +22,6 @@ export function transformMessageEventDataToMessageResource({
     reactionCounts: [],
     replyCount: data.reply_count || 0,
     replyRootId: data.reply_root_id || null,
-    idempotentKey: data.idempotent_key ?? null,
     messageType: data.message_type,
     personIdsForSystemEvent: data.system_event_person_ids,
     systemTextParts: data.system_text_parts ? {

package/build/utils/jolt/transform_message_event_data_to_message_resource.js.map

@@ -1 +1 @@
-{"version":3,"file":"transform_message_event_data_to_message_resource.js","names":["deepCamelCaseKeys","transformMessageEventDataToMessageResource","data","currentPersonId","type","id","sort_key","text","html","createdAt","created_at","deletedAt","deleted_at","textEditedAt","text_edited_at","mine","author_id","attachments","author","name","author_name","avatar","author_avatar","reactionCounts","replyCount","reply_count","replyRootId","reply_root_id","idempotentKey","idempotent_key","messageType","message_type","personIdsForSystemEvent","system_event_person_ids","systemTextParts","system_text_parts","names","overflowCount","overflow_count","action"],"sources":["../../../src/utils/jolt/transform_message_event_data_to_message_resource.ts"],"sourcesContent":["import { MessageResource } from '../../types'\nimport { MessageCreatedEvent } from '../../types/jolt_events/message_events'\nimport { DenormalizedAttachmentResource } from '../../types/resources/denormalized_attachment_resource'\nimport { deepCamelCaseKeys } from '../deepCamelCaseKeys'\n\nexport function transformMessageEventDataToMessageResource({\n  data,\n  currentPersonId,\n}: {\n  data: MessageCreatedEvent['data']['data']\n  currentPersonId: number\n}): MessageResource {\n  return {\n    type: 'Message',\n    id: data.sort_key,\n    text: data.text,\n    html: data.html,\n    createdAt: data.created_at,\n    deletedAt: data.deleted_at,\n    textEditedAt: data.text_edited_at,\n    mine: data.author_id === currentPersonId,\n    attachments: deepCamelCaseKeys<DenormalizedAttachmentResource[]>(data.attachments) || [],\n    author: {\n      type: 'Person',\n      id: data.author_id,\n      name: data.author_name,\n      avatar: data.author_avatar,\n    },\n    reactionCounts: [],\n    replyCount: data.reply_count || 0,\n    replyRootId: data.reply_root_id || null,\n    idempotentKey: data.idempotent_key ?? null,\n    messageType: data.message_type,\n    personIdsForSystemEvent: data.system_event_person_ids,\n    systemTextParts: data.system_text_parts\n      ? {\n          names: data.system_text_parts.names,\n          overflowCount: data.system_text_parts.overflow_count,\n          action: data.system_text_parts.action,\n        }\n      : null,\n  }\n}\n"],"mappings":"AAGA,SAASA,iBAAiB,QAAQ,sBAAsB;AAExD,OAAO,SAASC,0CAA0CA,CAAC;EACzDC,IAAI;EACJC;AAIF,CAAC,EAAmB;EAClB,OAAO;IACLC,IAAI,EAAE,SAAS;IACfC,EAAE,EAAEH,IAAI,CAACI,QAAQ;IACjBC,IAAI,EAAEL,IAAI,CAACK,IAAI;IACfC,IAAI,EAAEN,IAAI,CAACM,IAAI;IACfC,SAAS,EAAEP,IAAI,CAACQ,UAAU;IAC1BC,SAAS,EAAET,IAAI,CAACU,UAAU;IAC1BC,YAAY,EAAEX,IAAI,CAACY,cAAc;IACjCC,IAAI,EAAEb,IAAI,CAACc,SAAS,KAAKb,eAAe;IACxCc,WAAW,EAAEjB,iBAAiB,CAAmCE,IAAI,CAACe,WAAW,CAAC,IAAI,EAAE;IACxFC,MAAM,EAAE;MACNd,IAAI,EAAE,QAAQ;MACdC,EAAE,EAAEH,IAAI,CAACc,SAAS;MAClBG,IAAI,EAAEjB,IAAI,CAACkB,WAAW;MACtBC,MAAM,EAAEnB,IAAI,CAACoB;IACf,CAAC;IACDC,cAAc,EAAE,EAAE;IAClBC,UAAU,EAAEtB,IAAI,CAACuB,WAAW,IAAI,CAAC;IACjCC,WAAW,EAAExB,IAAI,CAACyB,aAAa,IAAI,IAAI;IACvCC,aAAa,EAAE1B,IAAI,CAAC2B,cAAc,IAAI,IAAI;IAC1CC,WAAW,EAAE5B,IAAI,CAAC6B,YAAY;IAC9BC,uBAAuB,EAAE9B,IAAI,CAAC+B,uBAAuB;IACrDC,eAAe,EAAEhC,IAAI,CAACiC,iBAAiB,GACnC;MACEC,KAAK,EAAElC,IAAI,CAACiC,iBAAiB,CAACC,KAAK;MACnCC,aAAa,EAAEnC,IAAI,CAACiC,iBAAiB,CAACG,cAAc;MACpDC,MAAM,EAAErC,IAAI,CAACiC,iBAAiB,CAACI;IACjC,CAAC,GACD;EACN,CAAC;AACH","ignoreList":[]}
+{"version":3,"file":"transform_message_event_data_to_message_resource.js","names":["deepCamelCaseKeys","transformMessageEventDataToMessageResource","data","currentPersonId","type","id","sort_key","text","html","createdAt","created_at","deletedAt","deleted_at","textEditedAt","text_edited_at","mine","author_id","attachments","author","name","author_name","avatar","author_avatar","reactionCounts","replyCount","reply_count","replyRootId","reply_root_id","messageType","message_type","personIdsForSystemEvent","system_event_person_ids","systemTextParts","system_text_parts","names","overflowCount","overflow_count","action"],"sources":["../../../src/utils/jolt/transform_message_event_data_to_message_resource.ts"],"sourcesContent":["import { MessageResource } from '../../types'\nimport { MessageCreatedEvent } from '../../types/jolt_events/message_events'\nimport { DenormalizedAttachmentResource } from '../../types/resources/denormalized_attachment_resource'\nimport { deepCamelCaseKeys } from '../deepCamelCaseKeys'\n\nexport function transformMessageEventDataToMessageResource({\n  data,\n  currentPersonId,\n}: {\n  data: MessageCreatedEvent['data']['data']\n  currentPersonId: number\n}): MessageResource {\n  return {\n    type: 'Message',\n    id: data.sort_key,\n    text: data.text,\n    html: data.html,\n    createdAt: data.created_at,\n    deletedAt: data.deleted_at,\n    textEditedAt: data.text_edited_at,\n    mine: data.author_id === currentPersonId,\n    attachments: deepCamelCaseKeys<DenormalizedAttachmentResource[]>(data.attachments) || [],\n    author: {\n      type: 'Person',\n      id: data.author_id,\n      name: data.author_name,\n      avatar: data.author_avatar,\n    },\n    reactionCounts: [],\n    replyCount: data.reply_count || 0,\n    replyRootId: data.reply_root_id || null,\n    messageType: data.message_type,\n    personIdsForSystemEvent: data.system_event_person_ids,\n    systemTextParts: data.system_text_parts\n      ? {\n          names: data.system_text_parts.names,\n          overflowCount: data.system_text_parts.overflow_count,\n          action: data.system_text_parts.action,\n        }\n      : null,\n  }\n}\n"],"mappings":"AAGA,SAASA,iBAAiB,QAAQ,sBAAsB;AAExD,OAAO,SAASC,0CAA0CA,CAAC;EACzDC,IAAI;EACJC;AAIF,CAAC,EAAmB;EAClB,OAAO;IACLC,IAAI,EAAE,SAAS;IACfC,EAAE,EAAEH,IAAI,CAACI,QAAQ;IACjBC,IAAI,EAAEL,IAAI,CAACK,IAAI;IACfC,IAAI,EAAEN,IAAI,CAACM,IAAI;IACfC,SAAS,EAAEP,IAAI,CAACQ,UAAU;IAC1BC,SAAS,EAAET,IAAI,CAACU,UAAU;IAC1BC,YAAY,EAAEX,IAAI,CAACY,cAAc;IACjCC,IAAI,EAAEb,IAAI,CAACc,SAAS,KAAKb,eAAe;IACxCc,WAAW,EAAEjB,iBAAiB,CAAmCE,IAAI,CAACe,WAAW,CAAC,IAAI,EAAE;IACxFC,MAAM,EAAE;MACNd,IAAI,EAAE,QAAQ;MACdC,EAAE,EAAEH,IAAI,CAACc,SAAS;MAClBG,IAAI,EAAEjB,IAAI,CAACkB,WAAW;MACtBC,MAAM,EAAEnB,IAAI,CAACoB;IACf,CAAC;IACDC,cAAc,EAAE,EAAE;IAClBC,UAAU,EAAEtB,IAAI,CAACuB,WAAW,IAAI,CAAC;IACjCC,WAAW,EAAExB,IAAI,CAACyB,aAAa,IAAI,IAAI;IACvCC,WAAW,EAAE1B,IAAI,CAAC2B,YAAY;IAC9BC,uBAAuB,EAAE5B,IAAI,CAAC6B,uBAAuB;IACrDC,eAAe,EAAE9B,IAAI,CAAC+B,iBAAiB,GACnC;MACEC,KAAK,EAAEhC,IAAI,CAAC+B,iBAAiB,CAACC,KAAK;MACnCC,aAAa,EAAEjC,IAAI,CAAC+B,iBAAiB,CAACG,cAAc;MACpDC,MAAM,EAAEnC,IAAI,CAAC+B,iBAAiB,CAACI;IACjC,CAAC,GACD;EACN,CAAC;AACH","ignoreList":[]}

package/build/utils/request/messages_data_options.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"messages_data_options.d.ts","sourceRoot":"","sources":["../../../src/utils/request/messages_data_options.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,gBAAgB;;;;CAmB5B,CAAA;AAED,eAAO,MAAM,kBAAkB,UAAmE,CAAA"}
+{"version":3,"file":"messages_data_options.d.ts","sourceRoot":"","sources":["../../../src/utils/request/messages_data_options.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,gBAAgB;;;;CAkB5B,CAAA;AAED,eAAO,MAAM,kBAAkB,UAAgC,CAAA"}

package/build/utils/request/messages_data_options.js

@@ -1,7 +1,7 @@
 export const getMessageFields = {
-  Message: ['text', 'text_edited_at', 'mine', 'attachments', 'created_at', 'deleted_at', 'author', 'reaction_counts', 'reply_count', 'reply_root', 'idempotent_key', 'message_type', 'person_ids_for_system_event', 'system_text_parts'],
+  Message: ['text', 'text_edited_at', 'mine', 'attachments', 'created_at', 'deleted_at', 'author', 'reaction_counts', 'reply_count', 'reply_root', 'message_type', 'person_ids_for_system_event', 'system_text_parts'],
   Person: ['name', 'avatar'],
   ReactionCount: ['value', 'count', 'mine', 'message_id', 'author_ids']
 };
-export const getMessagesInclude = ['author', 'reaction_counts', 'reply_root', 'reply_root.author'];
+export const getMessagesInclude = ['author', 'reaction_counts'];
 //# sourceMappingURL=messages_data_options.js.map

package/build/utils/request/messages_data_options.js.map

@@ -1 +1 @@
-{"version":3,"file":"messages_data_options.js","names":["getMessageFields","Message","Person","ReactionCount","getMessagesInclude"],"sources":["../../../src/utils/request/messages_data_options.ts"],"sourcesContent":["export const getMessageFields = {\n  Message: [\n    'text',\n    'text_edited_at',\n    'mine',\n    'attachments',\n    'created_at',\n    'deleted_at',\n    'author',\n    'reaction_counts',\n    'reply_count',\n    'reply_root',\n    'idempotent_key',\n    'message_type',\n    'person_ids_for_system_event',\n    'system_text_parts',\n  ],\n  Person: ['name', 'avatar'],\n  ReactionCount: ['value', 'count', 'mine', 'message_id', 'author_ids'],\n}\n\nexport const getMessagesInclude = ['author', 'reaction_counts', 'reply_root', 'reply_root.author']\n"],"mappings":"AAAA,OAAO,MAAMA,gBAAgB,GAAG;EAC9BC,OAAO,EAAE,CACP,MAAM,EACN,gBAAgB,EAChB,MAAM,EACN,aAAa,EACb,YAAY,EACZ,YAAY,EACZ,QAAQ,EACR,iBAAiB,EACjB,aAAa,EACb,YAAY,EACZ,gBAAgB,EAChB,cAAc,EACd,6BAA6B,EAC7B,mBAAmB,CACpB;EACDC,MAAM,EAAE,CAAC,MAAM,EAAE,QAAQ,CAAC;EAC1BC,aAAa,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY;AACtE,CAAC;AAED,OAAO,MAAMC,kBAAkB,GAAG,CAAC,QAAQ,EAAE,iBAAiB,EAAE,YAAY,EAAE,mBAAmB,CAAC","ignoreList":[]}
+{"version":3,"file":"messages_data_options.js","names":["getMessageFields","Message","Person","ReactionCount","getMessagesInclude"],"sources":["../../../src/utils/request/messages_data_options.ts"],"sourcesContent":["export const getMessageFields = {\n  Message: [\n    'text',\n    'text_edited_at',\n    'mine',\n    'attachments',\n    'created_at',\n    'deleted_at',\n    'author',\n    'reaction_counts',\n    'reply_count',\n    'reply_root',\n    'message_type',\n    'person_ids_for_system_event',\n    'system_text_parts',\n  ],\n  Person: ['name', 'avatar'],\n  ReactionCount: ['value', 'count', 'mine', 'message_id', 'author_ids'],\n}\n\nexport const getMessagesInclude = ['author', 'reaction_counts']\n"],"mappings":"AAAA,OAAO,MAAMA,gBAAgB,GAAG;EAC9BC,OAAO,EAAE,CACP,MAAM,EACN,gBAAgB,EAChB,MAAM,EACN,aAAa,EACb,YAAY,EACZ,YAAY,EACZ,QAAQ,EACR,iBAAiB,EACjB,aAAa,EACb,YAAY,EACZ,cAAc,EACd,6BAA6B,EAC7B,mBAAmB,CACpB;EACDC,MAAM,EAAE,CAAC,MAAM,EAAE,QAAQ,CAAC;EAC1BC,aAAa,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY;AACtE,CAAC;AAED,OAAO,MAAMC,kBAAkB,GAAG,CAAC,QAAQ,EAAE,iBAAiB,CAAC","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@planningcenter/chat-react-native",
-  "version": "4.0.1-qa-staging.2",
+  "version": "4.0.1-rc.1",
   "description": "",
   "repository": {
     "type": "git",
@@ -33,7 +33,7 @@
   "dependencies": {
     "@fortawesome/fontawesome-svg-core": "^7.2.0",
     "@fortawesome/react-native-fontawesome": "^0.3.2",
-    "@planningcenter/emoji-keyboard": "4.0.1-qa-staging.2",
+    "@planningcenter/emoji-keyboard": "4.0.0",
     "lodash-inflection": "^1.5.0"
   },
   "peerDependencies": {
@@ -84,5 +84,5 @@
     "sf-symbols-typescript": "^2.2.0",
     "typescript": "~6.0.3"
   },
-  "gitHead": "092bd6133bddee97b0fbdaab954d5a0984988a56"
+  "gitHead": "fa30b4ca64df403ad4e1f307404547528b3b8014"
 }

package/src/components/conversation/message.tsx

@@ -1,6 +1,6 @@
 import { useNavigation } from '@react-navigation/native'
 import { some } from 'lodash'
-import React, { memo, useEffect } from 'react'
+import React, { useEffect } from 'react'
 import {
   AccessibilityActionEvent,
   Pressable,
@@ -44,14 +44,14 @@ import { TheirReplyConnector, MyReplyConnector, AVATAR_CONNECTOR_SPACING } from
 interface MessageProps extends MessageResource {
   canDeleteNonAuthoredMessages: boolean
   conversation_id: number
-  readByOthers?: boolean
+  latestReadMessageSortKey?: string
   inReplyScreen?: boolean
 }
 
-export const Message = memo(function MessageRow({
+export function Message({
   canDeleteNonAuthoredMessages,
   conversation_id,
-  readByOthers,
+  latestReadMessageSortKey,
   inReplyScreen,
   ...message
 }: MessageProps) {
@@ -73,16 +73,11 @@ export const Message = memo(function MessageRow({
   const [messageBubbleHeight, setMessageBubbleHeight] = React.useState(0)
   const { animatedBackgroundColor, handleMessagePressIn, handleMessagePressOut } =
     useAnimatedMessageBackgroundColor()
-  const isReplyRootMessage = message.replyRootId === message.id
-  const isDeletedReplyRootMessage = isReplyRootMessage && !!message.deletedAt
-  const showReadReceipts = message.mine && !pending && !error
-  const replyToReplyRootMessage = !isReplyRootMessage && !!message.replyRootId
-  const { message: fetchedReplyRoot } = useConversationMessage({
+  const { message: replyRootMessage } = useConversationMessage({
     conversation_id,
     messageId: message.replyRootId || '',
-    enabled: replyToReplyRootMessage && !message.replyRoot,
+    enabled: !!message.replyRootId,
   })
-  const replyRoot = message.replyRoot ?? fetchedReplyRoot
 
   const metaProps = {
     authorName: author.name,
@@ -90,11 +85,14 @@ export const Message = memo(function MessageRow({
   }
 
   const renderAuthor = (!message.mine && message.renderAuthor) || false
-  const showReplyCountButton = !inReplyScreen && isReplyRootMessage
+  const showReplyCountButton = !inReplyScreen && message.replyRootId === message.id
+  const isReplyRootMessage = message.replyRootId === message.id
+  const isDeletedReplyRootMessage = isReplyRootMessage && !!message.deletedAt
+  const replyToReplyRootMessage = !isReplyRootMessage && !!message.replyRootId
 
   const replyCountText = pluralize(message.replyCount, 'reply')
   const messagePendingLabel = isPersisted ? 'Saving' : 'Sending'
-  const replyRootAuthorName = replyToReplyRootMessage ? replyRoot?.author.name : author.name
+  const replyRootAuthorName = message.replyRootId ? replyRootMessage?.author.name : author.name
   const messageText = isDeletedReplyRootMessage ? 'Message deleted' : text
 
   const messageBottomMargin =
@@ -286,7 +284,12 @@ export const Message = memo(function MessageRow({
           )}
           {showMessageMeta && !isDeletedReplyRootMessage && (
             <View style={styles.messageMeta}>
-              {showReadReceipts && <MessageReadReceipts read={readByOthers} />}
+              {message.mine && !pending && !error && (
+                <MessageReadReceipts
+                  message={message}
+                  latestReadMessageSortKey={latestReadMessageSortKey}
+                />
+              )}
               {error ? (
                 <View style={styles.errorContainer}>
                   {retryFailedSaveMutation.isPending ? (
@@ -335,7 +338,7 @@ export const Message = memo(function MessageRow({
       </Animated.View>
     </Pressable>
   )
-})
+}
 
 const useMessageStyles = (mine: boolean, isDeleting: boolean) => {
   const { colors } = useTheme()

package/src/components/conversation/message_read_receipts.tsx

@@ -1,15 +1,17 @@
 import React from 'react'
 import { StyleSheet, View } from 'react-native'
 import { useTheme } from '../../hooks'
+import { MessageResource } from '../../types'
 import { Icon, Text } from '../display'
 
 interface Props {
-  read?: boolean
+  message: MessageResource
+  latestReadMessageSortKey?: string
 }
 
-export function MessageReadReceipts({ read }: Props) {
+export function MessageReadReceipts({ message, latestReadMessageSortKey }: Props) {
   const styles = useStyles()
-  if (!read) {
+  if (!latestReadMessageSortKey || message.id > latestReadMessageSortKey) {
     return (
       <View style={styles.badgeContainer}>
         <Icon name="general.check" style={styles.icon} />

package/src/components/conversation/reply_shadow_message.tsx

@@ -1,6 +1,6 @@
 import { useNavigation } from '@react-navigation/native'
 import { some } from 'lodash'
-import React, { memo } from 'react'
+import React from 'react'
 import { Pressable, StyleSheet, useWindowDimensions, View } from 'react-native'
 import Animated from 'react-native-reanimated'
 import {
@@ -37,20 +37,18 @@ interface ReplyShadowMessageProps extends MessageResource {
   nextRendersAuthor: boolean
 }
 
-export const ReplyShadowMessage = memo(function ReplyShadowMessageRow({
+export function ReplyShadowMessage({
   conversation_id,
   inReplyScreen,
   messageId,
-  replyRoot,
   isReplyShadowMessage,
   nextRendersAuthor,
 }: ReplyShadowMessageProps) {
-  const fetched = useConversationMessage({ conversation_id, messageId, enabled: !replyRoot })
-  const message = replyRoot ?? fetched.message
+  const { message, isError, isLoading } = useConversationMessage({ conversation_id, messageId })
 
   if (inReplyScreen) return null
-  if (!message && fetched.isLoading) return <ShadowMessageFallback text="Loading..." />
-  if (!message) return <ShadowMessageFallback text="Message deleted" />
+  if (isLoading) return <ShadowMessageFallback text="Loading..." />
+  if (isError || !message) return <ShadowMessageFallback text="Message deleted" />
 
   const enrichedMessage = {
     ...message,
@@ -59,7 +57,7 @@ export const ReplyShadowMessage = memo(function ReplyShadowMessageRow({
   }
 
   return <ShadowMessageContent conversation_id={conversation_id} {...enrichedMessage} />
-})
+}
 
 interface ShadowMessageContentProps extends MessageResource {
   conversation_id: number
@@ -84,7 +82,7 @@ function ShadowMessageContent({ conversation_id, ...message }: ShadowMessageCont
   const handleNavigateToReplies = () => {
     navigation.navigate('ConversationReply', {
       conversation_id,
-      reply_root_id: message.replyRootId ?? message.id,
+      reply_root_id: message.replyRootId,
       reply_root_author_name: message.author.name,
     })
   }

package/src/hooks/use_conversation_messages.ts

@@ -1,6 +1,5 @@
 import { useMemo } from 'react'
 import { MessageResource } from '../types'
-import { replaceEqualById } from '../utils/replace_equal_by_id'
 import { getMessagesQueryKey, getMessagesRequestArgs } from '../utils/request/get_messages'
 import { SuspensePaginatorOptions, useSuspensePaginator } from './use_suspense_api'
 
@@ -11,10 +10,7 @@ export const useConversationMessages = (
   const { data, refetch, isRefetching, fetchNextPage, hasNextPage } =
     useSuspensePaginator<MessageResource>(
       getMessagesRequestArgs({ conversation_id, reply_root_id }),
-      {
-        structuralSharing: replaceEqualById,
-        ...opts,
-      }
+      opts
     )
   const queryKey = getMessagesQueryKey({ conversation_id, reply_root_id })
   const messages = useMemo(

package/src/hooks/use_conversation_messages_jolt_events.ts

@@ -11,7 +11,6 @@ import {
   updateCacheWithMessage,
   updateCacheWithIndividualMessage,
   updateCacheWithReaction,
-  updateCacheReplyRoots,
   getThreadedMessagesQueryKey,
 } from '../utils/cache/messages_cache'
 import { transformMessageEventDataToMessageResource } from '../utils/jolt/transform_message_event_data_to_message_resource'
@@ -45,7 +44,6 @@ export function useConversationMessagesJoltEvents({ conversationId }: Props) {
       data,
       currentPersonId: currentPerson.id,
     })
-    const isReplyRootUpdate = e.event === 'message.updated' && data.reply_root_id === data.sort_key
 
     if (e.event === 'message.created' && data.author_id) {
       removeAllTypingEventsByAuthorId(data.author_id)
@@ -64,11 +62,6 @@ export function useConversationMessagesJoltEvents({ conversationId }: Props) {
         data.reply_root_id
       )
       updateCacheWithMessage(queryClient, threadedMessagesQueryKey, message, e.event)
-
-      if (isReplyRootUpdate) {
-        updateCacheReplyRoots(queryClient, messagesQueryKey, message)
-        updateCacheReplyRoots(queryClient, threadedMessagesQueryKey, message)
-      }
     }
 
     // Update individual message query cache so reply shadow messages update immediately

package/src/hooks/use_message_create_or_update.ts

@@ -22,14 +22,6 @@ interface Props {
   replyRootId?: string | null
 }
 
-interface MessageMutationVariables {
-  text: string
-  attachments?: DenormalizedAttachmentResourceForCreate[]
-  idempotentKey?: string
-}
-
-type ResolvedMessageMutationVariables = MessageMutationVariables & { idempotentKey: string }
-
 export function useMessageCreateOrUpdate({ conversationId, message, replyRootId }: Props) {
   const messageId = message?.id || null
   const isEditing = !isNewMessage(message)
@@ -37,7 +29,13 @@ export function useMessageCreateOrUpdate({ conversationId, message, replyRootId
   const currentPerson = useCurrentPerson()
 
   const mutation = useMutation({
-    mutationFn: ({ text, attachments, idempotentKey }: ResolvedMessageMutationVariables) => {
+    mutationFn: ({
+      text,
+      attachments,
+    }: {
+      text: string
+      attachments?: DenormalizedAttachmentResourceForCreate[]
+    }) => {
       const requestParams = getMessagesRequestArgs({ conversation_id: conversationId })
       const fieldsWithValueJoined = Object.fromEntries(
         Object.entries(requestParams.data.fields).map(([k, v]) => [k, v.join(',')])
@@ -48,6 +46,7 @@ export function useMessageCreateOrUpdate({ conversationId, message, replyRootId
         ...(!isEditing && replyRootId ? { reply_root: { id: replyRootId } } : {}),
       }
       if (!isEditing) {
+        const idempotentKey = insecureUUID()
         attributes.idempotent_key = idempotentKey
         startMessageCreationTracking(idempotentKey)
       }
@@ -72,7 +71,13 @@ export function useMessageCreateOrUpdate({ conversationId, message, replyRootId
         })
       }
     },
-    onMutate: async ({ text, attachments, idempotentKey }: ResolvedMessageMutationVariables) => {
+    onMutate: async ({
+      text,
+      attachments,
+    }: {
+      text: string
+      attachments?: DenormalizedAttachmentResourceForCreate[]
+    }) => {
       if (message && isEditing) {
         const optimisticMessage = optimisticallyUpdateMessage({
           conversationId,
@@ -91,7 +96,6 @@ export function useMessageCreateOrUpdate({ conversationId, message, replyRootId
         attachments,
         currentPerson,
         replyRootId,
-        idempotentKey,
       })
 
       return { message: optimisticMessage }
@@ -151,24 +155,7 @@ export function useMessageCreateOrUpdate({ conversationId, message, replyRootId
     },
   })
 
-  const resolveVariables = (
-    variables: MessageMutationVariables
-  ): ResolvedMessageMutationVariables => ({
-    ...variables,
-    idempotentKey: variables.idempotentKey ?? message?.idempotentKey ?? insecureUUID(),
-  })
-
-  const mutate = (
-    variables: MessageMutationVariables,
-    options?: Parameters<typeof mutation.mutate>[1]
-  ) => mutation.mutate(resolveVariables(variables), options)
-
-  const mutateAsync = (
-    variables: MessageMutationVariables,
-    options?: Parameters<typeof mutation.mutateAsync>[1]
-  ) => mutation.mutateAsync(resolveVariables(variables), options)
-
-  return { ...mutation, mutate, mutateAsync }
+  return mutation
 }
 
 /**

package/src/screens/conversation_new/components/groups_form.tsx

@@ -212,9 +212,11 @@ function FormContent({
       </View>
       <Divider />
       <Pressable style={styles.titleSection} onPress={handleTitleSectionPress}>
-        <Heading variant="h3">Title</Heading>
+        <Heading variant="h3">
+          Title <Text style={styles.required}>*</Text>
+        </Heading>
         <AutoFocusAwareTextInput
-          placeholder="Topic of conversation (required)"
+          placeholder="Topic of conversation"
           value={title}
           onChangeText={setTitle}
           style={styles.titleInput}
@@ -291,6 +293,9 @@ const useStyles = () => {
       fontSize: 18,
       color: colors.textColorDefaultPrimary,
     },
+    required: {
+      color: colors.statusErrorText,
+    },
     memberSection: {
       padding: sectionPadding,
       paddingBottom: 0,

package/src/screens/conversation_screen.tsx

@@ -1,3 +1,4 @@
+import { date as formatDate } from '@planningcenter/datetime-fmt'
 import { HeaderTitle, HeaderTitleProps, PlatformPressable } from '@react-navigation/elements'
 import {
   CommonActions,
@@ -10,21 +11,24 @@ import {
 import React, { useCallback, useEffect, useRef, useState } from 'react'
 import { FlatList, Platform, StyleSheet, useWindowDimensions, View } from 'react-native'
 import { useSafeAreaInsets } from 'react-native-safe-area-context'
-import { Badge, Icon } from '../components'
+import { Badge, Icon, Text } from '../components'
 import { ConversationStartBanner } from '../components/conversation/conversation_start_banner'
 import { JumpToBottomButton } from '../components/conversation/jump_to_bottom_button'
+import { Message } from '../components/conversation/message'
 import { MessageForm } from '../components/conversation/message_form'
-import { MessageList } from '../components/conversation/message_list'
 import {
   ConversationDisabledBanner,
   LeaderMessagesDisabledBanner,
   MemberMessagesDisabledBanner,
 } from '../components/conversation/messages_disabled_banners'
+import { ReplyShadowMessage } from '../components/conversation/reply_shadow_message'
+import { SystemMessage } from '../components/conversation/system_message'
 import { TypingIndicator } from '../components/conversation/typing_indicator'
 import { KeyboardView } from '../components/display/keyboard_view'
 import { useHeaderSlotReserve } from '../components/display/platform_modal_header_buttons'
 import BlankState from '../components/primitive/blank_state_primitive'
 import { ConversationContextProvider } from '../contexts/conversation_context'
+import { useTheme } from '../hooks'
 import { useMessageAvailableMembersAction } from '../hooks/direct_messages/use_message_available_members_action'
 import { useConversation } from '../hooks/use_conversation'
 import { useConversationJoltEvents } from '../hooks/use_conversation_jolt_events'
@@ -41,6 +45,10 @@ import { useVideoModerationJoltEvents } from '../hooks/use_video_moderation_jolt
 import { ConversationResource } from '../types/resources/conversation'
 import { ConversationBadgeResource } from '../types/resources/conversation_badge'
 import { MessageResource } from '../types/resources/message'
+import { getRelativeDateStatus } from '../utils/date'
+import { groupMessages, type DateSeparator } from '../utils/group_messages'
+import { CONVERSATION_MESSAGE_LIST_PADDING_HORIZONTAL } from '../utils/styles'
+import { isSystemMessage } from '../utils/system_messages'
 
 export type ConversationRouteProps = {
   conversation_id: number
@@ -93,11 +101,16 @@ function ConversationScreenContent({ route }: ConversationScreenProps) {
   const { markHandledByMessageForm } = useVideoModerationJoltEvents()
   useEnsureConversationsRouteExists()
   useMarkLatestMessageRead({ conversation, messages })
-  const noMessages = messages.length === 0
+  const messagesWithSeparators = groupMessages({
+    ms: messages,
+    inReplyScreen: !!reply_root_id,
+  })
+  const noMessages = messagesWithSeparators.length === 0
 
   const { repliesDisabled, memberAbility, badges, title } = conversation
   const canReply = memberAbility?.canReply
   const showLeaderDisabledReplyBanner = canReply && repliesDisabled
+  const canDeleteNonAuthoredMessages = memberAbility?.canDeleteNonAuthoredMessages ?? false
   const currentlyEditingMessage = messages.find(m => String(m.id) === String(editing_message_id))
   const replyRootAuthorFirstName = reply_root_author_name?.split(' ')[0]
   const replyHeaderTitle = replyRootAuthorFirstName
@@ -168,19 +181,54 @@ function ConversationScreenContent({ route }: ConversationScreenProps) {
             <ConversationStartBanner conversation={conversation} hasMessages={false} />
           </View>
         ) : (
-          <MessageList
-            listRef={listRef}
-            conversation={conversation}
-            conversationId={conversation_id}
-            messages={messages}
-            replyRootId={reply_root_id}
-            hasNextPage={hasNextPage}
-            onEndReached={() => fetchNextPage()}
+          <FlatList
+            inverted
+            ref={listRef}
+            contentContainerStyle={styles.listContainer}
+            data={messagesWithSeparators}
+            keyExtractor={item => item.id}
             onScroll={trackScroll}
             onLayout={onLayout}
             onContentSizeChange={onContentSizeChange}
             onScrollEndDrag={onScrollEndDrag}
             onMomentumScrollEnd={onMomentumScrollEnd}
+            scrollEventThrottle={10}
+            ListFooterComponent={
+              hasNextPage ? null : (
+                <ConversationStartBanner conversation={conversation} hasMessages={true} />
+              )
+            }
+            renderItem={({ item }) => {
+              if (item.type === 'DateSeparator') {
+                return <InlineDateSeparator {...item} />
+              }
+
+              if (item.type === 'ReplyShadowMessage') {
+                return (
+                  <ReplyShadowMessage
+                    {...(item as any)}
+                    conversation_id={conversation_id}
+                    inReplyScreen={!!reply_root_id}
+                  />
+                )
+              }
+
+              if (isSystemMessage(item)) {
+                return <SystemMessage message={item} conversationId={conversation_id} />
+              }
+
+              return (
+                <Message
+                  {...item}
+                  canDeleteNonAuthoredMessages={canDeleteNonAuthoredMessages}
+                  conversation_id={conversation_id}
+                  latestReadMessageSortKey={conversation?.latestReadMessageSortKey}
+                  inReplyScreen={!!reply_root_id}
+                />
+              )
+            }}
+            onEndReached={() => fetchNextPage()}
+            ListHeaderComponent={<View style={styles.listHeader} />}
           />
         )}
         <JumpToBottomButton onPress={handleReturnToBottom} visible={showJumpToBottomButton} />
@@ -247,6 +295,44 @@ function ConversationBottomBar({
   )
 }
 
+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: CONVERSATION_MESSAGE_LIST_PADDING_HORIZONTAL,
+      paddingVertical: 16,
+    },
+    separator: {
+      flex: 1,
+      height: 1,
+      borderTopWidth: 1,
+      borderTopColor: theme.colors.borderColorDefaultBase,
+    },
+    dateText: {
+      paddingHorizontal: 8,
+    },
+  })
+}
+
 interface ConversationScreenTitleProps extends HeaderTitleProps {
   conversation_id: number
   badge?: ConversationBadgeResource
@@ -343,6 +429,13 @@ const useStyles = () => {
       flex: 1,
       justifyContent: 'center',
     },
+    listContainer: {
+      paddingVertical: 12,
+    },
+    listHeader: {
+      // Just whitespace to provide space where the typing indicator can be
+      height: 16,
+    },
   })
 }