diff --git a/src/containers/Chat/ChatConversations/ChatConversation/ChatConversation.tsx b/src/containers/Chat/ChatConversations/ChatConversation/ChatConversation.tsx index f3e6b8c763..a241b9f837 100644 --- a/src/containers/Chat/ChatConversations/ChatConversation/ChatConversation.tsx +++ b/src/containers/Chat/ChatConversations/ChatConversation/ChatConversation.tsx @@ -61,9 +61,7 @@ const BoldedText = (originalText: string, highlight: any) => { if (index === 0) { // we need calculate the length of the string before the search keyword const beforeSearchKeywordLength = strings[index].length; - formattedStringArray[index] = string.substring( - beforeSearchKeywordLength - availableCharacterLength / 2 - ); + formattedStringArray[index] = string.substring(beforeSearchKeywordLength - availableCharacterLength / 2); } else if (index % 2 !== 0) { formattedStringArray[index] = string; } else { diff --git a/src/containers/Chat/ChatConversations/ConversationList/ConversationList.tsx b/src/containers/Chat/ChatConversations/ConversationList/ConversationList.tsx index b8274a9a7f..587b9cb538 100644 --- a/src/containers/Chat/ChatConversations/ConversationList/ConversationList.tsx +++ b/src/containers/Chat/ChatConversations/ConversationList/ConversationList.tsx @@ -72,9 +72,7 @@ export const ConversationList = ({ let queryVariables = groups ? GROUP_QUERY_VARIABLES : SEARCH_QUERY_VARIABLES; if (selectedCollectionId || entityType === 'collection') { - queryVariables = groups - ? GROUP_COLLECTION_SEARCH_QUERY_VARIABLES - : COLLECTION_SEARCH_QUERY_VARIABLES; + queryVariables = groups ? GROUP_COLLECTION_SEARCH_QUERY_VARIABLES : COLLECTION_SEARCH_QUERY_VARIABLES; } if (savedSearchCriteria) { const variables = JSON.parse(savedSearchCriteria); @@ -222,8 +220,7 @@ export const ConversationList = ({ groups ); - const [getFilterConvos, { called, loading, error, data: searchData }] = - useLazyQuery(searchQuery); + const [getFilterConvos, { called, loading, error, data: searchData }] = useLazyQuery(searchQuery); // fetch data when typing for search const [getFilterSearch] = useLazyQuery(searchMultiQuery, { @@ -233,27 +230,24 @@ export const ConversationList = ({ }); // load more messages for multi search load more - const [getLoadMoreFilterSearch, { loading: loadingSearch }] = useLazyQuery( - SEARCH_MULTI_QUERY, - { - onCompleted: (multiSearch) => { - if (!searchMultiData) { - setSearchMultiData(multiSearch); - } else if (multiSearch && multiSearch.searchMulti.messages.length !== 0) { - const searchMultiDataCopy = JSON.parse(JSON.stringify(searchMultiData)); - // append new messages to existing messages - searchMultiDataCopy.searchMulti.messages = [ - ...searchMultiData.searchMulti.messages, - ...multiSearch.searchMulti.messages, - ]; - setSearchMultiData(searchMultiDataCopy); - } else { - setShowLoadMore(false); - } - setShowLoading(false); - }, - } - ); + const [getLoadMoreFilterSearch, { loading: loadingSearch }] = useLazyQuery(SEARCH_MULTI_QUERY, { + onCompleted: (multiSearch) => { + if (!searchMultiData) { + setSearchMultiData(multiSearch); + } else if (multiSearch && multiSearch.searchMulti.messages.length !== 0) { + const searchMultiDataCopy = JSON.parse(JSON.stringify(searchMultiData)); + // append new messages to existing messages + searchMultiDataCopy.searchMulti.messages = [ + ...searchMultiData.searchMulti.messages, + ...multiSearch.searchMulti.messages, + ]; + setSearchMultiData(searchMultiDataCopy); + } else { + setShowLoadMore(false); + } + setShowLoading(false); + }, + }); useEffect(() => { // Use multi search when has search value and when there is no collection id @@ -305,8 +299,11 @@ export const ConversationList = ({ const buildChatConversation = (index: number, header: any, conversation: any) => { // We don't have the contact data in the case of contacts. - const { displayName, contactIsOrgRead, selectedRecord, entityId, entity, timer } = - getConversationForSearchMulti(conversation, selectedContactId, groups); + const { displayName, contactIsOrgRead, selectedRecord, entityId, entity, timer } = getConversationForSearchMulti( + conversation, + selectedContactId, + groups + ); return ( {index === 0 ? header : null} @@ -315,6 +312,7 @@ export const ConversationList = ({ selected={selectedRecord} onClick={() => { setSearchHeight(); + showMessages(); if (entityType === 'contact' && setSelectedContactId) { setSelectedContactId(entity.id); } @@ -340,9 +338,7 @@ export const ConversationList = ({ conversations = searchMultiData.searchMulti; // to set search response sequence - const searchArray = groups - ? { groups: [], messages: [] } - : { contacts: [], messages: [], labels: [] }; + const searchArray = groups ? { groups: [], messages: [] } : { contacts: [], messages: [], labels: [] }; let conversationsData; Object.keys(searchArray).forEach((dataArray: any) => { const header = ( @@ -366,8 +362,11 @@ export const ConversationList = ({ // build the conversation list only if there are conversations if (!conversationList && conversations && conversations.length > 0) { conversationList = conversations.map((conversation: any, index: number) => { - const { lastMessage, entityId, displayName, contactIsOrgRead, selectedRecord, timer } = - getConversation(conversation, selectedContactId, selectedCollectionId); + const { lastMessage, entityId, displayName, contactIsOrgRead, selectedRecord, timer } = getConversation( + conversation, + selectedContactId, + selectedCollectionId + ); return (