Merge pull request #930 from Bilb/include-friend-search-result

Include friend search result #928

ts/components/SearchResults.tsx

@@ -75,6 +75,10 @@ export class SearchResults extends React.Component<Props> {
             ))}
           </div>
         ) : null}
+        {haveFriends
+          ? this.renderContacts(i18n('friendsHeader'), friends, true)
+          : null}
+
         {haveMessages ? (
           <div className="module-search-results__messages">
             {hideMessagesHeader ? null : (
@@ -95,4 +99,26 @@ export class SearchResults extends React.Component<Props> {
       </div>
     );
   }
+  private renderContacts(
+    header: string,
+    items: Array<ConversationListItemPropsType>,
+    friends?: boolean
+  ) {
+    const { i18n, openConversation } = this.props;
+
+    return (
+      <div className="module-search-results__contacts">
+        <div className="module-search-results__contacts-header">{header}</div>
+        {items.map(contact => (
+          <ConversationListItem
+            key={contact.phoneNumber}
+            isFriend={friends}
+            {...contact}
+            onClick={openConversation}
+            i18n={i18n}
+          />
+        ))}
+      </div>
+    );
+  }
 }

ts/components/session/LeftPaneMessageSection.tsx

@@ -132,11 +132,16 @@ export class LeftPaneMessageSection extends React.Component<Props, any> {
 
   public renderList(): JSX.Element | Array<JSX.Element | null> {
     const { openConversationInternal, searchResults } = this.props;
+    const friends =
+      (searchResults &&
+        searchResults.contacts.filter(contact => contact.isFriend)) ||
+      [];
 
     if (searchResults) {
       return (
         <SearchResults
           {...searchResults}
+          friends={friends}
           openConversation={openConversationInternal}
           i18n={window.i18n}
         />

ts/state/ducks/search.ts

@@ -214,7 +214,6 @@ async function queryConversationsAndContacts(
       conversations.push(conversation.id);
     }
   }
-
   // Inject synthetic Note to Self entry if query matches localized 'Note to Self'
   if (noteToSelf.indexOf(providedQuery.toLowerCase()) !== -1) {
     // ensure that we don't have duplicates in our results