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

(Fix) Send form fails to load (#574) 

* Fix material-ui/lab version

* Fix breaking changes introduced in commit b960dbf3cf36774a878239c9fed800b58d08abcd

* Fix web3connect version to `1.0.0-beta.25`
This commit is contained in:
Fernando 2020-02-18 14:33:16 -03:00 committed by GitHub
parent bb2f612490
commit fd5334669a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -45,7 +45,7 @@
"@gnosis.pm/util-contracts": "2.0.6",
"@material-ui/core": "4.8.0",
"@material-ui/icons": "4.5.1",
"@material-ui/lab": "^4.0.0-alpha.39",
"@material-ui/lab": "4.0.0-alpha.39",
"@portis/web3": "^2.0.0-beta.45",
"@testing-library/jest-dom": "4.2.4",
"@toruslabs/torus-embed": "0.2.10",

9
src/routes/safe/components/Settings/ManageOwners/AddOwnerModal/screens/ThresholdForm/index.jsx
View File

@ -22,7 +22,6 @@ export const ADD_OWNER_THRESHOLD_NEXT_BTN_TEST_ID = 'add-owner-threshold-next-bt
type Props = {
classes: Object,
meta: any,
onClickBack: Function,
onClose: () => void,
onSubmit: Function,
@ -30,7 +29,7 @@ type Props = {
threshold: number,
}
const ThresholdForm = ({ classes, onClose, owners, threshold, onClickBack, onSubmit, meta }: Props) => {
const ThresholdForm = ({ classes, onClose, owners, threshold, onClickBack, onSubmit }: Props) => {
const handleSubmit = values => {
onSubmit(values)
}
@ -63,7 +62,7 @@ const ThresholdForm = ({ classes, onClose, owners, threshold, onClickBack, onSub
<Col xs={2}>
<Field
name="threshold"
render={props => (
render={(props: any) => (
<>
<SelectField {...props} disableError>
{[...Array(Number(owners.size + 1))].map((x, index) => (
@ -72,9 +71,9 @@ const ThresholdForm = ({ classes, onClose, owners, threshold, onClickBack, onSub
</MenuItem>
))}
</SelectField>
{meta.error && meta.touched && (
{props.meta.error && props.meta.touched && (
<Paragraph className={classes.errorText} noMargin color="error">
{meta.error}
{props.meta.error}
</Paragraph>
)}
</>

9
src/routes/safe/components/Settings/ManageOwners/RemoveOwnerModal/screens/ThresholdForm/index.jsx
View File

@ -22,7 +22,6 @@ export const REMOVE_OWNER_THRESHOLD_NEXT_BTN_TEST_ID = 'remove-owner-threshold-n
type Props = {
classes: Object,
meta: any,
onClickBack: Function,
onClose: () => void,
onSubmit: Function,
@ -30,7 +29,7 @@ type Props = {
threshold: number,
}
const ThresholdForm = ({ classes, onClose, owners, threshold, onClickBack, onSubmit, meta }: Props) => {
const ThresholdForm = ({ classes, onClose, owners, threshold, onClickBack, onSubmit }: Props) => {
const handleSubmit = values => {
onSubmit(values)
}
@ -67,7 +66,7 @@ const ThresholdForm = ({ classes, onClose, owners, threshold, onClickBack, onSub
<Col xs={2}>
<Field
name="threshold"
render={props => (
render={(props: any) => (
<>
<SelectField {...props} disableError>
{[...Array(Number(numOptions))].map((x, index) => (
@ -76,9 +75,9 @@ const ThresholdForm = ({ classes, onClose, owners, threshold, onClickBack, onSub
</MenuItem>
))}
</SelectField>
{meta.error && meta.touched && (
{props.meta.error && props.meta.touched && (
<Paragraph className={classes.errorText} noMargin color="error">
{meta.error}
{props.meta.error}
</Paragraph>
)}
</>

8
yarn.lock
View File

@ -1367,10 +1367,10 @@
dependencies:
"@babel/runtime" "^7.4.4"
"@material-ui/lab@^4.0.0-alpha.39":
version "4.0.0-alpha.43"
resolved "https://registry.yarnpkg.com/@material-ui/lab/-/lab-4.0.0-alpha.43.tgz#4bc673924cf1922750d70adcbb71414d3c18ff23"
integrity sha512-UxsQggLpwr5HEZU+YRZkRVtpt5Cp27VwfYZz1InyGNWrtx9WovAYxEyR1xDvp/cmKhnSPCecVnqmb3dtLTpDqQ==
"@material-ui/lab@4.0.0-alpha.39":
version "4.0.0-alpha.39"
resolved "https://registry.yarnpkg.com/@material-ui/lab/-/lab-4.0.0-alpha.39.tgz#715ec621111ce876f1744bde1e55018341c4be3e"
integrity sha512-TbYfqS0zWdOzH44K7x74+dcLlMe6o5zrIvvHA2y6IZ1l9a9/qLUZGLwBIOtkBPHDDDJ32rv/bOPzOGGbnxLUDw==
dependencies:
"@babel/runtime" "^7.4.4"
"@material-ui/utils" "^4.7.1"