diff --git a/packages/web/src/components/notification/Notification/ArtistRemixContestEndedNotification.tsx b/packages/web/src/components/notification/Notification/ArtistRemixContestEndedNotification.tsx
index 336ee9e8909..1eec873ec6c 100644
--- a/packages/web/src/components/notification/Notification/ArtistRemixContestEndedNotification.tsx
+++ b/packages/web/src/components/notification/Notification/ArtistRemixContestEndedNotification.tsx
@@ -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'
@@ -35,7 +34,7 @@ export const ArtistRemixContestEndedNotification = (
const handleClick = useCallback(() => {
if (track) {
- dispatch(push(fullTrackPage(track.permalink)))
+ dispatch(push(track.permalink))
}
}, [track, dispatch])
diff --git a/packages/web/src/components/notification/Notification/ArtistRemixContestEndingSoonNotification.tsx b/packages/web/src/components/notification/Notification/ArtistRemixContestEndingSoonNotification.tsx
index decca3cc637..194aabc527b 100644
--- a/packages/web/src/components/notification/Notification/ArtistRemixContestEndingSoonNotification.tsx
+++ b/packages/web/src/components/notification/Notification/ArtistRemixContestEndingSoonNotification.tsx
@@ -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'
@@ -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])
@@ -55,10 +50,7 @@ export const ArtistRemixContestEndingSoonNotification = (
{messages.description1}
-
+
{messages.description2}
diff --git a/packages/web/src/components/notification/Notification/ArtistRemixContestSubmissionsNotification.tsx b/packages/web/src/components/notification/Notification/ArtistRemixContestSubmissionsNotification.tsx
index c1c68f4339d..aceff1bf237 100644
--- a/packages/web/src/components/notification/Notification/ArtistRemixContestSubmissionsNotification.tsx
+++ b/packages/web/src/components/notification/Notification/ArtistRemixContestSubmissionsNotification.tsx
@@ -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'
@@ -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])
@@ -52,7 +47,7 @@ export const ArtistRemixContestSubmissionsNotification = ({
{messages.description}
-
+
{milestone === 1
? messages.firstSubmission
: messages.description2(milestone)}
diff --git a/packages/web/src/components/notification/Notification/FanRemixContestEndedNotification.tsx b/packages/web/src/components/notification/Notification/FanRemixContestEndedNotification.tsx
index 96d15ec994c..50bcff533b5 100644
--- a/packages/web/src/components/notification/Notification/FanRemixContestEndedNotification.tsx
+++ b/packages/web/src/components/notification/Notification/FanRemixContestEndedNotification.tsx
@@ -2,7 +2,6 @@ import { useCallback } from 'react'
import { useTrack, useUser } from '@audius/common/api'
import {
- Entity,
FanRemixContestEndedNotification as FanRemixContestEndedNotificationType,
TrackEntity
} from '@audius/common/store'
@@ -10,9 +9,7 @@ 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'
@@ -43,7 +40,7 @@ export const FanRemixContestEndedNotification = (
const handleClick = useCallback(() => {
if (track) {
- dispatch(push(fullTrackPage(track.permalink)))
+ dispatch(push(track.permalink))
}
}, [track, dispatch])
@@ -58,8 +55,7 @@ export const FanRemixContestEndedNotification = (
{' '}
- {messages.description}{' '}
-
+ {messages.description}
diff --git a/packages/web/src/components/notification/Notification/FanRemixContestEndingSoonNotification.tsx b/packages/web/src/components/notification/Notification/FanRemixContestEndingSoonNotification.tsx
index aef3421baa0..fe3329b1754 100644
--- a/packages/web/src/components/notification/Notification/FanRemixContestEndingSoonNotification.tsx
+++ b/packages/web/src/components/notification/Notification/FanRemixContestEndingSoonNotification.tsx
@@ -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'
@@ -43,7 +42,7 @@ export const FanRemixContestEndingSoonNotification = (
const handleClick = useCallback(() => {
if (track) {
- dispatch(push(fullTrackPage(track.permalink)))
+ dispatch(push(track.permalink))
}
}, [track, dispatch])
diff --git a/packages/web/src/components/notification/Notification/FanRemixContestStartedNotification.tsx b/packages/web/src/components/notification/Notification/FanRemixContestStartedNotification.tsx
index 55d6135747a..d9ed8986186 100644
--- a/packages/web/src/components/notification/Notification/FanRemixContestStartedNotification.tsx
+++ b/packages/web/src/components/notification/Notification/FanRemixContestStartedNotification.tsx
@@ -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'
@@ -42,7 +40,7 @@ export const FanRemixContestStartedNotification = (
const handleClick = useCallback(() => {
if (track) {
- dispatch(push(fullTrackPage(track.permalink)))
+ dispatch(push(track.permalink))
}
}, [track, dispatch])
@@ -57,8 +55,7 @@ export const FanRemixContestStartedNotification = (
{' '}
- {messages.description}{' '}
-
+ {messages.description}