@planningcenter/chat-react-native 3.39.0-rc.1 → 3.39.0-rc.10

package/build/utils/request/conversation.js

@@ -1,9 +1,17 @@
-export const getConversationsRequestArgs = ({ gids, chat_group_graph_id, group_source_app_name, } = {}) => {
-    const filter = chat_group_graph_id
-        ? 'group'
-        : group_source_app_name
-            ? 'group_source_app_name'
-            : 'mine_or_not_empty';
+export const getConversationsRequestArgs = ({ gids, chat_group_graph_id, group_source_app_name, show_direct_messages, } = {}) => {
+    let filter;
+    if (chat_group_graph_id) {
+        filter = 'group';
+    }
+    else if (show_direct_messages) {
+        filter = 'mine_or_not_empty,direct_message';
+    }
+    else if (group_source_app_name) {
+        filter = 'group_source_app_name';
+    }
+    else {
+        filter = 'mine_or_not_empty';
+    }
     return {
         url: '/me/conversations',
         data: {
@@ -18,6 +26,7 @@ export const getConversationsRequestArgs = ({ gids, chat_group_graph_id, group_s
                     'created_at',
                     'badges',
                     'disabled',
+                    'disabled_reason',
                     'groups',
                     'last_message_author_id',
                     'last_message_author_name',

package/build/utils/request/conversation.js.map

@@ -1 +1 @@
-{"version":3,"file":"conversation.js","sourceRoot":"","sources":["../../../src/utils/request/conversation.ts"],"names":[],"mappings":"AASA,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAAC,EAC1C,IAAI,EACJ,mBAAmB,EACnB,qBAAqB,MACe,EAAE,EAAc,EAAE;IACtD,MAAM,MAAM,GAAG,mBAAmB;QAChC,CAAC,CAAC,OAAO;QACT,CAAC,CAAC,qBAAqB;YACrB,CAAC,CAAC,uBAAuB;YACzB,CAAC,CAAC,mBAAmB,CAAA;IAEzB,OAAO;QACL,GAAG,EAAE,mBAAmB;QACxB,IAAI,EAAE;YACJ,OAAO,EAAE,EAAE;YACX,KAAK,EAAE,eAAe;YACtB,MAAM;YACN,IAAI;YACJ,KAAK,EAAE,mBAAmB;YAC1B,qBAAqB;YACrB,MAAM,EAAE;gBACN,YAAY,EAAE;oBACZ,YAAY;oBACZ,QAAQ;oBACR,UAAU;oBACV,QAAQ;oBACR,wBAAwB;oBACxB,0BAA0B;oBAC1B,yBAAyB;oBACzB,2BAA2B;oBAC3B,qBAAqB;oBACrB,oBAAoB;oBACpB,mBAAmB;oBACnB,qBAAqB;oBACrB,yBAAyB;oBACzB,gBAAgB;oBAChB,OAAO;oBACP,kBAAkB;oBAClB,OAAO;oBACP,cAAc;oBACd,YAAY;iBACb;gBACD,iBAAiB,EAAE,CAAC,UAAU,CAAC;gBAC/B,iBAAiB,EAAE,CAAC,UAAU,EAAE,mBAAmB,EAAE,MAAM,CAAC;aAC7D;YACD,OAAO,EAAE,CAAC,QAAQ,EAAE,oBAAoB,CAAC;SAC1C;KACF,CAAA;AACH,CAAC,CAAA","sourcesContent":["import { GraphId } from '../../types/resources/group_resource'\nimport { GetRequest } from '../client/types'\n\nexport interface ConversationRequestArgs {\n  gids: string\n  chat_group_graph_id?: GraphId\n  group_source_app_name?: string\n}\n\nexport const getConversationsRequestArgs = ({\n  gids,\n  chat_group_graph_id,\n  group_source_app_name,\n}: Partial<ConversationRequestArgs> = {}): GetRequest => {\n  const filter = chat_group_graph_id\n    ? 'group'\n    : group_source_app_name\n      ? 'group_source_app_name'\n      : 'mine_or_not_empty'\n\n  return {\n    url: '/me/conversations',\n    data: {\n      perPage: 20,\n      order: '-last_message',\n      filter,\n      gids,\n      group: chat_group_graph_id,\n      group_source_app_name,\n      fields: {\n        Conversation: [\n          'created_at',\n          'badges',\n          'disabled',\n          'groups',\n          'last_message_author_id',\n          'last_message_author_name',\n          'last_message_created_at',\n          'last_message_text_preview',\n          'preview_avatar_urls',\n          'custom_avatar_type',\n          'custom_avatar_key',\n          'custom_avatar_color',\n          'custom_avatar_image_url',\n          'member_ability',\n          'muted',\n          'replies_disabled',\n          'title',\n          'unread_count',\n          'updated_at',\n        ],\n        AnalyticsMetadata: ['metadata'],\n        ConversationBadge: ['app_name', 'pco_resource_type', 'text'],\n      },\n      include: ['badges', 'analytics_metadata'],\n    },\n  }\n}\n"]}
+{"version":3,"file":"conversation.js","sourceRoot":"","sources":["../../../src/utils/request/conversation.ts"],"names":[],"mappings":"AAUA,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAAC,EAC1C,IAAI,EACJ,mBAAmB,EACnB,qBAAqB,EACrB,oBAAoB,MACgB,EAAE,EAAc,EAAE;IACtD,IAAI,MAAc,CAAA;IAClB,IAAI,mBAAmB,EAAE,CAAC;QACxB,MAAM,GAAG,OAAO,CAAA;IAClB,CAAC;SAAM,IAAI,oBAAoB,EAAE,CAAC;QAChC,MAAM,GAAG,kCAAkC,CAAA;IAC7C,CAAC;SAAM,IAAI,qBAAqB,EAAE,CAAC;QACjC,MAAM,GAAG,uBAAuB,CAAA;IAClC,CAAC;SAAM,CAAC;QACN,MAAM,GAAG,mBAAmB,CAAA;IAC9B,CAAC;IAED,OAAO;QACL,GAAG,EAAE,mBAAmB;QACxB,IAAI,EAAE;YACJ,OAAO,EAAE,EAAE;YACX,KAAK,EAAE,eAAe;YACtB,MAAM;YACN,IAAI;YACJ,KAAK,EAAE,mBAAmB;YAC1B,qBAAqB;YACrB,MAAM,EAAE;gBACN,YAAY,EAAE;oBACZ,YAAY;oBACZ,QAAQ;oBACR,UAAU;oBACV,iBAAiB;oBACjB,QAAQ;oBACR,wBAAwB;oBACxB,0BAA0B;oBAC1B,yBAAyB;oBACzB,2BAA2B;oBAC3B,qBAAqB;oBACrB,oBAAoB;oBACpB,mBAAmB;oBACnB,qBAAqB;oBACrB,yBAAyB;oBACzB,gBAAgB;oBAChB,OAAO;oBACP,kBAAkB;oBAClB,OAAO;oBACP,cAAc;oBACd,YAAY;iBACb;gBACD,iBAAiB,EAAE,CAAC,UAAU,CAAC;gBAC/B,iBAAiB,EAAE,CAAC,UAAU,EAAE,mBAAmB,EAAE,MAAM,CAAC;aAC7D;YACD,OAAO,EAAE,CAAC,QAAQ,EAAE,oBAAoB,CAAC;SAC1C;KACF,CAAA;AACH,CAAC,CAAA","sourcesContent":["import { GraphId } from '../../types/resources/group_resource'\nimport { GetRequest } from '../client/types'\n\nexport interface ConversationRequestArgs {\n  gids: string\n  chat_group_graph_id?: GraphId\n  group_source_app_name?: string\n  show_direct_messages?: boolean\n}\n\nexport const getConversationsRequestArgs = ({\n  gids,\n  chat_group_graph_id,\n  group_source_app_name,\n  show_direct_messages,\n}: Partial<ConversationRequestArgs> = {}): GetRequest => {\n  let filter: string\n  if (chat_group_graph_id) {\n    filter = 'group'\n  } else if (show_direct_messages) {\n    filter = 'mine_or_not_empty,direct_message'\n  } else if (group_source_app_name) {\n    filter = 'group_source_app_name'\n  } else {\n    filter = 'mine_or_not_empty'\n  }\n\n  return {\n    url: '/me/conversations',\n    data: {\n      perPage: 20,\n      order: '-last_message',\n      filter,\n      gids,\n      group: chat_group_graph_id,\n      group_source_app_name,\n      fields: {\n        Conversation: [\n          'created_at',\n          'badges',\n          'disabled',\n          'disabled_reason',\n          'groups',\n          'last_message_author_id',\n          'last_message_author_name',\n          'last_message_created_at',\n          'last_message_text_preview',\n          'preview_avatar_urls',\n          'custom_avatar_type',\n          'custom_avatar_key',\n          'custom_avatar_color',\n          'custom_avatar_image_url',\n          'member_ability',\n          'muted',\n          'replies_disabled',\n          'title',\n          'unread_count',\n          'updated_at',\n        ],\n        AnalyticsMetadata: ['metadata'],\n        ConversationBadge: ['app_name', 'pco_resource_type', 'text'],\n      },\n      include: ['badges', 'analytics_metadata'],\n    },\n  }\n}\n"]}

package/build/utils/time.d.ts

@@ -0,0 +1,8 @@
+type TimeUnit = 'hours' | 'minutes' | 'seconds';
+export declare function toMs(value: number, unit: TimeUnit): number;
+export declare const FIVE_SECONDS: number;
+export declare const FIVE_MINUTES: number;
+export declare const THIRTY_MINUTES: number;
+export declare const ONE_HOUR: number;
+export {};
+//# sourceMappingURL=time.d.ts.map

package/build/utils/time.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"time.d.ts","sourceRoot":"","sources":["../../src/utils/time.ts"],"names":[],"mappings":"AAAA,KAAK,QAAQ,GAAG,OAAO,GAAG,SAAS,GAAG,SAAS,CAAA;AAE/C,wBAAgB,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,GAAG,MAAM,CAS1D;AAED,eAAO,MAAM,YAAY,QAAqB,CAAA;AAC9C,eAAO,MAAM,YAAY,QAAqB,CAAA;AAC9C,eAAO,MAAM,cAAc,QAAsB,CAAA;AACjD,eAAO,MAAM,QAAQ,QAAmB,CAAA"}

package/build/utils/time.js

@@ -0,0 +1,15 @@
+export function toMs(value, unit) {
+    switch (unit) {
+        case 'hours':
+            return value * 60 * 60 * 1000;
+        case 'minutes':
+            return value * 60 * 1000;
+        case 'seconds':
+            return value * 1000;
+    }
+}
+export const FIVE_SECONDS = toMs(5, 'seconds');
+export const FIVE_MINUTES = toMs(5, 'minutes');
+export const THIRTY_MINUTES = toMs(30, 'minutes');
+export const ONE_HOUR = toMs(1, 'hours');
+//# sourceMappingURL=time.js.map

package/build/utils/time.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"time.js","sourceRoot":"","sources":["../../src/utils/time.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,IAAI,CAAC,KAAa,EAAE,IAAc;IAChD,QAAQ,IAAI,EAAE,CAAC;QACb,KAAK,OAAO;YACV,OAAO,KAAK,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAA;QAC/B,KAAK,SAAS;YACZ,OAAO,KAAK,GAAG,EAAE,GAAG,IAAI,CAAA;QAC1B,KAAK,SAAS;YACZ,OAAO,KAAK,GAAG,IAAI,CAAA;IACvB,CAAC;AACH,CAAC;AAED,MAAM,CAAC,MAAM,YAAY,GAAG,IAAI,CAAC,CAAC,EAAE,SAAS,CAAC,CAAA;AAC9C,MAAM,CAAC,MAAM,YAAY,GAAG,IAAI,CAAC,CAAC,EAAE,SAAS,CAAC,CAAA;AAC9C,MAAM,CAAC,MAAM,cAAc,GAAG,IAAI,CAAC,EAAE,EAAE,SAAS,CAAC,CAAA;AACjD,MAAM,CAAC,MAAM,QAAQ,GAAG,IAAI,CAAC,CAAC,EAAE,OAAO,CAAC,CAAA","sourcesContent":["type TimeUnit = 'hours' | 'minutes' | 'seconds'\n\nexport function toMs(value: number, unit: TimeUnit): number {\n  switch (unit) {\n    case 'hours':\n      return value * 60 * 60 * 1000\n    case 'minutes':\n      return value * 60 * 1000\n    case 'seconds':\n      return value * 1000\n  }\n}\n\nexport const FIVE_SECONDS = toMs(5, 'seconds')\nexport const FIVE_MINUTES = toMs(5, 'minutes')\nexport const THIRTY_MINUTES = toMs(30, 'minutes')\nexport const ONE_HOUR = toMs(1, 'hours')\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@planningcenter/chat-react-native",
-  "version": "3.39.0-rc.1",
+  "version": "3.39.0-rc.10",
   "description": "",
   "main": "build/index.js",
   "react-native": "./src/index.tsx",
@@ -72,5 +72,5 @@
     "react-native-url-polyfill": "^2.0.0",
     "typescript": "~5.9.2"
   },
-  "gitHead": "03a375a045ff2ae572627318c41bfc6cdcf1bc74"
+  "gitHead": "6d8085c395109d5fb068d443b5ff320066f92952"
 }

package/src/components/conversation/messages_disabled_banners.tsx

@@ -1,6 +1,7 @@
 import { StyleSheet, View, type ViewStyle } from 'react-native'
 import { useSafeAreaInsets } from 'react-native-safe-area-context'
 import { useTheme } from '../../hooks'
+import type { ConversationDisabledReason } from '../../types'
 import { ADULT_REQUIREMENT_BODY } from '../../utils'
 import { Text } from '../display'
 
@@ -21,10 +22,23 @@ export const MemberMessagesDisabledBanner = () => {
   )
 }
 
-export const ConversationDisabledBanner = () => {
+const DISABLED_REASON_TEXT: Record<ConversationDisabledReason, string> = {
+  safety_check: ADULT_REQUIREMENT_BODY,
+  direct_messages_disabled: 'Direct messages have been turned off by someone in this conversation.',
+}
+
+const DEFAULT_DISABLED_TEXT = 'This conversation has been disabled.'
+
+interface ConversationDisabledBannerProps {
+  disabledReason?: ConversationDisabledReason
+}
+
+export const ConversationDisabledBanner = ({ disabledReason }: ConversationDisabledBannerProps) => {
   const styles = useStyles()
+  const description =
+    (disabledReason && DISABLED_REASON_TEXT[disabledReason]) ?? DEFAULT_DISABLED_TEXT
 
-  return <MessagesDisabledBanner description={ADULT_REQUIREMENT_BODY} style={styles.memberBanner} />
+  return <MessagesDisabledBanner description={description} style={styles.memberBanner} />
 }
 
 interface MessagesDisabledBannerProps {

package/src/contexts/api_provider.tsx

@@ -95,7 +95,10 @@ function useSessionChanged(value: Pick<ChatContextValue, 'token' | 'env'>): bool
   const isInitialLogin = !prevToken && !!newToken
   if (isInitialLogin) return false
 
-  return Boolean(prevToken && newToken !== prevToken) || Boolean(prevEnv && newEnv !== prevEnv)
+  const tokenChanged = Boolean(
+    prevToken?.access_token && newToken?.access_token !== prevToken?.access_token
+  )
+  return tokenChanged || Boolean(prevEnv && newEnv !== prevEnv)
 }
 
 function usePrevious<T>(value: T): T {

package/src/contexts/conversations_context.tsx

@@ -39,9 +39,13 @@ export const ConversationsContextProvider = ({
   args = {},
 }: PropsWithChildren<{ args: ConversationFiltersParams }>) => {
   const [activeConversationId, setActiveConversationId] = useState<number | undefined>()
-  const { chat_group_graph_id, group_source_app_name } = args
+  const { chat_group_graph_id, group_source_app_name, show_direct_messages } = args
 
-  const query = useConversations({ chat_group_graph_id, group_source_app_name })
+  const query = useConversations({
+    chat_group_graph_id,
+    group_source_app_name,
+    show_direct_messages,
+  })
 
   const value = useMemo(
     () => ({

package/src/hooks/direct_messages/use_direct_message_candidates.ts

@@ -26,5 +26,6 @@ export function useDirectMessageCandidates(term: string) {
       }) as Promise<ApiCollection<DirectMessageCandidateResource>>,
     enabled: term.length >= 1,
     staleTime: 1000 * 60,
+    throwOnError: true,
   })
 }

package/src/hooks/groups/use_group_chat_conversation_payload.ts

@@ -1,8 +1,9 @@
 import { useQuery } from '@tanstack/react-query'
 import { ApiResource, ResourceObject } from '../../types'
+import { toMs } from '../../utils/time'
 import { useApiClient } from '../use_api_client'
 
-const STALE_TIME_MS = 25 * 60 * 1000 // under Groups' 30-min server-side expiry
+const STALE_TIME_MS = toMs(25, 'minutes') // under Groups' 30-min server-side expiry
 
 interface Props {
   groupId: number

package/src/hooks/index.ts

@@ -10,6 +10,7 @@ export * from './use_current_person'
 export * from './use_deleting_ids'
 export * from './use_direct_messages_enabled'
 export * from './use_font_scale'
+export * from './use_has_direct_messages'
 export * from './use_groups_groups'
 export * from './use_groups'
 export * from './use_interaction_ghost_color'

package/src/hooks/services/use_services_chat_conversation_payload.ts

@@ -1,8 +1,9 @@
 import { useQuery } from '@tanstack/react-query'
+import { toMs } from '../../utils/time'
 import { useApiClient } from '../use_api_client'
 import { getServicesChatConversationPayload } from './use_find_or_create_services_conversation'
 
-const STALE_TIME_MS = 55 * 60 * 1000 // under Services' 1-hour server-side expiry
+const STALE_TIME_MS = toMs(55, 'minutes') // under Services' 1-hour server-side expiry
 
 interface Props {
   teamIds: number[]

package/src/hooks/use_api.ts

@@ -17,7 +17,15 @@ interface ApiGetOptions extends GetRequest {
   enabled?: boolean
 }
 
-export const useApiGet = <T extends ResourceObject | ResourceObject[]>(args: ApiGetOptions) => {
+type UseApiGetOptions = {
+  staleTime?: number
+  gcTime?: number
+}
+
+export const useApiGet = <T extends ResourceObject | ResourceObject[]>(
+  args: ApiGetOptions,
+  opts?: UseApiGetOptions
+) => {
   type Resource = ApiResource<T>
   const { session } = useContext(ChatContext)
   const apiClient = useApiClient()
@@ -32,6 +40,7 @@ export const useApiGet = <T extends ResourceObject | ResourceObject[]>(args: Api
       return apiClient[app].get({ url, data: d, headers }) as Promise<Resource>
     },
     enabled,
+    ...opts,
   })
 
   return { ...data, ...query }

package/src/hooks/use_chat_configuration.ts

@@ -5,6 +5,7 @@ import {
   getChatConfigurationRequestArgs,
   getChatConfigurationQueryKey,
 } from '../utils/request/get_chat_configuration'
+import { ONE_HOUR } from '../utils/time'
 import {
   FALLBACK_ALLOWED_FILE_EXTENSIONS,
   FALLBACK_ALLOWED_MIME_TYPES,
@@ -28,7 +29,7 @@ export function useChatConfiguration() {
         .get<ApiResource<ChatConfigurationResource>>(requestArgs)
         .catch(() => stableFallbackConfiguration)
     },
-    staleTime: 1000 * 60 * 60, // 1 hour — this rarely changes
+    staleTime: ONE_HOUR,
   })
 
   const attrs = data.data

package/src/hooks/use_chat_permissions.ts

@@ -1,4 +1,5 @@
 import { AppGrantsResource } from '../types'
+import { FIVE_MINUTES } from '../utils/time'
 import { useApiGet } from './use_api'
 import { App } from './use_api_client'
 
@@ -13,7 +14,9 @@ export const appGrantsRequestArgs = {
 }
 
 export function useAppGrants() {
-  return useApiGet<AppGrantsResource[]>(appGrantsRequestArgs)
+  return useApiGet<AppGrantsResource[]>(appGrantsRequestArgs, {
+    staleTime: FIVE_MINUTES,
+  })
 }
 
 export function useCanCreateConversations(): boolean {

package/src/hooks/use_conversation.ts

@@ -29,6 +29,7 @@ export const getConversationRequestArgs = ({ conversation_id }: { conversation_i
         'custom_avatar_color',
         'custom_avatar_image_url',
         'disabled',
+        'disabled_reason',
         'member_ability',
         'muted',
         'replies_disabled',

package/src/hooks/use_conversation_jolt_events.ts

@@ -26,7 +26,8 @@ export function useConversationJoltEvents({ conversationId }: Props) {
 
   const handleUpdatedConversation = useCallback(
     (e: JoltConversationEvent) => {
-      const { last_message_idempotent_key, last_message_author_id, disabled } = e.data.data
+      const { last_message_idempotent_key, last_message_author_id, disabled, disabled_reason } =
+        e.data.data
 
       if (last_message_idempotent_key && last_message_author_id === currentPersonId) {
         completeMessageCreationConversationTracking({
@@ -37,7 +38,7 @@ export function useConversationJoltEvents({ conversationId }: Props) {
 
       queryClient.setQueryData<ApiResource<ConversationResource>>(queryKey, prev => {
         if (!prev?.data) return prev
-        return { ...prev, data: { ...prev.data, disabled } }
+        return { ...prev, data: { ...prev.data, disabled, disabledReason: disabled_reason } }
       })
 
       queryClient.invalidateQueries({ queryKey })

package/src/hooks/use_current_person.ts

@@ -1,6 +1,7 @@
 import { useQueryClient } from '@tanstack/react-query'
 import { CurrentPersonResource } from '../types'
 import { ApiResource } from '../types/api_primitives'
+import { FIVE_MINUTES, THIRTY_MINUTES } from '../utils/time'
 import { getRequestQueryKey, useSuspenseGet } from './use_suspense_api'
 
 export const currentPersonRequestArgs = {
@@ -15,6 +16,7 @@ export const currentPersonRequestArgs = {
         'unread_count',
         'pco_chat_enabled',
         'age_qualification_status',
+        'direct_messages_disabled',
       ],
     },
   },
@@ -24,8 +26,8 @@ export const currentPersonQueryKey = getRequestQueryKey(currentPersonRequestArgs
 
 export const useCurrentPerson = () => {
   const { data: person } = useSuspenseGet<CurrentPersonResource>(currentPersonRequestArgs, {
-    staleTime: 5 * 60 * 1000, // 5 minutes - data stays fresh for 5 minutes
-    gcTime: 30 * 60 * 1000, // 30 minutes - data stays in cache for 30 minutes when not in use
+    staleTime: FIVE_MINUTES,
+    gcTime: THIRTY_MINUTES,
   })
 
   return person

package/src/hooks/use_features.ts

@@ -3,6 +3,7 @@ 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 } from '../utils/time'
 import { useApiClient } from './use_api_client'
 
 type FeatureName = (typeof availableFeatures)[keyof typeof availableFeatures]
@@ -18,7 +19,7 @@ export function useFeatures() {
         .get<ApiCollection<FeatureResource>>(requestArgs)
         .catch(() => stableEmptyFeatures)
     },
-    staleTime: 1000 * 60 * 5, // 5 minutes
+    staleTime: FIVE_MINUTES,
   })
 
   const features = data.data

package/src/hooks/use_groups.ts

@@ -1,5 +1,6 @@
 import { AppName } from '../types/resources/app_name'
 import { GroupResource, SourceType } from '../types/resources/group_resource'
+import { FIVE_MINUTES } from '../utils/time'
 import { useApiPaginator } from './use_api'
 
 type UseGroupsProps = {
@@ -8,20 +9,23 @@ type UseGroupsProps = {
 }
 
 export const useGroups = ({ source_app_name, source_type }: UseGroupsProps) => {
-  return useApiPaginator<GroupResource>({
-    url: '/me/groups',
-    data: {
-      fields: {
-        Group: [],
+  return useApiPaginator<GroupResource>(
+    {
+      url: '/me/groups',
+      data: {
+        fields: {
+          Group: [],
+        },
+        where: {
+          source_app_name,
+          source_type,
+        },
+        perPage: 100,
       },
-      where: {
-        source_app_name,
-        source_type,
-      },
-      perPage: 100,
+      app: 'chat',
     },
-    app: 'chat',
-  })
+    { staleTime: FIVE_MINUTES }
+  )
 }
 
 export const useCanDisplayGroups = (props: UseGroupsProps) => {

package/src/hooks/use_groups_groups.ts

@@ -1,24 +1,28 @@
 import { GroupsGroupResource } from '../types'
+import { FIVE_MINUTES } from '../utils/time'
 import { useApiPaginator } from './use_api'
 
 export const useGroupsGroups = () => {
-  return useApiPaginator<GroupsGroupResource>({
-    url: '/me/groups',
-    data: {
-      perPage: 100,
-      fields: {
-        Group: [
-          'can_create_conversation',
-          'can_create_conversation_reason_code',
-          'name',
-          'header_image',
-          'memberships_count',
-        ],
+  return useApiPaginator<GroupsGroupResource>(
+    {
+      url: '/me/groups',
+      data: {
+        perPage: 100,
+        fields: {
+          Group: [
+            'can_create_conversation',
+            'can_create_conversation_reason_code',
+            'name',
+            'header_image',
+            'memberships_count',
+          ],
+        },
+        order: 'name',
       },
-      order: 'name',
+      app: 'groups',
     },
-    app: 'groups',
-  })
+    { staleTime: FIVE_MINUTES }
+  )
 }
 
 export const useCanDisplayGroupsGroups = () => {

package/src/hooks/use_has_direct_messages.ts

@@ -0,0 +1,21 @@
+import { useQuery } from '@tanstack/react-query'
+import { ApiCollection, ConversationResource } from '../types'
+import { useApiClient } from './use_api_client'
+
+export function useHasDirectMessages(): boolean {
+  const apiClient = useApiClient()
+
+  const { data, isFetched } = useQuery<ApiCollection<ConversationResource>>({
+    queryKey: ['chat', '/me/conversations', 'direct_message', 'has_any'],
+    queryFn: () =>
+      apiClient.chat.get({
+        url: '/me/conversations',
+        data: { filter: 'direct_message', perPage: 1, fields: { Conversation: ['id'] } },
+      }),
+    staleTime: 1000 * 60 * 5,
+  })
+
+  if (!isFetched) return false
+
+  return (data?.data.length ?? 0) > 0
+}

package/src/hooks/use_jolt.ts

@@ -13,6 +13,7 @@ import { useChatContext } from '../contexts/chat_context'
 import { ApiResource } from '../types'
 import type { JoltSubscriptionPattern } from '../types/jolt_events'
 import { Client, Uri } from '../utils'
+import { FIVE_SECONDS } from '../utils/time'
 
 interface JoltResponse {
   type: 'JoltToken'
@@ -49,7 +50,7 @@ export const useJoltClient = (): JoltClient | undefined => {
           },
         })
       },
-      staleTime: 5000, // 5 seconds
+      staleTime: FIVE_SECONDS,
     })
   }
 

package/src/hooks/use_organization.ts

@@ -1,4 +1,5 @@
 import { OrganizationResource } from '../types'
+import { ONE_HOUR } from '../utils/time'
 import { App } from './use_api_client'
 import { useSuspenseGet } from './use_suspense_api'
 
@@ -13,5 +14,7 @@ export const organizationRequestArgs = {
 }
 
 export function useOrganization() {
-  return useSuspenseGet<OrganizationResource>(organizationRequestArgs)
+  return useSuspenseGet<OrganizationResource>(organizationRequestArgs, {
+    staleTime: ONE_HOUR,
+  })
 }

package/src/hooks/use_person_settings.ts

@@ -0,0 +1,29 @@
+import { useMutation } from '@tanstack/react-query'
+import { throwResponseError } from '../utils/response_error'
+import { useApiClient } from './use_api_client'
+import { useCurrentPerson, useCurrentPersonCache } from './use_current_person'
+
+export function usePersonSettings() {
+  const apiClient = useApiClient()
+  const person = useCurrentPerson()
+  const { update, invalidate } = useCurrentPersonCache()
+
+  const directMessagesDisabled = person?.directMessagesDisabled ?? false
+
+  const { mutate: setDirectMessagesDisabled, isPending: isMutating } = useMutation({
+    mutationFn: (disabled: boolean) => {
+      const action = disabled ? 'disable_direct_messages' : 'enable_direct_messages'
+      return apiClient.chat
+        .post({ url: `/me/${action}`, data: { data: { type: 'Person', attributes: {} } } })
+        .catch(throwResponseError)
+    },
+    onMutate: disabled => {
+      update({ directMessagesDisabled: disabled })
+    },
+    onError: () => {
+      invalidate()
+    },
+  })
+
+  return { directMessagesDisabled, setDirectMessagesDisabled, isMutating }
+}

package/src/navigation/index.tsx

@@ -77,6 +77,7 @@ import { NotificationSettingsScreen } from '../screens/notification_settings_scr
 import { PreferredAppSelectionScreen } from '../screens/preferred_app_selection_screen'
 import { ReactionsScreen, ReactionsScreenOptions } from '../screens/reactions_screen'
 import { SendGiphyScreen, SendGiphyScreenOptions } from '../screens/send_giphy_screen'
+import { SettingsScreen } from '../screens/settings_screen'
 import {
   SystemMessagePeopleScreen,
   SystemMessagePeopleScreenOptions,
@@ -280,6 +281,16 @@ export const ChatStack = createNativeStackNavigator({
       screen: AvatarPickerScreen,
       options: AvatarPickerScreenOptions,
     },
+    ChatSettings: {
+      screen: SettingsScreen,
+      options: ({ navigation }) => ({
+        title: 'Chat settings',
+        headerBackVisible: false,
+        headerRight: (props: NativeStackHeaderRightProps) => (
+          <HeaderTextButton {...props} onPress={navigation.goBack} title="Done" />
+        ),
+      }),
+    },
     NotificationSettings: {
       screen: NotificationSettingsScreen,
       options: ({ navigation }) => ({

package/src/screens/conversation_details_screen.tsx

@@ -122,6 +122,7 @@ export function ConversationDetailsScreen({ route }: ConversationDetailsScreenPr
   const canDelete = conversation.memberAbility?.canDelete || false
   const isLeader = conversation.memberAbility?.leader || false
   const isDisabled = conversation.disabled ?? false
+  const showAdultRequirementNotice = isDisabled && conversation.disabledReason === 'safety_check'
 
   const {
     data: members,
@@ -350,7 +351,7 @@ export function ConversationDetailsScreen({ route }: ConversationDetailsScreenPr
       sectionInnerStyle: styles.sectionInnerGenderNotice,
     },
     {
-      type: isDisabled ? SectionTypes.view : SectionTypes.hidden,
+      type: showAdultRequirementNotice ? SectionTypes.view : SectionTypes.hidden,
       data: {
         children: <AdultRequirementNotice />,
       },

package/src/screens/conversation_filters/components/conversation_filters.tsx

@@ -2,7 +2,12 @@ import React, { useContext, useMemo } from 'react'
 import { StyleSheet, View, ViewStyle } from 'react-native'
 import { FlatList } from 'react-native-gesture-handler'
 import { Heading } from '../../../components'
-import { useAtFontScaleBreakpoint, useTheme } from '../../../hooks'
+import {
+  useAtFontScaleBreakpoint,
+  useDirectMessagesEnabled,
+  useHasDirectMessages,
+  useTheme,
+} from '../../../hooks'
 import { FilterContext, useFilterContext } from '../context/conversation_filter_context'
 import { FilterTypes } from '../filter_types'
 import { useGroupsToFilter, useTeamsToFilter } from '../hooks/filters'
@@ -52,7 +57,11 @@ interface DataItem<T, TName extends SectionTypes> {
 export const ConversationFilters = () => {
   const styles = useStyles()
   const { setScrollOffset, params } = useContext(FilterContext)
-  const { chat_group_graph_id, group_source_app_name = '' } = params
+  const { chat_group_graph_id, group_source_app_name = '', show_direct_messages } = params
+
+  const directMessagesEnabled = useDirectMessagesEnabled()
+  const hasDirectMessages = useHasDirectMessages()
+  const canFilterByDMs = directMessagesEnabled && hasDirectMessages
 
   const activeFilter: FilterTypes = useMemo(() => {
     if (chat_group_graph_id) {
@@ -61,10 +70,12 @@ export const ConversationFilters = () => {
       return FilterTypes.Groups
     } else if (/services/i.test(group_source_app_name)) {
       return FilterTypes.Teams
+    } else if (show_direct_messages) {
+      return FilterTypes.DirectMessages
     }
 
     return FilterTypes.All
-  }, [chat_group_graph_id, group_source_app_name])
+  }, [chat_group_graph_id, group_source_app_name, show_direct_messages])
 
   const { groups = [] } = useGroupsToFilter()
   const { teams = [] } = useTeamsToFilter()
@@ -91,14 +102,15 @@ export const ConversationFilters = () => {
   const teamItemData = selectActiveWithFirst(5)(teamItems)
 
   const hideAppFilters = groupItems.length < 1 || teamItems.length < 1
+  const showGeneralFilters = !hideAppFilters || canFilterByDMs
 
   const listData: SectionListData = [
     {
-      type: hideAppFilters ? SectionTypes.hidden : SectionTypes.header,
+      type: showGeneralFilters ? SectionTypes.header : SectionTypes.hidden,
       data: { title: 'General Filters' },
     },
     {
-      type: hideAppFilters ? SectionTypes.hidden : SectionTypes.filter,
+      type: showGeneralFilters ? SectionTypes.filter : SectionTypes.hidden,
       data: { filter: FilterTypes.All, isActive: activeFilter === FilterTypes.All },
     },
     {
@@ -117,6 +129,14 @@ export const ConversationFilters = () => {
         isActive: activeFilter === FilterTypes.Teams,
       },
     },
+    {
+      type: canFilterByDMs ? SectionTypes.filter : SectionTypes.hidden,
+      data: {
+        filter: FilterTypes.DirectMessages,
+        show_direct_messages: true,
+        isActive: activeFilter === FilterTypes.DirectMessages,
+      },
+    },
     {
       type: groupItems.length ? SectionTypes.header : SectionTypes.hidden,
       data: { title: 'Groups', style: styles.extraHeaderScalableSpace },