Ott 527 tournament names (#204)

* fix(#527): show selected tournament name

* fix(#527): eslint warning
keep-around/af30b88d367751c9e05a735e4a0467a96238ef47
Mirlan 5 years ago committed by GitHub
parent 63bb8f4040
commit 26493b0c92
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 17
      src/features/HeaderFilters/components/TournamentFilter/hooks.tsx
  2. 2
      src/features/HeaderFilters/components/TournamentFilter/index.tsx
  3. 1
      src/features/UserFavorites/styled.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<Tournaments>([])
@ -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)

@ -37,7 +37,7 @@ export const TournamentFilter = () => {
<ButtonTitle>
{
selectedTournament
? <Name nameObj={selectedTournament} prefix='short_name_' />
? <Name nameObj={selectedTournament} />
: <T9n t='tournament' />
}
</ButtonTitle>

@ -1,4 +1,3 @@
import { devices } from 'config/devices'
import styled from 'styled-components/macro'

Loading…
Cancel
Save