Merge branch 'mkirk/fix-rounding-after-date'

7 years ago · 34c47f87c2
parent 3e0233ea60 f8f0e4aa93
commit 34c47f87c2
1 changed files with 2 additions and 0 deletions
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
@ -4940,6 +4940,8 @@ typedef enum : NSUInteger {
            // clustering
            if (previousViewItem == nil) {
                isFirstInCluster = YES;
+            } else if (viewItem.shouldShowDate) {
+                isFirstInCluster = YES;
            } else if (previousViewItem.interaction.interactionType != OWSInteractionType_IncomingMessage) {
                isFirstInCluster = YES;
            } else {