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

Bean UI - L1 Transfer form #1147

Merged
merged 8 commits into from
Oct 12, 2024
Merged

Bean UI - L1 Transfer form #1147

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
19218b8
l1 withdraw form
uncoolzero Oct 11, 2024
76d8cce
use wagmi to fetch balances and allowances
uncoolzero Oct 11, 2024
53860f0
rename, add to navbar
uncoolzero Oct 11, 2024
8887ece
spacing tweaks
uncoolzero Oct 11, 2024
5cb69d7
Merge branch 'master' into bean-ui-bs3-withdraw
uncoolzero Oct 11, 2024
57a4424
mobile tweaks
uncoolzero Oct 12, 2024
931f728
more mobile tweaks
uncoolzero Oct 12, 2024
9009e9e
remove @ts-ignore
uncoolzero Oct 12, 2024
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
2 changes: 2 additions & 0 deletions projects/ui/src/components/App/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ import L2Claim from '~/pages/l2claim';
import L1Delegate from '~/pages/l1delegate';

import MigrationPreview from '../../pages/preview';
import L1Transfer from '~/pages/l1transfer';

// import Snowflakes from './theme/winter/Snowflakes';

Expand Down Expand Up @@ -146,6 +147,7 @@ function MigrationGate() {
<Route path="/l2claim" element={<L2Claim />} />
<Route path="/l2" element={<L2Claim />} />
<Route path="/arbitrum" element={<L2Claim />} />
<Route path="/l1transfer" element={<L1Transfer />} />
<Route path="/404" element={<PageNotFound />} />
</Routes>
</Box>
Expand Down
15 changes: 9 additions & 6 deletions projects/ui/src/components/Nav/NavBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import { AppBar, Box } from '@mui/material';
import { AppBar, Box, useMediaQuery, useTheme } from '@mui/material';
import WalletButton from '~/components/Common/Connection/WalletButton';
import NetworkButton from '~/components/Common/Connection/NetworkButton';
import {
Expand All @@ -20,7 +20,7 @@ import HoverMenu from './HoverMenu';
import { PAGE_BORDER_COLOR } from '../App/muiTheme';
import BeanProgressIcon from '../Common/BeanProgressIcon';

const L1NavBar = () => (
const L1NavBar = ({ isMobile }: { isMobile: boolean }) => (
<>
<AppBar
className="navbar"
Expand All @@ -34,22 +34,23 @@ const L1NavBar = () => (
{/* Desktop: Right Side */}
<Row
justifyContent="space-between"
gap={1}
gap={isMobile ? 0 : 1}
px={1}
height={`${NAV_HEIGHT}px`}
>
<Box
px={2}
px={isMobile ? 1 : 2}
height={`${NAV_HEIGHT}px`}
sx={{
display: 'flex',
flexDirection: 'row',
gap: 2,
gap: isMobile ? 0 : 2,
alignItems: 'center',
}}
>
<BeanProgressIcon size={25} enabled={false} variant="indeterminate" />
<LinkButton key="/" to="/" title="Migration" />
<LinkButton key="/l1transfer" to="/l1transfer" title="Transfer" />
</Box>
<Row gap={1}>
<Box sx={{ display: { sm: 'block', xs: 'none' } }}>
Expand All @@ -65,9 +66,11 @@ const L1NavBar = () => (

const NavBar: FC<{}> = ({ children }) => {
const { isArbitrum, isArbMainnet } = useChainState();
const theme = useTheme();
const isMobile = useMediaQuery(theme.breakpoints.down('sm'));

if (!isArbitrum) {
return <L1NavBar />;
return <L1NavBar isMobile={isMobile} />;
}

return (
Expand Down
Loading
Loading