From 82c96edf4753f59c8890b411cd55d62c19cf85cf Mon Sep 17 00:00:00 2001
From: Andrei Dekterev <avdekterev@gmail.com>
Date: Tue, 20 Sep 2022 19:00:51 +0400
Subject: [PATCH] refactor(#2818): fix comments from code review

---
 .../components/FavouriteTeam/hooks.tsx        | 28 ++++++++++---------
 .../components/FavouriteTeam/index.tsx        |  8 +++---
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/src/features/MatchPage/components/FavouriteTeam/hooks.tsx b/src/features/MatchPage/components/FavouriteTeam/hooks.tsx
index c46d8b2e..89d70810 100644
--- a/src/features/MatchPage/components/FavouriteTeam/hooks.tsx
+++ b/src/features/MatchPage/components/FavouriteTeam/hooks.tsx
@@ -54,31 +54,33 @@ const groupTeams = {
 
 export const useFavouriteTeam = () => {
   const [teams, setTeams] = useState<Array<FavouriteTeams>>([])
-  const [active, setActive] = useState<number | null>(null)
+  const [activeId, setActiveId] = useState<number | null>(null)
   const [isOpen, setIsOpen] = useState<boolean>(false)
   const [group1, setGroup1] = useState<Array<FavouriteTeams>>([])
   const [group2, setGroup2] = useState<Array<FavouriteTeams>>([])
 
   const changeActive = (team: FavouriteTeams) => {
-    setActive((prev) => (prev === team.id ? null : team.id))
+    setActiveId((prev) => (prev === team.id ? null : team.id))
   }
 
   const onSaveFavouriteTeam = () => {
-    active && saveFavouriteTeam(
+    activeId && saveFavouriteTeam(
         {
-          answer_id: active,
+          answer_id: activeId,
           survey_id: 1,
         })
     setIsOpen(false)
   }
 
-  useEffect(() => {
-    getFavouriteTeam({
-      country_id: 77,
-      season: 30,
-      sport_id: 1,
-      tournament_id: 131,
-    }).then(({ data, status }: ResponseType) => {
+
+  useEffect(  () => {
+    (async () => {
+      const { data, status }: ResponseType = await getFavouriteTeam({
+        country_id: 77,
+        season: 30,
+        sport_id: 1,
+        tournament_id: 131,
+      })
       if(!status) {
         setTeams(data.sort((n1:FavouriteTeams , n2: FavouriteTeams) => {
           if (n1.name_en > n2.name_en) {
@@ -92,7 +94,7 @@ export const useFavouriteTeam = () => {
       }else{
         return
       }
-    })
+    })()
   }, [])
 
   useEffect(() => {
@@ -105,7 +107,7 @@ export const useFavouriteTeam = () => {
   }, [teams])
 
   return {
-    active,
+    activeId,
     changeActive,
     group1,
     group2,
diff --git a/src/features/MatchPage/components/FavouriteTeam/index.tsx b/src/features/MatchPage/components/FavouriteTeam/index.tsx
index 1c2c898c..f88ff7a2 100644
--- a/src/features/MatchPage/components/FavouriteTeam/index.tsx
+++ b/src/features/MatchPage/components/FavouriteTeam/index.tsx
@@ -22,7 +22,7 @@ import {
 
 export const FavouriteTeamPopup = () => {
   const {
-    active,
+    activeId,
     changeActive,
     group1,
     group2,
@@ -45,7 +45,7 @@ export const FavouriteTeamPopup = () => {
               <ScTeamsList>
                 {group1?.map((team: FavouriteTeams) => (
                   <ItemInfo
-                    active={team.id === active}
+                    active={team.id === activeId}
                     key={team.id}
                     id={team.id}
                     name={team.name_en}
@@ -62,7 +62,7 @@ export const FavouriteTeamPopup = () => {
               <ScTeamsList>
                 {group2?.map((team: FavouriteTeams) => (
                   <ItemInfo
-                    active={team.id === active}
+                    active={team.id === activeId}
                     key={team.id}
                     id={team.id}
                     name={team.name_en}
@@ -74,7 +74,7 @@ export const FavouriteTeamPopup = () => {
             </ScGroup>
           </ScGroups>
           <ButtonsBlock>
-            <Button disabled={!active} onClick={onSaveFavouriteTeam}>
+            <Button disabled={!activeId} onClick={onSaveFavouriteTeam}>
               Ok
             </Button>
           </ButtonsBlock>