@planningcenter/chat-react-native 4.1.1-qa-staging.4 → 4.2.0-rc.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@planningcenter/chat-react-native",
-  "version": "4.1.1-qa-staging.4",
+  "version": "4.2.0-rc.1",
   "description": "",
   "repository": {
     "type": "git",
@@ -33,7 +33,7 @@
   "dependencies": {
     "@fortawesome/fontawesome-svg-core": "^7.2.0",
     "@fortawesome/react-native-fontawesome": "^0.3.2",
-    "@planningcenter/emoji-keyboard": "4.1.1-qa-staging.4",
+    "@planningcenter/emoji-keyboard": "4.0.0",
     "lodash-inflection": "^1.5.0"
   },
   "peerDependencies": {
@@ -84,5 +84,5 @@
     "sf-symbols-typescript": "^2.2.0",
     "typescript": "~6.0.3"
   },
-  "gitHead": "b8308bc1b5f70600bc0174eebd2f93d4f947eb43"
+  "gitHead": "5f3487e3e5462b3074ed2e855ade9591243c6544"
 }

package/src/contexts/api_provider.tsx

@@ -10,7 +10,6 @@ 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 { featuresQueryOptions } from '../hooks/use_features'
 import { getRequestQueryKey, RequestQueryKey } from '../hooks/use_suspense_api'
 import { emitAuthRefresh } from '../utils/auth_events'
 import { ResponseError } from '../utils/response_error'
