feat: bail on fetching zapper /apps/balances when accountIds are empty (

#6823)
shapeshift · May 6, 2024 · 898f274 · 898f274
1 parent a404f13
commit 898f274
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/components/StakingVaults/hooks/useFetchOpportunities.tsx b/src/components/StakingVaults/hooks/useFetchOpportunities.tsx
@@ -23,7 +23,12 @@ export const useFetchOpportunities = () => {
   const portfolioAccounts = useSelector(selectPortfolioAccounts)
   const DynamicLpAssets = useFeatureFlag('DynamicLpAssets')
 
-  const { isLoading: isZapperAppsBalancesOutputLoading } = useGetZapperAppsBalancesOutputQuery()
+  const { isLoading: isZapperAppsBalancesOutputLoading } = useGetZapperAppsBalancesOutputQuery(
+    undefined,
+    {
+      skip: !requestedAccountIds.length,
+    },
+  )
   const { isLoading: isZapperUniV2PoolAssetIdsLoading } = useGetZapperUniV2PoolAssetIdsQuery(
     undefined,
     { skip: !DynamicLpAssets },

diff --git a/src/state/apis/zapper/zapperApi.ts b/src/state/apis/zapper/zapperApi.ts
@@ -330,6 +330,8 @@ export const zapper = createApi({
 
         const accountIds = selectWalletAccountIds(state)
 
+        if (!accountIds.length) throw new Error('Not ready')
+
         const assets = selectAssets(state)
         const evmNetworks = evmChainIds.map(chainIdToZapperNetwork).filter(isSome)