From 0d88303e1fbc6177816ca55d88164dea67dea662 Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Thu, 17 Dec 2020 16:06:20 -0300
Subject: [PATCH] Fix auto-scroll issue around first message in thread.

---
 .../ConversationView/ConversationViewController+CVC.swift | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController+CVC.swift b/Signal/src/ViewControllers/ConversationView/ConversationViewController+CVC.swift
index 9bcda4035a..796f91c509 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewController+CVC.swift
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController+CVC.swift
@@ -478,8 +478,12 @@ extension ConversationViewController: CVLoadCoordinatorDelegate {
                 case .insert(let renderItem, _):
 
                     var wasJustInserted = false
-                    if let lastMessageForInboxSortId = updateToken.lastMessageForInboxSortId,
-                       lastMessageForInboxSortId < renderItem.interaction.sortId {
+                    if let lastMessageForInboxSortId = updateToken.lastMessageForInboxSortId {
+                        if lastMessageForInboxSortId < renderItem.interaction.sortId {
+                            wasJustInserted = true
+                        }
+                    } else {
+                        // The first interaction in the thread.
                         wasJustInserted = true
                     }