@planningcenter/chat-react-native 4.7.1-qa-staging.3 → 4.7.1-qa-staging.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (62) hide show
  1. package/build/hooks/groups/use_group_chat_conversation_payload.d.ts +11 -1
  2. package/build/hooks/groups/use_group_chat_conversation_payload.d.ts.map +1 -1
  3. package/build/hooks/groups/use_group_chat_conversation_payload.js +92 -47
  4. package/build/hooks/groups/use_group_chat_conversation_payload.js.map +1 -1
  5. package/build/hooks/groups/use_group_members_for_new_conversation.d.ts +27 -25
  6. package/build/hooks/groups/use_group_members_for_new_conversation.d.ts.map +1 -1
  7. package/build/hooks/groups/use_group_members_for_new_conversation.js +125 -110
  8. package/build/hooks/groups/use_group_members_for_new_conversation.js.map +1 -1
  9. package/build/hooks/groups/use_groups_conversation_create.d.ts.map +1 -1
  10. package/build/hooks/groups/use_groups_conversation_create.js +39 -31
  11. package/build/hooks/groups/use_groups_conversation_create.js.map +1 -1
  12. package/build/hooks/groups/use_groups_proxy.d.ts +2 -0
  13. package/build/hooks/groups/use_groups_proxy.d.ts.map +1 -0
  14. package/build/hooks/groups/use_groups_proxy.js +18 -0
  15. package/build/hooks/groups/use_groups_proxy.js.map +1 -0
  16. package/build/hooks/use_features.d.ts +1 -0
  17. package/build/hooks/use_features.d.ts.map +1 -1
  18. package/build/hooks/use_features.js +2 -1
  19. package/build/hooks/use_features.js.map +1 -1
  20. package/build/hooks/use_groups_groups.d.ts.map +1 -1
  21. package/build/hooks/use_groups_groups.js +25 -9
  22. package/build/hooks/use_groups_groups.js.map +1 -1
  23. package/build/hooks/use_live_relative_time.js +6 -5
  24. package/build/hooks/use_live_relative_time.js.map +1 -1
  25. package/build/hooks/use_new_conversation_from_filter.d.ts.map +1 -1
  26. package/build/hooks/use_new_conversation_from_filter.js +11 -1
  27. package/build/hooks/use_new_conversation_from_filter.js.map +1 -1
  28. package/build/screens/conversation_new/components/groups_form.d.ts.map +1 -1
  29. package/build/screens/conversation_new/components/groups_form.js +96 -93
  30. package/build/screens/conversation_new/components/groups_form.js.map +1 -1
  31. package/build/types/resources/groups/groups_group_resource.d.ts +1 -1
  32. package/build/types/resources/groups/groups_group_resource.d.ts.map +1 -1
  33. package/build/types/resources/groups/groups_group_resource.js.map +1 -1
  34. package/build/types/resources/groups/groups_membership_resource.d.ts +11 -0
  35. package/build/types/resources/groups/groups_membership_resource.d.ts.map +1 -0
  36. package/build/types/resources/groups/groups_membership_resource.js +2 -0
  37. package/build/types/resources/groups/groups_membership_resource.js.map +1 -0
  38. package/build/types/resources/groups/index.d.ts +1 -0
  39. package/build/types/resources/groups/index.d.ts.map +1 -1
  40. package/build/types/resources/groups/index.js +1 -0
  41. package/build/types/resources/groups/index.js.map +1 -1
  42. package/build/utils/date.d.ts +1 -1
  43. package/build/utils/date.d.ts.map +1 -1
  44. package/build/utils/date.js +4 -4
  45. package/build/utils/date.js.map +1 -1
  46. package/package.json +3 -3
  47. package/src/__tests__/hooks/use_group_chat_conversation_payload.test.tsx +31 -0
  48. package/src/hooks/__tests__/use_live_relative_time.test.tsx +22 -0
  49. package/src/hooks/groups/use_group_chat_conversation_payload.ts +30 -12
  50. package/src/hooks/groups/use_group_members_for_new_conversation.ts +49 -18
  51. package/src/hooks/groups/use_groups_conversation_create.ts +10 -14
  52. package/src/hooks/groups/use_groups_proxy.ts +6 -0
  53. package/src/hooks/use_features.ts +1 -0
  54. package/src/hooks/use_groups_groups.ts +21 -16
  55. package/src/hooks/use_live_relative_time.ts +1 -1
  56. package/src/hooks/use_new_conversation_from_filter.ts +13 -5
  57. package/src/screens/conversation_new/components/groups_form.tsx +11 -9
  58. package/src/types/resources/groups/groups_group_resource.ts +1 -1
  59. package/src/types/resources/groups/groups_membership_resource.ts +10 -0
  60. package/src/types/resources/groups/index.ts +1 -0
  61. package/src/utils/__tests__/date.test.ts +10 -1
  62. package/src/utils/date.ts +4 -4
