From c1838ebdc2dd0ecdcd41b84cdc3966e9b6fe189c Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Tue, 7 Jan 2020 17:56:23 +1100
Subject: [PATCH] use friendRequest from redux in contactSection

---
 ts/components/LeftPane.tsx                       | 3 +++
 ts/components/session/LeftPaneContactSection.tsx | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ts/components/LeftPane.tsx b/ts/components/LeftPane.tsx
index 51c787dfa..8e9ce3281 100644
--- a/ts/components/LeftPane.tsx
+++ b/ts/components/LeftPane.tsx
@@ -162,6 +162,7 @@ export class LeftPane extends React.Component<Props, State> {
   }
 
   public handleSectionSelected(section: SectionType) {
+    this.props.clearSearch();
     this.setState({ selectedSection: section });
   }
 
@@ -234,6 +235,7 @@ export class LeftPane extends React.Component<Props, State> {
       updateSearchTerm,
       search,
       clearSearch,
+      receivedFriendRequestCount,
     } = this.props;
 
     return (
@@ -249,6 +251,7 @@ export class LeftPane extends React.Component<Props, State> {
         clearSearch={clearSearch}
         sentFriendsRequest={sentFriendsRequest}
         receivedFriendsRequest={receivedFriendsRequest}
+        receivedFriendRequestCount={receivedFriendRequestCount}
       />
     );
   }
diff --git a/ts/components/session/LeftPaneContactSection.tsx b/ts/components/session/LeftPaneContactSection.tsx
index ab4123958..7799b2b58 100644
--- a/ts/components/session/LeftPaneContactSection.tsx
+++ b/ts/components/session/LeftPaneContactSection.tsx
@@ -25,6 +25,7 @@ export interface Props {
   conversations: Array<ConversationListItemPropsType>;
   friends: Array<ConversationType>;
   receivedFriendsRequest: Array<ConversationListItemPropsType>;
+  receivedFriendRequestCount: number;
   sentFriendsRequest: Array<ConversationListItemPropsType>;
 
   searchResults?: SearchResultsProps;
@@ -78,16 +79,15 @@ export class LeftPaneContactSection extends React.Component<Props, State> {
   }
 
   public renderHeader(): JSX.Element | undefined {
-    const { receivedFriendsRequest } = this.props;
+    const { receivedFriendRequestCount } = this.props;
     const labels = [window.i18n('contactsHeader'), window.i18n('lists')];
-    const friendRequestCount = receivedFriendsRequest.length;
 
     return LeftPane.RENDER_HEADER(
       labels,
       this.handleTabSelected,
       undefined,
       this.handleToggleFriendRequestPopup,
-      friendRequestCount
+      receivedFriendRequestCount
     );
   }