@terreno/ui 57.21.0 → 58.0.0-beta.2

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 (221) hide show
  1. package/.ai/guidelines/core.md +1 -1
  2. package/CHANGELOG.md +89 -0
  3. package/dist/ActionSheet.d.ts +9 -9
  4. package/dist/ActionSheet.d.ts.map +1 -1
  5. package/dist/ActionSheet.js +11 -4
  6. package/dist/ActionSheet.js.map +1 -1
  7. package/dist/AnnouncementNavigator.d.ts +7 -1
  8. package/dist/AnnouncementNavigator.d.ts.map +1 -1
  9. package/dist/AnnouncementNavigator.js +15 -16
  10. package/dist/AnnouncementNavigator.js.map +1 -1
  11. package/dist/Avatar.d.ts.map +1 -1
  12. package/dist/Avatar.js +1 -1
  13. package/dist/Avatar.js.map +1 -1
  14. package/dist/Box.d.ts.map +1 -1
  15. package/dist/Box.js +3 -1
  16. package/dist/Box.js.map +1 -1
  17. package/dist/Common.d.ts +16 -12
  18. package/dist/Common.d.ts.map +1 -1
  19. package/dist/Common.js.map +1 -1
  20. package/dist/ConsentFormScreen.d.ts.map +1 -1
  21. package/dist/ConsentFormScreen.js.map +1 -1
  22. package/dist/ConsentNavigator.d.ts +5 -3
  23. package/dist/ConsentNavigator.d.ts.map +1 -1
  24. package/dist/ConsentNavigator.js +4 -4
  25. package/dist/ConsentNavigator.js.map +1 -1
  26. package/dist/CustomSelectField.js.map +1 -1
  27. package/dist/DataTable.d.ts.map +1 -1
  28. package/dist/DataTable.js +37 -12
  29. package/dist/DataTable.js.map +1 -1
  30. package/dist/DateTimeField.js.map +1 -1
  31. package/dist/DropdownPanel.d.ts +0 -5
  32. package/dist/DropdownPanel.d.ts.map +1 -1
  33. package/dist/DropdownPanel.js +0 -5
  34. package/dist/DropdownPanel.js.map +1 -1
  35. package/dist/FilterAccordion.d.ts.map +1 -1
  36. package/dist/FilterAccordion.js.map +1 -1
  37. package/dist/FilterBoolean.d.ts.map +1 -1
  38. package/dist/FilterBoolean.js.map +1 -1
  39. package/dist/FilterSelectMenu.js +1 -1
  40. package/dist/FilterSelectMenu.js.map +1 -1
  41. package/dist/GPTChat.d.ts.map +1 -1
  42. package/dist/GPTChat.js.map +1 -1
  43. package/dist/Heading.d.ts.map +1 -1
  44. package/dist/Heading.js +6 -12
  45. package/dist/Heading.js.map +1 -1
  46. package/dist/HeightField.d.ts.map +1 -1
  47. package/dist/HeightField.js +1 -1
  48. package/dist/HeightField.js.map +1 -1
  49. package/dist/Hyperlink.d.ts.map +1 -1
  50. package/dist/Hyperlink.js +6 -1
  51. package/dist/Hyperlink.js.map +1 -1
  52. package/dist/Image.d.ts +1 -1
  53. package/dist/MarkdownEditorField.d.ts.map +1 -1
  54. package/dist/MarkdownEditorField.js +1 -1
  55. package/dist/MarkdownEditorField.js.map +1 -1
  56. package/dist/OfflineBanner.d.ts +3 -2
  57. package/dist/OfflineBanner.d.ts.map +1 -1
  58. package/dist/OfflineBanner.js +3 -2
  59. package/dist/OfflineBanner.js.map +1 -1
  60. package/dist/OtpField.d.ts.map +1 -1
  61. package/dist/OtpField.js +6 -3
  62. package/dist/OtpField.js.map +1 -1
  63. package/dist/PickerSelect.d.ts +4 -4
  64. package/dist/PickerSelect.d.ts.map +1 -1
  65. package/dist/PickerSelect.js.map +1 -1
  66. package/dist/ProvisionalConsentSigner.d.ts +3 -2
  67. package/dist/ProvisionalConsentSigner.d.ts.map +1 -1
  68. package/dist/ProvisionalConsentSigner.js +2 -2
  69. package/dist/ProvisionalConsentSigner.js.map +1 -1
  70. package/dist/SidebarNavigation.js +2 -2
  71. package/dist/SidebarNavigation.js.map +1 -1
  72. package/dist/SidebarNavigation.native.js +2 -2
  73. package/dist/SidebarNavigation.native.js.map +1 -1
  74. package/dist/Skeleton.js.map +1 -1
  75. package/dist/Text.d.ts.map +1 -1
  76. package/dist/Text.js +27 -50
  77. package/dist/Text.js.map +1 -1
  78. package/dist/TextField.d.ts.map +1 -1
  79. package/dist/TextField.js.map +1 -1
  80. package/dist/ThumbsUpDownFeedback.d.ts.map +1 -1
  81. package/dist/ThumbsUpDownFeedback.js.map +1 -1
  82. package/dist/ToastNotifications.d.ts.map +1 -1
  83. package/dist/ToastNotifications.js.map +1 -1
  84. package/dist/Tooltip.d.ts.map +1 -1
  85. package/dist/Tooltip.js.map +1 -1
  86. package/dist/Unifier.d.ts +1 -1
  87. package/dist/WebAddressAutocomplete.js.map +1 -1
  88. package/dist/WebDropdownMenu.d.ts +3 -3
  89. package/dist/WebDropdownMenu.d.ts.map +1 -1
  90. package/dist/WebDropdownMenu.js +1 -1
  91. package/dist/WebDropdownMenu.js.map +1 -1
  92. package/dist/announcementPlatform.d.ts +5 -0
  93. package/dist/announcementPlatform.d.ts.map +1 -1
  94. package/dist/announcementPlatform.js +9 -0
  95. package/dist/announcementPlatform.js.map +1 -1
  96. package/dist/asks/AskCard.d.ts +2 -2
  97. package/dist/asks/AskCard.d.ts.map +1 -1
  98. package/dist/dataTableColumnWidths.d.ts +76 -0
  99. package/dist/dataTableColumnWidths.d.ts.map +1 -0
  100. package/dist/dataTableColumnWidths.js +181 -0
  101. package/dist/dataTableColumnWidths.js.map +1 -0
  102. package/dist/index.d.ts +2 -1
  103. package/dist/index.d.ts.map +1 -1
  104. package/dist/index.js.map +1 -1
  105. package/dist/login/LoginScreen.js.map +1 -1
  106. package/dist/requestClient.d.ts +71 -0
  107. package/dist/requestClient.d.ts.map +1 -0
  108. package/dist/requestClient.js +139 -0
  109. package/dist/requestClient.js.map +1 -0
  110. package/dist/security/PasswordCard.d.ts.map +1 -1
  111. package/dist/security/PasswordCard.js.map +1 -1
  112. package/dist/security/TwoFactorSettingsCard.d.ts.map +1 -1
  113. package/dist/security/TwoFactorSettingsCard.js +1 -1
  114. package/dist/security/TwoFactorSettingsCard.js.map +1 -1
  115. package/dist/signUp/SignUpScreen.js.map +1 -1
  116. package/dist/table/Table.d.ts.map +1 -1
  117. package/dist/table/Table.js.map +1 -1
  118. package/dist/table/TableTitle.d.ts.map +1 -1
  119. package/dist/table/TableTitle.js +2 -1
  120. package/dist/table/TableTitle.js.map +1 -1
  121. package/dist/textFontSizes.d.ts +12 -0
  122. package/dist/textFontSizes.d.ts.map +1 -0
  123. package/dist/textFontSizes.js +21 -0
  124. package/dist/textFontSizes.js.map +1 -0
  125. package/dist/useAcknowledgeAnnouncement.d.ts +8 -63
  126. package/dist/useAcknowledgeAnnouncement.d.ts.map +1 -1
  127. package/dist/useAcknowledgeAnnouncement.js +31 -80
  128. package/dist/useAcknowledgeAnnouncement.js.map +1 -1
  129. package/dist/useAnnouncements.d.ts +14 -47
  130. package/dist/useAnnouncements.d.ts.map +1 -1
  131. package/dist/useAnnouncements.js +30 -57
  132. package/dist/useAnnouncements.js.map +1 -1
  133. package/dist/useConsentForms.d.ts +6 -38
  134. package/dist/useConsentForms.d.ts.map +1 -1
  135. package/dist/useConsentForms.js +25 -48
  136. package/dist/useConsentForms.js.map +1 -1
  137. package/dist/useProvisionalConsent.d.ts +7 -58
  138. package/dist/useProvisionalConsent.d.ts.map +1 -1
  139. package/dist/useProvisionalConsent.js +57 -67
  140. package/dist/useProvisionalConsent.js.map +1 -1
  141. package/dist/useSubmitConsent.d.ts +9 -39
  142. package/dist/useSubmitConsent.d.ts.map +1 -1
  143. package/dist/useSubmitConsent.js +10 -39
  144. package/dist/useSubmitConsent.js.map +1 -1
  145. package/package.json +38 -38
  146. package/src/ActionSheet.test.tsx +4 -4
  147. package/src/ActionSheet.tsx +18 -5
  148. package/src/AnnouncementNavigator.test.tsx +215 -315
  149. package/src/AnnouncementNavigator.tsx +25 -20
  150. package/src/Avatar.tsx +2 -9
  151. package/src/Box.test.tsx +3 -3
  152. package/src/Box.tsx +4 -2
  153. package/src/Common.ts +19 -15
  154. package/src/ConsentFormScreen.tsx +2 -1
  155. package/src/ConsentNavigator.test.tsx +166 -242
  156. package/src/ConsentNavigator.tsx +9 -13
  157. package/src/CustomSelectField.tsx +3 -3
  158. package/src/DataTable.test.tsx +69 -1
  159. package/src/DataTable.tsx +72 -19
  160. package/src/DateTimeField.tsx +4 -4
  161. package/src/DropdownPanel.tsx +0 -6
  162. package/src/FilterAccordion.tsx +3 -3
  163. package/src/FilterBoolean.tsx +3 -3
  164. package/src/FilterSelectMenu.tsx +1 -1
  165. package/src/GPTChat.tsx +10 -9
  166. package/src/Heading.tsx +7 -14
  167. package/src/HeightField.tsx +9 -2
  168. package/src/Hyperlink.tsx +6 -3
  169. package/src/Link.test.tsx +2 -2
  170. package/src/MarkdownEditorField.tsx +10 -2
  171. package/src/MarkdownView.test.tsx +10 -6
  172. package/src/Modal.test.tsx +3 -1
  173. package/src/ModalSheet.test.tsx +6 -6
  174. package/src/OfflineBanner.tsx +3 -2
  175. package/src/OtpField.test.tsx +44 -0
  176. package/src/OtpField.tsx +8 -4
  177. package/src/PickerSelect.tsx +3 -2
  178. package/src/ProvisionalConsentSigner.test.tsx +140 -113
  179. package/src/ProvisionalConsentSigner.tsx +5 -4
  180. package/src/SidebarNavigation.native.tsx +2 -2
  181. package/src/SidebarNavigation.tsx +2 -2
  182. package/src/Skeleton.tsx +1 -1
  183. package/src/TapToEdit.test.tsx +2 -2
  184. package/src/Text.test.tsx +1 -1
  185. package/src/Text.tsx +25 -51
  186. package/src/TextField.tsx +2 -1
  187. package/src/ThumbsUpDownFeedback.tsx +3 -3
  188. package/src/ToastNotifications.tsx +3 -2
  189. package/src/ToastNotifications.webModal.test.tsx +4 -1
  190. package/src/Tooltip.tsx +2 -1
  191. package/src/UserInactivity.test.tsx +2 -3
  192. package/src/WebAddressAutocomplete.tsx +3 -3
  193. package/src/WebDropdownMenu.tsx +16 -5
  194. package/src/__snapshots__/DataTable.test.tsx.snap +13 -0
  195. package/src/announcementPlatform.ts +10 -0
  196. package/src/asks/AskCard.test.tsx +14 -12
  197. package/src/asks/AskCard.tsx +2 -2
  198. package/src/bunSetup.ts +42 -0
  199. package/src/dataTableColumnWidths.test.ts +266 -0
  200. package/src/dataTableColumnWidths.ts +272 -0
  201. package/src/index.tsx +9 -2
  202. package/src/login/LoginScreen.tsx +2 -2
  203. package/src/requestClient.test.ts +288 -0
  204. package/src/requestClient.ts +228 -0
  205. package/src/security/PasswordCard.tsx +7 -5
  206. package/src/security/TwoFactorSettingsCard.tsx +10 -3
  207. package/src/signUp/SignUpScreen.tsx +2 -2
  208. package/src/table/Table.tsx +1 -2
  209. package/src/table/TableTitle.tsx +2 -1
  210. package/src/test-utils.tsx +76 -0
  211. package/src/textFontSizes.ts +31 -0
  212. package/src/useAcknowledgeAnnouncement.test.ts +101 -193
  213. package/src/useAcknowledgeAnnouncement.ts +69 -147
  214. package/src/useAnnouncements.test.ts +122 -186
  215. package/src/useAnnouncements.ts +49 -105
  216. package/src/useConsentForms.test.ts +59 -112
  217. package/src/useConsentForms.ts +37 -87
  218. package/src/useProvisionalConsent.test.ts +74 -150
  219. package/src/useProvisionalConsent.ts +79 -125
  220. package/src/useSubmitConsent.test.ts +59 -85
  221. package/src/useSubmitConsent.ts +22 -77
