@wise/dynamic-flow-client 1.2.0 → 1.2.1

package/build/main.js

@@ -839,7 +839,7 @@ function isReference(block) {
 }
 
 // src/dynamicFlow/DynamicFlow.tsx
-var import_react35 = require("react");
+var import_react38 = require("react");
 var import_react_intl28 = require("react-intl");
 
 // src/common/contexts/dynamicFlowContexts/DynamicFlowContexts.tsx
@@ -1821,7 +1821,7 @@ function useExternalStepPolling(polling, onAction) {
 }
 
 // src/common/hooks/usePersistAsync/usePersistAsync.ts
-var import_react23 = require("react");
+var import_react26 = require("react");
 var import_react_intl16 = require("react-intl");
 
 // src/jsonSchemaForm/persistAsyncSchema/PersistAsyncSchema.messages.js
@@ -1835,7 +1835,7 @@ var PersistAsyncSchema_messages_default = (0, import_react_intl.defineMessages)(
 });
 
 // src/jsonSchemaForm/persistAsyncSchema/persistAsyncBasicSchema/PersistAsyncBasicSchema.tsx
-var import_react22 = require("react");
+var import_react25 = require("react");
 var import_react_intl15 = require("react-intl");
 
 // src/fixtures/jsonSchemaForm/allOf.ts
@@ -1961,7 +1961,7 @@ var allOf_default = schema;
 
 // src/jsonSchemaForm/basicTypeSchema/BasicTypeSchema.tsx
 var import_classnames6 = __toESM(require_classnames());
-var import_react21 = require("react");
+var import_react24 = require("react");
 
 // src/layout/alert/DynamicAlert.tsx
 var import_components = require("@transferwise/components");
@@ -2292,6 +2292,9 @@ var DynamicExternal = ({ component, onAction }) => {
 };
 var DynamicExternal_default = DynamicExternal;
 
+// src/jsonSchemaForm/genericSchema/GenericSchema.tsx
+var import_react20 = require("react");
+
 // src/jsonSchemaForm/allOfSchema/AllOfSchema.tsx
 var import_classnames = __toESM(require_classnames());
 var import_react10 = require("react");
@@ -2786,7 +2789,7 @@ var ObjectSchema_default = ObjectSchema3;
 
 // src/jsonSchemaForm/oneOfSchema/OneOfSchema.tsx
 var import_classnames4 = __toESM(require_classnames());
-var import_react14 = require("react");
+var import_react15 = require("react");
 
 // src/jsonSchemaForm/help/Help.tsx
 var import_components7 = require("@transferwise/components");
@@ -2819,6 +2822,9 @@ var Help = (props) => {
 };
 var Help_default = Help;
 
+// src/jsonSchemaForm/schemaFormControl/SchemaFormControl.tsx
+var import_react14 = require("react");
+
 // src/formControl/FormControl.tsx
 var import_components8 = require("@transferwise/components");
 var import_react13 = require("react");
@@ -3521,16 +3527,12 @@ var import_jsx_runtime24 = require("react/jsx-runtime");
 var isNativeInput = (propsSchemaType) => {
   return propsSchemaType === "string" || propsSchemaType === "number";
 };
