diff --git a/src/screens/Signup/StepInfo/Policies.tsx b/src/screens/Signup/StepInfo/Policies.tsx index a3a0672223..ba0cfc2b43 100644 --- a/src/screens/Signup/StepInfo/Policies.tsx +++ b/src/screens/Signup/StepInfo/Policies.tsx @@ -1,4 +1,4 @@ -import React from 'react' +import React, {ReactElement} from 'react' import {View} from 'react-native' import {ComAtprotoServerDescribeServer} from '@atproto/api' import {msg, Trans} from '@lingui/macro' @@ -42,43 +42,64 @@ export const Policies = ({ ) } - const els = [] - if (tos) { - els.push( - - {_(msg`Terms of Service`)} - , + let els: ReactElement + if (tos && pp) { + els = ( + + By creating an account you agree to the{' '} + + Terms of Service + {' '} + and{' '} + + Privacy Policy + + . + ) - } - if (pp) { - els.push( - - {_(msg`Privacy Policy`)} - , + } else if (tos) { + els = ( + + By creating an account you agree to the{' '} + + Terms of Service + + . + ) - } - if (els.length === 2) { - els.splice( - 1, - 0, - - {' '} - and{' '} - , + } else if (pp) { + els = ( + + By creating an account you agree to the{' '} + + Privacy Policy + + . + ) + } else { + return null } return ( - - By creating an account you agree to the {els}. - + {els ? ( + + {els} + + ) : null} {under13 ? ( diff --git a/src/screens/Signup/index.tsx b/src/screens/Signup/index.tsx index e3da053c09..1857981a0f 100644 --- a/src/screens/Signup/index.tsx +++ b/src/screens/Signup/index.tsx @@ -168,7 +168,8 @@ export function Signup({onPressBack}: {onPressBack: () => void}) { - + Having trouble?{' '}