From cfaceb8add54ab7cc531b52a5a9b4950bfa404ef Mon Sep 17 00:00:00 2001
From: Nora Trapp <nora@signal.org>
Date: Sat, 2 Apr 2022 14:20:54 -0700
Subject: [PATCH] Fix group reply cell grouping

---
 .../StoryGroupReplyLoader.swift               | 43 +++++++++----------
 1 file changed, 20 insertions(+), 23 deletions(-)

diff --git a/Signal/src/ViewControllers/HomeView/Stories/Group Reply Sheet/StoryGroupReplyLoader.swift b/Signal/src/ViewControllers/HomeView/Stories/Group Reply Sheet/StoryGroupReplyLoader.swift
index a799ddcb39..e9124a3087 100644
--- a/Signal/src/ViewControllers/HomeView/Stories/Group Reply Sheet/StoryGroupReplyLoader.swift	
+++ b/Signal/src/ViewControllers/HomeView/Stories/Group Reply Sheet/StoryGroupReplyLoader.swift	
@@ -261,30 +261,27 @@ class StoryGroupReplyLoader: Dependencies {
 
             newReplyItems[message.uniqueId] = replyItem
 
-            if let previousItem = previousItem {
-                if previousItem.authorAddress == authorAddress
-                    && previousItem.timeString == replyItem.timeString
-                    && replyItem.cellType != .reaction
-                    && previousItem.cellType != .reaction {
-                    switch previousItem.cellType {
-                    case .standalone:
-                        previousItem.cellType = .top
-                    case .bottom:
-                        previousItem.cellType = .middle
-                    case .top, .middle, .reaction:
-                        break
-                    }
+            if let previousItem = previousItem,
+               previousItem.authorAddress == authorAddress,
+               previousItem.timeString == replyItem.timeString,
+               replyItem.cellType != .reaction,
+               previousItem.cellType != .reaction {
+                switch previousItem.cellType {
+                case .standalone:
+                    previousItem.cellType = .top
+                case .bottom:
+                    previousItem.cellType = .middle
+                case .top, .middle, .reaction:
+                    break
+                }
 
-                    replyItem.cellType = .bottom
-                } else {
-                    switch previousItem.cellType {
-                    case .standalone, .reaction, .bottom:
-                        break
-                    case .top:
-                        previousItem.cellType = .standalone
-                    case .middle:
-                        previousItem.cellType = .bottom
-                    }
+                replyItem.cellType = .bottom
+            } else {
+                switch replyItem.cellType {
+                case .standalone, .reaction:
+                    break
+                case .top, .middle, .bottom:
+                    replyItem.cellType = .standalone
                 }
             }