From d75cb0294896e0e45f280cbccde8581376d501ce Mon Sep 17 00:00:00 2001 From: Joram Wilander Date: Fri, 6 May 2016 08:06:34 -0400 Subject: Multiple cross-team functionality fixes (#2902) --- webapp/components/posts_view.jsx | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'webapp/components/posts_view.jsx') diff --git a/webapp/components/posts_view.jsx b/webapp/components/posts_view.jsx index 3cc0c1a92..4a81feba2 100644 --- a/webapp/components/posts_view.jsx +++ b/webapp/components/posts_view.jsx @@ -47,13 +47,18 @@ export default class PostsView extends React.Component { this.scrollStopAction = new DelayedAction(this.handleScrollStop); + let profiles = UserStore.getProfiles(); + if (props.channel.type === Constants.DM_CHANNEL) { + profiles = Object.assign({}, profiles, UserStore.getDirectProfiles()); + } + this.state = { displayNameType: PreferenceStore.get(Preferences.CATEGORY_DISPLAY_SETTINGS, 'name_format', 'false'), centerPosts: PreferenceStore.get(Preferences.CATEGORY_DISPLAY_SETTINGS, Preferences.CHANNEL_DISPLAY_MODE, Preferences.CHANNEL_DISPLAY_MODE_DEFAULT) === Preferences.CHANNEL_DISPLAY_MODE_CENTERED, isScrolling: false, topPostId: null, currentUser: UserStore.getCurrentUser(), - profiles: UserStore.getProfiles() + profiles }; } static get SCROLL_TYPE_FREE() { @@ -78,7 +83,11 @@ export default class PostsView extends React.Component { }); } onUserChange() { - this.setState({currentUser: UserStore.getCurrentUser(), profiles: JSON.parse(JSON.stringify(UserStore.getProfiles()))}); + let profiles = UserStore.getProfiles(); + if (this.props.channel.type === Constants.DM_CHANNEL) { + profiles = Object.assign({}, profiles, UserStore.getDirectProfiles()); + } + this.setState({currentUser: UserStore.getCurrentUser(), profiles: JSON.parse(JSON.stringify(profiles))}); } isAtBottom() { // consider the view to be at the bottom if it's within this many pixels of the bottom -- cgit v1.2.3-1-g7c22