diff options
| -rw-r--r-- | src/lib/constants.ts | 7 | ||||
| -rw-r--r-- | src/lib/statsig/gates.ts | 1 | ||||
| -rw-r--r-- | src/screens/Signup/StepInfo/Policies.tsx | 52 |
3 files changed, 50 insertions, 10 deletions
diff --git a/src/lib/constants.ts b/src/lib/constants.ts index 3f0d49989..ab52b8710 100644 --- a/src/lib/constants.ts +++ b/src/lib/constants.ts @@ -207,3 +207,10 @@ export const PUBLIC_APPVIEW_DID = 'did:web:api.bsky.app' export const PUBLIC_STAGING_APPVIEW_DID = 'did:web:api.staging.bsky.dev' export const DEV_ENV_APPVIEW = `http://localhost:2584` // always the same + +export const webLinks = { + tos: `https://bsky.social/about/support/tos`, + privacy: `https://bsky.social/about/support/privacy-policy`, + community: `https://bsky.social/about/support/community-guidelines`, + communityDeprecated: `https://bsky.social/about/support/community-guidelines-deprecated`, +} diff --git a/src/lib/statsig/gates.ts b/src/lib/statsig/gates.ts index 3b1106480..c3bd1a7cb 100644 --- a/src/lib/statsig/gates.ts +++ b/src/lib/statsig/gates.ts @@ -3,6 +3,7 @@ export type Gate = | 'alt_share_icon' | 'debug_show_feedcontext' | 'debug_subscriptions' + | 'disable_onboarding_policy_update_notice' | 'explore_show_suggested_feeds' | 'old_postonboarding' | 'onboarding_add_video_feed' diff --git a/src/screens/Signup/StepInfo/Policies.tsx b/src/screens/Signup/StepInfo/Policies.tsx index 17980172d..0bc14fa6a 100644 --- a/src/screens/Signup/StepInfo/Policies.tsx +++ b/src/screens/Signup/StepInfo/Policies.tsx @@ -4,11 +4,42 @@ import {type ComAtprotoServerDescribeServer} from '@atproto/api' import {msg, Trans} from '@lingui/macro' import {useLingui} from '@lingui/react' +import {webLinks} from '#/lib/constants' +import {useGate} from '#/lib/statsig/statsig' import {atoms as a, useTheme} from '#/alf' -import {CircleInfo_Stroke2_Corner0_Rounded as CircleInfo} from '#/components/icons/CircleInfo' +import {Admonition} from '#/components/Admonition' import {InlineLinkText} from '#/components/Link' import {Text} from '#/components/Typography' +function CommunityGuidelinesNotice({}: {}) { + const {_} = useLingui() + const gate = useGate() + + if (gate('disable_onboarding_policy_update_notice')) return null + + return ( + <View style={[a.pt_xs]}> + <Admonition type="tip"> + <Trans> + You also agree to{' '} + <InlineLinkText + label={_(msg`Bluesky's Community Guidelines`)} + to={webLinks.communityDeprecated}> + Bluesky’s Community Guidelines + </InlineLinkText> + . An{' '} + <InlineLinkText + label={_(msg`Bluesky's Updated Community Guidelines`)} + to={webLinks.community}> + updated version of our Community Guidelines + </InlineLinkText>{' '} + will take effect on October 13th. + </Trans> + </Admonition> + </View> + ) +} + export const Policies = ({ serviceDescription, needsGuardian, @@ -30,14 +61,13 @@ export const Policies = ({ if (!tos && !pp) { return ( - <View style={[a.flex_row, a.align_center, a.gap_xs]}> - <CircleInfo size="md" fill={t.atoms.text_contrast_low.color} /> - - <Text style={[t.atoms.text_contrast_medium]}> + <View style={[a.gap_sm]}> + <Admonition type="info"> <Trans> This service has not provided terms of service or a privacy policy. </Trans> - </Text> + </Admonition> + <CommunityGuidelinesNotice /> </View> ) } @@ -102,19 +132,21 @@ export const Policies = ({ ) : null} {under13 ? ( - <Text style={[a.font_bold, a.leading_snug, t.atoms.text_contrast_high]}> + <Admonition type="error"> <Trans> You must be 13 years of age or older to create an account. </Trans> - </Text> + </Admonition> ) : needsGuardian ? ( - <Text style={[a.font_bold, a.leading_snug, t.atoms.text_contrast_high]}> + <Admonition type="warning"> <Trans> If you are not yet an adult according to the laws of your country, your parent or legal guardian must read these Terms on your behalf. </Trans> - </Text> + </Admonition> ) : undefined} + + <CommunityGuidelinesNotice /> </View> ) } |