Skip to content

Fix reactivity when aggressively fetching dune balances #919

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

Merged
pedromcunha merged 1 commit into from
Jan 23, 2026
Merged

Fix reactivity when aggressively fetching dune balances #919

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion demo/components/providers/RelayKitProviderWrapper.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ export const RelayKitProviderWrapper: FC<{
source: 'relay-demo',
logLevel: LogLevel.Verbose,
duneConfig: {
apiBaseUrl: process.env.NEXT_PUBLIC_DUNE_API_URL
apiBaseUrl: process.env.NEXT_PUBLIC_DUNE_API_URL,
apiKey: process.env.NEXT_PUBLIC_DUNE_API_KEY
},
chains: dynamicChains,
privateChainIds: process.env.NEXT_PUBLIC_INCLUDE_CHAINS?.split(','),
Expand Down
4 changes: 2 additions & 2 deletions packages/ui/src/hooks/useCurrencyBalance.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ const useCurrencyBalance = ({

if (chain.id === eclipse.id) {
value = eclipseBalances.data?.balance
isDuneBalance = true
isDuneBalance = false
isError = eclipseBalances.isError
error = eclipseBalances.error
} else {
Expand All @@ -237,7 +237,7 @@ const useCurrencyBalance = ({
duneBalances.balanceMap[`${chain.id}:${currency}`].amount ?? 0
)
: undefined
isDuneBalance = false
isDuneBalance = true
isError = duneBalances.isError
error = duneBalances.error
}
Expand Down
33 changes: 19 additions & 14 deletions packages/ui/src/hooks/useDuneBalances.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,31 +117,36 @@ export default (
(isSvmAddress || isEvmAddress)
})

response?.data?.balances?.forEach((balance) => {
if (!balance.chain_id && balance.chain === 'solana') {
balance.chain_id = solana.id
const balanceMap = response?.data?.balances?.reduce((balanceMap, balance) => {
// Create a new object instead of mutating the cached one
const normalizedBalance = { ...balance }

// Normalize chain_id
if (!normalizedBalance.chain_id && normalizedBalance.chain === 'solana') {
normalizedBalance.chain_id = solana.id
}
if (!balance.chain_id && balance.chain === 'eclipse') {
balance.chain_id = eclipse.id
if (!normalizedBalance.chain_id && normalizedBalance.chain === 'eclipse') {
normalizedBalance.chain_id = eclipse.id
}
})

const balanceMap = response?.data?.balances?.reduce((balanceMap, balance) => {
if (balance.address === 'native') {
balance.address =
balance.chain === 'solana' || balance.chain === 'eclipse'
// Normalize native address
if (normalizedBalance.address === 'native') {
normalizedBalance.address =
normalizedBalance.chain === 'solana' ||
normalizedBalance.chain === 'eclipse'
? '11111111111111111111111111111111'
: zeroAddress
}
let chainId = balance.chain_id
if (!chainId && balance.chain === 'solana') {

let chainId = normalizedBalance.chain_id
if (!chainId && normalizedBalance.chain === 'solana') {
chainId = solana.id
}
if (!chainId && balance.chain === 'eclipse') {
if (!chainId && normalizedBalance.chain === 'eclipse') {
chainId = eclipse.id
}

balanceMap[`${chainId}:${balance.address}`] = balance
balanceMap[`${chainId}:${normalizedBalance.address}`] = normalizedBalance
return balanceMap
}, {} as BalanceMap)

Expand Down