From 6aecab7fe73d0e96a1a1473fd7ac7ab6b148c4b5 Mon Sep 17 00:00:00 2001 From: JD Francis Date: Mon, 5 May 2025 14:02:07 -0500 Subject: [PATCH 1/2] make track permalink wait for account status --- .../src/api/tan-query/tracks/useTrackByPermalink.ts | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/packages/common/src/api/tan-query/tracks/useTrackByPermalink.ts b/packages/common/src/api/tan-query/tracks/useTrackByPermalink.ts index b5496febe8c..c2159aa5410 100644 --- a/packages/common/src/api/tan-query/tracks/useTrackByPermalink.ts +++ b/packages/common/src/api/tan-query/tracks/useTrackByPermalink.ts @@ -1,11 +1,13 @@ import { OptionalId } from '@audius/sdk' import { useQuery, useQueryClient } from '@tanstack/react-query' import { pick } from 'lodash' -import { useDispatch } from 'react-redux' +import { useDispatch, useSelector } from 'react-redux' import { userTrackMetadataFromSDK } from '~/adapters/track' import { useAudiusQueryContext } from '~/audius-query' import { ID } from '~/models/Identifiers' +import { Status } from '~/models/Status' +import { getAccountStatus } from '~/store/account/selectors' import { TQTrack } from '../models' import { QUERY_KEYS } from '../queryKeys' @@ -29,6 +31,8 @@ export const useTrackByPermalink = ( const queryClient = useQueryClient() const dispatch = useDispatch() const { data: currentUserId } = useCurrentUserId() + const accountStatus = useSelector(getAccountStatus) + console.log({ accountStatus }) const simpleOptions = pick(options, [ 'enabled', @@ -58,7 +62,11 @@ export const useTrackByPermalink = ( return track?.track_id }, staleTime: simpleOptions?.staleTime ?? Infinity, - enabled: simpleOptions?.enabled !== false && !!permalink + enabled: + simpleOptions?.enabled !== false && + !!permalink && + // Need to wait for account status to load so that we're able to query with the correct user id + (accountStatus === Status.SUCCESS || accountStatus === Status.ERROR) }) return useTrack(trackId, options) From 1cdcf0dfb1810911c05c322c32b8786e8eb53d99 Mon Sep 17 00:00:00 2001 From: JD Francis Date: Mon, 5 May 2025 14:26:16 -0500 Subject: [PATCH 2/2] remove log --- packages/common/src/api/tan-query/tracks/useTrackByPermalink.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/common/src/api/tan-query/tracks/useTrackByPermalink.ts b/packages/common/src/api/tan-query/tracks/useTrackByPermalink.ts index c2159aa5410..e8aa54c3736 100644 --- a/packages/common/src/api/tan-query/tracks/useTrackByPermalink.ts +++ b/packages/common/src/api/tan-query/tracks/useTrackByPermalink.ts @@ -32,7 +32,6 @@ export const useTrackByPermalink = ( const dispatch = useDispatch() const { data: currentUserId } = useCurrentUserId() const accountStatus = useSelector(getAccountStatus) - console.log({ accountStatus }) const simpleOptions = pick(options, [ 'enabled',