@@ -1,26 +1,31 @@
1
1
  import { GroupsGroupResource } from '../types'
2
2
  import { FIVE_MINUTES } from '../utils/time'
3
+ import { useGroupsProxy } from './groups/use_groups_proxy'
3
4
  import { useApiPaginator } from './use_api'
4
5
 
6
+ const GROUP_FIELDS = [
7
+ 'can_create_conversation',
8
+ 'can_create_conversation_reason_code',
9
+ 'name',
10
+ 'header_image',
11
+ 'memberships_count',
12
+ ]
13
+
5
14
  export const useGroupsGroups = () => {
15
+ const proxied = useGroupsProxy()
16
+
6
17
  return useApiPaginator<GroupsGroupResource>(
7
- {
8
- url: '/me/groups',
9
- data: {
10
- perPage: 100,
11
- fields: {
12
- Group: [
13
- 'can_create_conversation',
14
- 'can_create_conversation_reason_code',
15
- 'name',
16
- 'header_image',
17
- 'memberships_count',
18
- ],
18
+ proxied
19
+ ? {
20
+ url: '/me/groups_groups',
21
+ data: { perPage: 100, fields: { GroupsGroup: GROUP_FIELDS } },
22
+ app: 'chat',
23
+ }
24
+ : {
25
+ url: '/me/groups',
26
+ data: { perPage: 100, fields: { Group: GROUP_FIELDS }, order: 'name' },
27
+ app: 'groups',
19
28
  },
20
- order: 'name',
21
- },
22
- app: 'groups',
23
- },
24
29
  { staleTime: FIVE_MINUTES }
25
30
  )
26
31
  }
@@ -34,5 +34,5 @@ export function useLiveRelativeTime(date: DateProps) {
34
34
  setTimeNow(Date.now())
35
35
  }, [date])
36
36
 
37
- return relativeTime(date)
37
+ return relativeTime(date, timeNow)
38
38
  }
@@ -2,6 +2,7 @@ import { useMemo } from 'react'
2
2
  import { GroupResource, GraphId } from '../types/resources/group_resource'
3
3
  import { GroupsGroupResource } from '../types/resources/groups/groups_group_resource'
4
4
  import { destructureChatGroupGraphId } from '../utils'
5
+ import { useGroupsProxy } from './groups/use_groups_proxy'
5
6
  import { useApiGet } from './use_api'
6
7
  import { useNewConversationEntry } from './use_new_conversation_entry'
7
8
 
