From a2f836c690d01ded81c3ce2e2f1b6c56758de2e6 Mon Sep 17 00:00:00 2001
From: Maxim Shishmarev <maxim@loki.network>
Date: Fri, 25 Oct 2019 12:49:47 +1100
Subject: [PATCH] Address review comments

---
 _locales/en/messages.json                        | 3 +++
 js/models/messages.js                            | 3 ++-
 js/views/conversation_view.js                    | 7 ++++---
 js/views/create_group_dialog_view.js             | 5 ++---
 js/views/inbox_view.js                           | 3 ++-
 ts/components/conversation/CreateGroupDialog.tsx | 4 +---
 ts/components/conversation/MessageBody.tsx       | 2 +-
 ts/components/conversation/UpdateGroupDialog.tsx | 2 +-
 8 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 420ede878..c5f8f5691 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -2158,5 +2158,8 @@
   },
   "nonAdminDeleteMember": {
     "message": "Only group admin can remove members!"
+  },
+  "groupNamePlaceholder": {
+    "message": "Group Name"
   }
 }
diff --git a/js/models/messages.js b/js/models/messages.js
index a6679f166..f5d02ecd5 100644
--- a/js/models/messages.js
+++ b/js/models/messages.js
@@ -2178,7 +2178,8 @@
             if (
               !message.get('body') &&
               !message.get('attachments').length &&
-              !message.get('preview').length
+              !message.get('preview').length &&
+              !message.get('group_update')
             ) {
               return;
             }
diff --git a/js/views/conversation_view.js b/js/views/conversation_view.js
index 917aa1237..4a30c98d8 100644
--- a/js/views/conversation_view.js
+++ b/js/views/conversation_view.js
@@ -2533,9 +2533,10 @@
       let allMembers;
 
       if (this.model.isPublic()) {
-        let members = window.lokiPublicChatAPI.getListOfMembers();
-        members = members.filter(d => !!d);
-        members = members.filter(d => d.authorProfileName !== 'Anonymous');
+        const members = window.lokiPublicChatAPI
+          .getListOfMembers()
+          .filter(d => !!d)
+          .filter(d => d.authorProfileName !== 'Anonymous');
         allMembers = _.uniq(members, true, d => d.authorPhoneNumber);
       } else {
         const members = this.model.get('members');
diff --git a/js/views/create_group_dialog_view.js b/js/views/create_group_dialog_view.js
index d305facff..00daf53d5 100644
--- a/js/views/create_group_dialog_view.js
+++ b/js/views/create_group_dialog_view.js
@@ -16,9 +16,8 @@
 
       const convos = window.getConversations().models;
 
-      let allMembers = convos.filter(d => !!d);
-      allMembers = allMembers.filter(
-        d => d.isFriend() && d.isPrivate() && !d.isMe()
+      let allMembers = convos.filter(
+        d => !!d && d.isFriend() && d.isPrivate() && !d.isMe()
       );
       allMembers = _.uniq(allMembers, true, d => d.id);
 
diff --git a/js/views/inbox_view.js b/js/views/inbox_view.js
index bdbc45a96..2a514c498 100644
--- a/js/views/inbox_view.js
+++ b/js/views/inbox_view.js
@@ -294,7 +294,8 @@
     async openConversation(id, messageId) {
       const conversationExists = await ConversationController.get(id);
 
-      // why does this have to be 'private'???
+      // If we call this to create a new conversation, it can only be private
+      // (group conversations are created elsewhere)
       const conversation = await ConversationController.getOrCreateAndWait(
         id,
         'private'
diff --git a/ts/components/conversation/CreateGroupDialog.tsx b/ts/components/conversation/CreateGroupDialog.tsx
index 4eeba8dff..943ce22cc 100644
--- a/ts/components/conversation/CreateGroupDialog.tsx
+++ b/ts/components/conversation/CreateGroupDialog.tsx
@@ -30,8 +30,6 @@ export class CreateGroupDialog extends React.Component<Props, State> {
   constructor(props: any) {
     super(props);
 
-    // const _ = window.Lodash;
-
     this.onMemberClicked = this.onMemberClicked.bind(this);
     this.onClickOK = this.onClickOK.bind(this);
     this.onKeyUp = this.onKeyUp.bind(this);
@@ -101,7 +99,7 @@ export class CreateGroupDialog extends React.Component<Props, State> {
           type="text"
           id="group-name"
           className="group-name"
-          placeholder="Group Name"
+          placeholder={this.props.i18n('groupNamePlaceholder')}
           value={this.state.groupName}
           onChange={this.onGroupNameChanged}
           tabIndex={0}
diff --git a/ts/components/conversation/MessageBody.tsx b/ts/components/conversation/MessageBody.tsx
index 8e7dea61d..f0af43dff 100644
--- a/ts/components/conversation/MessageBody.tsx
+++ b/ts/components/conversation/MessageBody.tsx
@@ -20,7 +20,7 @@ interface Props {
   i18n: LocalizerType;
   convoId: string;
 }
-// eslint-disable-next-line
+
 const renderMentions: RenderTextCallbackType = ({ text, key, convoId }) => (
   <AddMentions key={key} text={text} convoId={convoId} />
 );
diff --git a/ts/components/conversation/UpdateGroupDialog.tsx b/ts/components/conversation/UpdateGroupDialog.tsx
index a7531a4a3..182699ecb 100644
--- a/ts/components/conversation/UpdateGroupDialog.tsx
+++ b/ts/components/conversation/UpdateGroupDialog.tsx
@@ -112,7 +112,7 @@ export class UpdateGroupDialog extends React.Component<Props, State> {
           type="text"
           id="group-name"
           className="group-name"
-          placeholder="Group Name"
+          placeholder={this.props.i18n('groupNamePlaceholder')}
           value={this.state.groupName}
           disabled={!this.props.isAdmin}
           onChange={this.onGroupNameChanged}