Merge pull request #500 from instat/preprod

Preprod

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;
 

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}
       />
     </DropdownSection>
-    {size(playlists.players.team1)
-     && (
-       <PlayersPlaylists
-         profile={profile}
-         players={playlists.players}
-         selectedMathPlaylist={selectedPlaylist}
-         onSelect={onSelect}
-       />
-     )}
+    {!isEmpty(playlists.players.team1) && (
+      <PlayersPlaylists
+        profile={profile}
+        players={playlists.players}
+        selectedMathPlaylist={selectedPlaylist}
+        onSelect={onSelect}
+      />
+    )}
   </Fragment>
 )

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()