diff --git a/packages/mobile/src/screens/explore-screen/components/ExploreContent.tsx b/packages/mobile/src/screens/explore-screen/components/ExploreContent.tsx index 516fb1942d7..0c3111b4f42 100644 --- a/packages/mobile/src/screens/explore-screen/components/ExploreContent.tsx +++ b/packages/mobile/src/screens/explore-screen/components/ExploreContent.tsx @@ -21,9 +21,10 @@ export const ExploreContent = () => { useCurrentUserId() const showUserContextualContent = isCurrentUserIdLoading || !!currentUserId - const showTrackContent = category === 'tracks' || category === 'all' - const showPlaylistContent = category === 'playlists' || category === 'all' - const showUserContent = category === 'users' || category === 'all' + const isAllTab = category === 'all' + const showTrackContent = category === 'tracks' + const showPlaylistContent = category === 'playlists' + const showUserContent = category === 'users' return ( @@ -37,7 +38,7 @@ export const ExploreContent = () => { {showUserContent && } {showUserContent && } {showTrackContent && showUserContextualContent && } - {showUserContextualContent && } + {!isAllTab && showUserContextualContent && } ) } diff --git a/packages/web/src/pages/search-explore-page/components/desktop/SearchExplorePage.tsx b/packages/web/src/pages/search-explore-page/components/desktop/SearchExplorePage.tsx index ced12b14709..9ae0fd4c56c 100644 --- a/packages/web/src/pages/search-explore-page/components/desktop/SearchExplorePage.tsx +++ b/packages/web/src/pages/search-explore-page/components/desktop/SearchExplorePage.tsx @@ -195,12 +195,10 @@ const SearchExplorePage = ({ }, []) const showUserContextualContent = isCurrentUserIdLoading || !!currentUserId - const showTrackContent = - categoryKey === CategoryView.TRACKS || categoryKey === CategoryView.ALL - const showPlaylistContent = - categoryKey === CategoryView.PLAYLISTS || categoryKey === CategoryView.ALL - const showUserContent = - categoryKey === CategoryView.PROFILES || categoryKey === CategoryView.ALL + const isAllTab = categoryKey === CategoryView.ALL + const showTrackContent = categoryKey === CategoryView.TRACKS + const showPlaylistContent = categoryKey === CategoryView.PLAYLISTS + const showUserContent = categoryKey === CategoryView.PROFILES const isTracksTab = categoryKey === CategoryView.TRACKS const isPlaylistsTab = categoryKey === CategoryView.PLAYLISTS const isAlbumsTab = categoryKey === CategoryView.ALBUMS @@ -328,9 +326,7 @@ const SearchExplorePage = ({ ) : null} {showPlaylistContent ? : null} - {categoryKey === CategoryView.ALL ? ( - - ) : null} + {showUserContent ? : null} {showTrackContent ? : null} {isTracksTab ? : null} {showUserContent ? : null} @@ -339,7 +335,9 @@ const SearchExplorePage = ({ {showTrackContent && showUserContextualContent ? ( ) : null} - {showUserContextualContent ? : null} + {!isAllTab && showUserContextualContent ? ( + + ) : null} diff --git a/packages/web/src/pages/search-explore-page/components/mobile/SearchExplorePage.tsx b/packages/web/src/pages/search-explore-page/components/mobile/SearchExplorePage.tsx index 7c9c4410488..925688c4a80 100644 --- a/packages/web/src/pages/search-explore-page/components/mobile/SearchExplorePage.tsx +++ b/packages/web/src/pages/search-explore-page/components/mobile/SearchExplorePage.tsx @@ -173,12 +173,10 @@ const SearchExplorePage = ({ }, [setCenter, setRight]) const showUserContextualContent = isCurrentUserIdLoading || !!currentUserId - const showTrackContent = - categoryKey === CategoryView.TRACKS || categoryKey === CategoryView.ALL - const showPlaylistContent = - categoryKey === CategoryView.PLAYLISTS || categoryKey === CategoryView.ALL - const showUserContent = - categoryKey === CategoryView.PROFILES || categoryKey === CategoryView.ALL + const isAllTab = categoryKey === CategoryView.ALL + const showTrackContent = categoryKey === CategoryView.TRACKS + const showPlaylistContent = categoryKey === CategoryView.PLAYLISTS + const showUserContent = categoryKey === CategoryView.PROFILES const isTracksTab = categoryKey === CategoryView.TRACKS const isPlaylistsTab = categoryKey === CategoryView.PLAYLISTS const isAlbumsTab = categoryKey === CategoryView.ALBUMS @@ -254,7 +252,7 @@ const SearchExplorePage = ({ ) : null} {showPlaylistContent ? : null} - {categoryKey === CategoryView.ALL ? : null} + {showUserContent ? : null} {showTrackContent ? : null} {isTracksTab ? : null} {showUserContent ? : null} @@ -263,7 +261,9 @@ const SearchExplorePage = ({ {showTrackContent && showUserContextualContent ? ( ) : null} - {showUserContextualContent ? : null} + {!isAllTab && showUserContextualContent ? ( + + ) : null}