@planningcenter/chat-react-native 3.37.0-rc.2 → 3.37.0-rc.4

package/build/utils/client/instrumented_fetch.js

@@ -0,0 +1,64 @@
+import { Log } from '../native_adapters/configuration';
+const SHARED_TAGS = {
+    team: 'chat',
+    package: 'chat-react-native',
+};
+const SKIPPED_STATUSES = [401, 403, 404];
+export async function instrumentedFetch(url, init) {
+    const method = init.method ?? 'GET';
+    try {
+        const response = await fetch(url, init);
+        if (!response.ok)
+            reportHttpError(response, method, url);
+        return response;
+    }
+    catch (networkError) {
+        reportNetworkError(networkError, method, url);
+        throw networkError;
+    }
+}
+function reportHttpError(response, method, url) {
+    const { status } = response;
+    if (SKIPPED_STATUSES.includes(status))
+        return;
+    const path = templatePath(url);
+    const error = new Error(`HTTP ${status} ${method} ${path}`);
+    error.name = `HTTPError${status}`;
+    Log.reportError(error, {
+        scope: 'http',
+        tags: {
+            ...SHARED_TAGS,
+            'http.status': String(status),
+            'http.method': method,
+            'http.path': path,
+        },
+    });
+}
+function reportNetworkError(networkError, method, url) {
+    const path = templatePath(url);
+    const error = new Error(`Network failure ${method} ${path}: ${networkError.message}`);
+    error.name = 'NetworkError';
+    Log.reportError(error, {
+        scope: 'http',
+        tags: {
+            ...SHARED_TAGS,
+            'http.method': method,
+            'http.path': path,
+            'http.error': 'network',
+        },
+    });
+}
+function templatePath(url) {
+    let path;
+    try {
+        path = new URL(url).pathname;
+    }
+    catch {
+        path = url;
+    }
+    return path
+        .split('/')
+        .map(segment => (/^\d+$/.test(segment) ? ':id' : segment))
+        .join('/');
+}
+//# sourceMappingURL=instrumented_fetch.js.map

package/build/utils/client/instrumented_fetch.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"instrumented_fetch.js","sourceRoot":"","sources":["../../../src/utils/client/instrumented_fetch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,kCAAkC,CAAA;AAEtD,MAAM,WAAW,GAAG;IAClB,IAAI,EAAE,MAAM;IACZ,OAAO,EAAE,mBAAmB;CACpB,CAAA;AAEV,MAAM,gBAAgB,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;AAExC,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,GAAW,EAAE,IAAiB;IACpE,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,IAAI,KAAK,CAAA;IACnC,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;QACvC,IAAI,CAAC,QAAQ,CAAC,EAAE;YAAE,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,CAAC,CAAA;QACxD,OAAO,QAAQ,CAAA;IACjB,CAAC;IAAC,OAAO,YAAY,EAAE,CAAC;QACtB,kBAAkB,CAAC,YAAqB,EAAE,MAAM,EAAE,GAAG,CAAC,CAAA;QACtD,MAAM,YAAY,CAAA;IACpB,CAAC;AACH,CAAC;AAED,SAAS,eAAe,CAAC,QAAkB,EAAE,MAAc,EAAE,GAAW;IACtE,MAAM,EAAE,MAAM,EAAE,GAAG,QAAQ,CAAA;IAC3B,IAAI,gBAAgB,CAAC,QAAQ,CAAC,MAAM,CAAC;QAAE,OAAM;IAE7C,MAAM,IAAI,GAAG,YAAY,CAAC,GAAG,CAAC,CAAA;IAC9B,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,QAAQ,MAAM,IAAI,MAAM,IAAI,IAAI,EAAE,CAAC,CAAA;IAC3D,KAAK,CAAC,IAAI,GAAG,YAAY,MAAM,EAAE,CAAA;IAEjC,GAAG,CAAC,WAAW,CAAC,KAAK,EAAE;QACrB,KAAK,EAAE,MAAM;QACb,IAAI,EAAE;YACJ,GAAG,WAAW;YACd,aAAa,EAAE,MAAM,CAAC,MAAM,CAAC;YAC7B,aAAa,EAAE,MAAM;YACrB,WAAW,EAAE,IAAI;SAClB;KACF,CAAC,CAAA;AACJ,CAAC;AAED,SAAS,kBAAkB,CAAC,YAAmB,EAAE,MAAc,EAAE,GAAW;IAC1E,MAAM,IAAI,GAAG,YAAY,CAAC,GAAG,CAAC,CAAA;IAC9B,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,mBAAmB,MAAM,IAAI,IAAI,KAAK,YAAY,CAAC,OAAO,EAAE,CAAC,CAAA;IACrF,KAAK,CAAC,IAAI,GAAG,cAAc,CAAA;IAE3B,GAAG,CAAC,WAAW,CAAC,KAAK,EAAE;QACrB,KAAK,EAAE,MAAM;QACb,IAAI,EAAE;YACJ,GAAG,WAAW;YACd,aAAa,EAAE,MAAM;YACrB,WAAW,EAAE,IAAI;YACjB,YAAY,EAAE,SAAS;SACxB;KACF,CAAC,CAAA;AACJ,CAAC;AAED,SAAS,YAAY,CAAC,GAAW;IAC/B,IAAI,IAAY,CAAA;IAChB,IAAI,CAAC;QACH,IAAI,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAA;IAC9B,CAAC;IAAC,MAAM,CAAC;QACP,IAAI,GAAG,GAAG,CAAA;IACZ,CAAC;IAED,OAAO,IAAI;SACR,KAAK,CAAC,GAAG,CAAC;SACV,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;SACzD,IAAI,CAAC,GAAG,CAAC,CAAA;AACd,CAAC","sourcesContent":["import { Log } from '../native_adapters/configuration'\n\nconst SHARED_TAGS = {\n  team: 'chat',\n  package: 'chat-react-native',\n} as const\n\nconst SKIPPED_STATUSES = [401, 403, 404]\n\nexport async function instrumentedFetch(url: string, init: RequestInit): Promise<Response> {\n  const method = init.method ?? 'GET'\n  try {\n    const response = await fetch(url, init)\n    if (!response.ok) reportHttpError(response, method, url)\n    return response\n  } catch (networkError) {\n    reportNetworkError(networkError as Error, method, url)\n    throw networkError\n  }\n}\n\nfunction reportHttpError(response: Response, method: string, url: string) {\n  const { status } = response\n  if (SKIPPED_STATUSES.includes(status)) return\n\n  const path = templatePath(url)\n  const error = new Error(`HTTP ${status} ${method} ${path}`)\n  error.name = `HTTPError${status}`\n\n  Log.reportError(error, {\n    scope: 'http',\n    tags: {\n      ...SHARED_TAGS,\n      'http.status': String(status),\n      'http.method': method,\n      'http.path': path,\n    },\n  })\n}\n\nfunction reportNetworkError(networkError: Error, method: string, url: string) {\n  const path = templatePath(url)\n  const error = new Error(`Network failure ${method} ${path}: ${networkError.message}`)\n  error.name = 'NetworkError'\n\n  Log.reportError(error, {\n    scope: 'http',\n    tags: {\n      ...SHARED_TAGS,\n      'http.method': method,\n      'http.path': path,\n      'http.error': 'network',\n    },\n  })\n}\n\nfunction templatePath(url: string): string {\n  let path: string\n  try {\n    path = new URL(url).pathname\n  } catch {\n    path = url\n  }\n\n  return path\n    .split('/')\n    .map(segment => (/^\\d+$/.test(segment) ? ':id' : segment))\n    .join('/')\n}\n"]}

