toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Use new isFavoriteChannel redux util (#1113)

Browse source 
* Use new isFavoriteChannel redux util

* Remove unmarkFavorite actions
This commit is contained in:
Chris Duarte 2017-11-14 03:19:32 -08:00 committed by enahum
parent df5f7a0059
commit cf29d8dec5
1 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/actions/views/channel.js
View file

@ -10,8 +10,7 @@ import {
fetchMyChannelsAndMembers,
markChannelAsRead,
selectChannel,
leaveChannel as serviceLeaveChannel,
unfavoriteChannel
leaveChannel as serviceLeaveChannel
} from 'mattermost-redux/actions/channels';
import {getPosts, getPostsBefore, getPostsSince, getPostThread} from 'mattermost-redux/actions/posts';
import {getFilesForPost} from 'mattermost-redux/actions/files';
@ -20,6 +19,7 @@ import {getTeamMembersByIds} from 'mattermost-redux/actions/teams';
import {getProfilesInChannel} from 'mattermost-redux/actions/users';
import {General, Preferences} from 'mattermost-redux/constants';
import {getCurrentChannelId} from 'mattermost-redux/selectors/entities/channels';
import {
getChannelByName,
getDirectChannelName,
@ -379,13 +379,10 @@ export function toggleGMChannel(channelId, visible) {
export function closeDMChannel(channel) {
return async (dispatch, getState) => {
const state = getState();
if (channel.isFavorite) {
unfavoriteChannel(channel.id)(dispatch, getState);
}
const currentChannelId = getCurrentChannelId(state);
toggleDMChannel(channel.teammate_id, 'false')(dispatch, getState);
if (channel.isCurrent) {
if (channel.id === currentChannelId) {
selectInitialChannel(state.entities.teams.currentTeamId)(dispatch, getState);
}
};
@ -394,13 +391,10 @@ export function closeDMChannel(channel) {
export function closeGMChannel(channel) {
return async (dispatch, getState) => {
const state = getState();
if (channel.isFavorite) {
unfavoriteChannel(channel.id)(dispatch, getState);
}
const currentChannelId = getCurrentChannelId(state);
toggleGMChannel(channel.id, 'false')(dispatch, getState);
if (channel.isCurrent) {
if (channel.id === currentChannelId) {
selectInitialChannel(state.entities.teams.currentTeamId)(dispatch, getState);
}
};