Skip to content

fix: user pool balances not loading correctly #1763

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
0xAlunara wants to merge 7 commits into
base: main
Choose a base branch
from
Open

fix: user pool balances not loading correctly #1763

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
780a5f7
feat: add enabled parameter to useTokenBalance
0xAlunara Dec 12, 2025
4a061a3
feat: add useTokenBalances to fetch multiple token balances at once
0xAlunara Dec 12, 2025
88a2629
feat: add usePoolTokenBalances and fetchPoolTokenBalances
0xAlunara Dec 12, 2025
4e36417
feat: add usePoolTokenDepositBalances and fetchPoolLpTokenBalance
0xAlunara Dec 12, 2025
0a8f2e8
refactor: remove walletBalances from dex user slice in favor of token…
0xAlunara Dec 12, 2025
db8c822
feat: bring back user pool balance fetching in fetchUserPoolInfo
0xAlunara Dec 12, 2025
fa1969c
fix: errors when no wallet and incorrect token address on swap tab
0xAlunara Dec 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions apps/main/src/dex/components/PagePool/Deposit/components/FieldsDeposit.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import { BigNumber } from 'bignumber.js'
import lodash from 'lodash'
import { useCallback, useMemo } from 'react'
import type { Address } from 'viem'
import { useConnection } from 'wagmi'
import FieldToken from '@/dex/components/PagePool/components/FieldToken'
import type { FormValues, LoadMaxAmount } from '@/dex/components/PagePool/Deposit/types'
import { FieldsWrapper } from '@/dex/components/PagePool/styles'
Expand All @@ -12,6 +14,7 @@ import type { CurrencyReserves } from '@/dex/types/main.types'
import { getChainPoolIdActiveKey } from '@/dex/utils'
import Checkbox from '@ui/Checkbox'
import { t } from '@ui-kit/lib/i18n'
import { useTokenBalances } from '@ui-kit/queries/token-balance.query'
import { Amount } from '../../utils'

