Add error state in case of config failure
This commit is contained in:
@@ -35,13 +35,14 @@ export function useAgeAssuranceState(): AgeAssuranceState {
|
|||||||
* The query handler will try it again, but if it continues to fail, of
|
* The query handler will try it again, but if it continues to fail, of
|
||||||
* course we won't have config.
|
* course we won't have config.
|
||||||
*
|
*
|
||||||
* In this case, fail open (unknown status/access) to avoid blocking users.
|
* In this case, fail open to avoid blocking users.
|
||||||
*/
|
*/
|
||||||
if (!config) {
|
if (!config) {
|
||||||
logger.warn('useAgeAssuranceState: missing config')
|
logger.warn('useAgeAssuranceState: missing config')
|
||||||
return {
|
return {
|
||||||
status: AgeAssuranceStatus.Unknown,
|
status: AgeAssuranceStatus.Unknown,
|
||||||
access: AgeAssuranceAccess.Unknown,
|
access: AgeAssuranceAccess.Safe,
|
||||||
|
error: 'config',
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ export type AgeAssuranceState = {
|
|||||||
lastInitiatedAt?: string
|
lastInitiatedAt?: string
|
||||||
status: AgeAssuranceStatus
|
status: AgeAssuranceStatus
|
||||||
access: AgeAssuranceAccess
|
access: AgeAssuranceAccess
|
||||||
|
error?: 'config' // maybe other specific cases in the future
|
||||||
}
|
}
|
||||||
|
|
||||||
export function parseStatusFromString(raw: string) {
|
export function parseStatusFromString(raw: string) {
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ import {atoms as a, useBreakpoints, useTheme, type ViewStyleProp} from '#/alf'
|
|||||||
import {Admonition} from '#/components/Admonition'
|
import {Admonition} from '#/components/Admonition'
|
||||||
import {AgeAssuranceAppealDialog} from '#/components/ageAssurance/AgeAssuranceAppealDialog'
|
import {AgeAssuranceAppealDialog} from '#/components/ageAssurance/AgeAssuranceAppealDialog'
|
||||||
import {AgeAssuranceBadge} from '#/components/ageAssurance/AgeAssuranceBadge'
|
import {AgeAssuranceBadge} from '#/components/ageAssurance/AgeAssuranceBadge'
|
||||||
|
import {AgeAssuranceConfigUnavailableError} from '#/components/ageAssurance/AgeAssuranceErrors'
|
||||||
import {
|
import {
|
||||||
AgeAssuranceInitDialog,
|
AgeAssuranceInitDialog,
|
||||||
useDialogControl,
|
useDialogControl,
|
||||||
@@ -27,6 +28,13 @@ import {useDeviceGeolocationApi} from '#/geolocation'
|
|||||||
export function AgeAssuranceAccountCard({style}: ViewStyleProp & {}) {
|
export function AgeAssuranceAccountCard({style}: ViewStyleProp & {}) {
|
||||||
const aa = useAgeAssurance()
|
const aa = useAgeAssurance()
|
||||||
if (aa.state.access === aa.Access.Full) return null
|
if (aa.state.access === aa.Access.Full) return null
|
||||||
|
if (aa.state.error === 'config') {
|
||||||
|
return (
|
||||||
|
<View style={style}>
|
||||||
|
<AgeAssuranceConfigUnavailableError />
|
||||||
|
</View>
|
||||||
|
)
|
||||||
|
}
|
||||||
return <Inner style={style} />
|
return <Inner style={style} />
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ import {msg, Trans} from '@lingui/macro'
|
|||||||
import {useLingui} from '@lingui/react'
|
import {useLingui} from '@lingui/react'
|
||||||
|
|
||||||
import {atoms as a, select, useTheme, type ViewStyleProp} from '#/alf'
|
import {atoms as a, select, useTheme, type ViewStyleProp} from '#/alf'
|
||||||
|
import {AgeAssuranceConfigUnavailableError} from '#/components/ageAssurance/AgeAssuranceErrors'
|
||||||
import {useDialogControl} from '#/components/ageAssurance/AgeAssuranceInitDialog'
|
import {useDialogControl} from '#/components/ageAssurance/AgeAssuranceInitDialog'
|
||||||
import type * as Dialog from '#/components/Dialog'
|
import type * as Dialog from '#/components/Dialog'
|
||||||
import {ShieldCheck_Stroke2_Corner0_Rounded as Shield} from '#/components/icons/Shield'
|
import {ShieldCheck_Stroke2_Corner0_Rounded as Shield} from '#/components/icons/Shield'
|
||||||
@@ -19,6 +20,9 @@ export function AgeAssuranceAdmonition({
|
|||||||
const aa = useAgeAssurance()
|
const aa = useAgeAssurance()
|
||||||
|
|
||||||
if (aa.state.access === aa.Access.Full) return null
|
if (aa.state.access === aa.Access.Full) return null
|
||||||
|
if (aa.state.error === 'config') {
|
||||||
|
return <AgeAssuranceConfigUnavailableError style={[a.pr_4xl]} />
|
||||||
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Inner style={style} control={control}>
|
<Inner style={style} control={control}>
|
||||||
|
|||||||
@@ -23,6 +23,7 @@ export function useInternalState() {
|
|||||||
const visible = useMemo(() => {
|
const visible = useMemo(() => {
|
||||||
if (aa.state.access === aa.Access.Full) return false
|
if (aa.state.access === aa.Access.Full) return false
|
||||||
if (aa.state.lastInitiatedAt) return false
|
if (aa.state.lastInitiatedAt) return false
|
||||||
|
if (aa.state.error === 'config') return false
|
||||||
if (hidden) return false
|
if (hidden) return false
|
||||||
if (nux && nux.completed) return false
|
if (nux && nux.completed) return false
|
||||||
return true
|
return true
|
||||||
|
|||||||
@@ -0,0 +1,16 @@
|
|||||||
|
import {Trans} from '@lingui/macro'
|
||||||
|
|
||||||
|
import {type ViewStyleProp} from '#/alf'
|
||||||
|
import {Admonition} from '#/components/Admonition'
|
||||||
|
|
||||||
|
export function AgeAssuranceConfigUnavailableError(props: ViewStyleProp) {
|
||||||
|
return (
|
||||||
|
<Admonition type="error" style={props.style}>
|
||||||
|
<Trans>
|
||||||
|
We were unable to load age assurance configuration for your region,
|
||||||
|
probably due to a network error. Some content and features may be
|
||||||
|
unavailable temporarily. Please try again later.
|
||||||
|
</Trans>
|
||||||
|
</Admonition>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -5,6 +5,7 @@ import {useLingui} from '@lingui/react'
|
|||||||
import {atoms as a} from '#/alf'
|
import {atoms as a} from '#/alf'
|
||||||
import {Admonition} from '#/components/Admonition'
|
import {Admonition} from '#/components/Admonition'
|
||||||
import {AgeAssuranceBadge} from '#/components/ageAssurance/AgeAssuranceBadge'
|
import {AgeAssuranceBadge} from '#/components/ageAssurance/AgeAssuranceBadge'
|
||||||
|
import {AgeAssuranceConfigUnavailableError} from '#/components/ageAssurance/AgeAssuranceErrors'
|
||||||
import {useAgeAssuranceCopy} from '#/components/ageAssurance/useAgeAssuranceCopy'
|
import {useAgeAssuranceCopy} from '#/components/ageAssurance/useAgeAssuranceCopy'
|
||||||
import {ButtonIcon, ButtonText} from '#/components/Button'
|
import {ButtonIcon, ButtonText} from '#/components/Button'
|
||||||
import {ChevronRight_Stroke2_Corner0_Rounded as ChevronRight} from '#/components/icons/Chevron'
|
import {ChevronRight_Stroke2_Corner0_Rounded as ChevronRight} from '#/components/icons/Chevron'
|
||||||
@@ -44,6 +45,12 @@ export function AgeRestrictedScreen({
|
|||||||
</Layout.Header.Outer>
|
</Layout.Header.Outer>
|
||||||
<Layout.Content>
|
<Layout.Content>
|
||||||
<View style={[a.p_lg]}>
|
<View style={[a.p_lg]}>
|
||||||
|
{aa.state.error === 'config' && (
|
||||||
|
<View style={[a.pb_lg]}>
|
||||||
|
<AgeAssuranceConfigUnavailableError />
|
||||||
|
</View>
|
||||||
|
)}
|
||||||
|
|
||||||
<View style={[a.align_start, a.pb_lg]}>
|
<View style={[a.align_start, a.pb_lg]}>
|
||||||
<AgeAssuranceBadge />
|
<AgeAssuranceBadge />
|
||||||
</View>
|
</View>
|
||||||
|
|||||||
Reference in New Issue
Block a user