From fa6554a23f671a6ff4266a2704bbd74a80bca14a Mon Sep 17 00:00:00 2001
From: Bogdan Fazakas <bogdan.fazakas@gmail.com>
Date: Thu, 22 Apr 2021 13:37:43 +0300
Subject: [PATCH] fix for terms state (#545)

---
 package-lock.json                             | 2 +-
 src/components/atoms/Input/InputElement.tsx   | 1 +
 src/components/molecules/FormFields/Terms.tsx | 6 +++++-
 src/components/pages/Publish/FormPublish.tsx  | 5 ++++-
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 819111efb..514d19cf6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -16704,7 +16704,7 @@
       }
     },
     "ethereumjs-abi": {
-      "version": "git+https://github.com/ethereumjs/ethereumjs-abi.git#1a27c59c15ab1e95ee8e5c4ed6ad814c49cc439e",
+      "version": "git+https://github.com/ethereumjs/ethereumjs-abi.git#1ce6a1d64235fabe2aaf827fd606def55693508f",
       "from": "git+https://github.com/ethereumjs/ethereumjs-abi.git",
       "requires": {
         "bn.js": "^4.11.8",
diff --git a/src/components/atoms/Input/InputElement.tsx b/src/components/atoms/Input/InputElement.tsx
index d136e22e4..9cb35e2cb 100644
--- a/src/components/atoms/Input/InputElement.tsx
+++ b/src/components/atoms/Input/InputElement.tsx
@@ -81,6 +81,7 @@ export default function InputElement({
                   id={slugify(option)}
                   type={type}
                   name={name}
+                  checked={props.defaultChecked}
                   {...props}
                 />
                 <label className={styles.radioLabel} htmlFor={slugify(option)}>
diff --git a/src/components/molecules/FormFields/Terms.tsx b/src/components/molecules/FormFields/Terms.tsx
index ccc518ace..f11044720 100644
--- a/src/components/molecules/FormFields/Terms.tsx
+++ b/src/components/molecules/FormFields/Terms.tsx
@@ -14,6 +14,10 @@ const query = graphql`
 
 export default function Terms(props: InputProps): ReactElement {
   const data = useStaticQuery(query)
+  const termsProps: InputProps = {
+    ...props,
+    defaultChecked: props.value.toString() === 'true'
+  }
 
   return (
     <>
@@ -21,7 +25,7 @@ export default function Terms(props: InputProps): ReactElement {
         className={styles.terms}
         dangerouslySetInnerHTML={{ __html: data.terms.html }}
       />
-      <InputElement {...props} type="checkbox" />
+      <InputElement {...termsProps} type="checkbox" />
     </>
   )
 }
diff --git a/src/components/pages/Publish/FormPublish.tsx b/src/components/pages/Publish/FormPublish.tsx
index a3ad2820f..aad02dbde 100644
--- a/src/components/pages/Publish/FormPublish.tsx
+++ b/src/components/pages/Publish/FormPublish.tsx
@@ -39,8 +39,11 @@ export default function FormPublish({
     e: ChangeEvent<HTMLInputElement>,
     field: FormFieldProps
   ) {
+    const value =
+      field.type === 'terms' ? !JSON.parse(e.target.value) : e.target.value
+
     validateField(field.name)
-    setFieldValue(field.name, e.target.value)
+    setFieldValue(field.name, value)
   }
 
   const resetFormAndClearStorage = (e: FormEvent<Element>) => {