From c3cf48c26815b8b79d130a7a177e4da74c00d9a5 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <aptkingston@ssl-mail.com>
Date: Thu, 19 Aug 2021 13:41:18 +0100
Subject: [PATCH] Clear form field error when re-registering the same field

---
 packages/standard-components/src/forms/InnerForm.svelte | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/standard-components/src/forms/InnerForm.svelte b/packages/standard-components/src/forms/InnerForm.svelte
index 32cae9f8bc..ec5c066699 100644
--- a/packages/standard-components/src/forms/InnerForm.svelte
+++ b/packages/standard-components/src/forms/InnerForm.svelte
@@ -73,9 +73,14 @@
         return
       }
 
-      // Skip if we've already registered this field
+      // If we've already registered this field then wipe any errors and
+      // return the existing field
       const existingField = getField(field)
       if (existingField) {
+        existingField.update(state => {
+          state.fieldState.error = null
+          return state
+        })
         return existingField
       }