Resets balances to [] on chain change (#96)

synapsecns · Dec 26, 2023 · 3dab609 · 3dab609
1 parent 6479d10
commit 3dab609
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 8 deletions.
diff --git a/src/components/ui/TokenSelect.tsx b/src/components/ui/TokenSelect.tsx
@@ -18,15 +18,21 @@ export function TokenSelect({ label, isOrigin, token, onChange }: Props) {
 
   const { balances } = useWalletState()
 
-  const options = isOrigin
-    ? originTokens
-    : filterTokens(destinationTokens, tokens)
-  const remainingOptions = _.difference(tokens, options)
+  let options
+  let remaining
+
+  if (isOrigin) {
+    options = originTokens
+    remaining = _.difference(tokens, options)
+  } else {
+    options = filterTokens(destinationTokens, tokens)
+    remaining = _.difference(tokens, options)
+  }
 
   return (
     <TokenPopoverSelect
       options={options}
-      remaining={remainingOptions}
+      remaining={remaining}
       balances={isOrigin ? balances : []}
       onSelect={(selected) => {
         onChange(selected)

diff --git a/src/constants/bridgeable.ts b/src/constants/bridgeable.ts
@@ -393,7 +393,6 @@ export const USDC = {
     [CHAINS.OPTIMISM.id]: '0x0b2C639c533813f4Aa9D7837CAf62653d097Ff85',
     [CHAINS.CRONOS.id]: '0xc21223249ca28397b4b6541dffaecc539bff0c59',
     [CHAINS.BNBCHAIN.id]: '0x8ac76a51cc950d9822d68b83fe1ad97b32cd580d',
-    [CHAINS.POLYGON.id]: '0x2791bca1f2de4661ed88a30c99a7a9449aa84174',
     [CHAINS.BOBA.id]: '0x66a2A913e447d6b4BF33EFbec43aAeF87890FBbc',
     [CHAINS.DOGE.id]: '0x85C2D3bEBffD83025910985389aB8aD655aBC946',
     [CHAINS.CANTO.id]: '0x80b5a32E4F032B2a058b4F29EC95EEfEEB87aDcd',
@@ -408,7 +407,6 @@ export const USDC = {
     [CHAINS.OPTIMISM.id]: 6,
     [CHAINS.CRONOS.id]: 6,
     [CHAINS.BNBCHAIN.id]: 18,
-    [CHAINS.POLYGON.id]: 6,
     [CHAINS.BOBA.id]: 6,
     [CHAINS.DOGE.id]: 6,
     [CHAINS.CANTO.id]: 6,
@@ -909,12 +907,14 @@ export const USDCe = {
     [CHAINS.AVALANCHE.id]: '0xA7D7079b0FEaD91F3e65f86E8915Cb59c1a4C664',
     [CHAINS.ARBITRUM.id]: '0xff970a61a04b1ca14834a43f5de4533ebddb5cc8',
     [CHAINS.AURORA.id]: '0xB12BFcA5A55806AaF64E99521918A4bf0fC40802',
+    [CHAINS.POLYGON.id]: '0x2791bca1f2de4661ed88a30c99a7a9449aa84174',
   },
   decimals: {
     [CHAINS.OPTIMISM.id]: 6,
     [CHAINS.AVALANCHE.id]: 6,
     [CHAINS.ARBITRUM.id]: 6,
     [CHAINS.AURORA.id]: 6,
+    [CHAINS.POLYGON.id]: 6,
   },
   symbol: 'USDC.e',
   name: 'Bridged USDC',

diff --git a/src/state/slices/wallet/reducer.ts b/src/state/slices/wallet/reducer.ts
@@ -30,6 +30,7 @@ export const walletSlice = createSlice({
   extraReducers: (builder) => {
     builder
       .addCase(fetchAndStoreTokenBalances.pending, (state) => {
+        state.balances = []
         state.status = FetchState.LOADING
       })
       .addCase(

diff --git a/src/utils/actions/fetchTokenBalances.ts b/src/utils/actions/fetchTokenBalances.ts
@@ -38,7 +38,12 @@ export async function fetchTokenBalances({
     return
   }
 
-  const calls = tokens.map((token: BridgeableToken) => {
+  const validTokens = tokens.filter((token: BridgeableToken) => {
+    const tokenAddress: string = token.addresses[chainId]
+    return tokenAddress !== undefined
+  })
+
+  const calls = validTokens.map((token: BridgeableToken) => {
     const tokenAddress: string = token.addresses[chainId]
 
     if (tokenAddress === ZeroAddress) {