@planningcenter/chat-react-native 3.43.0-rc.0 → 3.43.0-rc.2

package/src/screens/conversation_select_type_screen.tsx

@@ -2,7 +2,6 @@ import { StaticScreenProps, useNavigation } from '@react-navigation/native'
 import React, { useLayoutEffect } from 'react'
 import FormSheet, { getFormSheetScreenOptions } from '../components/primitive/form_sheet'
 import { useCurrentPerson } from '../hooks/use_current_person'
-import { availableFeatures, useFeatures } from '../hooks/use_features'
 import { useConversationTypeAccess } from '../hooks/use_new_conversation_entry'
 import type { NewConversationFromFilter } from '../hooks/use_new_conversation_from_filter'
 import { AppName } from '../types/resources/app_name'
@@ -28,17 +27,15 @@ export function ConversationSelectTypeScreen({ route }: ConversationSelectTypeSc
   const navigation = useNavigation()
   const { canCreateGroupsConversations, canCreateServicesConversations } =
     useConversationTypeAccess()
-  const { featureEnabled } = useFeatures()
-  const { directMessagesDisabled, under_18 } = useCurrentPerson()
+  const { directMessagesDisabled, directMessagesEligible } = useCurrentPerson()
   const { newConversationFromFilter, chat_group_graph_id, group_source_app_name } =
     route.params || {}
 
   const filterParams = { chat_group_graph_id, group_source_app_name }
-  const dmFeatureEnabled = featureEnabled(availableFeatures.direct_messages_eap)
-  const showDirectMessageOption = dmFeatureEnabled && !under_18
+  const showDirectMessageOption = directMessagesEligible
 
-  // sheetAllowedDetents depends on the DM feature flag, which isn't known until render, so it's
-  // set here instead of in the static ConversationSelectTypeScreenOptions. useLayoutEffect applies
+  // sheetAllowedDetents depends on DM eligibility, which isn't known until render, so it's set
+  // here instead of in the static ConversationSelectTypeScreenOptions. useLayoutEffect applies
   // it before paint so the sheet never visibly resizes after opening.
   useLayoutEffect(() => {
     navigation.setOptions({ sheetAllowedDetents: showDirectMessageOption ? [0.3] : [0.25] })

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

@@ -6,7 +6,7 @@ import {
   useAtFontScaleBreakpoint,
   useCanCreateConversations,
   useCurrentPersonCache,
-  useDirectMessagesEnabled,
+  useDirectMessagesEligible,
   useHasDirectMessages,
   useNewConversationEntry,
   useTheme,
@@ -35,9 +35,9 @@ export const ListHeaderComponent = () => {
   const navigation = useNavigation()
   const canFilterByTeams = useCanDisplayGroups({ source_app_name: 'Services', source_type: 'Team' })
   const canFilterByGroups = useCanDisplayGroups({ source_app_name: 'Groups', source_type: 'Group' })
-  const directMessagesEnabled = useDirectMessagesEnabled()
+  const directMessagesEligible = useDirectMessagesEligible()
   const hasDirectMessages = useHasDirectMessages()
-  const canFilterByDMs = directMessagesEnabled && hasDirectMessages
+  const canFilterByDMs = directMessagesEligible && hasDirectMessages
   const route = useRoute<RouteProp<ConversationsScreenProps['route']>>()
   const {
     chat_group_graph_id,

package/src/screens/settings_screen.tsx

@@ -4,7 +4,7 @@ import React, { useCallback } from 'react'
 import { Platform, StyleSheet, View } from 'react-native'
 import { Heading, Icon, Text } from '../components'
 import { Switch } from '../components/display/switch'
-import { useDirectMessagesEnabled, useTheme } from '../hooks'
+import { useDirectMessagesEligible, useTheme } from '../hooks'
 import { useAppName } from '../hooks/use_app_name'
 import { usePersonSettings } from '../hooks/use_person_settings'
 
@@ -13,7 +13,7 @@ export type SettingsScreenProps = StaticScreenProps<{}>
 export function SettingsScreen({}: SettingsScreenProps) {
   const styles = useStyles()
   const { directMessagesDisabled, setDirectMessagesDisabled, isMutating } = usePersonSettings()
-  const directMessagesEnabled = useDirectMessagesEnabled()
+  const directMessagesEligible = useDirectMessagesEligible()
   const appName = useAppName()
   const navigation = useNavigation()
 
@@ -31,7 +31,7 @@ export function SettingsScreen({}: SettingsScreenProps) {
         <View style={styles.sectionHeader}>
           <Heading variant="h2">Messages</Heading>
         </View>
-        {directMessagesEnabled && (
+        {directMessagesEligible && (
           <View style={styles.settingRow}>
             <View style={styles.settingRowText}>
               <Text>Allow direct messages</Text>

package/src/types/resources/person.ts

@@ -22,5 +22,6 @@ export interface CurrentPersonResource extends PersonResource {
   pcoChatEnabled: boolean
   ageQualificationStatus?: AgeQualificationStatus
   directMessagesDisabled: boolean
+  directMessagesEligible: boolean
   under_18: boolean
 }

package/build/hooks/use_direct_messages_enabled.d.ts

@@ -1,2 +0,0 @@
-export declare function useDirectMessagesEnabled(): boolean;
-//# sourceMappingURL=use_direct_messages_enabled.d.ts.map

package/build/hooks/use_direct_messages_enabled.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"use_direct_messages_enabled.d.ts","sourceRoot":"","sources":["../../src/hooks/use_direct_messages_enabled.ts"],"names":[],"mappings":"AAOA,wBAAgB,wBAAwB,IAAI,OAAO,CAelD"}

package/build/hooks/use_direct_messages_enabled.js

@@ -1,16 +0,0 @@
-import { useQuery } from '@tanstack/react-query';
-import { getFeaturesRequestArgs, getFeaturesQueryKey } from '../utils/request/get_features';
-import { useApiClient } from './use_api_client';
-import { availableFeatures } from './use_features';
-export function useDirectMessagesEnabled() {
-    const apiClient = useApiClient();
-    const { data, isFetched } = useQuery({
-        queryKey: getFeaturesQueryKey(),
-        queryFn: () => apiClient.chat.get(getFeaturesRequestArgs()),
-        staleTime: 1000 * 60 * 5,
-    });
-    if (!isFetched)
-        return false;
-    return (data?.data.some(feature => feature.name === availableFeatures.direct_messages_eap && feature.enabled) ?? false);
-}
-//# sourceMappingURL=use_direct_messages_enabled.js.map

package/build/hooks/use_direct_messages_enabled.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"use_direct_messages_enabled.js","sourceRoot":"","sources":["../../src/hooks/use_direct_messages_enabled.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAA;AAGhD,OAAO,EAAE,sBAAsB,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAA;AAC3F,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAA;AAC/C,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAA;AAElD,MAAM,UAAU,wBAAwB;IACtC,MAAM,SAAS,GAAG,YAAY,EAAE,CAAA;IAChC,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,QAAQ,CAAiC;QACnE,QAAQ,EAAE,mBAAmB,EAAE;QAC/B,OAAO,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAiC,sBAAsB,EAAE,CAAC;QAC3F,SAAS,EAAE,IAAI,GAAG,EAAE,GAAG,CAAC;KACzB,CAAC,CAAA;IAEF,IAAI,CAAC,SAAS;QAAE,OAAO,KAAK,CAAA;IAE5B,OAAO,CACL,IAAI,EAAE,IAAI,CAAC,IAAI,CACb,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,KAAK,iBAAiB,CAAC,mBAAmB,IAAI,OAAO,CAAC,OAAO,CACrF,IAAI,KAAK,CACX,CAAA;AACH,CAAC","sourcesContent":["import { useQuery } from '@tanstack/react-query'\nimport { ApiCollection } from '../types'\nimport type { FeatureResource } from '../types/resources/feature_resource'\nimport { getFeaturesRequestArgs, getFeaturesQueryKey } from '../utils/request/get_features'\nimport { useApiClient } from './use_api_client'\nimport { availableFeatures } from './use_features'\n\nexport function useDirectMessagesEnabled(): boolean {\n  const apiClient = useApiClient()\n  const { data, isFetched } = useQuery<ApiCollection<FeatureResource>>({\n    queryKey: getFeaturesQueryKey(),\n    queryFn: () => apiClient.chat.get<ApiCollection<FeatureResource>>(getFeaturesRequestArgs()),\n    staleTime: 1000 * 60 * 5,\n  })\n\n  if (!isFetched) return false\n\n  return (\n    data?.data.some(\n      feature => feature.name === availableFeatures.direct_messages_eap && feature.enabled\n    ) ?? false\n  )\n}\n"]}

package/src/hooks/use_direct_messages_enabled.ts

@@ -1,23 +0,0 @@
-import { useQuery } from '@tanstack/react-query'
-import { ApiCollection } from '../types'
-import type { FeatureResource } from '../types/resources/feature_resource'
-import { getFeaturesRequestArgs, getFeaturesQueryKey } from '../utils/request/get_features'
-import { useApiClient } from './use_api_client'
-import { availableFeatures } from './use_features'
-
-export function useDirectMessagesEnabled(): boolean {
-  const apiClient = useApiClient()
-  const { data, isFetched } = useQuery<ApiCollection<FeatureResource>>({
-    queryKey: getFeaturesQueryKey(),
-    queryFn: () => apiClient.chat.get<ApiCollection<FeatureResource>>(getFeaturesRequestArgs()),
-    staleTime: 1000 * 60 * 5,
-  })
-
-  if (!isFetched) return false
-
-  return (
-    data?.data.some(
-      feature => feature.name === availableFeatures.direct_messages_eap && feature.enabled
-    ) ?? false
-  )
-}