Merge branch 'master' into simplified-view

dashboard/src/main/auth/Register.tsx

@@ -45,6 +45,7 @@ const Register: React.FC<Props> = ({
   const [hasGithub, setHasGithub] = useState(true);
   const [hasGoogle, setHasGoogle] = useState(false);
   const [windowDimensions, setWindowDimensions] = useState(getWindowDimensions());
+  const [buttonDisabled, setButtonDisabled] = useState(false);
 
   const handleRegister = (): void => {
     if (!emailRegex.test(email)) {
@@ -75,6 +76,8 @@ const Register: React.FC<Props> = ({
       password !== "" &&
       companyName !== ""
     ) {
+      setButtonDisabled(true);
+      
       // Attempt user registration
       api
         .registerUser(
@@ -98,13 +101,16 @@ const Register: React.FC<Props> = ({
 
           // Temp
           location.reload();
+          setButtonDisabled(false);
         })
         .catch((err) => {
-          console.log("registration:", err)
-          location.reload();
+          console.log("registration:", err);
           if (err.response?.data?.error) {
             setCurrentError(err.response.data.error)
+          } else {
+            location.reload();
           }
+          setButtonDisabled(false);
         });
     }
   };
@@ -309,7 +315,7 @@ const Register: React.FC<Props> = ({
               error={(passwordError && "")}
             />
             <Spacer height="30px" />
-            <Button onClick={handleRegister} width="100%" height="40px">
+            <Button disabled={buttonDisabled} onClick={handleRegister} width="100%" height="40px">
               Continue
             </Button>
           </>