@@ -82,13 +81,10 @@ export function ApiProvider({ children }: ViewProps) {
 // This needs to live in the provider so that it can access the api client
 // and the chat query client
 const PrefetchQueries = () => {
-  const client = useApiClient()
-
   usePrefetchQuery({
     queryKey: getRequestQueryKey(appGrantsRequestArgs),
     queryFn: defaultQueryFn,
   })
-  usePrefetchQuery(featuresQueryOptions(client))
 
   return null
 }

package/src/hooks/use_features.ts

@@ -1,20 +1,26 @@
-import { queryOptions, useSuspenseQuery } from '@tanstack/react-query'
+import { useSuspenseQuery } from '@tanstack/react-query'
 import { useCallback } from 'react'
 import { ApiCollection } from '../types'
 import type { FeatureResource } from '../types/resources/feature_resource'
 import { getFeaturesRequestArgs, getFeaturesQueryKey } from '../utils/request/get_features'
-import { FIVE_MINUTES, ONE_MINUTE } from '../utils/time'
-import { ApiClient, useApiClient } from './use_api_client'
+import { FIVE_MINUTES } from '../utils/time'
+import { useApiClient } from './use_api_client'
 
 type FeatureName = (typeof availableFeatures)[keyof typeof availableFeatures]
 
-type FeaturesCollection = ApiCollection<FeatureResource> & {
-  failure?: { status?: number }
-}
-
 export function useFeatures() {
   const apiClient = useApiClient()
-  const { data } = useSuspenseQuery(featuresQueryOptions(apiClient))
+  const requestArgs = getFeaturesRequestArgs()
+
+  const { data } = useSuspenseQuery({
+    queryKey: getFeaturesQueryKey(),
+    queryFn: () => {
+      return apiClient.chat
+        .get<ApiCollection<FeatureResource>>(requestArgs)
+        .catch(() => stableEmptyFeatures)
+    },
+    staleTime: FIVE_MINUTES,
+  })
 
   const features = data.data
 
@@ -30,23 +36,6 @@ export function useFeatures() {
   }
 }
 
-export const featuresQueryOptions = (apiClient: ApiClient) =>
-  queryOptions({
-    queryKey: getFeaturesQueryKey(),
-    queryFn: (): Promise<FeaturesCollection> => {
-      return apiClient.chat
-        .get<ApiCollection<FeatureResource>>(getFeaturesRequestArgs())
-        .catch(error => ({ ...stableEmptyFeatures, failure: { status: error?.status } }))
-    },
-    staleTime: query => {
-      const failure = query.state.data?.failure
-      if (!failure) return FIVE_MINUTES
-
-      return failure.status === 429 ? ONE_MINUTE : 0
-    },
-    gcTime: Infinity,
-  })
-
 export const availableFeatures = {
   gender_specific_conversations: 'ROLLOUT_gender_specific_conversations',
   message_reporting: 'ROLLOUT_MOBILE_message_reporting',
@@ -55,7 +44,6 @@ export const availableFeatures = {
   conversation_safety_lock: 'ROLLOUT_conversation_safety_lock',
   video_moderation: 'ROLLOUT_MOBILE_video_moderation',
   dm_search_clear_fix: 'ROLLOUT_MOBILE_dm_search_clear_fix',
-  search: 'ROLLOUT_search',
 } as const satisfies Record<string, `ROLLOUT_${string}`>
 
 const stableEmptyFeatures: ApiCollection<FeatureResource> = {

package/src/navigation/index.tsx

@@ -130,13 +130,14 @@ export const NewConversationStack = createNativeStackNavigator({
     ConversationSelectDirectMessageRecipients: {
       screen: ConversationSelectDirectMessageRecipientsScreen,
       if: useDirectMessagesEligible,
-      options: ({ navigation }) =>
+      options: ({ navigation, route }) =>
         composeOptions(
           {
             title: 'New conversation',
-            headerBackVisible: false,
           },
-          withRightClose({ onPress: navigation.goBack })
+          withRightClose({
+            onPress: () => navigation.popTo('Conversations', route.params),
+          })
         ),
     },
     ConversationFilterRecipients: {

package/src/screens/conversation_new/components/services_form.tsx

@@ -45,7 +45,6 @@ export const ServicesForm = ({
   const customAvatarsEnabled = featureEnabled(availableFeatures.custom_conversation_avatars)
   const safetyLockEnabled = featureEnabled(availableFeatures.conversation_safety_lock)
   const [selectedPlanId, setSelectedPlanId] = useState<number | undefined>(initialPlanId)
-  const [filterByPlan, setFilterByPlan] = useState(!!initialPlanId)
   const initialState = useMemo(() => uniq(initialTeamIds) || [], [initialTeamIds]) // Uniq here because services can send duplicates in the teams_i_lead response.
   const [selectedTeamIds, setSelectedTeamIds] = useState<number[]>(initialState)
 
@@ -53,7 +52,6 @@ export const ServicesForm = ({
   useEffect(() => {
     setSelectedTeamIds(initialState)
     setSelectedPlanId(initialPlanId)
-    setFilterByPlan(!!initialPlanId)
   }, [initialState, initialPlanId])
 
   const removeSelection = useCallback(
@@ -63,7 +61,9 @@ export const ServicesForm = ({
     [selectedTeamIds]
   )
 
-  const activePlanId = filterByPlan ? selectedPlanId : undefined
+  const [filerByPlan, setFilterByPlan] = useState(false)
+
+  const activePlanId = filerByPlan ? selectedPlanId : undefined
 
   const { payload, isLoading: isLoadingPayload } = useServicesChatConversationPayload({
     teamIds: selectedTeamIds,
@@ -79,7 +79,7 @@ export const ServicesForm = ({
 
   const { members, isError: isMemberError } = useTeamMembersForNewConversation({
     teamIds: selectedTeamIds,
-    planId: activePlanId,
+    planId: selectedPlanId,
   })
   const adultMembers = useMemo(() => members.filter(member => !member.child), [members])
 
@@ -118,7 +118,7 @@ export const ServicesForm = ({
             removeSelection={removeSelection}
             selectedPlanId={selectedPlanId}
             setSelectedPlanId={setSelectedPlanId}
-            filterByPlan={filterByPlan}
+            filterByPlan={filerByPlan}
             setFilterByPlan={setFilterByPlan}
             members={members}
             isMemberError={isMemberError}

package/src/screens/conversation_select_recipients/conversation_select_direct_message_recipients_screen.tsx

@@ -76,9 +76,8 @@ export function ConversationSelectDirectMessageRecipientsScreen({
   const { warnings, validationPending } = useDirectMessageConversationValidate({ recipientIds })
 
   const handleSuccess = (conversationId: number) => {
-    navigation
-      .getParent()
-      ?.dispatch(StackActions.replace('Conversation', { conversation_id: conversationId }))
+    navigation.getParent()?.goBack()
+    navigation.dispatch(StackActions.push('Conversation', { conversation_id: conversationId }))
   }
 
   const { findOrCreateConversation, directMessageExists, isFinding, isError } =

package/src/screens/conversations/conversations_screen.tsx

@@ -3,12 +3,10 @@ import React from 'react'
 import { StyleSheet, View } from 'react-native'
 import { Conversations } from '../../components'
 import { ConversationsContextProvider } from '../../contexts/conversations_context'
-import { availableFeatures, useFeatures } from '../../hooks/use_features'
 import { analyticsEvents, usePublishProductAnalyticsEvent } from '../../hooks/use_product_analytics'
 import { AppName } from '../../types/resources/app_name'
 import { GraphId } from '../../types/resources/group_resource'
 import { ListHeaderComponent } from './components/list_header_component'
-import { SearchListHeaderComponent } from './components/search_list_header_component'
 
 export type ConversationsScreenProps = StaticScreenProps<{
   title?: string
@@ -19,16 +17,13 @@ export type ConversationsScreenProps = StaticScreenProps<{
 
 export function ConversationsScreen({ route }: ConversationsScreenProps) {
   const styles = useStyles()
-  const { featureEnabled } = useFeatures()
-  const searchEnabled = featureEnabled(availableFeatures.search)
-  const Header = searchEnabled ? SearchListHeaderComponent : ListHeaderComponent
 
   usePublishProductAnalyticsEvent(analyticsEvents.conversation_index_opened)
 
   return (
     <View style={styles.container}>
       <ConversationsContextProvider args={route.params} opts={{ throwOnError: true }}>
-        <Conversations ListHeaderComponent={Header} />
+        <Conversations ListHeaderComponent={ListHeaderComponent} />
       </ConversationsContextProvider>
     </View>
   )

package/src/utils/time.ts

@@ -12,7 +12,6 @@ export function toMs(value: number, unit: TimeUnit): number {
 }
 
 export const FIVE_SECONDS = toMs(5, 'seconds')
-export const ONE_MINUTE = toMs(1, 'minutes')
 export const FIVE_MINUTES = toMs(5, 'minutes')
 export const THIRTY_MINUTES = toMs(30, 'minutes')
 export const ONE_HOUR = toMs(1, 'hours')

package/build/screens/conversations/components/search_list_header_component.d.ts

@@ -1,2 +0,0 @@
-export declare const SearchListHeaderComponent: () => import("react/jsx-runtime").JSX.Element;
-//# sourceMappingURL=search_list_header_component.d.ts.map

package/build/screens/conversations/components/search_list_header_component.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"search_list_header_component.d.ts","sourceRoot":"","sources":["../../../../src/screens/conversations/components/search_list_header_component.tsx"],"names":[],"mappings":"AAkCA,eAAO,MAAM,yBAAyB,+CA8MrC,CAAA"}