fix more by artist lineup (#1921)

Co-authored-by: Nikki Kang <kangaroo233@gmail.com>
AudiusProject · Sep 14, 2022 · 5a496fa · 5a496fa
1 parent 7a95b3f
commit 5a496fa
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/packages/common/src/store/pages/track/reducer.ts b/packages/common/src/store/pages/track/reducer.ts
@@ -60,7 +60,8 @@ const actionsMap = {
   [RESET](state, action) {
     return {
       ...state,
-      ...initialState
+      ...initialState,
+      tracks: tracksLineupReducer(undefined, action)
     }
   }
 }

diff --git a/packages/mobile/src/screens/track-screen/TrackScreen.tsx b/packages/mobile/src/screens/track-screen/TrackScreen.tsx
@@ -17,7 +17,7 @@ import { useRoute } from 'app/hooks/useRoute'
 import { makeStyles } from 'app/styles'
 
 import { TrackScreenMainContent } from './TrackScreenMainContent'
-const { fetchTrack } = trackPageActions
+const { fetchTrack, resetTrackPage } = trackPageActions
 const { tracksActions } = trackPageLineupActions
 const { getLineup, getRemixParentTrack, getTrack, getUser } = trackPageSelectors
 const { makeGetLineupMetadatas } = lineupSelectors
@@ -58,10 +58,6 @@ export const TrackScreen = () => {
   // params is incorrectly typed and can sometimes be undefined
   const { searchTrack, id } = params ?? {}
 
-  useEffect(() => {
-    dispatch(fetchTrack(id, undefined, undefined, true))
-  }, [dispatch, id])
-
   const cachedTrack = useSelector((state) => getTrack(state, params))
 
   const track = cachedTrack ?? searchTrack
@@ -74,6 +70,14 @@ export const TrackScreen = () => {
 
   const lineup = useSelector(getMoreByArtistLineup)
   const remixParentTrack = useSelector(getRemixParentTrack)
+  const trackUserExists = user != null
+  useEffect(() => {
+    dispatch(fetchTrack(id, undefined, user?.handle, true))
+    return () => {
+      dispatch(resetTrackPage())
+      dispatch(tracksActions.reset())
+    }
+  }, [dispatch, id, trackUserExists, user?.handle])
 
   if (!track || !user) {
     console.warn(

diff --git a/packages/web/src/common/store/pages/track/sagas.js b/packages/web/src/common/store/pages/track/sagas.js
@@ -136,7 +136,6 @@ function* getRestOfLineup(permalink, ownerHandle) {
 function* watchFetchTrack() {
   yield takeEvery(trackPageActions.FETCH_TRACK, function* (action) {
     const { trackId, handle, slug, canBeUnlisted } = action
-    const permalink = `/${handle}/${slug}`
     try {
       let track
       if (!trackId) {
@@ -171,7 +170,11 @@ function* watchFetchTrack() {
         // Add hero track to lineup early so that we can play it ASAP
         // (instead of waiting for the entire lineup to load)
         yield call(addTrackToLineup, track)
-        yield fork(getRestOfLineup, permalink, handle)
+        yield fork(
+          getRestOfLineup,
+          track.permalink,
+          handle || track.permalink.split('/')?.[1]
+        )
         yield fork(getTrackRanks, track.track_id)
         yield put(trackPageActions.fetchTrackSucceeded(track.track_id))
       }