From bf0f33e4b0b010762735ecd0d517364b317d40c4 Mon Sep 17 00:00:00 2001
From: Matthew Chen <charlesmchen@gmail.com>
Date: Fri, 10 Nov 2017 14:51:34 -0500
Subject: [PATCH] Temporarily alter animations in conversation view.

---
 .../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 3c09b7fbb..156b1e948 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
@@ -2943,7 +2943,7 @@ typedef NS_ENUM(NSInteger, MessagesRangeSizeMode) {
         [self updateLastVisibleTimestamp];
 
         if (scrollToBottom) {
-            [self scrollToBottomAnimated:shouldAnimateScrollToBottom];
+            [self scrollToBottomAnimated:shouldAnimateScrollToBottom && shouldAnimateUpdates];
         }
     };
 
@@ -2953,7 +2953,7 @@ typedef NS_ENUM(NSInteger, MessagesRangeSizeMode) {
         // We want these animations to be as short as possible, but `performBatchUpdates`
         // will SIGABORT in some cases if the animation duration is zero.
         [CATransaction begin];
-        [CATransaction setAnimationDuration:0.05f];
+        [CATransaction setAnimationDuration:0.001f];
         [self.collectionView performBatchUpdates:batchUpdates completion:batchUpdatesCompletion];
         [CATransaction commit];
     }