AudiusProject · dylanjeffers · Jun 25, 2025 · Jun 25, 2025 · Jun 25, 2025 · Jun 25, 2025
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/common/src/store/ui/buy-sell/useBuySellSwap.ts b/packages/common/src/store/ui/buy-sell/useBuySellSwap.ts
@@ -78,6 +78,7 @@ export const useBuySellSwap = (props: UseBuySellSwapProps) => {
  clearTimeout(retryTimeoutRef.current)
  }
 
+ // @ts-ignore - weird mobile type issue
  retryTimeoutRef.current = setTimeout(() => {
  invalidateBalances()
  performSwap()

diff --git a/packages/mobile/src/components/lineup-tile/CollectionTile.tsx b/packages/mobile/src/components/lineup-tile/CollectionTile.tsx
@@ -1,6 +1,7 @@
 import { useCallback, useMemo } from 'react'
 
 import { useCollection, useCurrentUserId, useUser } from '@audius/common/api'
+import { useGatedCollectionAccess } from '@audius/common/hooks'
 import {
  ShareSource,
  RepostSource,
@@ -90,6 +91,8 @@ export const CollectionTile = (props: CollectionTileProps) => {
  })
  })
 
+ const { hasStreamAccess } = useGatedCollectionAccess(id)
+
  const currentTrack = useSelector((state: CommonState) => {
  const uid = getUid(state)
  return tracks.find((track) => track.uid === uid) ?? null
@@ -270,7 +273,7 @@ export const CollectionTile = (props: CollectionTileProps) => {
  collection.is_album ? PurchaseableContentType.ALBUM : undefined
  }
  streamConditions={collection.stream_conditions}
- hasStreamAccess={true} // This should be determined by the hook
+ hasStreamAccess={hasStreamAccess}
  source={source}
  onPressOverflow={handlePressOverflow}
  onPressRepost={handlePressRepost}

diff --git a/packages/mobile/src/components/lineup-tile/TrackTile.tsx b/packages/mobile/src/components/lineup-tile/TrackTile.tsx
@@ -6,6 +6,7 @@ import {
  useTrack,
  useUser
 } from '@audius/common/api'
+import { useGatedTrackAccess } from '@audius/common/hooks'
 import {
  ShareSource,
  RepostSource,
@@ -67,6 +68,7 @@ export const TrackTile = (props: TrackTileProps) => {
  duration: track.duration,
  field_visibility: track.field_visibility,
  has_current_user_reposted: track.has_current_user_reposted,
+ has_current_user_saved: track.has_current_user_saved,
  title: track.title,
  track_id: track.track_id,
  genre: track.genre,
@@ -88,6 +90,8 @@ export const TrackTile = (props: TrackTileProps) => {
  })
  })
 
+ const { hasStreamAccess } = useGatedTrackAccess(id)
+
  const isPlayingUid = useSelector(
  (state: CommonState) => getUid(state) === lineupTileProps.uid
  )
@@ -261,15 +265,15 @@ export const TrackTile = (props: TrackTileProps) => {
  {isReadonly ? null : (
  <LineupTileActionButtons
  hasReposted={track.has_current_user_reposted}
- hasSaved={false} // This will be handled by the hook
+ hasSaved={track.has_current_user_saved}
  isOwner={isOwner}
  isShareHidden={hideShare}
  isUnlisted={track.is_unlisted}
  readonly={isReadonly}
  contentId={track.track_id}
  contentType={PurchaseableContentType.TRACK}
  streamConditions={track.stream_conditions}
- hasStreamAccess={true} // This should be determined by the hook
+ hasStreamAccess={hasStreamAccess}
  source={lineupTileProps.source}
  onPressOverflow={handlePressOverflow}
  onPressRepost={handlePressRepost}

diff --git a/packages/mobile/src/screens/app-screen/FavoritesTabScreen.tsx b/packages/mobile/src/screens/app-screen/FavoritesTabScreen.tsx
@@ -1,4 +1,4 @@
-import { FavoritesScreen } from 'app/screens/library-screen'
+import { LibraryScreen } from 'app/screens/library-screen'
 
 import type { AppTabScreenParamList } from './AppTabScreen'
 import { createAppTabScreenStack } from './createAppTabScreenStack'
@@ -11,6 +11,6 @@ export type FavoritesTabScreenParamList = AppTabScreenParamList & {
 export const FavoritesTabScreen =
  createAppTabScreenStack<FavoritesTabScreenParamList>((Stack) => (
  <>
- <Stack.Screen name='Library' component={FavoritesScreen} />
+ <Stack.Screen name='Library' component={LibraryScreen} />
  </>
  ))
diff --git a/packages/mobile/src/screens/library-screen/LibraryCategorySelectionMenu.tsx b/packages/mobile/src/screens/library-screen/LibraryCategorySelectionMenu.tsx
@@ -1,4 +1,4 @@
-import { useCallback } from 'react'
+import { useCallback, useEffect } from 'react'
 
 import type { LibraryCategoryType } from '@audius/common/store'
 import {
@@ -50,11 +50,12 @@ const ALL_CATEGORIES = [
 
 const CATEGORIES_WITHOUT_PURCHASED = ALL_CATEGORIES.slice(0, -1)
 
-type LibraryTabRouteName = 'albums' | 'tracks' | 'playlists'
+type LibraryTabRouteName = 'Albums' | 'Tracks' | 'Playlists'
+
 const ROUTE_NAME_TO_TAB = {
-albums: LibraryPageTabs.ALBUMS,
-tracks: LibraryPageTabs.TRACKS,
-playlists: LibraryPageTabs.PLAYLISTS
+Albums: LibraryPageTabs.ALBUMS,
+Tracks: LibraryPageTabs.TRACKS,
+Playlists: LibraryPageTabs.PLAYLISTS
 } as Record<LibraryTabRouteName, LibraryPageTabs>
 
 export const LibraryCategorySelectionMenu = () => {
@@ -80,7 +81,10 @@ export const LibraryCategorySelectionMenu = () => {
  return LibraryPageTabs.TRACKS
  }
 
- return ROUTE_NAME_TO_TAB[routeName] || LibraryPageTabs.TRACKS
+ return (
+ ROUTE_NAME_TO_TAB[routeName as LibraryTabRouteName] ||
+ LibraryPageTabs.TRACKS
+ )
  }) as LibraryPageTabs
 
  const selectedCategory = useSelector((state) =>
@@ -89,6 +93,27 @@ export const LibraryCategorySelectionMenu = () => {
  })
  )
 
+ const isUSDCPurchasesEnabled = useIsUSDCEnabled()
+ const categories =
+ isUSDCPurchasesEnabled &&
+ (currentTab === LibraryPageTabs.TRACKS ||
+ currentTab === LibraryPageTabs.ALBUMS)
+ ? ALL_CATEGORIES
+ : CATEGORIES_WITHOUT_PURCHASED
+
+ // Auto-switch to "All" if the selected category is not available for the current tab
+ useEffect(() => {
+ const availableCategoryValues = categories.map((category) => category.value)
+ if (!availableCategoryValues.includes(selectedCategory)) {
+ dispatch(
+ setSelectedCategory({
+ currentTab,
+ category: LibraryCategory.All
+ })
+ )
+ }
+ }, [currentTab, selectedCategory, categories, dispatch])
+
  const handleChange = useCallback(
  (category: string) => {
  dispatch(
@@ -101,14 +126,6 @@ export const LibraryCategorySelectionMenu = () => {
  [currentTab, dispatch]
  )
 
- const isUSDCPurchasesEnabled = useIsUSDCEnabled()
- const categories =
- isUSDCPurchasesEnabled &&
- (currentTab === LibraryPageTabs.TRACKS ||
- currentTab === LibraryPageTabs.ALBUMS)
- ? ALL_CATEGORIES
- : CATEGORIES_WITHOUT_PURCHASED
-
  return (
  <View style={styles.container}>
  <ScrollView

diff --git a/...brary-screen/FavoritesDownloadSection.tsx → ...library-screen/LibraryDownloadSection.tsx b/...brary-screen/FavoritesDownloadSection.tsx → ...library-screen/LibraryDownloadSection.tsx
@@ -10,7 +10,7 @@ import { getCollectionDownloadStatus } from 'app/store/offline-downloads/selecto
 import { makeStyles } from 'app/styles'
 
 import { DownloadProgress } from './DownloadProgress'
-import { FavoritesDownloadStatusIndicator } from './FavoritesDownloadStatusIndicator'
+import { LibraryDownloadStatusIndicator } from './LibraryDownloadStatusIndicator'
 
 const useStyles = makeStyles(() => ({
  root: { flexDirection: 'row', alignItems: 'center' }
@@ -38,12 +38,12 @@ const OfflineListeningIndicatorButton = () => {
 
  return (
  <TouchableOpacity onPress={handlePressStatusIndicator}>
- <FavoritesDownloadStatusIndicator switchValue={switchValue} />
+ <LibraryDownloadStatusIndicator switchValue={switchValue} />
  </TouchableOpacity>
  )
 }
 
-export const FavoritesDownloadSection = () => {
+export const LibraryDownloadSection = () => {
  const styles = useStyles()
 
  return (

diff --git a/...reen/FavoritesDownloadStatusIndicator.tsx → ...screen/LibraryDownloadStatusIndicator.tsx b/...reen/FavoritesDownloadStatusIndicator.tsx → ...screen/LibraryDownloadStatusIndicator.tsx
@@ -12,7 +12,7 @@ const useStyles = makeStyles(({ spacing }) => ({
  }
 }))
 
-const getFavoritesDownloadStatus = (state: AppState) => {
+const getLibraryDownloadStatus = (state: AppState) => {
  const { collectionStatus } = state.offlineDownloads
  const favoritedCollectionStatus = collectionStatus[DOWNLOAD_REASON_FAVORITES]
 
@@ -38,16 +38,16 @@ const getFavoritesDownloadStatus = (state: AppState) => {
  return OfflineDownloadStatus.SUCCESS
 }
 
-type FavoritesDownloadStatusIndicatorProps = {
+type LibraryDownloadStatusIndicatorProps = {
  switchValue: boolean
 }
 
-export const FavoritesDownloadStatusIndicator = (
- props: FavoritesDownloadStatusIndicatorProps
+export const LibraryDownloadStatusIndicator = (
+ props: LibraryDownloadStatusIndicatorProps
 ) => {
  const { switchValue } = props
  const styles = useStyles()
- const downloadStatus = useProxySelector(getFavoritesDownloadStatus, [])
+ const downloadStatus = useProxySelector(getLibraryDownloadStatus, [])
 
  return (
  <DownloadStatusIndicator

diff --git a/...creens/library-screen/FavoritesScreen.tsx → .../screens/library-screen/LibraryScreen.tsx b/...creens/library-screen/FavoritesScreen.tsx → .../screens/library-screen/LibraryScreen.tsx
@@ -14,16 +14,16 @@ import { useAppTabScreen } from 'app/hooks/useAppTabScreen'
 import { makeStyles } from 'app/styles'
 
 import { AlbumsTab } from './AlbumsTab'
-import { FavoritesDownloadSection } from './FavoritesDownloadSection'
 import { LibraryCategorySelectionMenu } from './LibraryCategorySelectionMenu'
+import { LibraryDownloadSection } from './LibraryDownloadSection'
 import { PlaylistsTab } from './PlaylistsTab'
 import { TracksTab } from './TracksTab'
 
 const messages = {
  header: 'Library'
 }
 
-const favoritesScreens = [
+const libraryScreens = [
  {
  name: LibraryPageTabs.TRACKS,
  Icon: IconNote,
@@ -49,7 +49,7 @@ const useHeaderStyles = makeStyles(({ spacing }) => ({
  }
 }))
 
-export const FavoritesScreen = () => {
+export const LibraryScreen = () => {
  useAppTabScreen()
  const headerStyles = useHeaderStyles()
 
@@ -61,14 +61,14 @@ export const FavoritesScreen = () => {
  icon={IconLibrary}
  styles={headerStyles}
  >
- <FavoritesDownloadSection />
+ <LibraryDownloadSection />
  <LibraryCategorySelectionMenu />
  </ScreenHeader>
  </ScreenPrimaryContent>
  <ScreenContent isOfflineCapable>
  <ScreenSecondaryContent>
  <TopTabNavigator
- screens={favoritesScreens}
+ screens={libraryScreens}
  screenOptions={{ lazy: true }}
  />
  </ScreenSecondaryContent>

diff --git a/packages/mobile/src/screens/library-screen/index.ts b/packages/mobile/src/screens/library-screen/index.ts
@@ -1 +1 @@
-export * from './FavoritesScreen'
+export * from './LibraryScreen'
diff --git a/packages/mobile/src/screens/library-screen/useLibraryCollections.ts b/packages/mobile/src/screens/library-screen/useLibraryCollections.ts
@@ -8,7 +8,6 @@ import {
 import { Status } from '@audius/common/models'
 import {
  libraryPageSelectors,
- LibraryPageTabs,
  reachabilitySelectors
 } from '@audius/common/store'
 import type { CommonState, CollectionType } from '@audius/common/store'
@@ -25,7 +24,7 @@ import { OfflineDownloadStatus } from 'app/store/offline-downloads/slice'
 
 const { getIsReachable } = reachabilitySelectors
 const {
-getCategory,
+getCollectionsCategory,
  getSelectedCategoryLocalAlbumAdds,
  getSelectedCategoryLocalAlbumRemovals,
  getSelectedCategoryLocalPlaylistAdds,
@@ -43,14 +42,7 @@ export const useLibraryCollections = ({
 }: UseLibraryCollectionsConfig) => {
  const isDoneLoadingFromDisk = useSelector(getIsDoneLoadingFromDisk)
  const isReachable = useSelector(getIsReachable)
- const selectedCategory = useSelector((state) =>
- getCategory(state, {
- currentTab:
- collectionType === 'albums'
- ? LibraryPageTabs.ALBUMS
- : LibraryPageTabs.PLAYLISTS
- })
- )
+ const selectedCategory = useSelector(getCollectionsCategory)
 
  const locallyAddedCollectionIds = useSelector((state: CommonState) => {
  const ids =
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		export * from './FavoritesScreen'
		export * from './LibraryScreen'