From 6ac8b47b57b1395e27da051f9420e2af94498566 Mon Sep 17 00:00:00 2001 From: Eric Bailey Date: Tue, 15 Jul 2025 17:06:34 -0500 Subject: [PATCH] Rename useAgeAssurance --- .../ageAssurance/AgeAssuranceAccountCard.tsx | 6 +++--- src/components/ageAssurance/AgeAssuranceAdmonition.tsx | 4 ++-- .../ageAssurance/AgeAssuranceDismissableNotice.tsx | 4 ++-- src/components/ageAssurance/AgeRestrictedScreen.tsx | 4 ++-- src/screens/Moderation/index.tsx | 6 +++--- .../ageAssurance/{useAgeInfo.ts => useAgeAssurance.ts} | 10 +++++----- 6 files changed, 17 insertions(+), 17 deletions(-) rename src/state/ageAssurance/{useAgeInfo.ts => useAgeAssurance.ts} (88%) diff --git a/src/components/ageAssurance/AgeAssuranceAccountCard.tsx b/src/components/ageAssurance/AgeAssuranceAccountCard.tsx index 13671484bb..4b0cdaf934 100644 --- a/src/components/ageAssurance/AgeAssuranceAccountCard.tsx +++ b/src/components/ageAssurance/AgeAssuranceAccountCard.tsx @@ -3,7 +3,7 @@ import {msg, Trans} from '@lingui/macro' import {useLingui} from '@lingui/react' import {useGetTimeAgo} from '#/lib/hooks/useTimeAgo' -import {useAgeInfo} from '#/state/ageAssurance/useAgeInfo' +import {useAgeAssurance} from '#/state/ageAssurance/useAgeAssurance' import {atoms as a, useBreakpoints, useTheme, type ViewStyleProp} from '#/alf' import {Admonition} from '#/components/Admonition' import {AgeAssuranceAppealDialog} from '#/components/ageAssurance/AgeAssuranceAppealDialog' @@ -20,7 +20,7 @@ import {createStaticClick, InlineLinkText} from '#/components/Link' import {Text} from '#/components/Typography' export function AgeAssuranceAccountCard({style}: ViewStyleProp & {}) { - const {isReady, isAgeRestricted, isUnderage} = useAgeInfo() + const {isReady, isAgeRestricted, isUnderage} = useAgeAssurance() if (!isReady) return null if (isUnderage) return null @@ -38,7 +38,7 @@ function Inner({style}: ViewStyleProp & {}) { const {gtPhone} = useBreakpoints() const copy = useAgeAssuranceCopy() - const {assurance} = useAgeInfo() + const {assurance} = useAgeAssurance() const isBlocked = assurance.status === 'blocked' const hasInitiated = !!assurance.lastInitiatedAt const timeAgo = assurance.lastInitiatedAt diff --git a/src/components/ageAssurance/AgeAssuranceAdmonition.tsx b/src/components/ageAssurance/AgeAssuranceAdmonition.tsx index 0cffb156dc..b29327efd1 100644 --- a/src/components/ageAssurance/AgeAssuranceAdmonition.tsx +++ b/src/components/ageAssurance/AgeAssuranceAdmonition.tsx @@ -2,7 +2,7 @@ import {View} from 'react-native' import {msg, Trans} from '@lingui/macro' import {useLingui} from '@lingui/react' -import {useAgeInfo} from '#/state/ageAssurance/useAgeInfo' +import {useAgeAssurance} from '#/state/ageAssurance/useAgeAssurance' import {atoms as a, select, useTheme, type ViewStyleProp} from '#/alf' import {useDialogControl} from '#/components/ageAssurance/AgeAssuranceInitDialog' import type * as Dialog from '#/components/Dialog' @@ -15,7 +15,7 @@ export function AgeAssuranceAdmonition({ style, }: ViewStyleProp & {children: React.ReactNode}) { const control = useDialogControl() - const {isReady, isUnderage, isAgeRestricted} = useAgeInfo() + const {isReady, isUnderage, isAgeRestricted} = useAgeAssurance() if (!isReady) return null if (isUnderage) return null diff --git a/src/components/ageAssurance/AgeAssuranceDismissableNotice.tsx b/src/components/ageAssurance/AgeAssuranceDismissableNotice.tsx index 3817d8b92d..6ab0f2aaa1 100644 --- a/src/components/ageAssurance/AgeAssuranceDismissableNotice.tsx +++ b/src/components/ageAssurance/AgeAssuranceDismissableNotice.tsx @@ -2,7 +2,7 @@ import {View} from 'react-native' import {msg} from '@lingui/macro' import {useLingui} from '@lingui/react' -import {useAgeInfo} from '#/state/ageAssurance/useAgeInfo' +import {useAgeAssurance} from '#/state/ageAssurance/useAgeAssurance' import {Nux, useNux, useSaveNux} from '#/state/queries/nuxs' import {atoms as a, type ViewStyleProp} from '#/alf' import {AgeAssuranceAdmonition} from '#/components/ageAssurance/AgeAssuranceAdmonition' @@ -12,7 +12,7 @@ import {TimesLarge_Stroke2_Corner0_Rounded as X} from '#/components/icons/Times' export function AgeAssuranceDismissableNotice({style}: ViewStyleProp & {}) { const {_} = useLingui() - const {isReady, isUnderage, isAgeRestricted, assurance} = useAgeInfo() + const {isReady, isUnderage, isAgeRestricted, assurance} = useAgeAssurance() const {nux} = useNux(Nux.AgeAssuranceDismissableNotice) const copy = useAgeAssuranceCopy() const {mutate: save, variables} = useSaveNux() diff --git a/src/components/ageAssurance/AgeRestrictedScreen.tsx b/src/components/ageAssurance/AgeRestrictedScreen.tsx index 919af78f21..2a98824154 100644 --- a/src/components/ageAssurance/AgeRestrictedScreen.tsx +++ b/src/components/ageAssurance/AgeRestrictedScreen.tsx @@ -2,7 +2,7 @@ import {View} from 'react-native' import {msg, Trans} from '@lingui/macro' import {useLingui} from '@lingui/react' -import {useAgeInfo} from '#/state/ageAssurance/useAgeInfo' +import {useAgeAssurance} from '#/state/ageAssurance/useAgeAssurance' import {atoms as a} from '#/alf' import {Admonition} from '#/components/Admonition' import {AgeAssuranceBadge} from '#/components/ageAssurance/AgeAssuranceBadge' @@ -24,7 +24,7 @@ export function AgeRestrictedScreen({ }) { const {_} = useLingui() const copy = useAgeAssuranceCopy() - const {isReady, isAgeRestricted} = useAgeInfo() + const {isReady, isAgeRestricted} = useAgeAssurance() if (!isReady) { return ( diff --git a/src/screens/Moderation/index.tsx b/src/screens/Moderation/index.tsx index aa28286f71..1a617bcc9a 100644 --- a/src/screens/Moderation/index.tsx +++ b/src/screens/Moderation/index.tsx @@ -12,7 +12,7 @@ import { } from '#/lib/routes/types' import {logger} from '#/logger' import {isIOS} from '#/platform/detection' -import {useAgeInfo} from '#/state/ageAssurance/useAgeInfo' +import {useAgeAssurance} from '#/state/ageAssurance/useAgeAssurance' import { useMyLabelersQuery, usePreferencesQuery, @@ -86,7 +86,7 @@ export function ModerationScreen( error: preferencesError, data: preferences, } = usePreferencesQuery() - const {isReady: isAgeInfoReady} = useAgeInfo() + const {isReady: isAgeInfoReady} = useAgeAssurance() const isLoading = isPreferencesLoading || !isAgeInfoReady const error = preferencesError @@ -160,7 +160,7 @@ export function ModerationScreenInner({ data: labelers, error: labelersError, } = useMyLabelersQuery() - const {declaredAge, isUnderage, isAgeRestricted} = useAgeInfo() + const {declaredAge, isUnderage, isAgeRestricted} = useAgeAssurance() useFocusEffect( useCallback(() => { diff --git a/src/state/ageAssurance/useAgeInfo.ts b/src/state/ageAssurance/useAgeAssurance.ts similarity index 88% rename from src/state/ageAssurance/useAgeInfo.ts rename to src/state/ageAssurance/useAgeAssurance.ts index 380b912052..d4133f4dda 100644 --- a/src/state/ageAssurance/useAgeInfo.ts +++ b/src/state/ageAssurance/useAgeAssurance.ts @@ -7,7 +7,7 @@ import {usePreferencesQuery} from '#/state/queries/preferences' const logger = Logger.create(Logger.Context.AgeAssurance) -type AgeInfo = { +type AgeAssurance = { isReady: boolean declaredAge: number | undefined isUnderage: boolean @@ -20,7 +20,7 @@ type AgeInfo = { * declared age. Use this instead of {@link useAgeAssuranceContext} to get a * more user-friendly interface. */ -export function useAgeInfo(): AgeInfo { +export function useAgeAssurance(): AgeAssurance { const ctx = useAgeAssuranceContext() const {isAgeRestricted} = useIsAgeRestricted() const {isFetched: preferencesLoaded, data: preferences} = @@ -30,7 +30,7 @@ export function useAgeInfo(): AgeInfo { return useMemo(() => { const isReady = ctx.isReady && preferencesLoaded const isUnderage = (declaredAge || 0) < 18 - const info: AgeInfo = { + const state: AgeAssurance = { isReady, declaredAge, isUnderage, @@ -38,7 +38,7 @@ export function useAgeInfo(): AgeInfo { assurance: ctx, } - logger.debug(`useAgeInfo`, info) - return info + logger.debug(`state`, state) + return state }, [ctx, preferencesLoaded, declaredAge, isAgeRestricted]) }