-var getControlType = (schema2, log) => {
+var getControlType = (schema2) => {
   if (isOneOfSchema(schema2)) {
     if (schema2.control === FormControlType.TAB && schema2.oneOf.length > 3) {
       return FormControlType.SELECT;
     }
     if (schema2.oneOf.length === 2 && !schema2.control) {
-      log.warning(
-        "Deprecation warning",
-        'A oneOf schema with 2 options and no control type currently renders as a "radio" but will be changed to render as a "select". Please specify control radio to retain the existing behaviour.'
-      );
       return FormControlType.RADIO;
     }
     return schema2.control || FormControlType.SELECT;
@@ -3567,40 +3569,35 @@ var getOptions = (schema2, controlType) => {
   return null;
 };
 var SchemaFormControl = (props) => {
+  const { id, schema: schema2, value, disabled, onChange, onFocus, onBlur, onSearchChange } = props;
   const log = useLogger();
-  const getSanitisedValue = (value) => isNativeInput(props.schema.type) && (isNull(value) || isUndefined(value)) ? "" : value;
-  const onChange = (value, type) => {
-    props.onChange(getValidBasicModelOrNull(value, props.schema), type);
+  const getSanitisedValue = (value2) => isNativeInput(schema2.type) && (isNull(value2) || isUndefined(value2)) ? "" : value2;
+  const onModelChange = (value2, type) => {
+    onChange(getValidBasicModelOrNull(value2, schema2), type);
   };
-  const controlType = getControlType(props.schema, log);
-  if (controlType === "file") {
-    log.warning(
-      "Deprecation warning",
-      "Please use a persist-async blob schema instead of string with base64url for file uploads. The base64url does not perform well on low end devices. Support for this schema will be removed in a later release."
-    );
-  }
-  if (props.schema.values) {
-    log.error("Deprecated schema", "Schema.values is a legacy approach. Please use oneOf.");
-  }
-  const options = props.schema.values || getOptions(props.schema, controlType);
+  const controlType = getControlType(schema2);
+  (0, import_react14.useEffect)(() => {
+    warnIfInvalidSchema(schema2, log, controlType);
+  }, [schema2, log, controlType]);
+  const options = schema2.values || getOptions(schema2, controlType);
   const events = {
-    onFocus: props.onFocus,
-    onBlur: props.onBlur,
-    onSearchChange: props.onSearchChange,
-    onChange
+    onFocus,
+    onBlur,
+    onSearchChange,
+    onChange: onModelChange
   };
-  const safeValue = getSanitisedValue(props.value);
+  const safeValue = getSanitisedValue(value);
   const controlProps = {
-    id: props.id,
-    name: props.id,
-    label: props.schema.title,
+    id,
+    name: id,
+    label: schema2.title,
     options: options || [],
-    placeholder: props.schema.placeholder,
-    autoComplete: !props.schema.help,
-    disabled: props.disabled || props.schema.disabled,
-    displayPattern: props.schema.displayFormat,
+    placeholder: schema2.placeholder,
+    autoComplete: !schema2.help,
+    disabled: disabled || schema2.disabled,
+    displayPattern: schema2.displayFormat,
     // TODO: LOW avoid type assertion below
-    uploadProps: mapSchemaToUploadOptions(props.schema)
+    uploadProps: mapSchemaToUploadOptions(schema2)
   };
   return /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(FormControl, __spreadValues(__spreadValues({ type: controlType, value: safeValue }, events), controlProps));
 };
@@ -3611,6 +3608,23 @@ SchemaFormControl.defaultProps = {
   onSearchChange: null,
   disabled: false
 };
+var warnIfInvalidSchema = (schema2, log, controlType) => {
+  if (isOneOfSchema(schema2) && schema2.oneOf.length === 2 && !schema2.control) {
+    log.warning(
+      "Deprecation warning",
+      'A oneOf schema with 2 options and no control type currently renders as a "radio" but will be changed to render as a "select". Please specify control radio to retain the existing behaviour.'
+    );
+  }
+  if (controlType === "file") {
+    log.warning(
+      "Deprecation warning",
+      "Please use a persist-async blob schema instead of string with base64url for file uploads. The base64url does not perform well on low end devices. Support for this schema will be removed in a later release."
+    );
+  }
+  if (schema2.values) {
+    log.warning("Deprecated schema", "Schema.values is a legacy approach. Please use oneOf.");
+  }
+};
 var SchemaFormControl_default = SchemaFormControl;
 
 // src/jsonSchemaForm/oneOfSchema/utils/const-schema-utils.ts
@@ -3676,14 +3690,14 @@ function getSchemaProperties(childSchema) {
 var import_jsx_runtime25 = require("react/jsx-runtime");
 var OneOfSchema5 = (props) => {
   const onEvent = useEventDispatcher();
-  const [changed, setChanged] = (0, import_react14.useState)(false);
-  const [focused, setFocused] = (0, import_react14.useState)(false);
-  const [blurred, setBlurred] = (0, import_react14.useState)(false);
-  const id = (0, import_react14.useMemo)(() => props.schema.$id || generateRandomId(), [props.schema.$id]);
-  const [schemaIndex, setSchemaIndex] = (0, import_react14.useState)(
+  const [changed, setChanged] = (0, import_react15.useState)(false);
+  const [focused, setFocused] = (0, import_react15.useState)(false);
+  const [blurred, setBlurred] = (0, import_react15.useState)(false);
+  const id = (0, import_react15.useMemo)(() => props.schema.$id || generateRandomId(), [props.schema.$id]);
+  const [schemaIndex, setSchemaIndex] = (0, import_react15.useState)(
     getActiveSchemaIndex(props.schema, props.model)
   );
-  const [models, setModels] = (0, import_react14.useState)(getModelPartsForSchemas(props.model, props.schema.oneOf));
+  const [models, setModels] = (0, import_react15.useState)(getModelPartsForSchemas(props.model, props.schema.oneOf));
   const debouncedTrackEvent = useDebouncedFunction(onEvent, 200);
   const onSearchChange = (searchValue) => {
     debouncedTrackEvent("Dynamic Flow - OneOf Searched", {
@@ -3691,7 +3705,7 @@ var OneOfSchema5 = (props) => {
       searchValueLength: searchValue.length
     });
   };
-  (0, import_react14.useEffect)(() => {
+  (0, import_react15.useEffect)(() => {
     const modelIndex = getValidIndexFromValue(props.schema, props.model);
     const defaultIndex = getValidIndexFromValue(props.schema, props.schema.default);
     if (modelIndex === -1 && defaultIndex >= 0) {
@@ -3841,11 +3855,11 @@ var OneOfSchema_default = OneOfSchema5;
 
 // src/jsonSchemaForm/persistAsyncSchema/persistAsyncBlobSchema/PersistAsyncBlobSchema.tsx
 var import_classnames5 = __toESM(require_classnames());
-var import_react16 = require("react");
+var import_react17 = require("react");
 
 // src/jsonSchemaForm/persistAsyncSchema/persistAsyncBlobSchema/UploadInputAdapter.tsx
 var import_components10 = require("@transferwise/components");
-var import_react15 = require("react");
+var import_react16 = require("react");
 var import_jsx_runtime26 = require("react/jsx-runtime");
 var UploadInputAdapter = (props) => {
   const {
@@ -3862,7 +3876,7 @@ var UploadInputAdapter = (props) => {
     onCancel
   } = props;
   const onEvent = useEventDispatcher();
-  const files = (0, import_react15.useMemo)(() => fileId ? [{ id: fileId, status: import_components10.Status.SUCCEEDED }] : [], [fileId]);
+  const files = (0, import_react16.useMemo)(() => fileId ? [{ id: fileId, status: import_components10.Status.SUCCEEDED }] : [], [fileId]);
   const uploadFile = (formData) => {
     onEvent("Dynamic Flow - PersistAsync", { status: "pending", schemaId: id });
     return httpClient(`${httpOptions.url}`, {
@@ -3902,10 +3916,10 @@ var UploadInputAdapter = (props) => {
 // src/jsonSchemaForm/persistAsyncSchema/persistAsyncBlobSchema/PersistAsyncBlobSchema.tsx
 var import_jsx_runtime27 = require("react/jsx-runtime");
 var PersistAsyncBlobSchema = (props) => {
-  const [persistAsyncValidationMessages, setPersistAsyncValidationMessages] = (0, import_react16.useState)({});
-  const [persistAsyncValidations, setPersistAsyncValidations] = (0, import_react16.useState)(null);
-  const [validations, setValidations] = (0, import_react16.useState)([]);
-  const [changed, setChanged] = (0, import_react16.useState)(false);
+  const [persistAsyncValidationMessages, setPersistAsyncValidationMessages] = (0, import_react17.useState)({});
+  const [persistAsyncValidations, setPersistAsyncValidations] = (0, import_react17.useState)(null);
+  const [validations, setValidations] = (0, import_react17.useState)([]);
+  const [changed, setChanged] = (0, import_react17.useState)(false);
   const httpClient = useHttpClient();
   const onEvent = useEventDispatcher();
   const refreshValidations = () => {
@@ -3913,7 +3927,7 @@ var PersistAsyncBlobSchema = (props) => {
       setValidations(getValidationFailures(props.model, props.schema, !!props.required));
     }
   };
-  (0, import_react16.useEffect)(refreshValidations, [props.model, props.submitted]);
+  (0, import_react17.useEffect)(refreshValidations, [props.model, props.submitted]);
   const onSuccess = async (httpResponse, _fileName) => {
     const jsonResponse = await httpResponse.json();
     const id = getIdFromResponse(props.schema.persistAsync.idProperty, jsonResponse);
@@ -4002,7 +4016,7 @@ PersistAsyncSchema.defaultProps = {
 var PersistAsyncSchema_default = PersistAsyncSchema;
 
 // src/jsonSchemaForm/promotedOneOfSchema/PromotedOneOfSchema.tsx
-var import_react17 = require("react");
+var import_react18 = require("react");
 
 // src/jsonSchemaForm/promotedOneOfSchema/promoted-one-of-utils.ts
 var getSelectionFromModel = (schema2, model) => {
@@ -4093,7 +4107,7 @@ var import_jsx_runtime32 = require("react/jsx-runtime");
 var isPromoted = (schema2) => schema2.promoted === true;
 var PromotedOneOfSchema = (props) => {
   var _a;
-  const [selection, setSelection] = (0, import_react17.useState)(
+  const [selection, setSelection] = (0, import_react18.useState)(
     getSelectionFromModel(props.schema, props.model) || ((_a = props.schema.promotion) == null ? void 0 : _a.default) || "promoted"
   );
   const promotedAlert = props.schema.alert;
@@ -4209,32 +4223,35 @@ function getValueFromOption(option) {
 }
 
 // src/jsonSchemaForm/validationAsyncSchema/ValidationAsyncSchema.tsx
-var import_react18 = require("react");
+var import_react19 = require("react");
 var import_jsx_runtime34 = require("react/jsx-runtime");
 var ValidationAsyncSchema = (props) => {
-  const [validationAsyncModel, setValidationAsyncModel] = (0, import_react18.useState)(props.model);
-  const previousRequestedModelReference = (0, import_react18.useRef)(null);
-  const [validationAsyncSuccessMessage, setValidationAsyncSuccessMessage] = (0, import_react18.useState)(
+  const { schema: schema2, model, required, submitted, errors, onChange } = props;
+  const [validationAsyncModel, setValidationAsyncModel] = (0, import_react19.useState)(model);
+  const previousRequestedModelReference = (0, import_react19.useRef)(null);
+  const [validationAsyncSuccessMessage, setValidationAsyncSuccessMessage] = (0, import_react19.useState)(
     null
   );
-  const [validationAsyncErrors, setValidationAsyncErrors] = (0, import_react18.useState)(null);
-  const [fieldSubmitted, setFieldSubmitted] = (0, import_react18.useState)(false);
-  const [abortController, setAbortController] = (0, import_react18.useState)(null);
+  const [validationAsyncErrors, setValidationAsyncErrors] = (0, import_react19.useState)(null);
+  const [fieldSubmitted, setFieldSubmitted] = (0, import_react19.useState)(false);
+  const [abortController, setAbortController] = (0, import_react19.useState)(null);
   const httpClient = useHttpClient();
   const onEvent = useEventDispatcher();
-  const logger = useLogger();
-  const getValidationAsyncResponse = async (currentValidationAsyncModel, validationAsyncSpec) => {
-    const signal = abortCurrentRequestAndGetNewAbortSignal();
-    const requestBody = { [validationAsyncSpec.param]: currentValidationAsyncModel };
-    previousRequestedModelReference.current = currentValidationAsyncModel;
-    setFieldSubmitted(true);
-    if (!validationAsyncSpec.method) {
-      logger.warning(
+  const log = useLogger();
+  (0, import_react19.useEffect)(() => {
+    if (!schema2.validationAsync.method) {
+      log.warning(
         "Invalid schema or model",
         'ValidationAsyncSchema without a "method" property would have defaulted to "GET" in previous versions. Now defaults to "POST".',
         {}
       );
     }
+  }, [log, schema2.validationAsync.method]);
+  const getValidationAsyncResponse = async (currentValidationAsyncModel, validationAsyncSpec) => {
+    const signal = abortCurrentRequestAndGetNewAbortSignal();
+    const requestBody = { [validationAsyncSpec.param]: currentValidationAsyncModel };
+    previousRequestedModelReference.current = currentValidationAsyncModel;
+    setFieldSubmitted(true);
     onEvent("Dynamic Flow - ValidationAsync", { status: "pending" });
     const response = await httpClient(validationAsyncSpec.url, {
       method: validationAsyncSpec.method || "POST",
@@ -4269,29 +4286,29 @@ var ValidationAsyncSchema = (props) => {
   };
   const onBlur = () => {
     if (!isNull(validationAsyncModel) && !isEqual(validationAsyncModel, previousRequestedModelReference.current)) {
-      void getValidationAsyncResponse(validationAsyncModel, props.schema.validationAsync);
+      void getValidationAsyncResponse(validationAsyncModel, schema2.validationAsync);
     }
   };
-  const validationAsyncOnChange = (parameters) => {
-    props.onChange(__spreadProps(__spreadValues({}, parameters), {
-      triggerSchema: props.schema,
+  const onValidationAsyncChange = (parameters) => {
+    onChange(__spreadProps(__spreadValues({}, parameters), {
+      triggerSchema: schema2,
       triggerModel: parameters.model
     }));
     setValidationAsyncErrors(null);
     setValidationAsyncSuccessMessage(null);
-    if (isValidSchema(parameters.model, props.schema)) {
+    if (isValidSchema(parameters.model, schema2)) {
       setValidationAsyncModel(parameters.model);
     }
   };
   const basicTypeSchemaProps = {
-    required: props.required,
-    submitted: props.submitted || fieldSubmitted,
-    schema: props.schema,
+    submitted: submitted || fieldSubmitted,
     model: validationAsyncModel,
-    errors: validationAsyncErrors || props.errors,
-    onChange: validationAsyncOnChange,
+    errors: validationAsyncErrors || errors,
+    infoMessage: validationAsyncSuccessMessage,
+    onChange: onValidationAsyncChange,
     onBlur,
-    infoMessage: validationAsyncSuccessMessage
+    required,
+    schema: schema2
   };
   return /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(BasicTypeSchema_default, __spreadValues({}, basicTypeSchemaProps));
 };
@@ -4300,100 +4317,67 @@ var ValidationAsyncSchema_default = ValidationAsyncSchema;
 
 // src/jsonSchemaForm/genericSchema/GenericSchema.tsx
 var import_jsx_runtime35 = require("react/jsx-runtime");
+var import_react21 = require("react");
 var GenericSchemaForm = (props) => {
   const { schema: schema2, model = null, errors = null, hideTitle = false, disabled = false } = props;
   const schemaProps = __spreadProps(__spreadValues({}, props), { model, errors, hideTitle, disabled });
   const type = getSchemaType(schema2);
   const log = useLogger();
-  const logInvalidSchemaWarning = () => log.error(
-    "Invalid schema or model",
-    `Schema of type ${type || "undefined"} requested, but schema did not pass validation.`
-  );
+  (0, import_react20.useEffect)(() => {
+    if (!isValidGenericSchema(schema2, model, errors)) {
+      log.error(
+        "Invalid schema or model",
+        `Schema of type ${type || "undefined"} requested, but schema did not pass validation.`
+      );
+    }
+  }, [schema2, model, errors, type, log]);
   switch (type) {
     case "readOnly":
       return /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(ReadOnlySchema_default, __spreadValues({}, schemaProps));
     case "persistAsync":
-      if (isPersistAsyncSchema(schema2) && isNullableStringModel(model) && isBasicError(errors)) {
-        const filteredProps = __spreadProps(__spreadValues({}, schemaProps), { schema: schema2, model, errors });
-        return /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(PersistAsyncSchema_default, __spreadValues({}, filteredProps));
-      } else {
-        logInvalidSchemaWarning();
-        return /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(PersistAsyncSchema_default, __spreadValues({}, props));
-      }
+      return /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(PersistAsyncSchema_default, __spreadValues({}, schemaProps));
     case "validationAsync":
-      if (isValidationAsyncSchema(schema2) && isNullableBasicModel(model) && isBasicError(errors)) {
-        const filteredProps = __spreadProps(__spreadValues({}, schemaProps), { schema: schema2, model, errors });
-        return /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(ValidationAsyncSchema_default, __spreadValues({}, filteredProps));
-      } else {
-        logInvalidSchemaWarning();
-        return /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(ValidationAsyncSchema_default, __spreadValues({}, props));
-      }
+      return /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(ValidationAsyncSchema_default, __spreadValues({}, schemaProps));
     case "basic": {
-      if (isBasicSchema(schema2) && isNullableBasicModel(model) && isBasicError(errors)) {
-        const filteredProps = __spreadProps(__spreadValues({
-          infoMessage: null
-        }, schemaProps), {
-          schema: schema2,
-          model,
-          errors
-        });
-        return /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(BasicTypeSchema_default, __spreadValues({}, filteredProps));
-      } else {
-        const filteredProps = __spreadProps(__spreadValues({
-          infoMessage: null
-        }, schemaProps), {
-          schema: schema2,
-          model,
-          errors
-        });
-        logInvalidSchemaWarning();
-        return /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(BasicTypeSchema_default, __spreadValues({}, filteredProps));
-      }
+      const basicTypeProps = __spreadValues({ infoMessage: null }, schemaProps);
+      return /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(BasicTypeSchema_default, __spreadValues({}, basicTypeProps));
     }
     case "object":
-      if (isObjectSchema(schema2) && isNullableObjectModel(model)) {
-        const filteredProps = __spreadProps(__spreadValues({}, schemaProps), { schema: schema2, model, errors });
-        return /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(ObjectSchema_default, __spreadValues({}, filteredProps), JSON.stringify(schema2));
-      } else {
-        logInvalidSchemaWarning();
-        return /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(ObjectSchema_default, __spreadValues({}, props));
-      }
+      return /* @__PURE__ */ (0, import_react21.createElement)(ObjectSchema_default, __spreadProps(__spreadValues({}, schemaProps), { key: JSON.stringify(schema2) }));
     case "array":
-      if (isArraySchema(schema2) && isNullableArrayModel(model) && isBasicError(errors)) {
-        const filteredProps = __spreadProps(__spreadValues({}, schemaProps), { schema: schema2, model, errors });
-        return /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(ArraySchema_default, __spreadValues({}, filteredProps));
-      } else {
-        logInvalidSchemaWarning();
-        return /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(ArraySchema_default, __spreadValues({}, props));
-      }
+      return /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(ArraySchema_default, __spreadValues({}, schemaProps));
     case "promotedOneOf":
-      if (isOneOfObjectSchema(schema2) && isNullableObjectModel(model)) {
-        const filteredProps = __spreadProps(__spreadValues({}, schemaProps), { schema: schema2, model, errors });
-        return /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(PromotedOneOfSchema_default, __spreadValues({}, filteredProps));
-      } else {
-        logInvalidSchemaWarning();
-        return /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(PromotedOneOfSchema_default, __spreadValues({}, props));
-      }
+      return /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(PromotedOneOfSchema_default, __spreadValues({}, schemaProps));
     case "oneOf":
-      if (isOneOfSchema(schema2)) {
-        const filteredProps = __spreadProps(__spreadValues({}, schemaProps), { schema: schema2, model, errors });
-        return /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(OneOfSchema_default, __spreadValues({}, filteredProps));
-      } else {
-        logInvalidSchemaWarning();
-        return /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(OneOfSchema_default, __spreadValues({}, props));
-      }
+      return /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(OneOfSchema_default, __spreadValues({}, schemaProps));
     case "allOf":
-      if (isAllOfSchema(schema2) && isObjectModel(model)) {
-        const filteredProps = __spreadProps(__spreadValues({}, schemaProps), { schema: schema2, model, errors });
-        return /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(AllOfSchema_default, __spreadValues({}, filteredProps));
-      } else {
-        logInvalidSchemaWarning();
-        return /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(AllOfSchema_default, __spreadValues({}, props));
-      }
+      return /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(AllOfSchema_default, __spreadValues({}, schemaProps));
   }
   return /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(import_jsx_runtime35.Fragment, {});
 };
 var GenericSchema_default = GenericSchemaForm;
+var isValidGenericSchema = (schema2, model, errors) => {
+  const type = getSchemaType(schema2);
+  switch (type) {
+    case "persistAsync":
+      return isPersistAsyncSchema(schema2) && isNullableStringModel(model) && isBasicError(errors);
+    case "validationAsync":
+      return isValidationAsyncSchema(schema2) && isNullableBasicModel(model) && isBasicError(errors);
+    case "basic":
+      return isBasicSchema(schema2) && isNullableBasicModel(model) && isBasicError(errors);
+    case "object":
+      return isObjectSchema(schema2) && isNullableObjectModel(model);
+    case "array":
+      return isArraySchema(schema2) && isNullableArrayModel(model) && isBasicError(errors);
+    case "promotedOneOf":
+      return isOneOfObjectSchema(schema2) && isNullableObjectModel(model);
+    case "oneOf":
+      return isOneOfSchema(schema2);
+    case "allOf":
+      return isAllOfSchema(schema2) && isObjectModel(model);
+  }
+  return false;
+};
 
 // src/jsonSchemaForm/JsonSchemaForm.tsx
 var import_jsx_runtime36 = require("react/jsx-runtime");
@@ -4486,13 +4470,13 @@ var DynamicInfo = ({ component }) => {
 
 // src/layout/image/DynamicImage.tsx
 var import_components15 = require("@transferwise/components");
-var import_react19 = require("react");
+var import_react22 = require("react");
 var import_jsx_runtime40 = require("react/jsx-runtime");
 var DynamicImage = ({ component: image }) => {
   const { url, size, text, margin } = image;
   const httpClient = useHttpClient();
-  const [imageSource, setImageSource] = (0, import_react19.useState)("");
-  (0, import_react19.useEffect)(() => {
+  const [imageSource, setImageSource] = (0, import_react22.useState)("");
+  (0, import_react22.useEffect)(() => {
     void getImageSource(httpClient, url).then(setImageSource);
   }, [url, httpClient]);
   const imageProps = {
@@ -4689,9 +4673,9 @@ var DynamicParagraph_messages_default = (0, import_react_intl13.defineMessages)(
 
 // src/layout/paragraph/useSnackBarIfAvailable.ts
 var import_components18 = require("@transferwise/components");
-var import_react20 = require("react");
+var import_react23 = require("react");
 function useSnackBarIfAvailable() {
-  const context = (0, import_react20.useContext)(import_components18.SnackbarContext);
+  const context = (0, import_react23.useContext)(import_components18.SnackbarContext);
   return context ? context.createSnackbar : noop3;
 }
 function noop3() {
@@ -4813,13 +4797,13 @@ var BasicTypeSchema = (props) => {
       props.onBlur();
     }
   };
-  const [model, setModel] = (0, import_react21.useState)((_a = props.model) != null ? _a : null);
-  const [lastModel, setLastModel] = (0, import_react21.useState)((_b = props.model) != null ? _b : null);
-  const [changed, setChanged] = (0, import_react21.useState)(false);
-  const [focused, setFocused] = (0, import_react21.useState)(false);
-  const [blurred, setBlurred] = (0, import_react21.useState)(false);
-  const [validations, setValidations] = (0, import_react21.useState)([]);
-  const id = (0, import_react21.useMemo)(() => props.schema.$id || generateRandomId(), [props.schema.$id]);
+  const [model, setModel] = (0, import_react24.useState)((_a = props.model) != null ? _a : null);
+  const [lastModel, setLastModel] = (0, import_react24.useState)((_b = props.model) != null ? _b : null);
+  const [changed, setChanged] = (0, import_react24.useState)(false);
+  const [focused, setFocused] = (0, import_react24.useState)(false);
+  const [blurred, setBlurred] = (0, import_react24.useState)(false);
+  const [validations, setValidations] = (0, import_react24.useState)([]);
+  const id = (0, import_react24.useMemo)(() => props.schema.$id || generateRandomId(), [props.schema.$id]);
   const onSchemaChange = () => {
     const defaultValue = getDefaultValue(props.schema);
     if (isNullish(model) && !isNullish(defaultValue)) {
@@ -4834,9 +4818,9 @@ var BasicTypeSchema = (props) => {
   };
   const isConst = props.schema.const;
   const isHidden = props.schema.hidden || isConst;
-  (0, import_react21.useEffect)(refreshValidations, [props.model, props.submitted]);
-  (0, import_react21.useEffect)(onSchemaChange, [props.schema]);
-  (0, import_react21.useEffect)(() => {
+  (0, import_react24.useEffect)(refreshValidations, [props.model, props.submitted]);
+  (0, import_react24.useEffect)(onSchemaChange, [props.schema]);
+  (0, import_react24.useEffect)(() => {
     var _a2;
     const newModel = (_a2 = props.model) != null ? _a2 : null;
     if (newModel !== model) {
@@ -4913,16 +4897,15 @@ var PersistAsyncBasicSchema = (props) => {
   const intl = (0, import_react_intl15.useIntl)();
   const httpClient = useHttpClient();
   const onEvent = useEventDispatcher();
-  const [persistAsyncModel, setPersistAsyncModel] = (0, import_react22.useState)(null);
+  const [persistAsyncModel, setPersistAsyncModel] = (0, import_react25.useState)(null);
   const previousPersistAsyncModel = usePrevious(persistAsyncModel);
-  const [persistAsyncError, setPersistAsyncError] = (0, import_react22.useState)(null);
-  const [fieldSubmitted, setFieldSubmitted] = (0, import_react22.useState)(false);
-  const [abortController, setAbortController] = (0, import_react22.useState)(null);
-  const log = useLogger();
-  (0, import_react22.useEffect)(() => {
+  const [persistAsyncError, setPersistAsyncError] = (0, import_react25.useState)(null);
+  const [fieldSubmitted, setFieldSubmitted] = (0, import_react25.useState)(false);
+  const [abortController, setAbortController] = (0, import_react25.useState)(null);
+  (0, import_react25.useEffect)(() => {
     if (controlTypesWithPersistOnChange.has(
       // TODO: LOW avoid type assertion below -- control type may be nullish. consider ?? ''
-      getControlType(props.schema.persistAsync.schema, log)
+      getControlType(props.schema.persistAsync.schema)
     )) {
       persistAsyncIfValid();
     }
@@ -5007,7 +4990,7 @@ var PersistAsyncBasicSchema_default = PersistAsyncBasicSchema;
 
 // src/common/hooks/usePersistAsync/usePersistAsync.ts
 var usePersistAsync = (persistAsync) => {
-  const [abortController, setAbortController] = (0, import_react23.useState)(null);
+  const [abortController, setAbortController] = (0, import_react26.useState)(null);
   const httpClient = useHttpClient();
   const intl = (0, import_react_intl16.useIntl)();
   const { schema: schema2 } = persistAsync;
@@ -5086,7 +5069,7 @@ function hasStringMessage(value) {
 }
 
 // src/common/hooks/usePolling/usePolling.tsx
-var import_react24 = require("react");
+var import_react27 = require("react");
 function usePolling({
   asyncFn,
   interval,
@@ -5095,9 +5078,9 @@ function usePolling({
   onPollingResponse,
   onFailure
 }) {
-  const onPollingResponseReference = (0, import_react24.useRef)(onPollingResponse);
-  const onFailureReference = (0, import_react24.useRef)(onFailure);
-  const poll = (0, import_react24.useMemo)(
+  const onPollingResponseReference = (0, import_react27.useRef)(onPollingResponse);
+  const onFailureReference = (0, import_react27.useRef)(onFailure);
+  const poll = (0, import_react27.useMemo)(
     () => createPollingClosure(
       asyncFn,
       maxAttempts,
@@ -5107,7 +5090,7 @@ function usePolling({
     ),
     [asyncFn, maxAttempts, maxConsecutiveFails]
   );
-  (0, import_react24.useEffect)(() => {
+  (0, import_react27.useEffect)(() => {
     if (interval > 0) {
       const intervalReference = setInterval(() => {
         poll();
@@ -5115,7 +5098,7 @@ function usePolling({
       return () => clearInterval(intervalReference);
     }
   }, [poll, interval]);
-  (0, import_react24.useEffect)(() => {
+  (0, import_react27.useEffect)(() => {
     onPollingResponseReference.current = onPollingResponse;
     onFailureReference.current = onFailure;
   }, [onPollingResponse, onFailure]);
@@ -5144,20 +5127,20 @@ function createPollingClosure(asyncFn, maxAttempts, maxConsecutiveFails, onPolli
 }
 
 // src/common/hooks/usePrevious/usePrevious.js
-var import_react25 = require("react");
+var import_react28 = require("react");
 var usePrevious = (value) => {
-  const reference = (0, import_react25.useRef)();
-  (0, import_react25.useEffect)(() => {
+  const reference = (0, import_react28.useRef)();
+  (0, import_react28.useEffect)(() => {
     reference.current = value;
   }, [value]);
   return reference.current;
 };
 
 // src/common/hooks/useStepPolling/useStepPolling.tsx
-var import_react26 = require("react");
+var import_react29 = require("react");
 function useStepPolling(polling, onAction) {
   const httpClient = useHttpClient();
-  const asyncFn = (0, import_react26.useMemo)(() => {
+  const asyncFn = (0, import_react29.useMemo)(() => {
     if (polling) {
       return () => {
         return httpClient(polling.url).then((response) => {
@@ -5172,7 +5155,7 @@ function useStepPolling(polling, onAction) {
       return void 0;
     }
   }, [polling, httpClient]);
-  const onPollingResponse = (0, import_react26.useCallback)(
+  const onPollingResponse = (0, import_react29.useCallback)(
     (pollingResponse) => {
       if (pollingResponse == null ? void 0 : pollingResponse.action) {
         onAction(pollingResponse.action);
@@ -5188,7 +5171,7 @@ function useStepPolling(polling, onAction) {
     maxAttempts: (polling == null ? void 0 : polling.maxAttempts) || 0,
     maxConsecutiveFails: 1,
     onPollingResponse,
-    onFailure: (0, import_react26.useCallback)(() => {
+    onFailure: (0, import_react29.useCallback)(() => {
       if (polling) {
         onAction(polling.onError.action);
       }
@@ -5236,10 +5219,10 @@ var LayoutStep = (props) => {
 var LayoutStep_default = LayoutStep;
 
 // src/step/cameraStep/CameraStep.tsx
-var import_react30 = require("react");
+var import_react33 = require("react");
 
 // src/step/cameraStep/cameraCapture/CameraCapture.tsx
-var import_react29 = require("react");
+var import_react32 = require("react");
 var import_react_intl23 = require("react-intl");
 var import_react_webcam = __toESM(require_react_webcam());
 
@@ -5311,7 +5294,7 @@ var CaptureButton = ({ onClick }) => /* @__PURE__ */ (0, import_jsx_runtime49.js
 );
 
 // src/step/cameraStep/cameraCapture/hooks/index.ts
-var import_react27 = require("react");
+var import_react30 = require("react");
 
 // src/step/cameraStep/cameraCapture/utils/index.ts
 var isSelfieCamera = (stream) => {
@@ -5359,7 +5342,7 @@ var getVideoCapabilities = (videoStream) => {
 
 // src/step/cameraStep/cameraCapture/hooks/index.ts
 var useVideoConstraints = (direction) => {
-  const [videoConstraints, setVideoConstraints] = (0, import_react27.useState)();
+  const [videoConstraints, setVideoConstraints] = (0, import_react30.useState)();
   const defaultVideoConstraints = {
     facingMode: direction === "front" ? "user" : "environment",
     height: { min: 480, max: 1080, ideal: 720 },
@@ -5367,7 +5350,7 @@ var useVideoConstraints = (direction) => {
     frameRate: 30,
     aspectRatio: 16 / 9
   };
-  (0, import_react27.useEffect)(() => {
+  (0, import_react30.useEffect)(() => {
     void getVideoConstraints(direction).then(setVideoConstraints);
   }, [direction]);
   const getVideoConstraints = async (direction2) => {
@@ -5385,7 +5368,7 @@ var useVideoConstraints = (direction) => {
 };
 
 // src/step/cameraStep/cameraCapture/overlay/Overlay.tsx
-var import_react28 = require("react");
+var import_react31 = require("react");
 var import_jsx_runtime50 = require("react/jsx-runtime");
 var captureButtonHeight = 92;
 var reviewButtonsHeight = 120;
@@ -5402,8 +5385,8 @@ var Overlay = ({
   instructions,
   reviewInstructions
 }) => {
-  const svgReference = (0, import_react28.useRef)(null);
-  (0, import_react28.useEffect)(() => {
+  const svgReference = (0, import_react31.useRef)(null);
+  (0, import_react31.useEffect)(() => {
     const listener = debounce(() => {
       var _a;
       if ((_a = svgReference.current) == null ? void 0 : _a.innerHTML) {
@@ -5553,14 +5536,14 @@ var CameraCapture = ({
   onCapture,
   onEvent
 }) => {
-  const [mode, setMode] = (0, import_react29.useState)("CAPTURE");
-  const [isVideoMirrored, setIsVideoMirrored] = (0, import_react29.useState)(false);
-  const [ready, setReady] = (0, import_react29.useState)(false);
-  const [reviewImage, setReviewImage] = (0, import_react29.useState)();
-  const webcamReference = (0, import_react29.useRef)(null);
+  const [mode, setMode] = (0, import_react32.useState)("CAPTURE");
+  const [isVideoMirrored, setIsVideoMirrored] = (0, import_react32.useState)(false);
+  const [ready, setReady] = (0, import_react32.useState)(false);
+  const [reviewImage, setReviewImage] = (0, import_react32.useState)();
+  const webcamReference = (0, import_react32.useRef)(null);
   const { videoConstraints } = useVideoConstraints(direction);
   const intl = (0, import_react_intl23.useIntl)();
-  const handleCapture = (0, import_react29.useCallback)(async () => {
+  const handleCapture = (0, import_react32.useCallback)(async () => {
     var _a, _b, _c, _d, _e, _f;
     if (((_a = webcamReference == null ? void 0 : webcamReference.current) == null ? void 0 : _a.video) && ((_c = (_b = webcamReference == null ? void 0 : webcamReference.current) == null ? void 0 : _b.video) == null ? void 0 : _c.readyState) >= 3) {
       (_e = (_d = webcamReference == null ? void 0 : webcamReference.current) == null ? void 0 : _d.video) == null ? void 0 : _e.pause();
@@ -5582,7 +5565,7 @@ var CameraCapture = ({
       );
     }
   }, [webcamReference, showReview, setReviewImage, setMode, onCapture, isVideoMirrored]);
-  const handleUserMediaError = (0, import_react29.useCallback)(
+  const handleUserMediaError = (0, import_react32.useCallback)(
     (error) => {
       if (error instanceof DOMException && (error == null ? void 0 : error.name) === "NotAllowedError") {
         setMode("NO_CAMERA_ACCESS");
@@ -5594,7 +5577,7 @@ var CameraCapture = ({
     },
     [setMode, onEvent]
   );
-  const handleUserMedia = (0, import_react29.useCallback)(
+  const handleUserMedia = (0, import_react32.useCallback)(
     (stream) => {
       setReady(true);
       setIsVideoMirrored(isSelfieCamera(stream));
@@ -5676,8 +5659,8 @@ var CameraStep = (props) => {
   const { assets, direction, instructions } = cameraConfig || {};
   const { overlay, outline } = assets || {};
   const { url: imageUrl } = image || {};
-  const [captureClicked, setCaptureClicked] = (0, import_react30.useState)(false);
-  (0, import_react30.useEffect)(() => {
+  const [captureClicked, setCaptureClicked] = (0, import_react33.useState)(false);
+  (0, import_react33.useEffect)(() => {
     if (captureClicked) {
       onAction(action2);
     }
@@ -5865,10 +5848,10 @@ var DynamicFlowStep = (props) => {
 };
 
 // src/dynamicFlow/utils/useDebouncedRefresh/useDebouncedRefresh.ts
-var import_react31 = require("react");
+var import_react34 = require("react");
 var DEBOUNCE_DELAY = 1e3;
 function useDebouncedRefresh(fetchRefresh) {
-  const map = (0, import_react31.useRef)(/* @__PURE__ */ new Map());
+  const map = (0, import_react34.useRef)(/* @__PURE__ */ new Map());
   const retrieveOrCreate = (key) => {
     if (map.current.has(key)) {
       return map.current.get(key);
@@ -5890,7 +5873,7 @@ function useDebouncedRefresh(fetchRefresh) {
 }
 
 // src/dynamicFlow/utils/useDynamicFlowState.ts
-var import_react32 = require("react");
+var import_react35 = require("react");
 
 // src/dynamicFlow/DynamicFlowTypes.ts
 function isSchema(schema2) {
@@ -5900,9 +5883,9 @@ function isSchema(schema2) {
 // src/dynamicFlow/utils/useDynamicFlowState.ts
 var useDynamicFlowState = (initialStep) => {
   var _a, _b;
-  const [formErrors, setFormErrors] = (0, import_react32.useState)((_a = initialStep == null ? void 0 : initialStep.errors) == null ? void 0 : _a.validation);
-  const [globalError, setGlobalError] = (0, import_react32.useState)((_b = initialStep == null ? void 0 : initialStep.errors) == null ? void 0 : _b.error);
-  const [stepAndModels, setStepAndModels] = (0, import_react32.useState)({
+  const [formErrors, setFormErrors] = (0, import_react35.useState)((_a = initialStep == null ? void 0 : initialStep.errors) == null ? void 0 : _a.validation);
+  const [globalError, setGlobalError] = (0, import_react35.useState)((_b = initialStep == null ? void 0 : initialStep.errors) == null ? void 0 : _b.error);
+  const [stepAndModels, setStepAndModels] = (0, import_react35.useState)({
     step: initialStep || void 0,
     models: (initialStep == null ? void 0 : initialStep.model) ? buildInitialModels(initialStep.model, getAllSchemas(initialStep)) : {},
     etag: void 0
@@ -5932,7 +5915,7 @@ var useDynamicFlowState = (initialStep) => {
       return updatedState;
     });
   };
-  const modelIsValid = (0, import_react32.useMemo)(() => areModelsValid(models, getAllSchemas(step35)), [models, step35]);
+  const modelIsValid = (0, import_react35.useMemo)(() => areModelsValid(models, getAllSchemas(step35)), [models, step35]);
   return {
     formErrors,
     globalError,
@@ -5983,7 +5966,7 @@ var areModelsValid = (formModels, schemas = []) => {
 
 // src/dynamicFlow/utils/useLoader.tsx
 var import_components24 = require("@transferwise/components");
-var import_react33 = require("react");
+var import_react36 = require("react");
 var import_jsx_runtime57 = require("react/jsx-runtime");
 function useLoader(loaderConfig, initialState) {
   const config = __spreadValues({
@@ -5991,7 +5974,7 @@ function useLoader(loaderConfig, initialState) {
     initial: true,
     submission: false
   }, loaderConfig);
-  const [loadingState, setLoadingState] = (0, import_react33.useState)(initialState);
+  const [loadingState, setLoadingState] = (0, import_react36.useState)(initialState);
   const shouldDisplayLoader = config.initial && loadingState === "initial" || config.submission && loadingState === "submission";
   const loader = shouldDisplayLoader ? /* @__PURE__ */ (0, import_jsx_runtime57.jsx)(
     import_components24.Loader,
@@ -6005,7 +5988,7 @@ function useLoader(loaderConfig, initialState) {
 }
 
 // src/dynamicFlow/utils/errorBoundary/ErrorBoundary.tsx
-var import_react34 = require("react");
+var import_react37 = require("react");
 
 // src/dynamicFlow/utils/errorBoundary/ErrorBoundaryAlert.tsx
 var import_components25 = require("@transferwise/components");
@@ -6049,7 +6032,7 @@ var ErrorBoundaryAlert = ({ onDismiss }) => {
 var import_jsx_runtime59 = require("react/jsx-runtime");
 var noop6 = () => {
 };
-var ErrorBoundary = class extends import_react34.Component {
+var ErrorBoundary = class extends import_react37.Component {
   constructor(props) {
     super(props);
     this.handleErrorReset = () => {
@@ -6197,24 +6180,24 @@ var DynamicFlowComponent = ({
     setStepAndEtag,
     setSchemaModel
   } = useDynamicFlowState(initialStep);
-  const [submitted, setSubmitted] = (0, import_react35.useState)(false);
+  const [submitted, setSubmitted] = (0, import_react38.useState)(false);
   const { isLoading, loader, setLoadingState } = useLoader(
     loaderConfig,
     initialStep ? "idle" : "initial"
   );
   const logCritical = getLogger("critical", onLog, flowId, (step35 == null ? void 0 : step35.id) || (step35 == null ? void 0 : step35.key));
-  const analyticsMetadata = (0, import_react35.useMemo)(
+  const analyticsMetadata = (0, import_react38.useMemo)(
     () => {
       var _a;
       return __spreadValues({ flowId, stepId: (step35 == null ? void 0 : step35.id) || (step35 == null ? void 0 : step35.key) }, (_a = step35 == null ? void 0 : step35.analytics) != null ? _a : {});
     },
     [flowId, step35]
   );
-  const dispatchEvent = (0, import_react35.useMemo)(
+  const dispatchEvent = (0, import_react38.useMemo)(
     () => getEventDispatcher(onEvent, analyticsMetadata),
     [onEvent, analyticsMetadata]
   );
-  const dfHttpClient = (0, import_react35.useCallback)(
+  const dfHttpClient = (0, import_react38.useCallback)(
     ({ action: action2, data, etag: etag2 }) => {
       const { url, method = "POST" } = action2;
       return httpClient(url != null ? url : "", {
@@ -6264,17 +6247,17 @@ var DynamicFlowComponent = ({
     dispatchEventAndComplete(__spreadValues(__spreadValues({}, exitResult), actionResult));
   };
   const debouncedRefresh = useDebouncedRefresh(performRefresh);
-  const dispatchEventAndComplete = (0, import_react35.useCallback)(
+  const dispatchEventAndComplete = (0, import_react38.useCallback)(
     (result) => {
       dispatchEvent("Dynamic Flow - Flow Finished", { result: "success" });
       onCompletion(result);
     },
     [onCompletion, dispatchEvent]
   );
-  (0, import_react35.useEffect)(() => {
+  (0, import_react38.useEffect)(() => {
     dispatchEvent("Dynamic Flow - Flow Started", {});
   }, []);
-  (0, import_react35.useEffect)(() => {
+  (0, import_react38.useEffect)(() => {
     if (!initialStep) {
       const action2 = __spreadValues({
         $id: "#initial-step-request",