Skip to content

Fe fix phone number validation #1847

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ThomasNickerson merged 6 commits into from
Mar 15, 2021
Merged

Fe fix phone number validation #1847

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6e2d49c
Add regex validation of number
Mar 11, 2021
3815fca
Add better feedback, remove unused typeError message
Mar 11, 2021
d1b32fa
Update to Regex to match feedback from server
Mar 11, 2021
7156bd5
Add translation
Mar 11, 2021
7f824ec
Run lingui compile
Mar 12, 2021
5137d22
Fix i18n for phone number validation
Mar 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions frontend/src/EditableUserPhoneNumber.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,11 @@ import {
import WithPseudoBox from './withPseudoBox'
import { Formik } from 'formik'
import { t, Trans } from '@lingui/macro'
import { i18n } from '@lingui/core'
import { UPDATE_USER_PROFILE } from './graphql/mutations'
import { useMutation } from '@apollo/client'
import { useUserState } from './UserState'
import { number, object } from 'yup'
import { object, string as yupString } from 'yup'
import { fieldRequirements } from './fieldRequirements'
import { TrackerButton } from './TrackerButton'
import PhoneNumberField from './PhoneNumberField'
Expand Down Expand Up @@ -91,10 +92,15 @@ function EditableUserPhoneNumber({ detailValue }) {
},
)

const PHONE_NUMBER_REGEX = /^\+[1-9]\d{10,15}$/

const validationSchema = object().shape({
phoneNumber: number()
.required(fieldRequirements.phoneNumber.required.message)
.typeError(fieldRequirements.phoneNumber.typeError.message),
phoneNumber: yupString()
.required(i18n._(fieldRequirements.phoneNumber.required.message))
.matches(
PHONE_NUMBER_REGEX,
i18n._(fieldRequirements.phoneNumber.matches.message),
),
})

return (
Expand Down
4 changes: 3 additions & 1 deletion frontend/src/fieldRequirements.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,9 @@ export const fieldRequirements = {
required: { message: t`Domain url field must not be empty` },
},
phoneNumber: {
typeError: { message: t`Phone number must only contains numbers` },
matches: {
message: t`Phone number must be a valid phone number of the form +17895551234 (10-15 digits)`,
},
required: { message: t`Phone number field must not be empty` },
},
}
Loading