Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 1 addition & 24 deletions packages/mobile/src/screens/track-screen/DownloadSection.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,7 @@ import { useCallback, useState } from 'react'

import {
useCurrentStems,
useDownloadableContentAccess,
useGatedContentAccess
useDownloadableContentAccess
} from '@audius/common/hooks'
import type { ID } from '@audius/common/models'
import { DownloadQuality, ModalSource } from '@audius/common/models'
Expand DownExpand Up@@ -47,7 +46,6 @@ const messages = {
choose: 'Choose File Quality',
mp3: 'MP3',
lossless: 'Lossless',
downloadAll: 'Download All',
unlockAll: (price: string) => `Unlock All $${price}`,
purchased: 'purchased',
followToDownload: 'Must follow artist to download.',
Expand All@@ -67,10 +65,6 @@ export const DownloadSection = ({ trackId }: { trackId: ID }) => {
getTrack(state, { id: trackId })
)
const { stemTracks } = useCurrentStems({ trackId })
const { hasDownloadAccess } = useGatedContentAccess(track)
const shouldDisplayDownloadAll =
(track?.is_downloadable ? 1 : 0) + stemTracks.length > 1 &&
hasDownloadAccess
const {
price,
shouldDisplayPremiumDownloadLocked,
Expand DownExpand Up@@ -262,23 +256,6 @@ export const DownloadSection = ({ trackId }: { trackId: ID }) => {
isOriginal={quality === DownloadQuality.ORIGINAL}
/>
))}
{shouldDisplayDownloadAll ? (
<Flex p='l' borderTop='default' justifyContent='center'>
<Button
variant='secondary'
iconLeft={IconReceive}
size='small'
onPress={() =>
handleDownload({
trackIds: stemTracks.map((t) => t.id),
parentTrackId: trackId
})
}
>
{messages.downloadAll}
</Button>
</Flex>
) : null}
</Expandable>
</Flex>
)
Expand Down
31 changes: 0 additions & 31 deletions packages/web/src/components/track/DownloadSection.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,6 @@ import {
useCurrentStems,
useFileSizes,
useDownloadableContentAccess,
useGatedContentAccess,
useUploadingStems
} from '@audius/common/hooks'
import {
Expand DownExpand Up@@ -55,7 +54,6 @@ const STEM_INDEX_OFFSET_WITH_ORIGINAL_TRACK = 2

const messages = {
title: 'Stems & Downloads',
downloadAll: 'Download All',
unlockAll: (price: string) => `Unlock All $${price}`,
purchased: 'purchased',
followToDownload: 'Must follow artist to download.',
Expand All@@ -76,7 +74,6 @@ export const DownloadSection = ({ trackId }: DownloadSectionProps) => {
shallowEqual
)
const { stemTracks } = useCurrentStems({ trackId })
const { hasDownloadAccess } = useGatedContentAccess(track)
const { uploadingTracks: uploadingStems } = useUploadingStems({ trackId })
const {
price,
Expand All@@ -86,10 +83,6 @@ export const DownloadSection = ({ trackId }: DownloadSectionProps) => {
shouldDisplayOwnerPremiumDownloads
} = useDownloadableContentAccess({ trackId })

const shouldDisplayDownloadAll =
(track?.is_downloadable ? 1 : 0) + stemTracks.length > 1 &&
hasDownloadAccess

const downloadQuality = DownloadQuality.ORIGINAL
const shouldHideDownload =
!track?.access.download && !shouldDisplayDownloadFollowGated
Expand DownExpand Up@@ -166,25 +159,6 @@ export const DownloadSection = ({ trackId }: DownloadSectionProps) => {
]
)

const downloadAllButton = () => (
<Button
variant='secondary'
size='small'
iconLeft={IconReceive}
onClick={() =>
handleDownload({
trackIds: stemTracks.map((s) => s.id),
parentTrackId: trackId
})
}
disabled={
shouldDisplayDownloadFollowGated || shouldDisplayPremiumDownloadLocked
}
>
{messages.downloadAll}
</Button>
)

return (
<Box border='default' borderRadius='m' css={{ overflow: 'hidden' }}>
<Flex direction='column'>
Expand DownExpand Up@@ -313,11 +287,6 @@ export const DownloadSection = ({ trackId }: DownloadSectionProps) => {
isLoading
/>
))}
{shouldDisplayDownloadAll || isMobile ? (
<Flex borderTop='default' p='l' justifyContent='center'>
{downloadAllButton()}
</Flex>
) : null}
</Box>
</Expandable>
</Flex>
Expand Down