diff --git a/src/features/MatchPage/components/LiveMatchSidePlaylists/index.tsx b/src/features/MatchPage/components/LiveMatchSidePlaylists/index.tsx index df75b71a..471ea777 100644 --- a/src/features/MatchPage/components/LiveMatchSidePlaylists/index.tsx +++ b/src/features/MatchPage/components/LiveMatchSidePlaylists/index.tsx @@ -8,7 +8,6 @@ import { Tab, TabsGroup } from 'features/Common' const Wrapper = styled.div`` const Container = styled.div` - width: 288px; margin-left: 14px; margin-right: 18px; diff --git a/src/features/MatchSidePlaylists/components/TabWatch/index.tsx b/src/features/MatchSidePlaylists/components/TabWatch/index.tsx index 9158ebfe..506d9481 100644 --- a/src/features/MatchSidePlaylists/components/TabWatch/index.tsx +++ b/src/features/MatchSidePlaylists/components/TabWatch/index.tsx @@ -1,5 +1,6 @@ import { Fragment } from 'react' +import isEmpty from 'lodash/isEmpty' import size from 'lodash/size' import type { PlaylistOption, Playlists } from 'features/MatchPage/types' @@ -40,14 +41,13 @@ export const TabWatch = ({ onSelect={onSelect} /> - {size(playlists.players.team1) - && ( - - )} + {!isEmpty(playlists.players.team1) && ( + + )} ) diff --git a/src/features/PreferencesPopup/store/hooks/index.tsx b/src/features/PreferencesPopup/store/hooks/index.tsx index ce24b77a..44d55c48 100644 --- a/src/features/PreferencesPopup/store/hooks/index.tsx +++ b/src/features/PreferencesPopup/store/hooks/index.tsx @@ -14,19 +14,18 @@ import { useSearch } from './useSearch' export const usePreferences = () => { const [firstLoad, setFirstLoad] = useLocalStore({ - // defaultValue: true, - defaultValue: false, + defaultValue: true, key: 'preferences_first_load', validator: isBoolean, }) const { close, isOpen, - // open, + open, } = useToggle() const { - // fetchInitialSports, + fetchInitialSports, onSportSelect, selectedSports, setInitialSelectedSports, @@ -55,7 +54,7 @@ export const usePreferences = () => { } = useSelectedTournaments(selectedSports, tournaments) const { - // fetchInitialPreferences, + fetchInitialPreferences, isApplyButtonDisabled, isFetching: isFetchingPrefernces, isSaving, @@ -79,10 +78,10 @@ export const usePreferences = () => { ]) const openPopup = useCallback(() => { - // fetchInitialPreferences() - // fetchInitialSports() - // open() - }, [/* fetchInitialPreferences, fetchInitialSports, open */]) + fetchInitialPreferences() + fetchInitialSports() + open() + }, [fetchInitialPreferences, fetchInitialSports, open]) const closePopup = () => { reset()