Skip to content

fix: use static COMMON_BASES fallback when GQL unavailable #17

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
artoo-claw wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix: use static COMMON_BASES fallback when GQL unavailable #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
59fae23
fix: use static COMMON_BASES as direct fallback when GQL is unavailable
Feb 9, 2026
f787b8c
fix: EIP-55 checksummed addresses for LightLink tokens
Feb 9, 2026
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
9 changes: 6 additions & 3 deletions packages/uniswap/src/components/TokenSelector/hooks/useCommonTokensOptionsWithFallback.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,16 @@ export function useCommonTokensOptionsWithFallback({

const shouldFallback = (!data || data.length === 0) && commonBases?.length

// Use GQL-enriched options if available, otherwise fall back to static COMMON_BASES directly
const fallbackData = commonBasesTokenOptions ?? commonBases

return useMemo(
() => ({
data: shouldFallback ? commonBasesTokenOptions : data,
data: shouldFallback ? fallbackData : data,
error: shouldFallback ? undefined : error,
refetch,
loading,
loading: shouldFallback ? false : loading,
}),
[commonBasesTokenOptions, data, error, loading, refetch, shouldFallback],
[fallbackData, data, error, loading, refetch, shouldFallback],
)
}
6 changes: 3 additions & 3 deletions packages/uniswap/src/constants/tokens.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ export const BUSD_BSC = new Token(UniverseChainId.Bnb, '0xe9e7CEA3DedcA5984780Ba
// LightLink tokens
export const USDC_LIGHTLINK = new Token(
UniverseChainId.LightLink,
'0x18fB38404DADee1727Be4b805c5b242B5413Fa40',
'0x18fB38404DADeE1727Be4b805c5b242B5413Fa40',
6,
'USDC',
'USD Coin',
Expand All @@ -102,7 +102,7 @@ export const USDT_LIGHTLINK = new Token(
)
export const LL_TOKEN = new Token(
UniverseChainId.LightLink,
'0x519d3443cacc61bd844546edaea48e5502021802',
'0x519d3443cACc61bD844546eDAea48E5502021802',
18,
'LL',
'LightLink',
Expand Down Expand Up @@ -310,7 +310,7 @@ export const WRAPPED_NATIVE_CURRENCY: { [chainId: number]: Token | undefined } =
),
[UniverseChainId.LightLink]: new Token(
UniverseChainId.LightLink,
'0x7ebef2a4b1b09381ec5b9df8c5c6f2dbeca59c73',
'0x7EbeF2A4b1B09381Ec5B9dF8C5c6f2dBECA59c73',
18,
'WETH',
'Wrapped Ether',
Expand Down