From b0d8edd9e98ec915faf1c0d71fc1d6b457ae4705 Mon Sep 17 00:00:00 2001
From: Alexander Zinchuk <alx.zinchuk@gmail.com>
Date: Sun, 18 Apr 2021 22:41:04 +0300
Subject: [PATCH] New Chat Form: Hide Saved Messages (#1022)

---
 src/components/left/newChat/NewChatStep1.tsx | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/components/left/newChat/NewChatStep1.tsx b/src/components/left/newChat/NewChatStep1.tsx
index a4f8266aa..479e8d104 100644
--- a/src/components/left/newChat/NewChatStep1.tsx
+++ b/src/components/left/newChat/NewChatStep1.tsx
@@ -25,6 +25,7 @@ export type OwnProps = {
 };
 
 type StateProps = {
+  currentUserId?: number;
   usersById: Record<number, ApiUser>;
   localContactIds?: number[];
   searchQuery?: string;
@@ -43,6 +44,7 @@ const NewChatStep1: FC<OwnProps & StateProps & DispatchProps> = ({
   onSelectedMemberIdsChange,
   onNextStep,
   onReset,
+  currentUserId,
   usersById,
   localContactIds,
   searchQuery,
@@ -65,18 +67,20 @@ const NewChatStep1: FC<OwnProps & StateProps & DispatchProps> = ({
   }, [setGlobalSearchQuery]);
 
   const displayedIds = useMemo(() => {
+    const contactIds = localContactIds ? localContactIds.filter((id) => id !== currentUserId) : [];
+
     if (!searchQuery) {
-      return localContactIds || [];
+      return contactIds;
     }
 
-    const foundLocalContacts = localContactIds ? localContactIds.filter((id) => {
+    const foundLocalContacts = contactIds.filter((id) => {
       const user = usersById[id];
       if (!user) {
         return false;
       }
       const fullName = getUserFullName(user);
       return fullName && searchWords(fullName, searchQuery);
-    }) : [];
+    });
 
     return getSortedUserIds(
       unique([
@@ -87,7 +91,7 @@ const NewChatStep1: FC<OwnProps & StateProps & DispatchProps> = ({
       usersById,
       selectedMemberIds,
     );
-  }, [searchQuery, localContactIds, localUsers, globalUsers, usersById, selectedMemberIds]);
+  }, [localContactIds, searchQuery, localUsers, globalUsers, usersById, selectedMemberIds, currentUserId]);
 
   const handleNextStep = useCallback(() => {
     if (selectedMemberIds.length) {
@@ -140,6 +144,7 @@ export default memo(withGlobal<OwnProps>(
   (global): StateProps => {
     const { userIds: localContactIds } = global.contactList || {};
     const { byId: usersById } = global.users;
+    const { currentUserId } = global;
 
     const {
       query: searchQuery,
@@ -151,6 +156,7 @@ export default memo(withGlobal<OwnProps>(
     const { users: localUsers } = localResults || {};
 
     return {
+      currentUserId,
       usersById,
       localContactIds,
       searchQuery,