From 8c66b8febc168a4da6a06f1fc55113c26e20ea87 Mon Sep 17 00:00:00 2001 From: Ryan ZHAO Date: Fri, 19 Mar 2021 16:15:06 +1100 Subject: [PATCH] scroll to the bottom after the message has the attachment IDs --- Session/Conversations/ConversationVC+Interaction.swift | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Session/Conversations/ConversationVC+Interaction.swift b/Session/Conversations/ConversationVC+Interaction.swift index 83b37ef40..fe3cbf42f 100644 --- a/Session/Conversations/ConversationVC+Interaction.swift +++ b/Session/Conversations/ConversationVC+Interaction.swift @@ -49,7 +49,6 @@ extension ConversationVC : InputViewDelegate, MessageCellDelegate, ContextMenuAc func sendMediaNav(_ sendMediaNavigationController: SendMediaNavigationController, didApproveAttachments attachments: [SignalAttachment], messageText: String?) { sendAttachments(attachments, with: messageText ?? "") - scrollToBottom(isAnimated: false) resetMentions() self.snInputView.text = "" dismiss(animated: true) { } @@ -233,10 +232,15 @@ extension ConversationVC : InputViewDelegate, MessageCellDelegate, ContextMenuAc let tsMessage = TSOutgoingMessage.from(message, associatedWith: thread) Storage.write(with: { transaction in tsMessage.save(with: transaction) + // The new cell will be inserted here, but the TSOutgoingMessage now has no attachment. }, completion: { [weak self] in - Storage.write { transaction in + Storage.write(with: { transaction in MessageSender.send(message, with: attachments, in: thread, using: transaction) - } + }, completion: { [weak self] in + // The TSOutgoingMessage has no attachment IDs until the `prep` finished. + // Scroll to bottom here so the tableview can calculate the cell's height with the attachments correctly. + self?.scrollToBottom(isAnimated: false) + }) self?.handleMessageSent() }) }