refactor(#2818): fix comments from code review

keep-around/99001d5964a4727568711990575a9f282fe3f67e
Andrei Dekterev 3 years ago
parent 34ec3e8a5d
commit 82c96edf47
  1. 28
      src/features/MatchPage/components/FavouriteTeam/hooks.tsx
  2. 8
      src/features/MatchPage/components/FavouriteTeam/index.tsx

@ -54,31 +54,33 @@ const groupTeams = {
export const useFavouriteTeam = () => { export const useFavouriteTeam = () => {
const [teams, setTeams] = useState<Array<FavouriteTeams>>([]) 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 [isOpen, setIsOpen] = useState<boolean>(false)
const [group1, setGroup1] = useState<Array<FavouriteTeams>>([]) const [group1, setGroup1] = useState<Array<FavouriteTeams>>([])
const [group2, setGroup2] = useState<Array<FavouriteTeams>>([]) const [group2, setGroup2] = useState<Array<FavouriteTeams>>([])
const changeActive = (team: FavouriteTeams) => { const changeActive = (team: FavouriteTeams) => {
setActive((prev) => (prev === team.id ? null : team.id)) setActiveId((prev) => (prev === team.id ? null : team.id))
} }
const onSaveFavouriteTeam = () => { const onSaveFavouriteTeam = () => {
active && saveFavouriteTeam( activeId && saveFavouriteTeam(
{ {
answer_id: active, answer_id: activeId,
survey_id: 1, survey_id: 1,
}) })
setIsOpen(false) setIsOpen(false)
} }
useEffect(() => {
getFavouriteTeam({ useEffect( () => {
country_id: 77, (async () => {
season: 30, const { data, status }: ResponseType = await getFavouriteTeam({
sport_id: 1, country_id: 77,
tournament_id: 131, season: 30,
}).then(({ data, status }: ResponseType) => { sport_id: 1,
tournament_id: 131,
})
if(!status) { if(!status) {
setTeams(data.sort((n1:FavouriteTeams , n2: FavouriteTeams) => { setTeams(data.sort((n1:FavouriteTeams , n2: FavouriteTeams) => {
if (n1.name_en > n2.name_en) { if (n1.name_en > n2.name_en) {
@ -92,7 +94,7 @@ export const useFavouriteTeam = () => {
}else{ }else{
return return
} }
}) })()
}, []) }, [])
useEffect(() => { useEffect(() => {
@ -105,7 +107,7 @@ export const useFavouriteTeam = () => {
}, [teams]) }, [teams])
return { return {
active, activeId,
changeActive, changeActive,
group1, group1,
group2, group2,

@ -22,7 +22,7 @@ import {
export const FavouriteTeamPopup = () => { export const FavouriteTeamPopup = () => {
const { const {
active, activeId,
changeActive, changeActive,
group1, group1,
group2, group2,
@ -45,7 +45,7 @@ export const FavouriteTeamPopup = () => {
<ScTeamsList> <ScTeamsList>
{group1?.map((team: FavouriteTeams) => ( {group1?.map((team: FavouriteTeams) => (
<ItemInfo <ItemInfo
active={team.id === active} active={team.id === activeId}
key={team.id} key={team.id}
id={team.id} id={team.id}
name={team.name_en} name={team.name_en}
@ -62,7 +62,7 @@ export const FavouriteTeamPopup = () => {
<ScTeamsList> <ScTeamsList>
{group2?.map((team: FavouriteTeams) => ( {group2?.map((team: FavouriteTeams) => (
<ItemInfo <ItemInfo
active={team.id === active} active={team.id === activeId}
key={team.id} key={team.id}
id={team.id} id={team.id}
name={team.name_en} name={team.name_en}
@ -74,7 +74,7 @@ export const FavouriteTeamPopup = () => {
</ScGroup> </ScGroup>
</ScGroups> </ScGroups>
<ButtonsBlock> <ButtonsBlock>
<Button disabled={!active} onClick={onSaveFavouriteTeam}> <Button disabled={!activeId} onClick={onSaveFavouriteTeam}>
Ok Ok
</Button> </Button>
</ButtonsBlock> </ButtonsBlock>

Loading…
Cancel
Save