From c8241f47e6adeb08c71b5c8233e76c75d56e5b79 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Thu, 9 Jul 2020 10:58:05 +1000
Subject: [PATCH] CreateClosedGroup: only show direct conversations

Also use the conversation display name when available
---
 .../session/SessionClosableOverlay.tsx        | 24 +++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/ts/components/session/SessionClosableOverlay.tsx b/ts/components/session/SessionClosableOverlay.tsx
index f2085948c..b70853766 100644
--- a/ts/components/session/SessionClosableOverlay.tsx
+++ b/ts/components/session/SessionClosableOverlay.tsx
@@ -66,18 +66,34 @@ export class SessionClosableOverlay extends React.Component<Props, State> {
   }
 
   public getContacts() {
+    const { overlayMode } = this.props;
     const contactsList = this.props.contacts ?? [];
+    // Depending on the rendered overlay type we have to filter the contact list.
+    let filteredContactsList = contactsList;
+    const isClosedGroupView =
+      overlayMode === SessionClosableOverlayType.ClosedGroup;
+    if (isClosedGroupView) {
+      filteredContactsList = filteredContactsList.filter(
+        c => c.type === 'direct'
+      );
+    }
 
-    return contactsList.map((d: any) => {
-      const name = d.name ?? window.i18n('anonymous');
-
+    return filteredContactsList.map((d: any) => {
       // TODO: should take existing members into account
       const existingMember = false;
+      // if it has a profilename, use it and the shortened pubkey will be added automatically
+      // if no profile name, Anonymous and the shortened pubkey will be added automatically
+      let title;
+      if (d.profileName) {
+        title = `${d.profileName}`;
+      } else {
+        title = `${window.i18n('anonymous')}`;
+      }
 
       return {
         id: d.id,
         authorPhoneNumber: d.id,
-        authorProfileName: name,
+        authorProfileName: title,
         selected: false,
         authorName: name,
         authorColor: d.color,