review findings

ocadotechnology · Aug 13, 2024 · d79c335 · d79c335
1 parent 91b9bbc
commit d79c335
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/pages/register/IndyForm.tsx b/src/pages/register/IndyForm.tsx
@@ -40,7 +40,7 @@ const IndyForm: FC<IndyFormProps> = () => {
           password_repeat: "",
         }}
         onSubmit={submitForm(createIndependentUser, {
-          exclude: ["password_repeat"],
+          exclude: ["password_repeat", "meets_criteria"],
           then: () => {
             navigate(paths.register.emailVerification.userType.indy._)
           },

diff --git a/src/pages/register/TeacherForm.tsx b/src/pages/register/TeacherForm.tsx
@@ -37,7 +37,7 @@ const TeacherForm: FC<TeacherFormProps> = () => {
           },
         }}
         onSubmit={submitForm(createTeacher, {
-          exclude: ["user.password_repeat"],
+          exclude: ["user.password_repeat", "user.meets_criteria"],
           then: () => {
             navigate(paths.register.emailVerification.userType.teacher._)
           },

diff --git a/src/pages/studentAccount/UpdateAccountForm.tsx b/src/pages/studentAccount/UpdateAccountForm.tsx
@@ -91,13 +91,13 @@ const UpdateAccountForm: FC<UpdateAccountFormProps> = ({ user }) => {
             const messages = [
               "Your account details have been changed successfully.",
             ]
-            if (values.email !== initialValues.email) {
+            if (isDirty(values, initialValues, "email")) {
               // TODO: implement this behavior on the backend.
               messages.push(
                 "Your email will be changed once you have verified it, until then you can still log in with your old email.",
               )
             }
-            if (values.password !== initialValues.password) {
+            if (isDirty(values, initialValues, "password")) {
               messages.push(
                 "Going forward, please login using your new password.",
               )
@@ -122,7 +122,7 @@ const UpdateAccountForm: FC<UpdateAccountFormProps> = ({ user }) => {
           let passwordSchema = user.student
             ? studentPasswordSchema()
             : indyPasswordSchema()
-          if (form.values.current_password !== initialValues.current_password) {
+          if (isDirty(form.values, initialValues, "current_password")) {
             passwordSchema = passwordSchema.notOneOf(
               [form.values.current_password],
               "cannot match your current password",