From 75ce27e60237833d6eea8023447d111704440e06 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Fri, 19 Aug 2022 12:00:10 +1000
Subject: [PATCH] fix: finish menu redesign

---
 _locales/en/messages.json                             | 2 +-
 ts/components/leftpane/overlay/OverlayClosedGroup.tsx | 8 +++-----
 ts/components/leftpane/overlay/OverlayCommunity.tsx   | 2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 44be19c9f..e08cd4a0d 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -327,7 +327,7 @@
   "ByUsingThisService...": "By using this service, you agree to our <a href=\"https://getsession.org/terms-of-service \">Terms of Service</a> and <a href=\"https://getsession.org/privacy-policy\" target=\"_blank\">Privacy Policy</a>",
   "beginYourSession": "Begin your Session.",
   "welcomeToYourSession": "Welcome to your Session",
-  "searchFor...": "Search for messages or conversations",
+  "searchFor...": "Search conversations and contacts",
   "searchForContactsOnly": "Search for contacts",
   "enterSessionID": "Enter Session ID",
   "enterSessionIDOfRecipient": "Enter your contact's Session ID or ONS",
diff --git a/ts/components/leftpane/overlay/OverlayClosedGroup.tsx b/ts/components/leftpane/overlay/OverlayClosedGroup.tsx
index 6fb58541b..60ebd8c3f 100644
--- a/ts/components/leftpane/overlay/OverlayClosedGroup.tsx
+++ b/ts/components/leftpane/overlay/OverlayClosedGroup.tsx
@@ -80,11 +80,9 @@ export const OverlayClosedGroup = () => {
   let sharedWithResults: Array<string> = [];
 
   if (searchResults && searchResults.contactsAndGroups.length) {
-    const privateSearchResults = searchResults.contactsAndGroups.filter(convo => convo.isPrivate);
-
-    sharedWithResults = privateContactsPubkeys.filter(m =>
-      privateSearchResults.find(convo => convo.id === m)
-    );
+    sharedWithResults = searchResults.contactsAndGroups
+      .filter(convo => convo.isPrivate)
+      .map(convo => convo.id);
   }
   const contactsToRender = isSearch ? sharedWithResults : privateContactsPubkeys;
 
diff --git a/ts/components/leftpane/overlay/OverlayCommunity.tsx b/ts/components/leftpane/overlay/OverlayCommunity.tsx
index d228e28f9..8fac9962f 100644
--- a/ts/components/leftpane/overlay/OverlayCommunity.tsx
+++ b/ts/components/leftpane/overlay/OverlayCommunity.tsx
@@ -80,7 +80,7 @@ export const OverlayCommunity = () => {
       <SessionJoinableRooms onRoomClicked={closeOverlay} />
       {groupUrl && (
         <SessionButton
-          buttonColor={SessionButtonColor.White}
+          buttonColor={SessionButtonColor.Green}
           buttonType={SessionButtonType.BrandOutline}
           text={buttonText}
           onClick={onEnterPressed}