Merge branch 'charlesmchen/textInputVsLeaveConversationView'

8 years ago · 385d7c0c77
parent 27d8af6940 4dc6934fc7
commit 385d7c0c77
1 changed files with 1 additions and 0 deletions
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
@ -997,6 +997,7 @@ typedef NS_ENUM(NSInteger, MessagesRangeSizeMode) {
    [self markVisibleMessagesAsRead];
    [self cancelVoiceMemo];
    [self.cellMediaCache removeAllObjects];
+    [self.inputToolbar endEditingTextMessage];

    self.isUserScrolling = NO;
 }