1 files changed, 3 insertions, 4 deletions

diff --git a/web/react/components/post_list.jsx b/web/react/components/post_list.jsx
index 9349d0240..5439ca43d 100644
--- a/web/react/components/post_list.jsx
+++ b/web/react/components/post_list.jsx
@@ -6,7 +6,6 @@ var ChannelStore = require('../stores/channel_store.jsx');
 var UserStore = require('../stores/user_store.jsx');
 var UserProfile = require( './user_profile.jsx' );
 var AsyncClient = require('../utils/async_client.jsx');
-var CreatePost = require('./create_post.jsx');
 var Post = require('./post.jsx');
 var LoadingScreen = require('./loading_screen.jsx');
 var SocketStore = require('../stores/socket_store.jsx');
@@ -265,7 +264,7 @@ module.exports = React.createClass({
                 },
                 function(err) {
                     $(self.refs.loadmore.getDOMNode()).text("Load more messages");
-                    dispatchError(err, "getPosts");
+                    AsyncClient.dispatchError(err, "getPosts");
                 }
             );
     },
@@ -306,7 +305,7 @@ module.exports = React.createClass({
                 var teammate = utils.getDirectTeammate(channel.id)
 
                 if (teammate) {
-                    var teammate_name = teammate.full_name.length > 0 ? teammate.full_name : teammate.username;
+                    var teammate_name = teammate.nickname.length > 0 ? teammate.nickname : teammate.username;
                     more_messages = (
                         <div className="channel-intro">
                             <div className="post-profile-img__container channel-intro-img">
@@ -341,7 +340,7 @@ module.exports = React.createClass({
                     }
                 }
 
-                if (channel.name === Constants.DEFAULT_CHANNEL) {
+                if (ChannelStore.isDefault(channel)) {
                     more_messages = (
                         <div className="channel-intro">
                             <h4 className="channel-intro-title">Welcome</h4>