import client from lex instead of lex-client

package.json

@@ -100,7 +100,6 @@
   "dependencies": {
     "@atproto/common-web": "0.5.6",
     "@atproto/lex": "0.2.2",
-    "@atproto/lex-client": "0.2.4",
     "@atproto/lex-password-session": "0.1.7",
     "@atproto/syntax": "0.7.2",
     "@bitdrift/react-native": "^0.6.8",

src/ageAssurance/data.tsx

@@ -1,6 +1,6 @@
 import {createContext, useCallback, useContext, useEffect, useMemo} from 'react'
 import * as AgeRange from 'expo-age-range'
-import {Client} from '@atproto/lex-client'
+import {Client} from '@atproto/lex'
 import {getPreferences} from '@bsky.app/sdk'
 import {createAsyncStoragePersister} from '@tanstack/query-async-storage-persister'
 import {focusManager, QueryClient, useQuery} from '@tanstack/react-query'

src/ageAssurance/useBeginAgeAssurance.ts

@@ -1,5 +1,5 @@
 import {Platform} from 'react-native'
-import {Client} from '@atproto/lex-client'
+import {Client} from '@atproto/lex'
 import {useMutation} from '@tanstack/react-query'
 
 import {wait} from '#/lib/async/wait'

src/components/contacts/screens/GetContacts.tsx

@@ -3,7 +3,7 @@ import {Alert, View} from 'react-native'
 import {useSafeAreaInsets} from 'react-native-safe-area-context'
 import * as Contacts from 'expo-contacts'
 import {type Un$Typed} from '@atproto/lex'
-import {type Client} from '@atproto/lex-client'
+import {type Client} from '@atproto/lex'
 import {toDatetimeString} from '@atproto/syntax'
 import {upsertProfile} from '@bsky.app/sdk'
 import {msg, t} from '@lingui/core/macro'

src/components/dialogs/EmailDialog/data/useUpdateEmail.ts

@@ -1,4 +1,4 @@
-import {type Client} from '@atproto/lex-client'
+import {type Client} from '@atproto/lex'
 import {useMutation} from '@tanstack/react-query'
 
 import {usePdsClient, useSessionApi} from '#/state/session'

src/components/moderation/AppealForm.tsx

@@ -1,6 +1,6 @@
 import {useState} from 'react'
 import {View} from 'react-native'
-import {type Service} from '@atproto/lex-client'
+import {type Service} from '@atproto/lex'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'

src/components/moderation/ReportDialog/action.ts

@@ -1,4 +1,4 @@
-import {type Service} from '@atproto/lex-client'
+import {type Service} from '@atproto/lex'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {useMutation} from '@tanstack/react-query'

src/lib/api/feed/author.ts

@@ -1,4 +1,4 @@
-import {type Client} from '@atproto/lex-client'
+import {type Client} from '@atproto/lex'
 
 import {app} from '#/lexicons'
 import * as bsky from '#/types/bsky'

src/lib/api/feed/custom.ts

@@ -1,5 +1,5 @@
 import {lexParse} from '@atproto/lex'
-import {Client} from '@atproto/lex-client'
+import {Client} from '@atproto/lex'
 
 import {
   getAppLanguageAsContentLanguage,

src/lib/api/feed/demo.ts

@@ -1,4 +1,4 @@
-import {type Client} from '@atproto/lex-client'
+import {type Client} from '@atproto/lex'
 
 import {DEMO_FEED} from '#/lib/demo'
 import {type app} from '#/lexicons'

src/lib/api/feed/following.ts

@@ -1,4 +1,4 @@
-import {type Client} from '@atproto/lex-client'
+import {type Client} from '@atproto/lex'
 
 import {app} from '#/lexicons'
 import {type FeedAPI, type FeedAPIResponse} from './types'

src/lib/api/feed/home.ts

@@ -1,4 +1,4 @@
-import {type Client} from '@atproto/lex-client'
+import {type Client} from '@atproto/lex'
 import {type AtUriString} from '@atproto/syntax'
 
 import {PROD_DEFAULT_FEED} from '#/lib/constants'

src/lib/api/feed/likes.ts

@@ -1,4 +1,4 @@
-import {type Client} from '@atproto/lex-client'
+import {type Client} from '@atproto/lex'
 
 import {app} from '#/lexicons'
 import {type FeedAPI, type FeedAPIResponse} from './types'

src/lib/api/feed/list.ts

@@ -1,4 +1,4 @@
-import {type Client} from '@atproto/lex-client'
+import {type Client} from '@atproto/lex'
 
 import {app} from '#/lexicons'
 import {type FeedAPI, type FeedAPIResponse} from './types'

src/lib/api/feed/merge.ts

@@ -1,4 +1,4 @@
-import {type Client} from '@atproto/lex-client'
+import {type Client} from '@atproto/lex'
 import {type AtUriString} from '@atproto/syntax'
 import shuffle from 'lodash.shuffle'
 

src/lib/api/feed/posts.ts

@@ -1,4 +1,4 @@
-import {type Client} from '@atproto/lex-client'
+import {type Client} from '@atproto/lex'
 
 import {logger} from '#/logger'
 import {app} from '#/lexicons'

src/lib/api/feed/types.ts

@@ -1,4 +1,4 @@
-import {type Client} from '@atproto/lex-client'
+import {type Client} from '@atproto/lex'
 
 import {type app} from '#/lexicons'
 

src/lib/api/index.ts

@@ -1,6 +1,6 @@
 import {TID} from '@atproto/common-web'
 import {type $Typed} from '@atproto/lex'
-import {type Client} from '@atproto/lex-client'
+import {type Client} from '@atproto/lex'
 import {
   type AtUriString,
   toDatetimeString,

src/lib/api/resolve.ts

@@ -1,4 +1,4 @@
-import {type Client} from '@atproto/lex-client'
+import {type Client} from '@atproto/lex'
 import {AtUri, type AtUriString, type HandleString} from '@atproto/syntax'
 
 import {IMAGE_SIZE_CONFIG_2K_1MB} from '#/lib/constants'

src/lib/api/upload-blob.ts

@@ -1,6 +1,5 @@
 import {copyAsync} from 'expo-file-system/legacy'
-import {type BlobRef} from '@atproto/lex'
+import {type BlobRef, type Client, type EncodingString} from '@atproto/lex'
-import {type Client, type EncodingString} from '@atproto/lex-client'
 
 import {safeDeleteAsync} from '#/lib/media/manip'
 

src/lib/api/upload-blob.web.ts

@@ -1,5 +1,4 @@
-import {type BlobRef} from '@atproto/lex'
+import {type BlobRef, type Client, type EncodingString} from '@atproto/lex'
-import {type Client, type EncodingString} from '@atproto/lex-client'
 
 /**
  * The blob-upload response body: `{blob}`. lex `Client.uploadBlob` returns the

src/lib/constants.ts

@@ -1,5 +1,5 @@
 import {type Insets, Platform} from 'react-native'
-import {type Service} from '@atproto/lex-client'
+import {type Service} from '@atproto/lex'
 import {api} from '@bsky.app/sdk'
 
 import {BLUESKY_PROXY_DID, IS_DEV} from '#/env'

src/lib/generate-starterpack.ts

@@ -1,4 +1,4 @@
-import {type Client} from '@atproto/lex-client'
+import {type Client} from '@atproto/lex'
 import {type AtUriString, type DatetimeString} from '@atproto/syntax'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'

src/lib/media/video/multipart/upload.ts

@@ -1,4 +1,4 @@
-import {type Client} from '@atproto/lex-client'
+import {type Client} from '@atproto/lex'
 import {nanoid} from 'nanoid/non-secure'
 
 import {AbortError} from '#/lib/async/cancelable'

src/lib/media/video/upload.shared.ts

@@ -1,4 +1,4 @@
-import {type Client} from '@atproto/lex-client'
+import {type Client} from '@atproto/lex'
 import {type NsidString} from '@atproto/syntax'
 import {type I18n} from '@lingui/core'
 import {msg} from '@lingui/core/macro'

src/lib/media/video/upload.ts

@@ -1,5 +1,5 @@
 import {createUploadTask, FileSystemUploadType} from 'expo-file-system/legacy'
-import {type Client} from '@atproto/lex-client'
+import {type Client} from '@atproto/lex'
 import {type I18n} from '@lingui/core'
 import {msg} from '@lingui/core/macro'
 import {nanoid} from 'nanoid/non-secure'

src/lib/media/video/upload.web.ts

@@ -1,4 +1,4 @@
-import {type Client} from '@atproto/lex-client'
+import {type Client} from '@atproto/lex'
 import {type I18n} from '@lingui/core'
 import {msg} from '@lingui/core/macro'
 import {nanoid} from 'nanoid/non-secure'

src/lib/media/video/util.ts

@@ -1,4 +1,4 @@
-import {Client} from '@atproto/lex-client'
+import {Client} from '@atproto/lex'
 
 import {type SupportedMimeTypes, VIDEO_SERVICE} from '#/lib/constants'
 

src/lib/moderation.ts

@@ -1,5 +1,5 @@
 import {useMemo} from 'react'
-import {Client} from '@atproto/lex-client'
+import {Client} from '@atproto/lex'
 import {
   type InterpretedLabelValueDefinition,
   LABELS,

src/lib/notifications/__tests__/notifications-proxy.test.ts

@@ -1,4 +1,4 @@
-import {Client} from '@atproto/lex-client'
+import {Client} from '@atproto/lex'
 import {describe, expect, it} from '@jest/globals'
 
 import {NOTIF_SERVICE} from '#/lib/constants'

src/lib/notifications/notifications.ts

@@ -2,7 +2,7 @@ import {useCallback, useEffect} from 'react'
 import {Platform} from 'react-native'
 import * as Notifications from 'expo-notifications'
 import {getBadgeCountAsync, setBadgeCountAsync} from 'expo-notifications'
-import {type Client} from '@atproto/lex-client'
+import {type Client} from '@atproto/lex'
 import debounce from 'lodash.debounce'
 
 import {

src/lib/strings/__tests__/errors.test.ts

@@ -1,8 +1,4 @@
-import {
+import {type Procedure, type Query, XrpcResponseError} from '@atproto/lex'
-  type Procedure,
-  type Query,
-  XrpcResponseError,
-} from '@atproto/lex-client'
 import {describe, expect, it} from '@jest/globals'
 
 import {

src/lib/xrpc-error.ts

@@ -1,4 +1,4 @@
-import {LexError, XrpcError, XrpcResponseError} from '@atproto/lex-client'
+import {LexError, XrpcError, XrpcResponseError} from '@atproto/lex'
 
 /**
  * True for an XRPC error from a lex `Client` (`@atproto/lex-client` `XrpcError`,

src/screens/Login/ForgotPasswordForm.tsx

@@ -1,6 +1,6 @@
 import {useCallback, useState} from 'react'
 import {Keyboard, View} from 'react-native'
-import {Client} from '@atproto/lex-client'
+import {Client} from '@atproto/lex'
 import {Trans, useLingui} from '@lingui/react/macro'
 import * as EmailValidator from 'email-validator'
 

src/screens/Login/SetNewPasswordForm.tsx

@@ -1,6 +1,6 @@
 import {useState} from 'react'
 import {View} from 'react-native'
-import {Client} from '@atproto/lex-client'
+import {Client} from '@atproto/lex'
 import {Trans, useLingui} from '@lingui/react/macro'
 
 import {cleanError, isNetworkError} from '#/lib/strings/errors'

src/screens/Onboarding/util.ts

@@ -1,6 +1,5 @@
 import {TID} from '@atproto/common-web'
-import {type $Typed} from '@atproto/lex'
+import {type $Typed, type Client} from '@atproto/lex'
-import {type Client} from '@atproto/lex-client'
 import {
   type AtIdentifierString,
   type DidString,

src/screens/Profile/components/GermButton.tsx

@@ -1,6 +1,6 @@
 import {Platform, View} from 'react-native'
 import {Image} from 'expo-image'
-import {type Client} from '@atproto/lex-client'
+import {type Client} from '@atproto/lex'
 import {type DidString} from '@atproto/syntax'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'

src/state/feed-feedback.tsx

@@ -7,7 +7,7 @@ import {
   useRef,
 } from 'react'
 import {AppState, type AppStateStatus} from 'react-native'
-import {type Service} from '@atproto/lex-client'
+import {type Service} from '@atproto/lex'
 import {type AtUriString} from '@atproto/syntax'
 import throttle from 'lodash.throttle'
 

src/state/messages/convo/agent.ts

@@ -1,5 +1,4 @@
-import {type $Typed} from '@atproto/lex'
+import {type $Typed, type Client} from '@atproto/lex'
-import {type Client} from '@atproto/lex-client'
 import {type DatetimeString, type DidString} from '@atproto/syntax'
 import {EventEmitter} from 'eventemitter3'
 import {nanoid} from 'nanoid/non-secure'

src/state/messages/convo/types.ts

@@ -1,5 +1,4 @@
-import {type $Typed} from '@atproto/lex'
+import {type $Typed, type Client} from '@atproto/lex'
-import {type Client} from '@atproto/lex-client'
 
 import {type MessagesEventBus} from '#/state/messages/events/agent'
 import {type ConvoWithDetails} from '#/components/dms/util'

src/state/messages/events/agent.ts

@@ -1,4 +1,4 @@
-import {type Client} from '@atproto/lex-client'
+import {type Client} from '@atproto/lex'
 import {EventEmitter} from 'eventemitter3'
 import {nanoid} from 'nanoid/non-secure'
 

src/state/messages/events/types.ts

@@ -1,4 +1,4 @@
-import {type Client} from '@atproto/lex-client'
+import {type Client} from '@atproto/lex'
 
 import {type chat} from '#/lexicons'
 

src/state/preferences/moderation-opts.tsx

@@ -1,5 +1,5 @@
 import {createContext, useContext, useMemo} from 'react'
-import {Client} from '@atproto/lex-client'
+import {Client} from '@atproto/lex'
 import {type ModerationOpts} from '@bsky.app/sdk/moderation'
 
 import {useHiddenPosts, useLabelDefinitions} from '#/state/preferences'

src/state/queries/handle-availability.ts

@@ -1,4 +1,4 @@
-import {Client} from '@atproto/lex-client'
+import {Client} from '@atproto/lex'
 import {type DatetimeString, type HandleString} from '@atproto/syntax'
 import {useQuery} from '@tanstack/react-query'
 

src/state/queries/join-links.ts

@@ -1,6 +1,5 @@
 import {useCallback} from 'react'
-import {type $Typed} from '@atproto/lex'
+import {type $Typed, Client} from '@atproto/lex'
-import {Client} from '@atproto/lex-client'
 import {toDatetimeString} from '@atproto/syntax'
 import {type QueryClient, useQuery, useQueryClient} from '@tanstack/react-query'
 

src/state/queries/list-members.ts

@@ -1,4 +1,4 @@
-import {type Client} from '@atproto/lex-client'
+import {type Client} from '@atproto/lex'
 import {type AtUriString} from '@atproto/syntax'
 import {
   type InfiniteData,

src/state/queries/list.ts

@@ -1,4 +1,4 @@
-import {type Client} from '@atproto/lex-client'
+import {type Client} from '@atproto/lex'
 import {
   type AtIdentifierString,
   AtUri,

src/state/queries/messages/actor-declaration.ts

@@ -1,4 +1,4 @@
-import {type Client} from '@atproto/lex-client'
+import {type Client} from '@atproto/lex'
 import {type DidString} from '@atproto/syntax'
 import {useMutation, useQueryClient} from '@tanstack/react-query'
 

src/state/queries/messages/restrictChatSettings.ts

@@ -1,4 +1,4 @@
-import {type Client} from '@atproto/lex-client'
+import {type Client} from '@atproto/lex'
 
 import {networkRetry} from '#/lib/async/retry'
 import {logger} from '#/logger'

src/state/queries/notifications/util.ts

@@ -1,4 +1,4 @@
-import {type Client} from '@atproto/lex-client'
+import {type Client} from '@atproto/lex'
 import {type AtUriString} from '@atproto/syntax'
 import {
   hasMutedWord,

src/state/queries/pds-detection.ts

@@ -1,6 +1,6 @@
 import {useState} from 'react'
 import {type DidDocument, getPdsEndpoint} from '@atproto/common-web'
-import {Client} from '@atproto/lex-client'
+import {Client} from '@atproto/lex'
 import {type HandleString} from '@atproto/syntax'
 import {useQuery, useQueryClient} from '@tanstack/react-query'
 

src/state/queries/post-feed.ts

@@ -1,6 +1,6 @@
 import {useCallback, useEffect, useMemo, useRef} from 'react'
 import {AppState} from 'react-native'
-import {type AtIdentifierString, type Client} from '@atproto/lex-client'
+import {type AtIdentifierString, type Client} from '@atproto/lex'
 import {AtUri, type AtUriString} from '@atproto/syntax'
 import {
   moderatePost,

src/state/queries/postgate/index.ts

@@ -1,5 +1,5 @@
 import {useRef} from 'react'
-import {type Client} from '@atproto/lex-client'
+import {type Client} from '@atproto/lex'
 import {AtUri} from '@atproto/syntax'
 import {useMutation, useQuery, useQueryClient} from '@tanstack/react-query'
 

src/state/queries/preferences/moderation.ts

@@ -1,5 +1,5 @@
 import {useMemo} from 'react'
-import {Client} from '@atproto/lex-client'
+import {Client} from '@atproto/lex'
 import {interpretLabelValueDefinitions} from '@bsky.app/sdk/moderation'
 
 import {isNonConfigurableModerationAuthority} from '#/state/session/additional-moderation-authorities'

src/state/queries/profile.ts

@@ -4,7 +4,7 @@ import {
   type AtIdentifierString,
   type Client,
   type DidString,
-} from '@atproto/lex-client'
+} from '@atproto/lex'
 import {type DatetimeString} from '@atproto/lex-schema'
 import {AtUri, type AtUriString} from '@atproto/syntax'
 import {

src/state/queries/resolve-uri.ts

@@ -1,4 +1,4 @@
-import {type Client} from '@atproto/lex-client'
+import {type Client} from '@atproto/lex'
 import {AtUri, type HandleString} from '@atproto/syntax'
 import {type QueryClient, queryOptions, useQuery} from '@tanstack/react-query'
 

src/state/queries/service.ts

@@ -1,4 +1,4 @@
-import {Client} from '@atproto/lex-client'
+import {Client} from '@atproto/lex'
 import {useQuery} from '@tanstack/react-query'
 
 import {com} from '#/lexicons'

src/state/queries/starter-packs.ts

@@ -1,4 +1,4 @@
-import {type Client} from '@atproto/lex-client'
+import {type Client} from '@atproto/lex'
 import {AtUri, type AtUriString, type DatetimeString} from '@atproto/syntax'
 import {RichText} from '@bsky.app/sdk/richtext'
 import {

src/state/queries/threadgate/index.ts

@@ -1,4 +1,4 @@
-import {type Client} from '@atproto/lex-client'
+import {type Client} from '@atproto/lex'
 import {AtUri} from '@atproto/syntax'
 import {useMutation, useQuery, useQueryClient} from '@tanstack/react-query'
 

src/state/session/__tests__/clients-bundle-test.ts

@@ -1,4 +1,4 @@
-import {Client} from '@atproto/lex-client'
+import {Client} from '@atproto/lex'
 import {PasswordSession} from '@atproto/lex-password-session'
 import {api} from '@bsky.app/sdk'
 import {describe, expect, it, jest} from '@jest/globals'

src/state/session/additional-moderation-authorities.ts

@@ -1,4 +1,4 @@
-import {Client} from '@atproto/lex-client'
+import {Client} from '@atproto/lex'
 
 import {device} from '#/storage'
 

src/state/session/clients.ts

@@ -1,4 +1,4 @@
-import {Client} from '@atproto/lex-client'
+import {Client} from '@atproto/lex'
 import {type PasswordSession} from '@atproto/lex-password-session'
 import {api} from '@bsky.app/sdk'
 

src/state/session/index.tsx

@@ -8,7 +8,7 @@ import {
   useState,
   useSyncExternalStore,
 } from 'react'
-import {type Client} from '@atproto/lex-client'
+import {type Client} from '@atproto/lex'
 import {PasswordSession, type SessionData} from '@atproto/lex-password-session'
 
 import * as persisted from '#/state/persisted'

src/state/session/moderation.ts

@@ -1,4 +1,4 @@
-import {Client} from '@atproto/lex-client'
+import {Client} from '@atproto/lex'
 import {api} from '@bsky.app/sdk'
 
 import {IS_TEST_USER} from '#/lib/constants'

src/state/session/session-core.ts

@@ -1,5 +1,5 @@
 import {TID} from '@atproto/common-web'
-import {type Client} from '@atproto/lex-client'
+import {type Client} from '@atproto/lex'
 import {
   PasswordSession,
   type PasswordSessionOptions,

src/state/session/util.ts

@@ -1,4 +1,4 @@
-import {Client} from '@atproto/lex-client'
+import {Client} from '@atproto/lex'
 import {PasswordSession} from '@atproto/lex-password-session'
 
 import {isJwtExpired} from '#/lib/jwt'

src/view/com/composer/Composer.tsx

@@ -46,7 +46,7 @@ import {useSafeAreaInsets} from 'react-native-safe-area-context'
 import {scheduleOnUI} from 'react-native-worklets'
 import * as FileSystem from 'expo-file-system'
 import {type ImagePickerAsset} from 'expo-image-picker'
-import {type Client} from '@atproto/lex-client'
+import {type Client} from '@atproto/lex'
 import {AtUri, type AtUriString} from '@atproto/syntax'
 import {type RichText} from '@bsky.app/sdk/richtext'
 import {plural} from '@lingui/core/macro'

src/view/com/composer/state/video.ts

@@ -1,6 +1,5 @@
 import {type ImagePickerAsset} from 'expo-image-picker'
-import {type BlobRef} from '@atproto/lex'
+import {type BlobRef, type Client} from '@atproto/lex'
-import {type Client} from '@atproto/lex-client'
 import {type I18n} from '@lingui/core'
 import {msg} from '@lingui/core/macro'