package/build/utils/client/request_helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"request_helpers.d.ts","sourceRoot":"","sources":["../../../src/utils/client/request_helpers.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,WAAW,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAExF,MAAM,MAAM,eAAe,GAAG;IAC5B,MAAM,EAAE,KAAK,GAAG,MAAM,GAAG,OAAO,GAAG,QAAQ,CAAA;IAC3C,GAAG,EAAE,MAAM,CAAA;IACX,IAAI,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,CAAA;IAC3B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAChC,CAAA;AAED,eAAO,MAAM,WAAW,GAAI,gCAAkD,eAAe,iBAgC5F,CAAA;AAcD,eAAO,MAAM,aAAa,GAAI,SAAS,WAAW,EAAE,aAAa,WAAW;;;;CAM1E,CAAA;AAEF,KAAK,IAAI,GAAG,CAAC,IAAI,EAAE,eAAe,GAAG,WAAW,KAAK,OAAO,CAAC,GAAG,CAAC,CAAA;AACjE,KAAK,QAAQ,GAAG,eAAe,GAAG;IAChC,IAAI,CAAC,EAAE;QACL,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;KAC7B,CAAA;CACF,CAAA;AAED,eAAO,MAAM,yBAAyB,GAAU,MAAM,IAAI,EAAE,MAAM,QAAQ,iBAuBzE,CAAA;AAED,eAAO,MAAM,cAAc,GAAI,MAAM,IAAI,EAAE,MAAM,QAAQ,iBAG7B,CAAA;AAE5B,eAAO,MAAM,2BAA2B,GAAI,SAAS,OAAO,WAAW,EAAE,MAAM,QAAQ,iBAG3D,CAAA;AAK5B,eAAO,MAAM,iBAAiB,SAbO,IAAI,QAAQ,QAAQ,iBAac,CAAA;AAEvE,eAAO,MAAM,wBAAwB,YAVgB,OAAO,WAAW,QAAQ,QAAQ,iBAUI,CAAA;AAE3F,eAAO,MAAM,uBAAuB,GAAI,KAAK,MAAM,kBAMlD,CAAA;AAED,eAAO,MAAM,kBAAkB,GAAI,MAAM,UAAU,KAAG,WAkBrD,CAAA"}
+{"version":3,"file":"request_helpers.d.ts","sourceRoot":"","sources":["../../../src/utils/client/request_helpers.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,WAAW,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAExF,MAAM,MAAM,eAAe,GAAG;IAC5B,MAAM,EAAE,KAAK,GAAG,MAAM,GAAG,OAAO,GAAG,QAAQ,CAAA;IAC3C,GAAG,EAAE,MAAM,CAAA;IACX,IAAI,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,CAAA;IAC3B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAChC,CAAA;AAED,eAAO,MAAM,WAAW,GAAI,gCAAkD,eAAe,iBAgC5F,CAAA;AAcD,eAAO,MAAM,aAAa,GAAI,SAAS,WAAW,EAAE,aAAa,WAAW;;;;CAM1E,CAAA;AAEF,KAAK,IAAI,GAAG,CAAC,IAAI,EAAE,eAAe,GAAG,WAAW,KAAK,OAAO,CAAC,GAAG,CAAC,CAAA;AACjE,KAAK,QAAQ,GAAG,eAAe,GAAG;IAChC,IAAI,CAAC,EAAE;QACL,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;KAC7B,CAAA;CACF,CAAA;AAED,eAAO,MAAM,yBAAyB,GAAU,MAAM,IAAI,EAAE,MAAM,QAAQ,iBAuBzE,CAAA;AAED,eAAO,MAAM,cAAc,GAAI,MAAM,IAAI,EAAE,MAAM,QAAQ,iBAG7B,CAAA;AAE5B,eAAO,MAAM,2BAA2B,GAAI,SAAS,OAAO,WAAW,EAAE,MAAM,QAAQ,iBAG3D,CAAA;AAK5B,eAAO,MAAM,iBAAiB,SAbO,IAAI,QAAQ,QAAQ,iBAac,CAAA;AAEvE,eAAO,MAAM,wBAAwB,YAVgB,OAAO,WAAW,QAAQ,QAAQ,iBAUI,CAAA;AAE3F,eAAO,MAAM,uBAAuB,GAAI,KAAK,MAAM,kBAMlD,CAAA;AAED,eAAO,MAAM,kBAAkB,GAAI,MAAM,UAAU,KAAG,WAkBrD,CAAA"}

package/build/utils/client/request_helpers.js

@@ -1,5 +1,6 @@
 import _ from 'lodash';
 import URI from 'urijs';
+import { instrumentedFetch } from './instrumented_fetch';
 import { transformRequestData } from './transform_request_data';
 import transformResponse from './transform_response';
 export const makeRequest = ({ action = 'GET', url, data = {}, headers = {} }) => {
@@ -19,7 +20,7 @@ export const makeRequest = ({ action = 'GET', url, data = {}, headers = {} }) =>
         uri = uri.query(combinedQuery);
     }
     const body = ['POST', 'PATCH'].includes(action) ? JSON.stringify(data) : undefined;
-    return fetch(decodeURIComponent(uri.toString()), {
+    return instrumentedFetch(decodeURIComponent(uri.toString()), {
         method: action,
         headers,
         body,

package/build/utils/client/request_helpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"request_helpers.js","sourceRoot":"","sources":["../../../src/utils/client/request_helpers.ts"],"names":[],"mappings":"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","sourcesContent":["import _ from 'lodash'\nimport URI from 'urijs'\nimport { transformRequestData } from './transform_request_data'\nimport transformResponse from './transform_response'\nimport { Accumulator, GetRequest, PostRequest, RequestData, WalkRequest } from './types'\n\nexport type MakeRequestArgs = {\n  action: 'GET' | 'POST' | 'PATCH' | 'DELETE'\n  url: string\n  data?: Partial<RequestData>\n  headers: Record<string, string>\n}\n\nexport const makeRequest = ({ action = 'GET', url, data = {}, headers = {} }: MakeRequestArgs) => {\n  // break apart url so we can reconstruct the url with the query params\n  let uri = new URI(url)\n  const query = transformRequestData(data)\n  const urlQuery = uri.query(true)\n\n  // This likely doesn't matter but will enforce consistent ordering of query params\n  const combinedQuery = Object.entries({ ...query, ...urlQuery })\n    .sort()\n    .reduce((obj, [key, value]) => {\n      // @ts-ignore\n      obj[key] = value\n      return obj\n    }, {})\n\n  if (action === 'GET') {\n    uri = uri.query(combinedQuery)\n  }\n\n  const body = ['POST', 'PATCH'].includes(action) ? JSON.stringify(data) : undefined\n\n  return fetch(decodeURIComponent(uri.toString()), {\n    method: action,\n    headers,\n    body,\n  }).then(response => {\n    if (response.ok) {\n      return response.text().then(t => (t === '' ? '' : JSON.parse(t)))\n    } else {\n      return Promise.reject(response)\n    }\n  })\n}\n\nconst STANDARD_META_ATTRIBUTES = [\n  'total_count',\n  'count',\n  'prev',\n  'next',\n  'can_order_by',\n  'can_query_by',\n  'can_include',\n  'can_filter',\n  'parent',\n]\n\nexport const concatRecords = (records: Accumulator, moreRecords: Accumulator) => ({\n  data: [...records.data, ...moreRecords.data],\n  included: [...records.included, ...moreRecords.included],\n  // Because custom meta can be computed on a per-page bases,\n  // it is safer to remove all custom meta when concatenating multiple pages of data\n  meta: _.pick(moreRecords.meta, STANDARD_META_ATTRIBUTES),\n})\n\ntype Walk = (args: MakeRequestArgs | WalkRequest) => Promise<any>\ntype WalkArgs = MakeRequestArgs & {\n  data?: {\n    fields?: Record<string, any>\n  }\n}\n\nexport const throwErrorIfFieldsMissing = async (walk: Walk, args: WalkArgs) => {\n  const fields = args?.data?.fields\n\n  if (!fields) {\n    throw new Error(`Must pass fields for request: ${args.url}`)\n  }\n\n  const fieldTypes = Object.keys(fields)\n\n  const response = await walk(args)\n\n  const dataTypes = _(response.data).castArray().map('type').value()\n  const includedTypes = _.map(response.included, 'type')\n  const responseTypes = _.uniq(dataTypes.concat(includedTypes))\n  const missingFields = _.difference(responseTypes, fieldTypes).filter(t => t)\n\n  if (missingFields.length > 0) {\n    throw new Error(\n      `Must include fields for types: ${JSON.stringify(missingFields)} for request ${args.url}`\n    )\n  }\n\n  return transformResponse(response)\n}\n\nexport const friendlyErrors = (walk: Walk, args: WalkArgs) =>\n  throwErrorIfQueryParams(args.url)\n    .then(() => throwErrorIfFieldsMissing(walk, args))\n    .then(transformResponse)\n\nexport const noQueryParamsFriendlyErrors = (request: typeof makeRequest, args: WalkArgs) =>\n  throwErrorIfQueryParams(args.url)\n    .then(() => request(args))\n    .then(transformResponse)\n\nconst passthrough = async <T, R>(walk: (args: T) => Promise<R>, args: T) =>\n  Promise.resolve(transformResponse(await walk(args)))\n\nexport const ensureFieldsInDev = __DEV__ ? friendlyErrors : passthrough\n\nexport const ensureNoQueryParamsInDev = __DEV__ ? noQueryParamsFriendlyErrors : passthrough\n\nexport const throwErrorIfQueryParams = (url: string) => {\n  if (new URI(url).search().length) {\n    throw new Error('Must pass query params as data arg')\n  }\n\n  return Promise.resolve()\n}\n\nexport const transformGetToPost = (args: GetRequest): PostRequest => {\n  const { data, ...rest } = args\n  const { fields, include } = data\n  const fieldsArray = Object.entries(fields).map(([key, value]) => {\n    if (Array.isArray(value)) {\n      return [key, value.join(',')]\n    }\n\n    return [key, value]\n  })\n\n  return {\n    ...rest,\n    data: {\n      fields: Object.fromEntries(fieldsArray),\n      include,\n    },\n  }\n}\n"]}
+{"version":3,"file":"request_helpers.js","sourceRoot":"","sources":["../../../src/utils/client/request_helpers.ts"],"names":[],"mappings":"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","sourcesContent":["import _ from 'lodash'\nimport URI from 'urijs'\nimport { instrumentedFetch } from './instrumented_fetch'\nimport { transformRequestData } from './transform_request_data'\nimport transformResponse from './transform_response'\nimport { Accumulator, GetRequest, PostRequest, RequestData, WalkRequest } from './types'\n\nexport type MakeRequestArgs = {\n  action: 'GET' | 'POST' | 'PATCH' | 'DELETE'\n  url: string\n  data?: Partial<RequestData>\n  headers: Record<string, string>\n}\n\nexport const makeRequest = ({ action = 'GET', url, data = {}, headers = {} }: MakeRequestArgs) => {\n  // break apart url so we can reconstruct the url with the query params\n  let uri = new URI(url)\n  const query = transformRequestData(data)\n  const urlQuery = uri.query(true)\n\n  // This likely doesn't matter but will enforce consistent ordering of query params\n  const combinedQuery = Object.entries({ ...query, ...urlQuery })\n    .sort()\n    .reduce((obj, [key, value]) => {\n      // @ts-ignore\n      obj[key] = value\n      return obj\n    }, {})\n\n  if (action === 'GET') {\n    uri = uri.query(combinedQuery)\n  }\n\n  const body = ['POST', 'PATCH'].includes(action) ? JSON.stringify(data) : undefined\n\n  return instrumentedFetch(decodeURIComponent(uri.toString()), {\n    method: action,\n    headers,\n    body,\n  }).then(response => {\n    if (response.ok) {\n      return response.text().then(t => (t === '' ? '' : JSON.parse(t)))\n    } else {\n      return Promise.reject(response)\n    }\n  })\n}\n\nconst STANDARD_META_ATTRIBUTES = [\n  'total_count',\n  'count',\n  'prev',\n  'next',\n  'can_order_by',\n  'can_query_by',\n  'can_include',\n  'can_filter',\n  'parent',\n]\n\nexport const concatRecords = (records: Accumulator, moreRecords: Accumulator) => ({\n  data: [...records.data, ...moreRecords.data],\n  included: [...records.included, ...moreRecords.included],\n  // Because custom meta can be computed on a per-page bases,\n  // it is safer to remove all custom meta when concatenating multiple pages of data\n  meta: _.pick(moreRecords.meta, STANDARD_META_ATTRIBUTES),\n})\n\ntype Walk = (args: MakeRequestArgs | WalkRequest) => Promise<any>\ntype WalkArgs = MakeRequestArgs & {\n  data?: {\n    fields?: Record<string, any>\n  }\n}\n\nexport const throwErrorIfFieldsMissing = async (walk: Walk, args: WalkArgs) => {\n  const fields = args?.data?.fields\n\n  if (!fields) {\n    throw new Error(`Must pass fields for request: ${args.url}`)\n  }\n\n  const fieldTypes = Object.keys(fields)\n\n  const response = await walk(args)\n\n  const dataTypes = _(response.data).castArray().map('type').value()\n  const includedTypes = _.map(response.included, 'type')\n  const responseTypes = _.uniq(dataTypes.concat(includedTypes))\n  const missingFields = _.difference(responseTypes, fieldTypes).filter(t => t)\n\n  if (missingFields.length > 0) {\n    throw new Error(\n      `Must include fields for types: ${JSON.stringify(missingFields)} for request ${args.url}`\n    )\n  }\n\n  return transformResponse(response)\n}\n\nexport const friendlyErrors = (walk: Walk, args: WalkArgs) =>\n  throwErrorIfQueryParams(args.url)\n    .then(() => throwErrorIfFieldsMissing(walk, args))\n    .then(transformResponse)\n\nexport const noQueryParamsFriendlyErrors = (request: typeof makeRequest, args: WalkArgs) =>\n  throwErrorIfQueryParams(args.url)\n    .then(() => request(args))\n    .then(transformResponse)\n\nconst passthrough = async <T, R>(walk: (args: T) => Promise<R>, args: T) =>\n  Promise.resolve(transformResponse(await walk(args)))\n\nexport const ensureFieldsInDev = __DEV__ ? friendlyErrors : passthrough\n\nexport const ensureNoQueryParamsInDev = __DEV__ ? noQueryParamsFriendlyErrors : passthrough\n\nexport const throwErrorIfQueryParams = (url: string) => {\n  if (new URI(url).search().length) {\n    throw new Error('Must pass query params as data arg')\n  }\n\n  return Promise.resolve()\n}\n\nexport const transformGetToPost = (args: GetRequest): PostRequest => {\n  const { data, ...rest } = args\n  const { fields, include } = data\n  const fieldsArray = Object.entries(fields).map(([key, value]) => {\n    if (Array.isArray(value)) {\n      return [key, value.join(',')]\n    }\n\n    return [key, value]\n  })\n\n  return {\n    ...rest,\n    data: {\n      fields: Object.fromEntries(fieldsArray),\n      include,\n    },\n  }\n}\n"]}

package/build/utils/native_adapters/log.d.ts

@@ -1,4 +1,4 @@
-export type ReportErrorScope = 'screen' | 'message' | 'http';
+export type ReportErrorScope = 'screen' | 'component' | 'http';
 export type ReportErrorContext = {
     componentStack?: string;
     scope?: ReportErrorScope;

package/build/utils/native_adapters/log.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"log.d.ts","sourceRoot":"","sources":["../../../src/utils/native_adapters/log.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,gBAAgB,GAAG,QAAQ,GAAG,SAAS,GAAG,MAAM,CAAA;AAE5D,MAAM,MAAM,kBAAkB,GAAG;IAC/B,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,KAAK,CAAC,EAAE,gBAAgB,CAAA;IACxB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC7B,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAChC,CAAA;AAED,UAAU,gBAAgB;IACxB,OAAO,EAAE,OAAO,CAAA;IAChB,KAAK,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAA;IAChD,IAAI,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAA;IAC/C,WAAW,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,EAAE,kBAAkB,KAAK,IAAI,CAAA;CAClE;AAED,qBAAa,UAAU;IACrB,OAAO,EAAE,OAAO,CAAA;IAChB,OAAO,CAAC,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAA;IACnC,MAAM,CAAC,EAAE,gBAAgB,CAAC,MAAM,CAAC,CAAA;IACjC,aAAa,CAAC,EAAE,gBAAgB,CAAC,aAAa,CAAC,CAAA;gBAEnC,MAAM,GAAE,OAAO,CAAC,gBAAgB,CAAM;IAOlD,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE;IAMrC,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE;IAMpC,WAAW,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,EAAE,kBAAkB;CAQvD"}
+{"version":3,"file":"log.d.ts","sourceRoot":"","sources":["../../../src/utils/native_adapters/log.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,gBAAgB,GAAG,QAAQ,GAAG,WAAW,GAAG,MAAM,CAAA;AAE9D,MAAM,MAAM,kBAAkB,GAAG;IAC/B,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,KAAK,CAAC,EAAE,gBAAgB,CAAA;IACxB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC7B,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAChC,CAAA;AAED,UAAU,gBAAgB;IACxB,OAAO,EAAE,OAAO,CAAA;IAChB,KAAK,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAA;IAChD,IAAI,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAA;IAC/C,WAAW,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,EAAE,kBAAkB,KAAK,IAAI,CAAA;CAClE;AAED,qBAAa,UAAU;IACrB,OAAO,EAAE,OAAO,CAAA;IAChB,OAAO,CAAC,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAA;IACnC,MAAM,CAAC,EAAE,gBAAgB,CAAC,MAAM,CAAC,CAAA;IACjC,aAAa,CAAC,EAAE,gBAAgB,CAAC,aAAa,CAAC,CAAA;gBAEnC,MAAM,GAAE,OAAO,CAAC,gBAAgB,CAAM;IAOlD,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE;IAMrC,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE;IAMpC,WAAW,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,EAAE,kBAAkB;CAQvD"}

package/build/utils/native_adapters/log.js.map

@@ -1 +1 @@
-{"version":3,"file":"log.js","sourceRoot":"","sources":["../../../src/utils/native_adapters/log.ts"],"names":[],"mappings":"AAiBA,MAAM,OAAO,UAAU;IACrB,OAAO,CAAS;IAChB,OAAO,CAA4B;IACnC,MAAM,CAA2B;IACjC,aAAa,CAAkC;IAE/C,YAAY,SAAoC,EAAE;QAChD,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,IAAI,KAAK,CAAA;QACtC,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,KAAK,CAAA;QAC3B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,IAAI,CAAA;QACzB,IAAI,CAAC,aAAa,GAAG,MAAM,CAAC,WAAW,CAAA;IACzC,CAAC;IAED,KAAK,CAAC,OAAe,EAAE,GAAG,IAAW;QACnC,IAAI,CAAC,IAAI,CAAC,OAAO;YAAE,OAAM;QAEzB,IAAI,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAA;IAClC,CAAC;IAED,IAAI,CAAC,OAAe,EAAE,GAAG,IAAW;QAClC,IAAI,CAAC,IAAI,CAAC,OAAO;YAAE,OAAM;QAEzB,IAAI,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAA;IACjC,CAAC;IAED,WAAW,CAAC,KAAY,EAAE,OAA4B;QACpD,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;YACvB,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,OAAO,CAAC,CAAA;YAClC,OAAM;QACR,CAAC;QAED,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE,OAAO,CAAC,CAAA;IAC/B,CAAC;CACF","sourcesContent":["export type ReportErrorScope = 'screen' | 'message' | 'http'\n\nexport type ReportErrorContext = {\n  componentStack?: string\n  scope?: ReportErrorScope\n  screenName?: string\n  tags?: Record<string, string>\n  extra?: Record<string, unknown>\n}\n\ninterface LogAdapterConfig {\n  enabled: boolean\n  error: (message: string, ...args: any[]) => void\n  info: (message: string, ...args: any[]) => void\n  reportError: (error: Error, context?: ReportErrorContext) => void\n}\n\nexport class LogAdapter {\n  enabled: boolean\n  onError?: LogAdapterConfig['error']\n  onInfo?: LogAdapterConfig['info']\n  onReportError?: LogAdapterConfig['reportError']\n\n  constructor(config: Partial<LogAdapterConfig> = {}) {\n    this.enabled = config.enabled ?? false\n    this.onError = config.error\n    this.onInfo = config.info\n    this.onReportError = config.reportError\n  }\n\n  error(message: string, ...args: any[]) {\n    if (!this.enabled) return\n\n    this.onError?.(message, ...args)\n  }\n\n  info(message: string, ...args: any[]) {\n    if (!this.enabled) return\n\n    this.onInfo?.(message, ...args)\n  }\n\n  reportError(error: Error, context?: ReportErrorContext) {\n    if (this.onReportError) {\n      this.onReportError(error, context)\n      return\n    }\n\n    console.error(error, context)\n  }\n}\n"]}
+{"version":3,"file":"log.js","sourceRoot":"","sources":["../../../src/utils/native_adapters/log.ts"],"names":[],"mappings":"AAiBA,MAAM,OAAO,UAAU;IACrB,OAAO,CAAS;IAChB,OAAO,CAA4B;IACnC,MAAM,CAA2B;IACjC,aAAa,CAAkC;IAE/C,YAAY,SAAoC,EAAE;QAChD,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,IAAI,KAAK,CAAA;QACtC,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,KAAK,CAAA;QAC3B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,IAAI,CAAA;QACzB,IAAI,CAAC,aAAa,GAAG,MAAM,CAAC,WAAW,CAAA;IACzC,CAAC;IAED,KAAK,CAAC,OAAe,EAAE,GAAG,IAAW;QACnC,IAAI,CAAC,IAAI,CAAC,OAAO;YAAE,OAAM;QAEzB,IAAI,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAA;IAClC,CAAC;IAED,IAAI,CAAC,OAAe,EAAE,GAAG,IAAW;QAClC,IAAI,CAAC,IAAI,CAAC,OAAO;YAAE,OAAM;QAEzB,IAAI,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAA;IACjC,CAAC;IAED,WAAW,CAAC,KAAY,EAAE,OAA4B;QACpD,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;YACvB,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,OAAO,CAAC,CAAA;YAClC,OAAM;QACR,CAAC;QAED,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE,OAAO,CAAC,CAAA;IAC/B,CAAC;CACF","sourcesContent":["export type ReportErrorScope = 'screen' | 'component' | 'http'\n\nexport type ReportErrorContext = {\n  componentStack?: string\n  scope?: ReportErrorScope\n  screenName?: string\n  tags?: Record<string, string>\n  extra?: Record<string, unknown>\n}\n\ninterface LogAdapterConfig {\n  enabled: boolean\n  error: (message: string, ...args: any[]) => void\n  info: (message: string, ...args: any[]) => void\n  reportError: (error: Error, context?: ReportErrorContext) => void\n}\n\nexport class LogAdapter {\n  enabled: boolean\n  onError?: LogAdapterConfig['error']\n  onInfo?: LogAdapterConfig['info']\n  onReportError?: LogAdapterConfig['reportError']\n\n  constructor(config: Partial<LogAdapterConfig> = {}) {\n    this.enabled = config.enabled ?? false\n    this.onError = config.error\n    this.onInfo = config.info\n    this.onReportError = config.reportError\n  }\n\n  error(message: string, ...args: any[]) {\n    if (!this.enabled) return\n\n    this.onError?.(message, ...args)\n  }\n\n  info(message: string, ...args: any[]) {\n    if (!this.enabled) return\n\n    this.onInfo?.(message, ...args)\n  }\n\n  reportError(error: Error, context?: ReportErrorContext) {\n    if (this.onReportError) {\n      this.onReportError(error, context)\n      return\n    }\n\n    console.error(error, context)\n  }\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@planningcenter/chat-react-native",
-  "version": "3.37.0-rc.2",
+  "version": "3.37.0-rc.4",
   "description": "",
   "main": "build/index.js",
   "react-native": "./src/index.tsx",
@@ -72,5 +72,5 @@
     "react-native-url-polyfill": "^2.0.0",
     "typescript": "~5.9.2"
   },
-  "gitHead": "13e581dd9640a86feea850c6f0d1c34e7b0357cd"
+  "gitHead": "47b2675fc5a5c7b4dcca6a62690fe01a4e4151f1"
 }

package/src/components/conversation/message.tsx

@@ -31,7 +31,7 @@ import {
   MESSAGE_AUTHOR_AVATAR_COLUMN_WIDTH,
   platformFontWeightMedium,
 } from '../../utils/styles'
-import ErrorBoundary from '../page/error_boundary'
+import { ComponentErrorBoundary } from '../page/component_error_boundary'
 import { MessageAttachments } from './message_attachments'
 import { MessageMarkdown } from './message_markdown'
 import { MessageReadReceipts } from './message_read_receipts'
@@ -103,7 +103,9 @@ export function Message({
   const messageIsReplyLabel = replyToReplyRootMessage ? 'Reply' : ''
   const attachmentLabel = some(attachments) ? pluralize(attachments.length, 'attachment') : ''
   const replyCountLabel = isReplyRootMessage ? replyCountText : ''
-  const accessibilityLabel = `${author?.name || ''} ${messageIsReplyLabel} ${attachmentLabel} ${messageText || ''} ${timestamp} ${replyCountLabel}`
+  const accessibilityLabel = `${author?.name || ''} ${messageIsReplyLabel} ${attachmentLabel} ${
+    messageText || ''
+  } ${timestamp} ${replyCountLabel}`
 
   useEffect(() => {
     if (pending) {
@@ -237,14 +239,14 @@ export function Message({
               </View>
             ) : (
               <>
-                <ErrorBoundary>
+                <ComponentErrorBoundary>
                   <MessageAttachments
                     attachments={attachments}
                     metaProps={metaProps}
                     onMessageAttachmentLongPress={handleMessageAttachmentLongPress}
                     onMessageLongPress={handleMessageLongPress}
                   />
-                </ErrorBoundary>
+                </ComponentErrorBoundary>
                 {text && (
                   <View style={styles.messageText}>
                     <MessageMarkdown text={text} />

package/src/components/index.tsx

@@ -1,4 +1,6 @@
 export * from './conversations/conversations'
+export * from './page/component_error_boundary'
 export * from './page/error_boundary'
+export * from './page/page_error_boundary'
 export * from './display'
 export * from './group_conversation_list'

package/src/components/page/__tests__/component_error_boundary.test.tsx

@@ -0,0 +1,46 @@
+import { render } from '@testing-library/react-native'
+import React from 'react'
+import { Text } from 'react-native'
+import { Log } from '../../../utils/native_adapters/configuration'
+import { ComponentErrorBoundary } from '../component_error_boundary'
+
+function Boom({ thrown }: { thrown: unknown }) {
+  throw thrown
+}
+
+describe('ComponentErrorBoundary', () => {
+  let reportError: jest.SpyInstance
+  let consoleError: jest.SpyInstance
+
+  beforeEach(() => {
+    reportError = jest.spyOn(Log, 'reportError').mockImplementation(() => {})
+    consoleError = jest.spyOn(console, 'error').mockImplementation(() => {})
+  })
+
+  afterEach(() => {
+    reportError.mockRestore()
+    consoleError.mockRestore()
+  })
+
+  it('defaults the reporter scope to "component" and renders nothing on catch', () => {
+    const { toJSON } = render(
+      <ComponentErrorBoundary>
+        <Boom thrown={new Error('attachment boom')} />
+      </ComponentErrorBoundary>
+    )
+
+    expect(toJSON()).toBeNull()
+    expect(reportError.mock.calls[0][1]).toMatchObject({ scope: 'component' })
+  })
+
+  it('lets callers override the defaults', () => {
+    const { getByText } = render(
+      <ComponentErrorBoundary scope="screen" fallback={<Text>overridden</Text>}>
+        <Boom thrown={new Error('boom')} />
+      </ComponentErrorBoundary>
+    )
+
+    expect(getByText('overridden')).toBeTruthy()
+    expect(reportError.mock.calls[0][1]).toMatchObject({ scope: 'screen' })
+  })
+})

package/src/components/page/__tests__/error_boundary.test.tsx

@@ -0,0 +1,93 @@
+import { render } from '@testing-library/react-native'
+import React from 'react'
+import { Text } from 'react-native'
+import { FailedResponse } from '../../../types/api_primitives'
+import { Log } from '../../../utils/native_adapters/configuration'
+import { ResponseError } from '../../../utils/response_error'
+import { ErrorBoundary } from '../error_boundary'
+
+function Boom({ thrown }: { thrown: unknown }) {
+  throw thrown
+}
+
+describe('ErrorBoundary', () => {
+  let reportError: jest.SpyInstance
+  let consoleError: jest.SpyInstance
+
+  beforeEach(() => {
+    reportError = jest.spyOn(Log, 'reportError').mockImplementation(() => {})
+    consoleError = jest.spyOn(console, 'error').mockImplementation(() => {})
+  })
+
+  afterEach(() => {
+    reportError.mockRestore()
+    consoleError.mockRestore()
+  })
+
+  it('reports caught errors with the component stack and chat tags', () => {
+    const error = new TypeError('Invalid time value')
+
+    render(
+      <ErrorBoundary scope="screen" screenName="ConversationScreen" fallback={null}>
+        <Boom thrown={error} />
+      </ErrorBoundary>
+    )
+
+    expect(reportError).toHaveBeenCalledTimes(1)
+    const [reportedError, context] = reportError.mock.calls[0]
+    expect(reportedError).toBe(error)
+    expect(context).toMatchObject({
+      scope: 'screen',
+      screenName: 'ConversationScreen',
+      tags: { team: 'chat', package: 'chat-react-native' },
+    })
+    expect(typeof context.componentStack).toBe('string')
+    expect(context.componentStack.length).toBeGreaterThan(0)
+  })
+
+  it('does not report ResponseError — those are owned by the HTTP layer', () => {
+    const failure = { status: 500, statusText: 'Server Error', errors: [] } as FailedResponse
+
+    render(
+      <ErrorBoundary fallback={null}>
+        <Boom thrown={new ResponseError(failure)} />
+      </ErrorBoundary>
+    )
+
+    expect(reportError).not.toHaveBeenCalled()
+  })
+
+  it('renders the provided fallback element when a child throws', () => {
+    const { getByText } = render(
+      <ErrorBoundary fallback={<Text>custom fallback</Text>}>
+        <Boom thrown={new Error('boom')} />
+      </ErrorBoundary>
+    )
+
+    expect(getByText('custom fallback')).toBeTruthy()
+  })
+
+  it('renders nothing when no fallback is provided', () => {
+    const { toJSON } = render(
+      <ErrorBoundary>
+        <Boom thrown={new Error('boom')} />
+      </ErrorBoundary>
+    )
+
+    expect(toJSON()).toBeNull()
+  })
+
+  it('calls a fallback render function with the caught error and a reset handler', () => {
+    const fallback = jest.fn().mockReturnValue(<Text>fn fallback</Text>)
+    const error = new Error('boom')
+
+    const { getByText } = render(
+      <ErrorBoundary fallback={fallback}>
+        <Boom thrown={error} />
+      </ErrorBoundary>
+    )
+
+    expect(getByText('fn fallback')).toBeTruthy()
+    expect(fallback).toHaveBeenCalledWith(error, expect.any(Function))
+  })
+})

package/src/components/page/__tests__/page_error_boundary.test.tsx

@@ -0,0 +1,77 @@
+import { NavigationContainer } from '@react-navigation/native'
+import { QueryClientProvider } from '@tanstack/react-query'
+import { render } from '@testing-library/react-native'
+import React from 'react'
+import { buildTestQueryClient } from '../../../__utils__/query_client'
+import { Log } from '../../../utils/native_adapters/configuration'
+import { PageErrorBoundary } from '../page_error_boundary'
+
+jest.mock('../../primitive/blank_state_primitive', () => {
+  const { Text } = require('react-native')
+  const { createElement } = require('react')
+  const passthrough = ({ children }: { children?: unknown }) => children
+  const asText = ({ children }: { children?: unknown }) => createElement(Text, null, children)
+  const empty = () => null
+  return {
+    __esModule: true,
+    default: {
+      Root: passthrough,
+      Imagery: empty,
+      Content: passthrough,
+      Heading: asText,
+      Text: asText,
+      Button: empty,
+      TextButton: asText,
+    },
+  }
+})
+
+function Boom({ thrown }: { thrown: unknown }) {
+  throw thrown
+}
+
+const renderWithProviders = (ui: React.ReactElement) =>
+  render(
+    <QueryClientProvider client={buildTestQueryClient()}>
+      <NavigationContainer>{ui}</NavigationContainer>
+    </QueryClientProvider>
+  )
+
+describe('PageErrorBoundary', () => {
+  let reportError: jest.SpyInstance
+  let consoleError: jest.SpyInstance
+
+  beforeEach(() => {
+    reportError = jest.spyOn(Log, 'reportError').mockImplementation(() => {})
+    consoleError = jest.spyOn(console, 'error').mockImplementation(() => {})
+  })
+
+  afterEach(() => {
+    reportError.mockRestore()
+    consoleError.mockRestore()
+  })
+
+  it('defaults the reporter scope to "screen"', () => {
+    renderWithProviders(
+      <PageErrorBoundary screenName="ConversationScreen">
+        <Boom thrown={new Error('boom')} />
+      </PageErrorBoundary>
+    )
+
+    expect(reportError.mock.calls[0][1]).toMatchObject({
+      scope: 'screen',
+      screenName: 'ConversationScreen',
+    })
+  })
+
+  it('renders the full Oops fallback when no fallback is provided', () => {
+    const { getByText } = renderWithProviders(
+      <PageErrorBoundary>
+        <Boom thrown={new Error('boom')} />
+      </PageErrorBoundary>
+    )
+
+    expect(getByText('Oops!')).toBeTruthy()
+    expect(getByText('Something unexpected happened.')).toBeTruthy()
+  })
+})

package/src/components/page/component_error_boundary.tsx

@@ -0,0 +1,13 @@
+import React, { PropsWithChildren } from 'react'
+import { ErrorBoundary, ErrorBoundaryProps } from './error_boundary'
+
+export function ComponentErrorBoundary({
+  children,
+  ...props
+}: PropsWithChildren<ErrorBoundaryProps>) {
+  return (
+    <ErrorBoundary scope="component" fallback={null} {...props}>
+      {children}
+    </ErrorBoundary>
+  )
+}

package/src/components/page/error_boundary.tsx

@@ -1,137 +1,53 @@
-import { useNavigation } from '@react-navigation/native'
-import { useQueryErrorResetBoundary } from '@tanstack/react-query'
-import React, { PropsWithChildren, useCallback, useEffect, useMemo } from 'react'
-import { onAuthRefresh } from '../../utils/auth_events'
+import React, { PropsWithChildren } from 'react'
+import { Log } from '../../utils/native_adapters/configuration'
+import { ReportErrorScope } from '../../utils/native_adapters/log'
 import { ResponseError } from '../../utils/response_error'
-import BlankState from '../primitive/blank_state_primitive'
+
+export type ErrorBoundaryFallback =
+  | React.ReactNode
+  | ((error: Error, reset: () => void) => React.ReactNode)
+
+export type ErrorBoundaryProps = {
+  scope?: ReportErrorScope
+  screenName?: string
+  fallback?: ErrorBoundaryFallback
+}
 
 type ErrorBoundaryState = {
-  error: ResponseError | Error | TypeError | null
-  unsubscriber: () => void
+  error: Error | null
 }
 
-class ErrorBoundary extends React.Component<PropsWithChildren<{ onReset?: () => void }>> {
-  state: ErrorBoundaryState = {
-    error: null,
-    unsubscriber: () => {},
-  }
+export class ErrorBoundary extends React.Component<
+  PropsWithChildren<ErrorBoundaryProps>,
+  ErrorBoundaryState
+> {
+  state: ErrorBoundaryState = { error: null }
 
-  componentDidCatch(error: any) {
-    this.handleError(error)
+  static getDerivedStateFromError(error: Error): ErrorBoundaryState {
+    return { error }
   }
 
-  handleError(error: any) {
-    this.setState({ error })
+  componentDidCatch(error: Error, errorInfo: React.ErrorInfo) {
+    if (error instanceof ResponseError) return
+
+    Log.reportError(error, {
+      componentStack: errorInfo.componentStack ?? undefined,
+      scope: this.props.scope,
+      screenName: this.props.screenName,
+      tags: { team: 'chat', package: 'chat-react-native' },
+    })
   }
 
   handleReset = () => {
-    this.props.onReset?.()
     this.setState({ error: null })
   }
 
   render() {
-    if (this.state.error) {
-      return <ErrorView error={this.state.error} onReset={this.handleReset} />
-    } else {
-      return this.props.children
-    }
-  }
-}
+    if (!this.state.error) return this.props.children
 
-function ErrorView({ error, onReset }: { error: Error | ResponseError; onReset: () => void }) {
-  const { reset } = useQueryErrorResetBoundary()
+    const { fallback } = this.props
+    if (fallback === undefined) return null
 
-  const handleReset = useCallback(() => {
-    reset()
-    onReset()
-  }, [reset, onReset])
-
-  useEffect(() => handleReset, [handleReset])
-
-  if (error instanceof ResponseError) {
-    return <ResponseErrorView response={error.response} onReset={handleReset} />
-  }
-
-  if (isNetworkError(error)) {
-    return (
-      <ErrorContent
-        heading={'Problem connecting!'}
-        body={'Check your internet connection and try again.'}
-      />
-    )
+    return typeof fallback === 'function' ? fallback(this.state.error, this.handleReset) : fallback
   }
-
-  return <ErrorContent heading={'Oops!'} body={'Something unexpected happened.'} />
 }
-
-function isNetworkError(error: ResponseError | Error | TypeError | null) {
-  const isError = error instanceof Error
-  const networkFailedMessages = [
-    'Network request failed',
-    'Network request timed out',
-    'Failed to fetch',
-  ]
-
-  if (!isError) return false
-
-  return new RegExp(networkFailedMessages.join('|'), 'i').test(error.message)
-}
-
-function ResponseErrorView({ response, onReset }: { response: Response; onReset: () => void }) {
-  const { status } = response
-
-  const heading = useMemo(() => {
-    switch (status) {
-      case 403:
-        return 'Permission required'
-      case 404:
-        return 'Content not found'
-      default:
-        return 'Oops!'
-    }
-  }, [status])
-
-  const body = useMemo(() => {
-    switch (status) {
-      case 403:
-        return 'Contact your administrator for access.'
-      case 404:
-        return 'If you believe something should be here, please reach out to your administrator.'
-      default:
-        return 'Something unexpected happened.'
-    }
-  }, [status])
-
-  useEffect(() => {
-    if (status !== 401) return
-
-    return onAuthRefresh(onReset)
-  }, [status, onReset])
-
-  return <ErrorContent heading={heading} body={body} />
-}
-
-function ErrorContent({ heading, body }: { heading: string; body: string }) {
-  const navigation = useNavigation()
-
-  return (
-    <BlankState.Root>
-      <BlankState.Imagery name="people.noTextMessage" />
-      <BlankState.Content>
-        <BlankState.Heading>{heading}</BlankState.Heading>
-        <BlankState.Text>{body}</BlankState.Text>
-      </BlankState.Content>
-      <BlankState.Button
-        title="Go back"
-        onPress={navigation.goBack}
-        size="md"
-        accessibilityRole="link"
-      />
-      <BlankState.TextButton onPress={() => navigation.navigate('BugReport')}>
-        Report a bug
-      </BlankState.TextButton>
-    </BlankState.Root>
-  )
-}
-
-export default ErrorBoundary