@@ -22,6 +23,7 @@ export function useNewConversationFromFilter(
22
23
  ): NewConversationFromFilter | undefined {
23
24
  const { sourceAppName, sourceType, sourceId } = destructureChatGroupGraphId(chatGroupGraphId)
24
25
  const entryMode = useNewConversationEntry()
26
+ const proxied = useGroupsProxy()
25
27
  const isGroupsGroup = sourceAppName === 'Groups' && sourceType === 'Group'
26
28
  const isServicesTeam = sourceAppName === 'Services' && sourceType === 'Team'
27
29
 
@@ -31,11 +33,17 @@ export function useNewConversationFromFilter(
31
33
  )
32
34
 
33
35
  const { data: groupsGroup } = useApiGet<GroupsGroupResource>(
34
- {
35
- url: `/me/groups/${sourceId}`,
36
- data: { fields: { Group: ['can_create_conversation'] } },
37
- app: 'groups',
38
- },
36
+ proxied
37
+ ? {
38
+ url: `/me/groups_groups/${sourceId}`,
39
+ data: { fields: { GroupsGroup: ['can_create_conversation'] } },
40
+ app: 'chat',
41
+ }
42
+ : {
43
+ url: `/me/groups/${sourceId}`,
44
+ data: { fields: { Group: ['can_create_conversation'] } },
45
+ app: 'groups',
46
+ },
39
47
  { enabled: isGroupsGroup && !!sourceId }
40
48
  )
41
49
 
@@ -12,6 +12,7 @@ import {
12
12
  useGroupMembersForNewConversation,
13
13
  } from '../../../hooks/groups/use_group_members_for_new_conversation'
14
14
  import { useGroupsConversationCreate } from '../../../hooks/groups/use_groups_conversation_create'
15
+ import { useGroupsProxy } from '../../../hooks/groups/use_groups_proxy'
15
16
  import {
16
17
  type AvatarUpdatePayload,
17
18
  patchConversationAvatar,
@@ -50,15 +51,16 @@ export const GroupsForm = ({ groupId, chat_group_graph_id, avatarSelection }: Gr
50
51
  genderValue,
51
52
  isFetching: genderFetching,
52
53
  } = useMyGender()
53
- const { data: group } = useSuspenseGet<GroupsGroupResource>({
54
- url: `/me/groups/${groupId}`,
55
- data: {
56
- fields: {
57
- Group: [],
58
- },
59
- },
60
- app: 'groups',
61
- })
54
+ const groupsProxied = useGroupsProxy()
55
+ const { data: group } = useSuspenseGet<GroupsGroupResource>(
56
+ groupsProxied
57
+ ? {
58
+ url: `/me/groups_groups/${groupId}`,
59
+ data: { fields: { GroupsGroup: ['name', 'memberships_count'] } },
60
+ app: 'chat',
61
+ }
62
+ : { url: `/me/groups/${groupId}`, data: { fields: { Group: [] } }, app: 'groups' }
63
+ )
62
64
 
63
65
  const activeGenderId = genderFilterEnabled ? genderId : null
64
66
  const activeGenderValue = genderFilterEnabled ? genderValue : null
@@ -2,7 +2,7 @@ import { ResourceObject } from '../../api_primitives'
2
2
 
3
3
  export interface GroupsGroupResource extends ResourceObject {
4
4
  id: number
5
- type: 'Group'
5
+ type: 'Group' | 'GroupsGroup'
6
6
  headerImage: {
7
7
  thumbnail: string
8
8
  medium: string
@@ -0,0 +1,10 @@
1
+ export interface GroupsMembershipResource {
2
+ type: 'GroupsMembership'
3
+ id: number
4
+ role?: string
5
+ firstName: string
6
+ lastName: string
7
+ avatarUrl: string
8
+ child: boolean
9
+ gender: string | null
10
+ }
@@ -1 +1,2 @@
1
1
  export * from './groups_group_resource'
2
+ export * from './groups_membership_resource'
@@ -1,4 +1,4 @@
1
- import { formatEventDateTime } from '../date'
1
+ import { formatEventDateTime, relativeTime } from '../date'
2
2
 
3
3
  describe('formatEventDateTime', () => {
4
4
  beforeEach(() => {
@@ -21,3 +21,12 @@ describe('formatEventDateTime', () => {
21
21
  expect(formatEventDateTime(new Date(2026, 1, 3, 14, 0))).toBe('Feb 3 at 2pm')
22
22
  })
23
23
  })
24
+
25
+ describe('relativeTime', () => {
26
+ it('measures from the given time', () => {
27
+ const date = '2026-11-10T11:49:00Z'
28
+
29
+ expect(relativeTime(date, '2026-11-10T12:00:00Z')).toBe('11 minutes ago')
30
+ expect(relativeTime(date, '2026-11-10T12:01:00Z')).toBe('12 minutes ago')
31
+ })
32
+ })
package/src/utils/date.ts CHANGED
@@ -50,13 +50,13 @@ export function relativeDateTime(dateTimeString: string): string {
50
50
  }
51
51
  }
52
52
 
53
- export function relativeTime(date: DateProps): string {
54
- const now = dayjs()
53
+ export function relativeTime(date: DateProps, now: DateProps = Date.now()): string {
54
+ const current = dayjs(now)
55
55
  const then = dayjs(date)
56
- const duration = dayjs.duration(now.diff(then))
56
+ const duration = dayjs.duration(current.diff(then))
57
57
 
58
58
  if (duration.asDays() < 1) {
59
- return then.fromNow()
59
+ return then.from(current)
60
60
  } else {
61
61
  return dayjs(date).format('h:mma')
62
62
  }