@adyen/kyc-components 3.75.0 → 3.76.0-beta.0

package/dist/{BusinessFinancingDropin-BX3j5n4C.js → BusinessFinancingDropin-B7r2WGiX.js}

@@ -2,33 +2,22 @@
 {
   try {
     let e = "undefined" != typeof window ? window : "undefined" != typeof global ? global : "undefined" != typeof globalThis ? globalThis : "undefined" != typeof self ? self : {}, n = new e.Error().stack;
-    n && (e._sentryDebugIds = e._sentryDebugIds || {}, e._sentryDebugIds[n] = "e6f7a88d-1538-49d6-99fb-7031bfbc989d", e._sentryDebugIdIdentifier = "sentry-dbid-e6f7a88d-1538-49d6-99fb-7031bfbc989d");
+    n && (e._sentryDebugIds = e._sentryDebugIds || {}, e._sentryDebugIds[n] = "2832759d-3336-47e2-bf5d-6d8ad658e92d", e._sentryDebugIdIdentifier = "sentry-dbid-2832759d-3336-47e2-bf5d-6d8ad658e92d");
   } catch (e) {
   }
 }
 ;
 import { jsx, jsxs, Fragment } from "preact/jsx-runtime";
-import { useMemo, useEffect, useCallback, useState, useRef } from "preact/hooks";
-import { u as useCreateLegalEntity, a as useUpdateLegalEntity } from "./useUpdateLegalEntity-FAhW-hcz.js";
-import { bQ as reverseMapping, bR as formatObject, bS as isEeaCountry, y as LegalEntityType, ba as cloneObject, bT as getProp, ao as isEmpty, p as useApiContext, q as useQuery, r as httpGet, b as useI18nContext, ay as Field, bJ as Select, C as Typography, aV as RadioGroup, bU as Link, bp as InputText, bb as currencyByCountry, bV as InputNumber, bW as InputDate, bX as Currency, bY as CURRENCY_FIELD, bZ as InputCurrency, at as useForm, b_ as useGlobalDataSlice, aw as ErrorPanel, ax as createFormUtils, b$ as useGlobalData, c0 as getAddressSchemaForCountry, c1 as COUNTRIES_WITH_STATES_DATASET, c2 as Address, c3 as getAddressSchemaLabelsByCountry, _ as useAnalyticsContext, be as useInvalidateRootLegalEntity, am as useAssociatedLegalEntity, b0 as datasetUtilities, a4 as useToastContext, c4 as useScenarioConfiguration, c5 as getPropsFromConfigurations, c6 as useStateContext, bN as getRequiredForms, bO as addValidityToForms, J as useSettingsContext, K as SettingNames, c7 as getAssociatedLeAnalyticsPayload, bP as useFormComposer, bL as getFormProps, L as Loader, a2 as Icon, Y as Button, c8 as FormWrapper, c9 as composePerScenarioFormConfigurations, ca as trackNavigation, cb as isValidationError, cc as processValidationErrors, cd as isMaintenanceModeError } from "./StoreProvider-CtNk8ekh.js";
-import { h as hasDataChanged } from "./hasDataChanged-CYQbu-tN.js";
-import { F as FormEndState } from "./FormEndState-QUOVERNX.js";
-import { l as localizeDateString } from "./localizeDateString-CjNwvcza.js";
-import { m as mapFinancialReportsToFinancialInformation, a as mapFinancialInformationToFinancialReport } from "./mapFinancialReportsToFinancialInformation-CLDDiIVD.js";
-import { f as fieldsPerScenario } from "./individualFormConfig-C7P-qsgN.js";
-import { b as businessFinancingCompanyDetailsValidations, a as businessFinancingParentCompanyDetailsValidations } from "./validate-BIlxlfqG.js";
-const MANDATORY_FIELDS_BUSINESS_FINANCING = [
-  "company.numberOfEmployees",
-  "parentCompany.numberOfEmployees",
-  "ultimateParentCompany.numberOfEmployees"
-];
+import { useRef, useEffect, useCallback, useMemo, useState } from "preact/hooks";
+import { u as useCreateLegalEntity, a as useUpdateLegalEntity } from "./useUpdateLegalEntity-DUM-neeX.js";
+import { bQ as reverseMapping, bR as formatObject, bS as isEeaCountry, y as LegalEntityType, ba as cloneObject, p as useApiContext, q as useQuery, r as httpGet, b as useI18nContext, az as Field, bJ as Select, C as Typography, ay as createFormUtils, aV as RadioGroup, bT as Link, bp as InputText, bb as currencyByCountry, bU as InputNumber, bV as InputDate, bW as Currency, bX as CURRENCY_FIELD, bY as InputCurrency, bK as useFormContext, av as getFieldProps, ax as ErrorPanel, bZ as getAddressSchemaForCountry, b_ as COUNTRIES_WITH_STATES_DATASET, b$ as Address, c0 as getAddressSchemaLabelsByCountry, $ as useAnalyticsContext, be as useInvalidateRootLegalEntity, an as useAssociatedLegalEntity, b0 as datasetUtilities, a5 as useToastContext, J as useSettingsContext, K as SettingNames, c1 as getAssociatedLeAnalyticsPayload, bN as getRequiredForms, bO as addValidityToForms, bP as useFormComposer, c2 as trackNavigation, L as Loader, a3 as Icon, Z as Button, c3 as isValidationError, c4 as processValidationErrors, c5 as isMaintenanceModeError } from "./StoreProvider-DM45wVPv.js";
+import { F as FormContextProvider, a as FormFlow } from "./FormFlow-B8-6ExTs.js";
+import { u as useMultiForm } from "./useMultiForm-Cbc7WnPQ.js";
+import { F as FormEndState } from "./FormEndState-CZ6KCgSg.js";
+import { l as localizeDateString } from "./localizeDateString-C2CJszPy.js";
+import { m as mapFinancialReportsToFinancialInformation, a as mapFinancialInformationToFinancialReport } from "./mapFinancialReportsToFinancialInformation-BN4Vmw7c.js";
+import { b as businessFinancingMultiformRules } from "./validate-CuwYJGc9.js";
 const businessFinancingBaseMapping = {
-  // TODO delete the financialReports keys, they wouldn't get mapped correctly anyway
-  numberOfEmployees: "organization.financialReports.employeeCount",
-  annualTurnover: "organization.financialReports.annualTurnover",
-  netAssets: "organization.financialReports.netAssets",
-  financialReportingDate: "organization.financialReports.dateOfFinancialData",
-  currency: "organization.financialReports.currencyOfFinancialData",
   legalProceedingsDate: "organization.dateOfInitiationOfLegalProceeding",
   legalInformationInsolvency: "organization.statusOfLegalProceeding",
   legalEntityIdentifier: "organization.globalLegalEntityIdentifier",
@@ -40,13 +29,7 @@ const businessFinancingBaseMapping = {
   "registrationAddress.postalCode": "organization.registeredAddress.postalCode",
   "registrationAddress.stateOrProvince": "organization.registeredAddress.stateOrProvince",
   "registrationAddress.address": "organization.registeredAddress.street",
-  "registrationAddress.otherAddressInformation": "organization.registeredAddress.street2",
-  "principalPlaceOfBusiness.city": "organization.principalPlaceOfBusiness.city",
-  "principalPlaceOfBusiness.country": "organization.principalPlaceOfBusiness.country",
-  "principalPlaceOfBusiness.postalCode": "organization.principalPlaceOfBusiness.postalCode",
-  "principalPlaceOfBusiness.stateOrProvince": "organization.principalPlaceOfBusiness.stateOrProvince",
-  "principalPlaceOfBusiness.address": "organization.principalPlaceOfBusiness.street",
-  "principalPlaceOfBusiness.otherAddressInformation": "organization.principalPlaceOfBusiness.street2"
+  "registrationAddress.otherAddressInformation": "organization.registeredAddress.street2"
 };
 const businessFinancingComponentsKeyMapping = {
   ...businessFinancingBaseMapping
@@ -55,7 +38,10 @@ const businessFinancingApiKeyMapping = {
   ...reverseMapping(businessFinancingBaseMapping)
 };
 const mapBusinessFinancingToLegalEntity = (data) => ({
-  ...formatObject(data, businessFinancingApiKeyMapping)
+  ...formatObject(
+    data,
+    businessFinancingApiKeyMapping
+  )
 });
 var BusinessFinancingPagesEnums = /* @__PURE__ */ ((BusinessFinancingPagesEnums2) => {
   BusinessFinancingPagesEnums2["COMPANY_PAGE"] = "company";
@@ -105,7 +91,6 @@ const parentCompaniesSchemaKeys = [
   "numberOfEmployees",
   "doesYourCompanyHaveLEI",
   "legalEntityIdentifier",
-  "doesNotKnowNumberOfEmployees",
   "isThisAddressTheMainHeadquarters",
   "financialReportingDate",
   "currency",
@@ -158,6 +143,15 @@ const entityHasUltimateParentCompany = (data) => {
   var _a, _b;
   return ((_a = data.company) == null ? void 0 : _a.isParentOwnedByAnotherCompany) && ((_b = data.company) == null ? void 0 : _b.isParentOwnedByAnotherCompany) === "Yes";
 };
+const financialReportsToString = (financialReports) => {
+  return {
+    ...financialReports,
+    numberOfEmployees: financialReports.numberOfEmployees ? financialReports.numberOfEmployees.toString() : void 0,
+    netAssets: financialReports.netAssets ? financialReports.netAssets.toString() : void 0,
+    annualTurnover: financialReports.annualTurnover ? financialReports.annualTurnover.toString() : void 0,
+    balanceSheetTotal: financialReports.balanceSheetTotal ? financialReports.balanceSheetTotal.toString() : void 0
+  };
+};
 const prepareBusinessFinancingSubmitData = (businessFinancingIndex, data, rootLegalEntity) => {
   var _a, _b, _c;
   const businessFinancingData = data[businessFinancingIndex];
@@ -168,15 +162,18 @@ const prepareBusinessFinancingSubmitData = (businessFinancingIndex, data, rootLe
   if (businessFinancingIndex === BusinessFinancingIndex.ULTIMATE_PARENT_COMPANY && (!entityHasUltimateParentCompany(data) || !entityHasParentCompany(data))) {
     return null;
   }
-  const businessFinancingDetails = mapBusinessFinancingToLegalEntity(
-    businessFinancingData
-  );
+  const businessFinancingDetails = mapBusinessFinancingToLegalEntity(businessFinancingData);
   if (!businessFinancingDetails.organization) return null;
   const businessFinancingCountry = ((_a = businessFinancingDetails.organization.registeredAddress) == null ? void 0 : _a.country) || ((_c = (_b = rootLegalEntity == null ? void 0 : rootLegalEntity.organization) == null ? void 0 : _b.registeredAddress) == null ? void 0 : _c.country);
-  if (businessFinancingDetails.organization.financialReports && isEeaCountry(businessFinancingCountry)) {
-    const businessFinancingFinancialReport = mapFinancialInformationToFinancialReport(
-      businessFinancingData
-    );
+  if (businessFinancingData.financialReportingDate && isEeaCountry(businessFinancingCountry)) {
+    const finReports = {
+      currency: businessFinancingData.currency,
+      financialReportingDate: businessFinancingData.financialReportingDate,
+      numberOfEmployees: businessFinancingData.numberOfEmployees ? Number(businessFinancingData.numberOfEmployees) : void 0,
+      netAssets: businessFinancingData.netAssets ? Number(businessFinancingData.netAssets) : void 0,
+      annualTurnover: businessFinancingData.annualTurnover ? Number(businessFinancingData.annualTurnover) : void 0
+    };
+    const businessFinancingFinancialReport = mapFinancialInformationToFinancialReport(finReports);
     businessFinancingDetails.organization.financialReports = [businessFinancingFinancialReport];
   }
   if (!isEeaCountry(businessFinancingCountry)) {
@@ -212,11 +209,19 @@ const appendBusinessFinancingData = (legalOrganization, businessFinancingData) =
   let financialReportData = {};
   if (legalOrganization.financialReports) {
     const financialReportsArray = Array.isArray(legalOrganization.financialReports) ? legalOrganization.financialReports : [legalOrganization.financialReports];
-    financialReportData = mapFinancialReportsToFinancialInformation(financialReportsArray, false);
+    const financialInformationSchema = mapFinancialReportsToFinancialInformation(
+      financialReportsArray,
+      false
+    );
+    financialReportData = financialReportsToString(financialInformationSchema);
+    if (financialReportData.numberOfEmployees) {
+      financialReportData.numberOfEmployees = financialReportData.numberOfEmployees.toString();
+    }
   }
   return {
     ...clonedBusinessFinancingData,
     ...financialReportData,
+    numberOfEmployees: financialReportData.numberOfEmployees ? financialReportData.numberOfEmployees.toString() : void 0,
     doesYourCompanyHaveLEI: legalOrganization.globalLegalEntityIdentifier ? "Yes" : "No",
     isThisAddressTheMainHeadquarters: legalOrganization.principalPlaceOfBusiness ? "Yes" : clonedBusinessFinancingData.isThisAddressTheMainHeadquarters
   };
@@ -278,6 +283,39 @@ const getParentCompanySchemaKeys = (currentData, schemaKeys) => {
   }
   return schemaKeys.filter((field) => !fieldsToRemove.includes(field));
 };
+const getBusinessFinancingRequiredFields = (data) => {
+  let requiredFields = {
+    company: companySchemaKeys
+  };
+  if (!data) {
+    return requiredFields;
+  }
+  const { company, parentCompany = {}, ultimateParentCompany = {} } = data;
+  if (company) {
+    requiredFields.company = getCompanySchemaKeys("NL", company, companySchemaKeys);
+  }
+  if ((company == null ? void 0 : company.isCompanyOwnedByAnotherCompany) === "Yes") {
+    const parentCompanyRequiredFields = getParentCompanySchemaKeys(
+      parentCompany,
+      parentCompaniesSchemaKeys
+    );
+    requiredFields = {
+      ...requiredFields,
+      parentCompany: parentCompanyRequiredFields
+    };
+  }
+  if ((company == null ? void 0 : company.isParentOwnedByAnotherCompany) === "Yes") {
+    const ultimateParentCompanyRequiredFields = getParentCompanySchemaKeys(
+      ultimateParentCompany,
+      parentCompaniesSchemaKeys
+    );
+    requiredFields = {
+      ...requiredFields,
+      ultimateParentCompany: ultimateParentCompanyRequiredFields
+    };
+  }
+  return requiredFields;
+};
 const customLabels = {
   company: {
     legalForm: "businessStructure",
@@ -319,7 +357,7 @@ const getFormattedAmount = (value, currency) => {
   const formattedValue = Number(value).toLocaleString(userLocale);
   return `${currency} ${formattedValue}`;
 };
-const formatDataForSummary = (data, i18n, datasetUtils) => {
+const formatDataForSummary = (i18n, datasetUtils, data) => {
   var _a, _b, _c, _d, _e;
   const summaryData = cloneObject(data) || {};
   if (summaryData.company) {
@@ -383,10 +421,6 @@ const formatDataForSummary = (data, i18n, datasetUtils) => {
   }
   return summaryData;
 };
-const canSubmit = (data) => MANDATORY_FIELDS_BUSINESS_FINANCING.every((detail) => {
-  const value = getProp(data, detail);
-  return !isEmpty(value);
-});
 const mapLegalEntityToBusinessFinancing = (legalEntity) => formatObject(legalEntity, businessFinancingComponentsKeyMapping);
 const getLegalForms = async (countryCode, baseUrl) => {
   return httpGet({
@@ -416,21 +450,35 @@ function LegalFormField({
 }) {
   const { i18n } = useI18nContext();
   const { data: legalFormsData } = useLegalForms(countryCode);
-  const handleChangeForLegalForm = (e) => {
+  const handleChangeForRef = useRef(handleChangeFor);
+  useEffect(() => {
+    handleChangeForRef.current = handleChangeFor;
+  }, [handleChangeFor]);
+  const handleChangeForLegalForm = useCallback(
+    (e) => {
+      const legalFormEvent = {
+        target: {
+          name: "legalForm",
+          value: e.target.value
+        }
+      };
+      handleChangeFor("legalForm")(legalFormEvent);
+    },
+    [handleChangeFor]
+  );
+  useEffect(() => {
     var _a;
-    const legalFormValue = e.target.value;
     const selectedLabel = (_a = legalFormsData == null ? void 0 : legalFormsData.find(
-      (legalForm) => legalForm.id === legalFormValue
+      (legalForm) => legalForm.id === data.legalForm
     )) == null ? void 0 : _a.name;
     const legalFormEvent = {
       target: {
-        name: "legalForm",
-        value: e.target.value,
-        label: selectedLabel
+        name: "legalFormLabel",
+        value: selectedLabel
       }
     };
-    handleChangeFor("legalForm")(legalFormEvent);
-  };
+    handleChangeForRef.current("legalFormLabel")(legalFormEvent);
+  }, [data.legalForm, legalFormsData]);
   return /* @__PURE__ */ jsx(
     Field,
     {
@@ -482,21 +530,30 @@ function NaceCodeField({
 }) {
   const { i18n } = useI18nContext();
   const { data: naceCodesData } = useNaceCodes();
+  const handleChangeForRef = useRef(handleChangeFor);
+  useEffect(() => {
+    handleChangeForRef.current = handleChangeFor;
+  }, [handleChangeFor]);
   const handleChangeForNaceCode = (e) => {
-    var _a;
-    const naceCodeFormValue = e.target.value;
-    const selectedLabel = (_a = naceCodesData == null ? void 0 : naceCodesData.find(
-      (naceCode) => naceCode.id === naceCodeFormValue
-    )) == null ? void 0 : _a.name;
     const naceCodeEvent = {
       target: {
         name: "naceCode",
-        value: e.target.value,
-        label: selectedLabel
+        value: e.target.value
       }
     };
     handleChangeFor("naceCode")(naceCodeEvent);
   };
+  useEffect(() => {
+    var _a;
+    const selectedLabel = (_a = naceCodesData == null ? void 0 : naceCodesData.find((naceCode) => naceCode.id === data.naceCode)) == null ? void 0 : _a.name;
+    const naceCodeEvent = {
+      target: {
+        name: "naceCodeLabel",
+        value: selectedLabel
+      }
+    };
+    handleChangeForRef.current("naceCodeLabel")(naceCodeEvent);
+  }, [data.naceCode, naceCodesData]);
   return /* @__PURE__ */ jsx(
     Field,
     {
@@ -521,51 +578,44 @@ function NaceCodeField({
     }
   );
 }
-function BusinessFinancingBusinessInformation({
-  formUtils,
-  data,
-  valid,
-  errors,
-  fieldProblems,
-  handleChangeFor,
-  country,
-  targetPage,
-  sectionHeading
-}) {
-  var _a;
+const businessInformationFields = [
+  "legalForm",
+  "naceCode",
+  "naceCodeLabel",
+  "legalFormLabel",
+  "doesYourCompanyHaveLEI",
+  "legalEntityIdentifier"
+];
+function BusinessFinancingBusinessInformation(props) {
+  const {
+    data,
+    valid,
+    errors,
+    country,
+    handleFieldChange,
+    fieldValidationErrors,
+    targetPage,
+    sectionHeading
+  } = props;
   const { i18n } = useI18nContext();
+  const formUtils = createFormUtils(props, i18n);
+  if (!handleFieldChange) {
+    return;
+  }
   const isMainCompany = targetPage === BusinessFinancingPagesEnums.COMPANY_PAGE;
-  const companyCountry = targetPage === BusinessFinancingPagesEnums.COMPANY_PAGE ? country : (_a = data == null ? void 0 : data.registrationAddress) == null ? void 0 : _a.country;
-  const handleChangeWithLabel = (key) => (e) => {
-    const labelKey = `${key}Label`;
-    const fieldEvent = {
-      target: {
-        name: key,
-        value: e.target.value
-      }
-    };
-    const labelEvent = {
-      target: {
-        name: labelKey,
-        value: e.target.label
-      }
-    };
-    handleChangeFor(key)(fieldEvent);
-    handleChangeFor(labelKey)(labelEvent);
-  };
   return /* @__PURE__ */ jsxs(Fragment, { children: [
     /* @__PURE__ */ jsx(Typography, { el: "h3", variant: "title", children: i18n.get(sectionHeading || "yourBusinessInformation") }),
     /* @__PURE__ */ jsx(
       LegalFormField,
       {
         name: "legalForm",
-        countryCode: companyCountry,
+        countryCode: country,
         data: {
-          legalForm: data.legalForm
+          legalForm: data == null ? void 0 : data.legalForm
         },
-        valid: { legalForm: valid.legalForm },
-        errorMessage: formUtils.getErrorMessage("legalForm", errors, fieldProblems),
-        handleChangeFor: handleChangeWithLabel,
+        valid: { legalForm: valid == null ? void 0 : valid.legalForm },
+        errorMessage: formUtils.getErrorMessage("legalForm", errors, fieldValidationErrors),
+        handleChangeFor: handleFieldChange,
         readonly: false,
         label: formUtils.getLabel("legalForm", "businessStructure")
       }
@@ -574,10 +624,10 @@ function BusinessFinancingBusinessInformation({
       NaceCodeField,
       {
         name: "naceCode",
-        data: { naceCode: data.naceCode },
-        valid: { naceCode: valid.naceCode },
-        errorMessage: formUtils.getErrorMessage("naceCode", errors, fieldProblems),
-        handleChangeFor: handleChangeWithLabel,
+        data: { naceCode: data == null ? void 0 : data.naceCode },
+        valid: { naceCode: valid == null ? void 0 : valid.naceCode },
+        errorMessage: formUtils.getErrorMessage("naceCode", errors, fieldValidationErrors),
+        handleChangeFor: handleFieldChange,
         readonly: false,
         label: formUtils.getLabel("naceCode", "industryAndNaceCode")
       }
@@ -594,29 +644,37 @@ function BusinessFinancingBusinessInformation({
           " ",
           /* @__PURE__ */ jsx(Link, { href: "https://search.gleif.org/#/search/", external: true, inline: true, children: i18n.get("lookUpYourLEI") })
         ] }),
-        errorMessage: formUtils.getErrorMessage("doesYourCompanyHaveLEI", errors, fieldProblems),
+        errorMessage: formUtils.getErrorMessage(
+          "doesYourCompanyHaveLEI",
+          errors,
+          fieldValidationErrors
+        ),
         children: (childProps) => /* @__PURE__ */ jsx(
           RadioGroup,
           {
             ...childProps,
             name: "doesYourCompanyHaveLEI",
             items: isMainCompany ? businessFinancingRadioItems : businessFinancingParentRadioItems,
-            value: data.doesYourCompanyHaveLEI,
+            value: data == null ? void 0 : data.doesYourCompanyHaveLEI,
             disabled: false,
-            onChange: handleChangeFor("doesYourCompanyHaveLEI"),
+            onChange: handleFieldChange("doesYourCompanyHaveLEI"),
             "aria-required": true,
-            "aria-invalid": !valid.doesYourCompanyHaveLEI
+            "aria-invalid": !(valid == null ? void 0 : valid.doesYourCompanyHaveLEI)
           }
         )
       }
     ),
-    data.doesYourCompanyHaveLEI === "Yes" && /* @__PURE__ */ jsx(
+    (data == null ? void 0 : data.doesYourCompanyHaveLEI) === "Yes" && /* @__PURE__ */ jsx(
       Field,
       {
         name: "legalEntityIdentifier",
         label: formUtils.getLabel("legalEntityIdentifier", "legalEntityIdentifier"),
-        errorMessage: formUtils.getErrorMessage("legalEntityIdentifier", errors, fieldProblems),
-        isValid: valid.legalEntityIdentifier,
+        errorMessage: formUtils.getErrorMessage(
+          "legalEntityIdentifier",
+          errors,
+          fieldValidationErrors
+        ),
+        isValid: valid == null ? void 0 : valid.legalEntityIdentifier,
         helper: i18n.get("enterNCharactersWithAMixForExample", {
           values: {
             numChars: 20,
@@ -628,14 +686,14 @@ function BusinessFinancingBusinessInformation({
           {
             ...childProps,
             name: "legalEntityIdentifier",
-            value: data.legalEntityIdentifier,
+            value: data == null ? void 0 : data.legalEntityIdentifier,
             readonly: false,
             classNameModifiers: ["legalName"],
-            onInput: handleChangeFor("legalEntityIdentifier", "input"),
-            onBlur: handleChangeFor("legalEntityIdentifier", "blur"),
+            onInput: handleFieldChange("legalEntityIdentifier", "input"),
+            onBlur: handleFieldChange("legalEntityIdentifier", "blur"),
             "aria-required": true,
-            "aria-invalid": !valid.legalEntityIdentifier,
-            isValid: valid.legalEntityIdentifier
+            "aria-invalid": !(valid == null ? void 0 : valid.legalEntityIdentifier),
+            isValid: valid == null ? void 0 : valid.legalEntityIdentifier
           }
         )
       }
@@ -643,31 +701,28 @@ function BusinessFinancingBusinessInformation({
   ] });
 }
 const TODAY_DATE$1 = (/* @__PURE__ */ new Date()).toISOString().split("T")[0];
-function BusinessFinancingFinancialInformation({
-  formUtils,
-  data,
-  valid,
-  errors,
-  fieldProblems,
-  handleChangeFor,
-  country,
-  sectionHeading,
-  setValidCurrency
-}) {
-  var _a;
+const financialInformationFields = [
+  "numberOfEmployees",
+  "financialReportingDate",
+  "doesYourCompanyHaveLEI",
+  "legalEntityIdentifier",
+  "currency",
+  "netAssets",
+  "annualTurnover"
+];
+function BusinessFinancingFinancialInformation(props) {
+  const { data, valid, errors, country, sectionHeading, handleFieldChange, fieldValidationErrors } = props;
   const { i18n } = useI18nContext();
+  const formUtils = createFormUtils(props, i18n);
+  const currenciesForCurrCountry = useMemo(() => currencyByCountry[country] ?? [], [country]);
+  if (!handleFieldChange) {
+    return;
+  }
   const financialData = data;
   const financialErrors = errors;
   const isFinancialDataValid = valid;
-  const currenciesForCurrCountry = useMemo(() => currencyByCountry[country] ?? [], [country]);
   const [firstCurrency] = currenciesForCurrCountry;
   const defaultCurrency = firstCurrency ?? "EUR";
-  useEffect(() => {
-    if ((currenciesForCurrCountry == null ? void 0 : currenciesForCurrCountry.length) === 1) {
-      financialData.currency = firstCurrency;
-      setValidCurrency("currency", true);
-    }
-  }, [currenciesForCurrCountry, firstCurrency, setValidCurrency, financialData]);
   return /* @__PURE__ */ jsxs("section", { children: [
     /* @__PURE__ */ jsx(Typography, { el: "h3", variant: "title", children: i18n.get(sectionHeading || "financialInformation") }),
     /* @__PURE__ */ jsx(
@@ -675,21 +730,21 @@ function BusinessFinancingFinancialInformation({
       {
         name: "numberOfEmployees",
         label: formUtils.getLabel("numberOfEmployees", "numberOfEmployees"),
-        errorMessage: formUtils.getErrorMessage("numberOfEmployees", errors, fieldProblems),
-        isValid: valid.numberOfEmployees,
+        errorMessage: formUtils.getErrorMessage("numberOfEmployees", errors, fieldValidationErrors),
+        isValid: valid == null ? void 0 : valid.numberOfEmployees,
         classNameModifiers: ["numberOfEmployees"],
         children: (childProps) => /* @__PURE__ */ jsx(
           InputNumber,
           {
             ...childProps,
             "aria-required": true,
-            "aria-invalid": !valid.numberOfEmployees,
+            "aria-invalid": !(valid == null ? void 0 : valid.numberOfEmployees),
             name: "numberOfEmployees",
             min: "0",
             step: "1",
-            value: data.numberOfEmployees,
-            onInput: handleChangeFor("numberOfEmployees", "input"),
-            onBlur: handleChangeFor("numberOfEmployees", "blur")
+            value: data == null ? void 0 : data.numberOfEmployees,
+            onInput: handleFieldChange("numberOfEmployees", "input"),
+            onBlur: handleFieldChange("numberOfEmployees", "blur")
           }
         )
       }
@@ -700,19 +755,23 @@ function BusinessFinancingFinancialInformation({
         name: "financialReportingDate",
         label: formUtils.getLabel("financialReportingDate", "financialReportingDate"),
         helper: i18n.get("dateOfTotalAssetsCalculation"),
-        errorMessage: formUtils.getErrorMessage("financialReportingDate", errors, fieldProblems),
-        isValid: valid.financialReportingDate,
+        errorMessage: formUtils.getErrorMessage(
+          "financialReportingDate",
+          errors,
+          fieldValidationErrors
+        ),
+        isValid: valid == null ? void 0 : valid.financialReportingDate,
         classNameModifiers: ["financialReportingDate"],
         children: (childProps) => /* @__PURE__ */ jsx(
           InputDate,
           {
             ...childProps,
             name: "financialReportingDate",
-            value: data.financialReportingDate,
-            onInput: handleChangeFor("financialReportingDate", "input"),
-            onBlur: handleChangeFor("financialReportingDate", "blur"),
+            value: data == null ? void 0 : data.financialReportingDate,
+            onInput: handleFieldChange("financialReportingDate", "input"),
+            onBlur: handleFieldChange("financialReportingDate", "blur"),
             "aria-required": true,
-            "aria-invalid": !valid.financialReportingDate,
+            "aria-invalid": !(valid == null ? void 0 : valid.financialReportingDate),
             max: TODAY_DATE$1
           }
         )
@@ -721,10 +780,10 @@ function BusinessFinancingFinancialInformation({
     /* @__PURE__ */ jsx(
       Currency,
       {
-        country: ((_a = data == null ? void 0 : data.registrationAddress) == null ? void 0 : _a.country) ?? country,
+        country,
         data: formUtils.getFieldData(financialData, CURRENCY_FIELD),
-        errors: formUtils.getFieldErrors(financialErrors, fieldProblems, CURRENCY_FIELD),
-        handleChangeFor,
+        errors: formUtils.getFieldErrors(financialErrors, fieldValidationErrors, CURRENCY_FIELD),
+        handleChangeFor: handleFieldChange,
         labels: { currency: i18n.get("reportingCurrency") },
         readonly: formUtils.isReadOnly("currency"),
         valid: formUtils.getFieldValid(isFinancialDataValid, CURRENCY_FIELD)
@@ -737,15 +796,15 @@ function BusinessFinancingFinancialInformation({
           name: "netAssets",
           label: formUtils.getLabel("netAssets", "totalAssets"),
           helper: i18n.get("totalAssetsHelper"),
-          errorMessage: formUtils.getErrorMessage("netAssets", errors, fieldProblems),
+          errorMessage: formUtils.getErrorMessage("netAssets", errors, fieldValidationErrors),
           children: (childProps) => /* @__PURE__ */ jsx(
             InputCurrency,
             {
               ...childProps,
               locale: i18n.locale,
-              currency: data.currency ?? defaultCurrency,
-              amount: data.netAssets,
-              onAmountChanged: handleChangeFor("netAssets")
+              currency: (data == null ? void 0 : data.currency) ?? defaultCurrency,
+              amount: (data == null ? void 0 : data.netAssets) ? Number(data == null ? void 0 : data.netAssets) : void 0,
+              onAmountChanged: handleFieldChange("netAssets")
             }
           )
         }
@@ -756,16 +815,16 @@ function BusinessFinancingFinancialInformation({
           name: "annualTurnover",
           label: formUtils.getLabel("annualTurnover", "annualTurnover"),
           helper: i18n.get("annualTurnoverHelper"),
-          errorMessage: formUtils.getErrorMessage("annualTurnover", errors, fieldProblems),
+          errorMessage: formUtils.getErrorMessage("annualTurnover", errors, fieldValidationErrors),
           children: (childProps) => /* @__PURE__ */ jsx(
             InputCurrency,
             {
               ...childProps,
               name: "annualTurnover",
               locale: i18n.locale,
-              currency: data.currency ?? defaultCurrency,
-              amount: data.annualTurnover,
-              onAmountChanged: handleChangeFor("annualTurnover")
+              currency: (data == null ? void 0 : data.currency) ?? defaultCurrency,
+              amount: (data == null ? void 0 : data.annualTurnover) ? Number(data == null ? void 0 : data.annualTurnover) : void 0,
+              onAmountChanged: handleFieldChange("annualTurnover")
             }
           )
         }
@@ -774,16 +833,17 @@ function BusinessFinancingFinancialInformation({
   ] });
 }
 const TODAY_DATE = (/* @__PURE__ */ new Date()).toISOString().split("T")[0];
-function BusinessFinancingLegalInformation({
-  formUtils,
-  data,
-  valid,
-  errors,
-  fieldProblems,
-  handleChangeFor,
-  sectionHeading
-}) {
+const legalInformationFields = [
+  "legalInformationInsolvency",
+  "legalProceedingsDate"
+];
+function BusinessFinancingLegalInformation(props) {
+  const { data, valid, errors, fieldValidationErrors, handleFieldChange, sectionHeading } = props;
   const { i18n } = useI18nContext();
+  const formUtils = createFormUtils(props, i18n);
+  if (!handleFieldChange) {
+    return;
+  }
   const legalInformationInsolvencyItems = [
     { id: "noLegalActionsTaken", name: i18n.get("no") },
     { id: "underJudicialAdministration", name: i18n.get("underJudicialAdministration") },
@@ -791,7 +851,7 @@ function BusinessFinancingLegalInformation({
     { id: "otherLegalMeasures", name: i18n.get("otherLegalMeasures") },
     { id: "iDontKnow", name: i18n.get("iDontKnow") }
   ];
-  const showLegalProceedingsDateField = data.legalInformationInsolvency && !["noLegalActionsTaken", "iDontKnow"].includes(data.legalInformationInsolvency);
+  const showLegalProceedingsDateField = (data == null ? void 0 : data.legalInformationInsolvency) && !["noLegalActionsTaken", "iDontKnow"].includes(data == null ? void 0 : data.legalInformationInsolvency);
   return /* @__PURE__ */ jsxs(Fragment, { children: [
     /* @__PURE__ */ jsx(Typography, { el: "h3", variant: "title", children: i18n.get(sectionHeading || "legalInformation") }),
     /* @__PURE__ */ jsx(
@@ -802,20 +862,20 @@ function BusinessFinancingLegalInformation({
         errorMessage: formUtils.getErrorMessage(
           "legalInformationInsolvency",
           errors,
-          fieldProblems
+          fieldValidationErrors
         ),
-        isValid: valid.legalInformationInsolvency,
+        isValid: valid == null ? void 0 : valid.legalInformationInsolvency,
         children: (childProps) => /* @__PURE__ */ jsx(
           Select,
           {
             ...childProps,
-            onChange: handleChangeFor("legalInformationInsolvency", "blur"),
+            onChange: handleFieldChange("legalInformationInsolvency", "blur"),
             name: "legalInformationInsolvency",
             placeholder: i18n.get("selectOne"),
-            selected: data.legalInformationInsolvency,
+            selected: data == null ? void 0 : data.legalInformationInsolvency,
             items: legalInformationInsolvencyItems,
             "aria-required": true,
-            "aria-invalid": !valid.legalInformationInsolvency
+            "aria-invalid": !(valid == null ? void 0 : valid.legalInformationInsolvency)
           }
         )
       }
@@ -825,8 +885,12 @@ function BusinessFinancingLegalInformation({
       {
         name: "legalProceedingsDate",
         label: formUtils.getLabel("legalProceedingsDate", "legalProceedingsDate"),
-        errorMessage: formUtils.getErrorMessage("legalProceedingsDate", errors, fieldProblems),
-        isValid: valid.legalProceedingsDate,
+        errorMessage: formUtils.getErrorMessage(
+          "legalProceedingsDate",
+          errors,
+          fieldValidationErrors
+        ),
+        isValid: valid == null ? void 0 : valid.legalProceedingsDate,
         children: (childProps) => /* @__PURE__ */ jsx(
           InputDate,
           {
@@ -834,10 +898,10 @@ function BusinessFinancingLegalInformation({
             name: "legalProceedingsDate",
             value: data.legalProceedingsDate,
             classNameModifiers: ["legalProceedingsDate"],
-            onInput: handleChangeFor("legalProceedingsDate", "input"),
-            onBlur: handleChangeFor("legalProceedingsDate", "blur"),
+            onInput: handleFieldChange("legalProceedingsDate", "input"),
+            onBlur: handleFieldChange("legalProceedingsDate", "blur"),
             "aria-required": true,
-            "aria-invalid": !valid.legalProceedingsDate,
+            "aria-invalid": !(valid == null ? void 0 : valid.legalProceedingsDate),
             max: TODAY_DATE
           }
         )
@@ -845,16 +909,17 @@ function BusinessFinancingLegalInformation({
     )
   ] });
 }
-function BusinessFinancingOwnershipStructure({
-  formUtils,
-  data,
-  valid,
-  errors,
-  fieldProblems,
-  handleChangeFor,
-  legalEntity
-}) {
+const ownershipStructureFields = [
+  "isCompanyOwnedByAnotherCompany",
+  "isParentOwnedByAnotherCompany"
+];
+function BusinessFinancingOwnershipStructure(props) {
+  const { data, valid, errors = {}, legalEntity, fieldValidationErrors, handleFieldChange } = props;
   const { i18n } = useI18nContext();
+  const formUtils = createFormUtils(props, i18n);
+  if (!handleFieldChange) {
+    return;
+  }
   return /* @__PURE__ */ jsxs(Fragment, { children: [
     /* @__PURE__ */ jsx(Typography, { el: "h3", variant: "title", children: i18n.get("ownershipStructure") }),
     /* @__PURE__ */ jsx(
@@ -869,7 +934,7 @@ function BusinessFinancingOwnershipStructure({
         errorMessage: formUtils.getErrorMessage(
           "isCompanyOwnedByAnotherCompany",
           errors,
-          fieldProblems
+          fieldValidationErrors
         ),
         helper: /* @__PURE__ */ jsx(Typography, { el: "div", variant: "body", color: "secondary", children: /* @__PURE__ */ jsx("span", { children: i18n.get("thisMeansYouHaveAParentCompany") }) }),
         children: (childProps) => /* @__PURE__ */ jsx(
@@ -878,11 +943,11 @@ function BusinessFinancingOwnershipStructure({
             ...childProps,
             name: "isCompanyOwnedByAnotherCompany",
             items: businessFinancingRadioItems,
-            value: data.isCompanyOwnedByAnotherCompany,
+            value: data == null ? void 0 : data.isCompanyOwnedByAnotherCompany,
             disabled: false,
-            onChange: handleChangeFor("isCompanyOwnedByAnotherCompany"),
+            onChange: handleFieldChange("isCompanyOwnedByAnotherCompany"),
             "aria-required": true,
-            "aria-invalid": !valid.isCompanyOwnedByAnotherCompany
+            "aria-invalid": !(valid == null ? void 0 : valid.isCompanyOwnedByAnotherCompany)
           }
         )
       }
@@ -896,9 +961,9 @@ function BusinessFinancingOwnershipStructure({
         label: formUtils.getLabel("isParentOwnedByAnotherCompany"),
         helper: /* @__PURE__ */ jsx(Typography, { el: "div", variant: "body", color: "secondary", children: /* @__PURE__ */ jsx("span", { children: i18n.get("thisMeansYouHaveAnUltimateParentCompany") }) }),
         errorMessage: formUtils.getErrorMessage(
-          "isParentOwnedByAnotherCompany",
+          "isCompanyOwnedByAnotherCompany",
           errors,
-          fieldProblems
+          fieldValidationErrors
         ),
         children: (childProps) => /* @__PURE__ */ jsx(
           RadioGroup,
@@ -908,9 +973,9 @@ function BusinessFinancingOwnershipStructure({
             items: businessFinancingRadioItems,
             value: data.isParentOwnedByAnotherCompany,
             disabled: false,
-            onChange: handleChangeFor("isParentOwnedByAnotherCompany"),
+            onChange: handleFieldChange("isCompanyOwnedByAnotherCompany"),
             "aria-required": true,
-            "aria-invalid": !valid.isParentOwnedByAnotherCompany
+            "aria-invalid": !(valid == null ? void 0 : valid.isParentOwnedByAnotherCompany)
           }
         )
       }
@@ -920,35 +985,15 @@ function BusinessFinancingOwnershipStructure({
 function AdditionalFieldsForBusinessFinancingCompany(props) {
   const { i18n } = useI18nContext();
   const {
-    country,
-    data: businessFinancingCompanyDetailsData,
-    validators,
-    formVerificationErrors,
-    legalEntity
-  } = props;
-  const getFormSchema = useCallback(
-    (currentData) => getCompanySchemaKeys(country, currentData, companySchemaKeys),
-    []
-  );
-  const { handleChangeFor, data, schema, valid, errors, fieldProblems, setValid } = useForm({
-    ...props,
-    schema: getFormSchema,
-    defaultData: businessFinancingCompanyDetailsData,
-    rules: validators || businessFinancingCompanyDetailsValidations,
-    fieldProblems: props == null ? void 0 : props.fieldValidationErrors
-  });
+    form: { handleChangeFor, data }
+  } = useFormContext();
+  const { country, formVerificationErrors, legalEntity } = props;
   const formUtils = createFormUtils(props, i18n);
-  const businessFinancingHandleChangeFor = handleChangeFor;
-  const { updateStateSlice } = useGlobalDataSlice("company");
-  useEffect(() => {
-    updateStateSlice == null ? void 0 : updateStateSlice({
-      data,
-      valid,
-      errors,
-      fieldProblems,
-      schema
-    });
-  }, [data, valid, errors, schema, fieldProblems]);
+  const handleChange = (fieldName, mode) => handleChangeFor(fieldName, "company", mode);
+  const ownershipStructureProps = getFieldProps(props, ownershipStructureFields);
+  const businessInformationProps = getFieldProps(props, businessInformationFields);
+  const financialInformationProps = getFieldProps(props, financialInformationFields);
+  const legalInformationProps = getFieldProps(props, legalInformationFields);
   return /* @__PURE__ */ jsxs("form", { className: "adyen-kyc__high-exposure-company", children: [
     /* @__PURE__ */ jsx(Typography, { el: "h1", variant: "title-l", children: i18n.get("additionalInformationForBusinessFinancing") }),
     /* @__PURE__ */ jsx(Typography, { el: "p", variant: "body", children: i18n.get("beforeSubmittingYourCapitalLoanApplication") }),
@@ -964,71 +1009,56 @@ function AdditionalFieldsForBusinessFinancingCompany(props) {
     /* @__PURE__ */ jsx(
       BusinessFinancingBusinessInformation,
       {
-        ...props,
-        handleChangeFor: businessFinancingHandleChangeFor,
-        errors,
-        data,
-        valid,
+        ...businessInformationProps,
+        handleFieldChange: handleChange,
         country,
-        formUtils,
-        fieldProblems,
         targetPage: BusinessFinancingPagesEnums.COMPANY_PAGE,
-        sectionHeading: "yourBusinessInformation"
+        sectionHeading: "yourBusinessInformation",
+        data: formUtils.getFieldData((data == null ? void 0 : data.company) ?? {}, businessInformationFields)
       }
     ),
     /* @__PURE__ */ jsx(
       BusinessFinancingOwnershipStructure,
       {
-        ...props,
-        handleChangeFor,
-        errors,
-        data,
-        valid,
+        ...ownershipStructureProps,
         legalEntity,
-        formUtils,
-        fieldProblems
+        handleFieldChange: handleChange,
+        data: formUtils.getFieldData((data == null ? void 0 : data.company) ?? {}, ownershipStructureFields)
       }
     ),
     isEeaCountry(country) && /* @__PURE__ */ jsx(
       BusinessFinancingFinancialInformation,
       {
-        ...props,
-        handleChangeFor: businessFinancingHandleChangeFor,
-        errors,
-        data,
-        valid,
+        ...financialInformationProps,
+        handleFieldChange: handleChange,
         country,
-        formUtils,
-        fieldProblems,
         targetPage: BusinessFinancingPagesEnums.COMPANY_PAGE,
-        setValidCurrency: setValid
+        data: formUtils.getFieldData((data == null ? void 0 : data.company) ?? {}, financialInformationFields)
       }
     ),
     /* @__PURE__ */ jsx(
       BusinessFinancingLegalInformation,
       {
-        ...props,
-        handleChangeFor: businessFinancingHandleChangeFor,
-        errors,
-        data,
-        valid,
-        formUtils,
-        fieldProblems,
-        targetPage: BusinessFinancingPagesEnums.COMPANY_PAGE
+        ...legalInformationProps,
+        country,
+        handleFieldChange: handleChange,
+        targetPage: BusinessFinancingPagesEnums.COMPANY_PAGE,
+        sectionHeading: "legalInformation",
+        data: formUtils.getFieldData((data == null ? void 0 : data.company) ?? {}, legalInformationFields)
       }
     )
   ] });
 }
-function BusinessFinancingBasicCompanyInformation({
-  formUtils,
-  data,
-  valid,
-  errors,
-  fieldProblems,
-  handleChangeFor,
-  sectionHeading
-}) {
+const basicInformationFields = [
+  "legalName"
+];
+function BusinessFinancingBasicCompanyInformation(props) {
+  const { data, valid, errors, fieldValidationErrors, handleFieldChange, sectionHeading } = props;
   const { i18n } = useI18nContext();
+  const formUtils = createFormUtils(props, i18n);
+  if (!handleFieldChange) {
+    return;
+  }
   return /* @__PURE__ */ jsxs(Fragment, { children: [
     /* @__PURE__ */ jsx(Typography, { el: "h3", variant: "title", children: i18n.get(sectionHeading || "basicCompanyInformation") }),
     /* @__PURE__ */ jsx(
@@ -1037,21 +1067,21 @@ function BusinessFinancingBasicCompanyInformation({
         name: "legalName",
         label: formUtils.getLabel("legalName", "legalName"),
         classNameModifiers: ["legalName"],
-        errorMessage: formUtils.getErrorMessage("legalName", errors, fieldProblems),
-        isValid: valid.legalName,
+        errorMessage: formUtils.getErrorMessage("legalName", errors, fieldValidationErrors),
+        isValid: valid == null ? void 0 : valid.legalName,
         helper: i18n.get("legalNameIsUsedToIdentifyABusinessWithTheGovernment"),
         children: (childProps) => /* @__PURE__ */ jsx(
           InputText,
           {
             ...childProps,
             name: "legalName",
-            value: data.legalName,
+            value: data == null ? void 0 : data.legalName,
             readonly: false,
             classNameModifiers: ["legalName"],
-            onInput: handleChangeFor("legalName", "input"),
-            onBlur: handleChangeFor("legalName", "blur"),
+            onInput: handleFieldChange("legalName", "input"),
+            onBlur: handleFieldChange("legalName", "blur"),
             "aria-required": true,
-            "aria-invalid": !valid.legalName
+            "aria-invalid": !(valid == null ? void 0 : valid.legalName)
           }
         )
       }
@@ -1059,23 +1089,26 @@ function BusinessFinancingBasicCompanyInformation({
   ] });
 }
 const OPTIONAL_ADDRESS_FIELDS = ["otherAddressInformation"];
-function BusinessFinancingRegisteredAddress({
-  formUtils,
-  valid,
-  errors,
-  fieldProblems,
-  handleChangeFor,
-  legalEntity,
-  sectionHeading,
-  formId,
-  setValid,
-  shouldValidate,
-  defaultData
-}) {
-  var _a, _b;
+const registeredAddressFields = [
+  "isThisAddressTheMainHeadquarters",
+  "registrationAddress"
+];
+function BusinessFinancingRegisteredAddress(props) {
+  var _a;
+  const {
+    data,
+    valid,
+    errors,
+    fieldValidationErrors,
+    shouldValidate,
+    defaultData,
+    handleFieldChange,
+    formId,
+    legalEntity,
+    sectionHeading
+  } = props;
   const { i18n } = useI18nContext();
-  const { parentCompany, ultimateParentCompany } = useGlobalData();
-  const data = formId === "parentCompany" ? parentCompany : ultimateParentCompany;
+  const formUtils = createFormUtils(props, i18n);
   const addressCountry = (_a = data == null ? void 0 : data.registrationAddress) == null ? void 0 : _a.country;
   const addressSchema = useMemo(() => {
     return getAddressSchemaForCountry(addressCountry).filter((field) => {
@@ -1085,27 +1118,15 @@ function BusinessFinancingRegisteredAddress({
       return true;
     });
   }, [addressCountry]);
+  if (!handleFieldChange) {
+    return;
+  }
   const handleRegistrationAddressChange = (state) => {
     if (!state.data.country) {
       state.data.country = addressCountry;
     }
-    handleChangeFor("registrationAddress")(state.data);
-    if (setValid) {
-      setValid("registrationAddress", Boolean(state.isValid));
-    }
+    handleFieldChange("registrationAddress")(state.data);
   };
-  useEffect(() => {
-    var _a2, _b2;
-    const countryCurrencies = ((_a2 = data == null ? void 0 : data.registrationAddress) == null ? void 0 : _a2.country) ? currencyByCountry[(_b2 = data == null ? void 0 : data.registrationAddress) == null ? void 0 : _b2.country] : null;
-    if ((countryCurrencies == null ? void 0 : countryCurrencies.length) === 1) {
-      handleChangeFor("currency")({
-        target: {
-          name: "currency",
-          value: countryCurrencies[0]
-        }
-      });
-    }
-  }, [(_b = data == null ? void 0 : data.registrationAddress) == null ? void 0 : _b.country]);
   return /* @__PURE__ */ jsxs(Fragment, { children: [
     /* @__PURE__ */ jsx(Typography, { el: "h3", variant: "title", children: i18n.get(sectionHeading || "registeredAddress") }),
     /* @__PURE__ */ jsx(Typography, { el: "h3", variant: "caption", children: i18n.get("addressRegisteredWithSecretaryOfState") }),
@@ -1121,7 +1142,7 @@ function BusinessFinancingRegisteredAddress({
         errorMessage: formUtils.getErrorMessage(
           "isThisAddressTheMainHeadquarters",
           errors,
-          fieldProblems
+          fieldValidationErrors
         ),
         children: (childProps) => /* @__PURE__ */ jsx(
           RadioGroup,
@@ -1131,9 +1152,9 @@ function BusinessFinancingRegisteredAddress({
             items: businessFinancingRadioItems,
             value: data == null ? void 0 : data.isThisAddressTheMainHeadquarters,
             disabled: false,
-            onChange: handleChangeFor("isThisAddressTheMainHeadquarters"),
+            onChange: handleFieldChange("isThisAddressTheMainHeadquarters"),
             "aria-required": true,
-            "aria-invalid": !valid.isThisAddressTheMainHeadquarters
+            "aria-invalid": !(valid == null ? void 0 : valid.isThisAddressTheMainHeadquarters)
           }
         )
       }
@@ -1156,40 +1177,19 @@ function BusinessFinancingRegisteredAddress({
 }
 const parentCompanyFormId$1 = businessFinancingForms.parentCompany.formId;
 function AdditionalFieldsForBusinessFinancingParentCompany(props) {
-  var _a;
-  const {
-    shouldValidate,
-    data: businessFinancingParentCompanyDetailsData,
-    country,
-    formVerificationErrors
-  } = props;
+  var _a, _b, _c, _d, _e, _f;
   const { i18n } = useI18nContext();
-  const getFormSchema = useCallback(
-    (currentData) => getParentCompanySchemaKeys(currentData, parentCompaniesSchemaKeys),
-    []
-  );
-  const { handleChangeFor, data, valid, schema, setValid, errors, fieldProblems } = useForm({
-    ...props,
-    schema: getFormSchema,
-    defaultData: businessFinancingParentCompanyDetailsData,
-    rules: businessFinancingParentCompanyDetailsValidations,
-    fieldProblems: props == null ? void 0 : props.fieldValidationErrors,
-    shouldValidate
-  });
+  const {
+    form: { handleChangeFor, data }
+  } = useFormContext();
+  const { country, formVerificationErrors } = props;
   const formUtils = createFormUtils(props, i18n);
-  const businessFinancingHandleChangeFor = handleChangeFor;
-  const { updateStateSlice } = useGlobalDataSlice(
-    "parentCompany"
-  );
-  useEffect(() => {
-    updateStateSlice == null ? void 0 : updateStateSlice({
-      data,
-      valid,
-      errors,
-      fieldProblems,
-      schema
-    });
-  }, [data, valid, errors, schema, fieldProblems]);
+  const handleChange = (fieldName, mode) => handleChangeFor(fieldName, "parentCompany", mode);
+  const basicCompanyInformationProps = getFieldProps(props, basicInformationFields);
+  const registeredAddressProps = getFieldProps(props, registeredAddressFields);
+  const businessInformationProps = getFieldProps(props, businessInformationFields);
+  const financialInformationProps = getFieldProps(props, financialInformationFields);
+  const legalInformationProps = getFieldProps(props, legalInformationFields);
   return /* @__PURE__ */ jsxs("form", { className: "adyen-kyc__high-exposure-parent-company", children: [
     /* @__PURE__ */ jsx(Typography, { el: "h1", variant: "title-l", children: i18n.get("parentCompanyInformation") }),
     /* @__PURE__ */ jsx(Typography, { el: "p", variant: "body", children: i18n.get("inThePreviousStepOwnedByAParentCompany") }),
@@ -1205,116 +1205,72 @@ function AdditionalFieldsForBusinessFinancingParentCompany(props) {
     /* @__PURE__ */ jsx(
       BusinessFinancingBasicCompanyInformation,
       {
-        ...props,
-        handleChangeFor: businessFinancingHandleChangeFor,
+        ...basicCompanyInformationProps,
         sectionHeading: "basicCompanyInformation",
-        errors,
-        data,
-        valid,
-        formUtils,
-        fieldProblems
+        handleFieldChange: handleChange,
+        data: formUtils.getFieldData((data == null ? void 0 : data.parentCompany) ?? {}, basicInformationFields)
       }
     ),
     /* @__PURE__ */ jsx(
       BusinessFinancingRegisteredAddress,
       {
-        ...props,
+        ...registeredAddressProps,
         formId: parentCompanyFormId$1,
-        handleChangeFor: businessFinancingHandleChangeFor,
         sectionHeading: "registeredAddress",
-        errors,
-        defaultData: businessFinancingParentCompanyDetailsData,
-        valid,
-        setValid,
-        formUtils,
-        fieldProblems,
-        targetPage: BusinessFinancingPagesEnums.PARENT_COMPANY_PAGE,
-        shouldValidate
+        defaultData: data == null ? void 0 : data.parentCompany,
+        handleFieldChange: handleChange,
+        data: formUtils.getFieldData((data == null ? void 0 : data.parentCompany) ?? {}, registeredAddressFields)
       }
     ),
     /* @__PURE__ */ jsx(
       BusinessFinancingBusinessInformation,
       {
-        ...props,
-        handleChangeFor: businessFinancingHandleChangeFor,
+        ...businessInformationProps,
         sectionHeading: "additionalCompanyInformation",
-        errors,
-        data,
-        valid,
-        country,
-        formUtils,
-        fieldProblems,
-        targetPage: BusinessFinancingPagesEnums.PARENT_COMPANY_PAGE
+        country: ((_b = (_a = data == null ? void 0 : data.parentCompany) == null ? void 0 : _a.registrationAddress) == null ? void 0 : _b.country) ?? country,
+        targetPage: BusinessFinancingPagesEnums.PARENT_COMPANY_PAGE,
+        handleFieldChange: handleChange,
+        data: formUtils.getFieldData((data == null ? void 0 : data.parentCompany) ?? {}, businessInformationFields)
       }
     ),
-    isEeaCountry((_a = data == null ? void 0 : data.registrationAddress) == null ? void 0 : _a.country) && /* @__PURE__ */ jsx(
+    isEeaCountry((_d = (_c = data == null ? void 0 : data.parentCompany) == null ? void 0 : _c.registrationAddress) == null ? void 0 : _d.country) && /* @__PURE__ */ jsx(
       BusinessFinancingFinancialInformation,
       {
-        ...props,
-        handleChangeFor: businessFinancingHandleChangeFor,
-        errors,
-        data,
-        valid,
-        country,
-        formUtils,
-        fieldProblems,
+        ...financialInformationProps,
+        country: ((_f = (_e = data == null ? void 0 : data.parentCompany) == null ? void 0 : _e.registrationAddress) == null ? void 0 : _f.country) ?? country,
         targetPage: BusinessFinancingPagesEnums.PARENT_COMPANY_PAGE,
-        setValidCurrency: setValid
+        handleFieldChange: handleChange,
+        data: formUtils.getFieldData((data == null ? void 0 : data.parentCompany) ?? {}, financialInformationFields)
       }
     ),
     /* @__PURE__ */ jsx(
       BusinessFinancingLegalInformation,
       {
-        ...props,
-        handleChangeFor: businessFinancingHandleChangeFor,
-        errors,
-        data,
-        valid,
-        formUtils,
-        fieldProblems,
-        targetPage: BusinessFinancingPagesEnums.PARENT_COMPANY_PAGE
+        ...legalInformationProps,
+        country,
+        targetPage: BusinessFinancingPagesEnums.PARENT_COMPANY_PAGE,
+        sectionHeading: "legalInformation",
+        handleFieldChange: handleChange,
+        data: formUtils.getFieldData((data == null ? void 0 : data.parentCompany) ?? {}, legalInformationFields)
       }
     )
   ] });
 }
 const ultimateParentCompanyFormId$1 = businessFinancingForms.ultimateParentCompany.formId;
 function AdditionalFieldsForBusinessFinancingUltimateParentCompany(props) {
-  var _a;
-  const {
-    data: additionalFieldsForBusinessFinancingUltimateParentCompanyData,
-    validators,
-    formVerificationErrors,
-    country
-  } = props;
+  var _a, _b;
+  const { formVerificationErrors, country } = props;
   const { i18n } = useI18nContext();
-  const getFormSchema = useCallback(
-    (currentData) => getParentCompanySchemaKeys(currentData, parentCompaniesSchemaKeys),
-    []
-  );
-  const { handleChangeFor, data, valid, errors, fieldProblems, schema, setValid } = useForm({
-    ...props,
-    schema: getFormSchema,
-    defaultData: { ...additionalFieldsForBusinessFinancingUltimateParentCompanyData },
-    rules: validators || businessFinancingParentCompanyDetailsValidations,
-    fieldProblems: props == null ? void 0 : props.fieldValidationErrors
-  });
-  const formUtils = createFormUtils(
-    props,
-    i18n
-  );
-  const businessFinancingHandleChangeFor = handleChangeFor;
-  const { updateStateSlice } = useGlobalDataSlice(
-    "ultimateParentCompany"
-  );
-  useEffect(() => {
-    updateStateSlice == null ? void 0 : updateStateSlice({
-      data,
-      valid,
-      errors,
-      fieldProblems,
-      schema
-    });
-  }, [data, valid, errors, schema, fieldProblems]);
+  const formUtils = createFormUtils(props, i18n);
+  const {
+    form: { handleChangeFor, data }
+  } = useFormContext();
+  const handleChange = (fieldName, mode) => handleChangeFor(fieldName, "ultimateParentCompany", mode);
+  const basicCompanyInformationProps = getFieldProps(props, basicInformationFields);
+  const registeredAddressProps = getFieldProps(props, registeredAddressFields);
+  const businessInformationProps = getFieldProps(props, businessInformationFields);
+  const financialInformationProps = getFieldProps(props, financialInformationFields);
+  const legalInformationProps = getFieldProps(props, legalInformationFields);
   return /* @__PURE__ */ jsxs("form", { className: "adyen-kyc__high-exposure-ultimate-parent-company", children: [
     /* @__PURE__ */ jsx(Typography, { el: "h1", variant: "title-l", children: i18n.get("ultimateParentCompanyInformation") }),
     /* @__PURE__ */ jsx(Typography, { el: "p", variant: "body", children: i18n.get("inThePreviousStepOwnedByAnUltimateParentCompany") }),
@@ -1330,76 +1286,69 @@ function AdditionalFieldsForBusinessFinancingUltimateParentCompany(props) {
     /* @__PURE__ */ jsx(
       BusinessFinancingBasicCompanyInformation,
       {
-        ...props,
-        handleChangeFor: businessFinancingHandleChangeFor,
+        ...basicCompanyInformationProps,
         sectionHeading: "businessInformation",
-        errors,
-        data,
-        valid,
-        formUtils,
-        fieldProblems
+        handleFieldChange: handleChange,
+        data: formUtils.getFieldData((data == null ? void 0 : data.ultimateParentCompany) ?? {}, basicInformationFields)
       }
     ),
     /* @__PURE__ */ jsx(
       BusinessFinancingRegisteredAddress,
       {
-        ...props,
+        ...registeredAddressProps,
         formId: ultimateParentCompanyFormId$1,
-        handleChangeFor: businessFinancingHandleChangeFor,
         sectionHeading: "registeredAddress",
-        errors,
-        defaultData: additionalFieldsForBusinessFinancingUltimateParentCompanyData,
-        valid,
-        formUtils,
-        fieldProblems,
-        targetPage: BusinessFinancingPagesEnums.ULTIMATE_PARENT_COMPANY_PAGE
+        defaultData: data == null ? void 0 : data.ultimateParentCompany,
+        handleFieldChange: handleChange,
+        data: formUtils.getFieldData((data == null ? void 0 : data.ultimateParentCompany) ?? {}, registeredAddressFields)
       }
     ),
     /* @__PURE__ */ jsx(
       BusinessFinancingBusinessInformation,
       {
-        ...props,
-        handleChangeFor: businessFinancingHandleChangeFor,
+        ...businessInformationProps,
         sectionHeading: "additionalCompanyInformation",
-        errors,
-        data,
-        valid,
         country,
-        formUtils,
-        fieldProblems,
-        targetPage: BusinessFinancingPagesEnums.ULTIMATE_PARENT_COMPANY_PAGE
+        targetPage: BusinessFinancingPagesEnums.ULTIMATE_PARENT_COMPANY_PAGE,
+        handleFieldChange: handleChange,
+        data: formUtils.getFieldData((data == null ? void 0 : data.ultimateParentCompany) ?? {}, businessInformationFields)
       }
     ),
-    isEeaCountry((_a = data == null ? void 0 : data.registrationAddress) == null ? void 0 : _a.country) && /* @__PURE__ */ jsx(
+    isEeaCountry((_b = (_a = data == null ? void 0 : data.ultimateParentCompany) == null ? void 0 : _a.registrationAddress) == null ? void 0 : _b.country) && /* @__PURE__ */ jsx(
       BusinessFinancingFinancialInformation,
       {
-        ...props,
-        handleChangeFor: businessFinancingHandleChangeFor,
-        errors,
-        data,
-        valid,
+        ...financialInformationProps,
         country,
-        formUtils,
-        fieldProblems,
         targetPage: BusinessFinancingPagesEnums.ULTIMATE_PARENT_COMPANY_PAGE,
-        setValidCurrency: setValid
+        handleFieldChange: handleChange,
+        data: formUtils.getFieldData(
+          (data == null ? void 0 : data.ultimateParentCompany) ?? {},
+          financialInformationFields
+        )
       }
     ),
     /* @__PURE__ */ jsx(
       BusinessFinancingLegalInformation,
       {
-        ...props,
-        handleChangeFor: businessFinancingHandleChangeFor,
-        errors,
-        data,
-        valid,
-        formUtils,
-        fieldProblems,
-        targetPage: BusinessFinancingPagesEnums.ULTIMATE_PARENT_COMPANY_PAGE
+        ...legalInformationProps,
+        country,
+        sectionHeading: "legalInformation",
+        targetPage: BusinessFinancingPagesEnums.ULTIMATE_PARENT_COMPANY_PAGE,
+        handleFieldChange: handleChange,
+        data: formUtils.getFieldData((data == null ? void 0 : data.ultimateParentCompany) ?? {}, legalInformationFields)
       }
     )
   ] });
 }
+const getOrgAnalyticsData = (prefix, details) => {
+  const org = details == null ? void 0 : details.organization;
+  if (!org) return {};
+  return {
+    [`${prefix}--economicSector`]: (org == null ? void 0 : org.economicSector) ?? "",
+    [`${prefix}--legalForm`]: (org == null ? void 0 : org.legalForm) ?? "",
+    [`${prefix}--statusOfLegalProceeding`]: (org == null ? void 0 : org.statusOfLegalProceeding) ?? ""
+  };
+};
 const businessFinancingFormsRequiredFields = {
   company: businessFinancingForms.company.fields,
   parentCompany: businessFinancingForms.parentCompany.fields,
@@ -1408,8 +1357,6 @@ const businessFinancingFormsRequiredFields = {
 const parentCompanyFormId = businessFinancingForms.parentCompany.formId;
 const companyFormId = businessFinancingForms.company.formId;
 const ultimateParentCompanyFormId = businessFinancingForms.ultimateParentCompany.formId;
-const parseBusinessFinancingScenarios = (scenarios) => composePerScenarioFormConfigurations(scenarios, fieldsPerScenario);
-const parseConfiguration = ({ scenarios }) => parseBusinessFinancingScenarios(scenarios);
 function BusinessFinancingDropin(props) {
   var _a, _b;
   const {
@@ -1422,7 +1369,6 @@ function BusinessFinancingDropin(props) {
   } = props;
   const userEvents = useAnalyticsContext();
   const [defaultData, setDefaultData] = useState();
-  const [data, setData] = useState({});
   useRef(null);
   const invalidateRootLegalEntity = useInvalidateRootLegalEntity();
   const { mutateAsync: createLegalEntity } = useCreateLegalEntity();
@@ -1431,34 +1377,37 @@ function BusinessFinancingDropin(props) {
   const { data: ultimateParentCompany, isLoading: ultimateParentCompanyIsLoading } = useAssociatedLegalEntity(rootLegalEntity, "ultimateParentCompany");
   const derivedData = useMemo(() => {
     if (immediateParentCompanyIsLoading || ultimateParentCompanyIsLoading) return void 0;
-    const data2 = {};
-    data2.company = mapLegalEntityToBusinessFinancing(
+    const dataFromResponse = {};
+    dataFromResponse.company = mapLegalEntityToBusinessFinancing(
       rootLegalEntity
     );
-    data2.company = appendBusinessFinancingData(rootLegalEntity.organization, data2.company);
-    data2.company.isCompanyOwnedByAnotherCompany = "No";
-    data2.company.isParentOwnedByAnotherCompany = "No";
+    dataFromResponse.company = appendBusinessFinancingData(
+      rootLegalEntity.organization,
+      dataFromResponse.company
+    );
+    dataFromResponse.company.isCompanyOwnedByAnotherCompany = "No";
+    dataFromResponse.company.isParentOwnedByAnotherCompany = "No";
     if (immediateParentCompany) {
-      data2.parentCompany = mapLegalEntityToBusinessFinancing(
+      dataFromResponse.parentCompany = mapLegalEntityToBusinessFinancing(
         immediateParentCompany
       );
-      data2.parentCompany = appendBusinessFinancingData(
+      dataFromResponse.parentCompany = appendBusinessFinancingData(
         immediateParentCompany.organization,
-        data2.parentCompany
+        dataFromResponse.parentCompany
       );
-      data2.company.isCompanyOwnedByAnotherCompany = "Yes";
+      dataFromResponse.company.isCompanyOwnedByAnotherCompany = "Yes";
     }
     if (ultimateParentCompany) {
-      data2.ultimateParentCompany = mapLegalEntityToBusinessFinancing(
+      dataFromResponse.ultimateParentCompany = mapLegalEntityToBusinessFinancing(
         ultimateParentCompany
       );
-      data2.ultimateParentCompany = appendBusinessFinancingData(
+      dataFromResponse.ultimateParentCompany = appendBusinessFinancingData(
         ultimateParentCompany.organization,
-        data2.ultimateParentCompany
+        dataFromResponse.ultimateParentCompany
       );
-      data2.company.isParentOwnedByAnotherCompany = "Yes";
+      dataFromResponse.company.isParentOwnedByAnotherCompany = "Yes";
     }
-    return data2;
+    return dataFromResponse;
   }, [
     immediateParentCompanyIsLoading,
     ultimateParentCompanyIsLoading,
@@ -1473,10 +1422,9 @@ function BusinessFinancingDropin(props) {
   }, [userEvents]);
   useEffect(() => {
     if (derivedData) {
-      setData(derivedData);
-      if (!defaultData) setDefaultData({ ...derivedData });
+      setDefaultData({ ...derivedData });
     }
-  }, [derivedData, defaultData]);
+  }, [derivedData]);
   const { i18n } = useI18nContext();
   const datasetUtils = datasetUtilities(i18n.locale);
   const [problems, setProblems] = useState();
@@ -1484,85 +1432,26 @@ function BusinessFinancingDropin(props) {
   const [showEndState, setShowEndState] = useState(false);
   const [businessFinancingRequiredForms, setBusinessFinancingRequiredForms] = useState(businessFinancingForms);
   const { showToast } = useToastContext();
-  const { fieldConfigurations } = useScenarioConfiguration({
-    parseConfiguration,
-    legalEntityType: LegalEntityType.ORGANIZATION,
-    setLoadingStatus,
-    country
-  });
-  const derivedProps = useMemo(
-    () => getPropsFromConfigurations(
-      fieldConfigurations,
-      businessFinancingForms,
-      (problems == null ? void 0 : problems.remediationActions) ? Object.values(problems == null ? void 0 : problems.remediationActions) : [],
-      (problems == null ? void 0 : problems.missingData) ?? [],
-      // TODO this is not a valid key mapping so we can't put it here
-      // rootLegalEntity
-      //   ? getFieldsWithExistingData(rootLegalEntity, businessFinancingApiKeyMapping)
-      //   : [],
-      [],
-      {},
-      {},
-      {},
-      rootLegalEntity == null ? void 0 : rootLegalEntity.type,
-      rootLegalEntity == null ? void 0 : rootLegalEntity.trustedFields
-    ),
-    [fieldConfigurations, problems == null ? void 0 : problems.missingData, problems == null ? void 0 : problems.remediationActions, rootLegalEntity]
-  );
-  const {
-    state: { currentState }
-  } = useStateContext();
-  const formValidity = currentState.validityByForm;
-  useEffect(() => {
-    const newState = {
-      ...data,
-      ...currentState.data
-    };
-    setData(newState);
-  }, [currentState]);
-  useEffect(() => {
-    var _a2, _b2;
-    const showParentCompany = ((_a2 = data == null ? void 0 : data.company) == null ? void 0 : _a2.isCompanyOwnedByAnotherCompany) === "Yes";
-    const showUltimateParentCompany = ((_b2 = data == null ? void 0 : data.company) == null ? void 0 : _b2.isParentOwnedByAnotherCompany) === "Yes";
-    let updateForms = {
-      company: { ...businessFinancingForms.company }
-    };
-    if (showParentCompany) {
-      updateForms = { ...updateForms, parentCompany: businessFinancingForms.parentCompany };
-    }
-    if (showParentCompany && showUltimateParentCompany) {
-      updateForms = {
-        ...updateForms,
-        ultimateParentCompany: businessFinancingForms.ultimateParentCompany
-      };
-    }
-    setBusinessFinancingRequiredForms(updateForms);
-  }, [(_a = data == null ? void 0 : data.company) == null ? void 0 : _a.isCompanyOwnedByAnotherCompany, (_b = data == null ? void 0 : data.company) == null ? void 0 : _b.isParentOwnedByAnotherCompany]);
-  const forms = useMemo(() => {
-    const requiredForms = getRequiredForms(
-      businessFinancingRequiredForms,
-      businessFinancingFormsRequiredFields,
-      derivedProps == null ? void 0 : derivedProps.optionalFields
-    );
-    return addValidityToForms(requiredForms, formValidity, problems);
-  }, [derivedProps == null ? void 0 : derivedProps.optionalFields, formValidity, businessFinancingRequiredForms, problems]);
   const { isSettingEnabled } = useSettingsContext();
   const showBusinessFinancingFirst = isSettingEnabled(SettingNames.ShowBusinessFinancingFirst);
   const onSubmit = async () => {
     setLoadingStatus("loading");
+    if (!umfData) {
+      return;
+    }
     const companyBusinessFinancingDetails = prepareBusinessFinancingSubmitData(
       BusinessFinancingIndex.COMPANY,
-      data,
+      umfData,
       rootLegalEntity
     );
     const parentCompanyBusinessFinancingDetails = prepareBusinessFinancingSubmitData(
       BusinessFinancingIndex.PARENT_COMPANY,
-      data,
+      umfData,
       rootLegalEntity
     );
     const ultimateParentCompanyBusinessFinancingDetails = prepareBusinessFinancingSubmitData(
       BusinessFinancingIndex.ULTIMATE_PARENT_COMPANY,
-      data,
+      umfData,
       rootLegalEntity
     );
     if (!companyBusinessFinancingDetails || !rootLegalEntity) {
@@ -1633,6 +1522,14 @@ function BusinessFinancingDropin(props) {
         companyBusinessFinancingDetails.entityAssociations = [
           ...businessFinancingEntityAssociations
         ];
+        const eventsAdditionalData = {
+          ...getOrgAnalyticsData("Business", companyBusinessFinancingDetails),
+          ...getOrgAnalyticsData("ParentCompany", parentCompanyBusinessFinancingDetails),
+          ...getOrgAnalyticsData(
+            "UltimateParentCompany",
+            ultimateParentCompanyBusinessFinancingDetails
+          )
+        };
         try {
           await handleBusinessFinancingFormSubmission(
             BusinessFinancingIndex.COMPANY,
@@ -1643,13 +1540,14 @@ function BusinessFinancingDropin(props) {
           );
           userEvents.addTaskEvent("Success", {
             actionType: "submit",
-            returnValue: entitiesToTrack
+            returnValue: entitiesToTrack,
+            additionalData: eventsAdditionalData
           });
           await invalidateRootLegalEntity();
           if (showBusinessFinancingFirst || isStandaloneComponent) {
             setShowEndState(true);
           } else {
-            externalOnSubmit == null ? void 0 : externalOnSubmit({ ...data });
+            externalOnSubmit == null ? void 0 : externalOnSubmit({ ...umfData });
           }
         } catch (e) {
           showToast({ label: i18n.get("failedToUpdateDetails"), variant: "error" });
@@ -1694,29 +1592,73 @@ function BusinessFinancingDropin(props) {
     associatedLegalEntity: rootLegalEntity
   });
   const omittedSummaryKeys = ["naceCodeLabel", "legalFormLabel", "currency"];
+  const [requiredFields, setRequiredFields] = useState(void 0);
+  const form = useMultiForm({
+    requiredFields,
+    defaultData: derivedData,
+    rules: businessFinancingMultiformRules
+  });
+  const { data: umfData = derivedData } = form;
+  useEffect(() => {
+    var _a2, _b2;
+    const showParentCompany = ((_a2 = umfData == null ? void 0 : umfData.company) == null ? void 0 : _a2.isCompanyOwnedByAnotherCompany) === "Yes";
+    const showUltimateParentCompany = ((_b2 = umfData == null ? void 0 : umfData.company) == null ? void 0 : _b2.isParentOwnedByAnotherCompany) === "Yes";
+    let updateForms = {
+      company: { ...businessFinancingForms.company }
+    };
+    if (showParentCompany) {
+      updateForms = { ...updateForms, parentCompany: businessFinancingForms.parentCompany };
+    }
+    if (showParentCompany && showUltimateParentCompany) {
+      updateForms = {
+        ...updateForms,
+        ultimateParentCompany: businessFinancingForms.ultimateParentCompany
+      };
+    }
+    setBusinessFinancingRequiredForms(updateForms);
+  }, [
+    (_a = umfData == null ? void 0 : umfData.company) == null ? void 0 : _a.isCompanyOwnedByAnotherCompany,
+    (_b = umfData == null ? void 0 : umfData.company) == null ? void 0 : _b.isParentOwnedByAnotherCompany
+  ]);
+  useEffect(() => {
+    const reqs = getBusinessFinancingRequiredFields(umfData);
+    setRequiredFields(reqs);
+  }, [umfData]);
+  const forms = useMemo(() => {
+    const requiredForms = getRequiredForms(
+      businessFinancingRequiredForms,
+      businessFinancingFormsRequiredFields,
+      {}
+    );
+    return addValidityToForms(requiredForms, form.isValid, problems);
+  }, [
+    businessFinancingRequiredForms,
+    form.isValid,
+    businessFinancingFormsRequiredFields,
+    problems
+  ]);
   const {
     handleNextClick,
     handleBackClick,
     activeForm,
-    setShouldValidate,
     gotoFormByFormIndex,
-    shouldValidate,
-    steps
+    steps,
+    shouldValidate
   } = useFormComposer({
     problems,
     navigationTrackingParams: associatedLeTrackingParams,
     forms,
     onSubmit
   });
-  const allDerivedProps = {
-    ...props,
-    ...derivedProps,
-    problems,
-    shouldValidate
-  };
-  const businessFinancingCompanyDetailsFormProps = getFormProps(allDerivedProps, companyFormId);
-  const businessFinancingParentCompanyDetailsFormProps = getFormProps(allDerivedProps, parentCompanyFormId);
-  const businessFinancingUltimateParentCompanyDetailsFormProps = getFormProps(allDerivedProps, ultimateParentCompanyFormId);
+  const handleTrackNavigation = useCallback(
+    (props2) => {
+      trackNavigation({
+        ...props2,
+        additionalTrackingParams: associatedLeTrackingParams
+      });
+    },
+    [associatedLeTrackingParams]
+  );
   const homeClick = () => {
     trackNavigation({
       userEvents,
@@ -1726,75 +1668,80 @@ function BusinessFinancingDropin(props) {
     });
     handleHomeClick == null ? void 0 : handleHomeClick();
   };
-  const formWrapperClasses = (activeForm2, formId) => (activeForm2 == null ? void 0 : activeForm2.formId) !== formId ? "adyen-kyc-form-wrapper adyen-kyc-form-wrapper--hidden" : "adyen-kyc-form-wrapper";
-  const renderActiveForm = (activeForm2) => /* @__PURE__ */ jsxs("div", { className: "adyen-kyc-form-wrapper", children: [
-    /* @__PURE__ */ jsx("div", { className: formWrapperClasses(activeForm2, companyFormId), children: /* @__PURE__ */ jsx(
-      AdditionalFieldsForBusinessFinancingCompany,
-      {
-        ...businessFinancingCompanyDetailsFormProps,
-        data: defaultData == null ? void 0 : defaultData.company,
-        legalEntity: rootLegalEntity,
-        heading: i18n.get("additionalInformationForBusinessFinancing"),
-        id: companyFormId,
-        country
-      }
-    ) }),
-    /* @__PURE__ */ jsx("div", { className: formWrapperClasses(activeForm2, parentCompanyFormId), children: /* @__PURE__ */ jsx(
-      AdditionalFieldsForBusinessFinancingParentCompany,
-      {
-        ...businessFinancingParentCompanyDetailsFormProps,
-        data: defaultData == null ? void 0 : defaultData.parentCompany,
-        heading: i18n.get("parentCompanyInformation"),
-        id: companyFormId,
-        country
-      }
-    ) }),
-    /* @__PURE__ */ jsx("div", { className: formWrapperClasses(activeForm2, ultimateParentCompanyFormId), children: /* @__PURE__ */ jsx(
-      AdditionalFieldsForBusinessFinancingUltimateParentCompany,
-      {
-        ...businessFinancingUltimateParentCompanyDetailsFormProps,
-        data: defaultData == null ? void 0 : defaultData.ultimateParentCompany,
-        heading: i18n.get("ultimateParentCompanyInformation"),
-        id: companyFormId,
-        country
-      }
-    ) })
-  ] });
+  const renderActiveForm = (selectedForm) => {
+    var _a2, _b2, _c, _d, _e, _f;
+    return /* @__PURE__ */ jsxs("div", { className: "adyen-kyc-form-wrapper", children: [
+      selectedForm.formId === companyFormId && /* @__PURE__ */ jsx(
+        AdditionalFieldsForBusinessFinancingCompany,
+        {
+          data: defaultData == null ? void 0 : defaultData.company,
+          legalEntity: rootLegalEntity,
+          heading: i18n.get("additionalInformationForBusinessFinancing"),
+          id: companyFormId,
+          country,
+          shouldValidate,
+          fieldValidationErrors: (_a2 = problems == null ? void 0 : problems.validationErrors) == null ? void 0 : _a2[selectedForm == null ? void 0 : selectedForm.formId],
+          formVerificationErrors: (_b2 = problems == null ? void 0 : problems.verificationErrors) == null ? void 0 : _b2[selectedForm == null ? void 0 : selectedForm.formId],
+          errors: (_c = form.errors) == null ? void 0 : _c.company,
+          valid: (_d = form.valid) == null ? void 0 : _d.company
+        }
+      ),
+      selectedForm.formId === parentCompanyFormId && /* @__PURE__ */ jsx(
+        AdditionalFieldsForBusinessFinancingParentCompany,
+        {
+          data: defaultData == null ? void 0 : defaultData.parentCompany,
+          heading: i18n.get("parentCompanyInformation"),
+          id: companyFormId,
+          country,
+          shouldValidate,
+          errors: (_e = form.errors) == null ? void 0 : _e.parentCompany
+        }
+      ),
+      selectedForm.formId === ultimateParentCompanyFormId && /* @__PURE__ */ jsx(
+        AdditionalFieldsForBusinessFinancingUltimateParentCompany,
+        {
+          data: defaultData == null ? void 0 : defaultData.ultimateParentCompany,
+          heading: i18n.get("ultimateParentCompanyInformation"),
+          id: companyFormId,
+          country,
+          shouldValidate,
+          errors: (_f = form.errors) == null ? void 0 : _f.ultimateParentCompany
+        }
+      )
+    ] });
+  };
   if (!(defaultData == null ? void 0 : defaultData.company)) {
     return /* @__PURE__ */ jsx(Loader, {});
   }
   return showEndState ? /* @__PURE__ */ jsxs(FormEndState, { variant: "success", children: [
     /* @__PURE__ */ jsx("template", { slot: "title", children: i18n.get("applicationSubmittedSuccessfully") }),
     /* @__PURE__ */ jsx("template", { slot: "icon", children: /* @__PURE__ */ jsx(Icon, { name: "checkmark" }) }),
-    /* @__PURE__ */ jsx("template", { slot: "actions", children: externalOnSubmit && !showBusinessFinancingFirst && /* @__PURE__ */ jsx(Button, { onClick: () => externalOnSubmit == null ? void 0 : externalOnSubmit({ ...data }), children: externalOnSubmitLabel || i18n.get("finish") }) }),
+    /* @__PURE__ */ jsx("template", { slot: "actions", children: externalOnSubmit && !showBusinessFinancingFirst && /* @__PURE__ */ jsx(Button, { onClick: () => externalOnSubmit == null ? void 0 : externalOnSubmit({ ...umfData }), children: externalOnSubmitLabel || i18n.get("finish") }) }),
     /* @__PURE__ */ jsx("div", { children: i18n.get("yourLoanApplicationHasBeenReceived") })
-  ] }) : /* @__PURE__ */ jsx(
-    FormWrapper,
+  ] }) : /* @__PURE__ */ jsx(FormContextProvider, { form, children: /* @__PURE__ */ jsx(
+    FormFlow,
     {
-      taskName: "businessFinancing",
-      handleNextClick,
-      handleBackClick,
-      gotoFormByFormIndex,
-      loadingStatus,
-      forms,
-      activeForm,
-      navigationTrackingParams: associatedLeTrackingParams,
-      onSubmit,
-      validateForm: () => setShouldValidate(true),
-      canSubmit: canSubmit(data) && hasDataChanged(defaultData, data),
-      problems,
-      handleHomeClick: homeClick,
       summary: {
-        data: formatDataForSummary(data, i18n, datasetUtils),
-        labels: customLabels,
+        data: formatDataForSummary(i18n, datasetUtils, umfData),
         omitted: {
           keys: omittedSummaryKeys
-        }
+        },
+        problems,
+        trackNavigation: handleTrackNavigation,
+        labels: customLabels
       },
-      steps,
+      currentStep: steps.current,
+      disableNextButton: !activeForm.isValid,
+      forms,
+      gotoFormByFormIndex,
+      handleBackClick,
+      handleCancelClick: homeClick,
+      handleNextClick,
+      loadingStatus,
+      totalSteps: steps.total,
       children: /* @__PURE__ */ jsx("div", { children: renderActiveForm(activeForm || businessFinancingForms.company) })
     }
-  );
+  ) });
 }
 export {
   BusinessFinancingDropin as B