From ed48fa6facfef1750109b704961285766472fa67 Mon Sep 17 00:00:00 2001
From: Yann Stepienik <azukaar@gmail.com>
Date: Tue, 16 May 2023 19:34:21 +0100
Subject: [PATCH] [release] version 0.5.0-unstable16

---
 client/src/pages/newInstall/newInstall.jsx | 29 ++++++++++------------
 package.json                               |  2 +-
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/client/src/pages/newInstall/newInstall.jsx b/client/src/pages/newInstall/newInstall.jsx
index ef947ad..ff0e3a2 100644
--- a/client/src/pages/newInstall/newInstall.jsx
+++ b/client/src/pages/newInstall/newInstall.jsx
@@ -331,7 +331,7 @@ const NewInstall = () => {
                                 type="submit"
                                 variant="contained"
                                 color="primary"
-                                disabled={formik.isSubmitting}
+                                disabled={formik.isSubmitting || !formik.isValid}
                                 fullWidth>
                                 {formik.isSubmitting ? 'Loading' : (
                                     formik.values.HTTPSCertificateMode === "DISABLE" ? 'Disable' : 'Update'
@@ -371,23 +371,20 @@ const NewInstall = () => {
                         confirmPassword: Yup.string().oneOf([Yup.ref('password'), null], 'Passwords must match'),
                     })}
                     onSubmit={async (values, { setErrors, setStatus, setSubmitting }) => {
-                        try {
-                            setSubmitting(true);
-                            const res = await API.newInstall({
-                                step: "4",
-                                nickname: values.nickname,
-                                password: values.password,
-                                email: values.email,
-                            });
-                            if(res.status == "OK") {
-                                setStatus({ success: true });
-                                setActiveStep(5);
-                            }
-                        } catch (error) {
+                        setSubmitting(true);
+                        return await API.newInstall({
+                            step: "4",
+                            nickname: values.nickname,
+                            password: values.password,
+                            email: values.email,
+                        }).then((res) => {
+                            setStatus({ success: true });
+                            setActiveStep(5);
+                        }).catch((error) => {
                             setStatus({ success: false });
                             setErrors({ submit: error.message });
                             setSubmitting(false);
-                        }
+                        });
                     }}>
                     {(formik) => (
                         <form noValidate onSubmit={formik.handleSubmit}>
@@ -429,7 +426,7 @@ const NewInstall = () => {
                                     type="submit"
                                     variant="contained"
                                     color="primary"
-                                    disabled={formik.isSubmitting}
+                                    disabled={formik.isSubmitting || !formik.isValid}
                                     fullWidth>
                                     {formik.isSubmitting ? 'Loading' : 'Create'}
                                 </Button>
diff --git a/package.json b/package.json
index e52af0a..79fa27f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cosmos-server",
-  "version": "0.5.0-unstable15",
+  "version": "0.5.0-unstable16",
   "description": "",
   "main": "test-server.js",
   "bugs": {