Merge pull request #867 from chengweiv5/team-name

Team name

web/react/components/team_signup_url_page.jsx

@@ -35,8 +35,8 @@ export default class TeamSignupUrlPage extends React.Component {
         if (cleanedName !== name || !urlRegex.test(name)) {
             this.setState({nameError: "Use only lower case letters, numbers and dashes. Must start with a letter and can't end in a dash."});
             return;
-        } else if (cleanedName.length <= 3 || cleanedName.length > 15) {
+        } else if (cleanedName.length <= 2 || cleanedName.length > 15) {
-            this.setState({nameError: 'Name must be 4 or more characters up to a maximum of 15'});
+            this.setState({nameError: 'Name must be 3 or more characters up to a maximum of 15'});
             return;
         }
 

web/react/components/team_signup_with_sso.jsx

@@ -23,12 +23,14 @@ export default class SSOSignUpPage extends React.Component {
 
         team.display_name = this.state.name;
 
-        if (team.display_name.length <= 3) {
+        if (!team.display_name) {
+            state.nameError = 'Please enter a team name';
+            this.setState(state);
             return;
         }
 
-        if (!team.display_name) {
+        if (team.display_name.length <= 2) {
-            state.nameError = 'Please enter a team name';
+            state.nameError = 'Name must be 3 or more characters up to a maximum of 15';
             this.setState(state);
             return;
         }
@@ -68,7 +70,7 @@ export default class SSOSignUpPage extends React.Component {
         }
 
         var disabled = false;
-        if (this.state.name.length <= 3) {
+        if (this.state.name.length <= 2) {
             disabled = true;
         }