@planningcenter/chat-react-native 4.6.3 → 4.6.4-qa-staging.1

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 (40) hide show
  1. package/build/contexts/api_provider.d.ts +1 -0
  2. package/build/contexts/api_provider.d.ts.map +1 -1
  3. package/build/contexts/api_provider.js +11 -5
  4. package/build/contexts/api_provider.js.map +1 -1
  5. package/build/hooks/index.d.ts +1 -0
  6. package/build/hooks/index.d.ts.map +1 -1
  7. package/build/hooks/index.js +1 -0
  8. package/build/hooks/index.js.map +1 -1
  9. package/build/hooks/use_current_person.d.ts.map +1 -1
  10. package/build/hooks/use_current_person.js +1 -1
  11. package/build/hooks/use_current_person.js.map +1 -1
  12. package/build/hooks/use_person_settings.d.ts +1 -0
  13. package/build/hooks/use_person_settings.d.ts.map +1 -1
  14. package/build/hooks/use_person_settings.js +10 -7
  15. package/build/hooks/use_person_settings.js.map +1 -1
  16. package/build/hooks/use_system_message_people.d.ts +14 -0
  17. package/build/hooks/use_system_message_people.d.ts.map +1 -0
  18. package/build/hooks/use_system_message_people.js +101 -0
  19. package/build/hooks/use_system_message_people.js.map +1 -0
  20. package/build/screens/settings_screen.js +6 -6
  21. package/build/screens/settings_screen.js.map +1 -1
  22. package/build/screens/system_message_people_screen.d.ts.map +1 -1
  23. package/build/screens/system_message_people_screen.js +33 -96
  24. package/build/screens/system_message_people_screen.js.map +1 -1
  25. package/build/types/resources/person.d.ts +1 -0
  26. package/build/types/resources/person.d.ts.map +1 -1
  27. package/build/types/resources/person.js.map +1 -1
  28. package/package.json +3 -3
  29. package/src/__tests__/hooks/use_person_settings.test.tsx +53 -0
  30. package/src/__tests__/screens/settings_screen.test.tsx +58 -0
  31. package/src/contexts/__tests__/configured_retry.test.ts +39 -0
  32. package/src/contexts/api_provider.tsx +12 -5
  33. package/src/hooks/__tests__/use_system_message_people.test.tsx +79 -0
  34. package/src/hooks/index.ts +1 -0
  35. package/src/hooks/use_current_person.ts +1 -0
  36. package/src/hooks/use_person_settings.ts +3 -1
  37. package/src/hooks/use_system_message_people.ts +55 -0
  38. package/src/screens/settings_screen.tsx +4 -4
  39. package/src/screens/system_message_people_screen.tsx +6 -20
  40. package/src/types/resources/person.ts +1 -0
@@ -5,7 +5,7 @@ import { FlatList } from 'react-native-gesture-handler';
5
5
  import { useSafeAreaInsets } from 'react-native-safe-area-context';
6
6
  import { Avatar, Text } from '../components';
7
7
  import FormSheet, { getFormSheetScreenOptions } from '../components/primitive/form_sheet';
8
- import { useSuspenseGet } from '../hooks';
8
+ import { useSystemMessagePeople } from '../hooks/use_system_message_people';
9
9
  import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
