@planningcenter/chat-react-native 3.38.0-rc.1 → 3.38.0-rc.11

package/build/utils/group_messages.js

@@ -1,8 +1,7 @@
 import dayjs from './dayjs';
 import { isSystemMessage } from './system_messages';
 const FIVE_MINUTES_MS = 5 * 60 * 1000;
-export const UNREAD_DIVIDER_KEY = 'unread-divider';
-export function groupMessages({ ms, inReplyScreen, jumpToUnreadActive, initialMessageId, }) {
+export function groupMessages({ ms, inReplyScreen }) {
     const items = [];
     let myLatestSeen = false;
     let nextNeighborEnriched;
@@ -12,9 +11,6 @@ export function groupMessages({ ms, inReplyScreen, jumpToUnreadActive, initialMe
         if (isSystemMessage(message)) {
             const enriched = enrichSystemMessage(message, next);
             items.push(enriched);
-            if (crossesUnreadBoundary(message, prev, jumpToUnreadActive, initialMessageId)) {
-                items.push(unreadDivider());
-            }
             if (datesDifferBetween(message, prev))
                 items.push(dateSeparator(message));
             nextNeighborEnriched = enriched;
@@ -25,9 +21,6 @@ export function groupMessages({ ms, inReplyScreen, jumpToUnreadActive, initialMe
             myLatestSeen = true;
         const enriched = enrichRegularMessage(message, prev, next, isMyLatest, !!inReplyScreen);
         items.push(enriched);
-        if (crossesUnreadBoundary(message, prev, jumpToUnreadActive, initialMessageId)) {
-            items.push(unreadDivider());
-        }
         const shadow = replyShadowFor(enriched, prev);
         if (shadow)
             items.push(shadow);
@@ -38,18 +31,6 @@ export function groupMessages({ ms, inReplyScreen, jumpToUnreadActive, initialMe
     });
     return items;
 }
-function crossesUnreadBoundary(message, prev, jumpToUnreadActive, initialMessageId) {
-    if (!jumpToUnreadActive)
-        return false;
-    if (!initialMessageId)
-        return false;
-    if (!prev)
-        return false;
-    return (prev.id.localeCompare(initialMessageId) <= 0 && message.id.localeCompare(initialMessageId) > 0);
-}
-function unreadDivider() {
-    return { type: 'UnreadDivider', id: UNREAD_DIVIDER_KEY };
-}
 function neighborsOf(arr, i) {
     return { prev: arr[i + 1], next: arr[i - 1] };
 }

package/build/utils/group_messages.js.map

@@ -1 +1 @@
-{"version":3,"file":"group_messages.js","sourceRoot":"","sources":["../../src/utils/group_messages.ts"],"names":[],"mappings":"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","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 const UNREAD_DIVIDER_KEY = 'unread-divider'\n\nexport type DateSeparator = { type: 'DateSeparator'; id: string; date: string }\n\nexport type UnreadDividerItem = { type: 'UnreadDivider'; id: typeof UNREAD_DIVIDER_KEY }\n\nexport type ReplyShadowMessage = {\n  type: 'ReplyShadowMessage'\n  id: string\n  messageId: string\n  isReplyShadowMessage: boolean\n  nextRendersAuthor: boolean\n}\n\nexport type EnrichedMessage =\n  | MessageResource\n  | DateSeparator\n  | UnreadDividerItem\n  | ReplyShadowMessage\n\ninterface GroupMessagesProps {\n  ms: MessageResource[]\n  inReplyScreen?: boolean\n  jumpToUnreadActive?: boolean\n  initialMessageId?: string | null\n}\n\nexport function groupMessages({\n  ms,\n  inReplyScreen,\n  jumpToUnreadActive,\n  initialMessageId,\n}: 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 (crossesUnreadBoundary(message, prev, jumpToUnreadActive, initialMessageId)) {\n        items.push(unreadDivider())\n      }\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    if (crossesUnreadBoundary(message, prev, jumpToUnreadActive, initialMessageId)) {\n      items.push(unreadDivider())\n    }\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 crossesUnreadBoundary(\n  message: MessageResource,\n  prev: MessageResource | undefined,\n  jumpToUnreadActive: boolean | undefined,\n  initialMessageId: string | null | undefined\n): boolean {\n  if (!jumpToUnreadActive) return false\n  if (!initialMessageId) return false\n  if (!prev) return false\n  return (\n    prev.id.localeCompare(initialMessageId) <= 0 && message.id.localeCompare(initialMessageId) > 0\n  )\n}\n\nfunction unreadDivider(): UnreadDividerItem {\n  return { type: 'UnreadDivider', id: UNREAD_DIVIDER_KEY }\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"]}
+{"version":3,"file":"group_messages.js","sourceRoot":"","sources":["../../src/utils/group_messages.ts"],"names":[],"mappings":"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","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"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@planningcenter/chat-react-native",
-  "version": "3.38.0-rc.1",
+  "version": "3.38.0-rc.11",
   "description": "",
   "main": "build/index.js",
   "react-native": "./src/index.tsx",
@@ -26,9 +26,9 @@
   "dependencies": {
     "@fortawesome/fontawesome-svg-core": "^7.2.0",
     "@fortawesome/react-native-fontawesome": "^0.3.2",
+    "@planningcenter/emoji-keyboard": "3.38.0-rc.11",
     "lodash-inflection": "^1.5.0",
-    "react-compiler-runtime": "^1.0.0",
-    "rn-emoji-keyboard": "1.7.0"
+    "react-compiler-runtime": "^1.0.0"
   },
   "peerDependencies": {
     "@planningcenter/datetime-fmt": ">=2.0.0",
@@ -72,5 +72,5 @@
     "react-native-url-polyfill": "^2.0.0",
     "typescript": "~5.9.2"
   },
-  "gitHead": "addadedc983bf11d717e5528d8d4d143a7acd4c9"
+  "gitHead": "02d0d805d82b046009c238100d6ec601b4295b39"
 }

package/src/__tests__/hooks/use_group_chat_conversation_payload.test.tsx

@@ -0,0 +1,50 @@
+import { QueryClientProvider } from '@tanstack/react-query'
+import { renderHook, waitFor } from '@testing-library/react-native'
+import React from 'react'
+import { buildTestQueryClient } from '../../__utils__/query_client'
+import { useGroupChatConversationPayload } from '../../hooks/groups/use_group_chat_conversation_payload'
+import * as useApiClientModule from '../../hooks/use_api_client'
+
+const mockGroupsPost = (impl: jest.Mock) => {
+  jest.spyOn(useApiClientModule, 'useApiClient').mockReturnValue({
+    groups: { post: impl },
+  } as unknown as ReturnType<typeof useApiClientModule.useApiClient>)
+  return impl
+}
+
+const resolveWith = (value: string) =>
+  jest.fn().mockResolvedValue({
+    data: { type: 'GroupChatConversationPayload', id: '1', value },
+    links: {},
+    meta: {},
+  })
+
+describe('useGroupChatConversationPayload', () => {
+  afterEach(() => {
+    jest.restoreAllMocks()
+  })
+
+  it('refetches on mount even when a fresh payload is already cached', async () => {
+    // Prime the cache as if a payload was fetched moments ago. The hook's 25-min staleTime
+    // means the default refetchOnMount would treat this as fresh and skip the request, so a
+    // group composition change on web would stay invisible until the cache is dropped (app
+    // restart). refetchOnMount: 'always' must override that and refetch on every mount.
+    const queryClient = buildTestQueryClient()
+    queryClient.setQueryData(['groups', '/me/groups/1/chat_conversation_payload'], {
+      data: { type: 'GroupChatConversationPayload', id: '1', value: 'stale' },
+      links: {},
+      meta: {},
+    })
+    const post = mockGroupsPost(resolveWith('fresh'))
+    const wrapper = ({ children }: { children: React.ReactNode }) => (
+      <QueryClientProvider client={queryClient}>{children}</QueryClientProvider>
+    )
+
+    const { result } = renderHook(() => useGroupChatConversationPayload({ groupId: 1 }), {
+      wrapper,
+    })
+
+    await waitFor(() => expect(post).toHaveBeenCalledTimes(1))
+    await waitFor(() => expect(result.current.payload).toBe('fresh'))
+  })
+})

package/src/__tests__/jest.ts

@@ -4,8 +4,8 @@ describe('jestTransformPackages', () => {
   it('exports an array of package patterns', () => {
     expect(jestTransformPackages).toEqual([
       '@planningcenter/chat-react-native',
+      '@planningcenter/emoji-keyboard',
       '@fortawesome',
-      'rn-emoji-keyboard',
     ])
   })
 })

package/src/__tests__/utils/client.ts

@@ -369,4 +369,36 @@ describe('error handling', () => {
       ).rejects.toHaveProperty('status', 401)
     }
   })
+
+  describe('non-401 errors', () => {
+    it('attaches the parsed body so the message survives to the UI', async () => {
+      const url = '/records'
+
+      MockServer.post(
+        url,
+        {
+          errors: [
+            {
+              status: '422',
+              title: 'Unprocessable Entity',
+              detail: 'Conversations including a minor must have at least two confirmed adults.',
+            },
+          ],
+        },
+        422,
+        { once: true }
+      )
+
+      const rejection = (await client
+        .post({ url, data: { data: { type: 'Record', attributes: {} } } })
+        .catch(e => e)) as FailedResponse
+
+      expect(rejection).toHaveProperty('status', 422)
+      expect(rejection.errors?.[0]?.detail).toEqual(
+        'Conversations including a minor must have at least two confirmed adults.'
+      )
+      // A 422 must not be mistaken for an auth failure
+      expect(onUnauthorizedResponse).not.toHaveBeenCalled()
+    })
+  })
 })

package/src/components/conversation/__tests__/message_list.test.tsx

@@ -0,0 +1,14 @@
+import { render } from '@testing-library/react-native'
+import { createRef } from 'react'
+import { FlatList } from 'react-native-gesture-handler'
+import { MessageList } from '../message_list'
+
+describe('MessageList', () => {
+  it('renders with the gesture-handler FlatList so overscroll cannot drag an enclosing sheet', () => {
+    const listRef = createRef<FlatList>()
+
+    const screen = render(<MessageList listRef={listRef} data={[]} renderItem={() => null} />)
+
+    expect(screen.UNSAFE_getByType(FlatList)).toBeTruthy()
+  })
+})

package/src/components/conversation/jump_to_bottom_button.tsx

@@ -1,13 +1,12 @@
 import { useEffect } from 'react'
-import { ActivityIndicator, Pressable, StyleSheet, View } from 'react-native'
+import { View, Pressable, StyleSheet } from 'react-native'
 import Animated, {
-  Extrapolation,
+  useSharedValue,
+  useAnimatedStyle,
   interpolate,
+  Extrapolation,
   ReduceMotion,
-  useAnimatedStyle,
-  useSharedValue,
   withSpring,
-  withTiming,
 } from 'react-native-reanimated'
 import { useTheme } from '../../hooks'
 import { platformFontWeightMedium } from '../../utils'
@@ -16,17 +15,11 @@ import { Icon, Text } from '../display'
 interface JumpToBottomButtonProps {
   onPress: () => void
   visible: boolean
-  loading?: boolean
 }
 
-export const JumpToBottomButton = ({
-  onPress,
-  visible,
-  loading = false,
-}: JumpToBottomButtonProps) => {
+export const JumpToBottomButton = ({ onPress, visible }: JumpToBottomButtonProps) => {
   const styles = useStyles()
   const progress = useSharedValue(0)
-  const loadingProgress = useSharedValue(0)
 
   useEffect(() => {
     progress.value = withSpring(visible ? 1 : 0, {
@@ -38,13 +31,6 @@ export const JumpToBottomButton = ({
     })
   }, [visible, progress])
 
-  useEffect(() => {
-    loadingProgress.value = withTiming(loading ? 1 : 0, {
-      duration: 750,
-      reduceMotion: ReduceMotion.System,
-    })
-  }, [loading, loadingProgress])
-
   const animatedStyle = useAnimatedStyle(() => {
     return {
       opacity: progress.value,
@@ -59,34 +45,16 @@ export const JumpToBottomButton = ({
     }
   })
 
-  const iconStyle = useAnimatedStyle(() => ({ opacity: 1 - loadingProgress.value }))
-  const spinnerStyle = useAnimatedStyle(() => ({ opacity: loadingProgress.value }))
-
   return (
     <View>
-      <Animated.View
-        style={[styles.container, animatedStyle]}
-        pointerEvents={visible ? 'auto' : 'none'}
-      >
+      <Animated.View style={[styles.container, animatedStyle]}>
         <Pressable
           onPress={onPress}
-          disabled={loading}
-          accessibilityRole="button"
-          accessibilityLabel="Jump to most recent message"
-          accessibilityState={{ busy: loading }}
-          hitSlop={hitSlop}
           style={({ pressed }) => [styles.button, pressed && styles.pressed]}
         >
-          <View style={styles.glyph}>
-            <Animated.View style={[styles.glyphLayer, iconStyle]}>
-              <Icon name="general.downArrow" style={styles.icon} />
-            </Animated.View>
-            <Animated.View style={[styles.glyphLayer, spinnerStyle]}>
-              <ActivityIndicator size="small" color={styles.icon.color} style={styles.spinner} />
-            </Animated.View>
-          </View>
+          <Icon name="general.downArrow" style={styles.icon} />
           <Text variant="tertiary" style={styles.text}>
-            {loading ? 'Jumping to latest…' : 'Jump to bottom'}
+            Jump to bottom
           </Text>
         </Pressable>
       </Animated.View>
@@ -94,8 +62,6 @@ export const JumpToBottomButton = ({
   )
 }
 
-const hitSlop = { top: 12, bottom: 12, left: 12, right: 12 }
-
 const useStyles = () => {
   const { colors } = useTheme()
 
@@ -127,25 +93,10 @@ const useStyles = () => {
       color: colors.fillColorNeutral100Inverted,
       fontWeight: platformFontWeightMedium,
     },
-    glyph: {
-      width: 14,
-      height: 14,
-      alignItems: 'center',
-      justifyContent: 'center',
-    },
-    glyphLayer: {
-      position: 'absolute',
-      alignItems: 'center',
-      justifyContent: 'center',
-    },
     icon: {
       color: colors.fillColorNeutral100Inverted,
       fontSize: 14,
     },
-    spinner: {
-      width: 14,
-      height: 14,
-    },
     pressed: {
       transform: [{ scale: 0.95 }],
     },

package/src/components/conversation/message_list.tsx

@@ -0,0 +1,42 @@
+import { RefObject } from 'react'
+import { StyleSheet, type FlatListProps } from 'react-native'
+import { FlatList } from 'react-native-gesture-handler'
+import type { EnrichedMessage } from '../../utils/group_messages'
+
+const extractItemKey = (item: EnrichedMessage) => String(item.id)
+const maintainVisibleContentPosition = { minIndexForVisible: 0 }
+
+type MessageListProps = Pick<
+  FlatListProps<EnrichedMessage>,
+  | 'data'
+  | 'renderItem'
+  | 'onScroll'
+  | 'onScrollBeginDrag'
+  | 'viewabilityConfigCallbackPairs'
+  | 'onContentSizeChange'
+  | 'onScrollToIndexFailed'
+  | 'onEndReached'
+  | 'ListHeaderComponent'
+> & {
+  listRef: RefObject<FlatList | null>
+}
+
+export function MessageList({ listRef, ...props }: MessageListProps) {
+  return (
+    <FlatList
+      inverted
+      ref={listRef}
+      contentContainerStyle={styles.listContainer}
+      maintainVisibleContentPosition={maintainVisibleContentPosition}
+      keyExtractor={extractItemKey}
+      scrollEventThrottle={64}
+      {...props}
+    />
+  )
+}
+
+const styles = StyleSheet.create({
+  listContainer: {
+    paddingVertical: 12,
+  },
+})

package/src/components/conversation/reply_shadow_message.tsx

@@ -28,7 +28,7 @@ import {
 import { Avatar, Icon, IconProps, Image, Text } from '../display'
 import { TheirReplyConnector, MyReplyConnector } from './reply_connectors'
 
-interface ReplyShadowMessageProps {
+interface ReplyShadowMessageProps extends MessageResource {
   messageId: string
   conversation_id: number
   inReplyScreen?: boolean

package/src/components/display/conversation_avatar.tsx

@@ -52,6 +52,7 @@ interface ConversationAvatarProps {
   showFallback?: boolean
   fallbackIconName?: IconString
   style?: ViewStyle
+  maxFontSizeMultiplier?: AvatarRootProps['maxFontSizeMultiplier']
 }
 
 export function ConversationAvatar({
@@ -60,30 +61,31 @@ export function ConversationAvatar({
   showFallback = false,
   fallbackIconName = 'general.person',
   style,
+  maxFontSizeMultiplier,
 }: ConversationAvatarProps) {
   const avatar = resolveAvatar(conversation)
+  const sizeProps = { size, maxFontSizeMultiplier, style }
 
   switch (avatar.kind) {
     case 'image':
       return (
-        <AvatarPrimitive.Root size={size} style={style}>
+        <AvatarPrimitive.Root {...sizeProps}>
           <AvatarPrimitive.Mask>
             <AvatarPrimitive.Image sourceUri={avatar.url} />
           </AvatarPrimitive.Mask>
         </AvatarPrimitive.Root>
       )
     case 'icon':
-      return <IconAvatar iconKey={avatar.iconKey} color={avatar.color} size={size} />
+      return <IconAvatar iconKey={avatar.iconKey} color={avatar.color} {...sizeProps} />
     case 'emoji':
-      return <EmojiAvatar emoji={avatar.emoji} color={avatar.color} size={size} />
+      return <EmojiAvatar emoji={avatar.emoji} color={avatar.color} {...sizeProps} />
     case 'group':
       return (
         <AvatarGroup
           sourceUris={avatar.sources || []}
-          size={size}
           showFallback={showFallback || !avatar.sources || avatar.sources.length === 0}
           fallbackIconName={fallbackIconName}
-          style={style}
+          {...sizeProps}
         />
       )
   }

package/src/components/display/emoji_avatar.tsx

@@ -20,13 +20,21 @@ interface EmojiAvatarProps {
   emoji: string
   color?: string | null
   size?: AvatarRootProps['size']
+  maxFontSizeMultiplier?: AvatarRootProps['maxFontSizeMultiplier']
+  style?: AvatarRootProps['style']
 }
 
-export function EmojiAvatar({ emoji, color, size = 'lg' }: EmojiAvatarProps) {
+export function EmojiAvatar({
+  emoji,
+  color,
+  size = 'lg',
+  maxFontSizeMultiplier,
+  style,
+}: EmojiAvatarProps) {
   const gradientProps = getAvatarGradientProps(color)
 
   return (
-    <AvatarPrimitive.Root size={size}>
+    <AvatarPrimitive.Root size={size} maxFontSizeMultiplier={maxFontSizeMultiplier} style={style}>
       <AvatarPrimitive.Mask>
         <LinearGradient {...gradientProps} style={styles.gradientFill}>
           <View style={styles.contentContainer}>

package/src/components/display/icon_avatar.tsx

@@ -26,13 +26,21 @@ interface IconAvatarProps {
   iconKey: string
   color?: string | null
   size?: AvatarRootProps['size']
+  maxFontSizeMultiplier?: AvatarRootProps['maxFontSizeMultiplier']
+  style?: AvatarRootProps['style']
 }
 
 function findIcon(iconKey: string): IconDefinition | undefined {
   return findIconDefinition({ prefix: 'fas', iconName: iconKey as IconName })
 }
 
-export function IconAvatar({ iconKey, color, size = 'lg' }: IconAvatarProps) {
+export function IconAvatar({
+  iconKey,
+  color,
+  size = 'lg',
+  maxFontSizeMultiplier,
+  style,
+}: IconAvatarProps) {
   const gradientProps = getAvatarGradientProps(color)
   const iconDef = findIcon(iconKey)
 
@@ -41,7 +49,7 @@ export function IconAvatar({ iconKey, color, size = 'lg' }: IconAvatarProps) {
   }
 
   return (
-    <AvatarPrimitive.Root size={size}>
+    <AvatarPrimitive.Root size={size} maxFontSizeMultiplier={maxFontSizeMultiplier} style={style}>
       <AvatarPrimitive.Mask>
         <LinearGradient {...gradientProps} style={styles.gradientFill}>
           <View style={styles.contentContainer}>

package/src/contexts/conversation_context.tsx

@@ -1,59 +1,31 @@
-import React, { createContext, PropsWithChildren, useContext, useMemo, useState } from 'react'
+import React, { createContext, PropsWithChildren, useContext, useMemo } from 'react'
 
 interface ConversationContextValue {
   conversationId: number
   currentPageReplyRootId: string | null
-  initialMessageId: string | null
-  setInitialMessageId: (id: string | null) => void
-  initialMessageIdIsAnchor: boolean
-  atEndOfMessageHistory: boolean
-  setAtEndOfMessageHistory: (atEnd: boolean) => void
 }
 
 interface ConversationContextProviderProps extends PropsWithChildren {
   conversationId: number
   currentPageReplyRootId: string | null
-  initialMessageId?: string | null
-  initialMessageIdIsAnchor?: boolean
 }
 
 const ConversationContext = createContext<ConversationContextValue>({
   conversationId: 0,
   currentPageReplyRootId: null,
-  initialMessageId: null,
-  setInitialMessageId: () => {},
-  initialMessageIdIsAnchor: false,
-  atEndOfMessageHistory: false,
-  setAtEndOfMessageHistory: () => {},
 })
 
 export const ConversationContextProvider = ({
   children,
   conversationId,
   currentPageReplyRootId,
-  initialMessageId: initialMessageIdProp = null,
-  initialMessageIdIsAnchor = false,
 }: ConversationContextProviderProps) => {
-  const [initialMessageId, setInitialMessageId] = useState(initialMessageIdProp)
-  const [atEndOfMessageHistory, setAtEndOfMessageHistory] = useState(false)
-
   const value = useMemo(
     () => ({
       conversationId,
       currentPageReplyRootId,
-      initialMessageId,
-      setInitialMessageId,
-      initialMessageIdIsAnchor,
-      atEndOfMessageHistory,
-      setAtEndOfMessageHistory,
     }),
-    [
-      conversationId,
-      currentPageReplyRootId,
-      initialMessageId,
-      initialMessageIdIsAnchor,
-      atEndOfMessageHistory,
-    ]
+    [conversationId, currentPageReplyRootId]
   )
 
   return <ConversationContext.Provider value={value}>{children}</ConversationContext.Provider>

package/src/hooks/groups/use_group_chat_conversation_payload.ts

@@ -26,6 +26,7 @@ export function useGroupChatConversationPayload({ groupId, enabled = true }: Pro
         },
       }),
     staleTime: STALE_TIME_MS,
+    refetchOnMount: 'always',
     enabled,
   })
 

package/src/hooks/index.ts

@@ -16,6 +16,7 @@ export * from './use_message_reaction_toggle'
 export * from './use_new_conversation_entry'
 export * from './use_organization'
 export * from './use_people_person'
+export * from './use_preview_avatar_diameter'
 export * from './use_product_analytics'
 export * from './use_qualified_by_age'
 export * from './use_scalable_number_of_lines'