Chat: more type fixes

src/components/dms/ConvoMenu.tsx

@@ -1,10 +1,6 @@
 import React, {useCallback} from 'react'
 import {Keyboard, Pressable, View} from 'react-native'
-import {
+import {ChatBskyConvoDefs, ModerationCause} from '@atproto/api'
-  AppBskyActorDefs,
-  ChatBskyConvoDefs,
-  ModerationCause,
-} from '@atproto/api'
 import {msg, Trans} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
 import {useNavigation} from '@react-navigation/native'
@@ -34,6 +30,7 @@ import {
 import {SpeakerVolumeFull_Stroke2_Corner0_Rounded as Unmute} from '#/components/icons/Speaker'
 import * as Menu from '#/components/Menu'
 import * as Prompt from '#/components/Prompt'
+import * as atp from '#/types/atproto'
 import {Bubble_Stroke2_Corner2_Rounded as Bubble} from '../icons/Bubble'
 
 let ConvoMenu = ({
@@ -47,7 +44,7 @@ let ConvoMenu = ({
   style,
 }: {
   convo: ChatBskyConvoDefs.ConvoView
-  profile: Shadow<AppBskyActorDefs.ProfileViewBasic>
+  profile: Shadow<atp.profile.AnyProfileView>
   control?: Menu.MenuControlProps
   currentScreen: 'list' | 'conversation'
   showMarkAsRead?: boolean

src/components/dms/MessagesListBlockedFooter.tsx

@@ -1,6 +1,6 @@
 import React from 'react'
 import {View} from 'react-native'
-import {AppBskyActorDefs, ModerationCause} from '@atproto/api'
+import {ModerationCause} from '@atproto/api'
 import {msg, Trans} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
 
@@ -14,6 +14,7 @@ import {BlockedByListDialog} from '#/components/dms/BlockedByListDialog'
 import {LeaveConvoPrompt} from '#/components/dms/LeaveConvoPrompt'
 import {ReportConversationPrompt} from '#/components/dms/ReportConversationPrompt'
 import {Text} from '#/components/Typography'
+import * as atp from '#/types/atproto'
 
 export function MessagesListBlockedFooter({
   recipient: initialRecipient,
@@ -21,7 +22,7 @@ export function MessagesListBlockedFooter({
   hasMessages,
   blockInfo,
 }: {
-  recipient: AppBskyActorDefs.ProfileViewBasic
+  recipient: atp.profile.AnyProfileView
   convoId: string
   hasMessages: boolean
   blockInfo: {

src/components/dms/MessagesListHeader.tsx

@@ -1,10 +1,6 @@
 import React, {useCallback} from 'react'
 import {TouchableOpacity, View} from 'react-native'
-import {
+import {ModerationCause, ModerationDecision} from '@atproto/api'
-  AppBskyActorDefs,
-  ModerationCause,
-  ModerationDecision,
-} from '@atproto/api'
 import {FontAwesomeIcon} from '@fortawesome/react-native-fontawesome'
 import {msg} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
@@ -24,6 +20,7 @@ import {Bell2Off_Filled_Corner0_Rounded as BellStroke} from '#/components/icons/
 import {Link} from '#/components/Link'
 import {PostAlerts} from '#/components/moderation/PostAlerts'
 import {Text} from '#/components/Typography'
+import * as atp from '#/types/atproto'
 
 const PFP_SIZE = isWeb ? 40 : 34
 
@@ -32,7 +29,7 @@ export let MessagesListHeader = ({
   moderation,
   blockInfo,
 }: {
-  profile?: AppBskyActorDefs.ProfileViewBasic
+  profile?: atp.profile.AnyProfileView
   moderation?: ModerationDecision
   blockInfo?: {
     listBlocks: ModerationCause[]
@@ -131,7 +128,7 @@ function HeaderReady({
   moderation,
   blockInfo,
 }: {
-  profile: AppBskyActorDefs.ProfileViewBasic
+  profile: atp.profile.AnyProfileView
   moderation: ModerationDecision
   blockInfo: {
     listBlocks: ModerationCause[]

src/screens/Messages/Conversation.tsx

@@ -1,6 +1,6 @@
 import React, {useCallback} from 'react'
 import {View} from 'react-native'
-import {AppBskyActorDefs, moderateProfile, ModerationOpts} from '@atproto/api'
+import {moderateProfile, ModerationOpts} from '@atproto/api'
 import {msg} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
 import {useFocusEffect, useNavigation} from '@react-navigation/native'
@@ -26,6 +26,7 @@ import {MessagesListHeader} from '#/components/dms/MessagesListHeader'
 import {Error} from '#/components/Error'
 import * as Layout from '#/components/Layout'
 import {Loader} from '#/components/Loader'
+import * as atp from '#/types/atproto'
 
 type Props = NativeStackScreenProps<
   CommonNavigatorParams,
@@ -150,7 +151,7 @@ function InnerReady({
   setHasScrolled,
 }: {
   moderationOpts: ModerationOpts
-  recipient: AppBskyActorDefs.ProfileViewBasic
+  recipient: atp.profile.AnyProfileView
   hasScrolled: boolean
   setHasScrolled: React.Dispatch<React.SetStateAction<boolean>>
 }) {

src/screens/Messages/components/MessagesList.tsx

@@ -11,6 +11,7 @@ import Animated, {
 import {ReanimatedScrollEvent} from 'react-native-reanimated/lib/typescript/hook/commonTypes'
 import {useSafeAreaInsets} from 'react-native-safe-area-context'
 import {AppBskyEmbedRecord, AppBskyRichtextFacet, RichText} from '@atproto/api'
+import {$Typed} from '@atproto/api/dist/client/util'
 
 import {clamp} from '#/lib/numbers'
 import {ScrollProvider} from '#/lib/ScrollContext'
@@ -297,7 +298,7 @@ export function MessagesList({
       // we want to remove the post link from the text, re-trim, then detect facets
       rt.detectFacetsWithoutResolution()
 
-      let embed: AppBskyEmbedRecord.Main | undefined
+      let embed: $Typed<AppBskyEmbedRecord.Main> | undefined
 
       if (embedUri) {
         try {