Merge branch 'charlesmchen/initialScrollState' into release/2.26.0

7 years ago · 7e9d2b00e1
parent b61838006d bb266d03e4
commit 7e9d2b00e1
1 changed files with 3 additions and 1 deletions
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
@ -4115,7 +4115,9 @@ typedef enum : NSUInteger {
        self.scrollDownButton.frame = newButtonFrame;

        // Adjust content offset to prevent the presented keyboard from obscuring content.
-        if (wasScrolledToBottom) {
+        if (!self.viewHasEverAppeared) {
+            [self scrollToDefaultPosition];
+        } else if (wasScrolledToBottom) {
            // If we were scrolled to the bottom, don't do any fancy math. Just stay at the bottom.
            [self scrollToBottomAnimated:NO];
        } else {