From 0ebb352df0bfd44dea25557307fbc9e3a59a0c38 Mon Sep 17 00:00:00 2001
From: Bubka <858858+Bubka@users.noreply.github.com>
Date: Tue, 21 Nov 2023 16:04:20 +0100
Subject: [PATCH] Fix validation errors being displayed besides alert
 notification

---
 resources/js_vue3/views/Start.vue                 | 7 +++++--
 resources/js_vue3/views/auth/webauthn/Recover.vue | 1 -
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/resources/js_vue3/views/Start.vue b/resources/js_vue3/views/Start.vue
index ee85892f..dbdde8b6 100644
--- a/resources/js_vue3/views/Start.vue
+++ b/resources/js_vue3/views/Start.vue
@@ -25,6 +25,7 @@
      * to the Create or Import form with decoded URI to prefill the form
      */
     function submitQrCode() {
+        form.clear()
         form.qrcode = qrcodeInput.value.files[0]
 
         form.upload('/api/v1/qrcode/decode', { returnError: true }).then(response => {
@@ -38,7 +39,9 @@
             }
         })
         .catch(error => {
-            notify.alert({ text: trans(error.response.data.message) })
+            if (error.response.status !== 422) {
+                notify.alert({ text: error.response.data.message })
+            }
         })
     }
 
@@ -77,8 +80,8 @@
                     <button v-else class="button is-link is-medium is-rounded is-main" @click="capture()">
                         {{ $t('twofaccounts.forms.scan_qrcode') }}
                     </button>
-                    <FieldError v-if="form.errors.hasAny('qrcode')" :error="form.errors.get('qrcode')" :field="'qrcode'" />
                 </div>
+                <FieldError v-if="form.errors.hasAny('qrcode')" :error="form.errors.get('qrcode')" :field="'qrcode'" />
             </div>
             <!-- alternative methods -->
             <div class="column is-full">
diff --git a/resources/js_vue3/views/auth/webauthn/Recover.vue b/resources/js_vue3/views/auth/webauthn/Recover.vue
index 72df543c..6b91f6a0 100644
--- a/resources/js_vue3/views/auth/webauthn/Recover.vue
+++ b/resources/js_vue3/views/auth/webauthn/Recover.vue
@@ -57,7 +57,6 @@
                         </RouterLink>
                     </p>
                 </div>
-                <FieldError v-if="form.errors.get('token') != undefined" :error="form.errors.get('token')" :field="form.token" />
                 <FormButtons
                     :submitId="'btnRecover'"
                     :isBusy="form.isBusy"