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

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

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

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/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'],