Merge branch '2.0' into 2.1

silverstripe · Oct 1, 2023 · 0f18b3d · 0f18b3d
2 parents a09a16b + d61964e
commit 0f18b3d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/client/dist/js/bundle.js b/client/dist/js/bundle.js
diff --git a/client/src/containers/FormBuilderLoader/FormBuilderLoader.js b/client/src/containers/FormBuilderLoader/FormBuilderLoader.js
@@ -184,10 +184,10 @@ class FormBuilderLoader extends Component {
             ...field,
             message,
           };
-        })
+        }),
+        // Non-field messages
+        messages: schema.errors.filter((error) => !error.field),
       },
-      // Non-field messages
-      messages: schema.errors.filter((error) => !error.field),
     };
 
     // Can be safely discarded