@planningcenter/chat-react-native 4.8.0-qa-staging.10 → 4.8.0-qa-staging.12

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 (27) hide show
  1. package/build/components/conversations/conversation_actions.d.ts.map +1 -1
  2. package/build/components/conversations/conversation_actions.js +83 -47
  3. package/build/components/conversations/conversation_actions.js.map +1 -1
  4. package/build/components/conversations/swipeable_toggle_button.d.ts +5 -1
  5. package/build/components/conversations/swipeable_toggle_button.d.ts.map +1 -1
  6. package/build/components/conversations/swipeable_toggle_button.js +96 -67
  7. package/build/components/conversations/swipeable_toggle_button.js.map +1 -1
  8. package/build/contexts/chat_context.d.ts +2 -2
  9. package/build/contexts/chat_context.d.ts.map +1 -1
  10. package/build/contexts/chat_context.js.map +1 -1
  11. package/build/contexts/session_context.d.ts +1 -1
  12. package/build/contexts/session_context.d.ts.map +1 -1
  13. package/build/contexts/session_context.js +143 -338
  14. package/build/contexts/session_context.js.map +1 -1
  15. package/build/utils/client/client.d.ts +9 -5
  16. package/build/utils/client/client.d.ts.map +1 -1
  17. package/build/utils/client/client.js +95 -78
  18. package/build/utils/client/client.js.map +1 -1
  19. package/package.json +3 -3
  20. package/src/__tests__/contexts/session_context.tsx +46 -0
  21. package/src/__tests__/utils/client.ts +36 -0
  22. package/src/components/conversations/__tests__/conversation_actions.test.tsx +5 -2
  23. package/src/components/conversations/conversation_actions.tsx +47 -31
  24. package/src/components/conversations/swipeable_toggle_button.tsx +45 -16
  25. package/src/contexts/chat_context.tsx +2 -2
  26. package/src/contexts/session_context.tsx +19 -14
  27. package/src/utils/client/client.ts +95 -52
@@ -1,15 +1,17 @@
1
- import { ApiCollection, ApiResource, FailedResponse } from '../../types';
1
+ import { ApiCollection, ApiResource, FailedResponse, OAuthToken } from '../../types';
2
2
  import { DeleteRequest, GetRequest, PatchRequest, PostRequest } from './types';
3
- export type OnUnauthorizedResponse = (_response: FailedResponse) => void;
3
+ type RefreshedToken = Pick<OAuthToken, 'access_token'>;
4
+ type Headers = Record<string, string>;
5
+ export type OnUnauthorizedResponse = (_response: FailedResponse) => void | Promise<RefreshedToken | void>;
4
6
  type ClientArgs = {
5
7
  version: string;
6
- defaultHeaders?: Record<string, string>;
8
+ defaultHeaders?: Headers;
7
9
  onUnauthorizedResponse?: OnUnauthorizedResponse;
8
10
  root?: string;
9
11
  };
