From 8ebd2076c7b2b325a45829ae5971bec4d3cc643f Mon Sep 17 00:00:00 2001
From: vineyardbovines <spencerfpope@gmail.com>
Date: Thu, 2 Apr 2026 13:58:25 -0400
Subject: [PATCH] fix typings

---
 eslint.config.mjs                                      | 2 ++
 src/components/ageAssurance/AgeAssuranceInitDialog.tsx | 2 +-
 src/components/moderation/LabelsOnMeDialog.tsx         | 2 +-
 src/lib/strings/errors.ts                              | 2 +-
 src/state/messages/convo/agent.ts                      | 2 +-
 src/view/com/util/List.tsx                             | 4 ++--
 6 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/eslint.config.mjs b/eslint.config.mjs
index abfdd4a013..4fe4ff14b5 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -198,6 +198,8 @@ export default defineConfig(
           // this is a dep for @atproto/api, but we absolutely need them in sync, so just
           // rely on the transient version
           '@atproto/common-web',
+          // XRPCError is no longer re-exported from @atproto/api
+          '@atproto/xrpc',
         ]
       }],
       'import-x/no-nodejs-modules': 'error',
diff --git a/src/components/ageAssurance/AgeAssuranceInitDialog.tsx b/src/components/ageAssurance/AgeAssuranceInitDialog.tsx
index 15e3a2b472..bf79f5dfc4 100644
--- a/src/components/ageAssurance/AgeAssuranceInitDialog.tsx
+++ b/src/components/ageAssurance/AgeAssuranceInitDialog.tsx
@@ -1,6 +1,6 @@
 import {useState} from 'react'
 import {View} from 'react-native'
-import {XRPCError} from '@atproto/api'
+import {XRPCError} from '@atproto/xrpc'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
diff --git a/src/components/moderation/LabelsOnMeDialog.tsx b/src/components/moderation/LabelsOnMeDialog.tsx
index 83fe2e4019..c750079d1e 100644
--- a/src/components/moderation/LabelsOnMeDialog.tsx
+++ b/src/components/moderation/LabelsOnMeDialog.tsx
@@ -1,7 +1,7 @@
 import {useCallback, useMemo, useState} from 'react'
 import {View} from 'react-native'
 import {type ComAtprotoLabelDefs, ToolsOzoneReportDefs} from '@atproto/api'
-import {XRPCError} from '@atproto/api'
+import {XRPCError} from '@atproto/xrpc'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
diff --git a/src/lib/strings/errors.ts b/src/lib/strings/errors.ts
index 5f56cccc4d..f3a91e58dd 100644
--- a/src/lib/strings/errors.ts
+++ b/src/lib/strings/errors.ts
@@ -1,4 +1,4 @@
-import {XRPCError} from '@atproto/api'
+import {XRPCError} from '@atproto/xrpc'
 import {t} from '@lingui/core/macro'
 
 export function cleanError(str: any): string {
diff --git a/src/state/messages/convo/agent.ts b/src/state/messages/convo/agent.ts
index b6c8ee2f16..43fc402b49 100644
--- a/src/state/messages/convo/agent.ts
+++ b/src/state/messages/convo/agent.ts
@@ -5,7 +5,7 @@ import {
   type ChatBskyConvoGetLog,
   type ChatBskyConvoSendMessage,
 } from '@atproto/api'
-import {XRPCError} from '@atproto/api'
+import {XRPCError} from '@atproto/xrpc'
 import {EventEmitter} from 'eventemitter3'
 import {nanoid} from 'nanoid/non-secure'
 
diff --git a/src/view/com/util/List.tsx b/src/view/com/util/List.tsx
index 3afb2a9668..6b0453f00c 100644
--- a/src/view/com/util/List.tsx
+++ b/src/view/com/util/List.tsx
@@ -186,8 +186,8 @@ let List = forwardRef<ListMethods, ListProps>(
         scrollEventThrottle={1}
         style={style}
         ref={node => {
-          localRef.current = node
-          if (typeof ref === 'function') ref(node)
+          localRef.current = node as FlatList_INTERNAL | null
+          if (typeof ref === 'function') ref(node as FlatList_INTERNAL | null)
           else if (ref) (ref as React.MutableRefObject<any>).current = node
         }}
       />