From c45b6c1679767d68175cedb54ba9b11d296b0d54 Mon Sep 17 00:00:00 2001 From: boyvanov Date: Thu, 13 Oct 2022 13:33:16 +0300 Subject: [PATCH] fix(ott-2710): minor fixes --- .../HeaderFilters/store/hooks/useMatchFilters.tsx | 6 +++++- src/features/HeaderMobile/index.tsx | 4 ++-- .../components/Dropdown/{Dropdown.tsx => index.tsx} | 6 +++--- .../HomePage/components/MatchesFilters/index.tsx | 4 +++- .../components/MobileMatchesFilters/index.tsx | 11 +++++++---- src/utilits/mirage/Mirage.tsx | 2 +- 6 files changed, 21 insertions(+), 12 deletions(-) rename src/features/HomePage/components/Dropdown/{Dropdown.tsx => index.tsx} (96%) diff --git a/src/features/HeaderFilters/store/hooks/useMatchFilters.tsx b/src/features/HeaderFilters/store/hooks/useMatchFilters.tsx index 3455c590..09f52cf0 100644 --- a/src/features/HeaderFilters/store/hooks/useMatchFilters.tsx +++ b/src/features/HeaderFilters/store/hooks/useMatchFilters.tsx @@ -6,6 +6,7 @@ import { MouseEvent, ChangeEvent, } from 'react' + import some from 'lodash/some' import isNil from 'lodash/isNil' import includes from 'lodash/includes' @@ -23,6 +24,9 @@ import { TQueryParams, } from 'requests' +const MATCHES_LIMIT = 1000 +const OFFSET = 0 + const getTimezoneOffset = (date: Date) => { const offset = date.getTimezoneOffset() if (offset === 0) return offset @@ -73,7 +77,7 @@ export const useMatchFilters = (selectedDate: Date) => { ) 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 }, [selectedDate]) diff --git a/src/features/HeaderMobile/index.tsx b/src/features/HeaderMobile/index.tsx index 6076bce9..ca3a6b18 100644 --- a/src/features/HeaderMobile/index.tsx +++ b/src/features/HeaderMobile/index.tsx @@ -9,8 +9,8 @@ import { ScoreSwitch } from 'features/MatchSwitches' import { SportsFilter } from 'features/SportsFilter' import { isSportFilterShownAtom } from 'features/HomePage/Atoms/HomePageAtoms' import { SmartBanner } from 'components/SmartBanner' +import { MobileMatchesFilters } from 'features/HomePage/components/MobileMatchesFilters' -import { MobileMathesFilters } from 'features/HomePage/components/MobileMatchesFilters' import { HeaderStyled, ScoreSwitchWrapper, @@ -39,7 +39,7 @@ export const HeaderMobile = ({ isOpenDownload, setIsOpenDownload }: HeaderBanner {!isLffClient && isSportFilterShown ? ( <> - + ) : null} diff --git a/src/features/HomePage/components/Dropdown/Dropdown.tsx b/src/features/HomePage/components/Dropdown/index.tsx similarity index 96% rename from src/features/HomePage/components/Dropdown/Dropdown.tsx rename to src/features/HomePage/components/Dropdown/index.tsx index 5ba084b7..29be08cc 100644 --- a/src/features/HomePage/components/Dropdown/Dropdown.tsx +++ b/src/features/HomePage/components/Dropdown/index.tsx @@ -6,9 +6,9 @@ import includes from 'lodash/includes' import { T9n } from 'features/T9n' import { Name } from 'features/Name' - import { useLexicsStore } from 'features/LexicsStore' import { isMobileDevice } from 'config/userAgent' + import { getAge, getArena, @@ -128,9 +128,9 @@ export const DropDown = ({ {filterTitle === 'gender' ? ( { e.preventDefault() e.stopPropagation() diff --git a/src/features/HomePage/components/MatchesFilters/index.tsx b/src/features/HomePage/components/MatchesFilters/index.tsx index 15ff7714..60f28325 100644 --- a/src/features/HomePage/components/MatchesFilters/index.tsx +++ b/src/features/HomePage/components/MatchesFilters/index.tsx @@ -1,4 +1,5 @@ import React from 'react' + import map from 'lodash/map' import isNil from 'lodash/isNil' import size from 'lodash/size' @@ -7,6 +8,7 @@ import { useName } from 'features/Name' import { T9n } from 'features/T9n' import { useHeaderFiltersStore } from 'features/HeaderFilters' import { isMobileDevice } from 'config/userAgent' + import { FilterContainer, FiltersCount, @@ -15,7 +17,7 @@ import { ActiveFilter, CloseButton, } from './styled' -import { DropDown } from '../Dropdown/Dropdown' +import { DropDown } from '../Dropdown' import { checkSize, truncateString } from './helpers' type TProps = { diff --git a/src/features/HomePage/components/MobileMatchesFilters/index.tsx b/src/features/HomePage/components/MobileMatchesFilters/index.tsx index 2547c38d..7a88f86c 100644 --- a/src/features/HomePage/components/MobileMatchesFilters/index.tsx +++ b/src/features/HomePage/components/MobileMatchesFilters/index.tsx @@ -1,8 +1,11 @@ -import { useHeaderFiltersStore } from 'features/HeaderFilters' -import { T9n } from 'features/T9n' import React, { useState } from 'react' + import isEmpty from 'lodash/isEmpty' import isNil from 'lodash/isNil' + +import { useHeaderFiltersStore } from 'features/HeaderFilters' +import { T9n } from 'features/T9n' + import { MatchesFilters } from '../MatchesFilters' import { ClearButton, @@ -10,10 +13,10 @@ import { FilterContainer, Modal, } from './styled' -import { DropDown } from '../Dropdown/Dropdown' +import { DropDown } from '../Dropdown' import { ClearFiltersPopup } from '../ClearFiltersPopup' -export const MobileMathesFilters = () => { +export const MobileMatchesFilters = () => { const [isOpen, setOpen] = useState(false) const { activeFilters, diff --git a/src/utilits/mirage/Mirage.tsx b/src/utilits/mirage/Mirage.tsx index 41d8521f..cdf556a1 100644 --- a/src/utilits/mirage/Mirage.tsx +++ b/src/utilits/mirage/Mirage.tsx @@ -6,7 +6,7 @@ import { import { ResponseType } from 'requests/getFavouriteTeam' -import { surveys } from './fixtures/surveys' +import { surveys } from './Fixtures/surveys' export function makeServer({ environment = 'test' } = {}) { const server = createServer({