diff --git a/frontend/client/components/Profile/ProfileEdit.tsx b/frontend/client/components/Profile/ProfileEdit.tsx index bc332558..5ab320c9 100644 --- a/frontend/client/components/Profile/ProfileEdit.tsx +++ b/frontend/client/components/Profile/ProfileEdit.tsx @@ -12,7 +12,7 @@ import { Input, Form, Col, Row, Button, Alert, Icon } from 'antd'; import { SOCIAL_INFO } from 'utils/social'; import { SOCIAL_SERVICE, User } from 'types'; import { UserState } from 'modules/users/reducers'; -import { getCreateTeamMemberError } from 'modules/create/utils'; +import { validateUserProfile } from 'modules/create/utils'; import AvatarEdit from './AvatarEdit'; import './ProfileEdit.less'; @@ -85,8 +85,8 @@ class ProfileEdit extends React.PureComponent { socialVerificationError, activeSocialService, } = this.state; - const error = getCreateTeamMemberError(fields); - const isMissingField = !fields.displayName || !fields.title || !fields.emailAddress; + const error = validateUserProfile(fields); + const isMissingField = !fields.displayName || !fields.title; const isDisabled = !!error || isMissingField || @@ -132,18 +132,6 @@ class ProfileEdit extends React.PureComponent { /> - - - - {Object.values(SOCIAL_INFO).map(s => { const field = fields.socialMedias.find(sm => sm.service === s.service); diff --git a/frontend/client/modules/create/utils.ts b/frontend/client/modules/create/utils.ts index afc06c7b..023d9e57 100644 --- a/frontend/client/modules/create/utils.ts +++ b/frontend/client/modules/create/utils.ts @@ -127,13 +127,11 @@ export function getCreateErrors( return errors; } -export function getCreateTeamMemberError(user: User) { +export function validateUserProfile(user: User) { if (user.displayName.length > 30) { return 'Display name can only be 30 characters maximum'; } else if (user.title.length > 30) { return 'Title can only be 30 characters maximum'; - } else if (!user.emailAddress || !/.+\@.+\..+/.test(user.emailAddress)) { - return 'That doesn’t look like a valid email address'; } return '';