diff options
Diffstat (limited to 'src/screens')
-rw-r--r-- | src/screens/Settings/components/ChangeHandleDialog.tsx | 10 | ||||
-rw-r--r-- | src/screens/Signup/StepHandle.tsx | 13 |
2 files changed, 14 insertions, 9 deletions
diff --git a/src/screens/Settings/components/ChangeHandleDialog.tsx b/src/screens/Settings/components/ChangeHandleDialog.tsx index bb03aace1..37f6ed9ef 100644 --- a/src/screens/Settings/components/ChangeHandleDialog.tsx +++ b/src/screens/Settings/components/ChangeHandleDialog.tsx @@ -172,13 +172,11 @@ function ProvidedHandlePage({ const host = serviceInfo.availableUserDomains[0] const validation = useMemo( - () => validateHandle(subdomain, host), + () => validateHandle(subdomain, host, true), [subdomain, host], ) - const isTooLong = subdomain.length > 18 const isInvalid = - isTooLong || !validation.handleChars || !validation.hyphenStartOrEnd || !validation.totalLength @@ -231,10 +229,10 @@ function ProvidedHandlePage({ label={_(msg`Save new handle`)} variant="solid" size="large" - color={validation.overall && !isTooLong ? 'primary' : 'secondary'} - disabled={!validation.overall && !isTooLong} + color={validation.overall ? 'primary' : 'secondary'} + disabled={!validation.overall} onPress={() => { - if (validation.overall && !isTooLong) { + if (validation.overall) { changeHandle({handle: createFullHandle(subdomain, host)}) } }}> diff --git a/src/screens/Signup/StepHandle.tsx b/src/screens/Signup/StepHandle.tsx index dee7df848..1d04264ae 100644 --- a/src/screens/Signup/StepHandle.tsx +++ b/src/screens/Signup/StepHandle.tsx @@ -4,7 +4,11 @@ import {msg, Trans} from '@lingui/macro' import {useLingui} from '@lingui/react' import {logEvent} from '#/lib/statsig/statsig' -import {createFullHandle, validateHandle} from '#/lib/strings/handles' +import { + createFullHandle, + maxServiceHandleLength, + validateHandle, +} from '#/lib/strings/handles' import {useAgent} from '#/state/session' import {ScreenTransition} from '#/screens/Login/ScreenTransition' import {useSignupContext} from '#/screens/Signup/state' @@ -93,7 +97,7 @@ export function StepHandle() { }) }, [dispatch, state.activeStep]) - const validCheck = validateHandle(draftValue, state.userDomain) + const validCheck = validateHandle(draftValue, state.userDomain, true) return ( <ScreenTransition> <View style={[a.gap_lg]}> @@ -166,7 +170,10 @@ export function StepHandle() { /> {!validCheck.totalLength ? ( <Text style={[a.text_md, a.flex_1]}> - <Trans>No longer than 253 characters</Trans> + <Trans> + No longer than {maxServiceHandleLength(state.userDomain)}{' '} + characters + </Trans> </Text> ) : ( <Text style={[a.text_md, a.flex_1]}> |