From be6b1ff83ff9121f7ffdaaca0df4c9f3460731bc Mon Sep 17 00:00:00 2001 From: Elias Nahum Date: Thu, 9 Apr 2020 06:07:14 -0400 Subject: [PATCH] MM-22198 Don't show commented on for post on the same thread after a date separator (#4129) --- app/components/post/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/components/post/index.js b/app/components/post/index.js index bd0fc40c5..29954cba7 100644 --- a/app/components/post/index.js +++ b/app/components/post/index.js @@ -10,7 +10,7 @@ import {isChannelReadOnlyById} from '@mm-redux/selectors/entities/channels'; import {getPost, makeGetCommentCountForPost, makeIsPostCommentMention} from '@mm-redux/selectors/entities/posts'; import {getUser, getCurrentUserId} from '@mm-redux/selectors/entities/users'; import {getMyPreferences, getTheme} from '@mm-redux/selectors/entities/preferences'; -import {isStartOfNewMessages} from '@mm-redux/utils/post_list'; +import {isDateLine, isStartOfNewMessages} from '@mm-redux/utils/post_list'; import {isPostFlagged, isSystemMessage} from '@mm-redux/utils/post_utils'; import {insertToDraft, setPostTooltipVisible} from 'app/actions/views/channel'; @@ -41,7 +41,7 @@ function makeMapStateToProps() { const isPostCommentMention = makeIsPostCommentMention(); return function mapStateToProps(state, ownProps) { const post = ownProps.post || getPost(state, ownProps.postId); - const previousPostId = isStartOfNewMessages(ownProps.previousPostId) ? ownProps.beforePrevPostId : ownProps.previousPostId; + const previousPostId = (isStartOfNewMessages(ownProps.previousPostId) || isDateLine(ownProps.previousPostId)) ? ownProps.beforePrevPostId : ownProps.previousPostId; const previousPost = getPost(state, previousPostId); const beforePrevPost = getPost(state, ownProps.beforePrevPostId);