Miscellaneous data fetching fixes for Pay and Earn page (#7493)

AudiusProject · Feb 7, 2024 · a202295 · a202295
1 parent ffd3a6f
commit a202295
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 11 deletions.
diff --git a/packages/common/src/api/purchases.ts b/packages/common/src/api/purchases.ts
@@ -76,10 +76,12 @@ const purchasesApi = createApi({
             ({ contentType }) => contentType === USDCContentPurchaseType.TRACK
           )
           .map(({ contentId }) => contentId)
-        await trackApiFetch.getTracksByIds(
-          { ids: trackIdsToFetch, currentUserId: userId },
-          context
-        )
+        if (trackIdsToFetch.length > 0) {
+          await trackApiFetch.getTracksByIds(
+            { ids: trackIdsToFetch, currentUserId: userId },
+            context
+          )
+        }
         return purchases
       },
       options: { retry: true }
@@ -135,10 +137,12 @@ const purchasesApi = createApi({
             ({ contentType }) => contentType === USDCContentPurchaseType.TRACK
           )
           .map(({ contentId }) => contentId)
-        await trackApiFetch.getTracksByIds(
-          { ids: trackIdsToFetch, currentUserId: userId },
-          context
-        )
+        if (trackIdsToFetch.length > 0) {
+          await trackApiFetch.getTracksByIds(
+            { ids: trackIdsToFetch, currentUserId: userId },
+            context
+          )
+        }
         return purchases
       },
       options: { retry: true }

diff --git a/packages/web/src/pages/pay-and-earn-page/components/PurchasesTab.tsx b/packages/web/src/pages/pay-and-earn-page/components/PurchasesTab.tsx
@@ -107,7 +107,7 @@ export const usePurchases = () => {
     {
       userId
     },
-    { force: true }
+    { disabled: !userId, force: true }
   )
 
   const status = combineStatuses([dataStatus, countStatus])

diff --git a/packages/web/src/pages/pay-and-earn-page/components/SalesTab.tsx b/packages/web/src/pages/pay-and-earn-page/components/SalesTab.tsx
@@ -105,7 +105,7 @@ export const useSales = () => {
 
   const { status: countStatus, data: count } = useGetSalesCount(
     { userId },
-    { force: true }
+    { disabled: !userId, force: true }
   )
 
   const status = combineStatuses([dataStatus, countStatus])

diff --git a/packages/web/src/pages/pay-and-earn-page/components/WithdrawalsTab.tsx b/packages/web/src/pages/pay-and-earn-page/components/WithdrawalsTab.tsx
@@ -217,7 +217,7 @@ export const useWithdrawals = () => {
       userId,
       method: full.GetUSDCTransactionsMethodEnum.Send
     },
-    { force: true }
+    { disabled: !userId, force: true }
   )
 
   const status = combineStatuses([dataStatus, countStatus])
-Original file line number
+Diff line change
@@ Expand Up / @@ -107,7 +107,7 @@ export const usePurchases = () => { @@
         {
           userId
         },
-        { force: true }
+        { disabled: !userId, force: true }
       )
       const status = combineStatuses([dataStatus, countStatus])
@@ Expand Down @@