diff --git a/frontend/src/components/MessageInput/index.js b/frontend/src/components/MessageInput/index.js index f6c62ad..2b566db 100644 --- a/frontend/src/components/MessageInput/index.js +++ b/frontend/src/components/MessageInput/index.js @@ -102,10 +102,9 @@ const useStyles = makeStyles(theme => ({ }, })); -const MessageInput = ({ searchParam }) => { +const MessageInput = () => { const classes = useStyles(); const { ticketId } = useParams(); - // const userId = localStorage.getItem("userId"); const username = localStorage.getItem("username"); const mediaInitialState = { preview: "", raw: "", name: "" }; @@ -309,7 +308,7 @@ const MessageInput = ({ searchParam }) => {
input && !searchParam && input.focus()} + inputRef={input => input && input.focus()} className={classes.messageInput} placeholder="Escreva uma mensagem" multiline diff --git a/frontend/src/components/MessagesList/index.js b/frontend/src/components/MessagesList/index.js index 7d82d55..84144a7 100644 --- a/frontend/src/components/MessagesList/index.js +++ b/frontend/src/components/MessagesList/index.js @@ -234,7 +234,6 @@ const MessagesList = () => { const [ticket, setTicket] = useState({}); const [messagesList, setMessagesList] = useState([]); const [hasMore, setHasMore] = useState(false); - const [searchParam, setSearchParam] = useState(""); const [pageNumber, setPageNumber] = useState(0); const [drawerOpen, setDrawerOpen] = useState(false); const lastMessageRef = useRef(); @@ -242,17 +241,13 @@ const MessagesList = () => { const [anchorEl, setAnchorEl] = useState(null); const moreMenuOpen = Boolean(anchorEl); - useEffect(() => { - setMessagesList([]); - }, [searchParam]); - useEffect(() => { setLoading(true); const delayDebounceFn = setTimeout(() => { const fetchMessages = async () => { try { const res = await api.get("/messages/" + ticketId, { - params: { searchParam, pageNumber }, + params: { pageNumber }, }); setContact(res.data.ticket.contact); setTicket(res.data.ticket); @@ -273,7 +268,7 @@ const MessagesList = () => { fetchMessages(); }, 1000); return () => clearTimeout(delayDebounceFn); - }, [searchParam, pageNumber, ticketId, token, history]); + }, [pageNumber, ticketId, token, history]); useEffect(() => { const socket = openSocket(process.env.REACT_APP_BACKEND_URL); @@ -297,17 +292,11 @@ const MessagesList = () => { return () => { socket.disconnect(); - setSearchParam(""); setPageNumber(1); setMessagesList([]); }; }, [ticketId]); - // const handleSearch = e => { - // setSearchParam(e.target.value); - // setPageNumber(1); - // }; - const loadMore = () => { setPageNumber(prevPageNumber => prevPageNumber + 1); }; @@ -613,7 +602,7 @@ const MessagesList = () => { > {messagesList.length > 0 ? renderMessages() : []} - + {loading ? (
diff --git a/frontend/src/components/Tickets/index.js b/frontend/src/components/Tickets/index.js index 97e3c70..3176782 100644 --- a/frontend/src/components/Tickets/index.js +++ b/frontend/src/components/Tickets/index.js @@ -50,8 +50,8 @@ const useStyles = makeStyles(theme => ({ }, tab: { - minWidth: 120, // a number of your choice - width: 120, // a number of your choice + minWidth: 120, + width: 120, }, halfTicketsList: { @@ -84,13 +84,10 @@ const useStyles = makeStyles(theme => ({ ticketsListHeader: { display: "flex", - // flexShrink: 0, - // -webkitBoxAlign: "center", alignItems: "center", fontWeight: 500, fontSize: "16px", height: "56px", - // backgroundColor: "#eee", color: "rgb(67, 83, 105)", padding: "0px 12px", borderBottom: "1px solid rgba(0, 0, 0, 0.12)", @@ -391,8 +388,6 @@ const Tickets = () => { ); }; - console.log(tickets); - return ( - {format(parseISO(ticket.updatedAt), "HH:mm")} + {isSameDay(parseISO(ticket.updatedAt), new Date()) ? ( + <>{format(parseISO(ticket.updatedAt), "HH:mm")} + ) : ( + <>{format(parseISO(ticket.updatedAt), "MM/dd/yyyy")} + )} )}