From f3d8cbb1e152e167807d519dd15cf2f59ec22c1c Mon Sep 17 00:00:00 2001
From: Ryan ZHAO <ryanzhaors@qq.com>
Date: Wed, 30 Sep 2020 10:40:51 +1000
Subject: [PATCH 1/2] remove useless 'group updated'

---
 SignalServiceKit/src/Messages/TSGroupModel.m | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/SignalServiceKit/src/Messages/TSGroupModel.m b/SignalServiceKit/src/Messages/TSGroupModel.m
index 6157d55b4..f8bbdba35 100644
--- a/SignalServiceKit/src/Messages/TSGroupModel.m
+++ b/SignalServiceKit/src/Messages/TSGroupModel.m
@@ -117,9 +117,6 @@ const int32_t kGroupIdLength = 16;
         updatedGroupInfoString =
             [updatedGroupInfoString stringByAppendingString:NSLocalizedString(@"GROUP_AVATAR_CHANGED", @"")];
     }
-    if ([updatedGroupInfoString length] == 0) {
-        updatedGroupInfoString = NSLocalizedString(@"GROUP_UPDATED", @"");
-    }
     NSSet *oldMembers = [NSSet setWithArray:_groupMemberIds];
     NSSet *newMembers = [NSSet setWithArray:newModel.groupMemberIds];
 
@@ -169,7 +166,9 @@ const int32_t kGroupIdLength = 16;
             }
         }
     }
-
+    if ([updatedGroupInfoString length] == 0) {
+        updatedGroupInfoString = NSLocalizedString(@"GROUP_UPDATED", @"");
+    }
     return updatedGroupInfoString;
 }
 

From 2abba508fe788a0245fa6d782b6ca9cf8638bb83 Mon Sep 17 00:00:00 2001
From: Ryan ZHAO <ryanzhaors@qq.com>
Date: Mon, 5 Oct 2020 15:20:07 +1100
Subject: [PATCH 2/2] Fix UI bug where previous chat bubble collapses when you
 send a message

---
 .../ConversationView/ConversationViewController.m           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
index 9ef040390..7a80995d0 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
@@ -653,8 +653,6 @@ typedef enum : NSUInteger {
 
     [self createContents];
 
-    [self registerCellClasses];
-
     [self createConversationScrollButtons];
     [self createHeaderViews];
 
@@ -760,6 +758,8 @@ typedef enum : NSUInteger {
     [self.loadMoreHeader autoSetDimension:ALDimensionHeight toSize:kLoadMoreHeaderHeight];
     SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, _loadMoreHeader);
 
+    [self registerCellClasses];
+    
     [self updateShowLoadMoreHeader];
 }
 
@@ -986,7 +986,7 @@ typedef enum : NSUInteger {
     self.lastReloadDate = [NSDate new];
     [self.conversationViewModel viewDidResetContentAndLayout];
     [self.collectionView.collectionViewLayout invalidateLayout];
-    [self.collectionView reloadData];
+    [self.collectionView reloadSections:[NSIndexSet indexSetWithIndex:0]];
 
     if (self.viewHasEverAppeared) {
         // Try to update the lastKnownDistanceFromBottom; the content size may have changed.