fix: user pool balances not loading correctly #1763

0xAlunara · 2025-12-12T18:31:33Z

Depends on #1757

The Zustand rot is real; like 80% of this PR is just me passing a wagmi config to all the imperative Zustand functions, just to be able to use the imperative versions of the new wagmi native token balance hooks.

Please don't judge too hardly about that plumbing, the main focus should be on:

token-balance.query.ts
usePoolTokenDepositBalances.ts
usePoolTokenBalances.ts

The harsh reality here is that there's no automated tests for now, so all we can do is test manually 😭

…-balance.query

vercel · 2025-12-12T18:31:36Z

The latest updates on your projects. Learn more about Vercel for GitHub.

Project	Deployment	Preview	Comments	Updated (UTC)
curve-dapp	Ready	Preview	Comment	Dec 12, 2025 7:02pm
curve-dapp-storybook	Ready	Preview	Comment	Dec 12, 2025 7:02pm

0xAlunara · 2025-12-12T19:03:30Z

packages/curve-ui-kit/src/queries/token-balance.query.ts

+}
+
+/** Hook to fetch balances for multiple tokens */
+export function useTokenBalances(


I let Claude vibe code this by looking at useTokenUsdRates from token-usd-rates.ts 🙈

0xAlunara · 2025-12-12T19:04:44Z

packages/curve-ui-kit/src/queries/token-balance.query.ts

-export function useTokenBalance({ chainId, userAddress, tokenAddress }: FieldsOf<TokenBalanceQuery>) {
+export function useTokenBalance(
+  { chainId, userAddress, tokenAddress }: FieldsOf<TokenBalanceQuery>,
+  enabled: boolean = true,


I know we normally use validation suites rather than enabled, but not using queryFactory (because of wagmi) makes it a big more complex and I wanted to know if my refactor was working at all. So I opted for this (anti?)-pattern that we've used for some other hooks as well.

disabling a query is fine, but IMO we can also add a validation suite here such that enabled=enabled&&valid

0xAlunara · 2025-12-12T19:05:17Z

apps/main/src/dex/store/createUserSlice.ts

        get()[sliceKey].setStateByActiveKey('userShare', userPoolActiveKey, userShare)
        get()[sliceKey].setStateByActiveKey('userLiquidityUsd', userPoolActiveKey, liquidityUsd)
-
-        return fetchedWalletBalances


Return value was never used

0xAlunara · 2025-12-12T19:07:07Z

apps/main/src/dex/hooks/usePoolTokenDepositBalances.ts

+  enabled = true,
+) {
+  const { curveApi, isHydrated } = useCurve()
+  const pool = chainId && userAddress && poolId && curveApi && isHydrated ? curveApi.getPool(poolId) : undefined


Hydration is required, because if it isn't getPool will throw an error it can't find the poolId

That's a lot of checks that aren't really related to the pool, they should be handled by the query's validation not manually here imo

chainId: is not used here

userAddress: has nothing to do with pool

poolId: can it really be undefined after hydration?

curveApi: cannot be undefined when isHydrated

Suggested change

const pool = chainId && userAddress && poolId && curveApi && isHydrated ? curveApi.getPool(poolId) : undefined

const pool = useMemo(() => isHydrated && curveApi.getPool(poolId), [curveApi, isHydrated, poolId])

0xAlunara · 2025-12-12T19:08:50Z

apps/main/src/dex/components/PagePool/Deposit/components/FormDepositStake.tsx

    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [chainId, poolId, signerAddress, formValues, formStatus, slippage.isHighSlippage, slippageConfirmed, maxSlippage])
+  }, [
+    config,


A lot of times exhaustive deps was turned off. I didn't dare to remove it, afraid of breaking anything. I just added config and called it a day.

DanielSchiavini · 2025-12-15T08:25:56Z

apps/main/src/dex/components/PagePool/Deposit/components/FormStake.tsx

-          balance={balLpToken}
-          balanceLoading={balancesLoading}
-          hasError={haveSigner ? new BigNumber(formValues.lpToken).isGreaterThan(balLpToken as string) : false}
+          balance={lpTokenBalance ?? '0'}


I know it was there already, but omg it looks so bad when your balance is 0 during loading.

DanielSchiavini · 2025-12-15T08:27:04Z

apps/main/src/dex/components/PagePool/Swap/index.tsx

-  const userToBalance = userPoolBalances?.[formValues.toAddress]
+  const config = useConfig()
+  const { address: userAddress } = useConnection()
+  const { data: userFromBalance, isLoading: userFromBalanceLoading } = useTokenBalance({


What do you think of a version that allows an array or tuple of addresses via useQueries?

DanielSchiavini · 2025-12-15T08:28:26Z

apps/main/src/dex/components/PagePool/Withdraw/components/FormUnstake.tsx

-        balance={haveSigner ? balGauge : ''}
-        hasError={+formValues.stakedLpToken > +balGauge}
+        balanceLoading={gaugeTokenLoading}
+        balance={gaugeTokenBalance ?? '0'}


the existing code did not have ?? 0 but as string

DanielSchiavini · 2025-12-15T08:31:58Z

apps/main/src/dex/components/PagePool/components/TransferActions.tsx

+    !seed.loaded ||
+    walletBalancesLoading
+
+  const hasWalletBalances = Object.keys(wrappedCoinsBalances).length && Object.keys(underlyingCoinsBalances).length


We should use usePoolTokenBalances(..).error for this, I don't see an use case for generic error

DanielSchiavini · 2025-12-15T08:32:42Z

apps/main/src/dex/hooks/usePoolTokenBalances.ts

+  const { curveApi, isHydrated } = useCurve()
+  const pool = chainId && userAddress && poolId && curveApi && isHydrated ? curveApi.getPool(poolId) : undefined
+
+  const { data: wrappedCoinsBalances, isLoading: wrappedCoinsLoading } = useTokenBalances(


we should be extracting the error here, too

DanielSchiavini · 2025-12-15T08:40:39Z

apps/main/src/dex/hooks/usePoolTokenDepositBalances.ts

+export function fetchPoolLpTokenBalance(config: Config, curve: CurveApi, poolId: string) {
+  const pool = requireLib('curveApi').getPool(poolId)
+
+  return fetchTokenBalance(config, {
+    chainId: curve?.chainId,
+    userAddress: curve.signerAddress as Address,
+    tokenAddress: pool.lpToken as Address,
+  })
+}


Why call requireLib if you are passing curve here? 😅

Suggested change

export function fetchPoolLpTokenBalance(config: Config, curve: CurveApi, poolId: string) {

const pool = requireLib('curveApi').getPool(poolId)

return fetchTokenBalance(config, {

chainId: curve?.chainId,

userAddress: curve.signerAddress as Address,

tokenAddress: pool.lpToken as Address,

})

}

export const fetchPoolLpTokenBalance = async (config: Config, curve: CurveApi, poolId: string) =>

await fetchTokenBalance(config, {

chainId: curve.chainId,

userAddress: curve.signerAddress as Address,

tokenAddress: curve.getPool(poolId).lpToken as Address,

})

DanielSchiavini · 2025-12-15T08:42:14Z

packages/curve-ui-kit/src/queries/token-balance.query.ts

-export function useTokenBalance({ chainId, userAddress, tokenAddress }: FieldsOf<TokenBalanceQuery>) {
+export function useTokenBalance(
+  { chainId, userAddress, tokenAddress }: FieldsOf<TokenBalanceQuery>,
+  enabled: boolean = true,


disabling a query is fine, but IMO we can also add a validation suite here such that enabled=enabled&&valid

DanielSchiavini · 2025-12-15T08:42:27Z

packages/curve-ui-kit/src/queries/token-balance.query.ts

+
+/** Get query options for a token balance (handles both native and ERC-20) */
+const getTokenBalanceQueryOptions = (config: Config, query: TokenBalanceQuery) => {
+  if (isNative(query)) {


ternary + inline arrow would be nice

DanielSchiavini · 2025-12-15T08:43:13Z

packages/curve-ui-kit/src/queries/token-balance.query.ts

+  const config = useConfig()
+
+  const isEnabled = enabled && chainId != null && userAddress != null
+  const uniqueAddresses = useMemo(() => Array.from(new Set(tokenAddresses)), [tokenAddresses])


doesn't wagmi unify them already?

DanielSchiavini · 2025-12-15T08:43:48Z

packages/curve-ui-kit/src/queries/token-balance.query.ts

+) {
+  const config = useConfig()
+
+  const isEnabled = enabled && chainId != null && userAddress != null


We can use the validation group here, too

0xAlunara added 5 commits December 12, 2025 19:25

feat: add enabled parameter to useTokenBalance

780a5f7

feat: add useTokenBalances to fetch multiple token balances at once

4a061a3

feat: add usePoolTokenBalances and fetchPoolTokenBalances

88a2629

feat: add usePoolTokenDepositBalances and fetchPoolLpTokenBalance

4e36417

refactor: remove walletBalances from dex user slice in favor of token…

0a8f2e8

…-balance.query

0xAlunara requested review from 0xPearce, 0xtutti, DanielSchiavini and OnlyJousting December 12, 2025 18:31

0xAlunara changed the base branch from main to refactor/user-balances-tanstack-query December 12, 2025 18:31

vercel bot deployed to Preview – curve-dapp-storybook December 12, 2025 18:32 View deployment

vercel bot deployed to Preview – curve-dapp December 12, 2025 18:33 View deployment

feat: bring back user pool balance fetching in fetchUserPoolInfo

db8c822

vercel bot deployed to Preview – curve-dapp-storybook December 12, 2025 18:51 View deployment

vercel bot deployed to Preview – curve-dapp December 12, 2025 18:51 View deployment

fix: errors when no wallet and incorrect token address on swap tab

fa1969c

vercel bot deployed to Preview – curve-dapp December 12, 2025 19:02 View deployment

vercel bot deployed to Preview – curve-dapp-storybook December 12, 2025 19:02 View deployment

0xAlunara commented Dec 12, 2025

View reviewed changes

0xAlunara mentioned this pull request Dec 13, 2025

refactor: remove user balance store dependency in deposit gauge reward feature #1765

Open

DanielSchiavini reviewed Dec 15, 2025

View reviewed changes

Base automatically changed from refactor/user-balances-tanstack-query to main December 17, 2025 09:11

	const pool = chainId && userAddress && poolId && curveApi && isHydrated ? curveApi.getPool(poolId) : undefined
	const pool = useMemo(() => isHydrated && curveApi.getPool(poolId), [curveApi, isHydrated, poolId])

fix: user pool balances not loading correctly #1763

Are you sure you want to change the base?

fix: user pool balances not loading correctly #1763

Uh oh!

Conversation

0xAlunara commented Dec 12, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

vercel bot commented Dec 12, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

0xAlunara Dec 12, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

0xAlunara commented Dec 12, 2025 •

edited

Loading

vercel bot commented Dec 12, 2025 •

edited

Loading

0xAlunara Dec 12, 2025 •

edited

Loading