Skip to content
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

fix: use correct source address for usdc on Orbit #2324

Merged
merged 9 commits into from
Mar 11, 2025
+57 −8
Merged

fix: use correct source address for usdc on Orbit #2324

Changes from 3 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
de1d578
fix usdc orbit withdrawal
brtkx Mar 10, 2025
ebf2334
Merge branch 'master' into fix-usdc-orbit-withdrawal
brtkx Mar 10, 2025
c6f1112
Merge branch 'master' into fix-usdc-orbit-withdrawal
brtkx Mar 11, 2025
7f06e2a
fix usdc token row
brtkx Mar 11, 2025
f01dc11
Merge branch 'fix-usdc-orbit-withdrawal' of https://github.com/Offcha…
brtkx Mar 11, 2025
211d032
remove logs
brtkx Mar 11, 2025
71fd024
use swr
brtkx Mar 11, 2025
9f9ee83
Merge branch 'master' of https://github.com/OffchainLabs/arbitrum-tok…
brtkx Mar 11, 2025
d2b4329
clean up
brtkx Mar 11, 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
9 changes: 8 additions & 1 deletion packages/arb-token-bridge-ui/src/hooks/useBalanceOnSourceChain.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import {
isTokenArbitrumOneNativeUSDC,
isTokenArbitrumSepoliaNativeUSDC
} from '../util/TokenUtils'
import { isNetwork } from '../util/networks'

/**
* Balance of the child chain's native currency or ERC20 token
Expand All @@ -20,6 +21,9 @@ export function useBalanceOnSourceChain(
const { address: walletAddress } = useAccount()
const [networks] = useNetworks()
const { isDepositMode } = useNetworksRelationship(networks)
const { isOrbitChain: isSourceOrbitChain } = isNetwork(
networks.sourceChain.id
)

const {
erc20: [erc20SourceChainBalances]
Expand Down Expand Up @@ -47,7 +51,10 @@ export function useBalanceOnSourceChain(
isTokenArbitrumOneNativeUSDC(tokenAddressLowercased) ||
isTokenArbitrumSepoliaNativeUSDC(tokenAddressLowercased)
) {
return erc20SourceChainBalances[tokenAddressLowercased] ?? constants.Zero
// because we read parent chain address, make sure we don't read Orbit chain's address if it's the source chain
if (!isSourceOrbitChain) {
return erc20SourceChainBalances[tokenAddressLowercased] ?? constants.Zero
}
}

const tokenChildChainAddress = token.l2Address?.toLowerCase()
Expand Down
Loading