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

feat(webapp): handle error messages in faucet #758

Merged
merged 2 commits into from
Apr 8, 2022
Merged

feat(webapp): handle error messages in faucet #758

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
491b5b7
feat(webapp): handle error messages in faucet
leisterfrancisco Apr 8, 2022
2f08e32
fix(webapp): responsive on faucet
leisterfrancisco Apr 8, 2022
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
147 changes: 89 additions & 58 deletions webapp/src/routes/Faucet.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import React, { useEffect, useState } from 'react'
import { useMutation } from '@apollo/client'
import PropTypes from 'prop-types'
import { makeStyles } from '@material-ui/core/styles'
import Card from '@material-ui/core/Card'
import CardContent from '@material-ui/core/CardContent'
Expand All @@ -14,16 +13,18 @@ import { useGoogleReCaptcha } from 'react-google-recaptcha-v3'

import { eosConfig } from '../config'
import { CREATE_ACCOUNT_MUTATION, TRANFER_FAUCET_TOKENS_MUTATION } from '../gql'
import { useSnackbarMessageState } from '../context/snackbar-message.context'

const useStyles = makeStyles((theme) => ({
formControl: {
margin: theme.spacing(4, 4, 0, 0)
}
}))

const Faucet = ({ ual }) => {
const Faucet = () => {
const classes = useStyles()
const { t } = useTranslation('faucetRoute')
const [, { showMessage }] = useSnackbarMessageState()
const [account, setAccount] = useState('')
const [publicKey, setPublicKey] = useState('')
const [newCreatedAccount, setNewCreatedAccount] = useState('')
Expand Down Expand Up @@ -53,7 +54,14 @@ const Faucet = ({ ual }) => {
}
})
} catch (err) {
console.log('ERR', err)
const errorMessage = err.message.replace(
'GraphQL error: assertion failure with message: ',
''
)
showMessage({
type: 'error',
content: errorMessage
})
}
}

Expand All @@ -72,7 +80,14 @@ const Faucet = ({ ual }) => {
}
})
} catch (err) {
console.log('ERR', err)
const errorMessage = err.message.replace(
'GraphQL error: assertion failure with message: ',
''
)
showMessage({
type: 'error',
content: errorMessage
})
}
}

Expand All @@ -94,33 +109,45 @@ const Faucet = ({ ual }) => {

return (
<Grid container spacing={2}>
<Grid item xs={6}>
<Grid item xs={12} sm={6}>
<Card>
<CardContent>
<Typography variant="h5">{t('createAccount')}</Typography>
<Grid container alignItems="flex-end">
<TextField
key="action-field-issue-tokens"
label="Public Key (Active/Owner)"
variant="outlined"
className={classes.formControl}
value={publicKey}
onChange={(e) => setPublicKey(e.target.value)}
/>
<Button
type="submit"
variant="contained"
color="primary"
disabled={loadingCreateAccount}
endIcon={
loadingCreateAccount ? <CircularProgress size={20} /> : <></>
}
onClick={createAccount}
>
{t('createButton')}
</Button>
<Grid
container
alignItems="flex-end"
className={classes.formControl}
spacing={2}
>
<Grid item>
<TextField
key="action-field-issue-tokens"
label="Public Key (Active/Owner)"
variant="outlined"
value={publicKey}
onChange={(e) => setPublicKey(e.target.value)}
/>
</Grid>
<Grid item>
<Button
type="submit"
variant="contained"
color="primary"
disabled={loadingCreateAccount}
endIcon={
loadingCreateAccount ? (
<CircularProgress size={20} />
) : (
<></>
)
}
onClick={createAccount}
>
{t('createButton')}
</Button>
</Grid>
{newCreatedAccount && (
<Grid item xs={12}>
<Grid item xs={12} sm={6}>
<Typography variant="h5">{`${t(
'newCreatedAccount'
)} ${newCreatedAccount}`}</Typography>
Expand All @@ -130,37 +157,45 @@ const Faucet = ({ ual }) => {
</CardContent>
</Card>
</Grid>
<Grid item xs={6}>
<Grid item xs={12} sm={6}>
<Card>
<CardContent>
<Typography variant="h5">{t('issueTokens')}</Typography>
<Grid container alignItems="flex-end">
<TextField
key="action-field-issue-tokens"
label="Account (500 UOS)"
variant="outlined"
className={classes.formControl}
value={account}
onChange={(e) => setAccount(e.target.value)}
/>
<Button
type="submit"
variant="contained"
color="primary"
disabled={loadingTransferFaucetTokens}
endIcon={
loadingTransferFaucetTokens ? (
<CircularProgress size={20} />
) : (
<></>
)
}
onClick={transferTokens}
>
{t('getUOS')}
</Button>
<Grid
container
alignItems="flex-end"
className={classes.formControl}
spacing={2}
>
<Grid item>
<TextField
key="action-field-issue-tokens"
label="Account (500 UOS)"
variant="outlined"
value={account}
onChange={(e) => setAccount(e.target.value)}
/>
</Grid>
<Grid item>
<Button
type="submit"
variant="contained"
color="primary"
disabled={loadingTransferFaucetTokens}
endIcon={
loadingTransferFaucetTokens ? (
<CircularProgress size={20} />
) : (
<></>
)
}
onClick={transferTokens}
>
{t('getUOS')}
</Button>
</Grid>
{transferTokensTransaction && (
<Grid item xs={12}>
<Grid item xs={12} sm={6}>
<Typography variant="h5">
{t('transferTokensTransaction')}
</Typography>
Expand All @@ -182,8 +217,4 @@ const Faucet = ({ ual }) => {
)
}

Faucet.propTypes = {
ual: PropTypes.object
}

export default Faucet