Skip to content

Fix remix contest web notif links #12092

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dharit-tan merged 1 commit into from
May 9, 2025
Merged

Fix remix contest web notif links #12092

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions ...ages/web/src/components/notification/Notification/ArtistRemixContestEndedNotification.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import { Flex, IconTrophy } from '@audius/harmony'
import { useDispatch } from 'react-redux'

import { push } from 'utils/navigation'
import { fullTrackPage } from 'utils/route'

import { NotificationBody } from './components/NotificationBody'
import { NotificationFooter } from './components/NotificationFooter'
Expand Down Expand Up @@ -35,7 +34,7 @@ export const ArtistRemixContestEndedNotification = (

const handleClick = useCallback(() => {
if (track) {
dispatch(push(fullTrackPage(track.permalink)))
dispatch(push(track.permalink))
}
}, [track, dispatch])

Expand Down
16 changes: 4 additions & 12 deletions ...web/src/components/notification/Notification/ArtistRemixContestEndingSoonNotification.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,13 @@
import { useCallback } from 'react'

import { useTrack } from '@audius/common/api'
import {
Entity,
ArtistRemixContestEndingSoonNotification as ArtistRemixContestEndingSoonNotificationType,
TrackEntity
} from '@audius/common/store'
import { ArtistRemixContestEndingSoonNotification as ArtistRemixContestEndingSoonNotificationType } from '@audius/common/store'
import { Flex, IconTrophy, Text } from '@audius/harmony'
import { useDispatch } from 'react-redux'

import { TrackLink } from 'components/link'
import { push } from 'utils/navigation'
import { fullTrackPage } from 'utils/route'

import { EntityLink } from './components/EntityLink'
import { NotificationBody } from './components/NotificationBody'
import { NotificationFooter } from './components/NotificationFooter'
import { NotificationHeader } from './components/NotificationHeader'
Expand Down Expand Up @@ -40,7 +35,7 @@ export const ArtistRemixContestEndingSoonNotification = (

const handleClick = useCallback(() => {
if (track) {
dispatch(push(fullTrackPage((track as TrackEntity).permalink)))
dispatch(push(track.permalink))
}
}, [track, dispatch])

Expand All @@ -55,10 +50,7 @@ export const ArtistRemixContestEndingSoonNotification = (
<NotificationBody>
<Text variant='body' size='l'>
{messages.description1}
<EntityLink
entity={track as TrackEntity}
entityType={Entity.Track}
/>
<TrackLink size='l' trackId={track.track_id} />
{messages.description2}
</Text>
</NotificationBody>
Expand Down
13 changes: 4 additions & 9 deletions ...eb/src/components/notification/Notification/ArtistRemixContestSubmissionsNotification.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,13 @@
import { useCallback } from 'react'

import { useTrack } from '@audius/common/api'
import {
Entity,
ArtistRemixContestSubmissionsNotification as ArtistRemixContestSubmissionsNotificationType,
TrackEntity
} from '@audius/common/store'
import { ArtistRemixContestSubmissionsNotification as ArtistRemixContestSubmissionsNotificationType } from '@audius/common/store'
import { IconTrophy } from '@audius/harmony'
import { useDispatch } from 'react-redux'

import { TrackLink } from 'components/link'
import { push } from 'utils/navigation'
import { fullTrackPage } from 'utils/route'

import { EntityLink } from './components/EntityLink'
import { NotificationBody } from './components/NotificationBody'
import { NotificationFooter } from './components/NotificationFooter'
import { NotificationHeader } from './components/NotificationHeader'
Expand All @@ -39,7 +34,7 @@ export const ArtistRemixContestSubmissionsNotification = ({

const handleClick = useCallback(() => {
if (track) {
dispatch(push(fullTrackPage((track as TrackEntity).permalink)))
dispatch(push(track.permalink))
}
}, [track, dispatch])

Expand All @@ -52,7 +47,7 @@ export const ArtistRemixContestSubmissionsNotification = ({
</NotificationHeader>
<NotificationBody>
{messages.description}
<EntityLink entity={track as TrackEntity} entityType={Entity.Track} />
<TrackLink size='l' trackId={track.track_id} />
{milestone === 1
? messages.firstSubmission
: messages.description2(milestone)}
Expand Down
8 changes: 2 additions & 6 deletions packages/web/src/components/notification/Notification/FanRemixContestEndedNotification.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,14 @@ import { useCallback } from 'react'

import { useTrack, useUser } from '@audius/common/api'
import {
Entity,
FanRemixContestEndedNotification as FanRemixContestEndedNotificationType,
TrackEntity
} from '@audius/common/store'
import { Flex, IconTrophy } from '@audius/harmony'
import { useDispatch } from 'react-redux'

import { push } from 'utils/navigation'
import { fullTrackPage } from 'utils/route'

import { EntityLink } from './components/EntityLink'
import { NotificationBody } from './components/NotificationBody'
import { NotificationFooter } from './components/NotificationFooter'
import { NotificationHeader } from './components/NotificationHeader'
Expand Down Expand Up @@ -43,7 +40,7 @@ export const FanRemixContestEndedNotification = (

const handleClick = useCallback(() => {
if (track) {
dispatch(push(fullTrackPage(track.permalink)))
dispatch(push(track.permalink))
}
}, [track, dispatch])

Expand All @@ -58,8 +55,7 @@ export const FanRemixContestEndedNotification = (
<TrackContent track={track as TrackEntity} hideTitle />
<NotificationBody>
<UserNameLink user={user} notification={notification} />{' '}
{messages.description}{' '}
<EntityLink entity={track as TrackEntity} entityType={Entity.Track} />
{messages.description}
</NotificationBody>
</Flex>
<NotificationFooter timeLabel={timeLabel} isViewed={isViewed} />
Expand Down
3 changes: 1 addition & 2 deletions ...es/web/src/components/notification/Notification/FanRemixContestEndingSoonNotification.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import { Flex, IconTrophy } from '@audius/harmony'
import { useDispatch } from 'react-redux'

import { push } from 'utils/navigation'
import { fullTrackPage } from 'utils/route'

import { EntityLink } from './components/EntityLink'
import { NotificationBody } from './components/NotificationBody'
Expand Down Expand Up @@ -43,7 +42,7 @@ export const FanRemixContestEndingSoonNotification = (

const handleClick = useCallback(() => {
if (track) {
dispatch(push(fullTrackPage(track.permalink)))
dispatch(push(track.permalink))
}
}, [track, dispatch])

Expand Down
9 changes: 3 additions & 6 deletions packages/web/src/components/notification/Notification/FanRemixContestStartedNotification.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,15 @@ import { useCallback } from 'react'

import { useTrack, useUser } from '@audius/common/api'
import {
Entity,
FanRemixContestStartedNotification as FanRemixContestStartedNotificationType,
TrackEntity
} from '@audius/common/store'
import { Flex, IconTrophy } from '@audius/harmony'
import { useDispatch } from 'react-redux'

import { TrackLink } from 'components/link'
import { push } from 'utils/navigation'
import { fullTrackPage } from 'utils/route'

import { EntityLink } from './components/EntityLink'
import { NotificationBody } from './components/NotificationBody'
import { NotificationFooter } from './components/NotificationFooter'
import { NotificationHeader } from './components/NotificationHeader'
Expand Down Expand Up @@ -42,7 +40,7 @@ export const FanRemixContestStartedNotification = (

const handleClick = useCallback(() => {
if (track) {
dispatch(push(fullTrackPage(track.permalink)))
dispatch(push(track.permalink))
}
}, [track, dispatch])

Expand All @@ -57,8 +55,7 @@ export const FanRemixContestStartedNotification = (
<TrackContent track={track as TrackEntity} hideTitle />
<NotificationBody>
<UserNameLink user={user} notification={notification} />{' '}
{messages.description}{' '}
<EntityLink entity={track as TrackEntity} entityType={Entity.Track} />
{messages.description} <TrackLink size='l' trackId={track.track_id} />
</NotificationBody>
</Flex>
<NotificationFooter timeLabel={timeLabel} isViewed={isViewed} />
Expand Down