Login Page Fix

Author: rajatmohan22

client/common/Button.jsx

@@ -66,9 +66,7 @@ const StyledButton = styled.button`
       color: ${({ kind }) => prop(`Button.${kind}.disabled.foreground`)};
       background-color: ${({ kind }) =>
         prop(`Button.${kind}.disabled.background`)};
-      border-color: ${({ kind }) => prop(`Button.${kind}.disabled.border`)};
-      cursor: not-allowed;
-
+    }
       svg * {
         fill: ${({ kind }) => prop(`Button.${kind}.disabled.foreground`)};
       }
@@ -144,7 +142,6 @@ const StyledIconButton = styled.button`
         fill: ${({ kind }) => prop(`Button.${kind}.active.foreground`)};
       }
     }
-
     &:disabled {
       color: ${({ kind }) => prop(`Button.${kind}.disabled.foreground`)};
       background-color: ${({ kind }) =>

client/modules/User/components/LoginForm.jsx

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Form, Field } from 'react-final-form';
 import { useDispatch } from 'react-redux';
@@ -7,8 +7,23 @@ import { validateLogin } from '../../../utils/reduxFormUtils';
 import { validateAndLoginUser } from '../actions';
 
 function LoginForm() {
+  const [contentPresent, setContentPresent] = useState(false);
   const { t } = useTranslation();
 
+  useEffect(() => {
+    const checkEmailElement = () => {
+      if (
+        document.getElementById('email') &&
+        document.getElementById('password')
+      ) {
+        setContentPresent(true);
+      } else {
+        setContentPresent(false);
+      }
+    };
+    checkEmailElement();
+  }, []);
+
   const dispatch = useDispatch();
   function onSubmit(formProps) {
     return dispatch(validateAndLoginUser(formProps));
@@ -71,7 +86,10 @@ function LoginForm() {
           {submitError && !modifiedSinceLastSubmit && (
             <span className="form-error">{submitError}</span>
           )}
-          <Button type="submit" disabled={submitting || pristine}>
+          <Button
+            type="submit"
+            disabled={(submitting || pristine) && !contentPresent}
+          >
             {t('LoginForm.Submit')}
           </Button>
         </form>