@planningcenter/chat-react-native 3.38.0-rc.0 → 3.38.0-rc.10

package/src/screens/conversation_select_recipients/components/recipient_link_row.tsx

@@ -11,7 +11,7 @@ interface RecipientLinkRowProps {
   accessibilityHint: string
   imageUri?: string
   title: string
-  subtitle: string
+  subtitle?: string
 }
 
 export const RecipientLinkRow = ({
@@ -40,9 +40,11 @@ export const RecipientLinkRow = ({
           <Text style={styles.title} numberOfLines={2}>
             {title}
           </Text>
-          <Text variant="tertiary" numberOfLines={1}>
-            {subtitle}
-          </Text>
+          {subtitle && (
+            <Text variant="tertiary" numberOfLines={1}>
+              {subtitle}
+            </Text>
+          )}
         </View>
         {Platform.OS === 'ios' && (
           <Icon name="general.rightChevron" size={16} style={styles.icon} />

package/src/screens/conversation_select_recipients/components/team_recipient_row.tsx

@@ -9,7 +9,8 @@ interface TeamRecipientRowProps {
 
 export const TeamRecipientRow = ({ serviceType, onPress }: TeamRecipientRowProps) => {
   const serviceTypeAccessibilityLabel = `Select ${pluralize(serviceType.teams.length, 'team')} for ${serviceType.name}`
-  const teamNames = serviceType.teams.map(team => team.name).join(', ')
+  const teamNames =
+    serviceType.id > 0 ? serviceType.teams.map(team => team.name).join(', ') : undefined
 
   return (
     <RecipientLinkRow

package/src/screens/team_conversation_screen.tsx

@@ -2,8 +2,10 @@ import { StackActions, StaticScreenProps, useNavigation } from '@react-navigatio
 import { useQuery, useQueryClient } from '@tanstack/react-query'
 import { useEffect } from 'react'
 import { DefaultLoading } from '../components/page/loading'
+import BlankState from '../components/primitive/blank_state_primitive'
 import { useApiClient } from '../hooks'
 import { findOrCreateServicesConversation } from '../hooks/services/use_find_or_create_services_conversation'
+import { ResponseError } from '../utils/response_error'
 
 export type TeamConversationRouteProps = {
   plan_id?: number
@@ -16,7 +18,11 @@ export const TeamConversationScreen = ({ route }: TeamConversationScreenProps) =
   const apiClient = useApiClient()
   const queryClient = useQueryClient()
   const navigation = useNavigation()
-  const { data: conversation } = useQuery({
+  const {
+    data: conversation,
+    isError,
+    error,
+  } = useQuery({
     queryKey: ['team-conversation', route.params.team_ids, route.params.plan_id],
     queryFn: () =>
       findOrCreateServicesConversation({
@@ -24,6 +30,7 @@ export const TeamConversationScreen = ({ route }: TeamConversationScreenProps) =
         teamIds: route.params.team_ids ?? [],
         planId: route.params.plan_id,
       }).then(r => r.conversation),
+    retry: (failureCount, err) => !(err instanceof ResponseError) && failureCount < 3,
   })
 
   useEffect(() => {
@@ -41,5 +48,30 @@ export const TeamConversationScreen = ({ route }: TeamConversationScreenProps) =
     }
   }, [conversation?.id, conversation?.title, navigation, queryClient])
 
+  if (isError) return <TeamConversationError error={error} onGoBack={navigation.goBack} />
+
   return <DefaultLoading />
 }
+
+function TeamConversationError({ error, onGoBack }: { error: Error; onGoBack: () => void }) {
+  const detail =
+    error instanceof ResponseError
+      ? error.errors
+          .map(e => e.detail)
+          .filter(Boolean)
+          .join('\n')
+      : ''
+
+  return (
+    <BlankState.Root>
+      <BlankState.Imagery name="people.noTextMessage" />
+      <BlankState.Content>
+        <BlankState.Heading>Can't start this conversation</BlankState.Heading>
+        <BlankState.Text>
+          {detail || 'Something went wrong while starting this conversation.'}
+        </BlankState.Text>
+      </BlankState.Content>
+      <BlankState.Button title="Go back" onPress={onGoBack} size="md" accessibilityRole="link" />
+    </BlankState.Root>
+  )
+}

package/src/utils/client/__tests__/instrumented_fetch.test.ts

@@ -5,15 +5,18 @@ const buildResponse = (status: number) => new Response('', { status })
 
 describe('instrumentedFetch', () => {
   let reportError: jest.SpyInstance
+  let warnSpy: jest.SpyInstance
   let fetchSpy: jest.SpyInstance
 
   beforeEach(() => {
     reportError = jest.spyOn(Log, 'reportError').mockImplementation(() => {})
+    warnSpy = jest.spyOn(console, 'warn').mockImplementation(() => {})
     fetchSpy = jest.spyOn(globalThis, 'fetch')
   })
 
   afterEach(() => {
     reportError.mockRestore()
+    warnSpy.mockRestore()
     fetchSpy.mockRestore()
   })
 
@@ -27,6 +30,7 @@ describe('instrumentedFetch', () => {
 
     expect(result).toBe(response)
     expect(reportError).not.toHaveBeenCalled()
+    expect(warnSpy).not.toHaveBeenCalled()
   })
 
   it.each([400, 422, 500])(
@@ -63,7 +67,7 @@ describe('instrumentedFetch', () => {
     expect(reportError).not.toHaveBeenCalled()
   })
 
-  it('reports network failures with http.error=network', async () => {
+  it('warns on network failures instead of reporting them', async () => {
     const networkError = new TypeError('Network request failed')
     fetchSpy.mockRejectedValueOnce(networkError)
 
@@ -71,10 +75,10 @@ describe('instrumentedFetch', () => {
       instrumentedFetch('https://api.example.com/conversations/123', { method: 'GET' })
     ).rejects.toBe(networkError)
 
-    expect(reportError).toHaveBeenCalledTimes(1)
-    const [error, context] = reportError.mock.calls[0]
-    expect(error.name).toBe('NetworkError')
-    expect(error.message).toContain('Network failure GET /conversations/:id')
+    expect(reportError).not.toHaveBeenCalled()
+    expect(warnSpy).toHaveBeenCalledTimes(1)
+    const [message, context] = warnSpy.mock.calls[0]
+    expect(message).toContain('Network failure GET /conversations/:id')
     expect(context.tags).toMatchObject({
       'http.method': 'GET',
       'http.path': '/conversations/:id',

package/src/utils/client/client.ts

@@ -105,16 +105,18 @@ export class Client {
     return makeRequest(requestArgs).catch(this.handleNotOk)
   }
 
-  handleNotOk = async (response: Response) => {
+  handleNotOk = async (response: Response | Error) => {
+    if (!(response instanceof Response)) return Promise.reject(response)
+
+    const errorData = await this.parseErrorResponse(response)
+    const notOkResponse = response.clone() as FailedResponse
+    notOkResponse.errors = errorData.errors || []
+
     if (response.status === 401) {
-      const errorData = await this.parseErrorResponse(response)
-      this.onUnauthorizedResponse?.({
-        ...response,
-        errors: errorData.errors || [],
-      } as FailedResponse)
+      this.onUnauthorizedResponse?.(notOkResponse)
     }
 
-    return Promise.reject(response)
+    return Promise.reject(notOkResponse)
   }
 
   parseErrorResponse = async (response: Response): Promise<Partial<FailedResponse>> => {

package/src/utils/client/instrumented_fetch.ts

@@ -14,7 +14,7 @@ export async function instrumentedFetch(url: string, init: RequestInit): Promise
     if (!response.ok) reportHttpError(response, method, url)
     return response
   } catch (networkError) {
-    reportNetworkError(networkError as Error, method, url)
+    warnNetworkError(networkError as Error, method, url)
     throw networkError
   }
 }
@@ -38,12 +38,9 @@ function reportHttpError(response: Response, method: string, url: string) {
   })
 }
 
-function reportNetworkError(networkError: Error, method: string, url: string) {
+function warnNetworkError(networkError: Error, method: string, url: string) {
   const path = templatePath(url)
-  const error = new Error(`Network failure ${method} ${path}: ${networkError.message}`)
-  error.name = 'NetworkError'
-
-  Log.reportError(error, {
+  console.warn(`Network failure ${method} ${path}: ${networkError.message}`, {
     scope: 'http',
     tags: {
       ...SHARED_TAGS,