From c21020d7e74fea837a04e1699de66b56d83f3615 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Mon, 24 Sep 2018 15:43:34 -0600 Subject: [PATCH] Use received date for footer-collapse supression --- .../ConversationView/ConversationViewController.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index ee32cde6b..46ae5757b 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -5116,8 +5116,8 @@ typedef enum : NSUInteger { } } - // MJK FIXME - investigate this more - if (viewItem.interaction.timestampForLegacySorting > collapseCutoffTimestamp) { + // Avoid animation churn by supressing footer-collapse on messages received recently. + if (viewItem.interaction.receivedAtTimestamp > collapseCutoffTimestamp) { shouldHideFooter = NO; }