Merge branch 'master' of github.com:followmedoug/totvs-chat-teste

mesquitamv · Oct 28, 2022 · 6557109 · 6557109
2 parents 6e03f63 + 21f41d4
commit 6557109
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/src/components/Organisms/ActiveChat/index.js b/src/components/Organisms/ActiveChat/index.js
@@ -114,13 +114,6 @@ const ActiveChat = ({ user, contact }) => {
     };
   }, [message]);
 
-  const filter1 = data
-    .filter(({ origin }) => origin.id === id || origin.id === contact.id)
-    .filter(
-      ({ destination }) =>
-        destination.id === id || destination.id === contact.id
-    );
-
   return (
     <Container>
       <Header

diff --git a/src/components/Organisms/ContactList/index.js b/src/components/Organisms/ContactList/index.js
@@ -5,7 +5,7 @@ import Contact from "../../Molecules/Contact";
 const ContactList = ({ contacts = [], onClick, active, id }) => {
   return (
     <Container>
-      {contacts.length &&
+      {contacts.length > 0 &&
         contacts
           .filter((item) => item?.id !== id)
           .map((contact, key) => (

diff --git a/src/components/Templates/Contacts/index.js b/src/components/Templates/Contacts/index.js
@@ -8,6 +8,7 @@ import NewChat from "../../Organisms/NewChat";
 import AddContact from "../../Organisms/AddContact";
 import { getContactsRequest } from "../../../store/reducers/contactSlice";
 import Container from "./style";
+import { getActiveChatsRequest } from "../../../store/reducers/userSlice";
 
 const Contacts = ({ onClick, active }) => {
   const dispatch = useDispatch();
@@ -24,6 +25,10 @@ const Contacts = ({ onClick, active }) => {
     dispatch(getContactsRequest());
   }, []);
 
+  useEffect(() => {
+    dispatch(getActiveChatsRequest({ id }));
+  }, [id]);
+
   return (
     <Container>
       {showNewChat ? (