@planningcenter/chat-react-native 4.4.1-qa-staging.2 → 4.4.1-qa-staging.4

package/src/contexts/api_provider.tsx

@@ -9,9 +9,9 @@ import React, { useContext, useEffect, useRef } from 'react'
 import { ViewProps } from 'react-native'
 import { ApiClient, useApiClient } from '../hooks/use_api_client'
 import { useAppState } from '../hooks/use_app_state'
-import { appGrantsRequestArgs } from '../hooks/use_chat_permissions'
+import { appGrantsQueryOptions } from '../hooks/use_chat_permissions'
 import { featuresQueryOptions } from '../hooks/use_features'
-import { getRequestQueryKey, RequestQueryKey } from '../hooks/use_suspense_api'
+import { RequestQueryKey } from '../hooks/use_suspense_api'
 import { emitAuthRefresh } from '../utils/auth_events'
 import { ResponseError } from '../utils/response_error'
 import { ChatContext, ChatContextValue } from './chat_context'
@@ -48,7 +48,7 @@ export const chatQueryClient = new QueryClient({
 })
 
 export function ApiProvider({ children }: ViewProps) {
-  const { token, env } = useContext(ChatContext)
+  const { token, env, session } = useContext(ChatContext)
   const sessionChanged = useSessionChanged({ token, env })
 
   const client = useApiClient()
@@ -72,7 +72,7 @@ export function ApiProvider({ children }: ViewProps) {
 
   return (
     <QueryClientProvider client={chatQueryClient}>
-      <PrefetchQueries />
+      {session.isAuthenticated && <PrefetchQueries />}
       {children}
     </QueryClientProvider>
   )
@@ -84,10 +84,7 @@ export function ApiProvider({ children }: ViewProps) {
 const PrefetchQueries = () => {
   const client = useApiClient()
 
-  usePrefetchQuery({
-    queryKey: getRequestQueryKey(appGrantsRequestArgs),
-    queryFn: defaultQueryFn,
-  })
+  usePrefetchQuery(appGrantsQueryOptions(client))
   usePrefetchQuery(featuresQueryOptions(client))
 
   return null

package/src/hooks/use_chat_permissions.ts

@@ -1,7 +1,10 @@
-import { AppGrantsResource } from '../types'
+import { queryOptions } from '@tanstack/react-query'
+import { ApiCollection, AppGrantsResource } from '../types'
+import { throwResponseError } from '../utils/response_error'
 import { FIVE_MINUTES } from '../utils/time'
 import { useApiGet } from './use_api'
-import { App } from './use_api_client'
+import { ApiClient, App } from './use_api_client'
+import { getRequestQueryKey } from './use_suspense_api'
 
 export const appGrantsRequestArgs = {
   url: '/me/app_grants',
@@ -13,6 +16,16 @@ export const appGrantsRequestArgs = {
   app: 'chat' as App,
 }
 
+export const appGrantsQueryOptions = (apiClient: ApiClient) =>
+  queryOptions({
+    queryKey: getRequestQueryKey(appGrantsRequestArgs),
+    queryFn: (): Promise<ApiCollection<AppGrantsResource>> =>
+      apiClient[appGrantsRequestArgs.app]
+        .get<ApiCollection<AppGrantsResource>>(appGrantsRequestArgs)
+        .catch(throwResponseError),
+    staleTime: FIVE_MINUTES,
+  })
+
 export function useAppGrants() {
   return useApiGet<AppGrantsResource[]>(appGrantsRequestArgs, {
     staleTime: FIVE_MINUTES,

package/src/hooks/use_features.ts

@@ -57,6 +57,8 @@ export const availableFeatures = {
   dm_search_clear_fix: 'ROLLOUT_MOBILE_dm_search_clear_fix',
   search: 'QA_MOBILE_search',
   search_rollout: 'ROLLOUT_MOBILE_search',
+  manual_archiving: 'QA_MOBILE_manual_archiving',
+  manual_archiving_rollout: 'ROLLOUT_MOBILE_manual_archiving',
 } as const satisfies Record<string, `${'QA' | 'ROLLOUT'}_${string}`>
 
 const stableEmptyFeatures: ApiCollection<FeatureResource> = {

package/src/screens/age_check/age_check_underage_screen.tsx

@@ -1,9 +1,10 @@
 import { useRoute, RouteProp } from '@react-navigation/native'
 import React from 'react'
-import { Linking, StyleSheet, View, ScrollView } from 'react-native'
+import { Linking as RNLinking, StyleSheet, View, ScrollView } from 'react-native'
 import { Heading } from '../../components'
 import { Icon, Text, TextInlineButton } from '../../components/display'
 import { useTheme } from '../../hooks'
+import { Linking } from '../../utils'
 import type { AgeCheckParams } from './screen_props'
 
 export interface AgeCheckUnderageScreenProps {
@@ -18,7 +19,7 @@ export function AgeCheckUnderageScreen({ contactEmail }: AgeCheckUnderageScreenP
 
   const openChurchAdminHelp = () => {
     if (!email) return
-    Linking.openURL(`mailto:${email}`)
+    RNLinking.openURL(`mailto:${email}`)
   }
 
   const openTerms = () => {

package/src/screens/bug_report_screen.tsx

@@ -5,15 +5,7 @@ import type {
 } from '@react-navigation/native-stack'
 import { startsWith } from 'lodash'
 import React, { useCallback, useState } from 'react'
-import {
-  View,
-  StyleSheet,
-  TextInput,
-  Linking,
-  ScrollView,
-  TouchableOpacity,
-  Platform,
-} from 'react-native'
+import { View, StyleSheet, TextInput, ScrollView, TouchableOpacity, Platform } from 'react-native'
 import { useSafeAreaInsets } from 'react-native-safe-area-context'
 import {
   Button,
@@ -38,7 +30,7 @@ import { useTheme } from '../hooks'
 import { useAppName } from '../hooks/use_app_name'
 import { useReportBugAction } from '../hooks/use_report_bug_action'
 import { useUploadClient } from '../hooks/use_upload_client'
-import { ImagePicker, ImagePickerResult, platformFontWeightBold } from '../utils'
+import { ImagePicker, ImagePickerResult, Linking, platformFontWeightBold } from '../utils'
 
 const MAX_DESCRIPTION_LENGTH = 2000
 

package/src/screens/get_help_screen.tsx

@@ -1,12 +1,12 @@
 import { StaticScreenProps, useNavigation } from '@react-navigation/native'
 import { useCallback, useMemo } from 'react'
-import { Alert, Linking, StyleSheet, View } from 'react-native'
+import { Alert, Linking as RNLinking, StyleSheet, View } from 'react-native'
 import { Heading, PressableRow, Text, TextInlineButton } from '../components'
 import { useApiGet, useTheme } from '../hooks'
 import { useAppName } from '../hooks/use_app_name'
 import { useOrganization } from '../hooks/use_organization'
 import { ResourceObject } from '../types'
-import { Clipboard } from '../utils'
+import { Clipboard, Linking } from '../utils'
 
 type GetHelpScreenRouteProps = {
   type?: 'chat' | 'general'
@@ -119,7 +119,7 @@ export function sendEmail(email: string) {
 
   const url = encodeURI(`mailto:${email}`)
 
-  Linking.openURL(url).catch(() => {
+  RNLinking.openURL(url).catch(() => {
     Alert.alert('Oops', `Unable to open: ${email}`, [
       { text: 'Copy to clipboard', onPress: () => Clipboard.setStringAsync(email) },
       { text: 'OK' },
@@ -132,7 +132,7 @@ export function placePhoneCall(phoneNumber: string) {
 
   const url = encodeURI(`tel:${phoneNumber}`)
 
-  Linking.openURL(url).catch(() => {
+  RNLinking.openURL(url).catch(() => {
     Alert.alert('Oops', `Unable to open: ${phoneNumber}`, [
       { text: 'Copy to clipboard', onPress: () => Clipboard.setStringAsync(phoneNumber) },
       { text: 'OK' },