1 files changed, 6 insertions, 14 deletions

diff --git a/web/react/components/navbar_dropdown.jsx b/web/react/components/navbar_dropdown.jsx
index dc21fad21..029b9c137 100644
--- a/web/react/components/navbar_dropdown.jsx
+++ b/web/react/components/navbar_dropdown.jsx
@@ -11,23 +11,15 @@ var AboutBuildModal = require('./about_build_modal.jsx');
 var Constants = require('../utils/constants.jsx');
 
 function getStateFromStores() {
-    let teams = [];
-    let teamsObject = UserStore.getTeams();
-    for (let teamId in teamsObject) {
+    const teams = [];
+    const teamsObject = UserStore.getTeams();
+    for (const teamId in teamsObject) {
         if (teamsObject.hasOwnProperty(teamId)) {
             teams.push(teamsObject[teamId]);
         }
     }
-    teams.sort(function sortByDisplayName(teamA, teamB) {
-        let teamADisplayName = teamA.display_name.toLowerCase();
-        let teamBDisplayName = teamB.display_name.toLowerCase();
-        if (teamADisplayName < teamBDisplayName) {
-            return -1;
-        } else if (teamADisplayName > teamBDisplayName) {
-            return 1;
-        }
-        return 0;
-    });
+
+    teams.sort(Utils.sortByDisplayName);
     return {teams};
 }
 
@@ -104,7 +96,7 @@ export default class NavbarDropdown extends React.Component {
                 </li>
             );
 
-            if (this.props.teamType === 'O') {
+            if (this.props.teamType === Constants.OPEN_TEAM) {
                 teamLink = (
                     <li>
                         <a