10
12
  export declare class Client {
11
13
  version: string;
12
- defaultHeaders: Record<string, string>;
14
+ defaultHeaders: Headers;
13
15
  onUnauthorizedResponse?: OnUnauthorizedResponse;
14
16
  root?: string;
15
17
  constructor({ version, defaultHeaders, onUnauthorizedResponse, root }: ClientArgs);
@@ -17,7 +19,9 @@ export declare class Client {
17
19
  patch<T extends ApiCollection | ApiResource>(args: PatchRequest): Promise<T>;
18
20
  post<T extends ApiCollection | ApiResource>(args: PostRequest): Promise<T>;
19
21
  delete(args: DeleteRequest): Promise<any>;
20
- handleNotOk: (response: Response | Error) => Promise<never>;
22
+ private send;
23
+ handleNotOk: <T = never>(response: Response | Error, retry?: (_token: RefreshedToken) => Promise<T>) => Promise<T>;
24
+ private refreshedTokenFor;
21
25
  parseErrorResponse: (response: Response) => Promise<Partial<FailedResponse>>;
22
26
  appUrl(url: string): string;
23
27
  get headers(): {
@@ -1 +1 @@
1
- {"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/utils/client/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AAUxE,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,YAAY,EAAE,WAAW,EAAe,MAAM,SAAS,CAAA;AAE3F,MAAM,MAAM,sBAAsB,GAAG,CAAC,SAAS,EAAE,cAAc,KAAK,IAAI,CAAA;AAExE,KAAK,UAAU,GAAG;IAChB,OAAO,EAAE,MAAM,CAAA;IACf,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACvC,sBAAsB,CAAC,EAAE,sBAAsB,CAAA;IAC/C,IAAI,CAAC,EAAE,MAAM,CAAA;CACd,CAAA;AAED,qBAAa,MAAM;IACjB,OAAO,EAAE,MAAM,CAAK;IACpB,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAK;IAC3C,sBAAsB,CAAC,EAAE,sBAAsB,CAAA;IAC/C,IAAI,CAAC,EAAE,MAAM,CAAA;gBAED,EAAE,OAAO,EAAE,cAAmB,EAAE,sBAAsB,EAAE,IAAI,EAAE,EAAE,UAAU;IAOhF,GAAG,CAAC,CAAC,SAAS,aAAa,GAAG,WAAW,EAAE,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,CAAC,CAAC;IA2CxE,KAAK,CAAC,CAAC,SAAS,aAAa,GAAG,WAAW,EAAE,IAAI,EAAE,YAAY,GAAG,OAAO,CAAC,CAAC,CAAC;IAW5E,IAAI,CAAC,CAAC,SAAS,aAAa,GAAG,WAAW,EAAE,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,CAAC,CAAC;IAW1E,MAAM,CAAC,IAAI,EAAE,aAAa;IAShC,WAAW,GAAU,UAAU,QAAQ,GAAG,KAAK,oBAY9C;IAED,kBAAkB,GAAU,UAAU,QAAQ,KAAG,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,CAMhF;IAED,MAAM,CAAC,GAAG,EAAE,MAAM;IAIlB,IAAI,OAAO;;;;MAOV;CACF;AAED,eAAe,MAAM,CAAA"}
1
+ {"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/utils/client/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAUpF,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,YAAY,EAAE,WAAW,EAAe,MAAM,SAAS,CAAA;AAE3F,KAAK,cAAc,GAAG,IAAI,CAAC,UAAU,EAAE,cAAc,CAAC,CAAA;AACtD,KAAK,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;AAErC,MAAM,MAAM,sBAAsB,GAAG,CACnC,SAAS,EAAE,cAAc,KACtB,IAAI,GAAG,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC,CAAA;AAE1C,KAAK,UAAU,GAAG;IAChB,OAAO,EAAE,MAAM,CAAA;IACf,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,sBAAsB,CAAC,EAAE,sBAAsB,CAAA;IAC/C,IAAI,CAAC,EAAE,MAAM,CAAA;CACd,CAAA;AAED,qBAAa,MAAM;IACjB,OAAO,EAAE,MAAM,CAAK;IACpB,cAAc,EAAE,OAAO,CAAK;IAC5B,sBAAsB,CAAC,EAAE,sBAAsB,CAAA;IAC/C,IAAI,CAAC,EAAE,MAAM,CAAA;gBAED,EAAE,OAAO,EAAE,cAAmB,EAAE,sBAAsB,EAAE,IAAI,EAAE,EAAE,UAAU;IAOhF,GAAG,CAAC,CAAC,SAAS,aAAa,GAAG,WAAW,EAAE,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,CAAC,CAAC;IA6CxE,KAAK,CAAC,CAAC,SAAS,aAAa,GAAG,WAAW,EAAE,IAAI,EAAE,YAAY,GAAG,OAAO,CAAC,CAAC,CAAC;IAa5E,IAAI,CAAC,CAAC,SAAS,aAAa,GAAG,WAAW,EAAE,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,CAAC,CAAC;IAmB1E,MAAM,CAAC,IAAI,EAAE,aAAa;IAShC,OAAO,CAAC,IAAI;IAUZ,WAAW,GAAU,CAAC,GAAG,KAAK,EAC5B,UAAU,QAAQ,GAAG,KAAK,EAC1B,QAAQ,CAAC,MAAM,EAAE,cAAc,KAAK,OAAO,CAAC,CAAC,CAAC,KAC7C,OAAO,CAAC,CAAC,CAAC,CAcZ;IAED,OAAO,CAAC,iBAAiB,CASxB;IAED,kBAAkB,GAAU,UAAU,QAAQ,KAAG,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,CAMhF;IAED,MAAM,CAAC,GAAG,EAAE,MAAM;IAIlB,IAAI,OAAO;;;;MAOV;CACF;AAED,eAAe,MAAM,CAAA"}
@@ -20,111 +20,128 @@ export class Client {
20
20
  ...data
21
21
  } = args.data;
22
22
  const isWalking = Boolean(walk);
23
- const headers = {
24
- ...this.headers,
25
- ...args.headers
26
- };
27
23
  const url = this.appUrl(args.url);
28
24
  await throwErrorIfQueryParams(url);
29
- const requestArgs = {
30
- data,
31
- url,
32
- action: 'GET',
33
- headers
34
- };
35
- const walkRequest = ({
36
- url: requestUrl,
37
- data: d = {
38
- fields: {}
39
- },
40
- acc = {
41
- data: [],
42
- included: [],
43
- meta: {},
44
- links: {}
45
- },
46
- ...options
47
- }) => {
48
- return makeRequest({
25
+ return this.send(headers => {
26
+ const requestArgs = {
27
+ data,
28
+ url,
49
29
  action: 'GET',
50
- data: d,
51
- url: requestUrl,
52
- ...options,
53
30
  headers
54
- }).then(({
55
- links,
56
- ...rest
31
+ };
32
+ const walkRequest = ({
33
+ url: requestUrl,
34
+ data: d = {
35
+ fields: {}
36
+ },
37
+ acc = {
38
+ data: [],
39
+ included: [],
40
+ meta: {},
41
+ links: {}
42
+ },
43
+ ...options
57
44
  }) => {
58
- const records = Array.isArray(rest.data) ? concatRecords(acc, rest) : rest;
45
+ return makeRequest({
46
+ action: 'GET',
47
+ data: d,
48
+ url: requestUrl,
49
+ ...options,
50
+ headers
51
+ }).then(({
52
+ links,
53
+ ...rest
54
+ }) => {
55
+ const records = Array.isArray(rest.data) ? concatRecords(acc, rest) : rest;
59
56
 
60
- // `next` will have our params in the link so we do not want to pass them back in
61
- if (links?.next) {
62
- return walkRequest({
63
- ...options,
64
- data: d,
65
- url: links.next,
66
- acc: records
67
- });
68
- } else {
69
- return records;
70
- }
71
- });
72
- };
73
- const handler = isWalking ? a => walkRequest(a) : a => makeRequest(a);
74
- return throwErrorIfFieldsMissing(handler, requestArgs).then(response => response).catch(this.handleNotOk);
57
+ // `next` will have our params in the link so we do not want to pass them back in
58
+ if (links?.next) {
59
+ return walkRequest({
60
+ ...options,
61
+ data: d,
62
+ url: links.next,
63
+ acc: records
64
+ });
65
+ } else {
66
+ return records;
67
+ }
68
+ });
69
+ };
70
+ const handler = isWalking ? a => walkRequest(a) : a => makeRequest(a);
71
+ return throwErrorIfFieldsMissing(handler, requestArgs).then(response => response);
72
+ }, {
73
+ ...this.headers,
74
+ ...args.headers
75
+ });
75
76
  }
76
77
  async patch(args) {
77
- const headers = {
78
+ const url = this.appUrl(args.url);
79
+ return this.send(headers => {
80
+ const requestArgs = {
81
+ data: args.data,
82
+ url,
83
+ action: 'PATCH',
84
+ headers
85
+ };
86
+ return ensureNoQueryParamsInDev(makeRequest, requestArgs).then(response => response);
87
+ }, {
78
88
  ...this.headers,
79
89
  ...args.headers
80
- };
81
- const url = this.appUrl(args.url);
82
- const requestArgs = {
83
- data: args.data,
84
- url,
85
- action: 'PATCH',
86
- headers
87
- };
88
- return ensureNoQueryParamsInDev(makeRequest, requestArgs).then(response => response).catch(this.handleNotOk);
90
+ });
89
91
  }
90
92
  async post(args) {
91
- const headers = {
93
+ const url = this.appUrl(args.url);
94
+ return this.send(headers => {
95
+ const requestArgs = {
96
+ ...args,
97
+ data: args.data,
98
+ url,
99
+ action: 'POST',
100
+ headers
101
+ };
102
+ return ensureNoQueryParamsInDev(makeRequest, requestArgs).then(response => response);
103
+ }, {
92
104
  ...this.headers,
93
105
  ...args.headers
94
- };
95
- const url = this.appUrl(args.url);
96
- const requestArgs = {
97
- ...args,
98
- data: args.data,
99
- url,
100
- action: 'POST',
101
- headers
102
- };
103
- return ensureNoQueryParamsInDev(makeRequest, requestArgs).then(response => response).catch(this.handleNotOk);
106
+ });
104
107
  }
105
108
  async delete(args) {
106
- const headers = {
107
- ...this.headers,
108
- ...args.headers
109
- };
110
109
  const url = this.appUrl(args.url);
111
- const requestArgs = {
110
+ return this.send(headers => makeRequest({
112
111
  url,
113
112
  action: 'DELETE',
114
113
  headers
115
- };
116
- return makeRequest(requestArgs).catch(this.handleNotOk);
114
+ }), {
115
+ ...this.headers,
116
+ ...args.headers
117
+ });
117
118
  }
118
- handleNotOk = async response => {
119
+ send(request, headers) {
120
+ return request(headers).catch(error => this.handleNotOk(error, ({
121
+ access_token
122
+ }) => request({
123
+ ...headers,
124
+ Authorization: `Bearer ${access_token}`
125
+ }).catch(retryError => this.handleNotOk(retryError))));
126
+ }
127
+ handleNotOk = async (response, retry) => {
119
128
  if (!isResponseLike(response)) return Promise.reject(response);
120
129
  const errorData = await this.parseErrorResponse(response);
121
130
  const notOkResponse = response.clone();
122
131
  notOkResponse.errors = errorData.errors || [];
123
- if (response.status === 401) {
124
- this.onUnauthorizedResponse?.(notOkResponse);
125
- }
132
+ if (response.status !== 401) return Promise.reject(notOkResponse);
133
+ const refreshedToken = await this.refreshedTokenFor(notOkResponse);
134
+ if (refreshedToken && retry) return retry(refreshedToken);
126
135
  return Promise.reject(notOkResponse);
127
136
  };
137
+ refreshedTokenFor = async response => {
138
+ try {
139
+ const token = await this.onUnauthorizedResponse?.(response);
140
+ return token && token.access_token ? token : undefined;
141
+ } catch {
142
+ return undefined;
143
+ }
144
+ };
128
145
  parseErrorResponse = async response => {
129
146
  try {
130
147
  return await response.clone().json();
@@ -1 +1 @@
1
- {"version":3,"file":"client.js","names":["isResponseLike","concatRecords","ensureNoQueryParamsInDev","makeRequest","throwErrorIfFieldsMissing","throwErrorIfQueryParams","Client","version","defaultHeaders","constructor","onUnauthorizedResponse","root","get","args","walk","data","isWalking","Boolean","headers","url","appUrl","requestArgs","action","walkRequest","requestUrl","d","fields","acc","included","meta","links","options","then","rest","records","Array","isArray","next","handler","a","response","catch","handleNotOk","patch","post","delete","Promise","reject","errorData","parseErrorResponse","notOkResponse","clone","errors","status","json","Accept"],"sources":["../../../src/utils/client/client.ts"],"sourcesContent":["import { ApiCollection, ApiResource, FailedResponse } from '../../types'\nimport { isResponseLike } from '../response_error'\nimport {\n concatRecords,\n ensureNoQueryParamsInDev,\n makeRequest,\n MakeRequestArgs,\n throwErrorIfFieldsMissing,\n throwErrorIfQueryParams,\n} from './request_helpers'\nimport { DeleteRequest, GetRequest, PatchRequest, PostRequest, WalkRequest } from './types'\n\nexport type OnUnauthorizedResponse = (_response: FailedResponse) => void\n\ntype ClientArgs = {\n version: string\n defaultHeaders?: Record<string, string>\n onUnauthorizedResponse?: OnUnauthorizedResponse\n root?: string\n}\n\nexport class Client {\n version: string = ''\n defaultHeaders: Record<string, string> = {}\n onUnauthorizedResponse?: OnUnauthorizedResponse\n root?: string\n\n constructor({ version, defaultHeaders = {}, onUnauthorizedResponse, root }: ClientArgs) {\n this.version = version\n this.defaultHeaders = defaultHeaders\n this.onUnauthorizedResponse = onUnauthorizedResponse\n this.root = root\n }\n\n async get<T extends ApiCollection | ApiResource>(args: GetRequest): Promise<T> {\n const { walk, ...data } = args.data\n const isWalking = Boolean(walk)\n const headers = { ...this.headers, ...args.headers }\n const url = this.appUrl(args.url)\n\n await throwErrorIfQueryParams(url)\n\n const requestArgs: MakeRequestArgs = { data, url, action: 'GET', headers }\n\n const walkRequest = ({\n url: requestUrl,\n data: d = { fields: {} },\n acc = { data: [], included: [], meta: {}, links: {} },\n ...options\n }: WalkRequest): Promise<T> => {\n return makeRequest({\n action: 'GET',\n data: d,\n url: requestUrl,\n ...options,\n headers,\n }).then(({ links, ...rest }) => {\n const records = Array.isArray(rest.data) ? concatRecords(acc, rest) : rest\n\n // `next` will have our params in the link so we do not want to pass them back in\n if (links?.next) {\n return walkRequest({ ...options, data: d, url: links.next, acc: records })\n } else {\n return records\n }\n })\n }\n\n const handler = isWalking\n ? (a: MakeRequestArgs | WalkRequest) => walkRequest(a as WalkRequest)\n : (a: MakeRequestArgs | WalkRequest) => makeRequest(a as MakeRequestArgs)\n\n return throwErrorIfFieldsMissing(handler, requestArgs)\n .then(response => response as T)\n .catch(this.handleNotOk)\n }\n\n async patch<T extends ApiCollection | ApiResource>(args: PatchRequest): Promise<T> {\n const headers = { ...this.headers, ...args.headers }\n const url = this.appUrl(args.url)\n\n const requestArgs: MakeRequestArgs = { data: args.data, url, action: 'PATCH', headers }\n\n return ensureNoQueryParamsInDev(makeRequest, requestArgs)\n .then(response => response as T)\n .catch(this.handleNotOk)\n }\n\n async post<T extends ApiCollection | ApiResource>(args: PostRequest): Promise<T> {\n const headers = { ...this.headers, ...args.headers }\n const url = this.appUrl(args.url)\n\n const requestArgs: MakeRequestArgs = { ...args, data: args.data, url, action: 'POST', headers }\n\n return ensureNoQueryParamsInDev(makeRequest, requestArgs)\n .then(response => response as T)\n .catch(this.handleNotOk)\n }\n\n async delete(args: DeleteRequest) {\n const headers = { ...this.headers, ...args.headers }\n const url = this.appUrl(args.url)\n\n const requestArgs: MakeRequestArgs = { url, action: 'DELETE', headers }\n\n return makeRequest(requestArgs).catch(this.handleNotOk)\n }\n\n handleNotOk = async (response: Response | Error) => {\n if (!isResponseLike(response)) return Promise.reject(response)\n\n const errorData = await this.parseErrorResponse(response)\n const notOkResponse = response.clone() as FailedResponse\n notOkResponse.errors = errorData.errors || []\n\n if (response.status === 401) {\n this.onUnauthorizedResponse?.(notOkResponse)\n }\n\n return Promise.reject(notOkResponse)\n }\n\n parseErrorResponse = async (response: Response): Promise<Partial<FailedResponse>> => {\n try {\n return (await response.clone().json()) as FailedResponse\n } catch {\n return {}\n }\n }\n\n appUrl(url: string) {\n return `${this.root}${url}`\n }\n\n get headers() {\n return {\n Accept: 'application/vnd.api+json',\n 'Content-Type': 'application/json',\n 'X-PCO-API-Version': this.version,\n ...this.defaultHeaders,\n }\n }\n}\n\nexport default Client\n"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"file":"client.js","names":["isResponseLike","concatRecords","ensureNoQueryParamsInDev","makeRequest","throwErrorIfFieldsMissing","throwErrorIfQueryParams","Client","version","defaultHeaders","constructor","onUnauthorizedResponse","root","get","args","walk","data","isWalking","Boolean","url","appUrl","send","headers","requestArgs","action","walkRequest","requestUrl","d","fields","acc","included","meta","links","options","then","rest","records","Array","isArray","next","handler","a","response","patch","post","delete","request","catch","error","handleNotOk","access_token","Authorization","retryError","retry","Promise","reject","errorData","parseErrorResponse","notOkResponse","clone","errors","status","refreshedToken","refreshedTokenFor","token","undefined","json","Accept"],"sources":["../../../src/utils/client/client.ts"],"sourcesContent":["import { ApiCollection, ApiResource, FailedResponse, OAuthToken } from '../../types'\nimport { isResponseLike } from '../response_error'\nimport {\n concatRecords,\n ensureNoQueryParamsInDev,\n makeRequest,\n MakeRequestArgs,\n throwErrorIfFieldsMissing,\n throwErrorIfQueryParams,\n} from './request_helpers'\nimport { DeleteRequest, GetRequest, PatchRequest, PostRequest, WalkRequest } from './types'\n\ntype RefreshedToken = Pick<OAuthToken, 'access_token'>\ntype Headers = Record<string, string>\n\nexport type OnUnauthorizedResponse = (\n _response: FailedResponse\n) => void | Promise<RefreshedToken | void>\n\ntype ClientArgs = {\n version: string\n defaultHeaders?: Headers\n onUnauthorizedResponse?: OnUnauthorizedResponse\n root?: string\n}\n\nexport class Client {\n version: string = ''\n defaultHeaders: Headers = {}\n onUnauthorizedResponse?: OnUnauthorizedResponse\n root?: string\n\n constructor({ version, defaultHeaders = {}, onUnauthorizedResponse, root }: ClientArgs) {\n this.version = version\n this.defaultHeaders = defaultHeaders\n this.onUnauthorizedResponse = onUnauthorizedResponse\n this.root = root\n }\n\n async get<T extends ApiCollection | ApiResource>(args: GetRequest): Promise<T> {\n const { walk, ...data } = args.data\n const isWalking = Boolean(walk)\n const url = this.appUrl(args.url)\n\n await throwErrorIfQueryParams(url)\n\n return this.send(\n headers => {\n const requestArgs: MakeRequestArgs = { data, url, action: 'GET', headers }\n\n const walkRequest = ({\n url: requestUrl,\n data: d = { fields: {} },\n acc = { data: [], included: [], meta: {}, links: {} },\n ...options\n }: WalkRequest): Promise<T> => {\n return makeRequest({\n action: 'GET',\n data: d,\n url: requestUrl,\n ...options,\n headers,\n }).then(({ links, ...rest }) => {\n const records = Array.isArray(rest.data) ? concatRecords(acc, rest) : rest\n\n // `next` will have our params in the link so we do not want to pass them back in\n if (links?.next) {\n return walkRequest({ ...options, data: d, url: links.next, acc: records })\n } else {\n return records\n }\n })\n }\n\n const handler = isWalking\n ? (a: MakeRequestArgs | WalkRequest) => walkRequest(a as WalkRequest)\n : (a: MakeRequestArgs | WalkRequest) => makeRequest(a as MakeRequestArgs)\n\n return throwErrorIfFieldsMissing(handler, requestArgs).then(response => response as T)\n },\n { ...this.headers, ...args.headers }\n )\n }\n\n async patch<T extends ApiCollection | ApiResource>(args: PatchRequest): Promise<T> {\n const url = this.appUrl(args.url)\n\n return this.send(\n headers => {\n const requestArgs: MakeRequestArgs = { data: args.data, url, action: 'PATCH', headers }\n\n return ensureNoQueryParamsInDev(makeRequest, requestArgs).then(response => response as T)\n },\n { ...this.headers, ...args.headers }\n )\n }\n\n async post<T extends ApiCollection | ApiResource>(args: PostRequest): Promise<T> {\n const url = this.appUrl(args.url)\n\n return this.send(\n headers => {\n const requestArgs: MakeRequestArgs = {\n ...args,\n data: args.data,\n url,\n action: 'POST',\n headers,\n }\n\n return ensureNoQueryParamsInDev(makeRequest, requestArgs).then(response => response as T)\n },\n { ...this.headers, ...args.headers }\n )\n }\n\n async delete(args: DeleteRequest) {\n const url = this.appUrl(args.url)\n\n return this.send(headers => makeRequest({ url, action: 'DELETE', headers }), {\n ...this.headers,\n ...args.headers,\n })\n }\n\n private send<T>(request: (_headers: Headers) => Promise<T>, headers: Headers): Promise<T> {\n return request(headers).catch((error: Response | Error) =>\n this.handleNotOk(error, ({ access_token }) =>\n request({ ...headers, Authorization: `Bearer ${access_token}` }).catch(\n (retryError: Response | Error) => this.handleNotOk(retryError)\n )\n )\n )\n }\n\n handleNotOk = async <T = never>(\n response: Response | Error,\n retry?: (_token: RefreshedToken) => Promise<T>\n ): Promise<T> => {\n if (!isResponseLike(response)) return Promise.reject(response)\n\n const errorData = await this.parseErrorResponse(response)\n const notOkResponse = response.clone() as FailedResponse\n notOkResponse.errors = errorData.errors || []\n\n if (response.status !== 401) return Promise.reject(notOkResponse)\n\n const refreshedToken = await this.refreshedTokenFor(notOkResponse)\n\n if (refreshedToken && retry) return retry(refreshedToken)\n\n return Promise.reject(notOkResponse)\n }\n\n private refreshedTokenFor = async (\n response: FailedResponse\n ): Promise<RefreshedToken | undefined> => {\n try {\n const token = await this.onUnauthorizedResponse?.(response)\n return token && token.access_token ? token : undefined\n } catch {\n return undefined\n }\n }\n\n parseErrorResponse = async (response: Response): Promise<Partial<FailedResponse>> => {\n try {\n return (await response.clone().json()) as FailedResponse\n } catch {\n return {}\n }\n }\n\n appUrl(url: string) {\n return `${this.root}${url}`\n }\n\n get headers() {\n return {\n Accept: 'application/vnd.api+json',\n 'Content-Type': 'application/json',\n 'X-PCO-API-Version': this.version,\n ...this.defaultHeaders,\n }\n }\n}\n\nexport default Client\n"],"mappings":"AACA,SAASA,cAAc,QAAQ,mBAAmB;AAClD,SACEC,aAAa,EACbC,wBAAwB,EACxBC,WAAW,EAEXC,yBAAyB,EACzBC,uBAAuB,QAClB,mBAAmB;AAiB1B,OAAO,MAAMC,MAAM,CAAC;EAClBC,OAAO,GAAW,EAAE;EACpBC,cAAc,GAAY,CAAC,CAAC;EAI5BC,WAAWA,CAAC;IAAEF,OAAO;IAAEC,cAAc,GAAG,CAAC,CAAC;IAAEE,sBAAsB;IAAEC;EAAiB,CAAC,EAAE;IACtF,IAAI,CAACJ,OAAO,GAAGA,OAAO;IACtB,IAAI,CAACC,cAAc,GAAGA,cAAc;IACpC,IAAI,CAACE,sBAAsB,GAAGA,sBAAsB;IACpD,IAAI,CAACC,IAAI,GAAGA,IAAI;EAClB;EAEA,MAAMC,GAAGA,CAAwCC,IAAgB,EAAc;IAC7E,MAAM;MAAEC,IAAI;MAAE,GAAGC;IAAK,CAAC,GAAGF,IAAI,CAACE,IAAI;IACnC,MAAMC,SAAS,GAAGC,OAAO,CAACH,IAAI,CAAC;IAC/B,MAAMI,GAAG,GAAG,IAAI,CAACC,MAAM,CAACN,IAAI,CAACK,GAAG,CAAC;IAEjC,MAAMb,uBAAuB,CAACa,GAAG,CAAC;IAElC,OAAO,IAAI,CAACE,IAAI,CACdC,OAAO,IAAI;MACT,MAAMC,WAA4B,GAAG;QAAEP,IAAI;QAAEG,GAAG;QAAEK,MAAM,EAAE,KAAK;QAAEF;MAAQ,CAAC;MAE1E,MAAMG,WAAW,GAAGA,CAAC;QACnBN,GAAG,EAAEO,UAAU;QACfV,IAAI,EAAEW,CAAC,GAAG;UAAEC,MAAM,EAAE,CAAC;QAAE,CAAC;QACxBC,GAAG,GAAG;UAAEb,IAAI,EAAE,EAAE;UAAEc,QAAQ,EAAE,EAAE;UAAEC,IAAI,EAAE,CAAC,CAAC;UAAEC,KAAK,EAAE,CAAC;QAAE,CAAC;QACrD,GAAGC;MACQ,CAAC,KAAiB;QAC7B,OAAO7B,WAAW,CAAC;UACjBoB,MAAM,EAAE,KAAK;UACbR,IAAI,EAAEW,CAAC;UACPR,GAAG,EAAEO,UAAU;UACf,GAAGO,OAAO;UACVX;QACF,CAAC,CAAC,CAACY,IAAI,CAAC,CAAC;UAAEF,KAAK;UAAE,GAAGG;QAAK,CAAC,KAAK;UAC9B,MAAMC,OAAO,GAAGC,KAAK,CAACC,OAAO,CAACH,IAAI,CAACnB,IAAI,CAAC,GAAGd,aAAa,CAAC2B,GAAG,EAAEM,IAAI,CAAC,GAAGA,IAAI;;UAE1E;UACA,IAAIH,KAAK,EAAEO,IAAI,EAAE;YACf,OAAOd,WAAW,CAAC;cAAE,GAAGQ,OAAO;cAAEjB,IAAI,EAAEW,CAAC;cAAER,GAAG,EAAEa,KAAK,CAACO,IAAI;cAAEV,GAAG,EAAEO;YAAQ,CAAC,CAAC;UAC5E,CAAC,MAAM;YACL,OAAOA,OAAO;UAChB;QACF,CAAC,CAAC;MACJ,CAAC;MAED,MAAMI,OAAO,GAAGvB,SAAS,GACpBwB,CAAgC,IAAKhB,WAAW,CAACgB,CAAgB,CAAC,GAClEA,CAAgC,IAAKrC,WAAW,CAACqC,CAAoB,CAAC;MAE3E,OAAOpC,yBAAyB,CAACmC,OAAO,EAAEjB,WAAW,CAAC,CAACW,IAAI,CAACQ,QAAQ,IAAIA,QAAa,CAAC;IACxF,CAAC,EACD;MAAE,GAAG,IAAI,CAACpB,OAAO;MAAE,GAAGR,IAAI,CAACQ;IAAQ,CACrC,CAAC;EACH;EAEA,MAAMqB,KAAKA,CAAwC7B,IAAkB,EAAc;IACjF,MAAMK,GAAG,GAAG,IAAI,CAACC,MAAM,CAACN,IAAI,CAACK,GAAG,CAAC;IAEjC,OAAO,IAAI,CAACE,IAAI,CACdC,OAAO,IAAI;MACT,MAAMC,WAA4B,GAAG;QAAEP,IAAI,EAAEF,IAAI,CAACE,IAAI;QAAEG,GAAG;QAAEK,MAAM,EAAE,OAAO;QAAEF;MAAQ,CAAC;MAEvF,OAAOnB,wBAAwB,CAACC,WAAW,EAAEmB,WAAW,CAAC,CAACW,IAAI,CAACQ,QAAQ,IAAIA,QAAa,CAAC;IAC3F,CAAC,EACD;MAAE,GAAG,IAAI,CAACpB,OAAO;MAAE,GAAGR,IAAI,CAACQ;IAAQ,CACrC,CAAC;EACH;EAEA,MAAMsB,IAAIA,CAAwC9B,IAAiB,EAAc;IAC/E,MAAMK,GAAG,GAAG,IAAI,CAACC,MAAM,CAACN,IAAI,CAACK,GAAG,CAAC;IAEjC,OAAO,IAAI,CAACE,IAAI,CACdC,OAAO,IAAI;MACT,MAAMC,WAA4B,GAAG;QACnC,GAAGT,IAAI;QACPE,IAAI,EAAEF,IAAI,CAACE,IAAI;QACfG,GAAG;QACHK,MAAM,EAAE,MAAM;QACdF;MACF,CAAC;MAED,OAAOnB,wBAAwB,CAACC,WAAW,EAAEmB,WAAW,CAAC,CAACW,IAAI,CAACQ,QAAQ,IAAIA,QAAa,CAAC;IAC3F,CAAC,EACD;MAAE,GAAG,IAAI,CAACpB,OAAO;MAAE,GAAGR,IAAI,CAACQ;IAAQ,CACrC,CAAC;EACH;EAEA,MAAMuB,MAAMA,CAAC/B,IAAmB,EAAE;IAChC,MAAMK,GAAG,GAAG,IAAI,CAACC,MAAM,CAACN,IAAI,CAACK,GAAG,CAAC;IAEjC,OAAO,IAAI,CAACE,IAAI,CAACC,OAAO,IAAIlB,WAAW,CAAC;MAAEe,GAAG;MAAEK,MAAM,EAAE,QAAQ;MAAEF;IAAQ,CAAC,CAAC,EAAE;MAC3E,GAAG,IAAI,CAACA,OAAO;MACf,GAAGR,IAAI,CAACQ;IACV,CAAC,CAAC;EACJ;EAEQD,IAAIA,CAAIyB,OAA0C,EAAExB,OAAgB,EAAc;IACxF,OAAOwB,OAAO,CAACxB,OAAO,CAAC,CAACyB,KAAK,CAAEC,KAAuB,IACpD,IAAI,CAACC,WAAW,CAACD,KAAK,EAAE,CAAC;MAAEE;IAAa,CAAC,KACvCJ,OAAO,CAAC;MAAE,GAAGxB,OAAO;MAAE6B,aAAa,EAAE,UAAUD,YAAY;IAAG,CAAC,CAAC,CAACH,KAAK,CACnEK,UAA4B,IAAK,IAAI,CAACH,WAAW,CAACG,UAAU,CAC/D,CACF,CACF,CAAC;EACH;EAEAH,WAAW,GAAG,MAAAA,CACZP,QAA0B,EAC1BW,KAA8C,KAC/B;IACf,IAAI,CAACpD,cAAc,CAACyC,QAAQ,CAAC,EAAE,OAAOY,OAAO,CAACC,MAAM,CAACb,QAAQ,CAAC;IAE9D,MAAMc,SAAS,GAAG,MAAM,IAAI,CAACC,kBAAkB,CAACf,QAAQ,CAAC;IACzD,MAAMgB,aAAa,GAAGhB,QAAQ,CAACiB,KAAK,CAAC,CAAmB;IACxDD,aAAa,CAACE,MAAM,GAAGJ,SAAS,CAACI,MAAM,IAAI,EAAE;IAE7C,IAAIlB,QAAQ,CAACmB,MAAM,KAAK,GAAG,EAAE,OAAOP,OAAO,CAACC,MAAM,CAACG,aAAa,CAAC;IAEjE,MAAMI,cAAc,GAAG,MAAM,IAAI,CAACC,iBAAiB,CAACL,aAAa,CAAC;IAElE,IAAII,cAAc,IAAIT,KAAK,EAAE,OAAOA,KAAK,CAACS,cAAc,CAAC;IAEzD,OAAOR,OAAO,CAACC,MAAM,CAACG,aAAa,CAAC;EACtC,CAAC;EAEOK,iBAAiB,GAAG,MAC1BrB,QAAwB,IACgB;IACxC,IAAI;MACF,MAAMsB,KAAK,GAAG,MAAM,IAAI,CAACrD,sBAAsB,GAAG+B,QAAQ,CAAC;MAC3D,OAAOsB,KAAK,IAAIA,KAAK,CAACd,YAAY,GAAGc,KAAK,GAAGC,SAAS;IACxD,CAAC,CAAC,MAAM;MACN,OAAOA,SAAS;IAClB;EACF,CAAC;EAEDR,kBAAkB,GAAG,MAAOf,QAAkB,IAAuC;IACnF,IAAI;MACF,OAAQ,MAAMA,QAAQ,CAACiB,KAAK,CAAC,CAAC,CAACO,IAAI,CAAC,CAAC;IACvC,CAAC,CAAC,MAAM;MACN,OAAO,CAAC,CAAC;IACX;EACF,CAAC;EAED9C,MAAMA,CAACD,GAAW,EAAE;IAClB,OAAO,GAAG,IAAI,CAACP,IAAI,GAAGO,GAAG,EAAE;EAC7B;EAEA,IAAIG,OAAOA,CAAA,EAAG;IACZ,OAAO;MACL6C,MAAM,EAAE,0BAA0B;MAClC,cAAc,EAAE,kBAAkB;MAClC,mBAAmB,EAAE,IAAI,CAAC3D,OAAO;MACjC,GAAG,IAAI,CAACC;IACV,CAAC;EACH;AACF;AAEA,eAAeF,MAAM","ignoreList":[]}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@planningcenter/chat-react-native",
3
- "version": "4.8.0-qa-staging.10",
3
+ "version": "4.8.0-qa-staging.12",
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.8.0-qa-staging.10",
36
+ "@planningcenter/emoji-keyboard": "4.8.0-qa-staging.12",
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": "1eb54a05b1923f837f7f26c81f926c4343253a2d"
87
+ "gitHead": "7c130d35069b5e724c244f654ecb37f49ced61d6"
88
88
  }
@@ -288,6 +288,52 @@ describe('SessionContextProvider', () => {
288
288
  expect(mockRefreshTokenFn).toHaveBeenCalledTimes(1)
289
289
  })
290
290
 
291
+ it('should share one refresh between expired-token responses in the same tick', async () => {
292
+ const token: OAuthToken = {
293
+ access_token: 'old-token-12345678',
294
+ refresh_token: 'refresh-token',
295
+ expires_in: 3600,
296
+ token_type: 'Bearer',
297
+ scope: 'read write',
298
+ created_at: Date.now(),
299
+ }
300
+ const refreshedToken: OAuthToken = { ...token, access_token: 'new-token-12345678' }
301
+
302
+ const session = new Session({ env: 'production', token })
303
+ const manager = new SessionManager()
304
+ manager.upsertSession(session)
305
+ await mockSecureStorage.setItem(TEST_SESSIONS_KEY, JSON.stringify(manager.toString()))
306
+
307
+ mockRefreshTokenFn.mockResolvedValue(refreshedToken)
308
+
309
+ const config = createConfig()
310
+ const { result } = renderHook(() => useSessionContext(), {
311
+ wrapper: createWrapper(config),
312
+ })
313
+
314
+ await waitForQuery()
315
+
316
+ const expiredResponse: FailedResponse = {
317
+ status: 401,
318
+ statusText: 'Unauthorized',
319
+ errors: [{ detail: 'Error Code Hint: (BABOON)', title: 'Unauthorized', status: '401' }],
320
+ } as FailedResponse
321
+
322
+ let resolved: (OAuthToken | undefined)[] = []
323
+ await act(async () => {
324
+ const pending = Promise.all([
325
+ result.current.handleUnauthorizedResponse(expiredResponse),
326
+ result.current.handleUnauthorizedResponse(expiredResponse),
327
+ result.current.handleUnauthorizedResponse(expiredResponse),
328
+ ])
329
+ await jest.runOnlyPendingTimersAsync()
330
+ resolved = await pending
331
+ })
332
+
333
+ expect(mockRefreshTokenFn).toHaveBeenCalledTimes(1)
334
+ expect(resolved).toEqual([refreshedToken, refreshedToken, refreshedToken])
335
+ })
336
+
291
337
  it('should logout on forced logout error (capuchin)', async () => {
292
338
  const token: OAuthToken = {
293
339
  access_token: 'old-token-12345678',
@@ -334,6 +334,42 @@ describe('error handling', () => {
334
334
  it('defaults', async () => {
335
335
  await test401({ secretWord: '' })
336
336
  expect(onUnauthorizedResponse).toHaveBeenCalled()
337
+ expect(fetchSpy).toHaveBeenCalledTimes(1)
338
+ })
339
+
340
+ it('retries once with the refreshed token the host resolves', async () => {
341
+ const url = '/records'
342
+ onUnauthorizedResponse.mockResolvedValueOnce({ access_token: 'refreshed-token' })
343
+ MockServer.get(url, { errors: [] }, 401, { once: true })
344
+
345
+ const response = await client.get({ url, data: { fields: { Record: ['id'] } } })
346
+
347
+ expect(response).toHaveProperty('data')
348
+ expect(fetchSpy).toHaveBeenCalledTimes(2)
349
+ expect(fetchSpy.mock.calls[1][1].headers).toMatchObject({
350
+ Authorization: 'Bearer refreshed-token',
351
+ })
352
+ })
353
+
354
+ it('rejects when the retried request is unauthorized too', async () => {
355
+ const url = '/records'
356
+ onUnauthorizedResponse.mockResolvedValue({ access_token: 'refreshed-token' })
357
+ MockServer.get(url, { errors: [] }, 401)
358
+
359
+ await expect(
360
+ client.get({ url, data: { fields: { Record: ['id'] } } })
361
+ ).rejects.toHaveProperty('status', 401)
362
+ expect(fetchSpy).toHaveBeenCalledTimes(2)
363
+ })
364
+
365
+ it('rejects with the 401 when the host refresh fails', async () => {
366
+ const url = '/records'
367
+ onUnauthorizedResponse.mockRejectedValueOnce(new Error('refresh failed'))
368
+ MockServer.get(url, { errors: [] }, 401, { once: true })
369
+
370
+ await expect(
371
+ client.get({ url, data: { fields: { Record: ['id'] } } })
372
+ ).rejects.toHaveProperty('status', 401)
337
373
  })
338
374
 
339
375
  const test401 = async ({ secretWord }: { secretWord: string }) => {
@@ -13,10 +13,13 @@ jest.mock('react-native-gesture-handler/ReanimatedSwipeable', () => {
13
13
  renderLeftActions,
14
14
  }: {
15
15
  children: React.ReactNode
16
- renderLeftActions: () => React.ReactNode
16
+ renderLeftActions: (
17
+ progress: { value: number },
18
+ translation: { value: number }
19
+ ) => React.ReactNode
17
20
  }) => (
18
21
  <MockView>
19
- {renderLeftActions()}
22
+ {renderLeftActions({ value: 1 }, { value: 360 })}
20
23
  {children}
21
24
  </MockView>
22
25
  ),
@@ -12,6 +12,7 @@ import {
12
12
  import ReanimatedSwipeable, {
13
13
  SwipeableMethods,
14
14
  } from 'react-native-gesture-handler/ReanimatedSwipeable'
15
+ import Animated, { SharedValue, useAnimatedStyle } from 'react-native-reanimated'
15
16
  import { useConversationsContext } from '../../contexts/conversations_context'
16
17
  import { useTheme, useCreateAndroidRippleColor } from '../../hooks'
17
18
  import {
@@ -24,7 +25,7 @@ import { ConversationResource } from '../../types'
24
25
  import { isArchivedConversation, platformPressedOpacityStyle } from '../../utils'
25
26
  import { Haptic } from '../../utils/native_adapters'
26
27
  import { tokens } from '../../vendor/tapestry/tokens'
27
- import { SwipeableToggleButton } from './swipeable_toggle_button'
28
+ import { SWIPEABLE_TOGGLE_BUTTON_WIDTH, SwipeableToggleButton } from './swipeable_toggle_button'
28
29
 
29
30
  export function ConversationActions({
30
31
  children,
@@ -186,8 +187,10 @@ export function ConversationActions({
186
187
  onSwipeableOpenStartDrag={handleSwipeableOpen}
187
188
  onSwipeableClose={() => setDisabled(false)}
188
189
  renderRightActions={() => <></>}
189
- renderLeftActions={() => (
190
+ renderLeftActions={(progress, translation) => (
190
191
  <LeftActions
192
+ progress={progress}
193
+ translation={translation}
191
194
  isConversationEmpty={isConversationEmpty}
192
195
  canMute={canMute}
193
196
  canHide={canHide}
@@ -222,6 +225,8 @@ export function ConversationActions({
222
225
  }
223
226
 
224
227
  interface LeftActionsProps {
228
+ progress: SharedValue<number>
229
+ translation: SharedValue<number>
225
230
  isConversationEmpty: boolean
226
231
  canMute: boolean
227
232
  canHide: boolean
@@ -237,6 +242,8 @@ interface LeftActionsProps {
237
242
  }
238
243
 
239
244
  function LeftActions({
245
+ progress,
246
+ translation,
240
247
  isConversationEmpty,
241
248
  canMute,
242
249
  canHide,
@@ -251,6 +258,9 @@ function LeftActions({
251
258
  isMarkReadPending,
252
259
  }: LeftActionsProps) {
253
260
  const styles = useStyles({ actionButtonCount: 1 + Number(canMute) + Number(canHide) })
261
+ // The buttons split whatever the drag has uncovered, so every action is on screen from the
262
+ // first few points and grows with the drag, instead of the last one waiting for a full open.
263
+ const revealStyle = useAnimatedStyle(() => ({ width: Math.max(translation.value, 0) }))
254
264
 
255
265
  const muteToggleContent = {
256
266
  true: { iconName: 'general.bell', label: 'Enable' },
@@ -269,38 +279,41 @@ function LeftActions({
269
279
 
270
280
  return (
271
281
  <View style={styles.actionButtonContainer}>
272
- <SwipeableToggleButton
273
- loading={isMarkReadPending}
274
- disabled={isConversationEmpty}
275
- toggled={!read}
276
- onPress={handleLatestMessageUnread}
277
- toggleContent={latestMessageUnreadToggleContent}
278
- backgroundColor={tokens.fillColorInteractionSwipeDefault}
279
- />
280
- {canMute && (
282
+ <Animated.View style={[styles.actionButtonReveal, revealStyle]}>
281
283
  <SwipeableToggleButton
282
- loading={isMutedPending}
283
- toggled={muted}
284
- onPress={handleMute}
285
- toggleContent={muteToggleContent}
286
- backgroundColor={tokens.fillColorInteractionSwipeSecondary}
284
+ progress={progress}
285
+ loading={isMarkReadPending}
286
+ disabled={isConversationEmpty}
287
+ toggled={!read}
288
+ onPress={handleLatestMessageUnread}
289
+ toggleContent={latestMessageUnreadToggleContent}
290
+ backgroundColor={tokens.fillColorInteractionSwipeDefault}
287
291
  />
288
- )}
289
- {canHide && (
290
- <SwipeableToggleButton
291
- loading={isHiddenPending}
292
- toggled={hidden}
293
- onPress={handleHide}
294
- toggleContent={hideToggleContent}
295
- backgroundColor={tokens.colorNeutral45}
296
- />
297
- )}
292
+ {canMute && (
293
+ <SwipeableToggleButton
294
+ progress={progress}
295
+ loading={isMutedPending}
296
+ toggled={muted}
297
+ onPress={handleMute}
298
+ toggleContent={muteToggleContent}
299
+ backgroundColor={tokens.fillColorInteractionSwipeSecondary}
300
+ />
301
+ )}
302
+ {canHide && (
303
+ <SwipeableToggleButton
304
+ progress={progress}
305
+ loading={isHiddenPending}
306
+ toggled={hidden}
307
+ onPress={handleHide}
308
+ toggleContent={hideToggleContent}
309
+ backgroundColor={tokens.colorNeutral45}
310
+ />
311
+ )}
312
+ </Animated.View>
298
313
  </View>
299
314
  )
300
315
  }
301
316
 
302
- const ACTION_BUTTON_WIDTH = 120
303
-
304
317
  const useStyles = ({ actionButtonCount = 2 }: { actionButtonCount?: number } = {}) => {
305
318
  const { colors } = useTheme()
306
319
  return StyleSheet.create({
@@ -308,10 +321,13 @@ const useStyles = ({ actionButtonCount = 2 }: { actionButtonCount?: number } = {
308
321
  backgroundColor: colors.conversationActionsBackground,
309
322
  },
310
323
  actionButtonContainer: {
324
+ // Fixed at the fully open width: the swipeable measures this to find its snap point.
325
+ width: SWIPEABLE_TOGGLE_BUTTON_WIDTH * actionButtonCount,
326
+ height: '100%',
327
+ },
328
+ actionButtonReveal: {
311
329
  flexDirection: 'row',
312
- alignItems: 'center',
313
- width: ACTION_BUTTON_WIDTH * actionButtonCount,
314
- alignContent: 'stretch',
330
+ height: '100%',
315
331
  },
316
332
  swipeableContainer: {
317
333
  backgroundColor: colors.surfaceColor090,