@planningcenter/chat-react-native 3.42.3-qa-staging.7 → 3.43.0-rc.1

package/src/navigation/index.tsx

@@ -9,6 +9,8 @@ import React from 'react'
 import { Platform } from 'react-native'
 import { Icon } from '../components'
 import {
+  composeHeaderOptions,
+  createMinimalHeaderBackButton,
   HeaderDoneButton,
   HeaderTextButton,
 } from '../components/display/platform_modal_header_buttons'
@@ -81,11 +83,6 @@ import {
 import { TeamConversationScreen } from '../screens/team_conversation_screen'
 import { ScreenLayoutWithChatAccessGate } from './screenLayout'
 
-const HEADER_BACK_BUTTON_LAYOUT_RESET_STYLES = {
-  marginLeft: Platform.select({ ios: -8, default: -3 }),
-  marginRight: Platform.select({ ios: 0, default: 30 }),
-}
-
 export const NewConversationStack = createNativeStackNavigator({
   initialRouteName: 'ConversationNewEntry',
   screenOptions: {
@@ -221,38 +218,27 @@ export const ChatStack = createNativeStackNavigator({
             onPress={() => navigation.getParent()?.goBack()}
           />
         ),
-        headerLeft: props => (
-          <HeaderBackButton
-            style={HEADER_BACK_BUTTON_LAYOUT_RESET_STYLES}
-            displayMode="minimal"
-            onPress={() => {
-              const params = route.params as ConversationRouteProps
-              if ((params as ConversationFiltersParams)?.chat_group_graph_id) {
-                // Ensure that conversations with a graph id pass them back to the conversation list
-                const { chat_group_graph_id } = params
-                navigation.popTo('Conversations', { chat_group_graph_id })
-              } else {
-                navigation.goBack()
-              }
-            }}
-            {...props}
-          />
-        ),
+        headerLeft: createMinimalHeaderBackButton({
+          onPress: () => {
+            const params = route.params as ConversationRouteProps
+            if ((params as ConversationFiltersParams)?.chat_group_graph_id) {
+              // Ensure that conversations with a graph id pass them back to the conversation list
+              const { chat_group_graph_id } = params
+              navigation.popTo('Conversations', { chat_group_graph_id })
+            } else {
+              navigation.goBack()
+            }
+          },
+        }),
       }),
     },
     ConversationReply: {
       screen: ConversationScreen,
-      options: ({ route, navigation }) => ({
-        title: (route.params as ConversationRouteProps)?.title ?? 'Reply',
-        headerLeft: props => (
-          <HeaderBackButton
-            style={HEADER_BACK_BUTTON_LAYOUT_RESET_STYLES}
-            displayMode="minimal"
-            onPress={() => navigation.goBack()}
-            {...props}
-          />
-        ),
-      }),
+      options: ({ route, navigation }) =>
+        composeHeaderOptions({
+          title: (route.params as ConversationRouteProps)?.title ?? 'Reply',
+          onPress: navigation.goBack,
+        }),
     },
     TeamConversation: {
       screen: TeamConversationScreen,

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

@@ -59,9 +59,9 @@ export const GroupRow = ({ group, isActive }: GroupRowProps) => {
 
   return (
     <PressableRow onPress={handleFilterByGroup} isActive={isActive}>
-      {headerImage?.medium && (
+      {headerImage?.thumbnail && (
         <Image
-          source={{ uri: headerImage?.medium }}
+          source={{ uri: headerImage?.thumbnail }}
           resizeMode="cover"
           style={styles.rowImage}
           alt=""

package/src/screens/conversation_screen.tsx

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

package/src/screens/conversation_select_recipients/components/groups_recipient_row.tsx

@@ -12,7 +12,7 @@ export const GroupsRecipientRow = ({ group, onPress }: GroupsRecipientRowProps)
 
   return (
     <RecipientLinkRow
-      imageUri={group.headerImage?.medium}
+      imageUri={group.headerImage?.thumbnail}
       title={group.name}
       subtitle={`${group.membershipsCount} members`}
       onPress={() => onPress(group)}

package/src/screens/conversation_select_recipients/components/restricted_group_row.tsx

@@ -29,9 +29,9 @@ export const RestrictedGroupRow = ({ group }: RestrictedGroupRowProps) => {
       accessibilityLabel={`${group.name} — ${reasonText(group.canCreateConversationReasonCode)}`}
     >
       <View style={styles.innerContainer}>
-        {group.headerImage?.medium && (
+        {group.headerImage?.thumbnail && (
           <Image
-            source={{ uri: group.headerImage.medium }}
+            source={{ uri: group.headerImage.thumbnail }}
             resizeMode="cover"
             style={styles.image}
             alt=""

package/src/types/jolt_events/conversation_events.ts

@@ -1,4 +1,5 @@
 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> {
@@ -15,8 +16,7 @@ interface BaseConversationEventData extends Record<string, unknown> {
     latest_read_message_sort_key?: string
     organization_id: number
     disabled: boolean
-    disabled_reason: string | null
-    disabled_message: string | null
+    disabled_reason?: ConversationDisabledReason
     replies_disabled: boolean
     subtitle?: string
     title: string

package/src/types/resources/conversation.ts

@@ -5,6 +5,8 @@ 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
@@ -24,8 +26,7 @@ export interface ConversationResource {
   deleted?: boolean
   directMessage?: boolean
   disabled?: boolean
-  disabledReason?: string | null
-  disabledMessage?: string | null
+  disabledReason?: ConversationDisabledReason
   genderOption?: string | null
   groups?: GroupResource[]
   previewAvatarUrls?: string[]

package/src/utils/conversation_safety_constants.ts

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

package/src/utils/request/conversation.ts

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