From c54979bb41e4299e31be063b3c77b73dce9fbe3e Mon Sep 17 00:00:00 2001
From: Maxim Shishmarev <maxim@loki.network>
Date: Wed, 18 Sep 2019 16:01:45 +1000
Subject: [PATCH] Address review comments

---
 js/views/conversation_view.js | 23 ++++++++++-------------
 js/views/member_list_view.js  |  4 ++--
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/js/views/conversation_view.js b/js/views/conversation_view.js
index 7d4421f13..7bf77d5cb 100644
--- a/js/views/conversation_view.js
+++ b/js/views/conversation_view.js
@@ -1583,7 +1583,7 @@
     },
 
     async handleSubmitPressed(e, options = {}) {
-      if (this.memberView.members_shown()) {
+      if (this.memberView.membersShown()) {
         const member = this.memberView.selectedMember();
         this.selectMember(member);
       } else {
@@ -2173,7 +2173,7 @@
 
       const preventDefault = keyPressedUp || keyPressedDown || keyPressedTab;
 
-      if (this.memberView.members_shown() && preventDefault) {
+      if (this.memberView.membersShown() && preventDefault) {
         if (keyPressedDown) {
           this.memberView.selectDown();
         } else if (keyPressedUp) {
@@ -2232,10 +2232,7 @@
           : '';
         const query = caseSensitiveQuery.toLowerCase();
 
-        if (
-          authorPhoneNumber.indexOf(query) !== -1 ||
-          profileName.indexOf(query) !== -1
-        ) {
+        if (authorPhoneNumber.includes(query) || profileName.includes(query)) {
           return true;
         }
         return false;
@@ -2273,14 +2270,14 @@
       allMembers = _.uniq(allMembers, true, d => d.authorPhoneNumber);
 
       let membersToShow = [];
-      if (query === null) {
-        // do nothing
-      } else if (query !== '') {
-        membersToShow = allMembers.filter(filterMembers.bind(null, query));
-      } else {
-        membersToShow = allMembers;
+      if (query) {
+        membersToShow =
+          query !== ''
+            ? allMembers.filter(m => filterMembers(query, m))
+            : allMembers;
       }
-      this.memberView.update_members(membersToShow);
+
+      this.memberView.updateMembers(membersToShow);
     },
 
     forceUpdateMessageFieldSize(event) {
diff --git a/js/views/member_list_view.js b/js/views/member_list_view.js
index 8086e3d4b..33c3445d9 100644
--- a/js/views/member_list_view.js
+++ b/js/views/member_list_view.js
@@ -35,7 +35,7 @@
     handleMemberClicked(member) {
       this.onClicked(member);
     },
-    update_members(members) {
+    updateMembers(members) {
       if (!_.isEqual(this.member_list, members)) {
         // Whenever the list is updated, we reset the selection
         this.selected_idx = 0;
@@ -43,7 +43,7 @@
         this.render();
       }
     },
-    members_shown() {
+    membersShown() {
       return this.member_list.length !== 0;
     },
     selectUp() {