fix(ott-2710): minor fixes

OTT-2710-match-filters
boyvanov 3 years ago
parent c8ec8d6fb0
commit c45b6c1679
  1. 6
      src/features/HeaderFilters/store/hooks/useMatchFilters.tsx
  2. 4
      src/features/HeaderMobile/index.tsx
  3. 6
      src/features/HomePage/components/Dropdown/index.tsx
  4. 4
      src/features/HomePage/components/MatchesFilters/index.tsx
  5. 11
      src/features/HomePage/components/MobileMatchesFilters/index.tsx
  6. 2
      src/utilits/mirage/Mirage.tsx

@ -6,6 +6,7 @@ import {
MouseEvent, MouseEvent,
ChangeEvent, ChangeEvent,
} from 'react' } from 'react'
import some from 'lodash/some' import some from 'lodash/some'
import isNil from 'lodash/isNil' import isNil from 'lodash/isNil'
import includes from 'lodash/includes' import includes from 'lodash/includes'
@ -23,6 +24,9 @@ import {
TQueryParams, TQueryParams,
} from 'requests' } from 'requests'
const MATCHES_LIMIT = 1000
const OFFSET = 0
const getTimezoneOffset = (date: Date) => { const getTimezoneOffset = (date: Date) => {
const offset = date.getTimezoneOffset() const offset = date.getTimezoneOffset()
if (offset === 0) return offset if (offset === 0) return offset
@ -73,7 +77,7 @@ export const useMatchFilters = (selectedDate: Date) => {
) )
useEffect(() => { useEffect(() => {
fetchMatches(1000, 0).then((resp) => setFiltersList(resp.broadcast)) fetchMatches(MATCHES_LIMIT, OFFSET).then((resp) => setFiltersList(resp.broadcast))
// eslint-disable-next-line react-hooks/exhaustive-deps // eslint-disable-next-line react-hooks/exhaustive-deps
}, [selectedDate]) }, [selectedDate])

@ -9,8 +9,8 @@ import { ScoreSwitch } from 'features/MatchSwitches'
import { SportsFilter } from 'features/SportsFilter' import { SportsFilter } from 'features/SportsFilter'
import { isSportFilterShownAtom } from 'features/HomePage/Atoms/HomePageAtoms' import { isSportFilterShownAtom } from 'features/HomePage/Atoms/HomePageAtoms'
import { SmartBanner } from 'components/SmartBanner' import { SmartBanner } from 'components/SmartBanner'
import { MobileMatchesFilters } from 'features/HomePage/components/MobileMatchesFilters'
import { MobileMathesFilters } from 'features/HomePage/components/MobileMatchesFilters'
import { import {
HeaderStyled, HeaderStyled,
ScoreSwitchWrapper, ScoreSwitchWrapper,
@ -39,7 +39,7 @@ export const HeaderMobile = ({ isOpenDownload, setIsOpenDownload }: HeaderBanner
{!isLffClient && isSportFilterShown ? ( {!isLffClient && isSportFilterShown ? (
<> <>
<SportsFilter /> <SportsFilter />
<MobileMathesFilters /> <MobileMatchesFilters />
</> </>
) : null} ) : null}
<ScoreSwitchWrapper> <ScoreSwitchWrapper>

@ -6,9 +6,9 @@ import includes from 'lodash/includes'
import { T9n } from 'features/T9n' import { T9n } from 'features/T9n'
import { Name } from 'features/Name' import { Name } from 'features/Name'
import { useLexicsStore } from 'features/LexicsStore' import { useLexicsStore } from 'features/LexicsStore'
import { isMobileDevice } from 'config/userAgent' import { isMobileDevice } from 'config/userAgent'
import { import {
getAge, getAge,
getArena, getArena,
@ -128,9 +128,9 @@ export const DropDown = ({
{filterTitle === 'gender' {filterTitle === 'gender'
? ( ? (
<Checkbox <Checkbox
// eslint-disable-next-line max-len
checked={includes(currentActiveFilter, checked={includes(currentActiveFilter,
filterItem || filterItem.name_eng || filterItem.name_rus)} filterItem || filterItem.name_eng
|| filterItem.name_rus)}
onChange={(e) => { onChange={(e) => {
e.preventDefault() e.preventDefault()
e.stopPropagation() e.stopPropagation()

@ -1,4 +1,5 @@
import React from 'react' import React from 'react'
import map from 'lodash/map' import map from 'lodash/map'
import isNil from 'lodash/isNil' import isNil from 'lodash/isNil'
import size from 'lodash/size' import size from 'lodash/size'
@ -7,6 +8,7 @@ import { useName } from 'features/Name'
import { T9n } from 'features/T9n' import { T9n } from 'features/T9n'
import { useHeaderFiltersStore } from 'features/HeaderFilters' import { useHeaderFiltersStore } from 'features/HeaderFilters'
import { isMobileDevice } from 'config/userAgent' import { isMobileDevice } from 'config/userAgent'
import { import {
FilterContainer, FilterContainer,
FiltersCount, FiltersCount,
@ -15,7 +17,7 @@ import {
ActiveFilter, ActiveFilter,
CloseButton, CloseButton,
} from './styled' } from './styled'
import { DropDown } from '../Dropdown/Dropdown' import { DropDown } from '../Dropdown'
import { checkSize, truncateString } from './helpers' import { checkSize, truncateString } from './helpers'
type TProps = { type TProps = {

@ -1,8 +1,11 @@
import { useHeaderFiltersStore } from 'features/HeaderFilters'
import { T9n } from 'features/T9n'
import React, { useState } from 'react' import React, { useState } from 'react'
import isEmpty from 'lodash/isEmpty' import isEmpty from 'lodash/isEmpty'
import isNil from 'lodash/isNil' import isNil from 'lodash/isNil'
import { useHeaderFiltersStore } from 'features/HeaderFilters'
import { T9n } from 'features/T9n'
import { MatchesFilters } from '../MatchesFilters' import { MatchesFilters } from '../MatchesFilters'
import { import {
ClearButton, ClearButton,
@ -10,10 +13,10 @@ import {
FilterContainer, FilterContainer,
Modal, Modal,
} from './styled' } from './styled'
import { DropDown } from '../Dropdown/Dropdown' import { DropDown } from '../Dropdown'
import { ClearFiltersPopup } from '../ClearFiltersPopup' import { ClearFiltersPopup } from '../ClearFiltersPopup'
export const MobileMathesFilters = () => { export const MobileMatchesFilters = () => {
const [isOpen, setOpen] = useState(false) const [isOpen, setOpen] = useState(false)
const { const {
activeFilters, activeFilters,

@ -6,7 +6,7 @@ import {
import { ResponseType } from 'requests/getFavouriteTeam' import { ResponseType } from 'requests/getFavouriteTeam'
import { surveys } from './fixtures/surveys' import { surveys } from './Fixtures/surveys'
export function makeServer({ environment = 'test' } = {}) { export function makeServer({ environment = 'test' } = {}) {
const server = createServer({ const server = createServer({

Loading…
Cancel
Save