diff --git a/src/components/Carpool/Carpool.tsx b/src/components/Carpool/Carpool.tsx index 30ec6c8..ede0650 100644 --- a/src/components/Carpool/Carpool.tsx +++ b/src/components/Carpool/Carpool.tsx @@ -1,5 +1,4 @@ -import MailOutlineIcon from '@material-ui/icons/MailOutline'; -import PersonAddIcon from '@material-ui/icons/PersonAdd'; +import { useMemo } from 'react'; import { createContext, useCallback, useEffect, useState } from 'react'; import { cancelCarpoolInvite, @@ -7,13 +6,11 @@ import { leaveCarpool, sendCarpoolInvite, } from '../api'; -import { lightgrey } from '../colors'; +import { useMe } from '../hooks'; import { ICarpool } from '../types'; -import UIButton from '../UI/UIButton'; import UISecondaryBox from '../UI/UISecondaryBox'; -import useToggle from '../useToggle'; import CarpoolDetails from './CarpoolDetails'; -import InvitationList from './InvitationList'; +import InvitationsAndRequests from './InvitationsAndRequests'; import MemberList from './MemberList'; export const CarpoolContext = createContext({ @@ -36,8 +33,6 @@ export default function Carpool({ id }: { id: number }) { getCarpool(id).then(setCarpool); }, [id]); - const [invitationsOpen, toggleInvitationsOpen] = useToggle(false); - const sendInvite = useCallback( (user: { id: number; name: string }) => { if (carpool) { @@ -95,6 +90,13 @@ export default function Carpool({ id }: { id: number }) { } }, [eventId, id]); + const me = useMe(); + + const isMember = useMemo( + () => carpool?.members.some((m) => m.id === me?.id), + [carpool?.members, me?.id] + ); + if (!carpool) { return <>Loading...>; } @@ -113,39 +115,7 @@ export default function Carpool({ id }: { id: number }) { <>