-
Notifications
You must be signed in to change notification settings - Fork 45
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #346 from ourzora/bridge-modal
Add inline bridging for EOA accounts
- Loading branch information
Showing
11 changed files
with
530 additions
and
22 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
import * as yup from 'yup' | ||
|
||
export interface BridgeFormValues { | ||
amount?: number | ||
} | ||
|
||
const bridgeFormSchema = (userL1Balance: number) => | ||
yup.object({ | ||
amount: yup | ||
.number() | ||
.required() | ||
.max(userL1Balance, 'Must bridge less than L1 balance.') | ||
.test( | ||
'is-greater-than-0', | ||
'Must bridge more than 0 ETH', | ||
(value) => !!value && value > 0 | ||
), | ||
}) | ||
|
||
export default bridgeFormSchema |
11 changes: 11 additions & 0 deletions
11
apps/web/src/components/BridgeModal/BridgeForm.styles.css.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
import { style } from '@vanilla-extract/css' | ||
import { vars } from '@zoralabs/zord' | ||
|
||
export const chainPopUpButton = style({ | ||
backgroundColor: 'white', | ||
selectors: { | ||
'&:hover': { | ||
backgroundColor: vars.color.background2, | ||
}, | ||
}, | ||
}) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,239 @@ | ||
import { useConnectModal } from '@rainbow-me/rainbowkit' | ||
import { sendTransaction } from '@wagmi/core' | ||
import { Box, Button, Flex, Heading, Text } from '@zoralabs/zord' | ||
import { parseEther } from 'ethers/lib/utils.js' | ||
import { Formik } from 'formik' | ||
import Image from 'next/image' | ||
import Link from 'next/link' | ||
import { useState } from 'react' | ||
import { useAccount, useBalance, useNetwork, useSwitchNetwork } from 'wagmi' | ||
|
||
import Input from 'src/components/Input/Input' | ||
import { L2ChainType, PUBLIC_L1_BRIDGE_ADDRESS } from 'src/constants/addresses' | ||
import { PUBLIC_DEFAULT_CHAINS } from 'src/constants/defaultChains' | ||
import { useBridgeModal } from 'src/hooks/useBridgeModal' | ||
import { useIsContract } from 'src/hooks/useIsContract' | ||
import { useChainStore } from 'src/stores/useChainStore' | ||
import { formatCryptoVal } from 'src/utils/numbers' | ||
|
||
import { Icon } from '../Icon' | ||
import bridgeFormSchema, { BridgeFormValues } from './BridgeForm.schema' | ||
import { NetworkSelector } from './NetworkSelector' | ||
|
||
export const BridgeForm = () => { | ||
const { address } = useAccount() | ||
const { chain: userChain } = useNetwork() | ||
const { switchNetwork } = useSwitchNetwork() | ||
const { closeBridgeModal } = useBridgeModal() | ||
const { openConnectModal } = useConnectModal() | ||
const { data: isContractWallet } = useIsContract({ address }) | ||
const [loading, setLoading] = useState(false) | ||
|
||
const { chain: appChain } = useChainStore() | ||
|
||
const l1Chain = PUBLIC_DEFAULT_CHAINS[0] | ||
const [l2Chain, setL2Chain] = useState( | ||
appChain.id !== l1Chain.id ? appChain : PUBLIC_DEFAULT_CHAINS[1] | ||
) | ||
|
||
const isWalletOnL1 = userChain?.id === l1Chain.id | ||
|
||
const { data: userL1Balance } = useBalance({ | ||
address, | ||
chainId: l1Chain.id, | ||
}) | ||
|
||
const { data: userL2Balance } = useBalance({ | ||
address, | ||
chainId: l2Chain.id, | ||
}) | ||
|
||
const initialValues: BridgeFormValues = { | ||
amount: 0, | ||
} | ||
|
||
const handleSubmit = async (values: BridgeFormValues) => { | ||
const bridge = PUBLIC_L1_BRIDGE_ADDRESS[l2Chain.id as L2ChainType] | ||
|
||
if (!values.amount || !bridge) return | ||
|
||
setLoading(true) | ||
try { | ||
const { wait } = await sendTransaction({ | ||
request: { | ||
to: PUBLIC_L1_BRIDGE_ADDRESS[l2Chain.id as L2ChainType], | ||
value: parseEther(values.amount.toString()), | ||
}, | ||
mode: 'recklesslyUnprepared', | ||
}) | ||
await wait() | ||
} catch (err) { | ||
console.log('err', err) | ||
} finally { | ||
setLoading(false) | ||
} | ||
} | ||
|
||
const formattedL1Balance = userL1Balance ? parseFloat(userL1Balance.formatted) : 0 | ||
const formattedL2Balance = userL2Balance ? parseFloat(userL2Balance.formatted) : 0 | ||
|
||
const getButtonText = (isAmountInvalid: boolean) => { | ||
if (isContractWallet) return 'Contract wallets are not supported' | ||
if (loading) return 'Bridging...' | ||
if (isAmountInvalid) return 'Insufficent ETH balance' | ||
return 'Bridge' | ||
} | ||
|
||
return ( | ||
<Box position={'relative'}> | ||
<Box | ||
onClick={closeBridgeModal} | ||
cursor={'pointer'} | ||
position={'absolute'} | ||
top="x0" | ||
right="x3" | ||
> | ||
<Icon id="cross" fill="text3" /> | ||
</Box> | ||
<Heading size="xs" fontWeight="display"> | ||
Bridge | ||
</Heading> | ||
|
||
<Formik | ||
initialValues={initialValues} | ||
validationSchema={bridgeFormSchema(formattedL1Balance)} | ||
onSubmit={handleSubmit} | ||
validateOnBlur | ||
validateOnMount={false} | ||
validateOnChange={false} | ||
> | ||
{({ errors, touched, isValid, submitForm }) => { | ||
const isAmountInvalid = !!errors.amount && touched.amount | ||
|
||
return ( | ||
<Box> | ||
<Box | ||
mt="x5" | ||
p="x4" | ||
borderColor="border" | ||
borderStyle="solid" | ||
borderRadius="curved" | ||
borderWidth="normal" | ||
> | ||
<Input | ||
name={'amount'} | ||
label={ | ||
<Flex> | ||
<Text mr="x2" fontWeight="heading"> | ||
From | ||
</Text> | ||
<Box mr="x1"> | ||
<Image | ||
alt="L1 Chain" | ||
style={{ | ||
height: 20, | ||
width: 20, | ||
}} | ||
src={l1Chain.icon} | ||
/> | ||
</Box> | ||
<Text fontWeight="heading">{l1Chain.name}</Text> | ||
</Flex> | ||
} | ||
secondaryLabel={'ETH'} | ||
autoComplete={'off'} | ||
type={'number'} | ||
placeholder={0} | ||
min={0} | ||
max={userL1Balance?.formatted} | ||
step={'any'} | ||
/> | ||
<Text mt="x3" color="text3"> | ||
Balance: {formatCryptoVal(formattedL1Balance)} ETH | ||
</Text> | ||
</Box> | ||
|
||
<Box | ||
mt="x5" | ||
p="x4" | ||
borderColor="border" | ||
borderStyle="solid" | ||
borderRadius="curved" | ||
borderWidth="normal" | ||
> | ||
<Input | ||
name={'amount'} | ||
label={ | ||
<Flex align={'center'}> | ||
<Text mr="x2" fontWeight="heading"> | ||
To | ||
</Text> | ||
<NetworkSelector | ||
selectedChain={l2Chain} | ||
setSelectedChain={setL2Chain} | ||
/> | ||
</Flex> | ||
} | ||
secondaryLabel={'ETH'} | ||
autoComplete={'off'} | ||
type={'number'} | ||
placeholder={0} | ||
min={0} | ||
max={userL2Balance?.formatted} | ||
step={'any'} | ||
/> | ||
<Text mt="x3" color="text3"> | ||
Balance: {formatCryptoVal(formattedL2Balance)} ETH | ||
</Text> | ||
</Box> | ||
|
||
{!address ? ( | ||
<Button onClick={openConnectModal} type="button" w="100%" mt="x5"> | ||
Connect wallet | ||
</Button> | ||
) : isWalletOnL1 ? ( | ||
<Button | ||
disabled={!isValid || isContractWallet || loading} | ||
onClick={submitForm} | ||
type="submit" | ||
w="100%" | ||
mt="x5" | ||
> | ||
{getButtonText(isAmountInvalid || false)} | ||
</Button> | ||
) : ( | ||
<Button | ||
onClick={() => switchNetwork?.(l1Chain.id)} | ||
type="button" | ||
w="100%" | ||
mt="x5" | ||
> | ||
Switch network | ||
</Button> | ||
)} | ||
|
||
<Box fontSize={12} color="text3" mt="x4"> | ||
By proceeding, you agree to Nouns Builder's{' '} | ||
<Link href="/legal" style={{ textDecoration: 'underline' }}> | ||
terms | ||
</Link> | ||
. THIS BRIDGE IS DEPOSIT ONLY. YOU MUST USE ANOTHER BRIDGE TO WITHDRAW. | ||
Learn more about{' '} | ||
<Box | ||
as="a" | ||
rel="noopener noreferrer" | ||
target="_blank" | ||
style={{ textDecoration: 'underline' }} | ||
href="https://docs.zora.co/docs/guides/builder-bridging" | ||
> | ||
bridging | ||
</Box> | ||
. | ||
</Box> | ||
</Box> | ||
) | ||
}} | ||
</Formik> | ||
</Box> | ||
) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
import { useRouter } from 'next/router' | ||
import { useEffect } from 'react' | ||
|
||
import AnimatedModal from '../Modal/AnimatedModal' | ||
import { BridgeForm } from './BridgeForm' | ||
|
||
export const BridgeModal = () => { | ||
const { | ||
query: { bridge }, | ||
} = useRouter() | ||
|
||
useEffect(() => { | ||
document.body.style.overflow = !!bridge ? 'hidden' : 'unset' | ||
}, [bridge]) | ||
|
||
return ( | ||
<AnimatedModal open={!!bridge}> | ||
<BridgeForm /> | ||
</AnimatedModal> | ||
) | ||
} |
Oops, something went wrong.
e5de910
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Successfully deployed to the following URLs:
nouns-builder – ./apps/web
zouns-builder.vercel.app
nouns-builder-git-main-nouns-builder.vercel.app
nouns-builder-nouns-builder.vercel.app
nouns.build
www.nouns.build
e5de910
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Successfully deployed to the following URLs:
testnet-nouns-builder – ./apps/web
testnet-nouns-builder-git-main-nouns-builder.vercel.app
testnet-nouns-builder-nouns-builder.vercel.app
testnet.nouns.build