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

fix channel mention when app is started from push notification (#2638)

Browse source
This commit is contained in:
Saturnino Abril 2019-03-12 03:36:02 +08:00 committed by Harrison Healey
parent c7dc992ac0
commit 35efa47b35
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -344,7 +344,7 @@ export function selectDefaultChannel(teamId) {
};
}
export function handleSelectChannel(channelId) {
export function handleSelectChannel(channelId, fromPushNotification = false) {
return async (dispatch, getState) => {
const state = getState();
const channel = getChannel(state, channelId);
@ -375,8 +375,8 @@ export function handleSelectChannel(channelId) {
},
]));
dispatch(markChannelAsRead(channelId, sameChannel ? null : currentChannelId));
dispatch(markChannelAsViewed(channelId, sameChannel ? null : currentChannelId));
dispatch(markChannelAsRead(channelId, fromPushNotification || sameChannel ? null : currentChannelId));
dispatch(markChannelAsViewed(channelId, fromPushNotification || sameChannel ? null : currentChannelId));
};
}

2
app/actions/views/root.js
View file

@ -92,7 +92,7 @@ export function loadFromPushNotification(notification, startAppFromPushNotificat
} else if (channelId !== currentChannelId) {
// when the notification is from a channel other than the current channel
dispatch(setChannelDisplayName(''));
dispatch(handleSelectChannel(channelId));
dispatch(handleSelectChannel(channelId, true));
}
};
}