@planningcenter/chat-react-native 3.42.1-qa-staging.5 → 3.42.1-rc.0

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/screens/conversation_select_type_screen.tsx

@@ -1,5 +1,5 @@
 import { StaticScreenProps, useNavigation } from '@react-navigation/native'
-import React from 'react'
+import React, { useLayoutEffect } from 'react'
 import FormSheet, { getFormSheetScreenOptions } from '../components/primitive/form_sheet'
 import { useCurrentPerson } from '../hooks/use_current_person'
 import { availableFeatures, useFeatures } from '../hooks/use_features'
@@ -35,6 +35,14 @@ export function ConversationSelectTypeScreen({ route }: ConversationSelectTypeSc
 
   const filterParams = { chat_group_graph_id, group_source_app_name }
   const dmFeatureEnabled = featureEnabled(availableFeatures.direct_messages_eap)
+  const showDirectMessageOption = dmFeatureEnabled && !under_18
+
+  // sheetAllowedDetents depends on the DM feature flag, which isn't known until render, so it's
+  // set here instead of in the static ConversationSelectTypeScreenOptions. useLayoutEffect applies
+  // it before paint so the sheet never visibly resizes after opening.
+  useLayoutEffect(() => {
+    navigation.setOptions({ sheetAllowedDetents: showDirectMessageOption ? [0.3] : [0.25] })
+  }, [navigation, showDirectMessageOption])
 
   const handleFilterPress = () => {
     if (!newConversationFromFilter) return
@@ -102,7 +110,7 @@ export function ConversationSelectTypeScreen({ route }: ConversationSelectTypeSc
           accessibilityHint="Opens team selection screen"
         />
       )}
-      {dmFeatureEnabled && !under_18 && (
+      {showDirectMessageOption && (
         <FormSheet.Action
           title="Direct message"
           onPress={handleDirectMessagePress}

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

@@ -145,7 +145,7 @@ export const ListHeaderComponent = () => {
       <View style={styles.headingRow}>
         <View style={styles.titleContainer}>
           <Heading numberOfLines={1} variant="h2">
-            Conversationz
+            Conversations
           </Heading>
           <TextButton
             onPress={alertMarkAllRead}

package/src/screens/settings_screen.tsx

@@ -36,8 +36,7 @@ export function SettingsScreen({}: SettingsScreenProps) {
             <View style={styles.settingRowText}>
               <Text>Allow direct messages</Text>
               <Text variant="tertiary">
-                When off, you can't be added to new direct messages, and any you're already in will
-                be turned off.
+                When disabled, you won't be able to participate in direct messages.
               </Text>
             </View>
             <Switch

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/__tests__/conversation.test.ts

@@ -5,12 +5,8 @@ const groupId = 'Groups-Group-1' as const
 describe('getConversationsRequestArgs', () => {
   it.each([
     ['no args', {}, 'mine_or_not_empty'],
-    [
-      'group_source_app_name',
-      { group_source_app_name: 'Groups' },
-      'mine_or_not_empty,group_source_app_name',
-    ],
-    ['chat_group_graph_id', { chat_group_graph_id: groupId }, 'mine_or_not_empty,group'],
+    ['group_source_app_name', { group_source_app_name: 'Groups' }, 'group_source_app_name'],
+    ['chat_group_graph_id', { chat_group_graph_id: groupId }, 'group'],
     ['show_direct_messages', { show_direct_messages: true }, 'mine_or_not_empty,direct_message'],
   ])('%s uses filter: %s', (_label, args, expectedFilter) => {
     expect(getConversationsRequestArgs(args).data.filter).toBe(expectedFilter)

package/src/utils/request/conversation.ts

@@ -16,11 +16,11 @@ export const getConversationsRequestArgs = ({
 }: Partial<ConversationRequestArgs> = {}): GetRequest => {
   let filter: string
   if (chat_group_graph_id) {
-    filter = 'mine_or_not_empty,group'
+    filter = 'group'
   } else if (show_direct_messages) {
     filter = 'mine_or_not_empty,direct_message'
   } else if (group_source_app_name) {
-    filter = 'mine_or_not_empty,group_source_app_name'
+    filter = 'group_source_app_name'
   } else {
     filter = 'mine_or_not_empty'
   }
@@ -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'],