@planningcenter/chat-react-native 4.2.0-rc.0 → 4.2.0-rc.1

package/src/components/conversation/message_read_receipts.tsx

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

package/src/hooks/use_conversation_messages.ts

@@ -1,5 +1,6 @@
 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'
 
@@ -10,7 +11,10 @@ export const useConversationMessages = (
   const { data, refetch, isRefetching, fetchNextPage, hasNextPage } =
     useSuspensePaginator<MessageResource>(
       getMessagesRequestArgs({ conversation_id, reply_root_id }),
-      opts
+      {
+        structuralSharing: replaceEqualById,
+        ...opts,
+      }
     )
   const queryKey = getMessagesQueryKey({ conversation_id, reply_root_id })
   const messages = useMemo(

package/src/hooks/use_conversation_messages_jolt_events.ts

@@ -11,6 +11,7 @@ import {
   updateCacheWithMessage,
   updateCacheWithIndividualMessage,
   updateCacheWithReaction,
+  updateCacheReplyRoots,
   getThreadedMessagesQueryKey,
 } from '../utils/cache/messages_cache'
 import { transformMessageEventDataToMessageResource } from '../utils/jolt/transform_message_event_data_to_message_resource'
@@ -44,6 +45,7 @@ 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)
@@ -62,6 +64,11 @@ 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/screens/conversation_screen.tsx

@@ -1,4 +1,3 @@
-import { date as formatDate } from '@planningcenter/datetime-fmt'
 import { HeaderTitle, HeaderTitleProps, PlatformPressable } from '@react-navigation/elements'
 import {
   CommonActions,
@@ -11,24 +10,21 @@ 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, Text } from '../components'
+import { Badge, Icon } 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'
@@ -45,10 +41,6 @@ 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
@@ -101,16 +93,11 @@ function ConversationScreenContent({ route }: ConversationScreenProps) {
   const { markHandledByMessageForm } = useVideoModerationJoltEvents()
   useEnsureConversationsRouteExists()
   useMarkLatestMessageRead({ conversation, messages })
-  const messagesWithSeparators = groupMessages({
-    ms: messages,
-    inReplyScreen: !!reply_root_id,
-  })
-  const noMessages = messagesWithSeparators.length === 0
+  const noMessages = messages.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
@@ -181,54 +168,19 @@ function ConversationScreenContent({ route }: ConversationScreenProps) {
             <ConversationStartBanner conversation={conversation} hasMessages={false} />
           </View>
         ) : (
-          <FlatList
-            inverted
-            ref={listRef}
-            contentContainerStyle={styles.listContainer}
-            data={messagesWithSeparators}
-            keyExtractor={item => item.id}
+          <MessageList
+            listRef={listRef}
+            conversation={conversation}
+            conversationId={conversation_id}
+            messages={messages}
+            replyRootId={reply_root_id}
+            hasNextPage={hasNextPage}
+            onEndReached={() => fetchNextPage()}
             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} />
@@ -295,44 +247,6 @@ 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
@@ -429,13 +343,6 @@ const useStyles = () => {
       flex: 1,
       justifyContent: 'center',
     },
-    listContainer: {
-      paddingVertical: 12,
-    },
-    listHeader: {
-      // Just whitespace to provide space where the typing indicator can be
-      height: 16,
-    },
   })
 }
 

package/src/types/resources/message.ts

@@ -17,6 +17,7 @@ export interface MessageResource {
   reactionCounts: ReactionCountResource[]
   replyCount: number
   replyRootId?: string | null
+  replyRoot?: MessageResource | null
   idempotentKey?: string | null
   messageType: string
   personIdsForSystemEvent?: number[] | null

package/src/utils/__tests__/group_messages.test.ts

@@ -124,6 +124,54 @@ describe('groupMessages — nextRendersAuthor mirrors the newer enriched neighbo
   })
 })
 
