From fd5334669a8a8045cb0a6a15a1c87ec3aa54a181 Mon Sep 17 00:00:00 2001
From: Fernando <fernando.greco@gmail.com>
Date: Tue, 18 Feb 2020 14:33:16 -0300
Subject: [PATCH] (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`
---
 package.json                                             | 2 +-
 .../AddOwnerModal/screens/ThresholdForm/index.jsx        | 9 ++++-----
 .../RemoveOwnerModal/screens/ThresholdForm/index.jsx     | 9 ++++-----
 yarn.lock                                                | 8 ++++----
 4 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/package.json b/package.json
index 434edac2..e7ae607d 100644
--- a/package.json
+++ b/package.json
@@ -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",
diff --git a/src/routes/safe/components/Settings/ManageOwners/AddOwnerModal/screens/ThresholdForm/index.jsx b/src/routes/safe/components/Settings/ManageOwners/AddOwnerModal/screens/ThresholdForm/index.jsx
index bc41b862..774fed51 100644
--- a/src/routes/safe/components/Settings/ManageOwners/AddOwnerModal/screens/ThresholdForm/index.jsx
+++ b/src/routes/safe/components/Settings/ManageOwners/AddOwnerModal/screens/ThresholdForm/index.jsx
@@ -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>
                         )}
                       </>
diff --git a/src/routes/safe/components/Settings/ManageOwners/RemoveOwnerModal/screens/ThresholdForm/index.jsx b/src/routes/safe/components/Settings/ManageOwners/RemoveOwnerModal/screens/ThresholdForm/index.jsx
index 0a56727f..723b5c1b 100644
--- a/src/routes/safe/components/Settings/ManageOwners/RemoveOwnerModal/screens/ThresholdForm/index.jsx
+++ b/src/routes/safe/components/Settings/ManageOwners/RemoveOwnerModal/screens/ThresholdForm/index.jsx
@@ -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>
                           )}
                         </>
diff --git a/yarn.lock b/yarn.lock
index ff719fa4..19a4b674 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -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"