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.

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

feat: network box redesign #1893

Merged
merged 36 commits into from
Jan 20, 2025
Merged
Changes from 3 commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
5fb64fc
network box redesign
brtkx Sep 13, 2024
79a5f76
padding fix
brtkx Sep 13, 2024
a88fddd
logo fixes
brtkx Sep 13, 2024
f7003c5
fix
brtkx Sep 13, 2024
b549a7e
fix
brtkx Sep 13, 2024
ee0dec9
fix
brtkx Sep 13, 2024
fa1df86
fix
brtkx Sep 13, 2024
2626388
Merge branch 'master' of github.com:OffchainLabs/arbitrum-token-bridg…
brtkx Sep 20, 2024
31687f2
fix
brtkx Sep 20, 2024
d76e933
fix e2e
brtkx Sep 20, 2024
988dfa1
Merge branch 'master' into network-box-redesign
fionnachan Sep 20, 2024
e95db61
fix
brtkx Nov 25, 2024
696a73f
Merge branch 'master' of github.com:OffchainLabs/arbitrum-token-bridg…
brtkx Nov 27, 2024
33b6b34
fix conflicts
brtkx Nov 27, 2024
ed1e9a6
fix
brtkx Nov 27, 2024
4031e09
usdc logo
brtkx Nov 27, 2024
2ad61c0
usdc logo
brtkx Nov 27, 2024
f267c7a
fix
brtkx Nov 27, 2024
298b3dd
Merge branch 'master' into network-box-redesign
brtkx Dec 9, 2024
5793b23
Merge branch 'master' into network-box-redesign
fionnachan Dec 10, 2024
126f477
Merge branch 'master' into network-box-redesign
fionnachan Dec 11, 2024
dc2cec7
Merge branch 'master' into network-box-redesign
fionnachan Dec 12, 2024
6383785
Merge branch 'master' into network-box-redesign
fionnachan Dec 24, 2024
17ecc2e
Merge branch 'master' of github.com:OffchainLabs/arbitrum-token-bridg…
brtkx Dec 30, 2024
761de7e
fix token symbol
brtkx Dec 30, 2024
f0863d9
Merge branch 'master' into network-box-redesign
brtkx Jan 15, 2025
319898c
Merge branch 'master' into network-box-redesign
brtkx Jan 15, 2025
3b8eb4a
remove chaining
brtkx Jan 15, 2025
4d6e074
fix tests
brtkx Jan 16, 2025
6c1e3bb
fix decimals
brtkx Jan 16, 2025
db317ba
Merge branch 'master' into network-box-redesign
brtkx Jan 16, 2025
54a1b23
Merge branch 'master' into network-box-redesign
brtkx Jan 16, 2025
b83eaf9
fix types
brtkx Jan 17, 2025
6d49ec8
Merge branch 'network-box-redesign' of github.com:OffchainLabs/arbitr…
brtkx Jan 17, 2025
c19c3c8
Merge branch 'master' into network-box-redesign
dewanshparashar Jan 17, 2025
c83165e
Merge branch 'master' into network-box-redesign
brtkx Jan 20, 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
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import { Loader } from '../../common/atoms/Loader'
import { useAmount2InputVisibility } from './SourceNetworkBox'
import { useArbQueryParams } from '../../../hooks/useArbQueryParams'
import { useIsCctpTransfer } from '../hooks/useIsCctpTransfer'
import { sanitizeTokenSymbol } from '../../../util/TokenUtils'

function BalanceRow({
parentErc20Address,
Expand Down Expand Up @@ -171,7 +172,14 @@ function BalancesContainer() {
})
: undefined
}
symbolOverride={isCctpTransfer ? 'USDC.e' : undefined}
symbolOverride={
selectedToken
? sanitizeTokenSymbol(selectedToken.symbol, {
chainId: networks.destinationChain.id,
erc20L1Address: selectedToken?.address
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
erc20L1Address: selectedToken?.address
erc20L1Address: selectedToken.address

})
: undefined
}
/>
{isBatchTransferSupported && isAmount2InputVisible && (
<BalanceRow
Expand Down
Loading