@planningcenter/chat-react-native 3.30.0-rc.1 → 3.30.0-rc.2

package/src/navigation/chat_access_gate.tsx

@@ -1,11 +1,11 @@
 import React, { PropsWithChildren, useEffect, useRef } from 'react'
-import { DefaultLoading } from '../components/page/loading'
-import { useChatContext } from '../contexts/chat_context'
-import { useApiGet, useOrganization } from '../hooks'
-import { currentPersonRequestArgs } from '../hooks/use_current_person'
-import { AgeCheckRequiredScreen } from '../screens/age_check/age_check_required_screen'
-import { AgeCheckUnderageScreen } from '../screens/age_check/age_check_underage_screen'
-import { AgeQualificationStatus, CurrentPersonResource } from '../types'
+import { DefaultLoading } from '@/components/page/loading'
+import { useChatContext } from '@/contexts/chat_context'
+import { useApiGet, useOrganization } from '@/hooks'
+import { currentPersonRequestArgs } from '@/hooks/use_current_person'
+import { AgeCheckRequiredScreen } from '@/screens/age_check/age_check_required_screen'
+import { AgeCheckUnderageScreen } from '@/screens/age_check/age_check_underage_screen'
+import { AgeQualificationStatus, CurrentPersonResource } from '@/types'
 
 export function ChatAccessGate({ children }: PropsWithChildren) {
   const { data: person, isFetched } = useApiGet<CurrentPersonResource>(currentPersonRequestArgs)

package/src/navigation/index.tsx

@@ -7,68 +7,65 @@ import {
 import { CardStyleInterpolators } from '@react-navigation/stack'
 import React from 'react'
 import { Platform } from 'react-native'
-import { Icon } from '../components'
+import { ScreenLayoutWithChatAccessGate } from './screenLayout'
+import { Icon } from '@/components'
 import {
   HeaderDoneButton,
   HeaderTextButton,
-} from '../components/display/platform_modal_header_buttons'
-import { useQualifiedByAge } from '../hooks'
+} from '@/components/display/platform_modal_header_buttons'
+import { useQualifiedByAge } from '@/hooks'
 import {
   AttachmentActionsScreen,
   AttachmentActionsScreenOptions,
-} from '../screens/attachment_actions/attachment_actions_screen'
-import { BugReportScreen, BugReportScreenOptions } from '../screens/bug_report_screen'
+} from '@/screens/attachment_actions/attachment_actions_screen'
+import { BugReportScreen, BugReportScreenOptions } from '@/screens/bug_report_screen'
 import {
   MessageReadReceiptsScreen,
   MessageReadReceiptsScreenOptions,
-} from '../screens/conversation/message_read_receipts_screen'
-import { ConversationDetailsScreen } from '../screens/conversation_details_screen'
+} from '@/screens/conversation/message_read_receipts_screen'
+import { ConversationDetailsScreen } from '@/screens/conversation_details_screen'
 import {
   ConversationFilterReceipientsScreenOptions,
   ConversationFilterRecipientsScreen,
-} from '../screens/conversation_filter_recipients/conversation_filter_recipients_screen'
-import { ConversationFiltersParams } from '../screens/conversation_filters/screen_props'
+} from '@/screens/conversation_filter_recipients/conversation_filter_recipients_screen'
+import { ConversationFiltersParams } from '@/screens/conversation_filters/screen_props'
 import {
   ConversationFiltersScreen,
   ConversationFiltersScreenOptions,
-} from '../screens/conversation_filters_screen'
-import { ConversationNewScreen } from '../screens/conversation_new/conversation_new_screen'
+} from '@/screens/conversation_filters_screen'
+import { ConversationNewScreen } from '@/screens/conversation_new/conversation_new_screen'
 import {
   ConversationNotificationLevelSelectScreen,
   ConversationNotificationLevelSelectScreenOptions,
-} from '../screens/conversation_notification_level_select_screen'
+} from '@/screens/conversation_notification_level_select_screen'
 import {
   ConversationRouteProps,
   ConversationScreen,
   ConversationScreenTitle,
-} from '../screens/conversation_screen'
-import { ConversationNewEntryScreen } from '../screens/conversation_select_recipients/conversation_new_entry_screen'
-import { ConversationSelectGroupRecipientsScreen } from '../screens/conversation_select_recipients/conversation_select_group_recipients_screen'
-import { ConversationSelectTeamsILeadRecipientsScreen } from '../screens/conversation_select_recipients/conversation_select_teams_i_lead_recipients_screen'
-import { ConversationSelectRecipientsParams } from '../screens/conversation_select_recipients/types/screen_props'
+} from '@/screens/conversation_screen'
+import { ConversationNewEntryScreen } from '@/screens/conversation_select_recipients/conversation_new_entry_screen'
+import { ConversationSelectGroupRecipientsScreen } from '@/screens/conversation_select_recipients/conversation_select_group_recipients_screen'
+import { ConversationSelectTeamsILeadRecipientsScreen } from '@/screens/conversation_select_recipients/conversation_select_teams_i_lead_recipients_screen'
+import { ConversationSelectRecipientsParams } from '@/screens/conversation_select_recipients/types/screen_props'
 import {
   ConversationSelectTypeScreen,
   ConversationSelectTypeScreenOptions,
-} from '../screens/conversation_select_type_screen'
-import { ConversationsScreen } from '../screens/conversations/conversations_screen'
-import { GetHelpScreen } from '../screens/get_help_screen'
+} from '@/screens/conversation_select_type_screen'
+import { ConversationsScreen } from '@/screens/conversations/conversations_screen'
+import { GetHelpScreen } from '@/screens/get_help_screen'
 import {
   GroupNotificationLevelSelectScreen,
   GroupNotificationLevelSelectScreenOptions,
-} from '../screens/group_notification_level_select_screen'
-import { GroupNotificationSettingsScreen } from '../screens/group_notification_settings_screen'
-import {
-  MessageActionsScreen,
-  MessageActionsScreenOptions,
-} from '../screens/message_actions_screen'
-import { MessageReportScreen, MessageReportScreenOptions } from '../screens/message_report_screen'
-import { NotFound } from '../screens/not_found'
-import { NotificationSettingsScreen } from '../screens/notification_settings_screen'
-import { PreferredAppSelectionScreen } from '../screens/preferred_app_selection_screen'
-import { ReactionsScreen, ReactionsScreenOptions } from '../screens/reactions_screen'
-import { SendGiphyScreen, SendGiphyScreenOptions } from '../screens/send_giphy_screen'
-import { TeamConversationScreen } from '../screens/team_conversation_screen'
-import { ScreenLayoutWithChatAccessGate } from './screenLayout'
+} from '@/screens/group_notification_level_select_screen'
+import { GroupNotificationSettingsScreen } from '@/screens/group_notification_settings_screen'
+import { MessageActionsScreen, MessageActionsScreenOptions } from '@/screens/message_actions_screen'
+import { MessageReportScreen, MessageReportScreenOptions } from '@/screens/message_report_screen'
+import { NotFound } from '@/screens/not_found'
+import { NotificationSettingsScreen } from '@/screens/notification_settings_screen'
+import { PreferredAppSelectionScreen } from '@/screens/preferred_app_selection_screen'
+import { ReactionsScreen, ReactionsScreenOptions } from '@/screens/reactions_screen'
+import { SendGiphyScreen, SendGiphyScreenOptions } from '@/screens/send_giphy_screen'
+import { TeamConversationScreen } from '@/screens/team_conversation_screen'
 
 const HEADER_BACK_BUTTON_LAYOUT_RESET_STYLES = {
   marginLeft: Platform.select({ ios: -8, default: -3 }),

package/src/navigation/screenLayout.tsx

@@ -1,8 +1,8 @@
 import React from 'react'
 import { Suspense } from 'react'
-import ErrorBoundary from '../components/page/error_boundary'
-import { DefaultLoading } from '../components/page/loading'
 import { ChatAccessGate } from './chat_access_gate'
+import ErrorBoundary from '@/components/page/error_boundary'
+import { DefaultLoading } from '@/components/page/loading'
 
 export function ScreenLayout({ children }: { children: React.ReactElement }) {
   return (

package/src/polyfills/events/Event.ts

@@ -10,7 +10,6 @@
  * See https://dom.spec.whatwg.org/#interface-event.
  */
 
-import { setPlatformObject } from '../webidl/PlatformObjects'
 import type RNEventTarget from './EventTarget'
 import {
   getComposedPath,
@@ -24,6 +23,7 @@ import {
   setIsTrusted,
   setEventPhase,
 } from './internals/EventInternals'
+import { setPlatformObject } from '@/polyfills/webidl/PlatformObjects'
 
 export interface EventInit {
   bubbles?: boolean

package/src/polyfills/events/EventTarget.ts

@@ -9,7 +9,6 @@
  * Implements the `EventTarget` interface from the DOM.
  */
 
-import { setPlatformObject } from '../webidl/PlatformObjects'
 import Event from './Event'
 import {
   getStopImmediatePropagationFlag,
@@ -27,6 +26,7 @@ import {
   EVENT_TARGET_GET_THE_PARENT_KEY,
   INTERNAL_DISPATCH_METHOD_KEY,
 } from './internals/EventTargetInternals'
+import { setPlatformObject } from '@/polyfills/webidl/PlatformObjects'
 
 export type EventCallback = (event: Event) => void
 export type EventHandler = { handleEvent(event: Event): void }

package/src/polyfills/events/internals/EventInternals.ts

@@ -2,8 +2,8 @@
  * Internal implementation details for the `Event` module.
  */
 
-import type Event from '../Event'
-import type EventTarget from '../EventTarget'
+import type Event from '@/polyfills/events/Event'
+import type EventTarget from '@/polyfills/events/EventTarget'
 
 export const COMPOSED_PATH_KEY: unique symbol = Symbol('composedPath')
 export const CURRENT_TARGET_KEY: unique symbol = Symbol('currentTarget')

package/src/polyfills/events/internals/EventTargetInternals.ts

@@ -2,9 +2,9 @@
  * Internal implementation details for the `EventTarget` module.
  */
 
-import type Event from '../Event'
-import type EventTarget from '../EventTarget'
 import { setIsTrusted } from './EventInternals'
+import type Event from '@/polyfills/events/Event'
+import type EventTarget from '@/polyfills/events/EventTarget'
 
 export const EVENT_TARGET_GET_THE_PARENT_KEY: unique symbol = Symbol('EventTarget[get the parent]')
 

package/src/screens/age_check/age_check_required_screen.tsx

@@ -1,15 +1,15 @@
 import { date as formatDate } from '@planningcenter/datetime-fmt'
 import React, { useState } from 'react'
 import { StyleSheet, View, ScrollView } from 'react-native'
-import { Heading } from '../../components'
-import { Avatar } from '../../components/display/avatar'
-import { Banner } from '../../components/display/banner'
-import { Button } from '../../components/display/button'
-import { Icon } from '../../components/display/icon'
-import { Text } from '../../components/display/text'
-import { useCurrentPerson, useTheme, useSubmitAgeCheck, useOrganization } from '../../hooks'
-import { platformFontWeightBold } from '../../utils/styles'
 import { AgeCheckSelectBirthdateModal } from './components/age_check_select_birthdate_modal'
+import { Heading } from '@/components'
+import { Avatar } from '@/components/display/avatar'
+import { Banner } from '@/components/display/banner'
+import { Button } from '@/components/display/button'
+import { Icon } from '@/components/display/icon'
+import { Text } from '@/components/display/text'
+import { useCurrentPerson, useTheme, useSubmitAgeCheck, useOrganization } from '@/hooks'
+import { platformFontWeightBold } from '@/utils/styles'
 
 function calculateAge(birthdate: Date) {
   const today = new Date()

package/src/screens/age_check/age_check_underage_screen.tsx

@@ -1,10 +1,10 @@
 import { useRoute, RouteProp } from '@react-navigation/native'
 import React from 'react'
 import { Linking, StyleSheet, View, ScrollView } from 'react-native'
-import { Heading } from '../../components'
-import { Icon, Text, TextInlineButton } from '../../components/display'
-import { useTheme } from '../../hooks'
 import type { AgeCheckParams } from './screen_props'
+import { Heading } from '@/components'
+import { Icon, Text, TextInlineButton } from '@/components/display'
+import { useTheme } from '@/hooks'
 
 export interface AgeCheckUnderageScreenProps {
   contactEmail?: string

package/src/screens/age_check/components/age_check_select_birthdate_modal.tsx

@@ -1,9 +1,9 @@
 import DateTimePicker, { DateTimePickerEvent } from '@react-native-community/datetimepicker'
 import React from 'react'
 import { Modal, Platform, StyleSheet, View } from 'react-native'
-import { Text } from '../../../components/display/text'
-import FormSheet from '../../../components/primitive/form_sheet'
-import { useTheme } from '../../../hooks'
+import { Text } from '@/components/display/text'
+import FormSheet from '@/components/primitive/form_sheet'
+import { useTheme } from '@/hooks'
 
 export type AgeCheckSelectBirthdateProps = {
   onChange: (date: Date) => void

package/src/screens/attachment_actions/attachment_actions_screen.tsx

@@ -1,8 +1,8 @@
 import { StaticScreenProps, useNavigation } from '@react-navigation/native'
 import React, { useCallback } from 'react'
 import { Alert, Linking, StyleSheet } from 'react-native'
-import FormSheet, { getFormSheetScreenOptions } from '../../components/primitive/form_sheet'
 import { useDeleteAttachment } from './hooks/useDeleteAttachment'
+import FormSheet, { getFormSheetScreenOptions } from '@/components/primitive/form_sheet'
 
 export const AttachmentActionsScreenOptions = getFormSheetScreenOptions({
   headerTitle: 'Attachment actions',

package/src/screens/attachment_actions/hooks/useDeleteAttachment.tsx

@@ -1,9 +1,9 @@
 import { useMutation } from '@tanstack/react-query'
 import { useCallback } from 'react'
 import { Alert } from 'react-native'
-import { useApiClient } from '../../../hooks/use_api_client'
-import { useConversationMessages } from '../../../hooks/use_conversation_messages'
-import { Haptic } from '../../../utils/native_adapters'
+import { useApiClient } from '@/hooks/use_api_client'
+import { useConversationMessages } from '@/hooks/use_conversation_messages'
+import { Haptic } from '@/utils/native_adapters'
 
 type UseDeleteAttachmentProps = {
   conversation_id: number

package/src/screens/bug_report_screen.tsx

@@ -23,20 +23,20 @@ import {
   ImageAttachmentPreview,
   Icon,
   KeyboardView,
-} from '../components'
+} from '@/components'
 import {
   HeaderDismissButton,
   HeaderTextButton,
-} from '../components/display/platform_modal_header_buttons'
-import { VideoAttachmentPreview } from '../components/display/video_attachment_preview'
-import { DefaultLoading } from '../components/page/loading'
-import BlankState from '../components/primitive/blank_state_primitive'
-import { SafeAreaModal } from '../components/safe_area_modal'
-import { useTheme } from '../hooks'
-import { useAppName } from '../hooks/use_app_name'
-import { useReportBugAction } from '../hooks/use_report_bug_action'
-import { useUploadClient } from '../hooks/use_upload_client'
-import { ImagePicker, ImagePickerResult, platformFontWeightBold } from '../utils'
+} from '@/components/display/platform_modal_header_buttons'
+import { VideoAttachmentPreview } from '@/components/display/video_attachment_preview'
+import { DefaultLoading } from '@/components/page/loading'
+import BlankState from '@/components/primitive/blank_state_primitive'
+import { SafeAreaModal } from '@/components/safe_area_modal'
+import { useTheme } from '@/hooks'
+import { useAppName } from '@/hooks/use_app_name'
+import { useReportBugAction } from '@/hooks/use_report_bug_action'
+import { useUploadClient } from '@/hooks/use_upload_client'
+import { ImagePicker, ImagePickerResult, platformFontWeightBold } from '@/utils'
 
 const MAX_DESCRIPTION_LENGTH = 2000
 

package/src/screens/conversation/message_read_receipts_screen.tsx

@@ -3,11 +3,11 @@ import React, { memo, useCallback, useMemo, useState } from 'react'
 import { LayoutChangeEvent, Platform, StyleSheet, View } from 'react-native'
 import { FlatList } from 'react-native-gesture-handler'
 import { useSafeAreaInsets } from 'react-native-safe-area-context'
-import { Avatar, Text } from '../../components'
-import FormSheet, { getFormSheetScreenOptions } from '../../components/primitive/form_sheet'
-import { useTheme } from '../../hooks'
-import { useReadReceipts } from '../../hooks/use_read_receipts'
-import { ReadReceiptResource } from '../../types/resources/read_receipt'
+import { Avatar, Text } from '@/components'
+import FormSheet, { getFormSheetScreenOptions } from '@/components/primitive/form_sheet'
+import { useTheme } from '@/hooks'
+import { useReadReceipts } from '@/hooks/use_read_receipts'
+import { ReadReceiptResource } from '@/types/resources/read_receipt'
 
 const LIST_BOTTOM_PADDING = 24
 

package/src/screens/conversation_details_screen.tsx

@@ -34,21 +34,22 @@ import {
   Text,
   TextButton,
   type TextStyle,
-} from '../components'
-import { HeaderTextButton } from '../components/display/platform_modal_header_buttons'
-import { ButtonAppearanceUnion } from '../components/display/utils/button_colors'
-import { useSuspensePaginator, useTheme } from '../hooks'
+} from '@/components'
+import { HeaderTextButton } from '@/components/display/platform_modal_header_buttons'
+import { ButtonAppearanceUnion } from '@/components/display/utils/button_colors'
+import { useSuspensePaginator, useTheme } from '@/hooks'
 import {
   useConversation,
   useConversationDelete,
   useConversationDisableReplies,
   useConversationMute,
   useConversationUpdate,
-} from '../hooks/use_conversation'
-import { availableFeatures, useFeatures } from '../hooks/use_features'
-import { MemberResource, isDefined } from '../types'
-import { GroupResource } from '../types/resources/group_resource'
-import { tokens } from '../vendor/tapestry/tokens'
+} from '@/hooks/use_conversation'
+import { availableFeatures, useFeatures } from '@/hooks/use_features'
+import { MemberResource, isDefined } from '@/types'
+import { GroupResource } from '@/types/resources/group_resource'
+import { genderDisplayLabel } from '@/utils/gender_display_label'
+import { tokens } from '@/vendor/tapestry/tokens'
 // =========================================
 // ====== Factory Constants & Types ========
 // =========================================
@@ -64,7 +65,7 @@ enum SectionTypes {
 }
 
 type SectionListData = Array<
-  | DataItem<{ title: string }, SectionTypes.header>
+  | DataItem<{ title: string; badge?: ReactNode }, SectionTypes.header>
   | DataItem<MemberResource, SectionTypes.members>
   | DataItem<any, SectionTypes.loadingMembers>
   | DataItem<NavigableSettingRowProps, SectionTypes.navigableSetting>
@@ -101,6 +102,9 @@ export function ConversationDetailsScreen({ route }: ConversationDetailsScreenPr
   const { mutate: deleteConversation } = useConversationDelete(route.params)
   const { featureEnabled } = useFeatures()
   const granularNotificationsEnabled = featureEnabled(availableFeatures.granular_notifications_ui)
+  const showGenderFilter =
+    featureEnabled(availableFeatures.gender_specific_conversations) && !!conversation.genderOption
+  const genderLabel = conversation.genderOption ? genderDisplayLabel(conversation.genderOption) : ''
   const { muted, setMuted } = useConversationMute({ conversation_id })
 
   const trimmedTitle = title.trim()
@@ -301,9 +305,24 @@ export function ConversationDetailsScreen({ route }: ConversationDetailsScreenPr
     },
     {
       type: SectionTypes.header,
-      data: { title: 'People' },
+      data: {
+        title: 'People',
+        badge: showGenderFilter ? <Badge label={`${genderLabel}-only`} /> : undefined,
+      },
       sectionInnerStyle: styles.sectionInnerHeader,
     },
+    {
+      type: showGenderFilter ? SectionTypes.view : SectionTypes.hidden,
+      data: {
+        children: (
+          <Text variant="tertiary">
+            This conversation will be automatically updated if any {genderLabel.toLowerCase()} are
+            added or removed from this group.
+          </Text>
+        ),
+      },
+      sectionInnerStyle: styles.sectionInnerGenderNotice,
+    },
     {
       type: hasChildren && isLeader ? SectionTypes.view : SectionTypes.hidden,
       data: {
@@ -340,7 +359,14 @@ export function ConversationDetailsScreen({ route }: ConversationDetailsScreenPr
                   outerStyle={item?.sectionOuterStyle}
                   innerStyle={item?.sectionInnerStyle}
                 >
-                  <Heading variant="h3">{item.data.title}</Heading>
+                  {item.data.badge ? (
+                    <View style={styles.sectionHeaderRow}>
+                      <Heading variant="h3">{item.data.title}</Heading>
+                      {item.data.badge}
+                    </View>
+                  ) : (
+                    <Heading variant="h3">{item.data.title}</Heading>
+                  )}
                 </ListSection>
               )
             case SectionTypes.members:
@@ -617,6 +643,15 @@ const useStyles = ({ isStart, isEnd }: { isStart?: boolean; isEnd?: boolean } =
     sectionInnerHeader: {
       paddingBottom: headerBottomPadding,
     },
+    sectionInnerGenderNotice: {
+      paddingTop: 0,
+      paddingBottom: headerBottomPadding,
+    },
+    sectionHeaderRow: {
+      flexDirection: 'row' as const,
+      alignItems: 'center' as const,
+      gap: 8,
+    },
     sectionInnerHeaderWithBottomBorder: {
       paddingBottom: 16,
     },

package/src/screens/conversation_filter_recipients/components/checkbox_row.tsx

@@ -1,9 +1,13 @@
 import { type RouteProp, useRoute } from '@react-navigation/native'
 import { Pressable, View, StyleSheet, type ViewStyle } from 'react-native'
-import { Icon, Text } from '../../../components'
-import { useTheme } from '../../../hooks'
-import { tokens } from '../../../vendor/tapestry/tokens'
-import { ConversationFilterRecipientsScreenProps, SetTeamFilters, TeamProps } from '../types'
+import { Icon, Text } from '@/components'
+import { useTheme } from '@/hooks'
+import {
+  ConversationFilterRecipientsScreenProps,
+  SetTeamFilters,
+  TeamProps,
+} from '@/screens/conversation_filter_recipients/types'
+import { tokens } from '@/vendor/tapestry/tokens'
 
 interface TeamRowProps {
   data: TeamProps

package/src/screens/conversation_filter_recipients/components/header_row.tsx

@@ -1,14 +1,14 @@
 import { useRoute, type RouteProp } from '@react-navigation/native'
 import { View, StyleSheet, type ViewStyle } from 'react-native'
-import { Icon, Heading, TextButton } from '../../../components'
-import { useTheme } from '../../../hooks'
-import { pluralize } from '../../../utils'
-import { tokens } from '../../../vendor/tapestry/tokens'
+import { Icon, Heading, TextButton } from '@/components'
+import { useTheme } from '@/hooks'
 import type {
   ConversationFilterRecipientsScreenProps,
   ServiceTypeProps,
   SetTeamFilters,
-} from '../types'
+} from '@/screens/conversation_filter_recipients/types'
+import { pluralize } from '@/utils'
+import { tokens } from '@/vendor/tapestry/tokens'
 
 const BULK_SELECT_LIMIT = 10
 

package/src/screens/conversation_filter_recipients/conversation_filter_recipients_screen.tsx

@@ -4,17 +4,17 @@ import React, { useCallback, useMemo, useState } from 'react'
 import { LayoutChangeEvent, Platform, ScrollView, StyleSheet, View } from 'react-native'
 import { FlatList, TextInput } from 'react-native-gesture-handler'
 import { useSafeAreaInsets } from 'react-native-safe-area-context'
-import { Heading, ToggleButton } from '../../components'
-import { DefaultLoading } from '../../components/page/loading'
-import BlankState from '../../components/primitive/blank_state_primitive'
-import FormSheet, { getFormSheetScreenOptions } from '../../components/primitive/form_sheet'
-import { useFontScale, useTheme } from '../../hooks'
-import { tokens } from '../../vendor/tapestry/tokens'
 import { CheckboxRow } from './components/checkbox_row'
 import { HeaderRow } from './components/header_row'
 import { useFlattenedArrayOfServiceTypesWithTeams } from './hooks/use_flattened_array_of_service_types_with_teams'
 import { useServiceTypesWithTeams } from './hooks/use_service_types_with_teams'
 import { ConversationFilterRecipientsScreenProps, SectionTypes, TeamFilterTypes } from './types'
+import { Heading, ToggleButton } from '@/components'
+import { DefaultLoading } from '@/components/page/loading'
+import BlankState from '@/components/primitive/blank_state_primitive'
+import FormSheet, { getFormSheetScreenOptions } from '@/components/primitive/form_sheet'
+import { useFontScale, useTheme } from '@/hooks'
+import { tokens } from '@/vendor/tapestry/tokens'
 
 const SERVICE_TYPE_LABELLED_BY_PREFIX = 'header-'
 const SPACE_UNDER_ROW = 16

package/src/screens/conversation_filter_recipients/hooks/use_flattened_array_of_service_types_with_teams.tsx

@@ -1,6 +1,10 @@
 import { useMemo } from 'react'
 import { type ViewStyle } from 'react-native'
-import { SectionTypes, type SectionListData, type ServiceTypeWithTeams } from '../types'
+import {
+  SectionTypes,
+  type SectionListData,
+  type ServiceTypeWithTeams,
+} from '@/screens/conversation_filter_recipients/types'
 
 interface Props {
   data: ServiceTypeWithTeams[]

package/src/screens/conversation_filter_recipients/hooks/use_service_types_with_teams.ts

@@ -1,8 +1,11 @@
 import { uniqBy } from 'lodash'
 import { useMemo } from 'react'
-import { useApiGet } from '../../../hooks/use_api'
-import { ServicesChatResource, TeamResponseItem } from '../../../types'
-import { ServiceTypeWithTeams, TeamFilterTypes } from '../types'
+import { useApiGet } from '@/hooks/use_api'
+import {
+  ServiceTypeWithTeams,
+  TeamFilterTypes,
+} from '@/screens/conversation_filter_recipients/types'
+import { ServicesChatResource, TeamResponseItem } from '@/types'
 
 export function useServiceTypesWithTeams({
   filterType = TeamFilterTypes.TeamsIlead,

package/src/screens/conversation_filter_recipients/types.tsx

@@ -1,6 +1,6 @@
 import { StaticScreenProps } from '@react-navigation/native'
 import { type ViewStyle } from 'react-native'
-import { AppName } from '../../types/resources/app_name'
+import { AppName } from '@/types/resources/app_name'
 
 export interface ServiceTypeWithTeams {
   id: number

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

@@ -1,11 +1,6 @@
 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 { FilterContext, useFilterContext } from '../context/conversation_filter_context'
-import { FilterTypes } from '../filter_types'
-import { useGroupsToFilter, useTeamsToFilter } from '../hooks/filters'
 import {
   FilterProps,
   FilterRow,
@@ -16,6 +11,14 @@ import {
   ViewMore,
   ViewMoreRowProps,
 } from './rows'
+import { Heading } from '@/components'
+import { useAtFontScaleBreakpoint, useTheme } from '@/hooks'
+import {
+  FilterContext,
+  useFilterContext,
+} from '@/screens/conversation_filters/context/conversation_filter_context'
+import { FilterTypes } from '@/screens/conversation_filters/filter_types'
+import { useGroupsToFilter, useTeamsToFilter } from '@/screens/conversation_filters/hooks/filters'
 
 // =========================================
 // ====== Factory Constants & Types ========

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

@@ -2,20 +2,15 @@ import { PlatformPressable } from '@react-navigation/elements'
 import { NavigationProp, useNavigation } from '@react-navigation/native'
 import React, { PropsWithChildren, useContext } from 'react'
 import { StyleSheet, View, ViewStyle } from 'react-native'
-import { Heading, Icon, Image, Text, TextButton } from '../../../components'
-import {
-  useAtFontScaleBreakpoint,
-  useFontScale,
-  useScalableNumberOfLines,
-  useTheme,
-} from '../../../hooks'
-import { useServicesTeamsMap } from '../../../hooks/services/use_services_team'
-import { GroupResource } from '../../../types/resources/group_resource'
-import { MAX_FONT_SIZE_MULTIPLIER, platformFontWeightBold } from '../../../utils/styles'
-import { FilterContext } from '../context/conversation_filter_context'
-import { FilterTypes } from '../filter_types'
-import { FilteredGroup } from '../hooks/filters'
-import { ConversationFilterStackParamList } from '../screen_props'
+import { Heading, Icon, Image, Text, TextButton } from '@/components'
+import { useAtFontScaleBreakpoint, useFontScale, useScalableNumberOfLines, useTheme } from '@/hooks'
+import { useServicesTeamsMap } from '@/hooks/services/use_services_team'
+import { FilterContext } from '@/screens/conversation_filters/context/conversation_filter_context'
+import { FilterTypes } from '@/screens/conversation_filters/filter_types'
+import { FilteredGroup } from '@/screens/conversation_filters/hooks/filters'
+import { ConversationFilterStackParamList } from '@/screens/conversation_filters/screen_props'
+import { GroupResource } from '@/types/resources/group_resource'
+import { MAX_FONT_SIZE_MULTIPLIER, platformFontWeightBold } from '@/utils/styles'
 
 export type FilterProps = { group_source_app_name?: string; isActive: boolean; filter: FilterTypes }
 

package/src/screens/conversation_filters/context/conversation_filter_context.tsx

@@ -3,7 +3,10 @@ import React from 'react'
 import { createContext, PropsWithChildren, useState } from 'react'
 import { Platform } from 'react-native'
 import { useSafeAreaInsets } from 'react-native-safe-area-context'
-import { ConversationFiltersParams, ConversationFiltersScreenProps } from '../screen_props'
+import {
+  ConversationFiltersParams,
+  ConversationFiltersScreenProps,
+} from '@/screens/conversation_filters/screen_props'
 
 const DEFAULT_LIST_PADDING_BOTTOM = 64
 

package/src/screens/conversation_filters/group_filters.tsx

@@ -2,11 +2,11 @@ import { StaticScreenProps } from '@react-navigation/native'
 import React from 'react'
 import { RefreshControl, StyleSheet } from 'react-native'
 import { FlatList } from 'react-native-gesture-handler'
-import { Text } from '../../components/display'
 import { GroupRow } from './components/rows'
 import { useFilterContext } from './context/conversation_filter_context'
 import { useGroupsToFilter } from './hooks/filters'
 import { ConversationFiltersParams } from './screen_props'
+import { Text } from '@/components/display'
 
 export type GroupFiltersScreenProps = StaticScreenProps<ConversationFiltersParams>