Adjust AA device signals copy
This commit is contained in:
@@ -0,0 +1,63 @@
|
|||||||
|
import {Trans, useLingui} from '@lingui/react/macro'
|
||||||
|
|
||||||
|
import {atoms as a, useTheme} from '#/alf'
|
||||||
|
import {createStaticClick, SimpleInlineLinkText} from '#/components/Link'
|
||||||
|
import {Text} from '#/components/Typography'
|
||||||
|
import {IS_IOS} from '#/env'
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Explains what sharing on-device age signals reveals, shown alongside the
|
||||||
|
* "Share age range" button on the age assurance surfaces (the no-access screen
|
||||||
|
* and the account settings card).
|
||||||
|
*
|
||||||
|
* Platform-split so the copy can name the OS account the age range comes from
|
||||||
|
* (Apple Account vs Google Account) and reassure users that only a range is
|
||||||
|
* shared. Device signals are only supported on iOS and Android, so these are
|
||||||
|
* the only two cases.
|
||||||
|
*/
|
||||||
|
export function DeviceSignalsNotice({onPressKws}: {onPressKws: () => void}) {
|
||||||
|
const t = useTheme()
|
||||||
|
const {t: l} = useLingui()
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Text style={[a.text_sm, a.italic, t.atoms.text_contrast_medium]}>
|
||||||
|
{IS_IOS ? (
|
||||||
|
<Trans comment="Shown next to the 'Share age range' button when on-device age verification is available. KWS is the name of a third-party verification partner.">
|
||||||
|
Sharing your age range reveals only the range associated with your
|
||||||
|
Apple Account – for example, that you’re at least 18.{' '}
|
||||||
|
<Text style={[a.text_sm, a.font_bold]}>
|
||||||
|
Your exact age and birthday are never shared,
|
||||||
|
</Text>{' '}
|
||||||
|
and this data never leaves this device. Therefore, it only enables
|
||||||
|
access on this device. Alternatively,{' '}
|
||||||
|
<SimpleInlineLinkText
|
||||||
|
label={l`Verify now using KWS`}
|
||||||
|
{...createStaticClick(() => {
|
||||||
|
onPressKws()
|
||||||
|
})}>
|
||||||
|
you can use our trusted partner, KWS
|
||||||
|
</SimpleInlineLinkText>
|
||||||
|
, to complete your verification and enable access on all platforms.
|
||||||
|
</Trans>
|
||||||
|
) : (
|
||||||
|
<Trans comment="Shown next to the 'Share age range' button when on-device age verification is available. KWS is the name of a third-party verification partner.">
|
||||||
|
Sharing your age range reveals only the range associated with your
|
||||||
|
Google Account – for example, that you’re at least 18.{' '}
|
||||||
|
<Text style={[a.text_sm, a.font_bold]}>
|
||||||
|
Your exact age and birthday are never shared,
|
||||||
|
</Text>{' '}
|
||||||
|
and this data never leaves this device. Therefore, it only enables
|
||||||
|
access on this device. Alternatively,{' '}
|
||||||
|
<SimpleInlineLinkText
|
||||||
|
label={l`Verify now using KWS`}
|
||||||
|
{...createStaticClick(() => {
|
||||||
|
onPressKws()
|
||||||
|
})}>
|
||||||
|
you can use our trusted partner, KWS
|
||||||
|
</SimpleInlineLinkText>
|
||||||
|
, to complete your verification and enable access on all platforms.
|
||||||
|
</Trans>
|
||||||
|
)}
|
||||||
|
</Text>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -27,6 +27,7 @@ import * as Toast from '#/components/Toast'
|
|||||||
import {Text} from '#/components/Typography'
|
import {Text} from '#/components/Typography'
|
||||||
import {BottomSheetOutlet} from '#/../modules/bottom-sheet'
|
import {BottomSheetOutlet} from '#/../modules/bottom-sheet'
|
||||||
import {useAgeAssurance} from '#/ageAssurance'
|
import {useAgeAssurance} from '#/ageAssurance'
|
||||||
|
import {DeviceSignalsNotice} from '#/ageAssurance/components/DeviceSignalsNotice'
|
||||||
import {useAgeAssuranceServerDataContext} from '#/ageAssurance/data'
|
import {useAgeAssuranceServerDataContext} from '#/ageAssurance/data'
|
||||||
import {useComputeAgeAssuranceRegionAccess} from '#/ageAssurance/useComputeAgeAssuranceRegionAccess'
|
import {useComputeAgeAssuranceRegionAccess} from '#/ageAssurance/useComputeAgeAssuranceRegionAccess'
|
||||||
import {useAgeAssuranceVerificationFlow} from '#/ageAssurance/useVerificationFlow'
|
import {useAgeAssuranceVerificationFlow} from '#/ageAssurance/useVerificationFlow'
|
||||||
@@ -428,23 +429,7 @@ function AccessSection() {
|
|||||||
</Button>
|
</Button>
|
||||||
|
|
||||||
{useDeviceSignals ? (
|
{useDeviceSignals ? (
|
||||||
<Text
|
<DeviceSignalsNotice onPressKws={openInitDialog} />
|
||||||
style={[a.text_sm, a.italic, t.atoms.text_contrast_medium]}>
|
|
||||||
<Trans>
|
|
||||||
Sharing your age data uses information stored on your
|
|
||||||
device, and will therefore only work on this device.
|
|
||||||
Alternatively,{' '}
|
|
||||||
<SimpleInlineLinkText
|
|
||||||
label={l`Verify now using KWS`}
|
|
||||||
{...createStaticClick(() => {
|
|
||||||
openInitDialog()
|
|
||||||
})}>
|
|
||||||
you can use our trusted partner, KWS
|
|
||||||
</SimpleInlineLinkText>
|
|
||||||
, to complete your verification and enable access on all
|
|
||||||
platforms.
|
|
||||||
</Trans>
|
|
||||||
</Text>
|
|
||||||
) : lastInitiatedAt && timeAgo && diff ? (
|
) : lastInitiatedAt && timeAgo && diff ? (
|
||||||
<Text
|
<Text
|
||||||
style={[a.text_sm, a.italic, t.atoms.text_contrast_medium]}
|
style={[a.text_sm, a.italic, t.atoms.text_contrast_medium]}
|
||||||
|
|||||||
@@ -59,7 +59,7 @@ export function useAgeAssuranceVerificationFlow({
|
|||||||
|
|
||||||
const verifyCta =
|
const verifyCta =
|
||||||
allowsDeviceVerification && !deviceSignalsFailed
|
allowsDeviceVerification && !deviceSignalsFailed
|
||||||
? l`Share age data`
|
? l`Share age range`
|
||||||
: hasInitiated
|
: hasInitiated
|
||||||
? l`Verify again`
|
? l`Verify again`
|
||||||
: l`Verify now`
|
: l`Verify now`
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ import {Loader} from '#/components/Loader'
|
|||||||
import * as Toast from '#/components/Toast'
|
import * as Toast from '#/components/Toast'
|
||||||
import {Text} from '#/components/Typography'
|
import {Text} from '#/components/Typography'
|
||||||
import {useAgeAssurance} from '#/ageAssurance'
|
import {useAgeAssurance} from '#/ageAssurance'
|
||||||
|
import {DeviceSignalsNotice} from '#/ageAssurance/components/DeviceSignalsNotice'
|
||||||
import {useComputeAgeAssuranceRegionAccess} from '#/ageAssurance/useComputeAgeAssuranceRegionAccess'
|
import {useComputeAgeAssuranceRegionAccess} from '#/ageAssurance/useComputeAgeAssuranceRegionAccess'
|
||||||
import {useAgeAssuranceVerificationFlow} from '#/ageAssurance/useVerificationFlow'
|
import {useAgeAssuranceVerificationFlow} from '#/ageAssurance/useVerificationFlow'
|
||||||
import {createGeolocationString} from '#/ageAssurance/util'
|
import {createGeolocationString} from '#/ageAssurance/util'
|
||||||
@@ -164,23 +165,7 @@ function Inner({style}: ViewStyleProp & {}) {
|
|||||||
</Button>
|
</Button>
|
||||||
|
|
||||||
{useDeviceSignals ? (
|
{useDeviceSignals ? (
|
||||||
<Text
|
<DeviceSignalsNotice onPressKws={openInitDialog} />
|
||||||
style={[a.text_sm, a.italic, t.atoms.text_contrast_medium]}>
|
|
||||||
<Trans>
|
|
||||||
Sharing your age data uses information stored on your
|
|
||||||
device, and will therefore only work on this device.
|
|
||||||
Alternatively,{' '}
|
|
||||||
<InlineLinkText
|
|
||||||
label={l`Verify now using KWS`}
|
|
||||||
{...createStaticClick(() => {
|
|
||||||
openInitDialog()
|
|
||||||
})}>
|
|
||||||
you can use our trusted partner, KWS
|
|
||||||
</InlineLinkText>
|
|
||||||
, to complete your verification and enable access on all
|
|
||||||
platforms.
|
|
||||||
</Trans>
|
|
||||||
</Text>
|
|
||||||
) : lastInitiatedAt && timeAgo && diff ? (
|
) : lastInitiatedAt && timeAgo && diff ? (
|
||||||
<Text
|
<Text
|
||||||
style={[a.text_sm, a.italic, t.atoms.text_contrast_medium]}
|
style={[a.text_sm, a.italic, t.atoms.text_contrast_medium]}
|
||||||
|
|||||||
Reference in New Issue
Block a user