tweak wording

This commit is contained in:
Hailey
2024-11-15 17:04:14 -08:00
parent ac734f8d5c
commit d09f4fd762
2 changed files with 49 additions and 23 deletions
+35 -12
View File
@@ -146,11 +146,35 @@ export function Inner({
<ErrorMessage message={error} /> <ErrorMessage message={error} />
</View> </View>
) : null} ) : null}
<Text style={[a.text_md, a.leading_snug]}>
{currentStep === 'StepOne' ? ( {currentStep === 'StepOne' ? (
<> <View>
{!reasonText ? ( {reasonText ? (
<> <View style={[a.gap_sm]}>
<Text style={[a.text_md, a.leading_snug]}>{reasonText}</Text>
<Text style={[a.text_md, a.leading_snug]}>
Don't have access to{' '}
<Text style={[a.text_md, a.leading_snug, a.font_bold]}>
{currentAccount?.email}
</Text>
?{' '}
<InlineLinkText
to="#"
label={_(msg`Change email address`)}
style={[a.text_md, a.leading_snug]}
onPress={e => {
e.preventDefault()
control.close(() => {
openModal({name: 'change-email'})
})
return false
}}>
<Trans>Change your email address</Trans>
</InlineLinkText>
.
</Text>
</View>
) : (
<Text style={[a.text_md, a.leading_snug]}>
<Trans> <Trans>
You'll receive an email at{' '} You'll receive an email at{' '}
<Text style={[a.text_md, a.leading_snug, a.font_bold]}> <Text style={[a.text_md, a.leading_snug, a.font_bold]}>
@@ -171,15 +195,14 @@ export function Inner({
}}> }}>
<Trans>Need to change it?</Trans> <Trans>Need to change it?</Trans>
</InlineLinkText> </InlineLinkText>
</>
) : (
reasonText
)}
</>
) : (
uiStrings[currentStep].message
)}
</Text> </Text>
)}
</View>
) : (
<Text style={[a.text_md, a.leading_snug]}>
uiStrings[currentStep].message
</Text>
)}
</View> </View>
{currentStep === 'StepTwo' ? ( {currentStep === 'StepTwo' ? (
<View> <View>
+5 -2
View File
@@ -8,12 +8,15 @@ export function useEmail() {
const {data: serviceConfig} = useServiceConfigQuery() const {data: serviceConfig} = useServiceConfigQuery()
const checkEmailConfirmed = !!serviceConfig?.checkEmailConfirmed
const isSelfHost = const isSelfHost =
serviceConfig?.checkEmailConfirmed &&
currentAccount && currentAccount &&
getHostnameFromUrl(currentAccount.service) !== getHostnameFromUrl(currentAccount.service) !==
getHostnameFromUrl(BSKY_SERVICE) getHostnameFromUrl(BSKY_SERVICE)
const needsEmailVerification = !isSelfHost && !currentAccount?.emailConfirmed
const needsEmailVerification =
checkEmailConfirmed && !isSelfHost && !currentAccount?.emailConfirmed
return {needsEmailVerification} return {needsEmailVerification}
} }