From 26493b0c92007059e7531f336998d2bfa3ebab5c Mon Sep 17 00:00:00 2001
From: Mirlan <m.maksitaliev@gmail.com>
Date: Tue, 3 Nov 2020 12:51:05 +0600
Subject: [PATCH] Ott 527 tournament names (#204)

* fix(#527): show selected tournament name

* fix(#527): eslint warning
---
 .../components/TournamentFilter/hooks.tsx       | 17 +++++++++++++----
 .../components/TournamentFilter/index.tsx       |  2 +-
 src/features/UserFavorites/styled.tsx           |  1 -
 3 files changed, 14 insertions(+), 6 deletions(-)

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<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)
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 = () => {
         <ButtonTitle>
           {
             selectedTournament
-              ? <Name nameObj={selectedTournament} prefix='short_name_' />
+              ? <Name nameObj={selectedTournament} />
               : <T9n t='tournament' />
           }
         </ButtonTitle>
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'