diff --git a/src/features/HeaderFilters/components/TournamentFilter/hooks.tsx b/src/features/HeaderFilters/components/TournamentFilter/hooks.tsx index 973645be..ae86d76d 100644 --- a/src/features/HeaderFilters/components/TournamentFilter/hooks.tsx +++ b/src/features/HeaderFilters/components/TournamentFilter/hooks.tsx @@ -9,6 +9,16 @@ import { useRequest, useToggle } from 'hooks' import { useHeaderFiltersStore } from 'features/HeaderFilters' +const findTournament = (tournaments: Tournaments, id: number) => { + const tournament = find(tournaments, { id }) + if (!tournament) return null + return { + ...tournament, + name_eng: tournament.short_name_eng || tournament.name_eng, + name_rus: tournament.short_name_rus || tournament.name_rus, + } +} + export const useTournamentFilter = () => { const [tournaments, setTournaments] = useState([]) @@ -44,10 +54,9 @@ export const useTournamentFilter = () => { setPage(page + 1) } - const selectedTournament = find( - tournaments, - (tournament) => tournament.id === selectedTournamentId, - ) + const selectedTournament = selectedTournamentId + ? findTournament(tournaments, selectedTournamentId) + : null const onTournamentSelect = (tournamentId: number) => { setSelectedTournamentId(tournamentId) diff --git a/src/features/HeaderFilters/components/TournamentFilter/index.tsx b/src/features/HeaderFilters/components/TournamentFilter/index.tsx index 3bcb1e7f..f29a3bab 100644 --- a/src/features/HeaderFilters/components/TournamentFilter/index.tsx +++ b/src/features/HeaderFilters/components/TournamentFilter/index.tsx @@ -37,7 +37,7 @@ export const TournamentFilter = () => { { selectedTournament - ? + ? : } diff --git a/src/features/UserFavorites/styled.tsx b/src/features/UserFavorites/styled.tsx index 713f5ed4..4504cfcc 100644 --- a/src/features/UserFavorites/styled.tsx +++ b/src/features/UserFavorites/styled.tsx @@ -1,4 +1,3 @@ - import { devices } from 'config/devices' import styled from 'styled-components/macro'