refactor: disable button logic and env vars

collective · Aug 20, 2021 · d09dcce · d09dcce
1 parent 76ce1b3
commit d09dcce
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/src/components/FormView.jsx b/src/components/FormView.jsx
@@ -48,9 +48,9 @@ const FormView = ({
 }) => {
   const intl = useIntl();
 
-  const captcha = process.env.RAZZLE_HCAPTCHA_KEY
+  const captcha = !!process.env.RAZZLE_HCAPTCHA_KEY
     ? 'HCaptcha'
-    : process.env.RAZZLE_RECAPTCHA_KEY
+    : !!process.env.RAZZLE_RECAPTCHA_KEY
     ? 'GoogleReCaptcha'
     : null;
 
@@ -174,10 +174,7 @@ const FormView = ({
                       primary
                       type="submit"
                       disabled={
-                        (!validToken?.current &&
-                          (!!process.env.RAZZLE_RECAPTCHA_KEY ||
-                            !!process.env.RAZZLE_HCAPTCHA_KEY)) ||
-                        formState.loading
+                        (captcha && !validToken?.current) || formState.loading
                       }
                     >
                       {data.submit_label ||