diff --git a/src/components/ageAssurance/useAgeAssuranceCopy.ts b/src/components/ageAssurance/useAgeAssuranceCopy.ts index f773349167..e75f84feed 100644 --- a/src/components/ageAssurance/useAgeAssuranceCopy.ts +++ b/src/components/ageAssurance/useAgeAssuranceCopy.ts @@ -2,22 +2,14 @@ import {useMemo} from 'react' import {msg} from '@lingui/macro' import {useLingui} from '@lingui/react' -import {useAgeAssurance} from '#/ageAssurance' - export function useAgeAssuranceCopy() { const {_} = useLingui() - const aa = useAgeAssurance() return useMemo(() => { return { - notice: - aa.state.access === aa.Access.Safe - ? _( - msg`Due to laws in your region, certain features on Bluesky are currently restricted until you're able to verify you're an adult.`, - ) - : _( - msg`The laws in your location require you to verify you're an adult before accessing certain features on Bluesky, like adult content and direct messaging.`, - ), + notice: _( + msg`Due to laws in your region, certain features on Bluesky are currently restricted until you're able to verify you're an adult.`, + ), banner: _( msg`The laws in your location require you to verify you're an adult to access certain features. Tap to learn more.`, ), @@ -25,5 +17,5 @@ export function useAgeAssuranceCopy() { msg`Don't worry! All existing messages and settings are saved and will be available after you verify you're an adult.`, ), } - }, [_, aa]) + }, [_]) } diff --git a/src/screens/Moderation/index.tsx b/src/screens/Moderation/index.tsx index 76667d44a2..7791a9eb8d 100644 --- a/src/screens/Moderation/index.tsx +++ b/src/screens/Moderation/index.tsx @@ -24,6 +24,7 @@ import {useSetMinimalShellMode} from '#/state/shell' import {atoms as a, useBreakpoints, useTheme, type ViewStyleProp} from '#/alf' import {Admonition} from '#/components/Admonition' import {AgeAssuranceAdmonition} from '#/components/ageAssurance/AgeAssuranceAdmonition' +import {useAgeAssuranceCopy} from '#/components/ageAssurance/useAgeAssuranceCopy' import {Button} from '#/components/Button' import {useGlobalDialogsControlContext} from '#/components/dialogs/Context' import {Divider} from '#/components/Divider' @@ -167,6 +168,7 @@ export function ModerationScreenInner({ } = useMyLabelersQuery() const aa = useAgeAssurance() const isBirthdateUpdateAllowed = useIsBirthdateUpdateAllowed() + const aaCopy = useAgeAssuranceCopy() useFocusEffect( useCallback(() => { @@ -343,9 +345,7 @@ export function ModerationScreenInner({ - - You must complete age assurance in order to access content filters. - + {aaCopy.notice}