diff --git a/src/features/MatchSidePlaylists/components/TabEvents/index.tsx b/src/features/MatchSidePlaylists/components/TabEvents/index.tsx index 7a2a746d..fc6d4a7a 100644 --- a/src/features/MatchSidePlaylists/components/TabEvents/index.tsx +++ b/src/features/MatchSidePlaylists/components/TabEvents/index.tsx @@ -44,19 +44,22 @@ export const TabEvents = ({ open: setReversed, } = useToggle() - const groupedEvents = useMemo(() => values( - groupBy( - areEventsReversed ? reverse([...events]) : events, - 'h', - ), - ), [areEventsReversed, events]) - - const reversedGroupEvents = useMemo(() => ( - areEventsReversed + const isLiveMatch = profile?.live + const reverseStatus = (areEventsReversed || isLiveMatch) && (areEventsReversed !== isLiveMatch) + const reversedGroupEvents = useMemo(() => { + const groupedEvents = values( + groupBy( + reverseStatus + ? reverse([...events]) + : events, + 'h', + ), + ) + return reverseStatus ? reverse(groupedEvents) : groupedEvents - ), [areEventsReversed, groupedEvents]) - + }, [events, reverseStatus]) + const activeStatus = isLiveMatch ? areEventsReversed : !areEventsReversed if (!profile) return null return ( @@ -71,14 +74,14 @@ export const TabEvents = ({