diff --git a/packages/mobile/src/components/lineup-tile/TrackTile.tsx b/packages/mobile/src/components/lineup-tile/TrackTile.tsx index cf017834f09..adba3b6807a 100644 --- a/packages/mobile/src/components/lineup-tile/TrackTile.tsx +++ b/packages/mobile/src/components/lineup-tile/TrackTile.tsx @@ -165,7 +165,9 @@ export const TrackTileComponent = ({ genre === Genre.PODCASTS || genre === Genre.AUDIOBOOKS const overflowActions = [ - isEditAlbumsEnabled && isOwner && !ddexApp ? OverflowAction.ADD_TO_ALBUM : null, + isEditAlbumsEnabled && isOwner && !ddexApp + ? OverflowAction.ADD_TO_ALBUM + : null, !isStreamGated ? OverflowAction.ADD_TO_PLAYLIST : null, isNewPodcastControlsEnabled && isLongFormContent ? OverflowAction.VIEW_EPISODE_PAGE @@ -196,6 +198,7 @@ export const TrackTileComponent = ({ genre, isEditAlbumsEnabled, isOwner, + ddexApp, isStreamGated, isNewPodcastControlsEnabled, albumInfo, diff --git a/packages/mobile/src/components/track-list/TrackListItem.tsx b/packages/mobile/src/components/track-list/TrackListItem.tsx index c781f985993..9b7c51d4936 100644 --- a/packages/mobile/src/components/track-list/TrackListItem.tsx +++ b/packages/mobile/src/components/track-list/TrackListItem.tsx @@ -321,7 +321,9 @@ const TrackListItemComponent = (props: TrackListItemComponentProps) => { ? OverflowAction.UNREPOST : OverflowAction.REPOST : null, - isEditAlbumsEnabled && isTrackOwner && !ddexApp ? OverflowAction.ADD_TO_ALBUM : null, + isEditAlbumsEnabled && isTrackOwner && !ddexApp + ? OverflowAction.ADD_TO_ALBUM + : null, !isStreamGated ? OverflowAction.ADD_TO_PLAYLIST : null, isNewPodcastControlsEnabled && isLongFormContent ? OverflowAction.VIEW_EPISODE_PAGE @@ -352,12 +354,13 @@ const TrackListItemComponent = (props: TrackListItemComponentProps) => { has_current_user_saved, has_current_user_reposted, isEditAlbumsEnabled, + ddexApp, isStreamGated, isNewPodcastControlsEnabled, isLongFormContent, + showViewAlbum, albumInfo, playbackPositionInfo?.status, - showViewAlbum, isContextPlaylistOwner, dispatch, track_id, diff --git a/packages/mobile/src/screens/collection-screen/CollectionScreen.tsx b/packages/mobile/src/screens/collection-screen/CollectionScreen.tsx index 94bc68cbfee..f12724268ef 100644 --- a/packages/mobile/src/screens/collection-screen/CollectionScreen.tsx +++ b/packages/mobile/src/screens/collection-screen/CollectionScreen.tsx @@ -217,6 +217,7 @@ const CollectionScreenComponent = (props: CollectionScreenComponentProps) => { is_album, isEditAlbumsEnabled, isOwner, + ddex_app, is_private, dispatch, playlist_id diff --git a/packages/mobile/src/screens/track-screen/TrackScreenDetailsTile.tsx b/packages/mobile/src/screens/track-screen/TrackScreenDetailsTile.tsx index cea902f24c7..de748d20b01 100644 --- a/packages/mobile/src/screens/track-screen/TrackScreenDetailsTile.tsx +++ b/packages/mobile/src/screens/track-screen/TrackScreenDetailsTile.tsx @@ -420,7 +420,9 @@ export const TrackScreenDetailsTile = ({ const isLongFormContent = genre === Genre.PODCASTS || genre === Genre.AUDIOBOOKS const addToAlbumAction = - isEditAlbumsEnabled && isOwner && !ddexApp ? OverflowAction.ADD_TO_ALBUM : null + isEditAlbumsEnabled && isOwner && !ddexApp + ? OverflowAction.ADD_TO_ALBUM + : null const addToPlaylistAction = !isStreamGated ? OverflowAction.ADD_TO_PLAYLIST : null diff --git a/packages/web/src/common/store/pages/audio-rewards/sagas.ts b/packages/web/src/common/store/pages/audio-rewards/sagas.ts index f97fd02585e..7daceecf5b0 100644 --- a/packages/web/src/common/store/pages/audio-rewards/sagas.ts +++ b/packages/web/src/common/store/pages/audio-rewards/sagas.ts @@ -33,7 +33,6 @@ import { } from '@audius/common/utils' import { AUDIO } from '@audius/fixed-decimal' import { ChallengeId } from '@audius/sdk' -import { reportToSentry } from 'store/errors/reportToSentry' import { call, fork, @@ -47,6 +46,7 @@ import { all } from 'typed-redux-saga' +import { reportToSentry } from 'store/errors/reportToSentry' import { isElectron } from 'utils/clientUtil' import { AUDIO_PAGE } from 'utils/route' import { waitForRead } from 'utils/sagaHelpers' diff --git a/packages/web/src/common/store/tipping/sagas.ts b/packages/web/src/common/store/tipping/sagas.ts index dbf199124b3..7d55d8009a9 100644 --- a/packages/web/src/common/store/tipping/sagas.ts +++ b/packages/web/src/common/store/tipping/sagas.ts @@ -44,6 +44,7 @@ import { removeNullable, encodeHashId } from '@audius/common/utils' +import { AUDIO } from '@audius/fixed-decimal' import { PayloadAction } from '@reduxjs/toolkit' import BN from 'bn.js' import { @@ -59,9 +60,8 @@ import { import { make } from 'common/store/analytics/actions' import { fetchUsers } from 'common/store/cache/users/sagas' -import { waitForWrite, waitForRead } from 'utils/sagaHelpers' -import { AUDIO } from '@audius/fixed-decimal' import { reportToSentry } from 'store/errors/reportToSentry' +import { waitForWrite, waitForRead } from 'utils/sagaHelpers' const { decreaseBalance, getBalance } = walletActions const { getFeePayer } = solanaSelectors diff --git a/packages/web/src/common/store/ui/reactions/sagas.ts b/packages/web/src/common/store/ui/reactions/sagas.ts index 1e5630f3d76..8ea0b06a329 100644 --- a/packages/web/src/common/store/ui/reactions/sagas.ts +++ b/packages/web/src/common/store/ui/reactions/sagas.ts @@ -15,6 +15,7 @@ import { } from '@audius/common/utils' import { AudiusSdk } from '@audius/sdk' import { call, takeEvery, all, put, select } from 'typed-redux-saga' + import { waitForWrite } from 'utils/sagaHelpers' const { getUserId } = accountSelectors diff --git a/packages/web/src/components/actions-tab/ActionsTab.jsx b/packages/web/src/components/actions-tab/ActionsTab.jsx index 25248b01b7d..d8bc7e8601e 100644 --- a/packages/web/src/components/actions-tab/ActionsTab.jsx +++ b/packages/web/src/components/actions-tab/ActionsTab.jsx @@ -206,7 +206,7 @@ export class ActionsTab extends PureComponent { mount: 'page', isOwner: handle === userHandle, isArtistPick, - ddexApp, + ddexApp } } if (variant === 'track') { @@ -268,10 +268,7 @@ ActionsTab.propTypes = { trackTitle: PropTypes.string, trackId: PropTypes.number, playlistName: PropTypes.string, - ddexApp: PropTypes.oneOfType([ - PropTypes.string, - PropTypes.oneOf([null]) - ]), + ddexApp: PropTypes.oneOfType([PropTypes.string, PropTypes.oneOf([null])]), playlistId: PropTypes.number, permalink: PropTypes.string } diff --git a/packages/web/src/components/collection/desktop/OwnerActionButtons.tsx b/packages/web/src/components/collection/desktop/OwnerActionButtons.tsx index 53209a0e090..342f2f45aad 100644 --- a/packages/web/src/components/collection/desktop/OwnerActionButtons.tsx +++ b/packages/web/src/components/collection/desktop/OwnerActionButtons.tsx @@ -25,10 +25,12 @@ export const OwnerActionButtons = (props: OwnerActionButtonProps) => { return collection ? ( <> - {!ddex_app && } + {!ddex_app && ( + + )} { const dispatch = useDispatch() const { isSsrEnabled } = useSsrContext() diff --git a/packages/web/src/components/track/mobile/ConnectedTrackListItem.tsx b/packages/web/src/components/track/mobile/ConnectedTrackListItem.tsx index a5110b954f2..a787fdb7a58 100644 --- a/packages/web/src/components/track/mobile/ConnectedTrackListItem.tsx +++ b/packages/web/src/components/track/mobile/ConnectedTrackListItem.tsx @@ -50,7 +50,9 @@ const ConnectedTrackListItem = (props: ConnectedTrackListItemProps) => { : props.isSaved ? OverflowAction.UNFAVORITE : OverflowAction.FAVORITE, - isEditAlbumsEnabled && props.user?.user_id === props.currentUserId && !props.ddexApp + isEditAlbumsEnabled && + props.user?.user_id === props.currentUserId && + !props.ddexApp ? OverflowAction.ADD_TO_ALBUM : null, !props.isStreamGated ? OverflowAction.ADD_TO_PLAYLIST : null,