diff --git a/jam-ui/src/components/jamtracks/JKMyJamTracks.js b/jam-ui/src/components/jamtracks/JKMyJamTracks.js index d54617ba8..1f2310316 100644 --- a/jam-ui/src/components/jamtracks/JKMyJamTracks.js +++ b/jam-ui/src/components/jamtracks/JKMyJamTracks.js @@ -29,9 +29,9 @@ const JKMyJamTracks = () => { setInputValue(val); }; - useEffect(() => { - dispatch(fetchMyJamTracks()); - }, []); + // useEffect(() => { + // dispatch(fetchMyJamTracks()); + // }, []); useEffect(() => { const getMyJamTracks = setTimeout(async () => { @@ -54,7 +54,7 @@ const JKMyJamTracks = () => { useEffect(() => { if (isIntersecting) { - if (nextPage && loadingStatus !== 'loading' && nextPage !== 1) { + if (nextPage && loadingStatus !== 'loading') { const params = { page: nextPage, search: inputValue }; fetchJamTracks(params); } @@ -95,23 +95,18 @@ const JKMyJamTracks = () => {
- {loadingStatus === 'loading' ? ( -
Loading...
- ) : loadingStatus === 'failed' ? ( -
Error loading jam tracks
- ) : loadingStatus === 'succeeded' ? ( - - {jamTracks && - jamTracks.map((jamTrack, index) => ( -
(jamTracks.length - 1 === index ? setLastJamTrackRef(ref) : null)}> - - {jamTrack.name} - {jamTrack.original_artist && ` by ${jamTrack.original_artist}`} - -
- ))} -
- ) : null} + + {jamTracks && + jamTracks.map((jamTrack, index) => ( +
(jamTracks.length - 1 === index ? setLastJamTrackRef(ref) : null)}> + + {jamTrack.name} + {jamTrack.original_artist && ` by ${jamTrack.original_artist}`} + +
+ ))} +
+ {loadingStatus === 'loading' &&
Loading...
}