@planningcenter/chat-react-native 3.42.2-qa-821.1 → 3.42.2-qa-staging.3

package/src/__utils__/handlers.ts

@@ -1,4 +1,5 @@
-import { http, HttpResponse, type JsonBodyType } from 'msw'
+import { http, HttpResponse } from 'msw'
+import { JSONAPIResponse } from '../types'
 import DefaultFixtures from './fixtures/defaults'
 
 export const BASE_URL = 'https://api.pco.test/chat/v2'
@@ -12,25 +13,25 @@ export const handlers = [
   del(BASE_URL + '/records/:id'),
 ]
 
-function get(url: string, mockedResponse: JsonBodyType, mockedStatus: number = 200) {
+function get(url: string, mockedResponse: JSONAPIResponse, mockedStatus: number = 200) {
   return http.get(url, () => {
     return HttpResponse.json(mockedResponse, { status: mockedStatus })
   })
 }
 
-function post(url: string, mockedResponse: JsonBodyType, mockedStatus: number = 200) {
+function post(url: string, mockedResponse: JSONAPIResponse, mockedStatus: number = 200) {
   return http.post(url, () => {
     return HttpResponse.json(mockedResponse, { status: mockedStatus })
   })
 }
 
-function del(url: string, mockedResponse?: JsonBodyType, mockedStatus: number = 200) {
+function del(url: string, mockedResponse?: JSONAPIResponse, mockedStatus: number = 200) {
   return http.delete(url, () => {
     return HttpResponse.json(mockedResponse, { status: mockedStatus })
   })
 }
 
-function patch(url: string, mockedResponse: JsonBodyType, mockedStatus: number = 200) {
+function patch(url: string, mockedResponse: JSONAPIResponse, mockedStatus: number = 200) {
   return http.patch(url, () => {
     return HttpResponse.json(mockedResponse, { status: mockedStatus })
   })

package/src/components/conversation/attachments/attachment_deleting_overlay.tsx

@@ -1,3 +1,4 @@
+import React from 'react'
 import { View, StyleSheet } from 'react-native'
 import { useTheme } from '../../../hooks'
 import { Spinner } from '../../display'
@@ -18,22 +19,14 @@ const useStyles = () => {
 
   return StyleSheet.create({
     container: {
-      position: 'absolute',
-      top: 0,
-      left: 0,
-      right: 0,
-      bottom: 0,
+      ...StyleSheet.absoluteFillObject,
       justifyContent: 'center',
       alignItems: 'center',
       borderRadius: 8,
       overflow: 'hidden',
     },
     overlay: {
-      position: 'absolute',
-      top: 0,
-      left: 0,
-      right: 0,
-      bottom: 0,
+      ...StyleSheet.absoluteFillObject,
       backgroundColor: colors.fillColorNeutral070,
       opacity: 0.5,
     },

package/src/components/conversations/conversation_preview.tsx

@@ -6,8 +6,10 @@ import {
   useFontScale,
   useScalableNumberOfLines,
 } from '../../hooks'
-import { ConversationResource } from '../../types'
+import { ConversationPreviewData, ConversationResource } from '../../types'
+import { REACTION_EMOJIS, platformFontWeightBold } from '../../utils'
 import { formatDatePreview } from '../../utils/date'
+import { tokens } from '../../vendor/tapestry/tokens'
 import { AvatarGroup, ConversationAvatar, Heading, Text, Badge, type BadgeProps } from '../display'
 import { ConversationActions } from './conversation_actions'
 import { MuteIndicator } from './mute_indicator'
@@ -30,25 +32,26 @@ export const ConversationPreview = ({
 }: ConversationPreviewProps) => {
   const styles = useStyles()
   const {
-    lastMessageAuthorName,
+    conversationPreview,
     lastMessageCreatedAt,
-    lastMessageTextPreview,
     title,
     unreadCount,
     badges,
     muted,
     disabled,
+    unreadReaction,
   } = conversation
 
   const emptyConversation = !lastMessageCreatedAt
   const fallbackIconName = emptyConversation ? 'people.noTextMessage' : 'general.person'
   const hasMetaContent = lastMessageCreatedAt || unreadCount > 0 || muted
+  const isUnread = unreadCount > 0 || unreadReaction
 
   const numberOfLinesScaledTitle = useScalableNumberOfLines(1)
   const numberOfLinesScaledPreviewText = useScalableNumberOfLines(2)
 
-  const conversationPreviewText = lastMessageTextPreview
-    ? `${lastMessageAuthorName}: ${lastMessageTextPreview}`
+  const conversationPreviewText = conversationPreview
+    ? formatConversationPreviewText(conversationPreview)
     : EMPTY_CONVERSATION_PREVIEW_TEXT
 
   const conversationAccessibilityLabel = getConversationAccessibilityLabel({
@@ -69,13 +72,20 @@ export const ConversationPreview = ({
         fallbackIconName={fallbackIconName}
       />
       <View style={styles.conversationBody}>
-        <Heading numberOfLines={numberOfLinesScaledTitle} variant="h3" style={styles.title}>
+        <Heading
+          numberOfLines={numberOfLinesScaledTitle}
+          variant="h3"
+          style={[styles.title, isUnread && styles.unreadTitle]}
+        >
           {title}
         </Heading>
         <Text
           variant="tertiary"
           numberOfLines={numberOfLinesScaledPreviewText}
-          style={emptyConversation && styles.emptyConversationPreviewText}
+          style={[
+            emptyConversation && styles.emptyConversationPreviewText,
+            isUnread && styles.unreadText,
+          ]}
         >
           {conversationPreviewText}
         </Text>
@@ -83,9 +93,9 @@ export const ConversationPreview = ({
       </View>
       {hasMetaContent && (
         <View style={styles.metaContainer}>
-          <Text variant="tertiary">{formatDatePreview(lastMessageCreatedAt)}</Text>
+          <Text variant="tertiary">{formatDatePreview(conversationPreview?.createdAt)}</Text>
           <View style={styles.statusContainer}>
-            <UnreadCountBadge count={unreadCount} showDot={muted} />
+            <UnreadCountBadge count={unreadCount} unreadReaction={unreadReaction} showDot={muted} />
             <MuteIndicator muted={muted} />
           </View>
         </View>
@@ -152,6 +162,30 @@ export const ConversationPreviewSkeleton = () => {
   )
 }
 
+function reactionEmoji(value: ConversationPreviewData['value']): string | null {
+  if (!value) return null
+  return REACTION_EMOJIS[value] ?? null
+}
+
+function formatConversationPreviewText(preview: ConversationPreviewData) {
+  if (preview.kind === 'reaction') {
+    const emoji = reactionEmoji(preview.value)
+    return `${preview.authorName}${emoji ? ` ${emoji}` : ' reacted'} to: "${preview.text}"`
+  }
+
+  return `${preview.authorName}: ${preview.text}`
+}
+
+function formatConversationPreviewAccessibilityLabel(preview: ConversationPreviewData) {
+  const date = formatDatePreview(preview.createdAt)
+
+  if (preview.kind === 'reaction') {
+    return `${preview.authorName} reacted to your message sent ${date} and says ${preview.text}`
+  }
+
+  return `Last message sent ${date} from ${preview.authorName} and says ${preview.text}`
+}
+
 interface GetConversationAccessibilityLabelProps {
   conversation: ConversationResource
   showBadges: boolean
@@ -160,29 +194,24 @@ const getConversationAccessibilityLabel = ({
   conversation,
   showBadges,
 }: GetConversationAccessibilityLabelProps) => {
-  const {
-    badges,
-    title,
-    lastMessageAuthorName,
-    lastMessageTextPreview,
-    muted,
-    disabled,
-    unreadCount,
-    lastMessageCreatedAt,
-  } = conversation
+  const { badges, title, conversationPreview, muted, disabled, unreadCount, unreadReaction } =
+    conversation
 
   const hasBadges = badges && showBadges
   const hasUnreadMessages = unreadCount > 0
-  const hasLastMessage = lastMessageCreatedAt
 
   const label = {
     title,
     badge: hasBadges ? `for ${badges[0]?.pcoResourceType} ${badges[0]?.text || ''}` : '',
     disabled: disabled ? 'Disabled' : '',
     muted: muted ? 'Muted' : '',
-    readStatus: hasUnreadMessages ? `${unreadCount} unread messages` : '',
-    lastMessage: hasLastMessage
-      ? `Last message sent ${formatDatePreview(lastMessageCreatedAt)} from ${lastMessageAuthorName} and says ${lastMessageTextPreview}`
+    readStatus: hasUnreadMessages
+      ? `${unreadCount} unread messages`
+      : unreadReaction
+        ? 'unread reaction'
+        : '',
+    lastMessage: conversationPreview
+      ? formatConversationPreviewAccessibilityLabel(conversationPreview)
       : EMPTY_CONVERSATION_PREVIEW_TEXT,
   }
 
@@ -222,6 +251,12 @@ const useStyles = () => {
       fontSize: 16,
       color: colors.textColorDefaultPrimary,
     },
+    unreadTitle: {
+      fontWeight: tokens.fontWeightBold,
+    },
+    unreadText: {
+      fontWeight: platformFontWeightBold,
+    },
     titleLoading: {
       width: 120,
       height: 20,

package/src/components/conversations/unread_count_badge.tsx

@@ -4,12 +4,21 @@ import { useFontScale, useTheme } from '../../hooks'
 import { MAX_FONT_SIZE_MULTIPLIER, platformFontWeightBold } from '../../utils'
 import { Text } from '../display'
 
-export const UnreadCountBadge = ({ count, showDot }: { count: number; showDot: boolean }) => {
+export const UnreadCountBadge = ({
+  count,
+  unreadReaction,
+  showDot,
+}: {
+  count: number
+  unreadReaction: boolean
+  showDot: boolean
+}) => {
   const styles = useStyles()
   const displayCount = count > 99 ? '99+' : count
+  const isUnread = count > 0 || unreadReaction
 
-  if (count === 0) return null
-  if (showDot) return <View style={styles.dot} />
+  if (!isUnread) return null
+  if (showDot || count === 0) return <View style={styles.dot} />
 
   return (
     <View style={styles.badge}>
@@ -24,7 +33,7 @@ const useStyles = () => {
   const { colors } = useTheme()
   const dotScaleLimit = MAX_FONT_SIZE_MULTIPLIER * 1.5
   const fontScale = useFontScale({ maxFontSizeMultiplier: dotScaleLimit })
-  const size = 8 * fontScale
+  const size = 10 * fontScale
 
   return StyleSheet.create({
     badge: {

package/src/components/page/__tests__/component_error_boundary.test.tsx

@@ -4,7 +4,7 @@ import { Text } from 'react-native'
 import { Log } from '../../../utils/native_adapters/configuration'
 import { ComponentErrorBoundary } from '../component_error_boundary'
 
-function Boom({ thrown }: { thrown: unknown }): React.ReactElement {
+function Boom({ thrown }: { thrown: unknown }) {
   throw thrown
 }
 

package/src/components/page/__tests__/error_boundary.test.tsx

@@ -6,7 +6,7 @@ import { Log } from '../../../utils/native_adapters/configuration'
 import { ResponseError } from '../../../utils/response_error'
 import { ErrorBoundary } from '../error_boundary'
 
-function Boom({ thrown }: { thrown: unknown }): React.ReactElement {
+function Boom({ thrown }: { thrown: unknown }) {
   throw thrown
 }
 
@@ -46,11 +46,7 @@ describe('ErrorBoundary', () => {
   })
 
   it('does not report ResponseError — those are owned by the HTTP layer', () => {
-    const failure = {
-      status: 500,
-      statusText: 'Server Error',
-      errors: [],
-    } as unknown as FailedResponse
+    const failure = { status: 500, statusText: 'Server Error', errors: [] } as FailedResponse
 
     render(
       <ErrorBoundary fallback={null}>

package/src/components/page/__tests__/page_error_boundary.test.tsx

@@ -26,7 +26,7 @@ jest.mock('../../primitive/blank_state_primitive', () => {
   }
 })
 
-function Boom({ thrown }: { thrown: unknown }): React.ReactElement {
+function Boom({ thrown }: { thrown: unknown }) {
   throw thrown
 }
 

package/src/hooks/use_conversation.ts

@@ -16,6 +16,7 @@ export const getConversationRequestArgs = ({ conversation_id }: { conversation_i
         'created_at',
         'badges',
         'conversation_membership',
+        'conversation_preview',
         'gender_option',
         'groups',
         'last_message_author_id',
@@ -36,6 +37,7 @@ export const getConversationRequestArgs = ({ conversation_id }: { conversation_i
         'replies_disabled',
         'title',
         'unread_count',
+        'unread_reaction',
         'updated_at',
       ],
       AnalyticsMetadata: ['metadata'],

package/src/hooks/use_conversation_jolt_events.ts

@@ -63,7 +63,7 @@ export function useConversationJoltEvents({ conversationId }: Props) {
           data: {
             ...prev.data,
             latestReadMessageSortKey: latest_read_message_sort_key,
-            unreadReactionCount: 0,
+            unreadReaction: false,
           },
         }
       })
@@ -87,25 +87,9 @@ export function useConversationJoltEvents({ conversationId }: Props) {
 
   const handleReactionJoltEvent = useCallback(
     (event: JoltReactionEvent) => {
-      queryClient.setQueryData<ApiResource<ConversationResource>>(queryKey, prev => {
-        if (!prev?.data) return prev
+      if (event.data.data.author_id === currentPersonId) return
 
-        if (event.data.data.author_id === currentPersonId) {
-          return prev
-        }
-
-        return {
-          ...prev,
-          data: {
-            ...prev.data,
-            // Not a real count, just a derived value from Jolt events so we can
-            // determine if we should mark the conversation as read
-            unreadReactionCount: prev.data.unreadReactionCount
-              ? prev.data.unreadReactionCount + 1
-              : 1,
-          },
-        }
-      })
+      queryClient.invalidateQueries({ queryKey })
     },
     [queryClient, queryKey, currentPersonId]
   )

package/src/hooks/use_conversation_messages.ts

@@ -7,11 +7,10 @@ export const useConversationMessages = (
   { conversation_id, reply_root_id }: { conversation_id: number; reply_root_id?: string | null },
   opts?: SuspensePaginatorOptions
 ) => {
-  const { data, refetch, isRefetching, fetchNextPage, hasNextPage } =
-    useSuspensePaginator<MessageResource>(
-      getMessagesRequestArgs({ conversation_id, reply_root_id }),
-      opts
-    )
+  const { data, refetch, isRefetching, fetchNextPage } = useSuspensePaginator<MessageResource>(
+    getMessagesRequestArgs({ conversation_id, reply_root_id }),
+    opts
+  )
   const queryKey = getMessagesQueryKey({ conversation_id, reply_root_id })
   const messages = useMemo(
     () =>
@@ -25,5 +24,5 @@ export const useConversationMessages = (
     [data]
   )
 
-  return { messages, refetch, isRefetching, fetchNextPage, hasNextPage, queryKey }
+  return { messages, refetch, isRefetching, fetchNextPage, queryKey }
 }

package/src/hooks/use_conversations_actions.ts

@@ -20,7 +20,7 @@ export const useConversationsMarkRead = ({
     currentPersonCache.update({}, person => {
       const currentUnread = person.unreadCount
       const updatedUnread = read ? Math.max(currentUnread - 1, 0) : currentUnread + 1
-      return { ...person, unreadCount: updatedUnread, unreadReactionCount: 0 }
+      return { ...person, unreadCount: updatedUnread }
     })
   }
 
@@ -29,6 +29,7 @@ export const useConversationsMarkRead = ({
       update({
         ...conversation,
         unreadCount: read ? 0 : 1,
+        ...(read ? { unreadReaction: false } : {}),
       })
       handlePersonUnreadCount(read)
     },
@@ -106,6 +107,7 @@ export const useMarkAllRead = () => {
     onMutate: () => {
       updateAll({
         unreadCount: 0,
+        unreadReaction: false,
       })
     },
     mutationKey: ['markAllRead', args],

package/src/hooks/use_mark_latest_message_read.ts

@@ -17,9 +17,9 @@ export function useMarkLatestMessageRead({ conversation }: Props) {
     [markRead]
   )
   const unreadCount = conversation.unreadCount
-  const unreadReactionCount = conversation.unreadReactionCount || 0
+  const unreadReaction = conversation.unreadReaction
 
-  const shouldMarkRead = Boolean(unreadCount >= 1 || unreadReactionCount > 0 || !firedOnce.current)
+  const shouldMarkRead = Boolean(unreadCount >= 1 || unreadReaction || !firedOnce.current)
   const appState = useAppState()
   const isActive = appState === 'active'
 
@@ -29,6 +29,5 @@ export function useMarkLatestMessageRead({ conversation }: Props) {
     firedOnce.current = true
 
     debouncedMarkRead(true)
-    // keeping unreadReactionCount in the dependency array to watch for changes
-  }, [debouncedMarkRead, isActive, shouldMarkRead, unreadReactionCount])
+  }, [debouncedMarkRead, isActive, shouldMarkRead, unreadReaction])
 }

package/src/index.tsx

@@ -12,8 +12,7 @@ export { default as Event } from './polyfills/events/Event'
 export * from './screens'
 export { AgeCheckUnderageScreen } from './screens/age_check/age_check_underage_screen' // TODO: add to barrel
 export * from './types'
-export { platformFontWeightBold, Session, Uri } from './utils'
-export type { ENV, TemporaryDefaultColorsType } from './utils'
+export { ENV, platformFontWeightBold, Session, TemporaryDefaultColorsType, Uri } from './utils'
 export * from './utils/client'
 export * from './utils/host_bridge'
 export * from './utils/native_adapters'

package/src/polyfills/events/EventTarget.ts

@@ -142,7 +142,7 @@ export default class EventTarget {
 
   removeEventListener(
     type: string,
-    callback: EventListener | null,
+    callback: EventListener,
     optionsOrUseCapture: EventListenerOptions | boolean = {}
   ): void {
     if (arguments.length < 2) {

package/src/screens/conversation_screen.tsx

@@ -89,7 +89,7 @@ function ConversationScreenContent({ route }: ConversationScreenProps) {
   const { conversation_id, editing_message_id, reply_root_id, reply_root_author_name } =
     route.params
   const { data: conversation } = useConversation(route.params)
-  const { messages, fetchNextPage, hasNextPage } = useConversationMessages({
+  const { messages, fetchNextPage } = useConversationMessages({
     conversation_id,
     reply_root_id,
   })
@@ -181,9 +181,7 @@ function ConversationScreenContent({ route }: ConversationScreenProps) {
             onScroll={trackScroll}
             scrollEventThrottle={10}
             ListFooterComponent={
-              hasNextPage ? null : (
-                <ConversationStartBanner conversation={conversation} hasMessages={true} />
-              )
+              <ConversationStartBanner conversation={conversation} hasMessages={true} />
             }
             renderItem={({ item }) => {
               if (item.type === 'DateSeparator') {

package/src/screens/conversations/components/list_header_component.tsx

@@ -158,12 +158,6 @@ export const ListHeaderComponent = () => {
           </TextButton>
         </View>
         <View style={styles.actionsContainer}>
-          <ListHeaderActionButton
-            name="general.cog"
-            onPress={handleChatSettings}
-            accessibilityLabel="Chat settings"
-            maxFontSizeMultiplier={MAX_FONT_SIZE_MULTIPLIER_LANDMARK}
-          />
           {canCreateConversations && (
             <ListHeaderActionButton
               name="churchCenter.signups"
@@ -173,6 +167,12 @@ export const ListHeaderComponent = () => {
               maxFontSizeMultiplier={MAX_FONT_SIZE_MULTIPLIER_LANDMARK}
             />
           )}
+          <ListHeaderActionButton
+            name="general.cog"
+            onPress={handleChatSettings}
+            accessibilityLabel="Chat settings"
+            maxFontSizeMultiplier={MAX_FONT_SIZE_MULTIPLIER_LANDMARK}
+          />
           {shouldShowHeaderFiltersButton && <ToggleButton {...moreFiltersButtonProps} />}
         </View>
       </View>

package/src/types/resources/conversation.ts

@@ -3,15 +3,25 @@ import { ConversationBadgeResource } from './conversation_badge'
 import { ConversationMembershipResource } from './conversation_membership'
 import { GroupResource } from './group_resource'
 import { MemberAbilityResource } from './member_ability'
+import { ReactionCountResource } from './reaction'
 
 export type ConversationDisabledReason = 'safety_check' | 'direct_messages_disabled'
 
+export interface ConversationPreviewData {
+  kind: 'reaction' | 'message'
+  authorName: string
+  value: ReactionCountResource['value'] | null
+  text: string
+  createdAt: string
+}
+
 export interface ConversationResource {
   type: 'Conversation'
   id: number
   badges?: ConversationBadgeResource[]
   analyticsMetadata?: AnalyticsMetadataResource
   conversationMembership?: Partial<ConversationMembershipResource>
+  conversationPreview: ConversationPreviewData | null
   createdAt: string
   deleted?: boolean
   directMessage?: boolean
@@ -34,6 +44,6 @@ export interface ConversationResource {
   repliesDisabled: boolean
   title: string
   unreadCount: number
-  unreadReactionCount?: number // Derived from Jolt events
+  unreadReaction: boolean
   updatedAt: string
 }

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

@@ -7,10 +7,14 @@ const fetchResponseLike = (status: number) => ({
   ok: status >= 200 && status < 300,
   statusText: 'unauthorized',
   url: 'https://api.planningcenteronline.com/chat/v2/me',
+  redirected: false,
+  headers: {},
   clone() {
     return this
   },
   json: async () => ({ errors: [] }),
+  text: async () => '',
+  arrayBuffer: async () => new ArrayBuffer(0),
 })
 
 describe('isResponseLike', () => {
@@ -25,6 +29,9 @@ describe('isResponseLike', () => {
     expect(isResponseLike(new Error('boom'))).toBe(false)
     expect(isResponseLike(new ResponseError({ status: 401 } as never))).toBe(false)
     expect(isResponseLike({ status: 401 })).toBe(false)
+    expect(isResponseLike({ status: 401, ok: false, clone() {}, json: async () => ({}) })).toBe(
+      false
+    )
   })
 })
 

package/src/utils/request/conversation.ts

@@ -38,6 +38,7 @@ export const getConversationsRequestArgs = ({
         Conversation: [
           'created_at',
           'badges',
+          'conversation_preview',
           'disabled',
           'disabled_reason',
           'groups',
@@ -55,6 +56,7 @@ export const getConversationsRequestArgs = ({
           'replies_disabled',
           'title',
           'unread_count',
+          'unread_reaction',
           'updated_at',
         ],
         AnalyticsMetadata: ['metadata'],

package/src/utils/response_error.ts

@@ -19,13 +19,24 @@ export class ResponseError extends Error {
 // Detect a fetch Response by shape, not `instanceof`: Expo's winter runtime
 // swaps in a `fetch` whose `FetchResponse` isn't an instance of the global
 // `Response`, so `instanceof` silently misses it under Expo.
-export const isResponseLike = (value: unknown): value is Response =>
-  typeof value === 'object' &&
-  value !== null &&
-  typeof (value as Response).status === 'number' &&
-  typeof (value as Response).ok === 'boolean' &&
-  typeof (value as Response).clone === 'function' &&
-  typeof (value as Response).json === 'function'
+export const isResponseLike = (value: unknown): value is Response => {
+  if (typeof value !== 'object' || value === null) return false
+
+  const candidate = value as Record<string, unknown>
+  return (
+    typeof candidate.status === 'number' &&
+    typeof candidate.statusText === 'string' &&
+    typeof candidate.ok === 'boolean' &&
+    typeof candidate.redirected === 'boolean' &&
+    typeof candidate.url === 'string' &&
+    typeof candidate.headers === 'object' &&
+    candidate.headers !== null &&
+    typeof candidate.clone === 'function' &&
+    typeof candidate.json === 'function' &&
+    typeof candidate.text === 'function' &&
+    typeof candidate.arrayBuffer === 'function'
+  )
+}
 
 export const throwResponseError = (error: unknown) => {
   if (isResponseLike(error)) {