status-im
/
safe-react
mirror of https://github.com/status-im/safe-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove validator to check that safeTxGas is lower than gasLimit (#2089)

This commit is contained in:
Daniel Sanchez 2021-03-26 16:23:52 +01:00 committed by GitHub
parent eb201e2621
commit c25946ab8f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/routes/safe/components/Transactions/helpers/EditTxParametersForm/index.tsx
View File

@ -1,4 +1,4 @@
import React from 'react' import React, { ReactElement } from 'react'
import IconButton from '@material-ui/core/IconButton' import IconButton from '@material-ui/core/IconButton'
import Close from '@material-ui/icons/Close' import Close from '@material-ui/icons/Close'
import { makeStyles } from '@material-ui/core/styles' import { makeStyles } from '@material-ui/core/styles'
@ -13,10 +13,9 @@ import Row from 'src/components/layout/Row'
import { styles } from './style' import { styles } from './style'
import GnoForm from 'src/components/forms/GnoForm' import GnoForm from 'src/components/forms/GnoForm'
import { TxParameters } from 'src/routes/safe/container/hooks/useTransactionParameters' import { TxParameters } from 'src/routes/safe/container/hooks/useTransactionParameters'
import { composeValidators, minValue } from 'src/components/forms/validator' import { minValue } from 'src/components/forms/validator'
import { ParametersStatus, areSafeParamsEnabled, areEthereumParamsVisible, ethereumTxParametersTitle } from '../utils' import { ParametersStatus, areSafeParamsEnabled, areEthereumParamsVisible, ethereumTxParametersTitle } from '../utils'
import { getNetworkInfo } from 'src/config'
const StyledDivider = styled(Divider)` const StyledDivider = styled(Divider)`
margin: 16px 0; margin: 16px 0;
@ -59,8 +58,6 @@ const StyledTextMt = styled(Text)`
const useStyles = makeStyles(styles) const useStyles = makeStyles(styles)
const { label } = getNetworkInfo()
interface Props { interface Props {
txParameters: TxParameters txParameters: TxParameters
onClose: (txParameters?: TxParameters) => void onClose: (txParameters?: TxParameters) => void
@ -79,15 +76,7 @@ const formValidation = (values) => {
const safeNonceValidation = minValue(0, true)(safeNonce) const safeNonceValidation = minValue(0, true)(safeNonce)
const safeTxGasValidation = composeValidators(minValue(0, true), (value: string) => { const safeTxGasValidation = minValue(0, true)(safeTxGas)
if (!value) {
return
}
if (Number(value) > Number(ethGasLimit)) {
return `Bigger than ${label} gas limit.`
}
})(safeTxGas)
return { return {
ethGasLimit: ethGasLimitValidation, ethGasLimit: ethGasLimitValidation,
@ -103,7 +92,7 @@ export const EditTxParametersForm = ({
txParameters, txParameters,
parametersStatus = 'ENABLED', parametersStatus = 'ENABLED',
isExecution, isExecution,
}: Props): React.ReactElement => { }: Props): ReactElement => {
const classes = useStyles() const classes = useStyles()
const { safeNonce, safeTxGas, ethNonce, ethGasLimit, ethGasPrice } = txParameters const { safeNonce, safeTxGas, ethNonce, ethGasLimit, ethGasPrice } = txParameters