Merge branch 'clearnet' of https://github.com/loki-project/session-desktop into blocked-fixes

js/background.js

@@ -700,7 +700,7 @@
         return;
       }
 
-      const nullAvatar = '';
+      const nullAvatar = undefined;
       if (avatar) {
         // would get to download this file on each client in the group
         // and reference the local file
@@ -831,7 +831,7 @@
           recipients: allMembers,
           active: true,
           expireTimer: 0,
-          avatar: '',
+          avatar: undefined,
         },
         confirm: () => {},
       };

ts/components/session/LeftPaneMessageSection.tsx

@@ -511,6 +511,7 @@ export class LeftPaneMessageSection extends React.Component<Props, State> {
       this.setState({
         loading: false,
       });
+      this.handleToggleOverlay(undefined);
     }
   }
 

ts/components/session/SessionClosableOverlay.tsx

@@ -74,7 +74,7 @@ export class SessionClosableOverlay extends React.Component<Props, State> {
       overlayMode === SessionClosableOverlayType.ClosedGroup;
     if (isClosedGroupView) {
       filteredContactsList = filteredContactsList.filter(
-        c => c.type === 'direct'
+        c => c.type === 'direct' && !c.isMe
       );
     }
 

ts/session/messages/outgoing/content/data/group/ClosedGroupUpdateMessage.ts

@@ -43,6 +43,13 @@ export abstract class ClosedGroupUpdateMessage extends ClosedGroupMessage {
       throw new Error('admins has not the correct type');
     }
 
+    if (
+      params.avatar !== undefined &&
+      !(params.avatar instanceof SignalService.AttachmentPointer)
+    ) {
+      throw new Error('avatar has not the correct type');
+    }
+
     this.name = params.name;
     this.members = params.members;
     this.admins = params.admins;