bas.sh
forked from
jollywhoppers.com/witchsky.app
Bluesky app fork with some witchin' additions 💫
[APP-1764] Improve Age Assurance copy (#9885)
Co-authored-by: surfdude29 <149612116+surfdude29@users.noreply.github.com>
authored by
Eric Bailey
surfdude29
and committed by
GitHub
8ee9709f
90d650de
+19
-1
src/components/ageAssurance/AgeAssuranceAccountCard.tsx
+19
-1
src/components/ageAssurance/AgeAssuranceAccountCard.tsx
···
56
56
const {status, lastInitiatedAt} = aa.state
57
57
const isBlocked = status === aa.Status.Blocked
58
58
const hasInitiated = !!lastInitiatedAt
59
+
const hasCompletedFlow = status === aa.Status.Assured
59
60
const timeAgo = lastInitiatedAt
60
61
? getTimeAgo(lastInitiatedAt, new Date())
61
62
: null
···
85
86
</View>
86
87
</View>
87
88
88
-
<View style={[a.pb_md, a.gap_xs]}>
89
+
<View style={[a.pb_md, a.gap_sm]}>
89
90
<Text style={[a.text_sm, a.leading_snug]}>{copy.notice}</Text>
91
+
{hasCompletedFlow && (
92
+
<Text style={[a.text_sm, a.leading_snug]}>
93
+
<Trans>
94
+
If you are 18 years of age or older and want to try again,
95
+
click the button below and use a different verification method
96
+
if one is available in your region. If you have questions or
97
+
concerns,{' '}
98
+
<InlineLinkText
99
+
label={_(msg`Contact our support team`)}
100
+
{...createStaticClick(() => {
101
+
appealControl.open()
102
+
})}>
103
+
our support team can help.
104
+
</InlineLinkText>
105
+
</Trans>
106
+
</Text>
107
+
)}
90
108
91
109
{IS_NATIVE && (
92
110
<>
+1
-1
src/components/ageAssurance/AgeRestrictedScreen.tsx
+1
-1
src/components/ageAssurance/AgeRestrictedScreen.tsx
+14
-5
src/components/ageAssurance/useAgeAssuranceCopy.ts
+14
-5
src/components/ageAssurance/useAgeAssuranceCopy.ts
···
2
2
import {msg} from '@lingui/macro'
3
3
import {useLingui} from '@lingui/react'
4
4
5
+
import {useAgeAssurance} from '#/ageAssurance'
6
+
5
7
export function useAgeAssuranceCopy() {
6
8
const {_} = useLingui()
9
+
const aa = useAgeAssurance()
10
+
11
+
const hasCompletedFlow = aa.state.status === aa.Status.Assured
7
12
8
13
return useMemo(() => {
9
14
return {
10
-
notice: _(
11
-
msg`Due to laws in your region, certain features on Bluesky are currently restricted until you're able to verify you're an adult.`,
12
-
),
15
+
notice: hasCompletedFlow
16
+
? _(
17
+
msg`You have completed the Age Assurance process, but based on the results, we cannot be sure that you are 18 years of age or older. Due to laws in your region, certain features on Bluesky must remain restricted until you're able to verify you're an adult.`,
18
+
)
19
+
: _(
20
+
msg`Due to laws in your region, certain features on Bluesky are currently restricted until you're able to verify you're an adult.`,
21
+
),
13
22
banner: _(
14
-
msg`The laws in your location require you to verify you're an adult to access certain features. Tap to learn more.`,
23
+
msg`The laws in your region require you to verify you're an adult to access certain features. Tap to learn more.`,
15
24
),
16
25
chatsInfoText: _(
17
26
msg`Don't worry! All existing messages and settings are saved and will be available after you verify you're an adult.`,
18
27
),
19
28
}
20
-
}, [_])
29
+
}, [_, hasCompletedFlow])
21
30
}