From ed4881886794e6864f8b8154f83eab43a6677bae Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Mon, 6 Jul 2020 17:07:55 +1000
Subject: [PATCH] include old avatar and expireTimer on groupUpdate

---
 js/background.js                                   | 14 ++++++++------
 ts/components/session/SessionGroupSettings.tsx     |  2 +-
 .../content/data/group/ClosedGroupUpdateMessage.ts |  2 ++
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/js/background.js b/js/background.js
index 89f5d242f..673bcc590 100644
--- a/js/background.js
+++ b/js/background.js
@@ -626,23 +626,25 @@
     window.doUpdateGroup = async (groupId, groupName, members, avatar) => {
       const ourKey = textsecure.storage.user.getNumber();
 
+      const convo = await ConversationController.getOrCreateAndWait(
+        groupId,
+        'group'
+      );
+
       const ev = {
         groupDetails: {
           id: groupId,
           name: groupName,
           members,
           active: true,
-          expireTimer: 0,
-          avatar: '',
+          expireTimer: convo.get('expireTimer'),
+          avatar,
           is_medium_group: false,
         },
         confirm: () => {},
       };
 
-      const convo = await ConversationController.getOrCreateAndWait(
-        groupId,
-        'group'
-      );
+
 
       const recipients = _.union(convo.get('members'), members);
 
diff --git a/ts/components/session/SessionGroupSettings.tsx b/ts/components/session/SessionGroupSettings.tsx
index 826b66939..d5b25fb2d 100644
--- a/ts/components/session/SessionGroupSettings.tsx
+++ b/ts/components/session/SessionGroupSettings.tsx
@@ -222,7 +222,7 @@ export class SessionGroupSettings extends React.Component<Props, any> {
     const leaveGroupString = isPublic
       ? window.i18n('leaveOpenGroup')
       : isKickedFromGroup
-      ? window.i18n('youGotKickedFromThisGroup')
+      ? window.i18n('youGotKickedFromGroup')
       : window.i18n('leaveClosedGroup');
 
     const disappearingMessagesOptions = timerOptions.map(option => {
diff --git a/ts/session/messages/outgoing/content/data/group/ClosedGroupUpdateMessage.ts b/ts/session/messages/outgoing/content/data/group/ClosedGroupUpdateMessage.ts
index dfcbf14c2..612f69eee 100644
--- a/ts/session/messages/outgoing/content/data/group/ClosedGroupUpdateMessage.ts
+++ b/ts/session/messages/outgoing/content/data/group/ClosedGroupUpdateMessage.ts
@@ -66,6 +66,8 @@ export abstract class ClosedGroupUpdateMessage extends ClosedGroupMessage {
       groupContext.admins = this.admins;
     }
 
+    groupContext.avatar = this.avatar;
+
     return groupContext;
   }
 }