@adyen/kyc-components 4.0.0-beta.0 → 4.0.0-beta.3

package/dist/{BusinessFinancingDropin-D8HAwTSq.js → BusinessFinancingDropin-D2lMEbNh.js}

@@ -2,39 +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] = "934bfa8f-3825-4f4c-9e55-66df91e68842", e._sentryDebugIdIdentifier = "sentry-dbid-934bfa8f-3825-4f4c-9e55-66df91e68842");
+    n && (e._sentryDebugIds = e._sentryDebugIds || {}, e._sentryDebugIds[n] = "ba18ab40-57e3-4f27-878f-7d4de0949d67", e._sentryDebugIdIdentifier = "sentry-dbid-ba18ab40-57e3-4f27-878f-7d4de0949d67");
   } 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-By6uwPUg.js";
-import { bJ as reverseMapping, z as LegalEntityType, b1 as cloneObject, an as isEmpty, q as useApiContext, r as useQuery, t as httpGet, b as useI18nContext, ax as Field, bw as Select, G as Typography, aT as RadioGroup, bK as Link, bg as InputText, b2 as currencyByCountry, bL as InputNumber, bM as InputDate, bN as Currency, bO as CURRENCY_FIELD, bP as InputCurrency, as as useForm, bQ as useGlobalDataSlice, av as ErrorPanel, aw as createFormUtils, bR as useGlobalData, bS as getAddressSchemaForCountry, bT as COUNTRIES_WITH_STATES_DATASET, bU as Address, bV as getAddressSchemaLabelsByCountry, $ as useAnalyticsContext, b4 as useInvalidateRootLegalEntity, al as useAssociatedLegalEntity, a_ as datasetUtilities, bG as useStateContext, K as useSettingsContext, M as SettingNames, bW as getAssociatedLeAnalyticsPayload, by as getFormProps, L as Loader, a3 as Icon, Z as Button } from "./StoreProvider-COHi02bX.js";
-import { h as hasDataChanged } from "./hasDataChanged-CIg-bPSm.js";
-import { u as useToastContext } from "./useToastContext-CF2xonft.js";
-import { u as useScenarioConfiguration, i as isValidationError, p as processValidationErrors, d as isMaintenanceModeError } from "./processValidationErrors-RYlNmxB9.js";
-import { g as getPropsFromConfigurations, c as composePerScenarioFormConfigurations } from "./process-field-configurations-DugpEY9k.js";
-import { g as getRequiredForms, a as addValidityToForms, u as useFormComposer, t as trackNavigation } from "./dropinUtils-Bk0T79SK.js";
-import { F as FormEndState } from "./FormEndState-BQOQ83vO.js";
-import { F as FormWrapper } from "./FormWrapper-Dvm1o4tC.js";
-import { l as localizeDateString } from "./localizeDateString-KlstHAcM.js";
-import { f as formatObject, g as getProp } from "./utils-B1H_8b1P.js";
-import { m as mapFinancialReportsToFinancialInformation, a as mapFinancialInformationToFinancialReport } from "./mapFinancialReportsToFinancialInformation-Cid31JpK.js";
-import { i as isEeaCountry, f as fieldsPerScenario } from "./individualFormConfig-BrFLPTfr.js";
-import { b as businessFinancingCompanyDetailsValidations, a as businessFinancingParentCompanyDetailsValidations } from "./validate-wd48TLfx.js";
-const MANDATORY_FIELDS_BUSINESS_FINANCING = [
-  "company.numberOfEmployees",
-  "parentCompany.numberOfEmployees",
-  "ultimateParentCompany.numberOfEmployees"
-];
+import { useRef, useEffect, useMemo, useState, useCallback } from "preact/hooks";
+import { u as useCreateLegalEntity, a as useUpdateLegalEntity } from "./useUpdateLegalEntity-D8dw9Oc3.js";
+import { bz as reverseMapping, bA as formatObject, bB as isEeaCountry, y as LegalEntityType, bd as cloneObject, p as useApiContext, q as useQuery, r as httpGet, ap as useI18nContext, aB as Field, bu as Select, G as Typography, bC as LegalFormField, aA as createFormUtils, aY as RadioGroup, bD as Link, bE as InputText, be as currencyByCountry, bF as InputNumber, bG as InputDate, bH as Currency, bI as CURRENCY_FIELD, bJ as InputCurrency, bK as useFormContext, ax as getFieldProps, az as ErrorPanel, bL as getAddressSchemaForCountry, bM as COUNTRIES_WITH_STATES_DATASET, bN as Address, bO as getAddressSchemaLabelsByCountry, a0 as useAnalyticsContext, bh as useInvalidateRootLegalEntity, ao as useAssociatedLegalEntity, b3 as datasetUtilities, a6 as useToastContext, K as useSettingsContext, M as SettingNames, bP as getAssociatedLeAnalyticsPayload, bQ as getRequiredForms, bR as addValidityToForms, bS as useFormComposer, bT as trackNavigation, L as Loader, a4 as Icon, _ as Button, bU as isValidationError, bV as processValidationErrors, bW as isMaintenanceModeError } from "./StoreProvider-ClKLaHzy.js";
+import { F as FormContextProvider, a as FormFlow } from "./FormFlow-DjvdNEiV.js";
+import { u as useMultiForm } from "./useMultiForm-KQwxav4F.js";
+import { F as FormEndState } from "./FormEndState-JB6QFSet.js";
+import { l as localizeDateString } from "./localizeDateString-CKCBXzSn.js";
+import { m as mapFinancialReportsToFinancialInformation, a as mapFinancialInformationToFinancialReport } from "./mapFinancialReportsToFinancialInformation-D_6u_bSS.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",
@@ -46,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
@@ -61,7 +38,10 @@ const businessFinancingApiKeyMapping = {
   ...reverseMapping(businessFinancingBaseMapping)
 };
 const mapBusinessFinancingToLegalEntity = (data) => ({
-  ...formatObject(data, businessFinancingApiKeyMapping)
+  ...formatObject(
+    data,
+    businessFinancingApiKeyMapping
+  )
 });
 var BusinessFinancingPagesEnums = /* @__PURE__ */ ((BusinessFinancingPagesEnums2) => {
   BusinessFinancingPagesEnums2["COMPANY_PAGE"] = "company";
@@ -111,7 +91,6 @@ const parentCompaniesSchemaKeys = [
   "numberOfEmployees",
   "doesYourCompanyHaveLEI",
   "legalEntityIdentifier",
-  "doesNotKnowNumberOfEmployees",
   "isThisAddressTheMainHeadquarters",
   "financialReportingDate",
   "currency",
@@ -145,27 +124,28 @@ var BusinessFinancingIndex = /* @__PURE__ */ ((BusinessFinancingIndex2) => {
   return BusinessFinancingIndex2;
 })(BusinessFinancingIndex || {});
 const getLegalEntityId = (businessFinancingIndex, rootLegalEntity) => {
-  var _a;
   if (!rootLegalEntity) return void 0;
   if (businessFinancingIndex === BusinessFinancingIndex.COMPANY) return rootLegalEntity.id;
-  if (!(rootLegalEntity == null ? void 0 : rootLegalEntity.entityAssociations)) return void 0;
+  if (!rootLegalEntity?.entityAssociations) return void 0;
   const businessFinancingEntityType = BusinessFinancingIndex.PARENT_COMPANY ? "immediateParentCompany" : "ultimateParentCompany";
-  const businessFinancingEntityAssociation = (_a = rootLegalEntity.entityAssociations) == null ? void 0 : _a.find(
+  const businessFinancingEntityAssociation = rootLegalEntity.entityAssociations?.find(
     (entity) => entity.type === businessFinancingEntityType
   );
-  return businessFinancingEntityAssociation == null ? void 0 : businessFinancingEntityAssociation.legalEntityId;
+  return businessFinancingEntityAssociation?.legalEntityId;
 };
 const USER_LOCALE = typeof navigator !== "undefined" ? navigator.language : "en-US";
-const entityHasParentCompany = (data) => {
-  var _a, _b;
-  return ((_a = data.company) == null ? void 0 : _a.isCompanyOwnedByAnotherCompany) && ((_b = data.company) == null ? void 0 : _b.isCompanyOwnedByAnotherCompany) === "Yes";
-};
-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 entityHasParentCompany = (data) => data.company?.isCompanyOwnedByAnotherCompany && data.company?.isCompanyOwnedByAnotherCompany === "Yes";
+const entityHasUltimateParentCompany = (data) => data.company?.isParentOwnedByAnotherCompany && data.company?.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];
   if (!businessFinancingData) return null;
   if (businessFinancingIndex === BusinessFinancingIndex.PARENT_COMPANY && !entityHasParentCompany(data)) {
@@ -174,15 +154,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
-    );
+  const businessFinancingCountry = businessFinancingDetails.organization.registeredAddress?.country || rootLegalEntity?.organization?.registeredAddress?.country;
+  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)) {
@@ -218,11 +201,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
   };
@@ -258,15 +249,14 @@ const getCompanySchemaKeys = (country, currentData, schemaKeys) => {
   if (currentData.doesYourCompanyHaveLEI !== "Yes") {
     fieldsToRemove.push("legalEntityIdentifier");
   }
-  if (!(currentData == null ? void 0 : currentData.legalInformationInsolvency) || ["noLegalActionsTaken", "iDontKnow"].includes(currentData == null ? void 0 : currentData.legalInformationInsolvency)) {
+  if (!currentData?.legalInformationInsolvency || ["noLegalActionsTaken", "iDontKnow"].includes(currentData?.legalInformationInsolvency)) {
     fieldsToRemove.push("legalProceedingsDate");
   }
   return schemaKeys.filter((field) => !fieldsToRemove.includes(field));
 };
 const getParentCompanySchemaKeys = (currentData, schemaKeys) => {
-  var _a;
   const fieldsToRemove = [];
-  const companyCountry = (_a = currentData == null ? void 0 : currentData.registrationAddress) == null ? void 0 : _a.country;
+  const companyCountry = currentData?.registrationAddress?.country;
   if (!isEeaCountry(companyCountry)) {
     fieldsToRemove.push(
       "financialReportingDate",
@@ -279,11 +269,44 @@ const getParentCompanySchemaKeys = (currentData, schemaKeys) => {
   if (currentData.doesYourCompanyHaveLEI !== "Yes") {
     fieldsToRemove.push("legalEntityIdentifier");
   }
-  if (!(currentData == null ? void 0 : currentData.legalInformationInsolvency) || ["noLegalActionsTaken", "iDontKnow"].includes(currentData == null ? void 0 : currentData.legalInformationInsolvency)) {
+  if (!currentData?.legalInformationInsolvency || ["noLegalActionsTaken", "iDontKnow"].includes(currentData?.legalInformationInsolvency)) {
     fieldsToRemove.push("legalProceedingsDate");
   }
   return schemaKeys.filter((field) => !fieldsToRemove.includes(field));
 };
+const getBusinessFinancingRequiredFields = (country, data) => {
+  let requiredFields = {
+    company: companySchemaKeys
+  };
+  if (!data) {
+    return requiredFields;
+  }
+  const { company, parentCompany = {}, ultimateParentCompany = {} } = data;
+  if (company) {
+    requiredFields.company = getCompanySchemaKeys(country, company, companySchemaKeys);
+  }
+  if (company?.isCompanyOwnedByAnotherCompany === "Yes") {
+    const parentCompanyRequiredFields = getParentCompanySchemaKeys(
+      parentCompany,
+      parentCompaniesSchemaKeys
+    );
+    requiredFields = {
+      ...requiredFields,
+      parentCompany: parentCompanyRequiredFields
+    };
+  }
+  if (company?.isParentOwnedByAnotherCompany === "Yes") {
+    const ultimateParentCompanyRequiredFields = getParentCompanySchemaKeys(
+      ultimateParentCompany,
+      parentCompaniesSchemaKeys
+    );
+    requiredFields = {
+      ...requiredFields,
+      ultimateParentCompany: ultimateParentCompanyRequiredFields
+    };
+  }
+  return requiredFields;
+};
 const customLabels = {
   company: {
     legalForm: "businessStructure",
@@ -325,15 +348,14 @@ const getFormattedAmount = (value, currency) => {
   const formattedValue = Number(value).toLocaleString(userLocale);
   return `${currency} ${formattedValue}`;
 };
-const formatDataForSummary = (data, i18n, datasetUtils) => {
-  var _a, _b, _c, _d, _e;
+const formatDataForSummary = (i18n, datasetUtils, data) => {
   const summaryData = cloneObject(data) || {};
   if (summaryData.company) {
     summaryData.company.legalForm = summaryData.company.legalFormLabel;
     summaryData.company.naceCode = summaryData.company.naceCodeLabel;
     summaryData.company.legalInformationInsolvency = getTranslatedLegalInsolvency(
       i18n,
-      (_a = summaryData.company) == null ? void 0 : _a.legalInformationInsolvency
+      summaryData.company?.legalInformationInsolvency
     );
     summaryData.company.annualTurnover = getFormattedAmount(
       summaryData.company.annualTurnover,
@@ -347,13 +369,13 @@ const formatDataForSummary = (data, i18n, datasetUtils) => {
     summaryData.company.legalProceedingsDate = legalProceedingsDate ? localizeDateString(legalProceedingsDate, i18n.locale) : void 0;
     summaryData.company.financialReportingDate = financialReportingDate ? localizeDateString(financialReportingDate, i18n.locale) : void 0;
   }
-  if ((_b = summaryData.parentCompany) == null ? void 0 : _b.legalName) {
+  if (summaryData.parentCompany?.legalName) {
     summaryData.parentCompany.legalForm = summaryData.parentCompany.legalFormLabel;
     summaryData.parentCompany.naceCode = summaryData.parentCompany.naceCodeLabel;
     summaryData.parentCompany.country = summaryData.parentCompany.country ? datasetUtils.getCountryName(summaryData.parentCompany.country) : "";
     summaryData.parentCompany.legalInformationInsolvency = getTranslatedLegalInsolvency(
       i18n,
-      (_c = summaryData.parentCompany) == null ? void 0 : _c.legalInformationInsolvency
+      summaryData.parentCompany?.legalInformationInsolvency
     );
     summaryData.parentCompany.annualTurnover = getFormattedAmount(
       summaryData.parentCompany.annualTurnover,
@@ -367,13 +389,13 @@ const formatDataForSummary = (data, i18n, datasetUtils) => {
     summaryData.parentCompany.legalProceedingsDate = legalProceedingsDate ? localizeDateString(legalProceedingsDate, i18n.locale) : void 0;
     summaryData.parentCompany.financialReportingDate = financialReportingDate ? localizeDateString(financialReportingDate, i18n.locale) : void 0;
   }
-  if ((_d = summaryData.ultimateParentCompany) == null ? void 0 : _d.legalName) {
+  if (summaryData.ultimateParentCompany?.legalName) {
     summaryData.ultimateParentCompany.legalForm = summaryData.ultimateParentCompany.legalFormLabel;
     summaryData.ultimateParentCompany.naceCode = summaryData.ultimateParentCompany.naceCodeLabel;
     summaryData.ultimateParentCompany.country = summaryData.ultimateParentCompany.country ? datasetUtils.getCountryName(summaryData.ultimateParentCompany.country) : "";
     summaryData.ultimateParentCompany.legalInformationInsolvency = getTranslatedLegalInsolvency(
       i18n,
-      (_e = summaryData.ultimateParentCompany) == null ? void 0 : _e.legalInformationInsolvency
+      summaryData.ultimateParentCompany?.legalInformationInsolvency
     );
     summaryData.ultimateParentCompany.annualTurnover = getFormattedAmount(
       summaryData.ultimateParentCompany.annualTurnover,
@@ -389,78 +411,7 @@ 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({
-    baseUrl,
-    path: `datasets/legalForms/${countryCode}`
-  });
-};
-const useLegalForms = (countryCode, options) => {
-  const { baseUrl } = useApiContext();
-  return useQuery({
-    queryKey: ["legalForms", countryCode],
-    queryFn: () => getLegalForms(countryCode, baseUrl.value),
-    ...options
-  });
-};
-function LegalFormField({
-  name = "legalForm",
-  data,
-  valid,
-  errorMessage,
-  label,
-  readonly,
-  handleChangeFor,
-  helperText,
-  countryCode,
-  classNameModifiers = []
-}) {
-  const { i18n } = useI18nContext();
-  const { data: legalFormsData } = useLegalForms(countryCode);
-  const handleChangeForLegalForm = (e) => {
-    var _a;
-    const legalFormValue = e.target.value;
-    const selectedLabel = (_a = legalFormsData == null ? void 0 : legalFormsData.find(
-      (legalForm) => legalForm.id === legalFormValue
-    )) == null ? void 0 : _a.name;
-    const legalFormEvent = {
-      target: {
-        name: "legalForm",
-        value: e.target.value,
-        label: selectedLabel
-      }
-    };
-    handleChangeFor("legalForm")(legalFormEvent);
-  };
-  return /* @__PURE__ */ jsx(
-    Field,
-    {
-      name,
-      label: label || i18n.get("businessStructure"),
-      errorMessage,
-      classNameModifiers,
-      isValid: valid.legalForm,
-      helper: helperText == null ? void 0 : helperText.legalForm,
-      children: (childProps) => /* @__PURE__ */ jsx(
-        Select,
-        {
-          ...childProps,
-          name,
-          placeholder: i18n.get("selectOne"),
-          selected: data.legalForm,
-          items: legalFormsData ?? [],
-          readonly: readonly && !!data,
-          onChange: handleChangeForLegalForm
-        }
-      )
-    }
-  );
-}
 const getNaceCodes = async (baseUrl) => {
   return httpGet({
     baseUrl,
@@ -483,35 +434,41 @@ function NaceCodeField({
   label,
   readonly,
   handleChangeFor,
-  helperText,
-  classNameModifiers = []
+  helperText
 }) {
   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(() => {
+    const selectedLabel = naceCodesData?.find((naceCode) => naceCode.id === data.naceCode)?.name;
+    const naceCodeEvent = {
+      target: {
+        name: "naceCodeLabel",
+        value: selectedLabel
+      }
+    };
+    handleChangeForRef.current("naceCodeLabel")(naceCodeEvent);
+  }, [data.naceCode, naceCodesData]);
   return /* @__PURE__ */ jsx(
     Field,
     {
       name,
       label: label || i18n.get("industryAndNaceCode"),
       errorMessage,
-      classNameModifiers,
       isValid: valid.naceCode,
-      helper: helperText == null ? void 0 : helperText.naceCode,
+      helper: helperText?.naceCode,
       children: (childProps) => /* @__PURE__ */ jsx(
         Select,
         {
@@ -527,51 +484,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?.legalForm
         },
-        valid: { legalForm: valid.legalForm },
-        errorMessage: formUtils.getErrorMessage("legalForm", errors, fieldProblems),
-        handleChangeFor: handleChangeWithLabel,
+        valid: { legalForm: valid?.legalForm },
+        errorMessage: formUtils.getErrorMessage("legalForm", errors, fieldValidationErrors),
+        handleChangeFor: handleFieldChange,
         readonly: false,
         label: formUtils.getLabel("legalForm", "businessStructure")
       }
@@ -580,10 +530,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?.naceCode },
+        valid: { naceCode: valid?.naceCode },
+        errorMessage: formUtils.getErrorMessage("naceCode", errors, fieldValidationErrors),
+        handleChangeFor: handleFieldChange,
         readonly: false,
         label: formUtils.getLabel("naceCode", "industryAndNaceCode")
       }
@@ -600,29 +550,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?.doesYourCompanyHaveLEI,
             disabled: false,
-            onChange: handleChangeFor("doesYourCompanyHaveLEI"),
+            onChange: handleFieldChange("doesYourCompanyHaveLEI"),
             "aria-required": true,
-            "aria-invalid": !valid.doesYourCompanyHaveLEI
+            "aria-invalid": !valid?.doesYourCompanyHaveLEI
           }
         )
       }
     ),
-    data.doesYourCompanyHaveLEI === "Yes" && /* @__PURE__ */ jsx(
+    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?.legalEntityIdentifier,
         helper: i18n.get("enterNCharactersWithAMixForExample", {
           values: {
             numChars: 20,
@@ -634,14 +592,13 @@ function BusinessFinancingBusinessInformation({
           {
             ...childProps,
             name: "legalEntityIdentifier",
-            value: data.legalEntityIdentifier,
+            value: 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?.legalEntityIdentifier,
+            isValid: valid?.legalEntityIdentifier
           }
         )
       }
@@ -649,31 +606,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(
@@ -681,21 +635,20 @@ function BusinessFinancingFinancialInformation({
       {
         name: "numberOfEmployees",
         label: formUtils.getLabel("numberOfEmployees", "numberOfEmployees"),
-        errorMessage: formUtils.getErrorMessage("numberOfEmployees", errors, fieldProblems),
-        isValid: valid.numberOfEmployees,
-        classNameModifiers: ["numberOfEmployees"],
+        errorMessage: formUtils.getErrorMessage("numberOfEmployees", errors, fieldValidationErrors),
+        isValid: valid?.numberOfEmployees,
         children: (childProps) => /* @__PURE__ */ jsx(
           InputNumber,
           {
             ...childProps,
             "aria-required": true,
-            "aria-invalid": !valid.numberOfEmployees,
+            "aria-invalid": !valid?.numberOfEmployees,
             name: "numberOfEmployees",
             min: "0",
             step: "1",
-            value: data.numberOfEmployees,
-            onInput: handleChangeFor("numberOfEmployees", "input"),
-            onBlur: handleChangeFor("numberOfEmployees", "blur")
+            value: data?.numberOfEmployees,
+            onInput: handleFieldChange("numberOfEmployees", "input"),
+            onBlur: handleFieldChange("numberOfEmployees", "blur")
           }
         )
       }
@@ -706,19 +659,22 @@ function BusinessFinancingFinancialInformation({
         name: "financialReportingDate",
         label: formUtils.getLabel("financialReportingDate", "financialReportingDate"),
         helper: i18n.get("dateOfTotalAssetsCalculation"),
-        errorMessage: formUtils.getErrorMessage("financialReportingDate", errors, fieldProblems),
-        isValid: valid.financialReportingDate,
-        classNameModifiers: ["financialReportingDate"],
+        errorMessage: formUtils.getErrorMessage(
+          "financialReportingDate",
+          errors,
+          fieldValidationErrors
+        ),
+        isValid: valid?.financialReportingDate,
         children: (childProps) => /* @__PURE__ */ jsx(
           InputDate,
           {
             ...childProps,
             name: "financialReportingDate",
-            value: data.financialReportingDate,
-            onInput: handleChangeFor("financialReportingDate", "input"),
-            onBlur: handleChangeFor("financialReportingDate", "blur"),
+            value: data?.financialReportingDate,
+            onInput: handleFieldChange("financialReportingDate", "input"),
+            onBlur: handleFieldChange("financialReportingDate", "blur"),
             "aria-required": true,
-            "aria-invalid": !valid.financialReportingDate,
+            "aria-invalid": !valid?.financialReportingDate,
             max: TODAY_DATE$1
           }
         )
@@ -727,10 +683,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)
@@ -743,15 +699,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?.currency ?? defaultCurrency,
+              amount: data?.netAssets ? Number(data?.netAssets) : void 0,
+              onAmountChanged: handleFieldChange("netAssets")
             }
           )
         }
@@ -762,16 +718,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?.currency ?? defaultCurrency,
+              amount: data?.annualTurnover ? Number(data?.annualTurnover) : void 0,
+              onAmountChanged: handleFieldChange("annualTurnover")
             }
           )
         }
@@ -780,16 +736,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") },
@@ -797,7 +754,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?.legalInformationInsolvency && !["noLegalActionsTaken", "iDontKnow"].includes(data?.legalInformationInsolvency);
   return /* @__PURE__ */ jsxs(Fragment, { children: [
     /* @__PURE__ */ jsx(Typography, { el: "h3", variant: "title", children: i18n.get(sectionHeading || "legalInformation") }),
     /* @__PURE__ */ jsx(
@@ -808,20 +765,20 @@ function BusinessFinancingLegalInformation({
         errorMessage: formUtils.getErrorMessage(
           "legalInformationInsolvency",
           errors,
-          fieldProblems
+          fieldValidationErrors
         ),
-        isValid: valid.legalInformationInsolvency,
+        isValid: 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?.legalInformationInsolvency,
             items: legalInformationInsolvencyItems,
             "aria-required": true,
-            "aria-invalid": !valid.legalInformationInsolvency
+            "aria-invalid": !valid?.legalInformationInsolvency
           }
         )
       }
@@ -831,19 +788,22 @@ 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?.legalProceedingsDate,
         children: (childProps) => /* @__PURE__ */ jsx(
           InputDate,
           {
             ...childProps,
             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?.legalProceedingsDate,
             max: TODAY_DATE
           }
         )
@@ -851,16 +811,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(
@@ -870,12 +831,12 @@ function BusinessFinancingOwnershipStructure({
         name: "isCompanyOwnedByAnotherCompany",
         classNameModifiers: ["highExposureBusinessInformation"],
         label: i18n.get("isCompanyOwnedByAnotherCompany", {
-          values: { company: (legalEntity == null ? void 0 : legalEntity.organization) ? legalEntity.organization.legalName : "" }
+          values: { company: legalEntity?.organization ? legalEntity.organization.legalName : "" }
         }),
         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(
@@ -884,16 +845,16 @@ function BusinessFinancingOwnershipStructure({
             ...childProps,
             name: "isCompanyOwnedByAnotherCompany",
             items: businessFinancingRadioItems,
-            value: data.isCompanyOwnedByAnotherCompany,
+            value: data?.isCompanyOwnedByAnotherCompany,
             disabled: false,
-            onChange: handleChangeFor("isCompanyOwnedByAnotherCompany"),
+            onChange: handleFieldChange("isCompanyOwnedByAnotherCompany"),
             "aria-required": true,
-            "aria-invalid": !valid.isCompanyOwnedByAnotherCompany
+            "aria-invalid": !valid?.isCompanyOwnedByAnotherCompany
           }
         )
       }
     ),
-    (data == null ? void 0 : data.isCompanyOwnedByAnotherCompany) === "Yes" && /* @__PURE__ */ jsx(
+    data?.isCompanyOwnedByAnotherCompany === "Yes" && /* @__PURE__ */ jsx(
       Field,
       {
         el: "fieldset",
@@ -904,7 +865,7 @@ function BusinessFinancingOwnershipStructure({
         errorMessage: formUtils.getErrorMessage(
           "isParentOwnedByAnotherCompany",
           errors,
-          fieldProblems
+          fieldValidationErrors
         ),
         children: (childProps) => /* @__PURE__ */ jsx(
           RadioGroup,
@@ -914,9 +875,9 @@ function BusinessFinancingOwnershipStructure({
             items: businessFinancingRadioItems,
             value: data.isParentOwnedByAnotherCompany,
             disabled: false,
-            onChange: handleChangeFor("isParentOwnedByAnotherCompany"),
+            onChange: handleFieldChange("isParentOwnedByAnotherCompany"),
             "aria-required": true,
-            "aria-invalid": !valid.isParentOwnedByAnotherCompany
+            "aria-invalid": !valid?.isParentOwnedByAnotherCompany
           }
         )
       }
@@ -926,35 +887,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, fieldValidationErrors } = 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") }),
@@ -962,7 +903,7 @@ function AdditionalFieldsForBusinessFinancingCompany(props) {
       ErrorPanel,
       {
         verificationErrors: formVerificationErrors,
-        validationErrors: props == null ? void 0 : props.fieldValidationErrors,
+        validationErrors: fieldValidationErrors,
         formUtils,
         id: "ariaErrorField"
       }
@@ -970,71 +911,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?.company ?? {}, businessInformationFields)
       }
     ),
     /* @__PURE__ */ jsx(
       BusinessFinancingOwnershipStructure,
       {
-        ...props,
-        handleChangeFor,
-        errors,
-        data,
-        valid,
+        ...ownershipStructureProps,
         legalEntity,
-        formUtils,
-        fieldProblems
+        handleFieldChange: handleChange,
+        data: formUtils.getFieldData(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?.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?.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(
@@ -1042,22 +968,20 @@ 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?.legalName,
         helper: i18n.get("legalNameIsUsedToIdentifyABusinessWithTheGovernment"),
         children: (childProps) => /* @__PURE__ */ jsx(
           InputText,
           {
             ...childProps,
             name: "legalName",
-            value: data.legalName,
+            value: 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?.legalName
           }
         )
       }
@@ -1065,24 +989,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) {
+  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 addressCountry = (_a = data == null ? void 0 : data.registrationAddress) == null ? void 0 : _a.country;
+  const formUtils = createFormUtils(props, i18n);
+  const addressCountry = data?.registrationAddress?.country;
   const addressSchema = useMemo(() => {
     return getAddressSchemaForCountry(addressCountry).filter((field) => {
       if (addressCountry) {
@@ -1091,27 +1017,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") }),
@@ -1122,12 +1036,12 @@ function BusinessFinancingRegisteredAddress({
         name: "isThisAddressTheMainHeadquarters",
         classNameModifiers: ["highExposureBusinessInformation"],
         label: i18n.get("isThisAddressTheMainHeadquarters", {
-          values: { company: (legalEntity == null ? void 0 : legalEntity.organization) ? legalEntity.organization.legalName : "" }
+          values: { company: legalEntity?.organization ? legalEntity.organization.legalName : "" }
         }),
         errorMessage: formUtils.getErrorMessage(
           "isThisAddressTheMainHeadquarters",
           errors,
-          fieldProblems
+          fieldValidationErrors
         ),
         children: (childProps) => /* @__PURE__ */ jsx(
           RadioGroup,
@@ -1135,11 +1049,11 @@ function BusinessFinancingRegisteredAddress({
             ...childProps,
             name: "isThisAddressTheMainHeadquarters",
             items: businessFinancingRadioItems,
-            value: data == null ? void 0 : data.isThisAddressTheMainHeadquarters,
+            value: data?.isThisAddressTheMainHeadquarters,
             disabled: false,
-            onChange: handleChangeFor("isThisAddressTheMainHeadquarters"),
+            onChange: handleFieldChange("isThisAddressTheMainHeadquarters"),
             "aria-required": true,
-            "aria-invalid": !valid.isThisAddressTheMainHeadquarters
+            "aria-invalid": !valid?.isThisAddressTheMainHeadquarters
           }
         )
       }
@@ -1149,7 +1063,7 @@ function BusinessFinancingRegisteredAddress({
       {
         id: formId,
         addressType: "registrationAddress",
-        data: { ...defaultData == null ? void 0 : defaultData.registrationAddress, country: addressCountry },
+        data: { ...defaultData?.registrationAddress, country: addressCountry },
         labels: addressCountry ? getAddressSchemaLabelsByCountry(addressCountry) : void 0,
         countryCode: addressCountry,
         requiredFields: addressSchema,
@@ -1162,40 +1076,18 @@ function BusinessFinancingRegisteredAddress({
 }
 const parentCompanyFormId$1 = businessFinancingForms.parentCompany.formId;
 function AdditionalFieldsForBusinessFinancingParentCompany(props) {
-  var _a;
-  const {
-    shouldValidate,
-    data: businessFinancingParentCompanyDetailsData,
-    country,
-    formVerificationErrors
-  } = props;
   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, fieldValidationErrors } = 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") }),
@@ -1203,7 +1095,7 @@ function AdditionalFieldsForBusinessFinancingParentCompany(props) {
       ErrorPanel,
       {
         verificationErrors: formVerificationErrors,
-        validationErrors: props == null ? void 0 : props.fieldValidationErrors,
+        validationErrors: fieldValidationErrors,
         formUtils,
         id: "ariaErrorField"
       }
@@ -1211,116 +1103,71 @@ function AdditionalFieldsForBusinessFinancingParentCompany(props) {
     /* @__PURE__ */ jsx(
       BusinessFinancingBasicCompanyInformation,
       {
-        ...props,
-        handleChangeFor: businessFinancingHandleChangeFor,
+        ...basicCompanyInformationProps,
         sectionHeading: "basicCompanyInformation",
-        errors,
-        data,
-        valid,
-        formUtils,
-        fieldProblems
+        handleFieldChange: handleChange,
+        data: formUtils.getFieldData(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?.parentCompany,
+        handleFieldChange: handleChange,
+        data: formUtils.getFieldData(data?.parentCompany ?? {}, registeredAddressFields)
       }
     ),
     /* @__PURE__ */ jsx(
       BusinessFinancingBusinessInformation,
       {
-        ...props,
-        handleChangeFor: businessFinancingHandleChangeFor,
+        ...businessInformationProps,
         sectionHeading: "additionalCompanyInformation",
-        errors,
-        data,
-        valid,
-        country,
-        formUtils,
-        fieldProblems,
-        targetPage: BusinessFinancingPagesEnums.PARENT_COMPANY_PAGE
+        country: data?.parentCompany?.registrationAddress?.country ?? country,
+        targetPage: BusinessFinancingPagesEnums.PARENT_COMPANY_PAGE,
+        handleFieldChange: handleChange,
+        data: formUtils.getFieldData(data?.parentCompany ?? {}, businessInformationFields)
       }
     ),
-    isEeaCountry((_a = data == null ? void 0 : data.registrationAddress) == null ? void 0 : _a.country) && /* @__PURE__ */ jsx(
+    isEeaCountry(data?.parentCompany?.registrationAddress?.country) && /* @__PURE__ */ jsx(
       BusinessFinancingFinancialInformation,
       {
-        ...props,
-        handleChangeFor: businessFinancingHandleChangeFor,
-        errors,
-        data,
-        valid,
-        country,
-        formUtils,
-        fieldProblems,
+        ...financialInformationProps,
+        country: data?.parentCompany?.registrationAddress?.country ?? country,
         targetPage: BusinessFinancingPagesEnums.PARENT_COMPANY_PAGE,
-        setValidCurrency: setValid
+        handleFieldChange: handleChange,
+        data: formUtils.getFieldData(data?.parentCompany ?? {}, financialInformationFields)
       }
     ),
     /* @__PURE__ */ jsx(
       BusinessFinancingLegalInformation,
       {
-        ...props,
-        handleChangeFor: businessFinancingHandleChangeFor,
-        errors,
-        data,
-        valid,
-        formUtils,
-        fieldProblems,
-        targetPage: BusinessFinancingPagesEnums.PARENT_COMPANY_PAGE
+        ...legalInformationProps,
+        country: data?.parentCompany?.registrationAddress?.country ?? country,
+        targetPage: BusinessFinancingPagesEnums.PARENT_COMPANY_PAGE,
+        sectionHeading: "legalInformation",
+        handleFieldChange: handleChange,
+        data: formUtils.getFieldData(data?.parentCompany ?? {}, legalInformationFields)
       }
     )
   ] });
 }
 const ultimateParentCompanyFormId$1 = businessFinancingForms.ultimateParentCompany.formId;
 function AdditionalFieldsForBusinessFinancingUltimateParentCompany(props) {
-  var _a;
-  const {
-    data: additionalFieldsForBusinessFinancingUltimateParentCompanyData,
-    validators,
-    formVerificationErrors,
-    country
-  } = props;
+  const { formVerificationErrors, country, fieldValidationErrors } = 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") }),
@@ -1328,7 +1175,7 @@ function AdditionalFieldsForBusinessFinancingUltimateParentCompany(props) {
       ErrorPanel,
       {
         verificationErrors: formVerificationErrors,
-        validationErrors: props == null ? void 0 : props.fieldValidationErrors,
+        validationErrors: fieldValidationErrors,
         formUtils,
         id: "ariaErrorField"
       }
@@ -1336,76 +1183,69 @@ function AdditionalFieldsForBusinessFinancingUltimateParentCompany(props) {
     /* @__PURE__ */ jsx(
       BusinessFinancingBasicCompanyInformation,
       {
-        ...props,
-        handleChangeFor: businessFinancingHandleChangeFor,
+        ...basicCompanyInformationProps,
         sectionHeading: "businessInformation",
-        errors,
-        data,
-        valid,
-        formUtils,
-        fieldProblems
+        handleFieldChange: handleChange,
+        data: formUtils.getFieldData(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?.ultimateParentCompany,
+        handleFieldChange: handleChange,
+        data: formUtils.getFieldData(data?.ultimateParentCompany ?? {}, registeredAddressFields)
       }
     ),
     /* @__PURE__ */ jsx(
       BusinessFinancingBusinessInformation,
       {
-        ...props,
-        handleChangeFor: businessFinancingHandleChangeFor,
+        ...businessInformationProps,
         sectionHeading: "additionalCompanyInformation",
-        errors,
-        data,
-        valid,
-        country,
-        formUtils,
-        fieldProblems,
-        targetPage: BusinessFinancingPagesEnums.ULTIMATE_PARENT_COMPANY_PAGE
+        country: data?.ultimateParentCompany?.registrationAddress?.country ?? country,
+        targetPage: BusinessFinancingPagesEnums.ULTIMATE_PARENT_COMPANY_PAGE,
+        handleFieldChange: handleChange,
+        data: formUtils.getFieldData(data?.ultimateParentCompany ?? {}, businessInformationFields)
       }
     ),
-    isEeaCountry((_a = data == null ? void 0 : data.registrationAddress) == null ? void 0 : _a.country) && /* @__PURE__ */ jsx(
+    isEeaCountry(data?.ultimateParentCompany?.registrationAddress?.country) && /* @__PURE__ */ jsx(
       BusinessFinancingFinancialInformation,
       {
-        ...props,
-        handleChangeFor: businessFinancingHandleChangeFor,
-        errors,
-        data,
-        valid,
-        country,
-        formUtils,
-        fieldProblems,
+        ...financialInformationProps,
+        country: data?.ultimateParentCompany?.registrationAddress?.country ?? country,
         targetPage: BusinessFinancingPagesEnums.ULTIMATE_PARENT_COMPANY_PAGE,
-        setValidCurrency: setValid
+        handleFieldChange: handleChange,
+        data: formUtils.getFieldData(
+          data?.ultimateParentCompany ?? {},
+          financialInformationFields
+        )
       }
     ),
     /* @__PURE__ */ jsx(
       BusinessFinancingLegalInformation,
       {
-        ...props,
-        handleChangeFor: businessFinancingHandleChangeFor,
-        errors,
-        data,
-        valid,
-        formUtils,
-        fieldProblems,
-        targetPage: BusinessFinancingPagesEnums.ULTIMATE_PARENT_COMPANY_PAGE
+        ...legalInformationProps,
+        country: data?.ultimateParentCompany?.registrationAddress?.country ?? country,
+        sectionHeading: "legalInformation",
+        targetPage: BusinessFinancingPagesEnums.ULTIMATE_PARENT_COMPANY_PAGE,
+        handleFieldChange: handleChange,
+        data: formUtils.getFieldData(data?.ultimateParentCompany ?? {}, legalInformationFields)
       }
     )
   ] });
 }
+const getOrgAnalyticsData = (prefix, details) => {
+  const org = details?.organization;
+  if (!org) return {};
+  return {
+    [`${prefix}--economicSector`]: org?.economicSector ?? "",
+    [`${prefix}--legalForm`]: org?.legalForm ?? "",
+    [`${prefix}--statusOfLegalProceeding`]: org?.statusOfLegalProceeding ?? ""
+  };
+};
 const businessFinancingFormsRequiredFields = {
   company: businessFinancingForms.company.fields,
   parentCompany: businessFinancingForms.parentCompany.fields,
@@ -1414,10 +1254,7 @@ 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 {
     country,
     rootLegalEntity,
@@ -1428,7 +1265,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();
@@ -1437,34 +1273,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,
@@ -1479,10 +1318,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();
@@ -1490,85 +1328,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) {
@@ -1585,7 +1364,7 @@ function BusinessFinancingDropin(props) {
           parentCompanyBusinessFinancingDetails,
           createLegalEntity,
           updateLegalEntity,
-          parentCompanyBusinessFinancingDetails == null ? void 0 : parentCompanyBusinessFinancingDetails.id
+          parentCompanyBusinessFinancingDetails?.id
         );
         promises.push(parentCompanyPromise);
       }
@@ -1595,7 +1374,7 @@ function BusinessFinancingDropin(props) {
           ultimateParentCompanyBusinessFinancingDetails,
           createLegalEntity,
           updateLegalEntity,
-          ultimateParentCompanyBusinessFinancingDetails == null ? void 0 : ultimateParentCompanyBusinessFinancingDetails.id
+          ultimateParentCompanyBusinessFinancingDetails?.id
         );
         promises.push(ultimateParentCompanyPromise);
       }
@@ -1639,23 +1418,32 @@ function BusinessFinancingDropin(props) {
         companyBusinessFinancingDetails.entityAssociations = [
           ...businessFinancingEntityAssociations
         ];
+        const eventsAdditionalData = {
+          ...getOrgAnalyticsData("Business", companyBusinessFinancingDetails),
+          ...getOrgAnalyticsData("ParentCompany", parentCompanyBusinessFinancingDetails),
+          ...getOrgAnalyticsData(
+            "UltimateParentCompany",
+            ultimateParentCompanyBusinessFinancingDetails
+          )
+        };
         try {
           await handleBusinessFinancingFormSubmission(
             BusinessFinancingIndex.COMPANY,
             companyBusinessFinancingDetails,
             createLegalEntity,
             updateLegalEntity,
-            companyBusinessFinancingDetails == null ? void 0 : companyBusinessFinancingDetails.id
+            companyBusinessFinancingDetails?.id
           );
           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?.({ ...umfData });
           }
         } catch (e) {
           showToast({ label: i18n.get("failedToUpdateDetails"), variant: "error" });
@@ -1682,8 +1470,8 @@ function BusinessFinancingDropin(props) {
       setProblems((prevProblems) => ({
         ...prevProblems,
         validationErrors: {
-          ...prevProblems == null ? void 0 : prevProblems.validationErrors,
-          [businessFinancingType]: (validationErrors == null ? void 0 : validationErrors[businessFinancingType]) ?? {}
+          ...prevProblems?.validationErrors,
+          [businessFinancingType]: validationErrors?.[businessFinancingType] ?? {}
         }
       }));
     } else if (isMaintenanceModeError(error)) {
@@ -1700,29 +1488,67 @@ 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, isValid, errors, valid } = form;
+  useEffect(() => {
+    const showParentCompany = umfData?.company?.isCompanyOwnedByAnotherCompany === "Yes";
+    const showUltimateParentCompany = umfData?.company?.isParentOwnedByAnotherCompany === "Yes";
+    let updateForms = {
+      company: { ...businessFinancingForms.company }
+    };
+    if (showParentCompany) {
+      updateForms = { ...updateForms, parentCompany: businessFinancingForms.parentCompany };
+    }
+    if (showParentCompany && showUltimateParentCompany) {
+      updateForms = {
+        ...updateForms,
+        ultimateParentCompany: businessFinancingForms.ultimateParentCompany
+      };
+    }
+    setBusinessFinancingRequiredForms(updateForms);
+  }, [
+    umfData?.company?.isCompanyOwnedByAnotherCompany,
+    umfData?.company?.isParentOwnedByAnotherCompany
+  ]);
+  useEffect(() => {
+    const reqs = getBusinessFinancingRequiredFields(country, umfData);
+    setRequiredFields(reqs);
+  }, [umfData]);
+  const forms = useMemo(() => {
+    const requiredForms = getRequiredForms(
+      businessFinancingRequiredForms,
+      businessFinancingFormsRequiredFields,
+      {}
+    );
+    return addValidityToForms(requiredForms, isValid, problems);
+  }, [businessFinancingRequiredForms, 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,
@@ -1730,77 +1556,79 @@ function BusinessFinancingDropin(props) {
       toForm: "home",
       label: "home"
     });
-    handleHomeClick == null ? void 0 : handleHomeClick();
+    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(
+  const renderActiveForm = (selectedForm) => /* @__PURE__ */ jsxs("div", { className: "adyen-kyc-form-wrapper", children: [
+    selectedForm.formId === companyFormId && /* @__PURE__ */ jsx(
       AdditionalFieldsForBusinessFinancingCompany,
       {
-        ...businessFinancingCompanyDetailsFormProps,
-        data: defaultData == null ? void 0 : defaultData.company,
+        data: defaultData?.company,
         legalEntity: rootLegalEntity,
         heading: i18n.get("additionalInformationForBusinessFinancing"),
         id: companyFormId,
-        country
+        country,
+        shouldValidate,
+        fieldValidationErrors: problems?.validationErrors?.[selectedForm?.formId],
+        formVerificationErrors: problems?.verificationErrors?.[selectedForm?.formId],
+        errors: errors?.company,
+        valid: valid?.company
       }
-    ) }),
-    /* @__PURE__ */ jsx("div", { className: formWrapperClasses(activeForm2, parentCompanyFormId), children: /* @__PURE__ */ jsx(
+    ),
+    selectedForm.formId === parentCompanyFormId && /* @__PURE__ */ jsx(
       AdditionalFieldsForBusinessFinancingParentCompany,
       {
-        ...businessFinancingParentCompanyDetailsFormProps,
-        data: defaultData == null ? void 0 : defaultData.parentCompany,
+        data: defaultData?.parentCompany,
         heading: i18n.get("parentCompanyInformation"),
         id: companyFormId,
-        country
+        country,
+        shouldValidate,
+        errors: errors?.parentCompany
       }
-    ) }),
-    /* @__PURE__ */ jsx("div", { className: formWrapperClasses(activeForm2, ultimateParentCompanyFormId), children: /* @__PURE__ */ jsx(
+    ),
+    selectedForm.formId === ultimateParentCompanyFormId && /* @__PURE__ */ jsx(
       AdditionalFieldsForBusinessFinancingUltimateParentCompany,
       {
-        ...businessFinancingUltimateParentCompanyDetailsFormProps,
-        data: defaultData == null ? void 0 : defaultData.ultimateParentCompany,
+        data: defaultData?.ultimateParentCompany,
         heading: i18n.get("ultimateParentCompanyInformation"),
         id: companyFormId,
-        country
+        country,
+        shouldValidate,
+        errors: errors?.ultimateParentCompany
       }
-    ) })
+    )
   ] });
-  if (!(defaultData == null ? void 0 : defaultData.company)) {
+  if (!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?.({ ...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