Skip to content

Commit cd2c390

Browse files
committed
feat: enhance ConferencesItem and ConferencesCard components with improved date handling and subtitle display
1 parent cd269f4 commit cd2c390

2 files changed

Lines changed: 12 additions & 4 deletions

File tree

src/features/cards/components/conferencesCard/ConferenceItem.tsx

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,10 @@ const ConferencesItem = ({ item, index, analyticsTag }: BaseItemPropsType<Confer
8383
[Attributes.LINK]: item.url,
8484
[Attributes.SOURCE]: analyticsTag,
8585
}}>
86-
<span className="rowTitleIcon">{conferenceLocation?.icon}</span>
87-
{item.title}
86+
<div className="subTitle">
87+
{differenceInDays < 0 && <span className="blockHeaderBadge past">Ended</span>}{' '}
88+
<span className="rowTitleIcon">{conferenceLocation?.icon}</span> {item.title}
89+
</div>
8890
</CardLink>
8991
{listingMode === 'normal' ? (
9092
<>
@@ -98,7 +100,7 @@ const ConferencesItem = ({ item, index, analyticsTag }: BaseItemPropsType<Confer
98100
? `In ${differenceInDays} days, ${conferenceDate}`
99101
: differenceInDays === 0
100102
? `Ongoing, ${conferenceDate}`
101-
: `${conferenceDate} (ended)`}
103+
: `${conferenceDate}`}
102104
</span>
103105
</div>
104106
<div className="rowDetails">

src/features/cards/components/conferencesCard/ConferencesCard.tsx

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { useMemo } from 'react'
12
import { Card } from 'src/components/Elements'
23
import { ListConferenceComponent } from 'src/components/List/ListConferenceComponent'
34
import { useUserPreferences } from 'src/stores/preferences'
@@ -10,8 +11,13 @@ export function ConferencesCard(props: CardPropsType) {
1011
const { meta } = props
1112
const cardSettings = useUserPreferences((state) => state.cardsSettings?.[meta.value])
1213
const { userSelectedTags } = useUserPreferences()
14+
15+
const selectedTag = useMemo(() => {
16+
return userSelectedTags.find((lang) => lang.value === cardSettings?.language)
17+
}, [userSelectedTags, cardSettings])
18+
1319
const { isLoading, data: results } = useGetConferences({
14-
tags: userSelectedTags.map((tag) => tag.value),
20+
tags: selectedTag ? [selectedTag.value] : userSelectedTags.map((tag) => tag.value),
1521
})
1622

1723
const renderItem = (item: Conference, index: number) => (

0 commit comments

Comments
 (0)