@bigbinary/neeto-form-frontend 1.2.25 → 1.2.27

package/dist/index.js

@@ -1,5 +1,5 @@
 import * as React$2 from 'react';
-import React__default, { useState, useRef, useEffect, useContext, useLayoutEffect as useLayoutEffect$1, memo, forwardRef, useImperativeHandle, Fragment, useReducer, useCallback as useCallback$1, useMemo as useMemo$1, createContext, createElement } from 'react';
+import React__default, { useState, useRef, useEffect, useContext, useLayoutEffect as useLayoutEffect$1, forwardRef, useImperativeHandle, Fragment, useReducer, useCallback as useCallback$1, useMemo as useMemo$1, createContext, createElement } from 'react';
 import { useField, useFormikContext, FieldArray, Form as Form$1, Formik, Field, FastField } from 'formik';
 import { noop as noop$4, slugify, filterBy, findBy, removeBy, isPresent as isPresent$1, isNotEmpty, findById, notEqualsDeep } from '@bigbinary/neeto-cist';
 import PageLoader from '@bigbinary/neeto-molecules/PageLoader';
@@ -22,11 +22,11 @@ import { withEventTargetValue, getQueryParams, dateFormat } from '@bigbinary/nee
 import useHotkeys from '@bigbinary/neeto-hotkeys';
 import dayjs from 'dayjs';
 import { validation, PhoneNumberInput, PhoneNumber as PhoneNumber$1 } from '@bigbinary/neeto-molecules/PhoneNumber';
-import path$1 from 'path';
 import localeData from 'dayjs/plugin/localeData';
 import utc from 'dayjs/plugin/utc';
 import weekday from 'dayjs/plugin/weekday';
 import weekOfYear from 'dayjs/plugin/weekOfYear';
