fix(#in161): min fix2

keep-around/9d11a525a1ee745f785976389c40d7a0601133e1
Farber Denis 3 years ago
parent 9752a5eeb6
commit f6418de5c9
  1. 39
      src/features/FavoritesMobilePopup/components/GroupBlock/index.tsx
  2. 5
      src/features/FavoritesMobilePopup/components/GroupBlock/styled.tsx

@ -6,7 +6,6 @@ import type { UserFavorites } from 'requests/getUserSportFavs'
import { T9n } from 'features/T9n' import { T9n } from 'features/T9n'
import { SportIcon } from 'components/SportIcon/SportIcon' import { SportIcon } from 'components/SportIcon/SportIcon'
import { useLexicsStore } from 'features/LexicsStore' import { useLexicsStore } from 'features/LexicsStore'
import { ProfileLink } from 'features/ProfileLink'
import { UserSportFavImgWrapper } from 'features/UserFavorites/styled' import { UserSportFavImgWrapper } from 'features/UserFavorites/styled'
import { Flag } from 'features/ItemsList/styled' import { Flag } from 'features/ItemsList/styled'
@ -21,6 +20,7 @@ import {
SportItemLogoWrapper, SportItemLogoWrapper,
Arrows, Arrows,
TitleWrapper, TitleWrapper,
FavLink,
Name, Name,
} from './styled' } from './styled'
@ -51,31 +51,30 @@ export const GroupBlock = ({ groupBlock }: Props) => {
const { countryOrTeam, name } = favoriteItemNames const { countryOrTeam, name } = favoriteItemNames
return ( return (
<Item key={item.id}> <FavLink
<SportItemLogoWrapper> id={item.id}
<ProfileLink sportType={item.sport}
id={item.id} profileType={item.type}
sportType={item.sport} >
profileType={item.type} <Item key={item.id}>
> <SportItemLogoWrapper>
<UserSportFavImgWrapper <UserSportFavImgWrapper
id={item.id} id={item.id}
altNameObj={item} altNameObj={item}
sportType={item.sport} sportType={item.sport}
profileType={item.type} profileType={item.type}
/> />
</ProfileLink> </SportItemLogoWrapper>
</SportItemLogoWrapper> <EmptyDiv>
<Name>{name}</Name>
<EmptyDiv> <CountryAndTeamInfo>
<Name>{name}</Name> <SportIcon sport={item.sport} size={10} />
<CountryAndTeamInfo> <Flag src={`https://instatscout.com/images/flags/48/${item.info.country?.id}.png`} />
<SportIcon sport={item.sport} size={10} /> <EmptySpan>{countryOrTeam}</EmptySpan>
<Flag src={`https://instatscout.com/images/flags/48/${item.info.country?.id}.png`} /> </CountryAndTeamInfo>
<EmptySpan>{countryOrTeam}</EmptySpan> </EmptyDiv>
</CountryAndTeamInfo> </Item>
</EmptyDiv> </FavLink>
</Item>
) )
})} })}
</ContentWrapper> </ContentWrapper>

@ -1,6 +1,7 @@
import styled from 'styled-components/macro' import styled from 'styled-components/macro'
import { devices } from 'config' import { devices } from 'config'
import { ProfileLink } from 'features/ProfileLink'
import { UserSportFavItemLogoWrapper } from 'features/UserFavorites/styled' import { UserSportFavItemLogoWrapper } from 'features/UserFavorites/styled'
type Props = { type Props = {
@ -82,6 +83,10 @@ export const Name = styled.div`
} }
` `
export const FavLink = styled(ProfileLink)`
color: inherit;
`
export const EmptySpan = styled.span`` export const EmptySpan = styled.span``
export const EmptyDiv = styled.div`` export const EmptyDiv = styled.div``

Loading…
Cancel
Save