@planningcenter/chat-react-native 3.42.2-qa-staging.2 → 3.42.2-rc.0

package/src/components/conversations/conversation_preview.tsx

@@ -6,10 +6,8 @@ import {
   useFontScale,
   useScalableNumberOfLines,
 } from '../../hooks'
-import { ConversationPreviewData, ConversationResource } from '../../types'
-import { REACTION_EMOJIS, platformFontWeightBold } from '../../utils'
+import { ConversationResource } from '../../types'
 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'
@@ -32,26 +30,25 @@ export const ConversationPreview = ({
 }: ConversationPreviewProps) => {
   const styles = useStyles()
   const {
-    conversationPreview,
+    lastMessageAuthorName,
     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 = conversationPreview
-    ? formatConversationPreviewText(conversationPreview)
+  const conversationPreviewText = lastMessageTextPreview
+    ? `${lastMessageAuthorName}: ${lastMessageTextPreview}`
     : EMPTY_CONVERSATION_PREVIEW_TEXT
 
   const conversationAccessibilityLabel = getConversationAccessibilityLabel({
@@ -72,20 +69,13 @@ export const ConversationPreview = ({
         fallbackIconName={fallbackIconName}
       />
       <View style={styles.conversationBody}>
-        <Heading
-          numberOfLines={numberOfLinesScaledTitle}
-          variant="h3"
-          style={[styles.title, isUnread && styles.unreadTitle]}
-        >
+        <Heading numberOfLines={numberOfLinesScaledTitle} variant="h3" style={styles.title}>
           {title}
         </Heading>
         <Text
           variant="tertiary"
           numberOfLines={numberOfLinesScaledPreviewText}
-          style={[
-            emptyConversation && styles.emptyConversationPreviewText,
-            isUnread && styles.unreadText,
-          ]}
+          style={emptyConversation && styles.emptyConversationPreviewText}
         >
           {conversationPreviewText}
         </Text>
@@ -93,9 +83,9 @@ export const ConversationPreview = ({
       </View>
       {hasMetaContent && (
         <View style={styles.metaContainer}>
-          <Text variant="tertiary">{formatDatePreview(conversationPreview?.createdAt)}</Text>
+          <Text variant="tertiary">{formatDatePreview(lastMessageCreatedAt)}</Text>
           <View style={styles.statusContainer}>
-            <UnreadCountBadge count={unreadCount} unreadReaction={unreadReaction} showDot={muted} />
+            <UnreadCountBadge count={unreadCount} showDot={muted} />
             <MuteIndicator muted={muted} />
           </View>
         </View>
@@ -162,30 +152,6 @@ 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
@@ -194,24 +160,29 @@ const getConversationAccessibilityLabel = ({
   conversation,
   showBadges,
 }: GetConversationAccessibilityLabelProps) => {
-  const { badges, title, conversationPreview, muted, disabled, unreadCount, unreadReaction } =
-    conversation
+  const {
+    badges,
+    title,
+    lastMessageAuthorName,
+    lastMessageTextPreview,
+    muted,
+    disabled,
+    unreadCount,
+    lastMessageCreatedAt,
+  } = 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`
-      : unreadReaction
-        ? 'unread reaction'
-        : '',
-    lastMessage: conversationPreview
-      ? formatConversationPreviewAccessibilityLabel(conversationPreview)
+    readStatus: hasUnreadMessages ? `${unreadCount} unread messages` : '',
+    lastMessage: hasLastMessage
+      ? `Last message sent ${formatDatePreview(lastMessageCreatedAt)} from ${lastMessageAuthorName} and says ${lastMessageTextPreview}`
       : EMPTY_CONVERSATION_PREVIEW_TEXT,
   }
 
@@ -251,12 +222,6 @@ 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,21 +4,12 @@ import { useFontScale, useTheme } from '../../hooks'
 import { MAX_FONT_SIZE_MULTIPLIER, platformFontWeightBold } from '../../utils'
 import { Text } from '../display'
 
-export const UnreadCountBadge = ({
-  count,
-  unreadReaction,
-  showDot,
-}: {
-  count: number
-  unreadReaction: boolean
-  showDot: boolean
-}) => {
+export const UnreadCountBadge = ({ count, showDot }: { count: number; showDot: boolean }) => {
   const styles = useStyles()
   const displayCount = count > 99 ? '99+' : count
-  const isUnread = count > 0 || unreadReaction
 
-  if (!isUnread) return null
-  if (showDot || count === 0) return <View style={styles.dot} />
+  if (count === 0) return null
+  if (showDot) return <View style={styles.dot} />
 
   return (
     <View style={styles.badge}>
@@ -33,7 +24,7 @@ const useStyles = () => {
   const { colors } = useTheme()
   const dotScaleLimit = MAX_FONT_SIZE_MULTIPLIER * 1.5
   const fontScale = useFontScale({ maxFontSizeMultiplier: dotScaleLimit })
-  const size = 10 * fontScale
+  const size = 8 * fontScale
 
   return StyleSheet.create({
     badge: {

package/src/hooks/use_conversation.ts

@@ -16,7 +16,6 @@ export const getConversationRequestArgs = ({ conversation_id }: { conversation_i
         'created_at',
         'badges',
         'conversation_membership',
-        'conversation_preview',
         'gender_option',
         'groups',
         'last_message_author_id',
@@ -37,7 +36,6 @@ 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,
-            unreadReaction: false,
+            unreadReactionCount: 0,
           },
         }
       })
@@ -87,9 +87,25 @@ export function useConversationJoltEvents({ conversationId }: Props) {
 
   const handleReactionJoltEvent = useCallback(
     (event: JoltReactionEvent) => {
-      if (event.data.data.author_id === currentPersonId) return
+      queryClient.setQueryData<ApiResource<ConversationResource>>(queryKey, prev => {
+        if (!prev?.data) return prev
 
-      queryClient.invalidateQueries({ queryKey })
+        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, queryKey, currentPersonId]
   )

package/src/hooks/use_conversation_messages.ts

@@ -7,10 +7,11 @@ export const useConversationMessages = (
   { conversation_id, reply_root_id }: { conversation_id: number; reply_root_id?: string | null },
   opts?: SuspensePaginatorOptions
 ) => {
-  const { data, refetch, isRefetching, fetchNextPage } = useSuspensePaginator<MessageResource>(
-    getMessagesRequestArgs({ conversation_id, reply_root_id }),
-    opts
-  )
+  const { data, refetch, isRefetching, fetchNextPage, hasNextPage } =
+    useSuspensePaginator<MessageResource>(
+      getMessagesRequestArgs({ conversation_id, reply_root_id }),
+      opts
+    )
   const queryKey = getMessagesQueryKey({ conversation_id, reply_root_id })
   const messages = useMemo(
     () =>
@@ -24,5 +25,5 @@ export const useConversationMessages = (
     [data]
   )
 
-  return { messages, refetch, isRefetching, fetchNextPage, queryKey }
+  return { messages, refetch, isRefetching, fetchNextPage, hasNextPage, 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 }
+      return { ...person, unreadCount: updatedUnread, unreadReactionCount: 0 }
     })
   }
 
@@ -29,7 +29,6 @@ export const useConversationsMarkRead = ({
       update({
         ...conversation,
         unreadCount: read ? 0 : 1,
-        ...(read ? { unreadReaction: false } : {}),
       })
       handlePersonUnreadCount(read)
     },
@@ -107,7 +106,6 @@ 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 unreadReaction = conversation.unreadReaction
+  const unreadReactionCount = conversation.unreadReactionCount || 0
 
-  const shouldMarkRead = Boolean(unreadCount >= 1 || unreadReaction || !firedOnce.current)
+  const shouldMarkRead = Boolean(unreadCount >= 1 || unreadReactionCount > 0 || !firedOnce.current)
   const appState = useAppState()
   const isActive = appState === 'active'
 
@@ -29,5 +29,6 @@ export function useMarkLatestMessageRead({ conversation }: Props) {
     firedOnce.current = true
 
     debouncedMarkRead(true)
-  }, [debouncedMarkRead, isActive, shouldMarkRead, unreadReaction])
+    // keeping unreadReactionCount in the dependency array to watch for changes
+  }, [debouncedMarkRead, isActive, shouldMarkRead, unreadReactionCount])
 }

package/src/hooks/use_suspense_api.ts

@@ -9,7 +9,7 @@ import { ApiCollection, ApiResource, ResourceObject } from '../types'
 import { FailedResponse } from '../types/api_primitives'
 import { Log } from '../utils'
 import { GetRequest, RequestData } from '../utils/client'
-import { throwResponseError } from '../utils/response_error'
+import { ResponseError } from '../utils/response_error'
 import { getNextPageParamFromMeta } from './paginator_meta'
 import { App, useApiClient } from './use_api_client'
 
@@ -90,6 +90,14 @@ export const useSuspensePaginator = <T extends ResourceObject>(
   return { ...query, data, totalCount }
 }
 
+const throwResponseError = (error: unknown) => {
+  if (error instanceof Response) {
+    throw new ResponseError(error as FailedResponse)
+  }
+
+  return Promise.reject(error)
+}
+
 export type RequestQueryKey = [
   SuspenseGetOptions['url'],
   SuspenseGetOptions['data'],

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

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

@@ -158,6 +158,12 @@ 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"
@@ -167,12 +173,6 @@ 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,25 +3,15 @@ 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
@@ -44,6 +34,6 @@ export interface ConversationResource {
   repliesDisabled: boolean
   title: string
   unreadCount: number
-  unreadReaction: boolean
+  unreadReactionCount?: number // Derived from Jolt events
   updatedAt: string
 }

package/src/utils/client/client.ts

@@ -1,5 +1,4 @@
 import { ApiCollection, ApiResource, FailedResponse } from '../../types'
-import { isResponseLike } from '../response_error'
 import {
   concatRecords,
   ensureNoQueryParamsInDev,
@@ -107,7 +106,7 @@ export class Client {
   }
 
   handleNotOk = async (response: Response | Error) => {
-    if (!isResponseLike(response)) return Promise.reject(response)
+    if (!(response instanceof Response)) return Promise.reject(response)
 
     const errorData = await this.parseErrorResponse(response)
     const notOkResponse = response.clone() as FailedResponse

package/src/utils/request/conversation.ts

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

package/src/utils/response_error.ts

@@ -16,19 +16,8 @@ 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 throwResponseError = (error: unknown) => {
-  if (isResponseLike(error)) {
+  if (error instanceof Response) {
     throw new ResponseError(error as FailedResponse)
   }
 

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

@@ -1,40 +0,0 @@
-import { isResponseLike, ResponseError, throwResponseError } from '../response_error'
-
-// Mimics Expo's winter `FetchResponse`: the full Response shape, but NOT an
-// instance of the global `Response` (so `instanceof Response` returns false).
-const fetchResponseLike = (status: number) => ({
-  status,
-  ok: status >= 200 && status < 300,
-  statusText: 'unauthorized',
-  url: 'https://api.planningcenteronline.com/chat/v2/me',
-  clone() {
-    return this
-  },
-  json: async () => ({ errors: [] }),
-})
-
-describe('isResponseLike', () => {
-  it('recognizes a Response by shape even when it is not an instanceof Response', () => {
-    const notARealResponse = fetchResponseLike(401)
-    expect(notARealResponse instanceof Response).toBe(false)
-    expect(isResponseLike(notARealResponse)).toBe(true)
-  })
-
-  it('rejects things that are not responses', () => {
-    expect(isResponseLike(null)).toBe(false)
-    expect(isResponseLike(new Error('boom'))).toBe(false)
-    expect(isResponseLike(new ResponseError({ status: 401 } as never))).toBe(false)
-    expect(isResponseLike({ status: 401 })).toBe(false)
-  })
-})
-
-describe('throwResponseError', () => {
-  it('wraps a Response-like rejection into a ResponseError', () => {
-    expect(() => throwResponseError(fetchResponseLike(401))).toThrow(ResponseError)
-  })
-
-  it('passes through non-response errors untouched', async () => {
-    const error = new Error('network down')
-    await expect(throwResponseError(error)).rejects.toBe(error)
-  })
-})