Reorg

src/components/ageAssurance/AgeAssuranceAccountCard.tsx

@@ -3,6 +3,7 @@ import {msg, Trans} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
 
 import {useGetTimeAgo} from '#/lib/hooks/useTimeAgo'
+import {useAgeInfo} from '#/state/age-assurance/useAgeInfo'
 import {atoms as a, useBreakpoints, useTheme, type ViewStyleProp} from '#/alf'
 import {Admonition} from '#/components/Admonition'
 import {AgeAssuranceAppealDialog} from '#/components/ageAssurance/AgeAssuranceAppealDialog'
@@ -12,7 +13,6 @@ import {
   useDialogControl,
 } from '#/components/ageAssurance/AgeAssuranceInitDialog'
 import {useAgeAssuranceCopy} from '#/components/ageAssurance/useAgeAssuranceCopy'
-import {useAgeInfo} from '#/components/ageAssurance/useAgeInfo'
 import {Button, ButtonText} from '#/components/Button'
 import * as Dialog from '#/components/Dialog'
 import {Divider} from '#/components/Divider'

src/components/ageAssurance/AgeAssuranceAdmonition.tsx

@@ -2,9 +2,9 @@ import {View} from 'react-native'
 import {msg, Trans} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
 
+import {useAgeInfo} from '#/state/age-assurance/useAgeInfo'
 import {atoms as a, select, useTheme, type ViewStyleProp} from '#/alf'
 import {useDialogControl} from '#/components/ageAssurance/AgeAssuranceInitDialog'
-import {useAgeInfo} from '#/components/ageAssurance/useAgeInfo'
 import type * as Dialog from '#/components/Dialog'
 import {ShieldCheck_Stroke2_Corner0_Rounded as Shield} from '#/components/icons/Shield'
 import {InlineLinkText} from '#/components/Link'

src/components/ageAssurance/AgeAssuranceDismissableNotice.tsx

@@ -2,11 +2,11 @@ import {View} from 'react-native'
 import {msg} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
 
+import {useAgeInfo} from '#/state/age-assurance/useAgeInfo'
 import {Nux, useNux, useSaveNux} from '#/state/queries/nuxs'
 import {atoms as a, type ViewStyleProp} from '#/alf'
 import {AgeAssuranceAdmonition} from '#/components/ageAssurance/AgeAssuranceAdmonition'
 import {useAgeAssuranceCopy} from '#/components/ageAssurance/useAgeAssuranceCopy'
-import {useAgeInfo} from '#/components/ageAssurance/useAgeInfo'
 import {Button, ButtonIcon} from '#/components/Button'
 import {TimesLarge_Stroke2_Corner0_Rounded as X} from '#/components/icons/Times'
 

src/components/ageAssurance/AgeAssuranceInitDialog.tsx

@@ -9,13 +9,13 @@ import {useGetTimeAgo} from '#/lib/hooks/useTimeAgo'
 import {useTLDs} from '#/lib/hooks/useTLDs'
 import {isEmailMaybeInvalid} from '#/lib/strings/email'
 import {useAgeAssuranceContext} from '#/state/age-assurance'
+import {useInitAgeAssurance} from '#/state/age-assurance/useInitAgeAssurance'
 import {useLanguagePrefs} from '#/state/preferences'
 import {useSession} from '#/state/session'
 import {atoms as a, useTheme, web} from '#/alf'
 import {Admonition} from '#/components/Admonition'
 import {AgeAssuranceBadge} from '#/components/ageAssurance/AgeAssuranceBadge'
 import {urls} from '#/components/ageAssurance/const'
-import {useInitAgeAssurance} from '#/components/ageAssurance/useInitAgeAssurance'
 import {Button, ButtonIcon, ButtonText} from '#/components/Button'
 import * as Dialog from '#/components/Dialog'
 import {Divider} from '#/components/Divider'

src/components/ageAssurance/AgeRestrictedScreen.tsx

@@ -2,11 +2,11 @@ import {View} from 'react-native'
 import {msg, Trans} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
 
+import {useAgeInfo} from '#/state/age-assurance/useAgeInfo'
 import {atoms as a} from '#/alf'
 import {Admonition} from '#/components/Admonition'
 import {AgeAssuranceBadge} from '#/components/ageAssurance/AgeAssuranceBadge'
 import {useAgeAssuranceCopy} from '#/components/ageAssurance/useAgeAssuranceCopy'
