IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix New Messages toast showing when it should not (#23995)

Browse Source
This commit is contained in:
Daniel Espino García 2023-07-13 13:28:44 +02:00 committed by GitHub
parent b00bb20d89
commit cb47d4fb7f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
webapp/channels/src/components/toast_wrapper/toast_wrapper.tsx
View File

@ -124,17 +124,17 @@ export class ToastWrapperClass extends React.PureComponent<Props, State> {
}
// show unread toast when a channel is marked as unread
if (props.channelMarkedAsUnread && !props.atBottom && !prevState.channelMarkedAsUnread && !prevState.showUnreadToast) {
if (props.channelMarkedAsUnread && (props.atBottom === false) && !prevState.channelMarkedAsUnread && !prevState.showUnreadToast) {
showUnreadToast = true;
}
// show unread toast when a channel is remarked as unread using the change in lastViewedAt
// lastViewedAt changes only if a channel is remarked as unread in channelMarkedAsUnread state
if (props.channelMarkedAsUnread && props.lastViewedAt !== prevState.lastViewedAt && !props.atBottom) {
if (props.channelMarkedAsUnread && props.lastViewedAt !== prevState.lastViewedAt && (props.atBottom === false)) {
showUnreadToast = true;
}
if (!showUnreadToast && unreadCount > 0 && !props.atBottom && props.latestPostTimeStamp && (props.lastViewedBottom < props.latestPostTimeStamp)) {
if (!showUnreadToast && unreadCount > 0 && (props.atBottom === false) && props.latestPostTimeStamp && (props.lastViewedBottom < props.latestPostTimeStamp)) {
showNewMessagesToast = true;
}
@ -384,7 +384,7 @@ export class ToastWrapperClass extends React.PureComponent<Props, State> {
onDismiss: this.hideUnreadToast,
onClick: this.scrollToLatestMessages,
onClickMessage: localizeMessage('postlist.toast.scrollToBottom', 'Jump to recents'),
showActions: !atLatestPost || (atLatestPost && !atBottom),
showActions: !atLatestPost || (atLatestPost && (atBottom === false)),
};
if (showUnreadToast && unreadCount > 0) {