/**
Expand Down Expand Up @@ -54,6 +57,7 @@ function calculateBalancedValues(
}

const FieldsDeposit = ({
chainId,
formProcessing,
formValues,
haveSigner,
Expand All @@ -63,9 +67,9 @@ const FieldsDeposit = ({
poolDataCacheOrApi,
routerParams: { rChainId, rPoolIdOrAddress },
tokensMapper,
userPoolBalances,
updateFormValues,
}: {
chainId: number | undefined
blockchainId: string
formProcessing: boolean
formValues: FormValues
Expand All @@ -76,9 +80,8 @@ const FieldsDeposit = ({
loadMaxAmount: LoadMaxAmount | null,
updatedMaxSlippage: string | null,
) => void
} & Pick<TransferProps, 'poolData' | 'poolDataCacheOrApi' | 'routerParams' | 'tokensMapper' | 'userPoolBalances'>) => {
} & Pick<TransferProps, 'poolData' | 'poolDataCacheOrApi' | 'routerParams' | 'tokensMapper'>) => {
const { data: network } = useNetworkByChain({ chainId: rChainId })
const balancesLoading = useStore((state) => state.user.walletBalancesLoading)
const maxLoading = useStore((state) => state.poolDeposit.maxLoading)
const setPoolIsWrapped = useStore((state) => state.pools.setPoolIsWrapped)
const poolId = usePoolIdByAddressOrId({ chainId: rChainId, poolIdOrAddress: rPoolIdOrAddress })
Expand Down Expand Up @@ -130,6 +133,13 @@ const FieldsDeposit = ({
[poolDataCacheOrApi.tokenAddresses, updateFormValues],
)

const { address: userAddress } = useConnection()
const { data: userPoolBalances, isLoading: balancesLoading } = useTokenBalances({
chainId,
userAddress,
tokenAddresses: poolDataCacheOrApi.tokenAddresses as Address[],
})

return (
<FieldsWrapper>
{poolDataCacheOrApi.tokens.length === amountsInput.length &&
Expand Down
28 changes: 20 additions & 8 deletions apps/main/src/dex/components/PagePool/Deposit/components/FormDeposit.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { ReactNode, useCallback, useEffect, useMemo, useRef, useState } from 'react'
import { useConfig, type Config } from 'wagmi'
import AlertFormError from '@/dex/components/AlertFormError'
import AlertSlippage from '@/dex/components/AlertSlippage'
import DetailInfoEstGas from '@/dex/components/DetailInfoEstGas'
Expand Down Expand Up @@ -39,7 +40,6 @@ const FormDeposit = ({
routerParams,
seed,
tokensMapper,
userPoolBalances,
}: TransferProps) => {
const isSubscribed = useRef(false)

Expand Down Expand Up @@ -67,6 +67,8 @@ const FormDeposit = ({
const poolId = poolData?.pool?.id
const haveSigner = !!signerAddress

const config = useConfig()

const updateFormValues = useCallback(
(
updatedFormValues: Partial<FormValues>,
Expand All @@ -77,6 +79,7 @@ const FormDeposit = ({
setSlippageConfirmed(false)
void setFormValues(
'DEPOSIT',
config,
curve,
poolDataCacheOrApi.pool.id,
poolData,
Expand All @@ -86,7 +89,7 @@ const FormDeposit = ({
updatedMaxSlippage || maxSlippage,
)
},
[curve, maxSlippage, poolData, poolDataCacheOrApi.pool.id, seed.isSeed, setFormValues],
[config, curve, maxSlippage, poolData, poolDataCacheOrApi.pool.id, seed.isSeed, setFormValues],
)

const handleApproveClick = useCallback(
Expand All @@ -100,11 +103,18 @@ const FormDeposit = ({
)

const handleDepositClick = useCallback(
async (activeKey: string, curve: CurveApi, poolData: PoolData, formValues: FormValues, maxSlippage: string) => {
async (
activeKey: string,
config: Config,
curve: CurveApi,
poolData: PoolData,
formValues: FormValues,
maxSlippage: string,
) => {
const tokenText = amountsDescription(formValues.amounts)
const notifyMessage = t`Please confirm deposit of ${tokenText} at max ${maxSlippage}% slippage.`
const { dismiss } = notify(notifyMessage, 'pending')
const resp = await fetchStepDeposit(activeKey, curve, poolData, formValues, maxSlippage)
const resp = await fetchStepDeposit(activeKey, config, curve, poolData, formValues, maxSlippage)

if (isSubscribed.current && resp && resp.hash && resp.activeKey === activeKey && network) {
const txDescription = t`Deposited ${tokenText}.`
Expand All @@ -118,6 +128,7 @@ const FormDeposit = ({
const getSteps = useCallback(
(
activeKey: string,
config: Config,
curve: CurveApi,
poolData: PoolData,
formValues: FormValues,
Expand Down Expand Up @@ -164,13 +175,13 @@ const FormDeposit = ({
onClick: () => setSlippageConfirmed(false),
},
primaryBtnProps: {
onClick: () => handleDepositClick(activeKey, curve, poolData, formValues, maxSlippage),
onClick: () => handleDepositClick(activeKey, config, curve, poolData, formValues, maxSlippage),
disabled: !slippageConfirmed,
},
primaryBtnLabel: 'Deposit anyway',
},
}
: { onClick: () => handleDepositClick(activeKey, curve, poolData, formValues, maxSlippage) }),
: { onClick: () => handleDepositClick(activeKey, config, curve, poolData, formValues, maxSlippage) }),
},
}

Expand Down Expand Up @@ -224,6 +235,7 @@ const FormDeposit = ({
if (curve && poolData) {
const updatedSteps = getSteps(
activeKey,
config,
curve,
poolData,
formValues,
Expand All @@ -237,6 +249,7 @@ const FormDeposit = ({
}
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [
config,
curve?.chainId,
poolData?.pool.id,
signerAddress,
Expand All @@ -261,6 +274,7 @@ const FormDeposit = ({
return (
<>
<FieldsDeposit
chainId={chainId}
formProcessing={disableForm}
formValues={formValues}
haveSigner={haveSigner}
Expand All @@ -270,7 +284,6 @@ const FormDeposit = ({
poolDataCacheOrApi={poolDataCacheOrApi}
routerParams={routerParams}
tokensMapper={tokensMapper}
userPoolBalances={userPoolBalances}
updateFormValues={updateFormValues}
/>

Expand Down Expand Up @@ -308,7 +321,6 @@ const FormDeposit = ({
loading={!chainId || !steps.length || !seed.loaded}
routerParams={routerParams}
seed={seed}
userPoolBalances={userPoolBalances}
>
<AlertSlippage maxSlippage={maxSlippage} usdAmount={estLpTokenReceivedUsdAmount} />
{formStatus.error && (
Expand Down
39 changes: 30 additions & 9 deletions apps/main/src/dex/components/PagePool/Deposit/components/FormDepositStake.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import type { ReactNode } from 'react'
import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
import { useConfig, type Config } from 'wagmi'
import AlertFormError from '@/dex/components/AlertFormError'
import AlertSlippage from '@/dex/components/AlertSlippage'
import DetailInfoEstGas from '@/dex/components/DetailInfoEstGas'
Expand Down Expand Up @@ -42,7 +43,6 @@ const FormDepositStake = ({
routerParams,
seed,
tokensMapper,
userPoolBalances,
}: TransferProps) => {
const isSubscribed = useRef(false)

Expand Down Expand Up @@ -70,6 +70,8 @@ const FormDepositStake = ({
const poolId = poolData?.pool?.id
const haveSigner = !!signerAddress

const config = useConfig()

const updateFormValues = useCallback(
(
updatedFormValues: Partial<FormValues>,
Expand All @@ -80,6 +82,7 @@ const FormDepositStake = ({
setSlippageConfirmed(false)
void setFormValues(
'DEPOSIT_STAKE',
config,
curve,
poolDataCacheOrApi.pool.id,
poolData,
Expand All @@ -89,7 +92,7 @@ const FormDepositStake = ({
updatedMaxSlippage || maxSlippage,
)
},
[curve, maxSlippage, poolData, poolDataCacheOrApi.pool.id, seed.isSeed, setFormValues],
[config, curve, maxSlippage, poolData, poolDataCacheOrApi.pool.id, seed.isSeed, setFormValues],
)

const handleApproveClick = useCallback(
Expand All @@ -103,11 +106,18 @@ const FormDepositStake = ({
)

const handleDepositStakeClick = useCallback(
async (activeKey: string, curve: CurveApi, poolData: PoolData, formValues: FormValues, maxSlippage: string) => {
async (
activeKey: string,
config: Config,
curve: CurveApi,
poolData: PoolData,
formValues: FormValues,
maxSlippage: string,
) => {
const tokenText = amountsDescription(formValues.amounts)
const notifyMessage = t`Please confirm deposit and staking of ${tokenText} LP Tokens at max ${maxSlippage}% slippage.`
const { dismiss } = notify(notifyMessage, 'pending')
const resp = await fetchStepDepositStake(activeKey, curve, poolData, formValues, maxSlippage)
const resp = await fetchStepDepositStake(activeKey, config, curve, poolData, formValues, maxSlippage)

if (isSubscribed.current && resp && resp.hash && resp.activeKey === activeKey) {
const TxDescription = t`Deposit and staked ${tokenText}`
Expand All @@ -121,6 +131,7 @@ const FormDepositStake = ({
const getSteps = useCallback(
(
activeKey: string,
config: Config,
curve: CurveApi,
poolData: PoolData,
formValues: FormValues,
Expand Down Expand Up @@ -167,13 +178,13 @@ const FormDepositStake = ({
onClick: () => setSlippageConfirmed(false),
},
primaryBtnProps: {
onClick: () => handleDepositStakeClick(activeKey, curve, poolData, formValues, maxSlippage),
onClick: () => handleDepositStakeClick(activeKey, config, curve, poolData, formValues, maxSlippage),
disabled: !slippageConfirmed,
},
primaryBtnLabel: 'Deposit anyway',
},
}
: { onClick: () => handleDepositStakeClick(activeKey, curve, poolData, formValues, maxSlippage) }),
: { onClick: () => handleDepositStakeClick(activeKey, config, curve, poolData, formValues, maxSlippage) }),
},
}

Expand Down Expand Up @@ -227,6 +238,7 @@ const FormDepositStake = ({
if (curve && poolData) {
const updatedSteps = getSteps(
activeKey,
config,
curve,
poolData,
formValues,
Expand All @@ -239,7 +251,17 @@ const FormDepositStake = ({
setSteps(updatedSteps)
}
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [chainId, poolId, signerAddress, formValues, formStatus, slippage.isHighSlippage, slippageConfirmed, maxSlippage])
}, [
config,
Copy link
Collaborator Author

@0xAlunara 0xAlunara Dec 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

chainId,
poolId,
signerAddress,
formValues,
formStatus,
slippage.isHighSlippage,
slippageConfirmed,
maxSlippage,
])

const activeStep = haveSigner ? getActiveStep(steps) : null
const disableForm = !seed.loaded || formStatus.formProcessing
Expand All @@ -255,6 +277,7 @@ const FormDepositStake = ({
return (
<>
<FieldsDeposit
chainId={chainId}
formProcessing={disableForm}
formValues={formValues}
haveSigner={haveSigner}
Expand All @@ -264,7 +287,6 @@ const FormDepositStake = ({
poolDataCacheOrApi={poolDataCacheOrApi}
routerParams={routerParams}
tokensMapper={tokensMapper}
userPoolBalances={userPoolBalances}
updateFormValues={updateFormValues}
/>

Expand Down Expand Up @@ -308,7 +330,6 @@ const FormDepositStake = ({
loading={!chainId || !steps.length || !seed.loaded}
routerParams={routerParams}
seed={seed}
userPoolBalances={userPoolBalances}
>
<AlertSlippage maxSlippage={maxSlippage} usdAmount={estLpTokenReceivedUsdAmount} />
{formStatus.error && (
Expand Down
Loading