diff options
Diffstat (limited to 'src/view/com/modals')
-rw-r--r-- | src/view/com/modals/ChangeEmail.tsx | 10 | ||||
-rw-r--r-- | src/view/com/modals/ChangeHandle.tsx | 11 | ||||
-rw-r--r-- | src/view/com/modals/DeleteAccount.tsx | 8 | ||||
-rw-r--r-- | src/view/com/modals/VerifyEmail.tsx | 8 | ||||
-rw-r--r-- | src/view/com/modals/report/Modal.tsx | 5 |
5 files changed, 23 insertions, 19 deletions
diff --git a/src/view/com/modals/ChangeEmail.tsx b/src/view/com/modals/ChangeEmail.tsx index 829188b51..7ea179688 100644 --- a/src/view/com/modals/ChangeEmail.tsx +++ b/src/view/com/modals/ChangeEmail.tsx @@ -13,7 +13,7 @@ import {cleanError} from 'lib/strings/errors' import {Trans, msg} from '@lingui/macro' import {useLingui} from '@lingui/react' import {useModalControls} from '#/state/modals' -import {useSession, useSessionApi} from '#/state/session' +import {useSession, useSessionApi, getAgent} from '#/state/session' enum Stages { InputEmail, @@ -25,7 +25,7 @@ export const snapPoints = ['90%'] export function Component() { const pal = usePalette('default') - const {agent, currentAccount} = useSession() + const {currentAccount} = useSession() const {updateCurrentAccount} = useSessionApi() const {_} = useLingui() const [stage, setStage] = useState<Stages>(Stages.InputEmail) @@ -44,11 +44,11 @@ export function Component() { setError('') setIsProcessing(true) try { - const res = await agent.com.atproto.server.requestEmailUpdate() + const res = await getAgent().com.atproto.server.requestEmailUpdate() if (res.data.tokenRequired) { setStage(Stages.ConfirmCode) } else { - await agent.com.atproto.server.updateEmail({email: email.trim()}) + await getAgent().com.atproto.server.updateEmail({email: email.trim()}) updateCurrentAccount({ email: email.trim(), emailConfirmed: false, @@ -77,7 +77,7 @@ export function Component() { setError('') setIsProcessing(true) try { - await agent.com.atproto.server.updateEmail({ + await getAgent().com.atproto.server.updateEmail({ email: email.trim(), token: confirmationCode.trim(), }) diff --git a/src/view/com/modals/ChangeHandle.tsx b/src/view/com/modals/ChangeHandle.tsx index da814b3d4..03516d35a 100644 --- a/src/view/com/modals/ChangeHandle.tsx +++ b/src/view/com/modals/ChangeHandle.tsx @@ -26,19 +26,24 @@ import {useLingui} from '@lingui/react' import {useModalControls} from '#/state/modals' import {useServiceQuery} from '#/state/queries/service' import {useUpdateHandleMutation, useFetchDid} from '#/state/queries/handle' -import {useSession, useSessionApi, SessionAccount} from '#/state/session' +import { + useSession, + useSessionApi, + SessionAccount, + getAgent, +} from '#/state/session' export const snapPoints = ['100%'] export type Props = {onChanged: () => void} export function Component(props: Props) { - const {agent, currentAccount} = useSession() + const {currentAccount} = useSession() const { isLoading, data: serviceInfo, error: serviceInfoError, - } = useServiceQuery(agent.service.toString()) + } = useServiceQuery(getAgent().service.toString()) return isLoading || !currentAccount ? ( <View style={{padding: 18}}> diff --git a/src/view/com/modals/DeleteAccount.tsx b/src/view/com/modals/DeleteAccount.tsx index 7969cf69f..ee16d46b3 100644 --- a/src/view/com/modals/DeleteAccount.tsx +++ b/src/view/com/modals/DeleteAccount.tsx @@ -19,14 +19,14 @@ import {resetToTab} from '../../../Navigation' import {Trans, msg} from '@lingui/macro' import {useLingui} from '@lingui/react' import {useModalControls} from '#/state/modals' -import {useSession, useSessionApi} from '#/state/session' +import {useSession, useSessionApi, getAgent} from '#/state/session' export const snapPoints = ['60%'] export function Component({}: {}) { const pal = usePalette('default') const theme = useTheme() - const {agent, currentAccount} = useSession() + const {currentAccount} = useSession() const {clearCurrentAccount, removeAccount} = useSessionApi() const {_} = useLingui() const {closeModal} = useModalControls() @@ -40,7 +40,7 @@ export function Component({}: {}) { setError('') setIsProcessing(true) try { - await agent.com.atproto.server.requestAccountDelete() + await getAgent().com.atproto.server.requestAccountDelete() setIsEmailSent(true) } catch (e: any) { setError(cleanError(e)) @@ -57,7 +57,7 @@ export function Component({}: {}) { const token = confirmCode.replace(/\s/g, '') try { - await agent.com.atproto.server.deleteAccount({ + await getAgent().com.atproto.server.deleteAccount({ did: currentAccount.did, password, token, diff --git a/src/view/com/modals/VerifyEmail.tsx b/src/view/com/modals/VerifyEmail.tsx index e7a4537c5..0af02db4b 100644 --- a/src/view/com/modals/VerifyEmail.tsx +++ b/src/view/com/modals/VerifyEmail.tsx @@ -21,7 +21,7 @@ import {cleanError} from 'lib/strings/errors' import {Trans, msg} from '@lingui/macro' import {useLingui} from '@lingui/react' import {useModalControls} from '#/state/modals' -import {useSession, useSessionApi} from '#/state/session' +import {useSession, useSessionApi, getAgent} from '#/state/session' export const snapPoints = ['90%'] @@ -33,7 +33,7 @@ enum Stages { export function Component({showReminder}: {showReminder?: boolean}) { const pal = usePalette('default') - const {agent, currentAccount} = useSession() + const {currentAccount} = useSession() const {updateCurrentAccount} = useSessionApi() const {_} = useLingui() const [stage, setStage] = useState<Stages>( @@ -49,7 +49,7 @@ export function Component({showReminder}: {showReminder?: boolean}) { setError('') setIsProcessing(true) try { - await agent.com.atproto.server.requestEmailConfirmation() + await getAgent().com.atproto.server.requestEmailConfirmation() setStage(Stages.ConfirmCode) } catch (e) { setError(cleanError(String(e))) @@ -62,7 +62,7 @@ export function Component({showReminder}: {showReminder?: boolean}) { setError('') setIsProcessing(true) try { - await agent.com.atproto.server.confirmEmail({ + await getAgent().com.atproto.server.confirmEmail({ email: (currentAccount?.email || '').trim(), token: confirmationCode.trim(), }) diff --git a/src/view/com/modals/report/Modal.tsx b/src/view/com/modals/report/Modal.tsx index 06075547f..60c3f06b7 100644 --- a/src/view/com/modals/report/Modal.tsx +++ b/src/view/com/modals/report/Modal.tsx @@ -16,7 +16,7 @@ import {CollectionId} from './types' import {Trans, msg} from '@lingui/macro' import {useLingui} from '@lingui/react' import {useModalControls} from '#/state/modals' -import {useSession} from '#/state/session' +import {getAgent} from '#/state/session' const DMCA_LINK = 'https://blueskyweb.xyz/support/copyright' @@ -39,7 +39,6 @@ type ReportComponentProps = } export function Component(content: ReportComponentProps) { - const {agent} = useSession() const {closeModal} = useModalControls() const pal = usePalette('default') const {isMobile} = useWebMediaQueries() @@ -70,7 +69,7 @@ export function Component(content: ReportComponentProps) { const $type = !isAccountReport ? 'com.atproto.repo.strongRef' : 'com.atproto.admin.defs#repoRef' - await agent.createModerationReport({ + await getAgent().createModerationReport({ reasonType: issue, subject: { $type, |