+import path$1 from 'path';
 
 function _extends$8() {
   _extends$8 = Object.assign ? Object.assign.bind() : function (target) {
@@ -125,7 +125,7 @@ function _objectWithoutProperties$1(source, excluded) {
   return target;
 }
 
-var _excluded$e = ["size"],
+var _excluded$c = ["size"],
   _excluded2$1 = ["size"],
   _excluded3$2 = ["size"],
   _excluded4$1 = ["size"],
@@ -133,7 +133,7 @@ var _excluded$e = ["size"],
 var Star = function Star(props) {
   var _props$size = props.size,
     size = _props$size === void 0 ? 20 : _props$size,
-    other = _objectWithoutProperties$1(props, _excluded$e);
+    other = _objectWithoutProperties$1(props, _excluded$c);
   return /*#__PURE__*/React__default.createElement("svg", _extends$8({
     fill: "none",
     height: size,
@@ -553,23 +553,23 @@ var neetoFormApi = {
   updatePublicSubmission: updatePublicSubmission
 };
 
-var _excluded$d = ["formId", "preview"],
+var _excluded$b = ["formId", "preview"],
   _excluded3$1 = ["formId", "submissionId"];
-function ownKeys$e(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$d(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$e(Object(t), !0).forEach(function (r) { _defineProperty$6(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$e(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$g(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$f(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$g(Object(t), !0).forEach(function (r) { _defineProperty$6(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$g(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var useForm = function useForm(_ref) {
   var formId = _ref.formId,
     preview = _ref.preview,
-    options = _objectWithoutProperties$1(_ref, _excluded$d);
+    options = _objectWithoutProperties$1(_ref, _excluded$b);
   return useQuery([QUERY_KEYS.QUESTIONS, preview ? "preview/".concat(formId) : formId], function () {
     return neetoFormApi.getPublicQuestions(formId);
-  }, _objectSpread$d({
+  }, _objectSpread$f({
     keepPreviousData: true
   }, options));
 };
 var useCreateForm = function useCreateForm(options) {
   var queryClient = useQueryClient();
-  return useMutation(neetoFormApi.createForm, _objectSpread$d(_objectSpread$d({}, options), {}, {
+  return useMutation(neetoFormApi.createForm, _objectSpread$f(_objectSpread$f({}, options), {}, {
     onSuccess: function onSuccess(form) {
       var _options$onSuccess;
       queryClient.setQueryData(QUERY_KEYS.QUESTIONS, function (forms) {
@@ -588,16 +588,16 @@ var useUpdateForm = function useUpdateForm(options) {
     var id = _ref2.id,
       values = _ref2.values;
     return neetoFormApi.updateForm(id, values);
-  }, _objectSpread$d(_objectSpread$d({}, options), {}, {
+  }, _objectSpread$f(_objectSpread$f({}, options), {}, {
     onSuccess: function onSuccess(data, _ref3) {
       var id = _ref3.id;
       queryClient.setQueryData([QUERY_KEYS.QUESTIONS, id], function (form) {
-        return _objectSpread$d(_objectSpread$d({}, form), {}, {
+        return _objectSpread$f(_objectSpread$f({}, form), {}, {
           title: data.title
         });
       });
       queryClient.setQueryData([QUERY_KEYS.QUESTIONS, "preview/".concat(id)], function (form) {
-        return _objectSpread$d(_objectSpread$d({}, form), {}, {
+        return _objectSpread$f(_objectSpread$f({}, form), {}, {
           title: data.title,
           questions: data.questions
         });
@@ -615,7 +615,7 @@ var useUpdateQuestions = function useUpdateQuestions(options) {
     var id = _ref4.id,
       values = _ref4.values;
     return neetoFormApi.updateQuestions(id, values);
-  }, _objectSpread$d(_objectSpread$d({}, options), {}, {
+  }, _objectSpread$f(_objectSpread$f({}, options), {}, {
     onSuccess: function onSuccess() {
       for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
         args[_key] = arguments[_key];
@@ -623,12 +623,12 @@ var useUpdateQuestions = function useUpdateQuestions(options) {
       var data = args[0],
         id = args[1].id;
       queryClient.setQueryData([QUERY_KEYS.QUESTIONS, id], function (form) {
-        return _objectSpread$d(_objectSpread$d({}, form), {}, {
+        return _objectSpread$f(_objectSpread$f({}, form), {}, {
           questions: data.questions
         });
       });
       queryClient.setQueryData([QUERY_KEYS.QUESTIONS, "preview/".concat(id)], function (form) {
-        return _objectSpread$d(_objectSpread$d({}, form), {}, {
+        return _objectSpread$f(_objectSpread$f({}, form), {}, {
           questions: data.questions
         });
       });
@@ -637,7 +637,7 @@ var useUpdateQuestions = function useUpdateQuestions(options) {
   }));
 };
 var useForms = function useForms(options) {
-  return useQuery([QUERY_KEYS.FORMS], neetoFormApi.getForms, _objectSpread$d({
+  return useQuery([QUERY_KEYS.FORMS], neetoFormApi.getForms, _objectSpread$f({
     keepPreviousData: true
   }, options));
 };
@@ -646,7 +646,7 @@ var useDeleteForm = function useDeleteForm(options) {
   return useMutation(function (_ref5) {
     var id = _ref5.id;
     return neetoFormApi.destroyForm(id);
-  }, _objectSpread$d(_objectSpread$d({}, options), {}, {
+  }, _objectSpread$f(_objectSpread$f({}, options), {}, {
     onSuccess: function onSuccess() {
       for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
         args[_key2] = arguments[_key2];
@@ -665,7 +665,7 @@ var useSubmission = function useSubmission(_ref7) {
     options = _objectWithoutProperties$1(_ref7, _excluded3$1);
   return useQuery([QUERY_KEYS.SUBMISSION, formId, submissionId], function () {
     return neetoFormApi.getPublicSubmission(formId, submissionId);
-  }, _objectSpread$d(_objectSpread$d({}, options), {}, {
+  }, _objectSpread$f(_objectSpread$f({}, options), {}, {
     keepPreviousData: true
   }));
 };
@@ -675,7 +675,7 @@ var useCreateSubmission = function useCreateSubmission(options) {
     var formId = _ref8.formId,
       values = _ref8.values;
     return neetoFormApi.submitPublicForm(formId, values);
-  }, _objectSpread$d(_objectSpread$d({}, options), {}, {
+  }, _objectSpread$f(_objectSpread$f({}, options), {}, {
     onSuccess: function onSuccess() {
       var _data$submission, _data$submission2;
       for (var _len3 = arguments.length, args = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
@@ -696,7 +696,7 @@ var useUpdateSubmission = function useUpdateSubmission(options) {
     var formId = _ref9.formId,
       values = _ref9.values;
     return neetoFormApi.updatePublicSubmission(formId, values);
-  }, _objectSpread$d(_objectSpread$d({}, options), {}, {
+  }, _objectSpread$f(_objectSpread$f({}, options), {}, {
     onSuccess: function onSuccess() {
       var _data$submission3;
       for (var _len4 = arguments.length, args = new Array(_len4), _key4 = 0; _key4 < _len4; _key4++) {
@@ -890,7 +890,7 @@ function _defineProperty$5(obj, key, value) {
   return obj;
 }
 
-function ownKeys$d(e, r) {
+function ownKeys$f(e, r) {
   var t = Object.keys(e);
   if (Object.getOwnPropertySymbols) {
     var o = Object.getOwnPropertySymbols(e);
@@ -903,9 +903,9 @@ function ownKeys$d(e, r) {
 function _objectSpread2(e) {
   for (var r = 1; r < arguments.length; r++) {
     var t = null != arguments[r] ? arguments[r] : {};
-    r % 2 ? ownKeys$d(Object(t), !0).forEach(function (r) {
+    r % 2 ? ownKeys$f(Object(t), !0).forEach(function (r) {
       _defineProperty$5(e, r, t[r]);
-    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$d(Object(t)).forEach(function (r) {
+    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$f(Object(t)).forEach(function (r) {
       Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r));
     });
   }
@@ -1625,7 +1625,7 @@ reactIs_production_min.isValidElementType=function(a){return "string"===typeof a
 
 var reactIsExports = reactIs.exports;
 
-const _excluded$c = ["initMapStateToProps", "initMapDispatchToProps", "initMergeProps"];
+const _excluded$a = ["initMapStateToProps", "initMapDispatchToProps", "initMergeProps"];
 function pureFinalPropsSelectorFactory(mapStateToProps, mapDispatchToProps, mergeProps, dispatch, {
   areStatesEqual,
   areOwnPropsEqual,
@@ -1695,7 +1695,7 @@ function finalPropsSelectorFactory(dispatch, _ref) {
     initMapDispatchToProps,
     initMergeProps
   } = _ref,
-      options = _objectWithoutPropertiesLoose$1(_ref, _excluded$c);
+      options = _objectWithoutPropertiesLoose$1(_ref, _excluded$a);
 
   const mapStateToProps = initMapStateToProps(dispatch, options);
   const mapDispatchToProps = initMapDispatchToProps(dispatch, options);
@@ -2032,7 +2032,7 @@ function shallowEqual(objA, objB) {
   return true;
 }
 
-const _excluded$b = ["reactReduxForwardedRef"];
+const _excluded$9 = ["reactReduxForwardedRef"];
 let useSyncExternalStore = notInitialized;
 const initializeConnect = fn => {
   useSyncExternalStore = fn;
@@ -2210,7 +2210,7 @@ function connect(mapStateToProps, mapDispatchToProps, mergeProps, {
         const {
           reactReduxForwardedRef
         } = props,
-              wrapperProps = _objectWithoutPropertiesLoose$1(props, _excluded$b);
+              wrapperProps = _objectWithoutPropertiesLoose$1(props, _excluded$9);
 
         return [props.context, reactReduxForwardedRef, wrapperProps];
       }, [props]);
@@ -9776,8 +9776,8 @@ const ConnectedDroppable = connect(makeMapStateToProps, mapDispatchToProps, (sta
 })(Droppable$1);
 var ConnectedDroppable$1 = ConnectedDroppable;
 
-function ownKeys$c(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$c(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$c(Object(t), !0).forEach(function (r) { _defineProperty$6(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$c(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$e(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$e(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$e(Object(t), !0).forEach(function (r) { _defineProperty$6(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$e(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var defaultConfig = {
   strict: true,
   matchKey: "value"
@@ -9785,7 +9785,7 @@ var defaultConfig = {
 var findOptionByValue = function findOptionByValue(value) {
   var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
   var config = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-  var configObject = _objectSpread$c(_objectSpread$c({}, defaultConfig), config);
+  var configObject = _objectSpread$e(_objectSpread$e({}, defaultConfig), config);
   var matchKey = configObject.matchKey,
     strict = configObject.strict;
   return options.find(function (option) {
@@ -9799,7 +9799,7 @@ var filterOptionsByValues = function filterOptionsByValues() {
   var values = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
   var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
   var config = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-  var configObject = _objectSpread$c(_objectSpread$c({}, defaultConfig), config);
+  var configObject = _objectSpread$e(_objectSpread$e({}, defaultConfig), config);
   var matchKey = configObject.matchKey,
     strict = configObject.strict;
   return options.filter(function (option) {
@@ -9817,7 +9817,7 @@ var destroyFromList = function destroyFromList(items, index) {
     var nextItems = _toConsumableArray$1(items);
     nextItems.splice(index, 1);
     if (itemToRemove.id) {
-      nextItems.push(_objectSpread$c(_objectSpread$c({}, itemToRemove), {}, {
+      nextItems.push(_objectSpread$e(_objectSpread$e({}, itemToRemove), {}, {
         _destroy: true
       }));
     }
@@ -9878,14 +9878,14 @@ var ListItem = function ListItem(_ref) {
   }, label));
 };
 
-var _excluded$a = ["size", "color"],
+var _excluded$8 = ["size", "color"],
   _excluded2 = ["size", "color"],
   _excluded3 = ["size", "color"],
   _excluded4 = ["size", "color"];
 var BadSmiley = function BadSmiley(props) {
   var size = props.size,
     color = props.color,
-    other = _objectWithoutProperties$1(props, _excluded$a);
+    other = _objectWithoutProperties$1(props, _excluded$8);
   return /*#__PURE__*/React__default.createElement("svg", _extends$8({
     fill: "none",
     height: size,
@@ -10099,10 +10099,10 @@ var Accordion = function Accordion(_ref) {
   }));
 };
 
-var _excluded$9 = ["maxLength"];
+var _excluded$7 = ["maxLength"];
 var InputWithMaxLength = function InputWithMaxLength(_ref) {
   var maxLength = _ref.maxLength,
-    props = _objectWithoutProperties$1(_ref, _excluded$9);
+    props = _objectWithoutProperties$1(_ref, _excluded$7);
   var _useField = useField(props),
     _useField2 = _slicedToArray$3(_useField, 3),
     value = _useField2[0].value,
@@ -10118,10 +10118,10 @@ var InputWithMaxLength = function InputWithMaxLength(_ref) {
   }));
 };
 
-var _excluded$8 = ["maxLength"];
+var _excluded$6 = ["maxLength"];
 var TextAreaWithMaxLength = function TextAreaWithMaxLength(_ref) {
   var maxLength = _ref.maxLength,
-    props = _objectWithoutProperties$1(_ref, _excluded$8);
+    props = _objectWithoutProperties$1(_ref, _excluded$6);
   var _useField = useField(props),
     _useField2 = _slicedToArray$3(_useField, 3),
     value = _useField2[0].value,
@@ -10184,7 +10184,7 @@ var AdditionalGuests$1 = withT(function (_ref) {
   }));
 });
 
-var Condition$3 = function Condition(_ref) {
+var Condition$1 = function Condition(_ref) {
   var name = _ref.name,
     isRequired = _ref.isRequired,
     isLabelDisabled = _ref.isLabelDisabled;
@@ -10897,7 +10897,7 @@ var StarRating$3 = function StarRating(_ref) {
   }));
 };
 
-var Terms$3 = function Terms(_ref) {
+var Terms$1 = function Terms(_ref) {
   var name = _ref.name,
     isLabelDisabled = _ref.isLabelDisabled;
   var editorRef = useRef(null);
@@ -10941,11 +10941,11 @@ var Fields = {
   SingleChoice: SingleChoice$1,
   Phone: Phone$1,
   Rating: Rating$3,
-  Terms: Terms$3,
+  Terms: Terms$1,
   StarRating: StarRating$3,
   AdditionalGuests: AdditionalGuests$1,
   RichText: RichText$1,
-  Condition: Condition$3,
+  Condition: Condition$1,
   FileUpload: FileUpload$2
 };
 
@@ -11002,11 +11002,11 @@ var Email = Fields.Email,
   SingleChoice = Fields.SingleChoice,
   Phone = Fields.Phone,
   Rating$2 = Fields.Rating,
-  Terms$2 = Fields.Terms,
+  Terms = Fields.Terms,
   StarRating$2 = Fields.StarRating,
   AdditionalGuests = Fields.AdditionalGuests,
   RichText = Fields.RichText,
-  Condition$2 = Fields.Condition,
+  Condition = Fields.Condition,
   FileUpload$1 = Fields.FileUpload;
 var SINGLE_CHOICE_FIELD_MIN_OPTIONS = 2;
 var DROPDOWN_FIELD_MIN_OPTIONS = 2;
@@ -11174,7 +11174,7 @@ var QUESTION_KINDS = [{
   label: t$4("neetoForm.fields.tcf"),
   isSingular: true,
   icon: NeetoInvisible,
-  component: Terms$2,
+  component: Terms,
   defaults: {
     termsLink: "",
     privacyPolicyLink: "",
@@ -11185,7 +11185,7 @@ var QUESTION_KINDS = [{
   type: "condition",
   label: t$4("neetoForm.fields.cf"),
   icon: Checkbox$2,
-  component: Condition$2,
+  component: Condition,
   defaults: {
     isRequired: true,
     label: t$4("neetoForm.common.agreeCondition")
@@ -11389,8 +11389,8 @@ var arrayHelpers = {
   moveItem: moveItem
 };
 
-function ownKeys$b(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$b(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$b(Object(t), !0).forEach(function (r) { _defineProperty$6(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$b(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$d(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$d(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$d(Object(t), !0).forEach(function (r) { _defineProperty$6(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$d(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var generateUniqueFieldCode = function generateUniqueFieldCode(type, questions) {
   var fieldCodes = pluck("fieldCode", filterBy({
     kind: type
@@ -11426,7 +11426,7 @@ var handleFieldDragEnd = function handleFieldDragEnd(_ref2) {
   var nextItems = _toConsumableArray$1(items);
   arrayHelpers.moveItem(nextItems, source.index, destination.index);
   var orderedItems = nextItems.map(function (item, index) {
-    return _objectSpread$b(_objectSpread$b({}, item), {}, {
+    return _objectSpread$d(_objectSpread$d({}, item), {}, {
       displayOrder: index
     });
   });
@@ -11440,7 +11440,7 @@ var createFieldData = function createFieldData(_ref3) {
     _ref3$isRequired = _ref3.isRequired,
     isRequired = _ref3$isRequired === void 0 ? undefined : _ref3$isRequired,
     questions = _ref3.questions;
-  return _objectSpread$b(_objectSpread$b({}, defaults), {}, {
+  return _objectSpread$d(_objectSpread$d({}, defaults), {}, {
     metadata: metadata,
     isRequired: isRequired,
     kind: type,
@@ -11461,7 +11461,7 @@ var duplicateFieldData = function duplicateFieldData(_ref4) {
     optionsAttributes = item.optionsAttributes;
   var defaultAttributeNames = keys(questionKind.defaults || {});
   var defaultAttributes = pick(defaultAttributeNames, item);
-  return _objectSpread$b(_objectSpread$b({}, defaultAttributes), {}, {
+  return _objectSpread$d(_objectSpread$d({}, defaultAttributes), {}, {
     isRequired: isRequired,
     kind: kind,
     label: label,
@@ -11568,9 +11568,9 @@ var List = function List(_ref) {
   })))));
 };
 
-var _excluded$7 = ["questionKinds", "showAddQuestionDivider", "onValueChange", "showActionBlock", "formId", "isDeletable", "isRequiredField", "submitButtonProps", "cancelButtonProps", "isKindAlreadyActive", "getActiveKindDetails", "kindUniqueOn", "isDisabledFieldLabel", "disabledAddButtonTooltipProps", "enableFieldCode"];
-function ownKeys$a(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$a(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$a(Object(t), !0).forEach(function (r) { _defineProperty$6(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$a(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+var _excluded$5 = ["questionKinds", "showAddQuestionDivider", "onValueChange", "showActionBlock", "formId", "isDeletable", "isRequiredField", "submitButtonProps", "cancelButtonProps", "isKindAlreadyActive", "getActiveKindDetails", "kindUniqueOn", "isDisabledFieldLabel", "disabledAddButtonTooltipProps", "enableFieldCode"];
+function ownKeys$c(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$c(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$c(Object(t), !0).forEach(function (r) { _defineProperty$6(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$c(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var Form = function Form(_ref) {
   var _INDEPENDENT_LABELS_M, _questions$deleteQues, _questions$deleteQues2;
   var questionKinds = _ref.questionKinds,
@@ -11588,7 +11588,7 @@ var Form = function Form(_ref) {
     isDisabledFieldLabel = _ref.isDisabledFieldLabel,
     disabledAddButtonTooltipProps = _ref.disabledAddButtonTooltipProps,
     enableFieldCode = _ref.enableFieldCode,
-    formDomProps = _objectWithoutProperties$1(_ref, _excluded$7);
+    formDomProps = _objectWithoutProperties$1(_ref, _excluded$5);
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
   var _useState = useState({}),
@@ -11658,7 +11658,7 @@ var Form = function Form(_ref) {
           questions: questions
         }), values.questions);
         setFieldValue("questions", newQuestions.map(function (question, index) {
-          return _objectSpread$a(_objectSpread$a({}, question), {}, {
+          return _objectSpread$c(_objectSpread$c({}, question), {}, {
             displayOrder: index + 1
           });
         }));
@@ -11758,10 +11758,10 @@ var Form = function Form(_ref) {
     className: "neeto-ui-border-gray-300 flex-shrink-0 border-t py-4"
   }, /*#__PURE__*/React__default.createElement(ActionBlock, {
     className: "space-x-2",
-    cancelButtonProps: _objectSpread$a({
+    cancelButtonProps: _objectSpread$c({
       label: t("neetoForm.common.reset")
     }, cancelButtonProps),
-    submitButtonProps: _objectSpread$a({
+    submitButtonProps: _objectSpread$c({
       disabled: isSubmitting || !dirty
     }, submitButtonProps)
   }))));
@@ -11821,8 +11821,8 @@ var formValidationSchema = object().shape({
   })).required()
 });
 
-function ownKeys$9(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$9(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$9(Object(t), !0).forEach(function (r) { _defineProperty$6(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$9(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$b(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$b(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$b(Object(t), !0).forEach(function (r) { _defineProperty$6(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$b(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var BuildForm = function BuildForm(_ref) {
   var id = _ref.id,
     onUpdate = _ref.onUpdate,
@@ -11901,7 +11901,7 @@ var BuildForm = function BuildForm(_ref) {
   var handleSubmit = function handleSubmit(payload) {
     return updateQuestions({
       id: id,
-      values: _objectSpread$9({
+      values: _objectSpread$b({
         neetoFormQuestion: payload
       }, buildRequestArgs)
     });
@@ -11938,7 +11938,7 @@ var BuildForm = function BuildForm(_ref) {
   }, function (_ref3) {
     var errors = _ref3.errors,
       setFieldError = _ref3.setFieldError;
-    return /*#__PURE__*/React__default.createElement(Form, _extends$8({}, _objectSpread$9(_objectSpread$9({}, formDomProps), {}, {
+    return /*#__PURE__*/React__default.createElement(Form, _extends$8({}, _objectSpread$b(_objectSpread$b({}, formDomProps), {}, {
       cancelButtonProps: cancelButtonProps,
       disabledAddButtonTooltipProps: disabledAddButtonTooltipProps,
       enableFieldCode: enableFieldCode,
@@ -12371,7 +12371,7 @@ var Spinner = function Spinner(_ref) {
 };
 var Spinner$1 = /*#__PURE__*/React__default.memo(Spinner);
 
-var _excluded$6 = ["label", "loading", "success", "className"];
+var _excluded$4 = ["label", "loading", "success", "className"];
 var Button = function Button(_ref) {
   var label = _ref.label,
     _ref$loading = _ref.loading,
@@ -12380,7 +12380,7 @@ var Button = function Button(_ref) {
     success = _ref$success === void 0 ? false : _ref$success,
     _ref$className = _ref.className,
     className = _ref$className === void 0 ? "" : _ref$className,
-    otherProps = _objectWithoutProperties$1(_ref, _excluded$6);
+    otherProps = _objectWithoutProperties$1(_ref, _excluded$4);
   return /*#__PURE__*/React__default.createElement("button", _extends$8({
     className: classnames("neeto-form-engine-button", className)
   }, otherProps), loading && /*#__PURE__*/React__default.createElement(ButtonLoader, null), success && /*#__PURE__*/React__default.createElement(Success$2, null), label);
@@ -14141,9 +14141,9 @@ function _unsupportedIterableToArray$6(o, minLen) { if (!o) return; if (typeof o
 
 function _arrayLikeToArray$6(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 
-function ownKeys$8(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function ownKeys$a(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread$8(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$8(Object(source), !0).forEach(function (key) { _defineProperty$4(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$8(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _objectSpread$a(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$a(Object(source), !0).forEach(function (key) { _defineProperty$4(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$a(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 function _defineProperty$4(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 var DEFAULT_OPTIONS = {
@@ -14170,7 +14170,7 @@ var DEFAULT_OPTIONS = {
 function formatNumber(input, format, options, metadata) {
   // Apply default options.
   if (options) {
-    options = _objectSpread$8(_objectSpread$8({}, DEFAULT_OPTIONS), options);
+    options = _objectSpread$a(_objectSpread$a({}, DEFAULT_OPTIONS), options);
   } else {
     options = DEFAULT_OPTIONS;
   }
@@ -14315,9 +14315,9 @@ function formatIDD(nationalNumber, carrierCode, countryCallingCode, fromCountry,
   }
 }
 
-function ownKeys$7(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function ownKeys$9(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread$7(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$7(Object(source), !0).forEach(function (key) { _defineProperty$3(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$7(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _objectSpread$9(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$9(Object(source), !0).forEach(function (key) { _defineProperty$3(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$9(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 function _defineProperty$3(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
@@ -14429,7 +14429,7 @@ var PhoneNumber = /*#__PURE__*/function () {
   }, {
     key: "format",
     value: function format(_format, options) {
-      return formatNumber(this, _format, options ? _objectSpread$7(_objectSpread$7({}, options), {}, {
+      return formatNumber(this, _format, options ? _objectSpread$9(_objectSpread$9({}, options), {}, {
         v2: true
       }) : {
         v2: true
@@ -15472,20 +15472,20 @@ function parsePhoneNumber(formattedPhoneNumber, defaultCountry, defaultCallingCo
   };
 }
 
-function ownKeys$6(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function ownKeys$8(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread$6(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$6(Object(source), !0).forEach(function (key) { _defineProperty$2(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$6(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _objectSpread$8(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$8(Object(source), !0).forEach(function (key) { _defineProperty$2(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$8(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 function _defineProperty$2(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function parsePhoneNumberWithError$2(text, options, metadata) {
-  return parse$1(text, _objectSpread$6(_objectSpread$6({}, options), {}, {
+  return parse$1(text, _objectSpread$8(_objectSpread$8({}, options), {}, {
     v2: true
   }), metadata);
 }
 
-function ownKeys$5(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function ownKeys$7(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread$5(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$5(Object(source), !0).forEach(function (key) { _defineProperty$1(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$5(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _objectSpread$7(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$7(Object(source), !0).forEach(function (key) { _defineProperty$1(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$7(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 function _defineProperty$1(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
@@ -15533,7 +15533,7 @@ function normalizeArguments(args) {
     }
 
     if (arg_2) {
-      options = _objectSpread$5({
+      options = _objectSpread$7({
         defaultCountry: arg_2
       }, options);
     }
@@ -15812,37 +15812,40 @@ var MultipleEmailInput = function MultipleEmailInput(_ref) {
   })));
 };
 
-var _excluded$5 = ["name", "label", "error", "value"];
-var Condition = function Condition(_ref, ref) {
-  var name = _ref.name,
-    label = _ref.label,
-    error = _ref.error,
-    value = _ref.value,
-    otherProps = _objectWithoutProperties$1(_ref, _excluded$5);
-  return /*#__PURE__*/React__default.createElement("div", {
-    className: "neeto-form-engine-terms"
-  }, /*#__PURE__*/React__default.createElement("div", {
-    className: "neeto-form-engine-choice"
-  }, /*#__PURE__*/React__default.createElement("input", _extends$8({
-    name: name,
-    ref: ref,
-    value: value,
-    required: true,
-    "aria-invalid": !!error,
-    id: "condition-".concat(name),
-    type: "checkbox"
-  }, otherProps)), /*#__PURE__*/React__default.createElement("label", {
-    className: "neeto-form-engine-label font-normal",
-    htmlFor: "condition-".concat(name)
-  }, label)), !!error && typeof error === "string" && /*#__PURE__*/React__default.createElement("p", {
-    className: "neeto-form-engine-input__error",
-    "data-cy": "neeto-form-engine-condition-error"
-  }, error));
+function ownKeys$6(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$6(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$6(Object(t), !0).forEach(function (r) { _defineProperty$6(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$6(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+var ConditionField = function ConditionField(_ref) {
+  var question = _ref.question,
+    customValidator = _ref.customValidator;
+  var name = question.id,
+    kind = question.kind,
+    label = question.label,
+    isRequired = question.isRequired,
+    nodeId = question.nodeId;
+  return /*#__PURE__*/React__default.createElement(Field, {
+    name: name || nodeId,
+    validate: validateFieldValue({
+      kind: kind,
+      label: label,
+      isRequired: isRequired,
+      customValidator: customValidator
+    })
+  }, function (_ref2) {
+    var meta = _ref2.meta,
+      field = _ref2.field;
+    return /*#__PURE__*/React__default.createElement(Checkbox$1, _extends$8({}, _objectSpread$6(_objectSpread$6({}, field), {}, {
+      label: label,
+      name: name
+    }), {
+      checked: field.value,
+      error: meta.touched ? meta.error : "",
+      required: isRequired
+    }));
+  });
 };
-var Condition$1 = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(Condition));
 
-function ownKeys$4(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$4(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$4(Object(t), !0).forEach(function (r) { _defineProperty$6(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$4(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$5(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$5(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$5(Object(t), !0).forEach(function (r) { _defineProperty$6(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$5(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var toEmailValues = function toEmailValues() {
   var values = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
   return values.map(function (value) {
@@ -15935,7 +15938,7 @@ var generateInitValues = function generateInitValues(_ref7) {
   var valuesMap = {};
   if (initialValues) {
     valuesMap = initialValues.reduce(function (acc, answer) {
-      return _objectSpread$4(_objectSpread$4({}, acc), {}, _defineProperty$6({}, answer.questionId, {
+      return _objectSpread$5(_objectSpread$5({}, acc), {}, _defineProperty$6({}, answer.questionId, {
         value: answer.value,
         optionIds: answer.optionIds
       }));
@@ -16156,34 +16159,7 @@ var renderErrorMessage = function renderErrorMessage(errorObject, maxFileSize, i
   });
 };
 
-var ConditionField = function ConditionField(_ref) {
-  var question = _ref.question,
-    customValidator = _ref.customValidator;
-  var name = question.id,
-    kind = question.kind,
-    label = question.label,
-    isRequired = question.isRequired,
-    nodeId = question.nodeId;
-  return /*#__PURE__*/React__default.createElement(Field, {
-    name: name || nodeId,
-    validate: validateFieldValue({
-      kind: kind,
-      label: label,
-      isRequired: isRequired,
-      customValidator: customValidator
-    })
-  }, function (_ref2) {
-    var meta = _ref2.meta,
-      field = _ref2.field;
-    return /*#__PURE__*/React__default.createElement(Condition$1, _extends$8({}, field, {
-      error: meta.touched ? meta.error : "",
-      label: getLabel$1(label, isRequired),
-      name: name
-    }));
-  });
-};
-
-var _excluded$4 = ["value"];
+var _excluded$3 = ["value"];
 dayjs.extend(weekOfYear);
 dayjs.extend(weekday);
 dayjs.extend(localeData);
@@ -16222,7 +16198,7 @@ var DateField = function DateField(_ref) {
     var meta = _ref2.meta,
       _ref2$field = _ref2.field,
       value = _ref2$field.value,
-      field = _objectWithoutProperties$1(_ref2$field, _excluded$4),
+      field = _objectWithoutProperties$1(_ref2$field, _excluded$3),
       form = _ref2.form;
     return /*#__PURE__*/React__default.createElement(DatePicker, _extends$8({
       placeholder: placeholder,
@@ -17732,9 +17708,9 @@ function _iterableToArrayLimit(arr, i) { if (typeof Symbol === "undefined" || !(
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-function ownKeys$3(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
+function ownKeys$4(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread$3(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$3(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$3(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread$4(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$4(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$4(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
@@ -17770,7 +17746,7 @@ var Dropzone = /*#__PURE__*/forwardRef(function (_ref, ref) {
     };
   }, [open]); // TODO: Figure out why react-styleguidist cannot create docs if we don't return a jsx element
 
-  return /*#__PURE__*/React__default.createElement(Fragment, null, children(_objectSpread$3(_objectSpread$3({}, props), {}, {
+  return /*#__PURE__*/React__default.createElement(Fragment, null, children(_objectSpread$4(_objectSpread$4({}, props), {}, {
     open: open
   })));
 });
@@ -18104,7 +18080,7 @@ var initialState = {
 function useDropzone() {
   var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
 
-  var _defaultProps$options = _objectSpread$3(_objectSpread$3({}, defaultProps), options),
+  var _defaultProps$options = _objectSpread$4(_objectSpread$4({}, defaultProps), options),
       accept = _defaultProps$options.accept,
       disabled = _defaultProps$options.disabled,
       getFilesFromEvent = _defaultProps$options.getFilesFromEvent,
@@ -18421,7 +18397,7 @@ function useDropzone() {
           onDrop = _ref2.onDrop,
           rest = _objectWithoutProperties(_ref2, ["refKey", "onKeyDown", "onFocus", "onBlur", "onClick", "onDragEnter", "onDragOver", "onDragLeave", "onDrop"]);
 
-      return _objectSpread$3(_objectSpread$3(_defineProperty({
+      return _objectSpread$4(_objectSpread$4(_defineProperty({
         onKeyDown: composeKeyboardHandler(composeEventHandlers(onKeyDown, onKeyDownCb)),
         onFocus: composeKeyboardHandler(composeEventHandlers(onFocus, onFocusCb)),
         onBlur: composeKeyboardHandler(composeEventHandlers(onBlur, onBlurCb)),
@@ -18460,7 +18436,7 @@ function useDropzone() {
         tabIndex: -1
       }, refKey, inputRef);
 
-      return _objectSpread$3(_objectSpread$3({}, inputProps), rest);
+      return _objectSpread$4(_objectSpread$4({}, inputProps), rest);
     };
   }, [inputRef, accept, multiple, onDropCb, disabled]);
   var fileCount = draggedFiles.length;
@@ -18473,7 +18449,7 @@ function useDropzone() {
     maxFiles: maxFiles
   });
   var isDragReject = fileCount > 0 && !isDragAccept;
-  return _objectSpread$3(_objectSpread$3({}, state), {}, {
+  return _objectSpread$4(_objectSpread$4({}, state), {}, {
     isDragAccept: isDragAccept,
     isDragReject: isDragReject,
     isFocused: isFocused && !disabled,
@@ -18489,22 +18465,22 @@ function reducer(state, action) {
   /* istanbul ignore next */
   switch (action.type) {
     case 'focus':
-      return _objectSpread$3(_objectSpread$3({}, state), {}, {
+      return _objectSpread$4(_objectSpread$4({}, state), {}, {
         isFocused: true
       });
 
     case 'blur':
-      return _objectSpread$3(_objectSpread$3({}, state), {}, {
+      return _objectSpread$4(_objectSpread$4({}, state), {}, {
         isFocused: false
       });
 
     case 'openDialog':
-      return _objectSpread$3(_objectSpread$3({}, state), {}, {
+      return _objectSpread$4(_objectSpread$4({}, state), {}, {
         isFileDialogActive: true
       });
 
     case 'closeDialog':
-      return _objectSpread$3(_objectSpread$3({}, state), {}, {
+      return _objectSpread$4(_objectSpread$4({}, state), {}, {
         isFileDialogActive: false
       });
 
@@ -18512,19 +18488,19 @@ function reducer(state, action) {
       /* eslint no-case-declarations: 0 */
       var isDragActive = action.isDragActive,
           draggedFiles = action.draggedFiles;
-      return _objectSpread$3(_objectSpread$3({}, state), {}, {
+      return _objectSpread$4(_objectSpread$4({}, state), {}, {
         draggedFiles: draggedFiles,
         isDragActive: isDragActive
       });
 
     case 'setFiles':
-      return _objectSpread$3(_objectSpread$3({}, state), {}, {
+      return _objectSpread$4(_objectSpread$4({}, state), {}, {
         acceptedFiles: action.acceptedFiles,
         fileRejections: action.fileRejections
       });
 
     case 'reset':
-      return _objectSpread$3(_objectSpread$3({}, state), {}, {
+      return _objectSpread$4(_objectSpread$4({}, state), {}, {
         isFileDialogActive: false,
         isDragActive: false,
         draggedFiles: [],
@@ -18537,8 +18513,8 @@ function reducer(state, action) {
   }
 }
 
-function ownKeys$2(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$2(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$2(Object(t), !0).forEach(function (r) { _defineProperty$6(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$2(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$3(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$3(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$3(Object(t), !0).forEach(function (r) { _defineProperty$6(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$3(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var useFileUpload = function useFileUpload(_ref) {
   var disabled = _ref.disabled,
     accept = _ref.accept,
@@ -18638,7 +18614,7 @@ var useFileUpload = function useFileUpload(_ref) {
                   var uploadedFile = findBy({
                     name: file.name
                   }, newFiles);
-                  return _objectSpread$2(_objectSpread$2({}, file), uploadedFile);
+                  return _objectSpread$3(_objectSpread$3({}, file), uploadedFile);
                 })
               });
             } else {
@@ -26426,7 +26402,7 @@ var PhoneNumberField = function PhoneNumberField(_ref) {
   });
 };
 
-var _excluded$3 = ["name", "label", "error", "lowestRatingLabel", "averageRatingLabel", "highestRatingLabel", "value"];
+var _excluded$2 = ["name", "label", "error", "lowestRatingLabel", "averageRatingLabel", "highestRatingLabel", "value"];
 var Rating = function Rating(_ref) {
   var name = _ref.name,
     label = _ref.label,
@@ -26435,7 +26411,7 @@ var Rating = function Rating(_ref) {
     averageRatingLabel = _ref.averageRatingLabel,
     highestRatingLabel = _ref.highestRatingLabel,
     value = _ref.value,
-    other = _objectWithoutProperties$1(_ref, _excluded$3);
+    other = _objectWithoutProperties$1(_ref, _excluded$2);
   var handleClick = function handleClick(e) {
     return e.currentTarget.nextElementSibling.click();
   };
@@ -26562,7 +26538,7 @@ var RichTextEditor = function RichTextEditor(_ref) {
   }));
 };
 
-var _excluded$2 = ["value", "shape", "label", "rating", "count"];
+var _excluded$1 = ["value", "shape", "label", "rating", "count"];
 var RatingButton = function RatingButton(_ref) {
   var _ref$value = _ref.value,
     value = _ref$value === void 0 ? "0" : _ref$value,
@@ -26570,7 +26546,7 @@ var RatingButton = function RatingButton(_ref) {
     label = _ref.label,
     rating = _ref.rating,
     count = _ref.count,
-    otherProps = _objectWithoutProperties$1(_ref, _excluded$2);
+    otherProps = _objectWithoutProperties$1(_ref, _excluded$1);
   var handleClick = function handleClick(e) {
     return e.currentTarget.nextElementSibling.click();
   };
@@ -26598,13 +26574,13 @@ var RatingButton = function RatingButton(_ref) {
 };
 var RatingButton$1 = /*#__PURE__*/React__default.memo(RatingButton);
 
-var _excluded$1 = ["label", "count", "shape", "error"];
+var _excluded = ["label", "count", "shape", "error"];
 var StarRating = function StarRating(_ref) {
   var label = _ref.label,
     count = _ref.count,
     shape = _ref.shape,
     error = _ref.error,
-    props = _objectWithoutProperties$1(_ref, _excluded$1);
+    props = _objectWithoutProperties$1(_ref, _excluded);
   return /*#__PURE__*/React__default.createElement("div", {
     className: "neeto-form-engine-input__wrapper neeto-form-engine-star-rating"
   }, /*#__PURE__*/React__default.createElement("div", {
@@ -26658,42 +26634,14 @@ var StarRatingField = function StarRatingField(_ref) {
   });
 };
 
-var _excluded = ["name", "label", "error", "value"];
-var Terms = function Terms(_ref, ref) {
-  var name = _ref.name,
-    label = _ref.label,
-    error = _ref.error,
-    value = _ref.value,
-    otherProps = _objectWithoutProperties$1(_ref, _excluded);
-  return /*#__PURE__*/React__default.createElement("div", {
-    className: "neeto-form-engine-terms"
-  }, /*#__PURE__*/React__default.createElement("div", {
-    className: "neeto-form-engine-choice"
-  }, /*#__PURE__*/React__default.createElement("input", _extends$8({
-    name: name,
-    ref: ref,
-    value: value,
-    required: true,
-    "aria-invalid": !!error,
-    id: "terms-and-condition",
-    type: "checkbox"
-  }, otherProps)), /*#__PURE__*/React__default.createElement(EditorContent, {
-    content: label
-  })), !!error && typeof error === "string" && /*#__PURE__*/React__default.createElement("p", {
-    className: "neeto-form-engine-input__error",
-    "data-cy": "neeto-form-engine-terms-error"
-  }, error));
-};
-var Terms$1 = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(Terms));
-
+function ownKeys$2(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$2(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$2(Object(t), !0).forEach(function (r) { _defineProperty$6(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$2(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var TermsField = function TermsField(_ref) {
   var question = _ref.question,
     customValidator = _ref.customValidator;
   var name = question.id,
     kind = question.kind,
     label = question.label,
-    termsLink = question.termsLink,
-    privacyPolicyLink = question.privacyPolicyLink,
     isRequired = question.isRequired,
     nodeId = question.nodeId;
   return /*#__PURE__*/React__default.createElement(Field, {
@@ -26707,13 +26655,16 @@ var TermsField = function TermsField(_ref) {
   }, function (_ref2) {
     var meta = _ref2.meta,
       field = _ref2.field;
-    return /*#__PURE__*/React__default.createElement(Terms$1, _extends$8({}, field, {
-      error: meta.touched ? meta.error : "",
-      label: label,
-      name: name,
-      privacyPolicyLink: privacyPolicyLink,
-      termsLink: termsLink
-    }));
+    return /*#__PURE__*/React__default.createElement("div", {
+      className: "neeto-form-engine-terms"
+    }, /*#__PURE__*/React__default.createElement(Checkbox$1, _extends$8({}, _objectSpread$2(_objectSpread$2({}, field), {}, {
+      name: name
+    }), {
+      checked: field.value,
+      error: meta.touched ? meta.error : ""
+    }), /*#__PURE__*/React__default.createElement(EditorContent, {
+      content: label
+    })));
   });
 };
 
@@ -27149,7 +27100,9 @@ var ExternalForm = function ExternalForm(_ref) {
       questions: questions,
       initialValues: submission === null || submission === void 0 ? void 0 : submission.responses,
       localValues: preserveValues ? localValues : initialValues,
-      fieldCodes: enablePreFilling ? getQueryParams() : {}
+      fieldCodes: enablePreFilling ? getQueryParams({
+        toCamelCase: false
+      }) : {}
     })
   }, function (_ref5) {
     var isSubmitting = _ref5.isSubmitting,