diff --git a/src/features/MatchPage/store/hooks/useMatchPlaylists.tsx b/src/features/MatchPage/store/hooks/useMatchPlaylists.tsx index 5af4789c..5667b8e2 100644 --- a/src/features/MatchPage/store/hooks/useMatchPlaylists.tsx +++ b/src/features/MatchPage/store/hooks/useMatchPlaylists.tsx @@ -3,6 +3,8 @@ import { useCallback, } from 'react' +import isEmpty from 'lodash/isEmpty' + import type { SportTypes } from 'config/sportTypes' import { getMatchPlaylists } from 'requests/getMatchPlaylists' @@ -32,7 +34,12 @@ export const useMatchPlaylists = () => { } = useSelectedPlaylist() const setInitialSeletedPlaylist = useCallback((playlists: Playlists) => { - setSelectedPlaylist(playlists.match[0]) + setSelectedPlaylist((playlist) => { + if (!playlist && !isEmpty(playlists.match)) { + return playlists.match[0] + } + return playlist + }) return playlists }, [setSelectedPlaylist]) diff --git a/src/features/MatchSidePlaylists/hooks.tsx b/src/features/MatchSidePlaylists/hooks.tsx index a953144c..b76c003b 100644 --- a/src/features/MatchSidePlaylists/hooks.tsx +++ b/src/features/MatchSidePlaylists/hooks.tsx @@ -15,6 +15,7 @@ export const useMatchSidePlaylists = () => { closePopup, events, matchPlaylists: playlists, + profile, tournamentData, } = useMatchPageStore() const [selectedTab, setSelectedTab] = useState(Tabs.WATCH) @@ -57,6 +58,10 @@ export const useMatchSidePlaylists = () => { if (selectedTab !== Tabs.EVENTS) closePopup() }, [selectedTab, closePopup]) + useEffect(() => { + setSelectedTab(Tabs.WATCH) + }, [profile]) + return { isEventTabVisible, isVideoTabVisible,