@planningcenter/chat-react-native 3.41.0 → 3.41.1-qa-799.0

package/src/hooks/use_conversations.ts

@@ -2,11 +2,12 @@ import { InfiniteData, UseInfiniteQueryResult } from '@tanstack/react-query'
 import { useMemo } from 'react'
 import { ApiCollection, ConversationResource } from '../types'
 import { ConversationRequestArgs, getConversationsRequestArgs } from '../utils/request/conversation'
-import { useApiPaginator } from './use_api'
+import { ResponseError } from '../utils/response_error'
+import { ApiGetQueryOptions, useApiPaginator } from './use_api'
 
 export type ConversationPaginationResult = UseInfiniteQueryResult<
   InfiniteData<ApiCollection<ConversationResource>, unknown>,
-  Response
+  ResponseError
 >
 
 export type UseConversationsValue = Pick<
@@ -24,9 +25,12 @@ export type UseConversationsValue = Pick<
   refetch: () => Promise<any>
 }
 
-export function useConversations(args?: Partial<ConversationRequestArgs>): UseConversationsValue {
+export function useConversations(
+  args?: Partial<ConversationRequestArgs>,
+  opts?: ApiGetQueryOptions
+): UseConversationsValue {
   const requestArgs = getConversationsRequestArgs(args)
-  const { data, ...rest } = useApiPaginator<ConversationResource>(requestArgs)
+  const { data, ...rest } = useApiPaginator<ConversationResource>(requestArgs, opts)
 
   const conversations = useMemo(() => data.sort(sortByLastMessage), [data])
 

package/src/hooks/use_my_gender.ts

@@ -16,18 +16,20 @@ export function useMyGender() {
   const { featureEnabled } = useFeatures()
   const isFeatureEnabled = featureEnabled(availableFeatures.gender_specific_conversations)
 
-  const { data, isFetching } = useApiGet<PersonWithGender>({
-    url: '/me',
-    enabled: isFeatureEnabled,
-    data: {
-      include: ['gender'],
-      fields: {
-        Person: ['gender'],
-        Gender: ['value'],
+  const { data, isFetching } = useApiGet<PersonWithGender>(
+    {
+      url: '/me',
+      data: {
+        include: ['gender'],
+        fields: {
+          Person: ['gender'],
+          Gender: ['value'],
+        },
       },
+      app: 'people',
     },
-    app: 'people',
-  })
+    { enabled: isFeatureEnabled }
+  )
 
   const gender = data?.gender
   const genderValue = gender?.value ?? null

package/src/hooks/use_new_conversation_from_filter.ts

@@ -25,19 +25,19 @@ export function useNewConversationFromFilter(
   const isGroupsGroup = sourceAppName === 'Groups' && sourceType === 'Group'
   const isServicesTeam = sourceAppName === 'Services' && sourceType === 'Team'
 
-  const { data: group } = useApiGet<GroupResource>({
-    url: `/me/groups/${chatGroupGraphId}`,
-    data: { fields: { Group: ['name'] } },
-    enabled: !!chatGroupGraphId,
-    app: 'chat',
-  })
+  const { data: group } = useApiGet<GroupResource>(
+    { url: `/me/groups/${chatGroupGraphId}`, data: { fields: { Group: ['name'] } }, app: 'chat' },
+    { enabled: !!chatGroupGraphId }
+  )
 
-  const { data: groupsGroup } = useApiGet<GroupsGroupResource>({
-    url: `/me/groups/${sourceId}`,
-    data: { fields: { Group: ['can_create_conversation'] } },
-    enabled: isGroupsGroup && !!sourceId,
-    app: 'groups',
-  })
+  const { data: groupsGroup } = useApiGet<GroupsGroupResource>(
+    {
+      url: `/me/groups/${sourceId}`,
+      data: { fields: { Group: ['can_create_conversation'] } },
+      app: 'groups',
+    },
+    { enabled: isGroupsGroup && !!sourceId }
+  )
 
   return useMemo(() => {
     if (isGroupsGroup && group?.name && sourceId) {

package/src/hooks/use_people_person.ts

@@ -16,18 +16,20 @@ interface PeoplePerson extends ResourceObject {
 }
 
 export const usePeoplePerson = (person?: { id: number }) => {
-  const { data: peoplePerson } = useApiGet<PeoplePerson>({
-    url: `/people/${person?.id}`,
-    enabled: Boolean(person?.id),
-    data: {
-      include: ['emails'],
-      fields: {
-        Person: ['id', 'name', 'avatar', 'emails'],
-        Email: ['address', 'primary'],
+  const { data: peoplePerson } = useApiGet<PeoplePerson>(
+    {
+      url: `/people/${person?.id}`,
+      data: {
+        include: ['emails'],
+        fields: {
+          Person: ['id', 'name', 'avatar', 'emails'],
+          Email: ['address', 'primary'],
+        },
       },
+      app: 'people',
     },
-    app: 'people',
-  })
+    { enabled: Boolean(person?.id) }
+  )
 
   return peoplePerson
 }

package/src/screens/conversation_screen.tsx

@@ -28,6 +28,7 @@ import { KeyboardView } from '../components/display/keyboard_view'
 import BlankState from '../components/primitive/blank_state_primitive'
 import { ConversationContextProvider } from '../contexts/conversation_context'
 import { useTheme } from '../hooks'
+import { useAutoDismissKeyboard } from '../hooks/use_auto_dismiss_keyboard'
 import { useConversation } from '../hooks/use_conversation'
 import { useConversationJoltEvents } from '../hooks/use_conversation_jolt_events'
 import { useConversationMessages } from '../hooks/use_conversation_messages'
@@ -130,6 +131,8 @@ function ConversationScreenContent({ route }: ConversationScreenProps) {
     })
   }, [])
 
+  useAutoDismissKeyboard()
+
   useEffect(() => {
     if (reply_root_id) {
       navigation.setParams({

package/src/screens/conversation_select_recipients/conversation_select_direct_message_recipients_screen.tsx

@@ -10,6 +10,7 @@ import { useDirectMessageAffiliations } from '../../hooks/direct_messages/use_di
 import { useDirectMessageCandidates } from '../../hooks/direct_messages/use_direct_message_candidates'
 import { useDirectMessageConversationValidate } from '../../hooks/direct_messages/use_direct_message_conversation_validate'
 import { useFindOrCreateDirectMessageConversation } from '../../hooks/direct_messages/use_find_or_create_direct_message_conversation'
+import { useAutoDismissKeyboard } from '../../hooks/use_auto_dismiss_keyboard'
 import { DirectMessageCandidateResource } from '../../types/resources/direct_message_candidate'
 import { ConversationSelectRecipientsScreenProps } from './types/screen_props'
 
@@ -26,6 +27,8 @@ export function ConversationSelectDirectMessageRecipientsScreen(
     new Map()
   )
 
+  useAutoDismissKeyboard()
+
   useEffect(() => {
     const timer = setTimeout(() => setDebouncedTerm(searchTerm), 200)
     return () => clearTimeout(timer)

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

@@ -11,16 +11,10 @@ export const ChatGroupBadge = ({ rowPaddingHorizontal }: { rowPaddingHorizontal:
   const navigation = useNavigation()
   const route = useRoute<RouteProp<ConversationsScreenProps['route']>>()
   const { chat_group_graph_id } = route.params || {}
-  const { data: group } = useApiGet<GroupResource>({
-    url: `/me/groups/${chat_group_graph_id}`,
-    data: {
-      fields: {
-        Group: [],
-      },
-    },
-    enabled: !!chat_group_graph_id,
-    app: 'chat',
-  })
+  const { data: group } = useApiGet<GroupResource>(
+    { url: `/me/groups/${chat_group_graph_id}`, data: { fields: { Group: [] } }, app: 'chat' },
+    { enabled: !!chat_group_graph_id }
+  )
 
   const handleBadgePress = useCallback(() => {
     navigation.setParams({

package/src/screens/conversations/conversations_screen.tsx

@@ -22,7 +22,7 @@ export function ConversationsScreen({ route }: ConversationsScreenProps) {
 
   return (
     <View style={styles.container}>
-      <ConversationsContextProvider args={route.params}>
+      <ConversationsContextProvider args={route.params} opts={{ throwOnError: true }}>
         <Conversations ListHeaderComponent={ListHeaderComponent} />
       </ConversationsContextProvider>
     </View>

package/src/utils/performance_tracking.ts

@@ -89,6 +89,8 @@ async function sendPerformanceMetric(
   apiClient: ApiClient,
   metric: PerformanceMetric
 ): Promise<void> {
+  if (__DEV__) return
+
   try {
     await apiClient.chat.post({
       url: `/me/metrics`,