+describe('groupMessages — reply roots', () => {
+  const findShadow = (items: ReturnType<typeof groupMessages>, id: string) =>
+    items.find(item => 'type' in item && item.type === 'ReplyShadowMessage' && item.id === id)
+
+  it('carries the root from the page onto the reply and its shadow', () => {
+    const messages = [
+      message('03', { replyRootId: 'rootA' }),
+      message('02'),
+      message('rootA', { replyRootId: 'rootA', text: 'fresh' }),
+    ]
+
+    const enriched = groupMessages({ ms: messages })
+
+    expect((findEnriched(enriched, '03') as MessageResource).replyRoot?.text).toBe('fresh')
+    expect(findShadow(enriched, '03-rootA')).toMatchObject({ replyRoot: { id: 'rootA' } })
+  })
+
+  it('prefers the page copy of the root over the reply’s included snapshot', () => {
+    const snapshot = message('rootA', { replyRootId: 'rootA', text: 'stale' })
+    const messages = [
+      message('03', { replyRootId: 'rootA', replyRoot: snapshot }),
+      message('02'),
+      message('rootA', { replyRootId: 'rootA', text: 'fresh' }),
+    ]
+
+    const enriched = groupMessages({ ms: messages })
+
+    expect(findShadow(enriched, '03-rootA')).toMatchObject({ replyRoot: { text: 'fresh' } })
+  })
+
+  it('falls back to the included snapshot when the root is not on the page', () => {
+    const snapshot = message('rootA', { replyRootId: 'rootA', text: 'included' })
+    const messages = [message('02', { replyRootId: 'rootA', replyRoot: snapshot })]
+
+    const enriched = groupMessages({ ms: messages })
+
+    expect(findShadow(enriched, '02-rootA')).toMatchObject({ replyRoot: { text: 'included' } })
+  })
+
+  it('leaves replyRoot null when the root is neither on the page nor included', () => {
+    const messages = [message('02', { replyRootId: 'rootA' })]
+
+    const enriched = groupMessages({ ms: messages })
+
+    expect(findShadow(enriched, '02-rootA')).toMatchObject({ replyRoot: null })
+  })
+})
+
 describe('groupMessages — system messages', () => {
   it('flags lastInGroup true and renderAuthor false on system messages', () => {
     const messages = [

package/src/utils/__tests__/replace_equal_by_id.test.ts

@@ -0,0 +1,73 @@
+import { replaceEqualById } from '../replace_equal_by_id'
+
+type Record = { type: 'Message'; id: string; text: string; attachments: string[] }
+type Pages = { pages: { data: Record[]; links: {}; meta: {} }[]; pageParams: unknown[] }
+
+const record = (id: string, text = id): Record => ({ type: 'Message', id, text, attachments: [] })
+const pagesOf = (...pages: Record[][]): Pages => ({
+  pages: pages.map(data => ({ data, links: {}, meta: {} })),
+  pageParams: pages.map(() => ({})),
+})
+
+const share = (prev: Pages, next: Pages) => replaceEqualById(prev, next) as Pages
+
+describe('replaceEqualById', () => {
+  it('returns the previous data when nothing changed', () => {
+    const prev = pagesOf([record('c'), record('b')], [record('a')])
+    const next = pagesOf([record('c'), record('b')], [record('a')])
+
+    expect(share(prev, next)).toBe(prev)
+  })
+
+  it('keeps every existing record when one is inserted at the head', () => {
+    const [c, b] = [record('c'), record('b')]
+    const prev = pagesOf([c, b])
+    const next = pagesOf([record('d'), record('c'), record('b')])
+
+    const result = share(prev, next)
+
+    expect(result.pages[0].data[1]).toBe(c)
+    expect(result.pages[0].data[2]).toBe(b)
+    expect(result.pages[0].data[0].id).toBe('d')
+  })
+
+  it('keeps the survivors when a record is removed', () => {
+    const [c, b, a] = [record('c'), record('b'), record('a')]
+    const prev = pagesOf([c, b, a])
+    const next = pagesOf([record('c'), record('a')])
+
+    const result = share(prev, next)
+
+    expect(result.pages[0].data).toEqual([c, a])
+    expect(result.pages[0].data[0]).toBe(c)
+    expect(result.pages[0].data[1]).toBe(a)
+  })
+
+  it('replaces only the changed record and keeps its untouched nested references', () => {
+    const b = record('b')
+    const prev = pagesOf([record('c'), b])
+    const next = pagesOf([record('c'), { ...record('b', 'edited'), attachments: [] }])
+
+    const result = share(prev, next)
+
+    expect(result.pages[0].data[0]).toBe(prev.pages[0].data[0])
+    expect(result.pages[0].data[1]).not.toBe(b)
+    expect(result.pages[0].data[1].text).toBe('edited')
+    expect(result.pages[0].data[1].attachments).toBe(b.attachments)
+  })
+
+  it('keeps untouched pages when only another page changed', () => {
+    const prev = pagesOf([record('c')], [record('a')])
+    const next = pagesOf([record('d'), record('c')], [record('a')])
+
+    const result = share(prev, next)
+
+    expect(result.pages[1]).toBe(prev.pages[1])
+  })
+
+  it('returns the new data when there is nothing to share with', () => {
+    const next = pagesOf([record('a')])
+
+    expect(replaceEqualById(undefined, next)).toBe(next)
+  })
+})

package/src/utils/cache/__tests__/messages_cache_reply_roots.test.ts

@@ -0,0 +1,70 @@
+import { InfiniteData, QueryClient } from '@tanstack/react-query'
+import type { ApiCollection } from '../../../types'
+import type { MessageResource } from '../../../types/resources/message'
+import type { PersonResource } from '../../../types/resources/person'
+import { updateCacheReplyRoots } from '../messages_cache'
+
+const author = { id: 1, type: 'Person', name: 'A', avatar: null } as unknown as PersonResource
+
+const message = (id: string, overrides: Partial<MessageResource> = {}): MessageResource =>
+  ({
+    type: 'Message',
+    id,
+    text: `msg ${id}`,
+    html: '',
+    createdAt: '2026-01-01T00:00:00Z',
+    deletedAt: null,
+    textEditedAt: null,
+    mine: false,
+    attachments: [],
+    author,
+    reactionCounts: [],
+    replyCount: 0,
+    replyRootId: null,
+    messageType: 'message',
+    ...overrides,
+  }) as MessageResource
+
+const queryKey = ['messages']
+
+const seedPages = (queryClient: QueryClient, messages: MessageResource[]) => {
+  queryClient.setQueryData<InfiniteData<ApiCollection<MessageResource>>>(queryKey, {
+    pageParams: [{}],
+    pages: [{ data: messages, links: {}, meta: { count: messages.length, totalCount: 1 } }],
+  })
+}
+
+const pageMessages = (queryClient: QueryClient) =>
+  queryClient.getQueryData<InfiniteData<ApiCollection<MessageResource>>>(queryKey)!.pages[0].data
+
+describe('updateCacheReplyRoots', () => {
+  it('merges a root update into every reply carrying that root', () => {
+    const queryClient = new QueryClient()
+    const root = message('rootA', { replyRootId: 'rootA', text: 'before' })
+    seedPages(queryClient, [
+      message('03', { replyRootId: 'rootA', replyRoot: root }),
+      message('02', { replyRootId: 'rootB', replyRoot: message('rootB', { text: 'other' }) }),
+      message('01', { replyRootId: 'rootA', replyRoot: root }),
+    ])
+
+    updateCacheReplyRoots(
+      queryClient,
+      queryKey,
+      message('rootA', { replyRootId: 'rootA', text: 'after', deletedAt: '2026-01-02T00:00:00Z' })
+    )
+
+    const [newest, other, oldest] = pageMessages(queryClient)
+    expect(newest.replyRoot).toMatchObject({ text: 'after', deletedAt: '2026-01-02T00:00:00Z' })
+    expect(oldest.replyRoot).toMatchObject({ text: 'after' })
+    expect(other.replyRoot?.text).toBe('other')
+  })
+
+  it('ignores replies without an inline root', () => {
+    const queryClient = new QueryClient()
+    seedPages(queryClient, [message('01', { replyRootId: 'rootA' })])
+
+    updateCacheReplyRoots(queryClient, queryKey, message('rootA', { replyRootId: 'rootA' }))
+
+    expect(pageMessages(queryClient)[0].replyRoot).toBeUndefined()
+  })
+})

package/src/utils/cache/messages_cache.ts

@@ -4,7 +4,11 @@ import { ApiCollection, ApiResource, MessageResource } from '../../types'
 import { JoltReactionEvent } from '../../types/jolt_events'
 import { transformReactionEventDataToReactionCountResource } from '../jolt/transform_reaction_event_data_to_reaction_count_resource'
 import { getMessagesRequestArgs } from '../request/get_messages'
-import { updateOrCreateRecordInPagesData, updateRecordInPagesData } from './page_mutations'
+import {
+  updateAllRecordsInPagesData,
+  updateOrCreateRecordInPagesData,
+  updateRecordInPagesData,
+} from './page_mutations'
 import { deleteRecordInPagesData } from './page_mutations'
 
 export function updateCacheWithMessage(
@@ -66,6 +70,22 @@ export function updateCacheWithIndividualMessage(
   })
 }
 
+export function updateCacheReplyRoots(
+  queryClient: QueryClient,
+  queryKey: unknown[],
+  root: MessageResource
+) {
+  queryClient.setQueryData<MessagesQueryData>(queryKey, prev =>
+    updateAllRecordsInPagesData({
+      data: prev,
+      processRecord: message =>
+        message.replyRoot?.id === root.id
+          ? { ...message, replyRoot: mergeMessageUpdate(root, message.replyRoot) }
+          : message,
+    })
+  )
+}
+
 export function updateCacheWithReaction(
   queryClient: QueryClient,
   queryKey: unknown[],

package/src/utils/client/__tests__/transform_response.test.ts

@@ -0,0 +1,62 @@
+import transformResponse from '../transform_response'
+
+const person = (id: string, name: string) => ({
+  type: 'Person',
+  id,
+  attributes: { name, avatar: null },
+})
+
+const message = (
+  id: string,
+  { authorId, replyRootId }: { authorId: string; replyRootId: string | null }
+) => ({
+  type: 'Message',
+  id,
+  attributes: { text: `msg ${id}` },
+  relationships: {
+    author: { data: { type: 'Person', id: authorId } },
+    reply_root: { data: replyRootId ? { type: 'Message', id: replyRootId } : null },
+    reaction_counts: { data: [] },
+  },
+})
+
+const root = message('01ROOT', { authorId: '2', replyRootId: '01ROOT' })
+const reply = message('01REPLY', { authorId: '1', replyRootId: '01ROOT' })
+
+describe('transformResponse — reply_root include', () => {
+  it('attaches the included root and its author to a reply', () => {
+    const result = transformResponse({
+      data: [reply],
+      included: [root, person('1', 'Replier'), person('2', 'Root Author')],
+    })
+
+    const [transformedReply] = result.data
+    expect(transformedReply.replyRootId).toBe('01ROOT')
+    expect(transformedReply.replyRoot.id).toBe('01ROOT')
+    expect(transformedReply.replyRoot.text).toBe('msg 01ROOT')
+    expect(transformedReply.replyRoot.author.name).toBe('Root Author')
+  })
+
+  it('drops a record’s self reference so the result stays acyclic', () => {
+    const result = transformResponse({
+      data: [reply, root],
+      included: [root, person('1', 'Replier'), person('2', 'Root Author')],
+    })
+
+    const [transformedReply, transformedRoot] = result.data
+    expect(transformedReply.replyRoot.replyRoot).toBeNull()
+    expect(transformedRoot.replyRootId).toBe('01ROOT')
+    expect(transformedRoot.replyRoot).toBeNull()
+    expect(() => JSON.stringify(result)).not.toThrow()
+  })
+
+  it('leaves replyRoot null when the root is not included', () => {
+    const result = transformResponse({
+      data: [reply],
+      included: [person('1', 'Replier')],
+    })
+
+    expect(result.data[0].replyRootId).toBe('01ROOT')
+    expect(result.data[0].replyRoot).toBeNull()
+  })
+})

package/src/utils/client/transform_response.ts

@@ -32,7 +32,8 @@ const transformRelationships = relationships => {
   }, {})
 }
 
-const addIncludedRecords = (relationships, included, seen, parent) => {
+const addIncludedRecords = (record, included, seen, parent) => {
+  const { relationships } = record
   return Object.keys(relationships || {}).reduce((acc, key) => {
     const relationship = relationships[key]
     if (_.isArray(relationship.data)) {
@@ -43,13 +44,14 @@ const addIncludedRecords = (relationships, included, seen, parent) => {
       return _.set(
         acc,
         _.pluralize(key),
-        _.map(records, record => transformRecord(record, included, seen))
+        _.map(records, related => transformRecord(related, included, seen))
       )
     } else {
       const [id, type] = _.at(relationship, ['data.id', 'data.type'])
       if (id && type) {
-        const record = _.find(included, { id, type })
-        return _.set(acc, key, record ? transformRecord(record, included, seen) : null)
+        const isSelfReference = id === record.id && type === record.type
+        const related = isSelfReference ? undefined : _.find(included, { id, type })
+        return _.set(acc, key, related ? transformRecord(related, included, seen) : null)
       } else {
         return acc
       }
@@ -78,7 +80,7 @@ const transformRecord = (record, included, seen) => {
 
     seen.set(record, transformed)
 
-    return addIncludedRecords(relationships, included, seen, transformed)
+    return addIncludedRecords(record, included, seen, transformed)
   }
 }