Fixing JS error (mattermost#6813)

* Fixing JS error * Fixing js error and storing issue
stevepartridge · Jul 1, 2017 · 2ab50bc · 2ab50bc
1 parent 29491b3
commit 2ab50bc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/utils/channel_utils.jsx b/utils/channel_utils.jsx
@@ -107,7 +107,7 @@ export function sortChannelsByDisplayName(a, b) {
  const aDisplayName = getChannelDisplayName(a);
  const bDisplayName = getChannelDisplayName(b);
 
- if (aDisplayName !== bDisplayName) {
+ if (aDisplayName !== null && bDisplayName !== null && aDisplayName !== bDisplayName) {
  return aDisplayName.localeCompare(bDisplayName, locale, {numeric: true});
  }
 

diff --git a/utils/utils.jsx b/utils/utils.jsx
@@ -1011,7 +1011,7 @@ export function displayUsernameForUser(user) {
  return name;
  }
 
- return null;
+ return '';
 }
 
 // Converts a file size in bytes into a human-readable string of the form '123MB'.