10
10
  export const SystemMessagePeopleScreenOptions = getFormSheetScreenOptions({
11
11
  sheetAllowedDetents: Platform.select({
@@ -15,7 +15,7 @@ export const SystemMessagePeopleScreenOptions = getFormSheetScreenOptions({
15
15
  headerTitle: 'People'
16
16
  });
17
17
  export function SystemMessagePeopleScreen(t0) {
18
- const $ = _c(22);
18
+ const $ = _c(9);
19
19
  const {
20
20
  route
21
21
  } = t0;
@@ -24,110 +24,50 @@ export function SystemMessagePeopleScreen(t0) {
24
24
  person_ids
25
25
  } = route.params;
26
26
  const styles = useStyles();
27
- const t1 = `/me/conversations/${conversation_id}/members`;
28
- let t2;
29
- if ($[0] === Symbol.for("react.memo_cache_sentinel")) {
30
- t2 = {
31
- Member: ["id", "name", "avatar"]
32
- };
33
- $[0] = t2;
34
- } else {
35
- t2 = $[0];
36
- }
37
- let t3;
38
- if ($[1] !== person_ids) {
39
- t3 = {
40
- id: person_ids
27
+ let t1;
28
+ if ($[0] !== conversation_id || $[1] !== person_ids) {
29
+ t1 = {
30
+ conversationId: conversation_id,
31
+ personIds: person_ids
41
32
  };
33
+ $[0] = conversation_id;
42
34
  $[1] = person_ids;
43
- $[2] = t3;
35
+ $[2] = t1;
44
36
  } else {
45
- t3 = $[2];
46
- }
47
- let t4;
48
- if ($[3] !== person_ids.length || $[4] !== t3) {
49
- t4 = {
50
- fields: t2,
51
- where: t3,
52
- limit: person_ids.length
53
- };
54
- $[3] = person_ids.length;
55
- $[4] = t3;
56
- $[5] = t4;
57
- } else {
58
- t4 = $[5];
59
- }
60
- let t5;
61
- if ($[6] !== t1 || $[7] !== t4) {
62
- t5 = {
63
- url: t1,
64
- data: t4
65
- };
66
- $[6] = t1;
67
- $[7] = t4;
68
- $[8] = t5;
69
- } else {
70
- t5 = $[8];
37
+ t1 = $[2];
71
38
  }
72
39
  const {
73
- data: members
74
- } = useSuspenseGet(t5);
75
- let t6;
76
- if ($[9] !== person_ids) {
77
- t6 = Object.fromEntries(person_ids.map(_temp));
78
- $[9] = person_ids;
79
- $[10] = t6;
80
- } else {
81
- t6 = $[10];
82
- }
83
- const orderById = t6;
84
- let t7;
85
- if ($[11] !== members || $[12] !== orderById) {
86
- let t8;
87
- if ($[14] !== orderById) {
88
- t8 = (a, b) => (orderById[a.id] ?? 0) - (orderById[b.id] ?? 0);
89
- $[14] = orderById;
90
- $[15] = t8;
91
- } else {
92
- t8 = $[15];
93
- }
94
- t7 = [...members].sort(t8);
95
- $[11] = members;
96
- $[12] = orderById;
97
- $[13] = t7;
98
- } else {
99
- t7 = $[13];
100
- }
101
- const sortedMembers = t7;
102
- let t8;
103
- if ($[16] !== sortedMembers || $[17] !== styles.contentContainer) {
104
- t8 = /*#__PURE__*/_jsx(FlatList, {
105
- data: sortedMembers,
40
+ data: people
41
+ } = useSystemMessagePeople(t1);
42
+ let t2;
43
+ if ($[3] !== people || $[4] !== styles.contentContainer) {
44
+ t2 = /*#__PURE__*/_jsx(FlatList, {
45
+ data: people,
106
46
  contentContainerStyle: styles.contentContainer,
107
- keyExtractor: _temp2,
108
- renderItem: _temp3
47
+ keyExtractor: _temp,
48
+ renderItem: _temp2
109
49
  });
110
- $[16] = sortedMembers;
111
- $[17] = styles.contentContainer;
112
- $[18] = t8;
50
+ $[3] = people;
51
+ $[4] = styles.contentContainer;
52
+ $[5] = t2;
113
53
  } else {
114
- t8 = $[18];
54
+ t2 = $[5];
115
55
  }
116
- let t9;
117
- if ($[19] !== styles.formSheetContent || $[20] !== t8) {
118
- t9 = /*#__PURE__*/_jsx(FormSheet.Root, {
56
+ let t3;
57
+ if ($[6] !== styles.formSheetContent || $[7] !== t2) {
58
+ t3 = /*#__PURE__*/_jsx(FormSheet.Root, {
119
59
  contentStyle: styles.formSheetContent,
120
- children: t8
60
+ children: t2
121
61
  });
122
- $[19] = styles.formSheetContent;
123
- $[20] = t8;
124
- $[21] = t9;
62
+ $[6] = styles.formSheetContent;
63
+ $[7] = t2;
64
+ $[8] = t3;
125
65
  } else {
126
- t9 = $[21];
66
+ t3 = $[8];
127
67
  }
128
- return t9;
68
+ return t3;
129
69
  }
130
- function _temp3(t0) {
70
+ function _temp2(t0) {
131
71
  const {
132
72
  item: item_0
133
73
  } = t0;
@@ -135,12 +75,9 @@ function _temp3(t0) {
135
75
  person: item_0
136
76
  });
137
77
  }
138
- function _temp2(item) {
78
+ function _temp(item) {
139
79
  return item.id.toString();
140
80
  }
141
- function _temp(id, i) {
142
- return [id, i];
143
- }
144
81
  const Person = memo(t0 => {
145
82
  const $ = _c(9);
146
83
  const {
@@ -1 +1 @@
1
- {"version":3,"file":"system_message_people_screen.js","names":["React","memo","Platform","StyleSheet","View","FlatList","useSafeAreaInsets","Avatar","Text","FormSheet","getFormSheetScreenOptions","useSuspenseGet","jsx","_jsx","jsxs","_jsxs","SystemMessagePeopleScreenOptions","sheetAllowedDetents","select","android","default","headerTitle","SystemMessagePeopleScreen","t0","$","_c","route","conversation_id","person_ids","params","styles","useStyles","t1","t2","Symbol","for","Member","t3","id","t4","length","fields","where","limit","t5","url","data","members","t6","Object","fromEntries","map","_temp","orderById","t7","t8","a","b","sort","sortedMembers","contentContainer","contentContainerStyle","keyExtractor","_temp2","renderItem","_temp3","t9","formSheetContent","Root","contentStyle","children","item","item_0","Person","toString","i","person","avatar","sourceUri","size","name","personName","variant","numberOfLines","style","personRow","bottom","create","paddingTop","paddingBottom","flexDirection","alignItems","gap","paddingVertical","paddingHorizontal","flex"],"sources":["../../src/screens/system_message_people_screen.tsx"],"sourcesContent":["import { StaticScreenProps } from '@react-navigation/native'\nimport React, { memo } from 'react'\nimport { Platform, StyleSheet, View } from 'react-native'\nimport { FlatList } from 'react-native-gesture-handler'\nimport { useSafeAreaInsets } from 'react-native-safe-area-context'\nimport { Avatar, Text } from '../components'\nimport FormSheet, { getFormSheetScreenOptions } from '../components/primitive/form_sheet'\nimport { useSuspenseGet } from '../hooks'\nimport { MemberResource } from '../types'\n\nexport const SystemMessagePeopleScreenOptions = getFormSheetScreenOptions({\n sheetAllowedDetents: Platform.select({\n android: [0.5, 0.94],\n default: [0.5, 1],\n }),\n headerTitle: 'People',\n})\n\nexport type SystemMessagePeopleScreenProps = StaticScreenProps<{\n conversation_id: number\n person_ids: number[]\n}>\n\nexport function SystemMessagePeopleScreen({ route }: SystemMessagePeopleScreenProps) {\n const { conversation_id, person_ids } = route.params\n const styles = useStyles()\n\n const { data: members } = useSuspenseGet<MemberResource[]>({\n url: `/me/conversations/${conversation_id}/members`,\n data: {\n fields: {\n Member: ['id', 'name', 'avatar'],\n },\n where: {\n id: person_ids,\n },\n limit: person_ids.length,\n },\n })\n\n const orderById = Object.fromEntries(person_ids.map((id, i) => [id, i]))\n const sortedMembers = [...members].sort((a, b) => (orderById[a.id] ?? 0) - (orderById[b.id] ?? 0))\n\n return (\n <FormSheet.Root contentStyle={styles.formSheetContent}>\n <FlatList\n data={sortedMembers}\n contentContainerStyle={styles.contentContainer}\n keyExtractor={item => item.id.toString()}\n renderItem={({ item }) => <Person person={item} />}\n />\n </FormSheet.Root>\n )\n}\n\ntype PersonProps = Pick<MemberResource, 'id' | 'name' | 'avatar'>\n\nconst Person = memo(({ person }: { person: PersonProps }) => {\n const styles = useStyles()\n\n return (\n <View style={styles.personRow}>\n <Avatar sourceUri={person.avatar} size=\"sm\" />\n <Text variant=\"tertiary\" numberOfLines={2} style={styles.personName}>\n {person.name}\n </Text>\n </View>\n )\n})\n\nconst useStyles = () => {\n const { bottom } = useSafeAreaInsets()\n\n return StyleSheet.create({\n formSheetContent: {\n paddingTop: 16,\n },\n contentContainer: {\n paddingTop: 8,\n paddingBottom: bottom + 24,\n },\n personRow: {\n flexDirection: 'row',\n alignItems: 'center',\n gap: 8,\n paddingVertical: 8,\n paddingHorizontal: 16,\n flex: 1,\n },\n personName: {\n flex: 1,\n },\n })\n}\n"],"mappings":";AACA,OAAOA,KAAK,IAAIC,IAAI,QAAQ,OAAO;AACnC,SAASC,QAAQ,EAAEC,UAAU,EAAEC,IAAI,QAAQ,cAAc;AACzD,SAASC,QAAQ,QAAQ,8BAA8B;AACvD,SAASC,iBAAiB,QAAQ,gCAAgC;AAClE,SAASC,MAAM,EAAEC,IAAI,QAAQ,eAAe;AAC5C,OAAOC,SAAS,IAAIC,yBAAyB,QAAQ,oCAAoC;AACzF,SAASC,cAAc,QAAQ,UAAU;AAAA,SAAAC,GAAA,IAAAC,IAAA,EAAAC,IAAA,IAAAC,KAAA;AAGzC,OAAO,MAAMC,gCAAgC,GAAGN,yBAAyB,CAAC;EACxEO,mBAAmB,EAAEf,QAAQ,CAACgB,MAAM,CAAC;IACnCC,OAAO,EAAE,CAAC,GAAG,EAAE,IAAI,CAAC;IACpBC,OAAO,EAAE,CAAC,GAAG,EAAE,CAAC;EAClB,CAAC,CAAC;EACFC,WAAW,EAAE;AACf,CAAC,CAAC;AAOF,OAAO,SAAAC,0BAAAC,EAAA;EAAA,MAAAC,CAAA,GAAAC,EAAA;EAAmC;IAAAC;EAAA,IAAAH,EAAyC;EACjF;IAAAI,eAAA;IAAAC;EAAA,IAAwCF,KAAK,CAAAG,MAAO;EACpD,MAAAC,MAAA,GAAeC,SAAS,CAAC,CAAC;EAGnB,MAAAC,EAAA,wBAAqBL,eAAe,UAAU;EAAA,IAAAM,EAAA;EAAA,IAAAT,CAAA,QAAAU,MAAA,CAAAC,GAAA;IAEzCF,EAAA;MAAAG,MAAA,EACE,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ;IACjC,CAAC;IAAAZ,CAAA,MAAAS,EAAA;EAAA;IAAAA,EAAA,GAAAT,CAAA;EAAA;EAAA,IAAAa,EAAA;EAAA,IAAAb,CAAA,QAAAI,UAAA;IACMS,EAAA;MAAAC,EAAA,EACDV;IACN,CAAC;IAAAJ,CAAA,MAAAI,UAAA;IAAAJ,CAAA,MAAAa,EAAA;EAAA;IAAAA,EAAA,GAAAb,CAAA;EAAA;EAAA,IAAAe,EAAA;EAAA,IAAAf,CAAA,QAAAI,UAAA,CAAAY,MAAA,IAAAhB,CAAA,QAAAa,EAAA;IANGE,EAAA;MAAAE,MAAA,EACIR,EAEP;MAAAS,KAAA,EACML,EAEN;MAAAM,KAAA,EACMf,UAAU,CAAAY;IACnB,CAAC;IAAAhB,CAAA,MAAAI,UAAA,CAAAY,MAAA;IAAAhB,CAAA,MAAAa,EAAA;IAAAb,CAAA,MAAAe,EAAA;EAAA;IAAAA,EAAA,GAAAf,CAAA;EAAA;EAAA,IAAAoB,EAAA;EAAA,IAAApB,CAAA,QAAAQ,EAAA,IAAAR,CAAA,QAAAe,EAAA;IAVwDK,EAAA;MAAAC,GAAA,EACpDb,EAA8C;MAAAc,IAAA,EAC7CP;IASR,CAAC;IAAAf,CAAA,MAAAQ,EAAA;IAAAR,CAAA,MAAAe,EAAA;IAAAf,CAAA,MAAAoB,EAAA;EAAA;IAAAA,EAAA,GAAApB,CAAA;EAAA;EAXD;IAAAsB,IAAA,EAAAC;EAAA,IAA0BpC,cAAc,CAAmBiC,EAW1D,CAAC;EAAA,IAAAI,EAAA;EAAA,IAAAxB,CAAA,QAAAI,UAAA;IAEgBoB,EAAA,GAAAC,MAAM,CAAAC,WAAY,CAACtB,UAAU,CAAAuB,GAAI,CAACC,KAAkB,CAAC,CAAC;IAAA5B,CAAA,MAAAI,UAAA;IAAAJ,CAAA,OAAAwB,EAAA;EAAA;IAAAA,EAAA,GAAAxB,CAAA;EAAA;EAAxE,MAAA6B,SAAA,GAAkBL,EAAsD;EAAA,IAAAM,EAAA;EAAA,IAAA9B,CAAA,SAAAuB,OAAA,IAAAvB,CAAA,SAAA6B,SAAA;IAAA,IAAAE,EAAA;IAAA,IAAA/B,CAAA,SAAA6B,SAAA;MAChCE,EAAA,GAAAA,CAAAC,CAAA,EAAAC,CAAA,KAAU,CAACJ,SAAS,CAACG,CAAC,CAAAlB,EAAG,CAAM,IAApB,CAAoB,KAAKe,SAAS,CAACI,CAAC,CAAAnB,EAAG,CAAM,IAApB,CAAoB,CAAC;MAAAd,CAAA,OAAA6B,SAAA;MAAA7B,CAAA,OAAA+B,EAAA;IAAA;MAAAA,EAAA,GAAA/B,CAAA;IAAA;IAA3E8B,EAAA,OAAIP,OAAO,CAAC,CAAAW,IAAK,CAACH,EAAyD,CAAC;IAAA/B,CAAA,OAAAuB,OAAA;IAAAvB,CAAA,OAAA6B,SAAA;IAAA7B,CAAA,OAAA8B,EAAA;EAAA;IAAAA,EAAA,GAAA9B,CAAA;EAAA;EAAlG,MAAAmC,aAAA,GAAsBL,EAA4E;EAAA,IAAAC,EAAA;EAAA,IAAA/B,CAAA,SAAAmC,aAAA,IAAAnC,CAAA,SAAAM,MAAA,CAAA8B,gBAAA;IAI9FL,EAAA,gBAAA1C,IAAA,CAACR,QAAQ;MACDsD,IAAa,EAAbA,aAAa;MACIE,qBAAuB,EAAvB/B,MAAM,CAAA8B,gBAAiB;MAChCE,YAA0B,EAA1BC,MAA0B;MAC5BC,UAAsC,EAAtCC;IAAsC,CACnD,CAAC;IAAAzC,CAAA,OAAAmC,aAAA;IAAAnC,CAAA,OAAAM,MAAA,CAAA8B,gBAAA;IAAApC,CAAA,OAAA+B,EAAA;EAAA;IAAAA,EAAA,GAAA/B,CAAA;EAAA;EAAA,IAAA0C,EAAA;EAAA,IAAA1C,CAAA,SAAAM,MAAA,CAAAqC,gBAAA,IAAA3C,CAAA,SAAA+B,EAAA;IANJW,EAAA,gBAAArD,IAAA,CAAAJ,SAAA,CAAA2D,IAAA;MAA8BC,YAAuB,EAAvBvC,MAAM,CAAAqC,gBAAiB;MAAAG,QAAA,EACnDf;IAKE,CACY,CAAC;IAAA/B,CAAA,OAAAM,MAAA,CAAAqC,gBAAA;IAAA3C,CAAA,OAAA+B,EAAA;IAAA/B,CAAA,OAAA0C,EAAA;EAAA;IAAAA,EAAA,GAAA1C,CAAA;EAAA;EAAA,OAPjB0C,EAOiB;AAAA;AA5Bd,SAAAD,OAAA1C,EAAA;EA0Bc;IAAAgD,IAAA,EAAAC;EAAA,IAAAjD,EAAQ;EAAA,oBAAKV,IAAA,CAAC4D,MAAM;IAASF,MAAI,EAAJA;EAAI,CAAG,CAAC;AAAA;AA1BnD,SAAAR,OAAAQ,IAAA;EAAA,OAyBuBA,IAAI,CAAAjC,EAAG,CAAAoC,QAAS,CAAC,CAAC;AAAA;AAzBzC,SAAAtB,MAAAd,EAAA,EAAAqC,CAAA;EAAA,OAiB0D,CAACrC,EAAE,EAAEqC,CAAC,CAAC;AAAA;AAiBxE,MAAMF,MAAM,GAAGxE,IAAI,CAACsB,EAAA;EAAA,MAAAC,CAAA,GAAAC,EAAA;EAAC;IAAAmD;EAAA,IAAArD,EAAmC;EACtD,MAAAO,MAAA,GAAeC,SAAS,CAAC,CAAC;EAAA,IAAAC,EAAA;EAAA,IAAAR,CAAA,QAAAoD,MAAA,CAAAC,MAAA;IAItB7C,EAAA,gBAAAnB,IAAA,CAACN,MAAM;MAAYuE,SAAa,EAAbF,MAAM,CAAAC,MAAO;MAAOE,IAAI,EAAJ;IAAI,CAAE,CAAC;IAAAvD,CAAA,MAAAoD,MAAA,CAAAC,MAAA;IAAArD,CAAA,MAAAQ,EAAA;EAAA;IAAAA,EAAA,GAAAR,CAAA;EAAA;EAAA,IAAAS,EAAA;EAAA,IAAAT,CAAA,QAAAoD,MAAA,CAAAI,IAAA,IAAAxD,CAAA,QAAAM,MAAA,CAAAmD,UAAA;IAC9ChD,EAAA,gBAAApB,IAAA,CAACL,IAAI;MAAS0E,OAAU,EAAV,UAAU;MAAgBC,aAAC,EAAD,CAAC;MAASC,KAAiB,EAAjBtD,MAAM,CAAAmD,UAAW;MAAAX,QAAA,EAChEM,MAAM,CAAAI;IAAK,CACR,CAAC;IAAAxD,CAAA,MAAAoD,MAAA,CAAAI,IAAA;IAAAxD,CAAA,MAAAM,MAAA,CAAAmD,UAAA;IAAAzD,CAAA,MAAAS,EAAA;EAAA;IAAAA,EAAA,GAAAT,CAAA;EAAA;EAAA,IAAAa,EAAA;EAAA,IAAAb,CAAA,QAAAM,MAAA,CAAAuD,SAAA,IAAA7D,CAAA,QAAAQ,EAAA,IAAAR,CAAA,QAAAS,EAAA;IAJTI,EAAA,gBAAAtB,KAAA,CAACX,IAAI;MAAQgF,KAAgB,EAAhBtD,MAAM,CAAAuD,SAAU;MAAAf,QAAA,GAC3BtC,EAA8C,EAC9CC,EAEO;IAAA,CACH,CAAC;IAAAT,CAAA,MAAAM,MAAA,CAAAuD,SAAA;IAAA7D,CAAA,MAAAQ,EAAA;IAAAR,CAAA,MAAAS,EAAA;IAAAT,CAAA,MAAAa,EAAA;EAAA;IAAAA,EAAA,GAAAb,CAAA;EAAA;EAAA,OALPa,EAKO;AAAA,CAEV,CAAC;AAEF,MAAMN,SAAS,GAAGA,CAAA;EAAA,MAAAP,CAAA,GAAAC,EAAA;EAChB;IAAA6D;EAAA,IAAmBhF,iBAAiB,CAAC,CAAC;EAAA,IAAAiB,EAAA;EAAA,IAAAC,CAAA,QAAA8D,MAAA;IAE/B/D,EAAA,GAAApB,UAAU,CAAAoF,MAAO,CAAC;MAAApB,gBAAA,EACL;QAAAqB,UAAA,EACJ;MACd,CAAC;MAAA5B,gBAAA,EACiB;QAAA4B,UAAA,EACJ,CAAC;QAAAC,aAAA,EACEH,MAAM,GAAG;MAC1B,CAAC;MAAAD,SAAA,EACU;QAAAK,aAAA,EACM,KAAK;QAAAC,UAAA,EACR,QAAQ;QAAAC,GAAA,EACf,CAAC;QAAAC,eAAA,EACW,CAAC;QAAAC,iBAAA,EACC,EAAE;QAAAC,IAAA,EACf;MACR,CAAC;MAAAd,UAAA,EACW;QAAAc,IAAA,EACJ;MACR;IACF,CAAC,CAAC;IAAAvE,CAAA,MAAA8D,MAAA;IAAA9D,CAAA,MAAAD,EAAA;EAAA;IAAAA,EAAA,GAAAC,CAAA;EAAA;EAAA,OAnBKD,EAmBL;AAAA,CACH","ignoreList":[]}
1
+ {"version":3,"file":"system_message_people_screen.js","names":["React","memo","Platform","StyleSheet","View","FlatList","useSafeAreaInsets","Avatar","Text","FormSheet","getFormSheetScreenOptions","useSystemMessagePeople","jsx","_jsx","jsxs","_jsxs","SystemMessagePeopleScreenOptions","sheetAllowedDetents","select","android","default","headerTitle","SystemMessagePeopleScreen","t0","$","_c","route","conversation_id","person_ids","params","styles","useStyles","t1","conversationId","personIds","data","people","t2","contentContainer","contentContainerStyle","keyExtractor","_temp","renderItem","_temp2","t3","formSheetContent","Root","contentStyle","children","item","item_0","Person","id","toString","person","avatar","sourceUri","size","name","personName","variant","numberOfLines","style","personRow","bottom","create","paddingTop","paddingBottom","flexDirection","alignItems","gap","paddingVertical","paddingHorizontal","flex"],"sources":["../../src/screens/system_message_people_screen.tsx"],"sourcesContent":["import { StaticScreenProps } from '@react-navigation/native'\nimport React, { memo } from 'react'\nimport { Platform, StyleSheet, View } from 'react-native'\nimport { FlatList } from 'react-native-gesture-handler'\nimport { useSafeAreaInsets } from 'react-native-safe-area-context'\nimport { Avatar, Text } from '../components'\nimport FormSheet, { getFormSheetScreenOptions } from '../components/primitive/form_sheet'\nimport { SystemMessagePerson, useSystemMessagePeople } from '../hooks/use_system_message_people'\n\nexport const SystemMessagePeopleScreenOptions = getFormSheetScreenOptions({\n sheetAllowedDetents: Platform.select({\n android: [0.5, 0.94],\n default: [0.5, 1],\n }),\n headerTitle: 'People',\n})\n\nexport type SystemMessagePeopleScreenProps = StaticScreenProps<{\n conversation_id: number\n person_ids: number[]\n}>\n\nexport function SystemMessagePeopleScreen({ route }: SystemMessagePeopleScreenProps) {\n const { conversation_id, person_ids } = route.params\n const styles = useStyles()\n\n const { data: people } = useSystemMessagePeople({\n conversationId: conversation_id,\n personIds: person_ids,\n })\n\n return (\n <FormSheet.Root contentStyle={styles.formSheetContent}>\n <FlatList\n data={people}\n contentContainerStyle={styles.contentContainer}\n keyExtractor={item => item.id.toString()}\n renderItem={({ item }) => <Person person={item} />}\n />\n </FormSheet.Root>\n )\n}\n\nconst Person = memo(({ person }: { person: SystemMessagePerson }) => {\n const styles = useStyles()\n\n return (\n <View style={styles.personRow}>\n <Avatar sourceUri={person.avatar} size=\"sm\" />\n <Text variant=\"tertiary\" numberOfLines={2} style={styles.personName}>\n {person.name}\n </Text>\n </View>\n )\n})\n\nconst useStyles = () => {\n const { bottom } = useSafeAreaInsets()\n\n return StyleSheet.create({\n formSheetContent: {\n paddingTop: 16,\n },\n contentContainer: {\n paddingTop: 8,\n paddingBottom: bottom + 24,\n },\n personRow: {\n flexDirection: 'row',\n alignItems: 'center',\n gap: 8,\n paddingVertical: 8,\n paddingHorizontal: 16,\n flex: 1,\n },\n personName: {\n flex: 1,\n },\n })\n}\n"],"mappings":";AACA,OAAOA,KAAK,IAAIC,IAAI,QAAQ,OAAO;AACnC,SAASC,QAAQ,EAAEC,UAAU,EAAEC,IAAI,QAAQ,cAAc;AACzD,SAASC,QAAQ,QAAQ,8BAA8B;AACvD,SAASC,iBAAiB,QAAQ,gCAAgC;AAClE,SAASC,MAAM,EAAEC,IAAI,QAAQ,eAAe;AAC5C,OAAOC,SAAS,IAAIC,yBAAyB,QAAQ,oCAAoC;AACzF,SAA8BC,sBAAsB,QAAQ,oCAAoC;AAAA,SAAAC,GAAA,IAAAC,IAAA,EAAAC,IAAA,IAAAC,KAAA;AAEhG,OAAO,MAAMC,gCAAgC,GAAGN,yBAAyB,CAAC;EACxEO,mBAAmB,EAAEf,QAAQ,CAACgB,MAAM,CAAC;IACnCC,OAAO,EAAE,CAAC,GAAG,EAAE,IAAI,CAAC;IACpBC,OAAO,EAAE,CAAC,GAAG,EAAE,CAAC;EAClB,CAAC,CAAC;EACFC,WAAW,EAAE;AACf,CAAC,CAAC;AAOF,OAAO,SAAAC,0BAAAC,EAAA;EAAA,MAAAC,CAAA,GAAAC,EAAA;EAAmC;IAAAC;EAAA,IAAAH,EAAyC;EACjF;IAAAI,eAAA;IAAAC;EAAA,IAAwCF,KAAK,CAAAG,MAAO;EACpD,MAAAC,MAAA,GAAeC,SAAS,CAAC,CAAC;EAAA,IAAAC,EAAA;EAAA,IAAAR,CAAA,QAAAG,eAAA,IAAAH,CAAA,QAAAI,UAAA;IAEsBI,EAAA;MAAAC,cAAA,EAC9BN,eAAe;MAAAO,SAAA,EACpBN;IACb,CAAC;IAAAJ,CAAA,MAAAG,eAAA;IAAAH,CAAA,MAAAI,UAAA;IAAAJ,CAAA,MAAAQ,EAAA;EAAA;IAAAA,EAAA,GAAAR,CAAA;EAAA;EAHD;IAAAW,IAAA,EAAAC;EAAA,IAAyBzB,sBAAsB,CAACqB,EAG/C,CAAC;EAAA,IAAAK,EAAA;EAAA,IAAAb,CAAA,QAAAY,MAAA,IAAAZ,CAAA,QAAAM,MAAA,CAAAQ,gBAAA;IAIED,EAAA,gBAAAxB,IAAA,CAACR,QAAQ;MACD+B,IAAM,EAANA,MAAM;MACWG,qBAAuB,EAAvBT,MAAM,CAAAQ,gBAAiB;MAChCE,YAA0B,EAA1BC,KAA0B;MAC5BC,UAAsC,EAAtCC;IAAsC,CACnD,CAAC;IAAAnB,CAAA,MAAAY,MAAA;IAAAZ,CAAA,MAAAM,MAAA,CAAAQ,gBAAA;IAAAd,CAAA,MAAAa,EAAA;EAAA;IAAAA,EAAA,GAAAb,CAAA;EAAA;EAAA,IAAAoB,EAAA;EAAA,IAAApB,CAAA,QAAAM,MAAA,CAAAe,gBAAA,IAAArB,CAAA,QAAAa,EAAA;IANJO,EAAA,gBAAA/B,IAAA,CAAAJ,SAAA,CAAAqC,IAAA;MAA8BC,YAAuB,EAAvBjB,MAAM,CAAAe,gBAAiB;MAAAG,QAAA,EACnDX;IAKE,CACY,CAAC;IAAAb,CAAA,MAAAM,MAAA,CAAAe,gBAAA;IAAArB,CAAA,MAAAa,EAAA;IAAAb,CAAA,MAAAoB,EAAA;EAAA;IAAAA,EAAA,GAAApB,CAAA;EAAA;EAAA,OAPjBoB,EAOiB;AAAA;AAjBd,SAAAD,OAAApB,EAAA;EAec;IAAA0B,IAAA,EAAAC;EAAA,IAAA3B,EAAQ;EAAA,oBAAKV,IAAA,CAACsC,MAAM;IAASF,MAAI,EAAJA;EAAI,CAAG,CAAC;AAAA;AAfnD,SAAAR,MAAAQ,IAAA;EAAA,OAcuBA,IAAI,CAAAG,EAAG,CAAAC,QAAS,CAAC,CAAC;AAAA;AAOhD,MAAMF,MAAM,GAAGlD,IAAI,CAACsB,EAAA;EAAA,MAAAC,CAAA,GAAAC,EAAA;EAAC;IAAA6B;EAAA,IAAA/B,EAA2C;EAC9D,MAAAO,MAAA,GAAeC,SAAS,CAAC,CAAC;EAAA,IAAAC,EAAA;EAAA,IAAAR,CAAA,QAAA8B,MAAA,CAAAC,MAAA;IAItBvB,EAAA,gBAAAnB,IAAA,CAACN,MAAM;MAAYiD,SAAa,EAAbF,MAAM,CAAAC,MAAO;MAAOE,IAAI,EAAJ;IAAI,CAAE,CAAC;IAAAjC,CAAA,MAAA8B,MAAA,CAAAC,MAAA;IAAA/B,CAAA,MAAAQ,EAAA;EAAA;IAAAA,EAAA,GAAAR,CAAA;EAAA;EAAA,IAAAa,EAAA;EAAA,IAAAb,CAAA,QAAA8B,MAAA,CAAAI,IAAA,IAAAlC,CAAA,QAAAM,MAAA,CAAA6B,UAAA;IAC9CtB,EAAA,gBAAAxB,IAAA,CAACL,IAAI;MAASoD,OAAU,EAAV,UAAU;MAAgBC,aAAC,EAAD,CAAC;MAASC,KAAiB,EAAjBhC,MAAM,CAAA6B,UAAW;MAAAX,QAAA,EAChEM,MAAM,CAAAI;IAAK,CACR,CAAC;IAAAlC,CAAA,MAAA8B,MAAA,CAAAI,IAAA;IAAAlC,CAAA,MAAAM,MAAA,CAAA6B,UAAA;IAAAnC,CAAA,MAAAa,EAAA;EAAA;IAAAA,EAAA,GAAAb,CAAA;EAAA;EAAA,IAAAoB,EAAA;EAAA,IAAApB,CAAA,QAAAM,MAAA,CAAAiC,SAAA,IAAAvC,CAAA,QAAAQ,EAAA,IAAAR,CAAA,QAAAa,EAAA;IAJTO,EAAA,gBAAA7B,KAAA,CAACX,IAAI;MAAQ0D,KAAgB,EAAhBhC,MAAM,CAAAiC,SAAU;MAAAf,QAAA,GAC3BhB,EAA8C,EAC9CK,EAEO;IAAA,CACH,CAAC;IAAAb,CAAA,MAAAM,MAAA,CAAAiC,SAAA;IAAAvC,CAAA,MAAAQ,EAAA;IAAAR,CAAA,MAAAa,EAAA;IAAAb,CAAA,MAAAoB,EAAA;EAAA;IAAAA,EAAA,GAAApB,CAAA;EAAA;EAAA,OALPoB,EAKO;AAAA,CAEV,CAAC;AAEF,MAAMb,SAAS,GAAGA,CAAA;EAAA,MAAAP,CAAA,GAAAC,EAAA;EAChB;IAAAuC;EAAA,IAAmB1D,iBAAiB,CAAC,CAAC;EAAA,IAAAiB,EAAA;EAAA,IAAAC,CAAA,QAAAwC,MAAA;IAE/BzC,EAAA,GAAApB,UAAU,CAAA8D,MAAO,CAAC;MAAApB,gBAAA,EACL;QAAAqB,UAAA,EACJ;MACd,CAAC;MAAA5B,gBAAA,EACiB;QAAA4B,UAAA,EACJ,CAAC;QAAAC,aAAA,EACEH,MAAM,GAAG;MAC1B,CAAC;MAAAD,SAAA,EACU;QAAAK,aAAA,EACM,KAAK;QAAAC,UAAA,EACR,QAAQ;QAAAC,GAAA,EACf,CAAC;QAAAC,eAAA,EACW,CAAC;QAAAC,iBAAA,EACC,EAAE;QAAAC,IAAA,EACf;MACR,CAAC;MAAAd,UAAA,EACW;QAAAc,IAAA,EACJ;MACR;IACF,CAAC,CAAC;IAAAjD,CAAA,MAAAwC,MAAA;IAAAxC,CAAA,MAAAD,EAAA;EAAA;IAAAA,EAAA,GAAAC,CAAA;EAAA;EAAA,OAnBKD,EAmBL;AAAA,CACH","ignoreList":[]}
@@ -18,6 +18,7 @@ export interface CurrentPersonResource extends PersonResource {
18
18
  ageQualificationStatus?: AgeQualificationStatus;
19
19
  directMessagesDisabled: boolean;
20
20
  directMessagesEligible: boolean;
21
+ canManageDirectMessages?: boolean;
21
22
  canBrowseArchivedConversations?: boolean;
22
23
  under_18: boolean;
23
24
  }
@@ -1 +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,sBAAsB,EAAE,OAAO,CAAA;IAC/B,8BAA8B,CAAC,EAAE,OAAO,CAAA;IACxC,QAAQ,EAAE,OAAO,CAAA;CAClB"}
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,sBAAsB,EAAE,OAAO,CAAA;IAC/B,uBAAuB,CAAC,EAAE,OAAO,CAAA;IACjC,8BAA8B,CAAC,EAAE,OAAO,CAAA;IACxC,QAAQ,EAAE,OAAO,CAAA;CAClB"}
@@ -1 +1 @@
1
- {"version":3,"file":"person.js","names":["AgeQualificationStatus","QUALIFIED","DISQUALIFIED","UNKNOWN"],"sources":["../../../src/types/resources/person.ts"],"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 canBrowseArchivedConversations?: boolean\n under_18: boolean\n}\n"],"mappings":"AAEA,OAAO,MAAMA,sBAAsB,GAAG;EACpCC,SAAS,EAAE,WAAW;EACtBC,YAAY,EAAE,cAAc;EAC5BC,OAAO,EAAE;AACX,CAAU","ignoreList":[]}
1
+ {"version":3,"file":"person.js","names":["AgeQualificationStatus","QUALIFIED","DISQUALIFIED","UNKNOWN"],"sources":["../../../src/types/resources/person.ts"],"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 canManageDirectMessages?: boolean\n canBrowseArchivedConversations?: boolean\n under_18: boolean\n}\n"],"mappings":"AAEA,OAAO,MAAMA,sBAAsB,GAAG;EACpCC,SAAS,EAAE,WAAW;EACtBC,YAAY,EAAE,cAAc;EAC5BC,OAAO,EAAE;AACX,CAAU","ignoreList":[]}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@planningcenter/chat-react-native",
3
- "version": "4.6.3",
3
+ "version": "4.6.4-qa-staging.1",
4
4
  "description": "",
5
5
  "repository": {
6
6
  "type": "git",
@@ -33,7 +33,7 @@
33
33
  "dependencies": {
34
34
  "@fortawesome/fontawesome-svg-core": "^7.2.0",
35
35
  "@fortawesome/react-native-fontawesome": "^0.3.2",
36
- "@planningcenter/emoji-keyboard": "4.6.0",
36
+ "@planningcenter/emoji-keyboard": "4.6.4-qa-staging.1",
37
37
  "lodash-inflection": "^1.5.0"
38
38
  },
39
39
  "peerDependencies": {
@@ -84,5 +84,5 @@
84
84
  "sf-symbols-typescript": "^2.2.0",
85
85
  "typescript": "~6.0.3"
86
86
  },
87
- "gitHead": "8e0e2f95366f48a3bb997eac22a998fbd2c3fac9"
87
+ "gitHead": "abae355555a9b464f435fbd9ae8dba699efbbb88"
88
88
  }
@@ -0,0 +1,53 @@
1
+ import { QueryClientProvider } from '@tanstack/react-query'
2
+ import { renderHook } from '@testing-library/react-native'
3
+ import React from 'react'
4
+ import { buildTestQueryClient } from '../../__utils__/query_client'
5
+ import { useCurrentPerson } from '../../hooks/use_current_person'
6
+ import { usePersonSettings } from '../../hooks/use_person_settings'
7
+ import { CurrentPersonResource } from '../../types'
8
+
9
+ jest.mock('../../hooks/use_api_client', () => ({ useApiClient: () => ({}) }))
10
+ jest.mock('../../hooks/use_current_person', () => ({
11
+ useCurrentPerson: jest.fn(),
12
+ useCurrentPersonCache: () => ({ update: jest.fn(), invalidate: jest.fn() }),
13
+ }))
14
+
15
+ const mockedUseCurrentPerson = useCurrentPerson as jest.MockedFunction<typeof useCurrentPerson>
16
+
17
+ const renderUsePersonSettings = (person: Partial<CurrentPersonResource>) => {
18
+ mockedUseCurrentPerson.mockReturnValue(person as CurrentPersonResource)
19
+ const wrapper = ({ children }: { children: React.ReactNode }) => (
20
+ <QueryClientProvider client={buildTestQueryClient()}>{children}</QueryClientProvider>
21
+ )
22
+
23
+ return renderHook(() => usePersonSettings(), { wrapper })
24
+ }
25
+
26
+ describe('usePersonSettings', () => {
27
+ describe('canManageDirectMessages', () => {
28
+ it('is true for a minor who can manage direct messages', () => {
29
+ const { result } = renderUsePersonSettings({
30
+ canManageDirectMessages: true,
31
+ directMessagesEligible: false,
32
+ under_18: true,
33
+ })
34
+
35
+ expect(result.current.canManageDirectMessages).toBe(true)
36
+ })
37
+
38
+ it('is false when the person cannot manage direct messages', () => {
39
+ const { result } = renderUsePersonSettings({
40
+ canManageDirectMessages: false,
41
+ directMessagesEligible: false,
42
+ })
43
+
44
+ expect(result.current.canManageDirectMessages).toBe(false)
45
+ })
46
+
47
+ it('falls back to direct message eligibility when the attribute is absent', () => {
48
+ const { result } = renderUsePersonSettings({ directMessagesEligible: true })
49
+
50
+ expect(result.current.canManageDirectMessages).toBe(true)
51
+ })
52
+ })
53
+ })
@@ -0,0 +1,58 @@
1
+ import { DefaultTheme, ThemeProvider } from '@react-navigation/native'
2
+ import { render } from '@testing-library/react-native'
3
+ import React from 'react'
4
+ import { SafeAreaProvider } from 'react-native-safe-area-context'
5
+ import { SettingsScreen, SettingsScreenProps } from '../../screens/settings_screen'
6
+
7
+ let mockCanManageDirectMessages = true
8
+
9
+ jest.mock('@react-navigation/native', () => ({
10
+ ...jest.requireActual('@react-navigation/native'),
11
+ useNavigation: () => ({ navigate: jest.fn() }),
12
+ }))
13
+ jest.mock('../../hooks/use_app_name', () => ({ useAppName: () => 'church_center' }))
14
+ jest.mock('../../hooks/use_person_settings', () => ({
15
+ usePersonSettings: () => ({
16
+ canManageDirectMessages: mockCanManageDirectMessages,
17
+ directMessagesDisabled: false,
18
+ setDirectMessagesDisabled: jest.fn(),
19
+ isMutating: false,
20
+ }),
21
+ }))
22
+ jest.mock('../../components/display/version_footer', () => ({ VersionFooter: () => null }))
23
+
24
+ const safeAreaMetrics = {
25
+ frame: { x: 0, y: 0, width: 390, height: 844 },
26
+ insets: { top: 0, right: 0, bottom: 0, left: 0 },
27
+ }
28
+
29
+ const route = { key: 'Settings', name: 'Settings', params: {} } as SettingsScreenProps['route']
30
+
31
+ const renderScreen = () =>
32
+ render(
33
+ <SafeAreaProvider initialMetrics={safeAreaMetrics}>
34
+ <ThemeProvider value={DefaultTheme}>
35
+ <SettingsScreen route={route} />
36
+ </ThemeProvider>
37
+ </SafeAreaProvider>
38
+ )
39
+
40
+ describe('SettingsScreen', () => {
41
+ beforeEach(() => {
42
+ mockCanManageDirectMessages = true
43
+ })
44
+
45
+ it('shows the direct messages toggle when the person can manage direct messages', () => {
46
+ const { getByText } = renderScreen()
47
+
48
+ expect(getByText('Allow direct messages')).toBeTruthy()
49
+ })
50
+
51
+ it('hides the direct messages toggle when the person cannot manage direct messages', () => {
52
+ mockCanManageDirectMessages = false
53
+ const { queryByText, getByText } = renderScreen()
54
+
55
+ expect(queryByText('Allow direct messages')).toBeNull()
56
+ expect(getByText('Notification settings')).toBeTruthy()
57
+ })
58
+ })
@@ -0,0 +1,39 @@
1
+ import { ResponseError } from '../../utils/response_error'
2
+ import { configuredRetry } from '../api_provider'
3
+
4
+ jest.mock('../../hooks/use_api_client')
5
+
6
+ const responseWithStatus = (status: number) =>
7
+ ({
8
+ status,
9
+ statusText: 'Error',
10
+ ok: false,
11
+ url: 'https://api.pco.test/chat/v2/me',
12
+ headers: {},
13
+ clone: () => ({}),
14
+ json: () => Promise.resolve({}),
15
+ text: () => Promise.resolve(''),
16
+ arrayBuffer: () => Promise.resolve(new ArrayBuffer(0)),
17
+ errors: [],
18
+ }) as unknown as Response
19
+
20
+ describe('configuredRetry', () => {
21
+ it('does not retry client errors', () => {
22
+ ;[400, 404, 414, 422, 429].forEach(status => {
23
+ expect(configuredRetry(0, new ResponseError(responseWithStatus(status) as any))).toBe(false)
24
+ expect(configuredRetry(0, responseWithStatus(status))).toBe(false)
25
+ })
26
+ })
27
+
28
+ it('retries server errors up to three times', () => {
29
+ const error = new ResponseError(responseWithStatus(503) as any)
30
+
31
+ expect(configuredRetry(0, error)).toBe(true)
32
+ expect(configuredRetry(2, error)).toBe(true)
33
+ expect(configuredRetry(3, error)).toBe(false)
34
+ })
35
+
36
+ it('retries network failures', () => {
37
+ expect(configuredRetry(0, new TypeError('Network request failed'))).toBe(true)
38
+ })
39
+ })
@@ -14,7 +14,7 @@ import { featuresQueryOptions } from '../hooks/use_features'
14
14
  import { useJoltForegroundPing } from '../hooks/use_jolt'
15
15
  import { RequestQueryKey } from '../hooks/use_suspense_api'
16
16
  import { emitAuthRefresh } from '../utils/auth_events'
17
- import { ResponseError } from '../utils/response_error'
17
+ import { isResponseLike, ResponseError } from '../utils/response_error'
18
18
  import { ChatContext, ChatContextValue } from './chat_context'
19
19
 
20
20
  let apiClient: ApiClient | undefined
@@ -29,14 +29,21 @@ const defaultQueryFn = ({ queryKey }: { queryKey: QueryKey }) => {
29
29
  return apiClient[app].get({ url, data, headers })
30
30
  }
31
31
 
32
- const configuredRetry = (failureCount: number, error: any) => {
33
- if (is429Error(error)) return false
32
+ export const configuredRetry = (failureCount: number, error: unknown) => {
33
+ if (isClientError(error)) return false
34
34
 
35
35
  return failureCount < 3
36
36
  }
37
37
 
38
- const is429Error = (error: any): boolean => {
39
- return error instanceof ResponseError && error.status === 429
38
+ const isClientError = (error: unknown): boolean => {
39
+ const status = errorStatus(error)
40
+ return status !== undefined && status >= 400 && status < 500
41
+ }
42
+
43
+ const errorStatus = (error: unknown): number | undefined => {
44
+ if (error instanceof ResponseError) return error.status
45
+ if (isResponseLike(error)) return error.status
46
+ return undefined
40
47
  }
41
48
 
42
49
  export const chatQueryClient = new QueryClient({
@@ -0,0 +1,79 @@
1
+ import { notifyManager, QueryClient, QueryClientProvider } from '@tanstack/react-query'
2
+ import { act, renderHook, waitFor } from '@testing-library/react-native'
3
+ import React, { Suspense } from 'react'
4
+ import { MEMBERS_PER_REQUEST, useSystemMessagePeople } from '../use_system_message_people'
5
+
6
+ const mockGet = jest.fn()
7
+ jest.mock('../use_api_client', () => ({
8
+ useApiClient: () => ({ chat: { get: mockGet } }),
9
+ }))
10
+
11
+ notifyManager.setNotifyFunction(fn => act(fn))
12
+
13
+ const conversationId = 7
14
+
15
+ const member = (id: number) => ({ type: 'Member', id, name: `Person ${id}`, avatar: '' })
16
+
17
+ const membersPage = (ids: number[]) => ({
18
+ data: ids.map(member),
19
+ links: {},
20
+ meta: { count: ids.length, totalCount: ids.length },
21
+ })
22
+
23
+ const requestedIds = () => mockGet.mock.calls.map(([request]) => request.data.where.id as number[])
24
+
25
+ const render = (personIds: number[]) => {
26
+ const queryClient = new QueryClient({
27
+ defaultOptions: { queries: { retry: false, gcTime: 0 } },
28
+ })
29
+ const wrapper = ({ children }: { children: React.ReactNode }) => (
30
+ <QueryClientProvider client={queryClient}>
31
+ <Suspense fallback={null}>{children}</Suspense>
32
+ </QueryClientProvider>
33
+ )
34
+
35
+ return renderHook(() => useSystemMessagePeople({ conversationId, personIds }), { wrapper })
36
+ }
37
+
38
+ beforeEach(() => {
39
+ mockGet.mockReset()
40
+ mockGet.mockImplementation(({ data }) =>
41
+ Promise.resolve(membersPage([...(data.where.id as number[])].reverse()))
42
+ )
43
+ })
44
+
45
+ describe('useSystemMessagePeople', () => {
46
+ it('requests members in batches no larger than a page', async () => {
47
+ const personIds = Array.from({ length: 250 }, (_, i) => i + 1)
48
+
49
+ render(personIds)
50
+
51
+ await waitFor(() => expect(mockGet).toHaveBeenCalledTimes(3))
52
+
53
+ expect(requestedIds().map(ids => ids.length)).toEqual([100, 100, 50])
54
+ expect(requestedIds().flat()).toEqual(personIds)
55
+ mockGet.mock.calls.forEach(([request]) => {
56
+ expect(request.url).toEqual(`/me/conversations/${conversationId}/members`)
57
+ expect(request.data.perPage).toEqual(MEMBERS_PER_REQUEST)
58
+ })
59
+ })
60
+
61
+ it('returns everyone in the order of the system message', async () => {
62
+ const personIds = Array.from({ length: 150 }, (_, i) => 1000 - i)
63
+
64
+ const { result } = render(personIds)
65
+
66
+ await waitFor(() => expect(result.current?.data).toHaveLength(150))
67
+
68
+ expect(result.current.data.map(({ id }) => id)).toEqual(personIds)
69
+ })
70
+
71
+ it('makes a single request for a small list', async () => {
72
+ const { result } = render([3, 1, 2])
73
+
74
+ await waitFor(() => expect(result.current?.data).toHaveLength(3))
75
+
76
+ expect(mockGet).toHaveBeenCalledTimes(1)
77
+ expect(result.current.data.map(({ id }) => id)).toEqual([3, 1, 2])
78
+ })
79
+ })
@@ -29,4 +29,5 @@ export * from './use_reduce_motion'
29
29
  export * from './use_scalable_number_of_lines'
30
30
  export * from './use_submit_age_check'
31
31
  export * from './use_suspense_api'
32
+ export * from './use_system_message_people'
32
33
  export * from './use_theme'
@@ -18,6 +18,7 @@ export const currentPersonRequestArgs = {
18
18
  'age_qualification_status',
19
19
  'direct_messages_disabled',
20
20
  'direct_messages_eligible',
21
+ 'can_manage_direct_messages',
21
22
  'can_browse_archived_conversations',
22
23
  'under_18',
23
24
  ],
@@ -9,6 +9,8 @@ export function usePersonSettings() {
9
9
  const { update, invalidate } = useCurrentPersonCache()
10
10
 
11
11
  const directMessagesDisabled = person?.directMessagesDisabled ?? false
12
+ const canManageDirectMessages =
13
+ person?.canManageDirectMessages ?? person?.directMessagesEligible ?? false
12
14
 
13
15
  const { mutate: setDirectMessagesDisabled, isPending: isMutating } = useMutation({
14
16
  mutationFn: (disabled: boolean) => {
@@ -25,5 +27,5 @@ export function usePersonSettings() {
25
27
  },
26
28
  })
27
29
 
28
- return { directMessagesDisabled, setDirectMessagesDisabled, isMutating }
30
+ return { canManageDirectMessages, directMessagesDisabled, setDirectMessagesDisabled, isMutating }
29
31
  }
@@ -0,0 +1,55 @@
1
+ import { useSuspenseQueries } from '@tanstack/react-query'
2
+ import { chunk, sortBy } from 'lodash'
3
+ import { ApiCollection, MemberResource } from '../types'
4
+ import { GetRequest } from '../utils/client'
5
+ import { throwResponseError } from '../utils/response_error'
6
+ import { useApiClient } from './use_api_client'
7
+ import { getRequestQueryKey } from './use_suspense_api'
8
+
9
+ export const MEMBERS_PER_REQUEST = 100
10
+
11
+ type SystemMessagePeopleArgs = {
12
+ conversationId: number
13
+ personIds: number[]
14
+ }
15
+
16
+ export type SystemMessagePerson = Pick<MemberResource, 'type' | 'id' | 'name' | 'avatar'>
17
+
18
+ export const systemMessagePeopleRequest = (
19
+ conversationId: number,
20
+ personIds: number[]
21
+ ): GetRequest => ({
22
+ url: `/me/conversations/${conversationId}/members`,
23
+ data: {
24
+ fields: {
25
+ Member: ['id', 'name', 'avatar'],
26
+ },
27
+ where: {
28
+ id: personIds,
29
+ },
30
+ perPage: MEMBERS_PER_REQUEST,
31
+ },
32
+ })
33
+
34
+ export const useSystemMessagePeople = ({ conversationId, personIds }: SystemMessagePeopleArgs) => {
35
+ const apiClient = useApiClient()
36
+ const requests = chunk(personIds, MEMBERS_PER_REQUEST).map(ids =>
37
+ systemMessagePeopleRequest(conversationId, ids)
38
+ )
39
+
40
+ const queries = useSuspenseQueries({
41
+ queries: requests.map(request => ({
42
+ queryKey: getRequestQueryKey(request),
43
+ queryFn: (): Promise<ApiCollection<SystemMessagePerson>> =>
44
+ apiClient.chat.get<ApiCollection<SystemMessagePerson>>(request).catch(throwResponseError),
45
+ })),
46
+ })
47
+
48
+ const orderById = Object.fromEntries(personIds.map((id, index) => [id, index]))
49
+ const people = sortBy(
50
+ queries.flatMap(query => query.data.data),
51
+ person => orderById[person.id] ?? personIds.length
52
+ )
53
+
54
+ return { data: people }
55
+ }
@@ -5,7 +5,7 @@ import { Platform, ScrollView, StyleSheet, View } from 'react-native'
5
5
  import { useSafeAreaInsets } from 'react-native-safe-area-context'
6
6
  import { Heading, Icon, Text, VersionFooter } from '../components'
7
7
  import { Switch } from '../components/display/switch'
8
- import { useDirectMessagesEligible, useTheme } from '../hooks'
8
+ import { useTheme } from '../hooks'
9
9
  import { useAppName } from '../hooks/use_app_name'
10
10
  import { usePersonSettings } from '../hooks/use_person_settings'
11
11
 
@@ -13,8 +13,8 @@ export type SettingsScreenProps = StaticScreenProps<{}>
13
13
 
14
14
  export function SettingsScreen({}: SettingsScreenProps) {
15
15
  const styles = useStyles()
16
- const { directMessagesDisabled, setDirectMessagesDisabled, isMutating } = usePersonSettings()
17
- const directMessagesEligible = useDirectMessagesEligible()
16
+ const { canManageDirectMessages, directMessagesDisabled, setDirectMessagesDisabled, isMutating } =
17
+ usePersonSettings()
18
18
  const appName = useAppName()
19
19
  const navigation = useNavigation()
20
20
 
@@ -33,7 +33,7 @@ export function SettingsScreen({}: SettingsScreenProps) {
33
33
  <View style={styles.sectionHeader}>
34
34
  <Heading variant="h2">Messages</Heading>
35
35
  </View>
36
- {directMessagesEligible && (
36
+ {canManageDirectMessages && (
37
37
  <View style={styles.settingRow}>
38
38
  <View style={styles.settingRowText}>
39
39
  <Text>Allow direct messages</Text>