-import {useAgeInfo} from '#/components/ageAssurance/useAgeInfo'
 import {ButtonIcon, ButtonText} from '#/components/Button'
 import {ChevronRight_Stroke2_Corner0_Rounded as ChevronRight} from '#/components/icons/Chevron'
 import * as Layout from '#/components/Layout'

src/components/ageAssurance/useAgeInfo.ts

@@ -1,20 +0,0 @@
-import {useMemo} from 'react'
-
-import {useAgeAssuranceContext} from '#/state/age-assurance'
-import {usePreferencesQuery} from '#/state/queries/preferences'
-
-export function useAgeInfo() {
-  const ctx = useAgeAssuranceContext()
-  const {isFetched: preferencesLoaded, data: preferences} =
-    usePreferencesQuery()
-  const declaredAge = useMemo(() => preferences?.userAge, [preferences])
-
-  return useMemo(() => {
-    return {
-      isLoaded: ctx.isLoaded && preferencesLoaded,
-      declaredAge,
-      isUnderage: ctx.isAgeRestricted && (declaredAge || 0) < 18,
-      assurance: ctx,
-    }
-  }, [ctx, preferencesLoaded, declaredAge])
-}

src/components/ageAssurance/useInitAgeAssurance.ts

@@ -1,78 +0,0 @@
-import {
-  type AppBskyUnspeccedDefs,
-  type AppBskyUnspeccedInitAgeAssurance,
-  AtpAgent,
-} from '@atproto/api'
-import {useMutation, useQueryClient} from '@tanstack/react-query'
-
-import {wait} from '#/lib/async/wait'
-import {
-  // DEV_ENV_APPVIEW,
-  // DEV_ENV_APPVIEW_DID,
-  PUBLIC_APPVIEW,
-  PUBLIC_APPVIEW_DID,
-} from '#/lib/constants'
-import {isNetworkError} from '#/lib/hooks/useCleanError'
-import {logger} from '#/logger'
-import {createAgeAssuranceQueryKey} from '#/state/age-assurance'
-import {useGeolocation} from '#/state/geolocation'
-import {useAgent} from '#/state/session'
-
-let APPVIEW = PUBLIC_APPVIEW
-let APPVIEW_DID = PUBLIC_APPVIEW_DID
-
-// if (__DEV__) {
-//   APPVIEW = DEV_ENV_APPVIEW
-//   APPVIEW_DID = DEV_ENV_APPVIEW_DID
-// }
-
-export function useInitAgeAssurance() {
-  const qc = useQueryClient()
-  const agent = useAgent()
-  const {geolocation} = useGeolocation()
-  return useMutation({
-    async mutationFn(
-      props: Omit<AppBskyUnspeccedInitAgeAssurance.InputSchema, 'countryCode'>,
-    ) {
-      if (!geolocation?.countryCode) {
-        throw new Error(`Geolocation not available, cannot init age assurance.`)
-      }
-
-      const {
-        data: {token},
-      } = await agent.com.atproto.server.getServiceAuth({
-        aud: APPVIEW_DID,
-        lxm: `app.bsky.unspecced.initAgeAssurance`,
-      })
-
-      const appView = new AtpAgent({service: APPVIEW})
-      appView.sessionManager.session = {...agent.session!}
-      appView.sessionManager.session.accessJwt = token
-      appView.sessionManager.session.refreshJwt = ''
-
-      /*
-       * 2s wait is good actually. Email sending takes a hot sec and this helps
-       * ensure the email is ready for the user once they open their inbox.
-       */
-      const {data} = await wait(
-        2e3,
-        appView.app.bsky.unspecced.initAgeAssurance({
-          ...props,
-          countryCode: geolocation?.countryCode?.toUpperCase(),
-        }),
-      )
-
-      qc.setQueryData<AppBskyUnspeccedDefs.AgeAssuranceState>(
-        createAgeAssuranceQueryKey(agent.session?.did ?? 'never'),
-        () => data,
-      )
-    },
-    onError(e) {
-      if (!isNetworkError(e)) {
-        logger.error(`useInitAgeAssurance failed`, {
-          safeMessage: e,
-        })
-      }
-    },
-  })
-}