From bae3033f16de5b3293fef01e17d112d495c07c00 Mon Sep 17 00:00:00 2001
From: Nick Sellen <git@nicksellen.co.uk>
Date: Sun, 11 Dec 2022 21:06:22 +0000
Subject: [PATCH] Use updated validation API

Fixes #2614
---
 src/authuser/components/Settings/ProfileEdit.vue |  6 +++---
 src/authuser/components/Signup.vue               | 10 +++++-----
 src/group/components/ActivityTypeForm.vue        |  4 ++--
 src/group/components/PlaceTypeForm.vue           |  4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/authuser/components/Settings/ProfileEdit.vue b/src/authuser/components/Settings/ProfileEdit.vue
index 47b9caa932..2c17b609e7 100644
--- a/src/authuser/components/Settings/ProfileEdit.vue
+++ b/src/authuser/components/Settings/ProfileEdit.vue
@@ -138,9 +138,9 @@ export default {
     displayNameError () {
       if (this.v$.edit.displayName.$error) {
         const m = this.v$.edit.displayName
-        if (!m.required) return this.$t('VALIDATION.REQUIRED')
-        if (!m.minLength) return this.$t('VALIDATION.MINLENGTH', { min: 2 })
-        if (!m.maxLength) return this.$t('VALIDATION.MAXLENGTH', { max: 81 })
+        if (m.required.$invalid) return this.$t('VALIDATION.REQUIRED')
+        if (m.minLength.$invalid) return this.$t('VALIDATION.MINLENGTH', { min: 2 })
+        if (m.maxLength.$invalid) return this.$t('VALIDATION.MAXLENGTH', { max: 81 })
       }
       return this.firstError('displayName')
     },
diff --git a/src/authuser/components/Signup.vue b/src/authuser/components/Signup.vue
index e8c6edd144..71c0f4a0f3 100644
--- a/src/authuser/components/Signup.vue
+++ b/src/authuser/components/Signup.vue
@@ -129,9 +129,9 @@ export default {
     displayNameError () {
       if (this.v$.user.displayName.$error) {
         const m = this.v$.user.displayName
-        if (!m.required) return this.$t('VALIDATION.REQUIRED')
-        if (!m.minLength) return this.$t('VALIDATION.MINLENGTH', { min: 2 })
-        if (!m.maxLength) return this.$t('VALIDATION.MAXLENGTH', { max: 81 })
+        if (m.required.$invalid) return this.$t('VALIDATION.REQUIRED')
+        if (m.minLength.$invalid) return this.$t('VALIDATION.MINLENGTH', { min: 2 })
+        if (m.maxLength.$invalid) return this.$t('VALIDATION.MAXLENGTH', { max: 81 })
       }
       return this.firstError('displayName')
     },
@@ -141,8 +141,8 @@ export default {
     usernameError () {
       if (this.v$.user.username.$error) {
         const m = this.v$.user.username
-        if (!m.required) return this.$t('VALIDATION.REQUIRED')
-        if (!m.valid) return this.$t('VALIDATION.VALID_USERNAME')
+        if (m.required.$invalid) return this.$t('VALIDATION.REQUIRED')
+        if (m.valid.$invalid) return this.$t('VALIDATION.VALID_USERNAME')
       }
       const error = this.firstError('username')
       if (error === 'username_invalid') return this.$t('VALIDATION.VALID_USERNAME')
diff --git a/src/group/components/ActivityTypeForm.vue b/src/group/components/ActivityTypeForm.vue
index a577f8967a..d937034552 100644
--- a/src/group/components/ActivityTypeForm.vue
+++ b/src/group/components/ActivityTypeForm.vue
@@ -403,8 +403,8 @@ export default {
     nameError () {
       if (this.v$.edit.name.$error) {
         const m = this.v$.edit.name
-        if (!m.required) return this.$t('VALIDATION.REQUIRED')
-        if (!m.isUnique) return this.$t('VALIDATION.UNIQUE')
+        if (m.required.$invalid) return this.$t('VALIDATION.REQUIRED')
+        if (m.isUnique.$invalid) return this.$t('VALIDATION.UNIQUE')
       }
       return this.firstError('name')
     },
diff --git a/src/group/components/PlaceTypeForm.vue b/src/group/components/PlaceTypeForm.vue
index 0393cd2519..a3eb762b11 100644
--- a/src/group/components/PlaceTypeForm.vue
+++ b/src/group/components/PlaceTypeForm.vue
@@ -265,8 +265,8 @@ export default {
     nameError () {
       if (this.v$.edit.name.$error) {
         const m = this.v$.edit.name
-        if (!m.required) return this.$t('VALIDATION.REQUIRED')
-        if (!m.isUnique) return this.$t('VALIDATION.UNIQUE')
+        if (m.required.$invalid) return this.$t('VALIDATION.REQUIRED')
+        if (m.isUnique.$invalid) return this.$t('VALIDATION.UNIQUE')
       }
       return this.firstError('name')
     },