Skip to content

Commit

Permalink
airdrop flow
Browse files Browse the repository at this point in the history
  • Loading branch information
calvinkei committed Dec 15, 2021
1 parent 57b1e83 commit d59c1b6
Show file tree
Hide file tree
Showing 12 changed files with 178 additions and 24 deletions.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions assets/images/icons/icon_tick.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17 changes: 17 additions & 0 deletions assets/images/icons/icon_warning.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 6 additions & 3 deletions components/Banner/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Link from 'next/link'
import { Card, CardMedia, alpha, useTheme } from '@material-ui/core'
import { Box, Card, CardMedia, alpha, useTheme } from '@material-ui/core'
import Carousel from 'react-material-ui-carousel'
import useStyles from './style'

Expand All @@ -23,14 +23,17 @@ const Banner: React.FC = () => {
}}
activeIndicatorIconButtonProps={{
style: {
color: theme.palette.primary.main,
backgroundColor: theme.palette.primary.main,
margin: theme.spacing(0.5, 0.5, 0),
},
}}
indicatorIconButtonProps={{
style: {
color: alpha(theme.palette.primary.main, 0.6),
backgroundColor: alpha(theme.palette.primary.main, 0.6),
margin: theme.spacing(0.5, 0.5, 0),
},
}}
IndicatorIcon={<Box p={0.5} borderRadius="50%" />}
>
{banners.map((banner) => (
<Link href="/dsm-airdrop" key={banner}>
Expand Down
8 changes: 5 additions & 3 deletions components/ConnectChainDialog/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ interface ConnectChainDialogProps {
onClose(event?: unknown, reason?: string): void
connections: ChainConnection[]
account: Account
shouldConnect?: boolean
}

interface Content {
Expand All @@ -51,6 +52,7 @@ const ConnectChainDialog: React.FC<ConnectChainDialogProps> = ({
onClose,
connections,
account,
shouldConnect,
}) => {
const { t } = useTranslation('common')
const classes = useStyles()
Expand All @@ -59,7 +61,7 @@ const ConnectChainDialog: React.FC<ConnectChainDialogProps> = ({
const sendTransaction = useSendTransaction()
const { password } = useWalletsContext()
const [stage, setStage, toPrevStage, isPrevStageAvailable] = useStateHistory<Stage>(
Stage.StartStage
shouldConnect ? Stage.SelectChainStage : Stage.StartStage
)

const [mnemonic, setMnemonic] = React.useState('')
Expand All @@ -80,9 +82,9 @@ const ConnectChainDialog: React.FC<ConnectChainDialogProps> = ({
setChain('')
setLedgerApp('')
setError('')
setStage(Stage.StartStage, true)
setStage(shouldConnect ? Stage.SelectChainStage : Stage.StartStage, true)
}
}, [open])
}, [open, shouldConnect])

React.useEffect(() => {
setError('')
Expand Down
Loading

0 comments on commit d59c1b6

Please sign in to comment.