[SDK] Migrate agent sugar to @bsky.app/sdk actions (#11382)

src/components/ageAssurance/AgeAssuranceRedirectDialog.tsx

@@ -6,7 +6,7 @@ import {Trans} from '@lingui/react/macro'
 
 import {retry} from '#/lib/async/retry'
 import {wait} from '#/lib/async/wait'
-import {useAgent} from '#/state/session'
+import {useAppviewClient} from '#/state/session'
 import {atoms as a, useTheme, web} from '#/alf'
 import {AgeAssuranceBadge} from '#/components/ageAssurance/AgeAssuranceBadge'
 import {Button, ButtonText} from '#/components/Button'
@@ -84,7 +84,7 @@ export function Inner({}: {optimisticState?: AgeAssuranceRedirectDialogState}) {
   const t = useTheme()
   const ax = useAnalytics()
   const {_} = useLingui()
-  const agent = useAgent()
+  const appviewClient = useAppviewClient()
   const polling = useRef(false)
   const unmounted = useRef(false)
   const control = useAgeAssuranceRedirectDialogControl()
@@ -104,10 +104,10 @@ export function Inner({}: {optimisticState?: AgeAssuranceRedirectDialogState}) {
         5,
         () => true,
         async () => {
-          if (!agent.session) return
+          if (!appviewClient.did) return
           if (unmounted.current) return
 
-          const data = await refetchAgeAssuranceServerState({agent})
+          const data = await refetchAgeAssuranceServerState({appviewClient})
 
           if (data?.state.status !== 'assured') {
             throw new Error(
@@ -122,7 +122,7 @@ export function Inner({}: {optimisticState?: AgeAssuranceRedirectDialogState}) {
     )
       .then(async data => {
         if (!data) return
-        if (!agent.session) return
+        if (!appviewClient.did) return
         if (unmounted.current) return
 
         setSuccess(true)
@@ -138,7 +138,7 @@ export function Inner({}: {optimisticState?: AgeAssuranceRedirectDialogState}) {
     return () => {
       unmounted.current = true
     }
-  }, [ax, agent, control])
+  }, [ax, appviewClient, control])
 
   if (success) {
     return (

src/components/contacts/screens/GetContacts.tsx

@@ -2,24 +2,21 @@ import {useContext} from 'react'
 import {Alert, View} from 'react-native'
 import {useSafeAreaInsets} from 'react-native-safe-area-context'
 import * as Contacts from 'expo-contacts'
-import type AtpAgent from '@atproto/api'
-import {
-  type AppBskyActorProfile,
-  AppBskyContactImportContacts,
-  type Un$Typed,
-} from '@atproto/api'
+import {type Un$Typed} from '@atproto/lex'
 import {type Client} from '@atproto/lex'
+import {toDatetimeString} from '@atproto/syntax'
+import {upsertProfile} from '@bsky.app/sdk'
 import {msg, t} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
 import {useMutation, useQueryClient} from '@tanstack/react-query'
 
 import {uploadBlob} from '#/lib/api'
-import {toLegacyBlobRef} from '#/lib/api/legacy-blob'
 import {cleanError, isNetworkError} from '#/lib/strings/errors'
+import {matchXrpcError} from '#/lib/xrpc-error'
 import {logger} from '#/logger'
 import {findContactsStatusQueryKey} from '#/state/queries/find-contacts'
-import {useAgent, usePdsClient} from '#/state/session'
+import {useAppviewClient, usePdsClient} from '#/state/session'
 import {
   Context as OnboardingContext,
   type OnboardingAction,
@@ -32,6 +29,7 @@ import {Loader} from '#/components/Loader'
 import * as Toast from '#/components/Toast'
 import {Text} from '#/components/Typography'
 import {useAnalytics} from '#/analytics'
+import {app} from '#/lexicons'
 import {
   contactsWithPhoneNumbersOnly,
   filterMatchedNumbers,
@@ -56,8 +54,8 @@ export function GetContacts({
 }) {
   const {_} = useLingui()
   const ax = useAnalytics()
-  const agent = useAgent()
   const pdsClient = usePdsClient()
+  const appviewClient = useAppviewClient()
   const insets = useSafeAreaInsets()
   const gutters = useGutters([0, 'wide'])
   const queryClient = useQueryClient()
@@ -75,7 +73,7 @@ export function GetContacts({
        */
       if (context === 'Onboarding' && maybeOnboardingContext) {
         try {
-          await createProfileRecord(agent, pdsClient, maybeOnboardingContext)
+          await createProfileRecord(pdsClient, maybeOnboardingContext)
         } catch (error) {
           logger.debug('Error creating profile record:', {safeMessage: error})
         }
@@ -88,13 +86,13 @@ export function GetContacts({
       )
 
       if (phoneNumbers.length > 0) {
-        const res = await agent.app.bsky.contact.importContacts({
+        const res = await appviewClient.call(app.bsky.contact.importContacts, {
           token: state.token,
           contacts: phoneNumbers.slice(0, MAX_UPLOAD_COUNT),
         })
 
         return {
-          matches: res.data.matchesAndContactIndexes,
+          matches: res.matchesAndContactIndexes,
           indexToContactId,
         }
       } else {
@@ -151,29 +149,30 @@ export function GetContacts({
           ),
           {type: 'error'},
         )
-      } else if (
-        err instanceof AppBskyContactImportContacts.TooManyContactsError
-      ) {
-        Toast.show(
-          _(
-            msg`Too many contacts - you've exceeded the number of contacts you can import to find your friends`,
-          ),
-          {type: 'error'},
-        )
-      } else if (
-        err instanceof AppBskyContactImportContacts.InvalidTokenError
-      ) {
-        Toast.show(
-          _(
-            msg`Could not upload contacts. You need to re-verify your phone number to proceed`,
-          ),
-          {type: 'error'},
-        )
-      } else {
-        logger.error('Error uploading contacts', {safeMessage: err})
-        Toast.show(_(msg`Could not upload contacts. ${cleanError(err)}`), {
-          type: 'error',
-        })
+        return
+      }
+      switch (matchXrpcError(err, app.bsky.contact.importContacts)) {
+        case 'TooManyContacts':
+          Toast.show(
+            _(
+              msg`Too many contacts - you've exceeded the number of contacts you can import to find your friends`,
+            ),
+            {type: 'error'},
+          )
+          break
+        case 'InvalidToken':
+          Toast.show(
+            _(
+              msg`Could not upload contacts. You need to re-verify your phone number to proceed`,
+            ),
+            {type: 'error'},
+          )
+          break
+        default:
+          logger.error('Error uploading contacts', {safeMessage: err})
+          Toast.show(_(msg`Could not upload contacts. ${cleanError(err)}`), {
+            type: 'error',
+          })
       }
     },
   })
@@ -328,7 +327,6 @@ function showPermissionDeniedAlert() {
  * Copied from `#/screens/Onboarding/StepFinished/index.tsx`
  */
 async function createProfileRecord(
-  agent: AtpAgent,
   pdsClient: Client,
   onboardingContext: {
     state: OnboardingState
@@ -342,19 +340,21 @@ async function createProfileRecord(
       ? uploadBlob(pdsClient, imageUri, imageMime)
       : undefined
 
-  await agent.upsertProfile(async existing => {
-    let next: Un$Typed<AppBskyActorProfile.Record> = existing ?? {}
+  await pdsClient.call(upsertProfile, async existing => {
+    let next: Un$Typed<app.bsky.actor.profile.Main> = existing ?? {}
 
     if (blobPromise) {
       const res = await blobPromise
       if (res.blob) {
-        next.avatar = toLegacyBlobRef(res.blob)
+        next.avatar = res.blob
       }
     }
 
     next.displayName = ''
 
-    next.createdAt = new Date().toISOString()
+    if (!next.createdAt) {
+      next.createdAt = toDatetimeString(new Date())
+    }
     return next
   })
 }

src/components/dialogs/lists/CreateListFromStarterPackDialog.tsx

@@ -6,7 +6,6 @@ import {
   type AtIdentifierString,
   AtUri,
   type AtUriString,
-  type DidString,
   toDatetimeString,
 } from '@atproto/syntax'
 import {msg} from '@lingui/core/macro'
@@ -86,8 +85,7 @@ export function CreateListFromStarterPackDialog({
               items.map(item => {
                 const listitemRecord: $Typed<app.bsky.graph.listitem.Main> = {
                   $type: 'app.bsky.graph.listitem',
-                  // the list view is still legacy-typed, so its strings are unbranded
-                  subject: item.subject.did as DidString,
+                  subject: item.subject.did,
                   list: listUri as AtUriString,
                   createdAt: toDatetimeString(new Date()),
                 }