@planningcenter/chat-react-native 3.43.0-rc.1 → 3.43.0-rc.3

package/build/types/resources/person.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"person.d.ts","sourceRoot":"","sources":["../../../src/types/resources/person.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAElD,eAAO,MAAM,sBAAsB;;;;CAIzB,CAAA;AAEV,MAAM,MAAM,sBAAsB,GAChC,CAAC,OAAO,sBAAsB,CAAC,CAAC,MAAM,OAAO,sBAAsB,CAAC,CAAA;AAEtE,MAAM,WAAW,cAAe,SAAQ,cAAc;IACpD,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,QAAQ,CAAA;IACd,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,MAAM,CAAA;CACf;AAED,MAAM,WAAW,qBAAsB,SAAQ,cAAc;IAC3D,OAAO,EAAE,OAAO,CAAA;IAChB,WAAW,EAAE,MAAM,CAAA;IACnB,cAAc,EAAE,OAAO,CAAA;IACvB,sBAAsB,CAAC,EAAE,sBAAsB,CAAA;IAC/C,sBAAsB,EAAE,OAAO,CAAA;IAC/B,QAAQ,EAAE,OAAO,CAAA;CAClB"}
+{"version":3,"file":"person.d.ts","sourceRoot":"","sources":["../../../src/types/resources/person.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAElD,eAAO,MAAM,sBAAsB;;;;CAIzB,CAAA;AAEV,MAAM,MAAM,sBAAsB,GAChC,CAAC,OAAO,sBAAsB,CAAC,CAAC,MAAM,OAAO,sBAAsB,CAAC,CAAA;AAEtE,MAAM,WAAW,cAAe,SAAQ,cAAc;IACpD,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,QAAQ,CAAA;IACd,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,MAAM,CAAA;CACf;AAED,MAAM,WAAW,qBAAsB,SAAQ,cAAc;IAC3D,OAAO,EAAE,OAAO,CAAA;IAChB,WAAW,EAAE,MAAM,CAAA;IACnB,cAAc,EAAE,OAAO,CAAA;IACvB,sBAAsB,CAAC,EAAE,sBAAsB,CAAA;IAC/C,sBAAsB,EAAE,OAAO,CAAA;IAC/B,sBAAsB,EAAE,OAAO,CAAA;IAC/B,QAAQ,EAAE,OAAO,CAAA;CAClB"}

package/build/types/resources/person.js.map

@@ -1 +1 @@
-{"version":3,"file":"person.js","sourceRoot":"","sources":["../../../src/types/resources/person.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,sBAAsB,GAAG;IACpC,SAAS,EAAE,WAAW;IACtB,YAAY,EAAE,cAAc;IAC5B,OAAO,EAAE,SAAS;CACV,CAAA","sourcesContent":["import { ResourceObject } from '../api_primitives'\n\nexport const AgeQualificationStatus = {\n  QUALIFIED: 'qualified',\n  DISQUALIFIED: 'disqualified',\n  UNKNOWN: 'unknown',\n} as const\n\nexport type AgeQualificationStatus =\n  (typeof AgeQualificationStatus)[keyof typeof AgeQualificationStatus]\n\nexport interface PersonResource extends ResourceObject {\n  id: number\n  type: 'Person'\n  name: string\n  avatar: string\n}\n\nexport interface CurrentPersonResource extends PersonResource {\n  canChat: boolean\n  unreadCount: number\n  pcoChatEnabled: boolean\n  ageQualificationStatus?: AgeQualificationStatus\n  directMessagesDisabled: boolean\n  under_18: boolean\n}\n"]}
+{"version":3,"file":"person.js","sourceRoot":"","sources":["../../../src/types/resources/person.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,sBAAsB,GAAG;IACpC,SAAS,EAAE,WAAW;IACtB,YAAY,EAAE,cAAc;IAC5B,OAAO,EAAE,SAAS;CACV,CAAA","sourcesContent":["import { ResourceObject } from '../api_primitives'\n\nexport const AgeQualificationStatus = {\n  QUALIFIED: 'qualified',\n  DISQUALIFIED: 'disqualified',\n  UNKNOWN: 'unknown',\n} as const\n\nexport type AgeQualificationStatus =\n  (typeof AgeQualificationStatus)[keyof typeof AgeQualificationStatus]\n\nexport interface PersonResource extends ResourceObject {\n  id: number\n  type: 'Person'\n  name: string\n  avatar: string\n}\n\nexport interface CurrentPersonResource extends PersonResource {\n  canChat: boolean\n  unreadCount: number\n  pcoChatEnabled: boolean\n  ageQualificationStatus?: AgeQualificationStatus\n  directMessagesDisabled: boolean\n  directMessagesEligible: boolean\n  under_18: boolean\n}\n"]}

package/build/utils/conversation_safety_constants.d.ts

@@ -1,2 +1,2 @@
-export declare const ADULT_REQUIREMENT_BODY = "Conversations with teens require at least 2 adults. This chat is paused until another adult is added.";
+export declare const ADULT_REQUIREMENT_BODY = "Conversations with minors require at least two adults. This chat is paused until more adults are added.";
 //# sourceMappingURL=conversation_safety_constants.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"conversation_safety_constants.d.ts","sourceRoot":"","sources":["../../src/utils/conversation_safety_constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,sBAAsB,0GACsE,CAAA"}
+{"version":3,"file":"conversation_safety_constants.d.ts","sourceRoot":"","sources":["../../src/utils/conversation_safety_constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,sBAAsB,4GACwE,CAAA"}

package/build/utils/conversation_safety_constants.js

@@ -1,2 +1,2 @@
-export const ADULT_REQUIREMENT_BODY = 'Conversations with teens require at least 2 adults. This chat is paused until another adult is added.';
+export const ADULT_REQUIREMENT_BODY = 'Conversations with minors require at least two adults. This chat is paused until more adults are added.';
 //# sourceMappingURL=conversation_safety_constants.js.map

package/build/utils/conversation_safety_constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"conversation_safety_constants.js","sourceRoot":"","sources":["../../src/utils/conversation_safety_constants.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,sBAAsB,GACjC,uGAAuG,CAAA","sourcesContent":["export const ADULT_REQUIREMENT_BODY =\n  'Conversations with teens require at least 2 adults. This chat is paused until another adult is added.'\n"]}
+{"version":3,"file":"conversation_safety_constants.js","sourceRoot":"","sources":["../../src/utils/conversation_safety_constants.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,sBAAsB,GACjC,yGAAyG,CAAA","sourcesContent":["export const ADULT_REQUIREMENT_BODY =\n  'Conversations with minors require at least two adults. This chat is paused until more adults are added.'\n"]}

package/build/utils/request/conversation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"conversation.d.ts","sourceRoot":"","sources":["../../../src/utils/request/conversation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,sCAAsC,CAAA;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAE5C,MAAM,WAAW,uBAAuB;IACtC,IAAI,EAAE,MAAM,CAAA;IACZ,mBAAmB,CAAC,EAAE,OAAO,CAAA;IAC7B,qBAAqB,CAAC,EAAE,MAAM,CAAA;IAC9B,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AAED,eAAO,MAAM,2BAA2B,GAAI,8EAKzC,OAAO,CAAC,uBAAuB,CAAM,KAAG,UAoD1C,CAAA"}
+{"version":3,"file":"conversation.d.ts","sourceRoot":"","sources":["../../../src/utils/request/conversation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,sCAAsC,CAAA;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAE5C,MAAM,WAAW,uBAAuB;IACtC,IAAI,EAAE,MAAM,CAAA;IACZ,mBAAmB,CAAC,EAAE,OAAO,CAAA;IAC7B,qBAAqB,CAAC,EAAE,MAAM,CAAA;IAC9B,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AAED,eAAO,MAAM,2BAA2B,GAAI,8EAKzC,OAAO,CAAC,uBAAuB,CAAM,KAAG,UAqD1C,CAAA"}

package/build/utils/request/conversation.js

@@ -28,6 +28,7 @@ export const getConversationsRequestArgs = ({ gids, chat_group_graph_id, group_s
                     'conversation_preview',
                     'disabled',
                     'disabled_reason',
+                    'disabled_message',
                     '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":"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,yBAAyB,CAAA;IACpC,CAAC;SAAM,IAAI,oBAAoB,EAAE,CAAC;QAChC,MAAM,GAAG,kCAAkC,CAAA;IAC7C,CAAC;SAAM,IAAI,qBAAqB,EAAE,CAAC;QACjC,MAAM,GAAG,yCAAyC,CAAA;IACpD,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,sBAAsB;oBACtB,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,iBAAiB;oBACjB,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 = 'mine_or_not_empty,group'\n  } else if (show_direct_messages) {\n    filter = 'mine_or_not_empty,direct_message'\n  } else if (group_source_app_name) {\n    filter = 'mine_or_not_empty,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          'conversation_preview',\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          'unread_reaction',\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,yBAAyB,CAAA;IACpC,CAAC;SAAM,IAAI,oBAAoB,EAAE,CAAC;QAChC,MAAM,GAAG,kCAAkC,CAAA;IAC7C,CAAC;SAAM,IAAI,qBAAqB,EAAE,CAAC;QACjC,MAAM,GAAG,yCAAyC,CAAA;IACpD,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,sBAAsB;oBACtB,UAAU;oBACV,iBAAiB;oBACjB,kBAAkB;oBAClB,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,iBAAiB;oBACjB,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 = 'mine_or_not_empty,group'\n  } else if (show_direct_messages) {\n    filter = 'mine_or_not_empty,direct_message'\n  } else if (group_source_app_name) {\n    filter = 'mine_or_not_empty,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          'conversation_preview',\n          'disabled',\n          'disabled_reason',\n          'disabled_message',\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          'unread_reaction',\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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@planningcenter/chat-react-native",
-  "version": "3.43.0-rc.1",
+  "version": "3.43.0-rc.3",
   "description": "",
   "main": "build/index.js",
   "react-native": "./src/index.tsx",
@@ -26,7 +26,7 @@
   "dependencies": {
     "@fortawesome/fontawesome-svg-core": "^7.2.0",
     "@fortawesome/react-native-fontawesome": "^0.3.2",
-    "@planningcenter/emoji-keyboard": "3.43.0-rc.1",
+    "@planningcenter/emoji-keyboard": "3.43.0-rc.3",
     "lodash-inflection": "^1.5.0",
     "react-compiler-runtime": "^1.0.0"
   },
@@ -72,5 +72,5 @@
     "react-native-url-polyfill": "^2.0.0",
     "typescript": "~6.0.3"
   },
-  "gitHead": "6b139e3805ab55e4f33cd77f997b536e26c63841"
+  "gitHead": "91f1e0975da6c34342b4e54491e986b569b5d475"
 }

package/src/__tests__/hooks/use_direct_messages_eligible.test.tsx

@@ -0,0 +1,76 @@
+import { QueryClientProvider } from '@tanstack/react-query'
+import { act, renderHook, waitFor } from '@testing-library/react-native'
+import React from 'react'
+import { buildTestQueryClient } from '../../__utils__/query_client'
+import { ChatContext, ChatContextValue } from '../../contexts/chat_context'
+import { ApiClient, useApiClient } from '../../hooks/use_api_client'
+import { currentPersonQueryKey } from '../../hooks/use_current_person'
+import { useDirectMessagesEligible } from '../../hooks/use_direct_messages_eligible'
+import { Session } from '../../utils'
+
+jest.mock('../../hooks/use_api_client')
+
+const mockedUseApiClient = useApiClient as jest.MockedFunction<typeof useApiClient>
+
+let get: jest.Mock
+
+const session = new Session({ token: { access_token: 'a-real-token' } })
+
+const renderUseDirectMessagesEligible = (queryClient = buildTestQueryClient()) => {
+  const wrapper = ({ children }: { children: React.ReactNode }) => (
+    <QueryClientProvider client={queryClient}>
+      <ChatContext.Provider value={{ session } as unknown as ChatContextValue}>
+        {children}
+      </ChatContext.Provider>
+    </QueryClientProvider>
+  )
+
+  return { ...renderHook(() => useDirectMessagesEligible(), { wrapper }), queryClient }
+}
+
+beforeEach(() => {
+  get = jest.fn().mockResolvedValue({ data: { id: 1, directMessagesEligible: true } })
+  mockedUseApiClient.mockReturnValue({ chat: { get } } as unknown as ApiClient)
+})
+
+afterEach(() => {
+  jest.clearAllMocks()
+})
+
+describe('useDirectMessagesEligible', () => {
+  it('returns true once the person is fetched as eligible', async () => {
+    get.mockResolvedValue({
+      data: { id: 1, directMessagesEligible: true, directMessagesDisabled: true },
+    })
+
+    const { result } = renderUseDirectMessagesEligible()
+
+    await waitFor(() => expect(result.current).toBe(true))
+  })
+
+  it('returns false when the attribute is absent from the response', async () => {
+    get.mockResolvedValue({ data: { id: 1 } })
+
+    const { result } = renderUseDirectMessagesEligible()
+
+    await waitFor(() => expect(get).toHaveBeenCalled())
+    // false is also the hook's return value before the fetch resolves, so a plain check here
+    // could pass by coincidence against that early state. react-query schedules its update via
+    // a real setTimeout, so this waits for that timer to actually fire before asserting the
+    // settled value.
+    await act(() => new Promise(resolve => setTimeout(resolve, 0)))
+
+    expect(result.current).toBe(false)
+  })
+
+  it('reads the same /me cache entry as useCurrentPerson', () => {
+    const queryClient = buildTestQueryClient()
+    queryClient.setQueryData(currentPersonQueryKey, {
+      data: { id: 1, directMessagesEligible: true },
+    })
+
+    const { result } = renderUseDirectMessagesEligible(queryClient)
+
+    expect(result.current).toBe(true)
+  })
+})

package/src/components/conversation/messages_disabled_banners.tsx

@@ -1,8 +1,6 @@
 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 { Button, Text } from '../display'
 
 export const LeaderMessagesDisabledBanner = () => {
@@ -22,25 +20,19 @@ export const MemberMessagesDisabledBanner = () => {
   )
 }
 
-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
+  message: string | null
   messageLink?: { label: string; onPress: () => void }
 }
 
 export const ConversationDisabledBanner = ({
-  disabledReason,
+  message,
   messageLink,
 }: ConversationDisabledBannerProps) => {
   const styles = useStyles()
-  const description =
-    (disabledReason && DISABLED_REASON_TEXT[disabledReason]) ?? DEFAULT_DISABLED_TEXT
+  const description = message ?? DEFAULT_DISABLED_TEXT
 
   return (
     <MessagesDisabledBanner

package/src/components/display/adult_requirement_notice.tsx

@@ -13,7 +13,7 @@ export function AdultRequirementNotice({ style }: AdultRequirementNoticeProps) {
     <BannerCollapsible
       appearance="warning"
       iconName="general.shieldExclamation"
-      heading="2 adults required to chat"
+      heading="Two adults required to chat"
       style={style}
     >
       <BannerPrimitive.Text>{ADULT_REQUIREMENT_BODY}</BannerPrimitive.Text>

package/src/hooks/index.ts

@@ -8,7 +8,7 @@ export * from './use_chat_permissions'
 export * from './use_create_android_ripple_color'
 export * from './use_current_person'
 export * from './use_deleting_ids'
-export * from './use_direct_messages_enabled'
+export * from './use_direct_messages_eligible'
 export * from './use_font_scale'
 export * from './use_has_direct_messages'
 export * from './use_groups_groups'

package/src/hooks/use_conversation.ts

@@ -32,6 +32,7 @@ export const getConversationRequestArgs = ({ conversation_id }: { conversation_i
         'direct_message',
         'disabled',
         'disabled_reason',
+        'disabled_message',
         'member_ability',
         'muted',
         'replies_disabled',

package/src/hooks/use_conversation_jolt_events.ts

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

package/src/hooks/use_current_person.ts

@@ -17,6 +17,7 @@ export const currentPersonRequestArgs = {
         'pco_chat_enabled',
         'age_qualification_status',
         'direct_messages_disabled',
+        'direct_messages_eligible',
         'under_18',
       ],
     },

package/src/hooks/use_direct_messages_eligible.ts

@@ -0,0 +1,14 @@
+import { CurrentPersonResource } from '../types'
+import { useApiGet } from './use_api'
+import { currentPersonRequestArgs } from './use_current_person'
+
+export const useDirectMessagesEligible = (): boolean => {
+  const { data: person, isFetched } = useApiGet<CurrentPersonResource>(currentPersonRequestArgs)
+
+  // This hook is used as a React Navigation `if:` predicate, which can't suspend, so this has
+  // to return a real boolean synchronously. Until the /me fetch resolves, that means failing
+  // closed to false rather than blocking so the route is briefly absent instead of the app hanging.
+  if (!isFetched) return false
+
+  return person?.directMessagesEligible ?? false
+}

package/src/hooks/use_features.ts

@@ -43,7 +43,6 @@ export const availableFeatures = {
   custom_conversation_avatars: 'ROLLOUT_custom_conversation_avatars',
   conversation_safety_lock: 'ROLLOUT_conversation_safety_lock',
   video_moderation: 'ROLLOUT_MOBILE_video_moderation',
-  direct_messages_eap: 'ROLLOUT_direct_messages_eap',
   dm_search_clear_fix: 'ROLLOUT_MOBILE_dm_search_clear_fix',
 } as const satisfies Record<string, `ROLLOUT_${string}`>
 

package/src/navigation/index.tsx

@@ -14,7 +14,7 @@ import {
   HeaderDoneButton,
   HeaderTextButton,
 } from '../components/display/platform_modal_header_buttons'
-import { useDirectMessagesEnabled, useQualifiedByAge } from '../hooks'
+import { useDirectMessagesEligible, useQualifiedByAge } from '../hooks'
 import {
   AttachmentActionsScreen,
   AttachmentActionsScreenOptions,
@@ -128,7 +128,7 @@ export const NewConversationStack = createNativeStackNavigator({
     },
     ConversationSelectDirectMessageRecipients: {
       screen: ConversationSelectDirectMessageRecipientsScreen,
-      if: useDirectMessagesEnabled,
+      if: useDirectMessagesEligible,
       options: ({ navigation, route }) => ({
         title: 'New conversation',
         headerRight: (props: NativeStackHeaderRightProps) => (

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

@@ -4,7 +4,7 @@ import { FlatList } from 'react-native-gesture-handler'
 import { Heading } from '../../../components'
 import {
   useAtFontScaleBreakpoint,
-  useDirectMessagesEnabled,
+  useDirectMessagesEligible,
   useHasDirectMessages,
   useTheme,
 } from '../../../hooks'
@@ -59,9 +59,9 @@ export const ConversationFilters = () => {
   const { setScrollOffset, params } = useContext(FilterContext)
   const { chat_group_graph_id, group_source_app_name = '', show_direct_messages } = params
 
-  const directMessagesEnabled = useDirectMessagesEnabled()
+  const directMessagesEligible = useDirectMessagesEligible()
   const hasDirectMessages = useHasDirectMessages()
-  const canFilterByDMs = directMessagesEnabled && hasDirectMessages
+  const canFilterByDMs = directMessagesEligible && hasDirectMessages
 
   const activeFilter: FilterTypes = useMemo(() => {
     if (chat_group_graph_id) {

package/src/screens/conversation_screen.tsx

@@ -257,7 +257,7 @@ function ConversationBottomBar({
   if (conversation.disabled)
     return (
       <ConversationDisabledBanner
-        disabledReason={conversation.disabledReason}
+        message={conversation.disabledMessage ?? null}
         messageLink={messageLink}
       />
     )

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/jolt_events/conversation_events.ts

@@ -1,5 +1,4 @@
 import type { CustomMessage } from '@planningcenter/jolt-client/dist/types/JoltConnection'
-import type { ConversationDisabledReason } from '../resources/conversation'
 
 type DateString = string
 interface BaseConversationEventData extends Record<string, unknown> {
@@ -16,7 +15,8 @@ interface BaseConversationEventData extends Record<string, unknown> {
     latest_read_message_sort_key?: string
     organization_id: number
     disabled: boolean
-    disabled_reason?: ConversationDisabledReason
+    disabled_reason: string | null
+    disabled_message: string | null
     replies_disabled: boolean
     subtitle?: string
     title: string

package/src/types/resources/conversation.ts

@@ -5,8 +5,6 @@ import { GroupResource } from './group_resource'
 import { MemberAbilityResource } from './member_ability'
 import { ReactionCountResource } from './reaction'
 
-export type ConversationDisabledReason = 'safety_check' | 'direct_messages_disabled'
-
 export interface ConversationPreviewData {
   kind: 'reaction' | 'message'
   authorName: string
@@ -26,7 +24,8 @@ export interface ConversationResource {
   deleted?: boolean
   directMessage?: boolean
   disabled?: boolean
-  disabledReason?: ConversationDisabledReason
+  disabledReason?: string | null
+  disabledMessage?: string | null
   genderOption?: string | null
   groups?: GroupResource[]
   previewAvatarUrls?: string[]

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/src/utils/conversation_safety_constants.ts

@@ -1,2 +1,2 @@
 export const ADULT_REQUIREMENT_BODY =
-  'Conversations with teens require at least 2 adults. This chat is paused until another adult is added.'
+  'Conversations with minors require at least two adults. This chat is paused until more adults are added.'

package/src/utils/request/conversation.ts

@@ -41,6 +41,7 @@ export const getConversationsRequestArgs = ({
           'conversation_preview',
           'disabled',
           'disabled_reason',
+          'disabled_message',
           'groups',
           'last_message_author_id',
           'last_message_author_name',

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
-  )
-}