From aaf9f0814e8cc500f0595303a557b0f35f7770bd Mon Sep 17 00:00:00 2001
From: igor-signal <98181527+igor-signal@users.noreply.github.com>
Date: Tue, 25 Jan 2022 16:08:11 -0800
Subject: [PATCH] Fix crash in emoji reaction search. (#3928)

Make sure collection view has finished updates before scrolling to a
selected section.
---
 .../ConversationView/Emoji Picker/EmojiPickerSheet.swift     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Signal/src/ViewControllers/ConversationView/Emoji Picker/EmojiPickerSheet.swift b/Signal/src/ViewControllers/ConversationView/Emoji Picker/EmojiPickerSheet.swift
index ff23de340a..1b9a7f0466 100644
--- a/Signal/src/ViewControllers/ConversationView/Emoji Picker/EmojiPickerSheet.swift	
+++ b/Signal/src/ViewControllers/ConversationView/Emoji Picker/EmojiPickerSheet.swift	
@@ -138,8 +138,9 @@ extension EmojiPickerSheet: EmojiPickerSectionToolbarDelegate {
             searchBar.text = nil
             collectionView.searchText = nil
 
-            // Collection view needs a moment to reload
-            DispatchQueue.main.async {
+            // Collection view needs a moment to reload.
+            // Do empty batch of updates to postpone scroll until collection view has updated.
+            collectionView.performBatchUpdates(nil) { _ in
                 self.collectionView.scrollToSectionHeader(section, animated: false)
             }
         } else {