Merge pull request #500 from instat/preprod

Preprod
keep-around/af30b88d367751c9e05a735e4a0467a96238ef47
Mirlan 4 years ago committed by GitHub
commit 2827f6b3e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      src/features/MatchPage/components/LiveMatchSidePlaylists/index.tsx
  2. 4
      src/features/MatchSidePlaylists/components/TabWatch/index.tsx
  3. 17
      src/features/PreferencesPopup/store/hooks/index.tsx

@ -8,7 +8,6 @@ import { Tab, TabsGroup } from 'features/Common'
const Wrapper = styled.div`` const Wrapper = styled.div``
const Container = styled.div` const Container = styled.div`
width: 288px;
margin-left: 14px; margin-left: 14px;
margin-right: 18px; margin-right: 18px;

@ -1,5 +1,6 @@
import { Fragment } from 'react' import { Fragment } from 'react'
import isEmpty from 'lodash/isEmpty'
import size from 'lodash/size' import size from 'lodash/size'
import type { PlaylistOption, Playlists } from 'features/MatchPage/types' import type { PlaylistOption, Playlists } from 'features/MatchPage/types'
@ -40,8 +41,7 @@ export const TabWatch = ({
onSelect={onSelect} onSelect={onSelect}
/> />
</DropdownSection> </DropdownSection>
{size(playlists.players.team1) {!isEmpty(playlists.players.team1) && (
&& (
<PlayersPlaylists <PlayersPlaylists
profile={profile} profile={profile}
players={playlists.players} players={playlists.players}

@ -14,19 +14,18 @@ import { useSearch } from './useSearch'
export const usePreferences = () => { export const usePreferences = () => {
const [firstLoad, setFirstLoad] = useLocalStore({ const [firstLoad, setFirstLoad] = useLocalStore({
// defaultValue: true, defaultValue: true,
defaultValue: false,
key: 'preferences_first_load', key: 'preferences_first_load',
validator: isBoolean, validator: isBoolean,
}) })
const { const {
close, close,
isOpen, isOpen,
// open, open,
} = useToggle() } = useToggle()
const { const {
// fetchInitialSports, fetchInitialSports,
onSportSelect, onSportSelect,
selectedSports, selectedSports,
setInitialSelectedSports, setInitialSelectedSports,
@ -55,7 +54,7 @@ export const usePreferences = () => {
} = useSelectedTournaments(selectedSports, tournaments) } = useSelectedTournaments(selectedSports, tournaments)
const { const {
// fetchInitialPreferences, fetchInitialPreferences,
isApplyButtonDisabled, isApplyButtonDisabled,
isFetching: isFetchingPrefernces, isFetching: isFetchingPrefernces,
isSaving, isSaving,
@ -79,10 +78,10 @@ export const usePreferences = () => {
]) ])
const openPopup = useCallback(() => { const openPopup = useCallback(() => {
// fetchInitialPreferences() fetchInitialPreferences()
// fetchInitialSports() fetchInitialSports()
// open() open()
}, [/* fetchInitialPreferences, fetchInitialSports, open */]) }, [fetchInitialPreferences, fetchInitialSports, open])
const closePopup = () => { const closePopup = () => {
reset() reset()

Loading…
Cancel
Save