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

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/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 }) {
+function Boom({ thrown }: { thrown: unknown }): React.ReactElement {
   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 }) {
+function Boom({ thrown }: { thrown: unknown }): React.ReactElement {
   throw thrown
 }
 
@@ -46,7 +46,11 @@ describe('ErrorBoundary', () => {
   })
 
   it('does not report ResponseError — those are owned by the HTTP layer', () => {
-    const failure = { status: 500, statusText: 'Server Error', errors: [] } as FailedResponse
+    const failure = {
+      status: 500,
+      statusText: 'Server Error',
+      errors: [],
+    } as unknown 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 }) {
+function Boom({ thrown }: { thrown: unknown }): React.ReactElement {
   throw thrown
 }
 

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/index.tsx

@@ -12,7 +12,8 @@ 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 { ENV, platformFontWeightBold, Session, TemporaryDefaultColorsType, Uri } from './utils'
+export { platformFontWeightBold, Session, Uri } from './utils'
+export type { ENV, TemporaryDefaultColorsType } 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,
+    callback: EventListener | null,
     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 } = 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/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/sha_256.ts

@@ -113,7 +113,7 @@ function preprocessMessage(message: number[]): Uint32Array {
   const words = new Uint32Array(message.length / 4)
   for (let i = 0; i < message.length; i += 4) {
     words[i / 4] =
-      (message[i] << 24) | (message[i + 1] << 16) | (message[i + 2] << 8) | message[i + 3]
+      (message[i]! << 24) | (message[i + 1]! << 16) | (message[i + 2]! << 8) | message[i + 3]!
   }
 
   return words
@@ -125,25 +125,25 @@ function processChunk(chunk: Uint32Array, hash: number[]): void {
 
   // Prepare message schedule
   for (let t = 0; t < 16; t++) {
-    W[t] = chunk[t]
+    W[t] = chunk[t]!
   }
   for (let t = 16; t < 64; t++) {
-    W[t] = (gamma1(W[t - 2]) + W[t - 7] + gamma0(W[t - 15]) + W[t - 16]) >>> 0
+    W[t] = (gamma1(W[t - 2]!) + W[t - 7]! + gamma0(W[t - 15]!) + W[t - 16]!) >>> 0
   }
 
   // Initialize working variables
-  let a = hash[0]
-  let b = hash[1]
-  let c = hash[2]
-  let d = hash[3]
-  let e = hash[4]
-  let f = hash[5]
-  let g = hash[6]
-  let h = hash[7]
+  let a = hash[0]!
+  let b = hash[1]!
+  let c = hash[2]!
+  let d = hash[3]!
+  let e = hash[4]!
+  let f = hash[5]!
+  let g = hash[6]!
+  let h = hash[7]!
 
   // Main loop
   for (let t = 0; t < 64; t++) {
-    const T1 = (h + sigma1(e) + ch(e, f, g) + K[t] + W[t]) >>> 0
+    const T1 = (h + sigma1(e) + ch(e, f, g) + K[t]! + W[t]!) >>> 0
     const T2 = (sigma0(a) + maj(a, b, c)) >>> 0
     h = g
     g = f
@@ -156,14 +156,14 @@ function processChunk(chunk: Uint32Array, hash: number[]): void {
   }
 
   // Add compressed chunk to current hash value
-  hash[0] = (hash[0] + a) >>> 0
-  hash[1] = (hash[1] + b) >>> 0
-  hash[2] = (hash[2] + c) >>> 0
-  hash[3] = (hash[3] + d) >>> 0
-  hash[4] = (hash[4] + e) >>> 0
-  hash[5] = (hash[5] + f) >>> 0
-  hash[6] = (hash[6] + g) >>> 0
-  hash[7] = (hash[7] + h) >>> 0
+  hash[0] = (hash[0]! + a) >>> 0
+  hash[1] = (hash[1]! + b) >>> 0
+  hash[2] = (hash[2]! + c) >>> 0
+  hash[3] = (hash[3]! + d) >>> 0
+  hash[4] = (hash[4]! + e) >>> 0
+  hash[5] = (hash[5]! + f) >>> 0
+  hash[6] = (hash[6]! + g) >>> 0
+  hash[7] = (hash[7]! + h) >>> 0
 }
 
 /** Compute SHA-256 hash and return as byte array */
@@ -181,10 +181,10 @@ function sha256Raw(message: string): number[] {
   // Convert hash to byte array
   const result: number[] = []
   for (let i = 0; i < 8; i++) {
-    result.push((hash[i] >>> 24) & 0xff)
-    result.push((hash[i] >>> 16) & 0xff)
-    result.push((hash[i] >>> 8) & 0xff)
-    result.push(hash[i] & 0xff)
+    result.push((hash[i]! >>> 24) & 0xff)
+    result.push((hash[i]! >>> 16) & 0xff)
+    result.push((hash[i]! >>> 8) & 0xff)
+    result.push(hash[i]! & 0xff)
   }
 
   return result

package/src/utils/system_messages.ts

@@ -1,4 +1,4 @@
-import { MessageResource } from '../types'
+import type { MessageResource } from '../types'
 
 const SYSTEM_MESSAGE_TYPES = ['user_joined'] as const
 

package/src/utils/theme.ts

@@ -1,4 +1,5 @@
-import { ColorSchemeName, ColorValue, OpaqueColorValue, PlatformColor } from 'react-native'
+import { PlatformColor } from 'react-native'
+import type { ColorSchemeName, ColorValue, OpaqueColorValue } from 'react-native'
 import { aliasTokensColorMap } from '../vendor/tapestry/alias_tokens_color_map'
 import { tokens } from '../vendor/tapestry/tokens'
 
@@ -30,7 +31,7 @@ export interface DefaultTheme {
   showBadgeProductLogo: boolean
 }
 
-export const defaultTheme = (colorScheme: ColorSchemeName): ChatTheme => {
+export const defaultTheme = (colorScheme: ColorSchemeName | null): ChatTheme => {
   const scheme: 'light' | 'dark' = colorScheme === 'dark' ? 'dark' : 'light'
 
   const defaultColors = {