Skip to content
This repository has been archived by the owner on Mar 13, 2024. It is now read-only.

PLT-7825: Fix unjoined-channel permalinks #141

Merged
merged 2 commits into from
Oct 11, 2017
Merged

PLT-7825: Fix unjoined-channel permalinks #141

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
88e7825
fix unjoined-channel permalinks
ccbrown Oct 10, 2017
0f229e8
rm redundant fix (already fixed in #124)
ccbrown Oct 10, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
rm redundant fix (already fixed in #124)
  • Loading branch information
@ccbrown
ccbrown committed Oct 10, 2017
commit 0f229e8fd618329b077ead087a51d751ece07def
6 changes: 3 additions & 3 deletions components/channel_header/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ function mapStateToProps(state, ownProps) {
}

return {
channel: channel || {},
channel,
channelMember: getMyChannelMember(state, ownProps.channelId),
teamMember: channel ? getMyTeamMember(state, channel.team_id) : {},
teamMember: getMyTeamMember(state, channel.team_id),
isFavorite: isFavoriteChannel(prefs, {...channel}),
isDefault: channel && isDefault(channel),
isDefault: isDefault(channel),
currentUser: user,
dmUser,
dmUserStatus,
Expand Down