@@ -2,7 +2,8 @@ import {beforeEach, describe, expect, it, mock, spyOn} from "bun:test";
2
2
  import {act, fireEvent} from "@testing-library/react-native";
3
3
  import {assert} from "chai";
4
4
  import {DateTime} from "luxon";
5
- import React, {useCallback, useState} from "react";
5
+ import type React from "react";
6
+ import {useState} from "react";
6
7
  import {Linking, Text} from "react-native";
7
8
  import {AnnouncementNavigator} from "./AnnouncementNavigator";
8
9
  import * as announcementFrequency from "./announcementFrequency";
@@ -12,7 +13,7 @@ import {
12
13
  } from "./announcementFrequency";
13
14
  import {Box} from "./Box";
14
15
  import {TextField} from "./TextField";
15
- import {renderWithTheme} from "./test-utils";
16
+ import {createFakeRequestClient, fakeHttpError, renderWithTheme} from "./test-utils";
16
17
  import {Unifier} from "./Unifier";
17
18
  import {
18
19
  type AnnouncementPublic,
@@ -31,67 +32,63 @@ const makeAnnouncement = (overrides: Partial<AnnouncementPublic> = {}): Announce
31
32
  ...overrides,
32
33
  });
33
34
 
35
+ interface MockApiOptions {
36
+ acknowledgeUnwrap?: () => Promise<unknown>;
37
+ clickUnwrap?: () => Promise<unknown>;
38
+ feedItems?: AnnouncementPublic[];
39
+ impressionUnwrap?: () => Promise<unknown>;
40
+ /** Runs before each pending refetch (every pending request after the first). */
41
+ onRefetch?: () => void;
42
+ /** Replaces the pending route: return a payload, a promise, or throw. */
43
+ pendingHandler?: () => unknown;
44
+ feedHandler?: () => unknown;
45
+ }
46
+
47
+ /**
48
+ * Fake request client for the announcement routes. Event mocks record `{announcementId}`
49
+ * per request; `refetch` records every pending request after the first.
50
+ */
34
51
  const createMockApi = (
35
52
  pending: PendingAnnouncementsResponse | (() => PendingAnnouncementsResponse),
36
- refetchOverride?: () => Promise<void>,
37
- feedItems: AnnouncementPublic[] = [],
38
- clickUnwrap: () => Promise<unknown> = async () => ({data: {recorded: true}}),
39
- overrides: {
40
- acknowledgeUnwrap?: () => Promise<unknown>;
41
- impressionUnwrap?: () => Promise<unknown>;
42
- } = {}
53
+ options: MockApiOptions = {}
43
54
  ) => {
44
55
  const getPending =
45
56
  typeof pending === "function" ? pending : (): PendingAnnouncementsResponse => pending;
46
- const refetch = refetchOverride ?? mock(() => Promise.resolve());
47
- const acknowledgeUnwrap =
48
- overrides.acknowledgeUnwrap ?? (async (): Promise<unknown> => ({data: {acknowledged: true}}));
49
- const impressionUnwrap =
50
- overrides.impressionUnwrap ?? (async (): Promise<unknown> => ({data: {recorded: true}}));
51
- const acknowledgeMutation = mock(() => ({
52
- unwrap: mock(acknowledgeUnwrap),
53
- }));
54
- const impressionMutation = mock(() => ({
55
- unwrap: mock(impressionUnwrap),
56
- }));
57
- const clickMutation = mock(() => ({
58
- unwrap: mock(clickUnwrap),
59
- }));
60
-
61
- const innerApi = {
62
- injectEndpoints: mock((_config: unknown) => ({
63
- useAcknowledgeAnnouncementMutation: mock(() => [
64
- acknowledgeMutation,
65
- {error: undefined, isLoading: false},
66
- ]),
67
- useGetAnnouncementFeedQuery: mock(() => ({
68
- data: {data: feedItems},
69
- error: undefined,
70
- isLoading: false,
71
- refetch,
72
- })),
73
- useGetPendingAnnouncementsQuery: mock(() => ({
74
- data: {data: getPending()},
75
- error: undefined,
76
- isLoading: false,
77
- refetch,
78
- })),
79
- useRecordAnnouncementClickMutation: mock(() => [
80
- clickMutation,
81
- {error: undefined, isLoading: false},
82
- ]),
83
- useRecordAnnouncementImpressionMutation: mock(() => [
84
- impressionMutation,
85
- {error: undefined, isLoading: false},
86
- ]),
87
- })),
88
- };
57
+ const refetch = mock(() => {});
58
+ const acknowledgeMutation = mock((_args: {announcementId: string}) => {});
59
+ const impressionMutation = mock((_args: {announcementId: string}) => {});
60
+ const clickMutation = mock((_args: {announcementId: string}) => {});
61
+ let pendingRequestCount = 0;
62
+
63
+ const fake = createFakeRequestClient({
64
+ "GET /announcements/feed": () =>
65
+ options.feedHandler ? options.feedHandler() : {data: options.feedItems ?? []},
66
+ "GET /announcements/pending": () => {
67
+ pendingRequestCount += 1;
68
+ if (pendingRequestCount > 1) {
69
+ refetch();
70
+ options.onRefetch?.();
71
+ }
72
+ return options.pendingHandler ? options.pendingHandler() : {data: getPending()};
73
+ },
74
+ "POST /announcements/:id/acknowledge": (_args, {id}) => {
75
+ acknowledgeMutation({announcementId: id});
76
+ return (options.acknowledgeUnwrap ?? (async () => ({acknowledged: true})))();
77
+ },
78
+ "POST /announcements/:id/click": (_args, {id}) => {
79
+ clickMutation({announcementId: id});
80
+ return (options.clickUnwrap ?? (async () => ({recorded: true})))();
81
+ },
82
+ "POST /announcements/:id/impression": (_args, {id}) => {
83
+ impressionMutation({announcementId: id});
84
+ return (options.impressionUnwrap ?? (async () => ({recorded: true})))();
85
+ },
86
+ });
89
87
 
90
88
  return {
91
89
  acknowledgeMutation,
92
- api: {
93
- enhanceEndpoints: mock(() => innerApi),
94
- },
90
+ api: fake.client,
91
+ calls: fake.calls,
95
92
  clickMutation,
96
93
  impressionMutation,
97
94
  refetch,
@@ -110,10 +107,13 @@ const announcementQueue: PendingAnnouncementsResponse[] = [
110
107
  {current: null, remainingCount: 0},
111
108
  ];
112
109
 
110
+ /** Let fake requests resolve and the async frequency check settle. */
113
111
  const waitForFrequencyCheck = async (): Promise<void> => {
114
- await act(async () => {
115
- await Promise.resolve();
116
- });
112
+ for (let i = 0; i < 3; i += 1) {
113
+ await act(async () => {
114
+ await new Promise((resolve) => setTimeout(resolve, 0));
115
+ });
116
+ }
117
117
  };
118
118
 
119
119
  const createNavigatorStorageMock = (): {
@@ -137,15 +137,16 @@ describe("AnnouncementNavigator", () => {
137
137
  Unifier.storage.setItem = storage.setItem;
138
138
  });
139
139
 
140
- it("renders children when no announcements are pending", () => {
140
+ it("renders children when no announcements are pending", async () => {
141
141
  const {api} = createMockApi({current: null, remainingCount: 0});
142
142
  const result = renderWithTheme(
143
- <AnnouncementNavigator api={api}>
143
+ <AnnouncementNavigator client={api}>
144
144
  <Box testID="app-content">
145
145
  <Text>App</Text>
146
146
  </Box>
147
147
  </AnnouncementNavigator>
148
148
  );
149
+ await waitForFrequencyCheck();
149
150
  expect(result.getByTestId("app-content")).toBeTruthy();
150
151
  });
151
152
 
@@ -155,7 +156,7 @@ describe("AnnouncementNavigator", () => {
155
156
  remainingCount: 0,
156
157
  });
157
158
  const result = renderWithTheme(
158
- <AnnouncementNavigator api={api}>
159
+ <AnnouncementNavigator client={api}>
159
160
  <Box testID="app-content">
160
161
  <Text>App</Text>
161
162
  </Box>
@@ -173,7 +174,7 @@ describe("AnnouncementNavigator", () => {
173
174
  remainingCount: 1,
174
175
  });
175
176
  const result = renderWithTheme(
176
- <AnnouncementNavigator api={api}>
177
+ <AnnouncementNavigator client={api}>
177
178
  <Box testID="app-content">
178
179
  <Text>App</Text>
179
180
  </Box>
@@ -190,15 +191,15 @@ describe("AnnouncementNavigator", () => {
190
191
  });
191
192
 
192
193
  it("shows the next announcement after refetch advances the queue", async () => {
194
+ let queueIndex = 0;
195
+ const {api} = createMockApi(() => announcementQueue[queueIndex], {
196
+ onRefetch: () => {
197
+ queueIndex = Math.min(queueIndex + 1, announcementQueue.length - 1);
198
+ },
199
+ });
193
200
  const QueueHarness: React.FC = () => {
194
- const [queueIndex, setQueueIndex] = useState(0);
195
- const refetch = useCallback(async (): Promise<void> => {
196
- setQueueIndex((currentIndex) => Math.min(currentIndex + 1, announcementQueue.length - 1));
197
- }, []);
198
- const {api} = createMockApi(() => announcementQueue[queueIndex], refetch);
199
-
200
201
  return (
201
- <AnnouncementNavigator api={api} frequency={{maxInterruptionsPerSession: 5}}>
202
+ <AnnouncementNavigator client={api} frequency={{maxInterruptionsPerSession: 5}}>
202
203
  <Box testID="app-content">
203
204
  <Text>App</Text>
204
205
  </Box>
@@ -220,42 +221,21 @@ describe("AnnouncementNavigator", () => {
220
221
  await act(async () => {
221
222
  fireEvent.press(result.getByText("Got it"));
222
223
  });
224
+ await waitForFrequencyCheck();
223
225
 
224
226
  expect(result.getByTestId("app-content")).toBeTruthy();
225
227
  expect(result.queryByTestId("announcement-screen")).toBeNull();
226
228
  });
227
229
 
228
230
  it("renders a loading spinner while pending announcements load", () => {
229
- const innerApi = {
230
- injectEndpoints: mock(() => ({
231
- useAcknowledgeAnnouncementMutation: mock(() => [
232
- mock(),
233
- {error: undefined, isLoading: false},
234
- ]),
235
- useGetAnnouncementFeedQuery: mock(() => ({
236
- data: undefined,
237
- error: undefined,
238
- isLoading: true,
239
- refetch: mock(() => Promise.resolve()),
240
- })),
241
- useGetPendingAnnouncementsQuery: mock(() => ({
242
- data: undefined,
243
- error: undefined,
244
- isLoading: true,
245
- refetch: mock(() => Promise.resolve()),
246
- })),
247
- useRecordAnnouncementClickMutation: mock(() => [
248
- mock(),
249
- {error: undefined, isLoading: false},
250
- ]),
251
- useRecordAnnouncementImpressionMutation: mock(() => [
252
- mock(),
253
- {error: undefined, isLoading: false},
254
- ]),
255
- })),
256
- };
231
+ const {api} = createMockApi(
232
+ {current: null, remainingCount: 0},
233
+ {
234
+ pendingHandler: () => new Promise(() => {}),
235
+ }
236
+ );
257
237
  const result = renderWithTheme(
258
- <AnnouncementNavigator api={{enhanceEndpoints: mock(() => innerApi)}}>
238
+ <AnnouncementNavigator client={api}>
259
239
  <Box testID="app-content">
260
240
  <Text>App</Text>
261
241
  </Box>
@@ -264,84 +244,57 @@ describe("AnnouncementNavigator", () => {
264
244
  expect(result.getByTestId("announcement-navigator-loading")).toBeTruthy();
265
245
  });
266
246
 
267
- it("shows retry UI for recoverable pending errors", () => {
268
- const refetch = mock(() => Promise.resolve());
269
- const innerApi = {
270
- injectEndpoints: mock(() => ({
271
- useAcknowledgeAnnouncementMutation: mock(() => [
272
- mock(),
273
- {error: undefined, isLoading: false},
274
- ]),
275
- useGetAnnouncementFeedQuery: mock(() => ({
276
- data: {data: []},
277
- error: undefined,
278
- isLoading: false,
279
- refetch,
280
- })),
281
- useGetPendingAnnouncementsQuery: mock(() => ({
282
- data: undefined,
283
- error: {status: 500},
284
- isLoading: false,
285
- refetch,
286
- })),
287
- useRecordAnnouncementClickMutation: mock(() => [
288
- mock(),
289
- {error: undefined, isLoading: false},
290
- ]),
291
- useRecordAnnouncementImpressionMutation: mock(() => [
292
- mock(),
293
- {error: undefined, isLoading: false},
294
- ]),
295
- })),
296
- };
297
- const onError = mock(() => undefined);
247
+ it("shows retry UI for recoverable pending errors", async () => {
248
+ let shouldFail = true;
249
+ const {api, refetch} = createMockApi(
250
+ {current: null, remainingCount: 0},
251
+ {
252
+ pendingHandler: () => {
253
+ if (shouldFail) {
254
+ throw fakeHttpError(500);
255
+ }
256
+ return {current: null, remainingCount: 0};
257
+ },
258
+ }
259
+ );
260
+ const onError = mock((_error: unknown) => undefined);
298
261
  const result = renderWithTheme(
299
- <AnnouncementNavigator api={{enhanceEndpoints: mock(() => innerApi)}} onError={onError}>
262
+ <AnnouncementNavigator client={api} onError={onError}>
300
263
  <Box testID="app-content">
301
264
  <Text>App</Text>
302
265
  </Box>
303
266
  </AnnouncementNavigator>
304
267
  );
268
+ await waitForFrequencyCheck();
305
269
  expect(result.getByTestId("announcement-navigator-error")).toBeTruthy();
306
270
  expect(onError).toHaveBeenCalled();
271
+
272
+ shouldFail = false;
273
+ await act(async () => {
274
+ fireEvent.press(result.getByText("Retry"));
275
+ });
276
+ await waitForFrequencyCheck();
277
+ expect(refetch).toHaveBeenCalledTimes(1);
278
+ expect(result.getByTestId("app-content")).toBeTruthy();
307
279
  });
308
280
 
309
- it("renders children when only the feed request fails", () => {
310
- const innerApi = {
311
- injectEndpoints: mock(() => ({
312
- useAcknowledgeAnnouncementMutation: mock(() => [
313
- mock(),
314
- {error: undefined, isLoading: false},
315
- ]),
316
- useGetAnnouncementFeedQuery: mock(() => ({
317
- data: undefined,
318
- error: {status: 500},
319
- isLoading: false,
320
- refetch: mock(() => Promise.resolve()),
321
- })),
322
- useGetPendingAnnouncementsQuery: mock(() => ({
323
- data: {data: {current: null, remainingCount: 0}},
324
- error: undefined,
325
- isLoading: false,
326
- refetch: mock(() => Promise.resolve()),
327
- })),
328
- useRecordAnnouncementClickMutation: mock(() => [
329
- mock(),
330
- {error: undefined, isLoading: false},
331
- ]),
332
- useRecordAnnouncementImpressionMutation: mock(() => [
333
- mock(),
334
- {error: undefined, isLoading: false},
335
- ]),
336
- })),
337
- };
281
+ it("renders children when only the feed request fails", async () => {
282
+ const {api} = createMockApi(
283
+ {current: null, remainingCount: 0},
284
+ {
285
+ feedHandler: () => {
286
+ throw fakeHttpError(500);
287
+ },
288
+ }
289
+ );
338
290
  const result = renderWithTheme(
339
- <AnnouncementNavigator api={{enhanceEndpoints: mock(() => innerApi)}}>
291
+ <AnnouncementNavigator client={api}>
340
292
  <Box testID="app-content">
341
293
  <Text>App</Text>
342
294
  </Box>
343
295
  </AnnouncementNavigator>
344
296
  );
297
+ await waitForFrequencyCheck();
345
298
  expect(result.getByTestId("app-content")).toBeTruthy();
346
299
  expect(result.queryByTestId("announcement-navigator-error")).toBeNull();
347
300
  });
@@ -352,7 +305,7 @@ describe("AnnouncementNavigator", () => {
352
305
  remainingCount: 0,
353
306
  });
354
307
  const result = renderWithTheme(
355
- <AnnouncementNavigator api={api}>
308
+ <AnnouncementNavigator client={api}>
356
309
  <Box testID="app-content">
357
310
  <Text>App</Text>
358
311
  </Box>
@@ -372,18 +325,18 @@ describe("AnnouncementNavigator", () => {
372
325
  return <TextField onChange={setValue} testID="todo-input" title="New Todo" value={value} />;
373
326
  };
374
327
 
328
+ let pending: PendingAnnouncementsResponse = {
329
+ current: makeAnnouncement({displayMode: "banner", requiresAcknowledgement: false}),
330
+ remainingCount: 0,
331
+ };
332
+ const {api} = createMockApi(() => pending, {
333
+ onRefetch: () => {
334
+ pending = {current: null, remainingCount: 0};
335
+ },
336
+ });
375
337
  const BannerDismissHarness: React.FC = () => {
376
- const [pending, setPending] = useState<PendingAnnouncementsResponse>({
377
- current: makeAnnouncement({displayMode: "banner", requiresAcknowledgement: false}),
378
- remainingCount: 0,
379
- });
380
- const refetch = useCallback(async (): Promise<void> => {
381
- setPending({current: null, remainingCount: 0});
382
- }, []);
383
- const {api} = createMockApi(pending, refetch);
384
-
385
338
  return (
386
- <AnnouncementNavigator api={api} frequency={{maxInterruptionsPerSession: 5}}>
339
+ <AnnouncementNavigator client={api} frequency={{maxInterruptionsPerSession: 5}}>
387
340
  <Box testID="app-content">
388
341
  <StatefulInput />
389
342
  </Box>
@@ -402,25 +355,26 @@ describe("AnnouncementNavigator", () => {
402
355
 
403
356
  await act(async () => {
404
357
  fireEvent.press(result.getByText("Dismiss"));
405
- await Promise.resolve();
406
358
  });
359
+ await waitForFrequencyCheck();
407
360
 
408
361
  expect(result.queryByTestId("announcement-banner")).toBeNull();
409
362
  expect(result.getByTestId("todo-input").props.value).toBe("unsaved text");
410
363
  });
411
364
 
412
- it("ignores unexpected feed displayMode items in pending.current", () => {
365
+ it("ignores unexpected feed displayMode items in pending.current", async () => {
413
366
  const {api} = createMockApi({
414
367
  current: makeAnnouncement({displayMode: "feed"}),
415
368
  remainingCount: 0,
416
369
  });
417
370
  const result = renderWithTheme(
418
- <AnnouncementNavigator api={api}>
371
+ <AnnouncementNavigator client={api}>
419
372
  <Box testID="app-content">
420
373
  <Text>App</Text>
421
374
  </Box>
422
375
  </AnnouncementNavigator>
423
376
  );
377
+ await waitForFrequencyCheck();
424
378
 
425
379
  expect(result.getByTestId("app-content")).toBeTruthy();
426
380
  assert.isNull(result.queryByTestId("announcement-banner"));
@@ -428,15 +382,15 @@ describe("AnnouncementNavigator", () => {
428
382
  });
429
383
 
430
384
  it("does not show a second interrupt in the same session when maxInterruptionsPerSession is 1", async () => {
385
+ let queueIndex = 0;
386
+ const {api} = createMockApi(() => announcementQueue[queueIndex], {
387
+ onRefetch: () => {
388
+ queueIndex = Math.min(queueIndex + 1, announcementQueue.length - 1);
389
+ },
390
+ });
431
391
  const QueueHarness: React.FC = () => {
432
- const [queueIndex, setQueueIndex] = useState(0);
433
- const refetch = useCallback(async (): Promise<void> => {
434
- setQueueIndex((currentIndex) => Math.min(currentIndex + 1, announcementQueue.length - 1));
435
- }, []);
436
- const {api} = createMockApi(() => announcementQueue[queueIndex], refetch);
437
-
438
392
  return (
439
- <AnnouncementNavigator api={api}>
393
+ <AnnouncementNavigator client={api}>
440
394
  <Box testID="app-content">
441
395
  <Text>App</Text>
442
396
  </Box>
@@ -467,7 +421,7 @@ describe("AnnouncementNavigator", () => {
467
421
  });
468
422
 
469
423
  return (
470
- <AnnouncementNavigator api={api}>
424
+ <AnnouncementNavigator client={api}>
471
425
  <Box testID="app-content">
472
426
  <Text>App</Text>
473
427
  </Box>
@@ -476,9 +430,7 @@ describe("AnnouncementNavigator", () => {
476
430
  };
477
431
 
478
432
  const firstSession = renderWithTheme(<FirstSessionHarness />);
479
- await act(async () => {
480
- await Promise.resolve();
481
- });
433
+ await waitForFrequencyCheck();
482
434
  expect(firstSession.getByText("First update")).toBeTruthy();
483
435
  firstSession.unmount();
484
436
  resetFrequencySessionStateForTests();
@@ -490,7 +442,7 @@ describe("AnnouncementNavigator", () => {
490
442
  });
491
443
 
492
444
  return (
493
- <AnnouncementNavigator api={api}>
445
+ <AnnouncementNavigator client={api}>
494
446
  <Box testID="app-content">
495
447
  <Text>App</Text>
496
448
  </Box>
@@ -499,9 +451,7 @@ describe("AnnouncementNavigator", () => {
499
451
  };
500
452
 
501
453
  const secondSession = renderWithTheme(<SecondSessionHarness />);
502
- await act(async () => {
503
- await Promise.resolve();
504
- });
454
+ await waitForFrequencyCheck();
505
455
 
506
456
  expect(secondSession.getByText("Second update")).toBeTruthy();
507
457
  });
@@ -512,7 +462,7 @@ describe("AnnouncementNavigator", () => {
512
462
  remainingCount: 0,
513
463
  });
514
464
  const result = renderWithTheme(
515
- <AnnouncementNavigator api={api} frequency={{maxInterruptionsPerSession: 5}}>
465
+ <AnnouncementNavigator client={api} frequency={{maxInterruptionsPerSession: 5}}>
516
466
  <Box testID="app-content">
517
467
  <Text>App</Text>
518
468
  </Box>
@@ -524,7 +474,7 @@ describe("AnnouncementNavigator", () => {
524
474
  assert.isNull(result.queryByTestId("app-content"));
525
475
 
526
476
  result.rerender(
527
- <AnnouncementNavigator api={api} frequency={{maxInterruptionsPerSession: 5}}>
477
+ <AnnouncementNavigator client={api} frequency={{maxInterruptionsPerSession: 5}}>
528
478
  <Box testID="app-content">
529
479
  <Text>App</Text>
530
480
  </Box>
@@ -541,16 +491,14 @@ describe("AnnouncementNavigator", () => {
541
491
  remainingCount: 0,
542
492
  });
543
493
  const result = renderWithTheme(
544
- <AnnouncementNavigator api={api} frequency={{skipFirstLaunch: true, userId: "user-1"}}>
494
+ <AnnouncementNavigator client={api} frequency={{skipFirstLaunch: true, userId: "user-1"}}>
545
495
  <Box testID="app-content">
546
496
  <Text>App</Text>
547
497
  </Box>
548
498
  </AnnouncementNavigator>
549
499
  );
550
500
 
551
- await act(async () => {
552
- await Promise.resolve();
553
- });
501
+ await waitForFrequencyCheck();
554
502
 
555
503
  expect(result.getByTestId("app-content")).toBeTruthy();
556
504
  assert.isNull(result.queryByTestId("announcement-screen"));
@@ -572,16 +520,14 @@ describe("AnnouncementNavigator", () => {
572
520
  remainingCount: 0,
573
521
  });
574
522
  const result = renderWithTheme(
575
- <AnnouncementNavigator api={api} frequency={{cooldownHours: 24}}>
523
+ <AnnouncementNavigator client={api} frequency={{cooldownHours: 24}}>
576
524
  <Box testID="app-content">
577
525
  <Text>App</Text>
578
526
  </Box>
579
527
  </AnnouncementNavigator>
580
528
  );
581
529
 
582
- await act(async () => {
583
- await Promise.resolve();
584
- });
530
+ await waitForFrequencyCheck();
585
531
 
586
532
  expect(result.getByTestId("app-content")).toBeTruthy();
587
533
  assert.isNull(result.queryByTestId("announcement-screen"));
@@ -599,14 +545,13 @@ describe("AnnouncementNavigator", () => {
599
545
  current: makeAnnouncement({title: "Blocked interrupt"}),
600
546
  remainingCount: 0,
601
547
  },
602
- undefined,
603
- [feedItem]
548
+ {feedItems: [feedItem]}
604
549
  );
605
550
 
606
551
  const FeedHarness: React.FC = () => {
607
552
  const {feed} = useAnnouncements(api);
608
553
  return (
609
- <AnnouncementNavigator api={api} frequency={{maxInterruptionsPerSession: 0}}>
554
+ <AnnouncementNavigator client={api} frequency={{maxInterruptionsPerSession: 0}}>
610
555
  <Box testID="app-content">
611
556
  <Text testID="feed-title">{feed[0]?.title ?? "missing"}</Text>
612
557
  </Box>
@@ -615,9 +560,7 @@ describe("AnnouncementNavigator", () => {
615
560
  };
616
561
 
617
562
  const result = renderWithTheme(<FeedHarness />);
618
- await act(async () => {
619
- await Promise.resolve();
620
- });
563
+ await waitForFrequencyCheck();
621
564
 
622
565
  expect(result.getByTestId("feed-title")).toHaveTextContent("Changelog entry");
623
566
  expect(result.getByTestId("app-content")).toBeTruthy();
@@ -637,16 +580,14 @@ describe("AnnouncementNavigator", () => {
637
580
  remainingCount: 0,
638
581
  });
639
582
  const result = renderWithTheme(
640
- <AnnouncementNavigator api={api} frequency={{cooldownHours: 12, skipFirstLaunch: true}}>
583
+ <AnnouncementNavigator client={api} frequency={{cooldownHours: 12, skipFirstLaunch: true}}>
641
584
  <Box testID="app-content">
642
585
  <Text>App</Text>
643
586
  </Box>
644
587
  </AnnouncementNavigator>
645
588
  );
646
589
 
647
- await act(async () => {
648
- await Promise.resolve();
649
- });
590
+ await waitForFrequencyCheck();
650
591
 
651
592
  expect(result.getByTestId("announcement-screen")).toBeTruthy();
652
593
  expect(impressionMutation).toHaveBeenCalledTimes(1);
@@ -658,7 +599,7 @@ describe("AnnouncementNavigator", () => {
658
599
  remainingCount: 0,
659
600
  });
660
601
  const result = renderWithTheme(
661
- <AnnouncementNavigator api={api}>
602
+ <AnnouncementNavigator client={api}>
662
603
  <Box testID="app-content">
663
604
  <Text>App</Text>
664
605
  </Box>
@@ -684,7 +625,7 @@ describe("AnnouncementNavigator", () => {
684
625
  remainingCount: 0,
685
626
  });
686
627
  const result = renderWithTheme(
687
- <AnnouncementNavigator api={api}>
628
+ <AnnouncementNavigator client={api}>
688
629
  <Box testID="app-content">
689
630
  <Text>App</Text>
690
631
  </Box>
@@ -702,7 +643,7 @@ describe("AnnouncementNavigator", () => {
702
643
  });
703
644
 
704
645
  it("still opens the primary action URL when click tracking fails", async () => {
705
- const warnSpy = mock(() => undefined);
646
+ const warnSpy = mock((..._args: unknown[]) => undefined);
706
647
  const originalWarn = console.warn;
707
648
  console.warn = warnSpy;
708
649
 
@@ -717,15 +658,15 @@ describe("AnnouncementNavigator", () => {
717
658
  }),
718
659
  remainingCount: 0,
719
660
  },
720
- undefined,
721
- [],
722
- async () => {
723
- throw new Error("click failed");
661
+ {
662
+ clickUnwrap: async () => {
663
+ throw new Error("click failed");
664
+ },
724
665
  }
725
666
  );
726
667
 
727
668
  const result = renderWithTheme(
728
- <AnnouncementNavigator api={api}>
669
+ <AnnouncementNavigator client={api}>
729
670
  <Box testID="app-content">
730
671
  <Text>App</Text>
731
672
  </Box>
@@ -745,43 +686,24 @@ describe("AnnouncementNavigator", () => {
745
686
  console.warn = originalWarn;
746
687
  });
747
688
 
748
- it("renders children when the pending request is unauthorized", () => {
749
- const innerApi = {
750
- injectEndpoints: mock(() => ({
751
- useAcknowledgeAnnouncementMutation: mock(() => [
752
- mock(),
753
- {error: undefined, isLoading: false},
754
- ]),
755
- useGetAnnouncementFeedQuery: mock(() => ({
756
- data: {data: []},
757
- error: undefined,
758
- isLoading: false,
759
- refetch: mock(() => Promise.resolve()),
760
- })),
761
- useGetPendingAnnouncementsQuery: mock(() => ({
762
- data: undefined,
763
- error: {status: 401},
764
- isLoading: false,
765
- refetch: mock(() => Promise.resolve()),
766
- })),
767
- useRecordAnnouncementClickMutation: mock(() => [
768
- mock(),
769
- {error: undefined, isLoading: false},
770
- ]),
771
- useRecordAnnouncementImpressionMutation: mock(() => [
772
- mock(),
773
- {error: undefined, isLoading: false},
774
- ]),
775
- })),
776
- };
777
- const onError = mock(() => undefined);
689
+ it("renders children when the pending request is unauthorized", async () => {
690
+ const {api} = createMockApi(
691
+ {current: null, remainingCount: 0},
692
+ {
693
+ pendingHandler: () => {
694
+ throw fakeHttpError(401);
695
+ },
696
+ }
697
+ );
698
+ const onError = mock((_error: unknown) => undefined);
778
699
  const result = renderWithTheme(
779
- <AnnouncementNavigator api={{enhanceEndpoints: mock(() => innerApi)}} onError={onError}>
700
+ <AnnouncementNavigator client={api} onError={onError}>
780
701
  <Box testID="app-content">
781
702
  <Text>App</Text>
782
703
  </Box>
783
704
  </AnnouncementNavigator>
784
705
  );
706
+ await waitForFrequencyCheck();
785
707
 
786
708
  expect(result.getByTestId("app-content")).toBeTruthy();
787
709
  assert.isNull(result.queryByTestId("announcement-navigator-error"));
@@ -794,9 +716,6 @@ describe("AnnouncementNavigator", () => {
794
716
  current: makeAnnouncement(),
795
717
  remainingCount: 0,
796
718
  },
797
- undefined,
798
- [],
799
- undefined,
800
719
  {
801
720
  acknowledgeUnwrap: async () => {
802
721
  throw new Error("ack failed");
@@ -805,7 +724,7 @@ describe("AnnouncementNavigator", () => {
805
724
  );
806
725
  const onError = mock((_error: unknown) => undefined);
807
726
  const result = renderWithTheme(
808
- <AnnouncementNavigator api={api} onError={onError}>
727
+ <AnnouncementNavigator client={api} onError={onError}>
809
728
  <Box testID="app-content">
810
729
  <Text>App</Text>
811
730
  </Box>
@@ -829,9 +748,6 @@ describe("AnnouncementNavigator", () => {
829
748
  current: makeAnnouncement({title: "Impression failure"}),
830
749
  remainingCount: 0,
831
750
  },
832
- undefined,
833
- [],
834
- undefined,
835
751
  {
836
752
  impressionUnwrap: async () => {
837
753
  throw new Error("impression failed");
@@ -841,7 +757,7 @@ describe("AnnouncementNavigator", () => {
841
757
 
842
758
  try {
843
759
  const result = renderWithTheme(
844
- <AnnouncementNavigator api={api}>
760
+ <AnnouncementNavigator client={api}>
845
761
  <Box testID="app-content">
846
762
  <Text>App</Text>
847
763
  </Box>
@@ -874,7 +790,7 @@ describe("AnnouncementNavigator", () => {
874
790
 
875
791
  try {
876
792
  const result = renderWithTheme(
877
- <AnnouncementNavigator api={api}>
793
+ <AnnouncementNavigator client={api}>
878
794
  <Box testID="app-content">
879
795
  <Text>App</Text>
880
796
  </Box>
@@ -917,7 +833,7 @@ describe("AnnouncementNavigator", () => {
917
833
 
918
834
  try {
919
835
  const result = renderWithTheme(
920
- <AnnouncementNavigator api={api}>
836
+ <AnnouncementNavigator client={api}>
921
837
  <Box testID="app-content">
922
838
  <Text>App</Text>
923
839
  </Box>
@@ -946,7 +862,7 @@ describe("AnnouncementNavigator", () => {
946
862
  remainingCount: 0,
947
863
  });
948
864
  const result = renderWithTheme(
949
- <AnnouncementNavigator api={api}>
865
+ <AnnouncementNavigator client={api}>
950
866
  <Box testID="app-content">
951
867
  <Text>App</Text>
952
868
  </Box>
@@ -961,55 +877,47 @@ describe("AnnouncementNavigator", () => {
961
877
  assert.strictEqual(clickMutation.mock.calls.length, 0);
962
878
  });
963
879
 
964
- it("renders children without calling onError when pending fails with 401", () => {
965
- const refetch = mock(() => Promise.resolve());
966
- const innerApi = {
967
- injectEndpoints: mock(() => ({
968
- useAcknowledgeAnnouncementMutation: mock(() => [
969
- mock(),
970
- {error: undefined, isLoading: false},
971
- ]),
972
- useGetAnnouncementFeedQuery: mock(() => ({
973
- data: {data: []},
974
- error: undefined,
975
- isLoading: false,
976
- refetch,
977
- })),
978
- useGetPendingAnnouncementsQuery: mock(() => ({
979
- data: undefined,
980
- error: {status: 401},
981
- isLoading: false,
982
- refetch,
983
- })),
984
- useRecordAnnouncementClickMutation: mock(() => [
985
- mock(),
986
- {error: undefined, isLoading: false},
987
- ]),
988
- useRecordAnnouncementImpressionMutation: mock(() => [
989
- mock(),
990
- {error: undefined, isLoading: false},
991
- ]),
992
- })),
993
- };
994
- const onError = mock(() => undefined);
880
+ it("renders children without calling onError when pending fails with 403", async () => {
881
+ const {api} = createMockApi(
882
+ {current: null, remainingCount: 0},
883
+ {
884
+ pendingHandler: () => {
885
+ throw fakeHttpError(403);
886
+ },
887
+ }
888
+ );
889
+ const onError = mock((_error: unknown) => undefined);
995
890
  const result = renderWithTheme(
996
- <AnnouncementNavigator api={{enhanceEndpoints: mock(() => innerApi)}} onError={onError}>
891
+ <AnnouncementNavigator client={api} onError={onError}>
997
892
  <Box testID="app-content">
998
893
  <Text>App</Text>
999
894
  </Box>
1000
895
  </AnnouncementNavigator>
1001
896
  );
897
+ await waitForFrequencyCheck();
898
+
1002
899
  expect(result.getByTestId("app-content")).toBeTruthy();
1003
- expect(result.queryByTestId("announcement-navigator-error")).toBeNull();
900
+ assert.isNull(result.queryByTestId("announcement-navigator-error"));
1004
901
  expect(onError).not.toHaveBeenCalled();
1005
902
  });
1006
903
 
1007
- it("reports acknowledge failures through onError", async () => {
1008
- const refetch = mock(() => Promise.reject(new Error("refetch failed")));
1009
- const {api} = createMockApi({current: makeAnnouncement(), remainingCount: 0}, refetch);
904
+ it("reports a failed post-acknowledge refetch through onError", async () => {
905
+ let pendingRequests = 0;
906
+ const {api, acknowledgeMutation} = createMockApi(
907
+ {current: null, remainingCount: 0},
908
+ {
909
+ pendingHandler: () => {
910
+ pendingRequests += 1;
911
+ if (pendingRequests > 1) {
912
+ throw new Error("refetch failed");
913
+ }
914
+ return {current: makeAnnouncement(), remainingCount: 0};
915
+ },
916
+ }
917
+ );
1010
918
  const onError = mock((_error: unknown) => undefined);
1011
919
  const result = renderWithTheme(
1012
- <AnnouncementNavigator api={api} onError={onError}>
920
+ <AnnouncementNavigator client={api} onError={onError}>
1013
921
  <Box testID="app-content">
1014
922
  <Text>App</Text>
1015
923
  </Box>
@@ -1019,11 +927,12 @@ describe("AnnouncementNavigator", () => {
1019
927
  await waitForFrequencyCheck();
1020
928
  await act(async () => {
1021
929
  fireEvent.press(result.getByText("Got it"));
1022
- await Promise.resolve();
1023
930
  });
931
+ await waitForFrequencyCheck();
1024
932
 
1025
- assert.strictEqual(onError.mock.calls.length, 1);
1026
- assert.instanceOf(onError.mock.calls[0][0], Error);
933
+ expect(acknowledgeMutation).toHaveBeenCalledTimes(1);
934
+ expect(result.getByTestId("announcement-navigator-error")).toBeTruthy();
935
+ assert.isAtLeast(onError.mock.calls.length, 1);
1027
936
  assert.strictEqual((onError.mock.calls[0][0] as Error).message, "refetch failed");
1028
937
  });
1029
938
 
@@ -1034,9 +943,6 @@ describe("AnnouncementNavigator", () => {
1034
943
 
1035
944
  const {api, impressionMutation} = createMockApi(
1036
945
  {current: makeAnnouncement(), remainingCount: 0},
1037
- undefined,
1038
- [],
1039
- undefined,
1040
946
  {
1041
947
  impressionUnwrap: async () => {
1042
948
  throw new Error("impression failed");
@@ -1046,16 +952,14 @@ describe("AnnouncementNavigator", () => {
1046
952
 
1047
953
  try {
1048
954
  const result = renderWithTheme(
1049
- <AnnouncementNavigator api={api}>
955
+ <AnnouncementNavigator client={api}>
1050
956
  <Box testID="app-content">
1051
957
  <Text>App</Text>
1052
958
  </Box>
1053
959
  </AnnouncementNavigator>
1054
960
  );
1055
961
  await waitForFrequencyCheck();
1056
- await act(async () => {
1057
- await Promise.resolve();
1058
- });
962
+ await waitForFrequencyCheck();
1059
963
 
1060
964
  expect(result.getByTestId("announcement-screen")).toBeTruthy();
1061
965
  expect(impressionMutation).toHaveBeenCalledTimes(1);
@@ -1084,7 +988,7 @@ describe("AnnouncementNavigator", () => {
1084
988
 
1085
989
  try {
1086
990
  const result = renderWithTheme(
1087
- <AnnouncementNavigator api={api}>
991
+ <AnnouncementNavigator client={api}>
1088
992
  <Box testID="app-content">
1089
993
  <Text>App</Text>
1090
994
  </Box>
@@ -1133,16 +1037,14 @@ describe("AnnouncementNavigator", () => {
1133
1037
 
1134
1038
  try {
1135
1039
  const result = renderWithTheme(
1136
- <AnnouncementNavigator api={api} frequency={{skipFirstLaunch: true}}>
1040
+ <AnnouncementNavigator client={api} frequency={{skipFirstLaunch: true}}>
1137
1041
  <Box testID="app-content">
1138
1042
  <Text>App</Text>
1139
1043
  </Box>
1140
1044
  </AnnouncementNavigator>
1141
1045
  );
1142
1046
 
1143
- await act(async () => {
1144
- await Promise.resolve();
1145
- });
1047
+ await waitForFrequencyCheck();
1146
1048
 
1147
1049
  expect(result.getByTestId("announcement-screen")).toBeTruthy();
1148
1050
  expect(impressionMutation).toHaveBeenCalledTimes(1);
@@ -1180,7 +1082,7 @@ describe("AnnouncementNavigator", () => {
1180
1082
 
1181
1083
  try {
1182
1084
  const result = renderWithTheme(
1183
- <AnnouncementNavigator api={api}>
1085
+ <AnnouncementNavigator client={api}>
1184
1086
  <Box testID="app-content">
1185
1087
  <Text>App</Text>
1186
1088
  </Box>
@@ -1188,9 +1090,7 @@ describe("AnnouncementNavigator", () => {
1188
1090
  );
1189
1091
 
1190
1092
  await waitForFrequencyCheck();
1191
- await act(async () => {
1192
- await Promise.resolve();
1193
- });
1093
+ await waitForFrequencyCheck();
1194
1094
 
1195
1095
  expect(result.getByTestId("announcement-screen")).toBeTruthy();
1196
1096
  const navigatorWarnings = warnCalls.filter(