Checkpoint: cleanup

src/components/ageAssurance/AgeAssuranceAccountCard.tsx

@@ -20,11 +20,11 @@ import {createStaticClick, InlineLinkText} from '#/components/Link'
 import {Text} from '#/components/Typography'
 
 export function AgeAssuranceAccountCard({style}: ViewStyleProp & {}) {
-  const {isLoaded, assurance, declaredAge} = useAgeInfo()
+  const {isLoaded, mustCompleteAgeAssurance, isUnderage} = useAgeInfo()
 
   if (!isLoaded) return null
-  if (declaredAge && declaredAge < 18) return null
-  if (!assurance.isAgeRestricted) return null
+  if (isUnderage) return null
+  if (!mustCompleteAgeAssurance) return null
 
   return <Inner style={style} />
 }

src/components/ageAssurance/AgeAssuranceAdmonition.tsx

@@ -15,11 +15,11 @@ export function AgeAssuranceAdmonition({
   style,
 }: ViewStyleProp & {children: React.ReactNode}) {
   const control = useDialogControl()
-  const {isLoaded, isUnderage, assurance} = useAgeInfo()
+  const {isLoaded, isUnderage, mustCompleteAgeAssurance} = useAgeInfo()
 
   if (!isLoaded) return null
   if (isUnderage) return null
-  if (!assurance.isAgeRestricted) return null
+  if (!mustCompleteAgeAssurance) return null
 
   return (
     <Inner style={style} control={control}>

src/components/ageAssurance/AgeAssuranceDismissableNotice.tsx

@@ -12,7 +12,8 @@ import {TimesLarge_Stroke2_Corner0_Rounded as X} from '#/components/icons/Times'
 
 export function AgeAssuranceDismissableNotice({style}: ViewStyleProp & {}) {
   const {_} = useLingui()
-  const {isLoaded, isUnderage, assurance} = useAgeInfo()
+  const {isLoaded, isUnderage, mustCompleteAgeAssurance, assurance} =
+    useAgeInfo()
   const {nux} = useNux(Nux.AgeAssuranceDismissableNotice)
   const copy = useAgeAssuranceCopy()
   const {mutate: save, variables} = useSaveNux()
@@ -20,7 +21,7 @@ export function AgeAssuranceDismissableNotice({style}: ViewStyleProp & {}) {
 
   if (!isLoaded) return null
   if (isUnderage) return null
-  if (!assurance.isAgeRestricted) return null
+  if (!mustCompleteAgeAssurance) return null
   if (assurance.lastInitiatedAt) return null
   if (hidden) return null
   if (nux && nux.completed) return null

src/components/ageAssurance/AgeRestrictedScreen.tsx

@@ -24,7 +24,7 @@ export function AgeRestrictedScreen({
 }) {
   const {_} = useLingui()
   const copy = useAgeAssuranceCopy()
-  const {isLoaded, assurance} = useAgeInfo()
+  const {isLoaded, mustCompleteAgeAssurance} = useAgeInfo()
 
   if (!isLoaded) {
     return (
@@ -39,7 +39,7 @@ export function AgeRestrictedScreen({
       </Layout.Screen>
     )
   }
-  if (!assurance.isAgeRestricted) return children
+  if (!mustCompleteAgeAssurance) return children
 
   return (
     <Layout.Screen>