@adyen/kyc-components 2.27.2 → 2.28.0

package/dist/es/adyen-kyc-components.es.js

@@ -3,7 +3,7 @@ import { createContext, createElement, render } from "preact";
 import { sanitize } from "isomorphic-dompurify";
 import cx from "classnames";
 import { jsx, jsxs, Fragment } from "preact/jsx-runtime";
-import { useId, forwardRef, memo, useMemo as useMemo$1, useEffect as useEffect$1, useState as useState$1 } from "preact/compat";
+import { useId, forwardRef, memo, useMemo as useMemo$1, useEffect as useEffect$1, useState as useState$1, useCallback as useCallback$1 } from "preact/compat";
 import { debounce, noop as noop$1, isEmpty as isEmpty$1, range } from "lodash";
 import OpenBankingSDK from "@adyen/openbankingsdk";
 import "@adyen/adyen-document-viewer/dist/adyen-document-viewer.min.css";
@@ -189,7 +189,7 @@ const doNotHaveHandelsregisternummer = "I do not have a Handelsregisternummer";
 const doNotHaveRegonKrsNumber = "I do not have a REGON";
 const taxIdAbsenceReason = "Tax ID absence reason";
 const vatNumberExempted = "Exempted from VAT";
-const vatNumberAbsenceReason = "VAT number absence reason";
+const vatAbsenceReason = "VAT number absence reason";
 const belowTaxThreshold = "Below tax threshold";
 const industryExemption = "Industry exemption";
 const validationPleaseEnterAValidRegistrationNumber = "Please enter a valid company registration number";
@@ -841,13 +841,7 @@ const legalCompanyName__helperText__US = "Enter the name exactly as it appears o
 const legalCompanyName__helperText__SG = "Enter the name exactly as it is on your Accounting and Corporate Regulatory Authority (ACRA) BizFile.";
 const legalCompanyName__helperText__HK = "Enter the name exactly as it is on your Hong Kong Companies Registry's Certificate of Incorporation.";
 const taxInformationNumber = "Tax Identification Number";
-const taxInformationNumber__US = "Tax Identification Number (TIN)";
-const taxInformationNumber__helperText__US = "Also known as Employer Identification Number (EIN), this is issued by the IRS to businesses operating in the US.";
-const businessRegistrationNumber = "Business registration number";
-const businessRegistrationNumber__optional = "Business registration number (optional)";
-const businessRegistrationNumber__HK = "Business Registration number (BRN)";
-const businessRegistrationNumber__helperText__US = "This can be found on your registration documents or any documents you receive from the registrar such as account reminders.";
-const businessRegistrationNumber__placeholder__US = "1234567 AB";
+const taxInformationNumber__HK = "Business Registration number (BRN)";
 const stockExchangeMIC = "Stock Exchange MIC";
 const stockExchangeMIC__US = "Market identifier code (MIC)";
 const stockExchangeMIC__placeholder__US = "XABC";
@@ -1385,7 +1379,7 @@ const defaultTrans = {
   doNotHaveRegonKrsNumber,
   taxIdAbsenceReason,
   vatNumberExempted,
-  vatNumberAbsenceReason,
+  vatAbsenceReason,
   belowTaxThreshold,
   industryExemption,
   validationPleaseEnterAValidRegistrationNumber,
@@ -2045,13 +2039,7 @@ const defaultTrans = {
   legalCompanyName__helperText__SG,
   legalCompanyName__helperText__HK,
   taxInformationNumber,
-  taxInformationNumber__US,
-  taxInformationNumber__helperText__US,
-  businessRegistrationNumber,
-  businessRegistrationNumber__optional,
-  businessRegistrationNumber__HK,
-  businessRegistrationNumber__helperText__US,
-  businessRegistrationNumber__placeholder__US,
+  taxInformationNumber__HK,
   stockExchangeMIC,
   stockExchangeMIC__US,
   stockExchangeMIC__placeholder__US,
@@ -3291,36 +3279,36 @@ var LegalEntityType = /* @__PURE__ */ ((LegalEntityType2) => {
 })(LegalEntityType || {});
 function getFormProps(props, innerFormId) {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q;
-  if (innerFormId) {
-    const nestedFormProps = {
-      placeholders: ((_a = props.placeholders) == null ? void 0 : _a[innerFormId]) ?? {},
-      labels: ((_b = props.labels) == null ? void 0 : _b[innerFormId]) ?? {},
-      helperText: ((_c = props.helperText) == null ? void 0 : _c[innerFormId]) ?? {},
-      masks: ((_d = props.masks) == null ? void 0 : _d[innerFormId]) ?? {},
-      data: ((_e = props.data) == null ? void 0 : _e[innerFormId]) ?? {},
-      readOnlyFields: ((_f = props.readOnlyFields) == null ? void 0 : _f[innerFormId]) ?? [],
-      requiredFields: ((_g = props.requiredFields) == null ? void 0 : _g[innerFormId]) ?? [],
-      optionalFields: ((_h = props.optionalFields) == null ? void 0 : _h[innerFormId]) ?? [],
-      maskedFields: ((_i = props.maskedFields) == null ? void 0 : _i[innerFormId]) ?? [],
-      verifyFields: ((_j = props.verifyFields) == null ? void 0 : _j[innerFormId]) ?? [],
-      formVerificationErrors: ((_l = (_k = props.problems) == null ? void 0 : _k.verificationErrors) == null ? void 0 : _l[innerFormId]) ?? {},
-      fieldValidationErrors: ((_n = (_m = props.problems) == null ? void 0 : _m.validationErrors) == null ? void 0 : _n[innerFormId]) ?? {},
-      /*
+  if (!innerFormId) {
+    return null;
+  }
+  const activeFormId = (_a = props.activeForm) == null ? void 0 : _a.formId;
+  return {
+    placeholders: ((_b = props.placeholders) == null ? void 0 : _b[innerFormId]) ?? {},
+    labels: ((_c = props.labels) == null ? void 0 : _c[innerFormId]) ?? {},
+    helperText: ((_d = props.helperText) == null ? void 0 : _d[innerFormId]) ?? {},
+    masks: ((_e = props.masks) == null ? void 0 : _e[innerFormId]) ?? {},
+    data: ((_f = props.data) == null ? void 0 : _f[innerFormId]) ?? {},
+    readOnlyFields: ((_g = props.readOnlyFields) == null ? void 0 : _g[innerFormId]) ?? [],
+    requiredFields: ((_h = props.requiredFields) == null ? void 0 : _h[innerFormId]) ?? [],
+    optionalFields: ((_i = props.optionalFields) == null ? void 0 : _i[innerFormId]) ?? [],
+    maskedFields: ((_j = props.maskedFields) == null ? void 0 : _j[innerFormId]) ?? [],
+    verifyFields: ((_k = props.verifyFields) == null ? void 0 : _k[innerFormId]) ?? [],
+    formVerificationErrors: ((_m = (_l = props.problems) == null ? void 0 : _l.verificationErrors) == null ? void 0 : _m[innerFormId]) ?? {},
+    fieldValidationErrors: ((_o = (_n = props.problems) == null ? void 0 : _n.validationErrors) == null ? void 0 : _o[innerFormId]) ?? {},
+    /*
         Validators should be `null` and not `{}` by default to make it easier to short circuit it with predetermined validators.
         For example `rules: props.validators || personalDetailsValidationRules`.
        */
-      validators: ((_o = props.validators) == null ? void 0 : _o[innerFormId]) ? {
-        ...(_p = props.validators) == null ? void 0 : _p[innerFormId]
-      } : null,
-      /*
-        activeForm check is required for shouldValidate because of we render all forms in a multistep form.
+    validators: ((_p = props.validators) == null ? void 0 : _p[innerFormId]) ? {
+      ...(_q = props.validators) == null ? void 0 : _q[innerFormId]
+    } : null,
+    /*
+        activeForm check is required for shouldValidate because we render all forms in a multistep form.
         Should be changed once stateManagement is fixed and this is no longer the case
       */
-      shouldValidate: ((_q = props.activeForm) == null ? void 0 : _q.formId) === innerFormId && props.shouldValidate
-    };
-    return nestedFormProps;
-  }
-  return null;
+    shouldValidate: (activeFormId ? activeFormId === innerFormId : true) && props.shouldValidate
+  };
 }
 function getFieldProps(props, innerFormFields) {
   if (innerFormFields) {
@@ -6682,10 +6670,10 @@ const validatePatternOnBlur = (pattern) => ({
   modes: ["blur"],
   validate: (val) => !!val && pattern.test(val)
 });
-const defaultFieldMetadata$2 = {
+const defaultFieldMetadata$3 = {
   label: "registrationNumber"
 };
-const defaultFieldConfig$2 = {
+const defaultFieldConfig$3 = {
   [CountryCodes.Australia]: {
     label: "australianBusinessNumberAcn",
     mask: businessRegistrationNumberMasks[CountryCodes.Australia].default,
@@ -6780,7 +6768,7 @@ const defaultFieldConfig$2 = {
       key: "enterNDigitsForExample",
       values: {
         numDigits: "9",
-        example: "80020970"
+        example: "080020970"
       }
     }
   },
@@ -6992,13 +6980,17 @@ const defaultFieldConfig$2 = {
       default:
         return {
           label: "partitaIVA",
-          mask: businessRegistrationNumberMasks[CountryCodes.Italy].partitaIVA,
-          validators: validatePatternOnBlur(businessRegistrationNumberPatterns[CountryCodes.Italy].partitaIVA),
+          validators: validatePatternOnBlur(/^\d{11}$/),
+          mask: {
+            mask: makeMask(...nonInputs("IT", {
+              includeInValue: false
+            }), spacer, ...numericInputs(11))
+          },
           guidanceText: {
-            key: "enterNDigitsForExample",
+            key: "enterTheRemainingNDigitsForExample",
             values: {
               numDigits: "11",
-              example: "47040001100"
+              example: "IT47040001100"
             }
           }
         };
@@ -7334,7 +7326,7 @@ const defaultFieldConfig$2 = {
 const businessRegistrationNumberFields = ["registrationNumber", "exemptedFromRegistrationNumber"];
 function BusinessRegistrationNumber(props) {
   var _a;
-  const fieldConfig = props.fieldConfig ?? defaultFieldConfig$2;
+  const fieldConfig = props.fieldConfig ?? defaultFieldConfig$3;
   const {
     i18n
   } = useI18nContext();
@@ -7350,7 +7342,7 @@ function BusinessRegistrationNumber(props) {
   const metadata = resolveFieldMetadata(fieldConfig[country2], {
     companyType: companyType2,
     registrationNumberType
-  }, defaultFieldMetadata$2);
+  }, defaultFieldMetadata$3);
   const mergedProps = mergeFieldMetadataIntoProps("registrationNumber", metadata, {
     requiredFields: schema
   });
@@ -7912,7 +7904,7 @@ function CompanyRegistrationNumberTypeSelector({
 }
 const inferCompanyRegistrationNumberType = (registrationNumber2, country2, companyType2) => {
   const optionsForCountry = companyRegistrationNumberOptions[country2];
-  const metadataFn = defaultFieldConfig$2[country2];
+  const metadataFn = defaultFieldConfig$3[country2];
   if (!optionsForCountry || !metadataFn || typeof metadataFn !== "function")
     return void 0;
   for (const option of optionsForCountry) {
@@ -7928,10 +7920,10 @@ const inferCompanyRegistrationNumberType = (registrationNumber2, country2, compa
     }
   }
 };
-const defaultFieldMetadata$1 = {
+const defaultFieldMetadata$2 = {
   label: "taxId"
 };
-const defaultFieldConfig$1 = {
+const defaultFieldConfig$2 = {
   [CountryCodes.Canada]: {
     label: "businessNumber",
     validators: validatePatternOnBlur(/^\d{9}$/),
@@ -7947,7 +7939,7 @@ const defaultFieldConfig$1 = {
     }
   },
   [CountryCodes.HongKong]: {
-    label: "businessRegistrationNumber__HK",
+    label: "taxInformationNumber__HK",
     validators: validatePatternOnBlur(/^\d{8}$/),
     mask: {
       mask: makeMask(...numericInputs(8))
@@ -8032,7 +8024,7 @@ const defaultFieldConfig$1 = {
           mask: {
             mask: makeMask(...numericInputs(9))
           },
-          helperText: {
+          guidanceText: {
             key: "validationPleaseEnterAValidTaxIdNumberWithFormat",
             values: {
               format: "XXXXXXXXX"
@@ -8060,10 +8052,10 @@ const defaultFieldConfig$1 = {
     validators: validatePatternOnBlur(/^\d{12}$/)
   }
 };
-const defaultFieldMetadata = {
+const defaultFieldMetadata$1 = {
   label: "vatNumber"
 };
-const defaultFieldConfig = {
+const defaultFieldConfig$1 = {
   [CountryCodes.Austria]: {
     label: "UST-ID",
     validators: validatePatternOnBlur(/^ATU\d{8}$/),
@@ -8353,7 +8345,7 @@ const defaultFieldConfig = {
       key: "enterTheRemainingNDigitsForExample",
       values: {
         numDigits: "11",
-        example: "IT12345678901"
+        example: "IT47040001100"
       }
     }
   },
@@ -8618,7 +8610,7 @@ const defaultFieldConfig = {
         numDigits: "9",
         minLetters: "3",
         maxLetters: "4",
-        example: "CHE123456789TVA"
+        example: "CHE-123.456.789 TVA"
       }
     }
   },
@@ -8692,7 +8684,7 @@ const defaultFieldConfig = {
 };
 const inferTaxIdNumberType = (taxId2, country2) => {
   const optionsForCountry = taxIdNumberOptions[country2];
-  const metadataFn = defaultFieldConfig[country2] ?? defaultFieldConfig$1[country2];
+  const metadataFn = defaultFieldConfig$1[country2] ?? defaultFieldConfig$2[country2];
   if (!optionsForCountry || !metadataFn || typeof metadataFn !== "function")
     return void 0;
   for (const option of optionsForCountry) {
@@ -8748,11 +8740,11 @@ function TaxId(props) {
     fieldValidationErrors,
     dataStoreId,
     taxIdNumberType,
-    fieldConfig = defaultFieldConfig$1
+    fieldConfig = defaultFieldConfig$2
   } = props;
   const metadata = resolveFieldMetadata(fieldConfig[country2], {
     taxIdNumberType
-  }, defaultFieldMetadata$1);
+  }, defaultFieldMetadata$2);
   const mergedProps = mergeFieldMetadataIntoProps("taxId", metadata, props);
   const {
     i18n
@@ -8867,12 +8859,12 @@ function VatNumber(props) {
     country: country2,
     fieldValidationErrors,
     dataStoreId,
-    fieldConfig = defaultFieldConfig,
+    fieldConfig = defaultFieldConfig$1,
     vatNumberType
   } = props;
   const metadata = resolveFieldMetadata(fieldConfig[country2], {
     vatNumberType
-  }, defaultFieldMetadata);
+  }, defaultFieldMetadata$1);
   const mergedProps = mergeFieldMetadataIntoProps("vatNumber", metadata, props);
   const {
     i18n
@@ -8954,7 +8946,7 @@ function VatNumber(props) {
     }), data.exemptedFromVat ? jsx(Field, {
       name: "vatAbsenceReason",
       classNameModifiers: ["tax-id-absence-reason"],
-      label: formUtils.getLabel("vatAbsenceReason", "vatNumberAbsenceReason"),
+      label: formUtils.getLabel("vatAbsenceReason", "vatAbsenceReason"),
       errorMessage: formUtils.getErrorMessage("vatAbsenceReason", errors, fieldProblems),
       isValid: valid.vatAbsenceReason,
       children: (childProps) => jsx(Select, {
@@ -8966,7 +8958,7 @@ function VatNumber(props) {
           id: reason,
           name: i18n.get(reason)
         })),
-        placeholder: i18n.get("vatNumberAbsenceReason")
+        placeholder: i18n.get("vatAbsenceReason")
       })
     }) : null]
   });
@@ -9359,6 +9351,9 @@ const companySearchBase = {
   },
   dateOfIncorporation: {
     rule: "countryRequiresDateOfIncorporationForCompanies"
+  },
+  registrationNumber: {
+    rule: "countryRequiresRegistrationNumberForCompanies"
   }
 };
 const taxIdBase$1 = {
@@ -9474,10 +9469,7 @@ const companySearchFieldsPerScenario = {
     }
   },
   L1: {
-    ...companySearchBase,
-    taxInformation: {
-      rule: "countryRequiresTaxInformationForSearch"
-    }
+    ...companySearchBase
   },
   L: {
     ...companySearchBase,
@@ -9506,9 +9498,6 @@ const countryConfig$4 = {
     },
     legalEntityType: {
       label: "companyType"
-    },
-    taxInformation: {
-      label: "australianBusinessNumberAbn"
     }
   },
   [CountryCodes.Austria]: {
@@ -9516,13 +9505,10 @@ const countryConfig$4 = {
       label: "vatNumberExempted"
     },
     vatAbsenceReason: {
-      label: "vatNumberAbsenceReason"
+      label: "vatAbsenceReason"
     },
     exemptedFromRegistrationNumber: {
       label: "doNotHaveFirmenbuchnummer"
-    },
-    exemptedFromBusinessRegistrationNumber: {
-      label: "doNotHaveFirmenbuchnummer"
     }
   },
   [CountryCodes.Belgium]: {
@@ -9530,7 +9516,7 @@ const countryConfig$4 = {
       label: "vatNumberExempted"
     },
     vatAbsenceReason: {
-      label: "vatNumberAbsenceReason"
+      label: "vatAbsenceReason"
     }
   },
   [CountryCodes.Brazil]: {},
@@ -9546,14 +9532,8 @@ const countryConfig$4 = {
     exemptedFromRegistrationNumber: {
       label: "doNotHaveBusinessIncorporationNumber"
     },
-    exemptedFromBusinessRegistrationNumber: {
-      label: "doNotHaveBusinessIncorporationNumber"
-    },
     exemptedFromTax: {
       label: "doNotHaveBusinessNumber"
-    },
-    taxInformation: {
-      label: "businessNumber"
     }
   },
   [CountryCodes.Croatia]: {
@@ -9568,7 +9548,7 @@ const countryConfig$4 = {
   },
   [CountryCodes.CzechRepublic]: {
     vatAbsenceReason: {
-      label: "vatNumberAbsenceReason"
+      label: "vatAbsenceReason"
     },
     exemptedFromVat: {
       label: "vatNumberExempted"
@@ -9588,9 +9568,6 @@ const countryConfig$4 = {
     exemptedFromRegistrationNumber: {
       label: "doNotHaveYTunnus"
     },
-    exemptedFromBusinessRegistrationNumber: {
-      label: "doNotHaveYTunnus"
-    },
     exemptedFromVat: {
       label: "vatNumberExempted"
     }
@@ -9600,14 +9577,11 @@ const countryConfig$4 = {
     exemptedFromRegistrationNumber: {
       label: "doNotHaveHandelsregisternummer"
     },
-    exemptedFromBusinessRegistrationNumber: {
-      label: "doNotHaveHandelsregisternummer"
-    },
     exemptedFromVat: {
       label: "vatNumberExempted"
     },
     vatAbsenceReason: {
-      label: "vatNumberAbsenceReason"
+      label: "vatAbsenceReason"
     }
   },
   [CountryCodes.Gibraltar]: {},
@@ -9647,7 +9621,7 @@ const countryConfig$4 = {
       label: "vatNumberExempted"
     },
     vatAbsenceReason: {
-      label: "vatNumberAbsenceReason"
+      label: "vatAbsenceReason"
     }
   },
   [CountryCodes.Japan]: {
@@ -9670,9 +9644,6 @@ const countryConfig$4 = {
     exemptedFromRegistrationNumber: {
       label: "doNotHaveLtRegistrationNumber"
     },
-    exemptedFromBusinessRegistrationNumber: {
-      label: "doNotHaveLtRegistrationNumber"
-    },
     exemptedFromVat: {
       label: "vatNumberExempted"
     }
@@ -9681,9 +9652,6 @@ const countryConfig$4 = {
     exemptedFromRegistrationNumber: {
       label: "doNotHaveLuRegistrationNumber"
     },
-    exemptedFromBusinessRegistrationNumber: {
-      label: "doNotHaveLuRegistrationNumber"
-    },
     exemptedFromVat: {
       label: "vatNumberExempted"
     }
@@ -9708,7 +9676,7 @@ const countryConfig$4 = {
       label: "vatNumberExempted"
     },
     vatAbsenceReason: {
-      label: "vatNumberAbsenceReason"
+      label: "vatAbsenceReason"
     }
   },
   [CountryCodes.NewZealand]: {
@@ -9727,21 +9695,18 @@ const countryConfig$4 = {
       label: "vatNumberExempted"
     },
     vatAbsenceReason: {
-      label: "vatNumberAbsenceReason"
+      label: "vatAbsenceReason"
     }
   },
   [CountryCodes.Poland]: {
     exemptedFromRegistrationNumber: {
       label: "doNotHaveRegonKrsNumber"
     },
-    exemptedFromBusinessRegistrationNumber: {
-      label: "doNotHaveRegonKrsNumber"
-    },
     exemptedFromVat: {
       label: "vatNumberExempted"
     },
     vatAbsenceReason: {
-      label: "vatNumberAbsenceReason"
+      label: "vatAbsenceReason"
     }
   },
   [CountryCodes.Portugal]: {
@@ -9749,7 +9714,7 @@ const countryConfig$4 = {
       label: "vatNumberExempted"
     },
     vatAbsenceReason: {
-      label: "vatNumberAbsenceReason"
+      label: "vatAbsenceReason"
     }
   },
   [CountryCodes.PuertoRico]: {},
@@ -9773,7 +9738,7 @@ const countryConfig$4 = {
       label: "vatNumberExempted"
     },
     vatAbsenceReason: {
-      label: "vatNumberAbsenceReason"
+      label: "vatAbsenceReason"
     }
   },
   [CountryCodes.Singapore]: {
@@ -9794,23 +9759,17 @@ const countryConfig$4 = {
     exemptedFromRegistrationNumber: {
       label: "doNotHaveOrganisationsnummer"
     },
-    exemptedFromBusinessRegistrationNumber: {
-      label: "doNotHaveOrganisationsnummer"
-    },
     exemptedFromVat: {
       label: "vatNumberExempted"
     },
     vatAbsenceReason: {
-      label: "vatNumberAbsenceReason"
+      label: "vatAbsenceReason"
     }
   },
   [CountryCodes.Switzerland]: {
     exemptedFromRegistrationNumber: {
       label: "doNotHaveChRegistrationNumber"
     },
-    exemptedFromBusinessRegistrationNumber: {
-      label: "doNotHaveChRegistrationNumber"
-    },
     exemptedFromVat: {
       label: "vatNumberExempted"
     }
@@ -9836,14 +9795,6 @@ const countryConfig$4 = {
       label: "employerIdentificationNumber"
     },
     /* CompanySearchComponent specific fields */
-    taxInformation: {
-      label: "taxInformationNumber__US",
-      helperText: "taxInformationNumber__helperText__US"
-    },
-    businessRegistrationNumber: {
-      label: "businessRegistrationNumber",
-      placeholder: "businessRegistrationNumber__placeholder__US"
-    },
     stockExchangeMIC: {
       label: "stockExchangeMIC__US",
       placeholder: "stockExchangeMIC__placeholder__US"
@@ -12617,13 +12568,13 @@ const rules$2 = ({
   },
   stockExchangeMICIfTypePublic: () => {
     var _a, _b;
-    if (((_a = data == null ? void 0 : data.companyType) == null ? void 0 : _a.entityType) === CompanyTypesValue.PUBLIC_COMPANY || ((_b = data == null ? void 0 : data.companyStructure) == null ? void 0 : _b.entityType) === CompanyTypesValue.PUBLIC_COMPANY) {
+    if ("companyType" in data && (((_a = data.companyType) == null ? void 0 : _a.entityType) === CompanyTypesValue.PUBLIC_COMPANY || ((_b = data.companyStructure) == null ? void 0 : _b.entityType) === CompanyTypesValue.PUBLIC_COMPANY)) {
       return "REQUIRED";
     }
   },
   stockISINIfTypePublic: () => {
     var _a, _b;
-    if (((_a = data == null ? void 0 : data.companyType) == null ? void 0 : _a.entityType) === CompanyTypesValue.PUBLIC_COMPANY || ((_b = data == null ? void 0 : data.companyStructure) == null ? void 0 : _b.entityType) === CompanyTypesValue.PUBLIC_COMPANY) {
+    if ("companyType" in data && (((_a = data.companyType) == null ? void 0 : _a.entityType) === CompanyTypesValue.PUBLIC_COMPANY || ((_b = data.companyStructure) == null ? void 0 : _b.entityType) === CompanyTypesValue.PUBLIC_COMPANY)) {
       return "REQUIRED";
     }
   },
@@ -12633,7 +12584,7 @@ const rules$2 = ({
     }
   },
   countryUsesTaxId: () => {
-    if (COUNTRIES_THAT_USE_TAX_ID_INSTEAD_OF_VAT.includes(country2) && !("solePropNameAndCountry" in data && COUNTRIES_THAT_DO_NOT_USE_TAX_ID_FOR_SOLE_PROP.includes(country2))) {
+    if (COUNTRIES_THAT_USE_TAX_ID_INSTEAD_OF_VAT.includes(country2) && !(taskType === TaskTypes.SOLE_PROPRIETOR_COMPANY && COUNTRIES_THAT_DO_NOT_USE_TAX_ID_FOR_SOLE_PROP.includes(country2))) {
       return "REQUIRED";
     }
   },
@@ -12644,7 +12595,7 @@ const rules$2 = ({
   },
   companyRegistrationNumberExemptionAllowed: () => {
     var _a, _b;
-    const companyType2 = ((_a = data == null ? void 0 : data.companyType) == null ? void 0 : _a.entityType) || ((_b = data == null ? void 0 : data.companyStructure) == null ? void 0 : _b.entityType);
+    const companyType2 = "companyType" in data && (((_a = data.companyType) == null ? void 0 : _a.entityType) || ((_b = data.companyStructure) == null ? void 0 : _b.entityType));
     if (country2 === "DE" && (companyType2 === CompanyTypesValue.GOVERNMENTAL_ORGANIZATION || companyType2 === CompanyTypesValue.NON_PROFIT_OR_CHARITABLE)) {
       return "REQUIRED";
     }
@@ -13007,7 +12958,7 @@ const companySearchBaseMapping = {
   "companyRegistrationAddress.operationalAddress.otherAddressInformation": "organization.principalPlaceOfBusiness.street2",
   "companyStructure.entityType": "organization.type",
   "companyOtherDetails.tradingName": "organization.doingBusinessAs",
-  "companyOtherDetails.businessRegistrationNumber": "organization.registrationNumber",
+  "companyOtherDetails.registrationNumber": "organization.registrationNumber",
   "companyOtherDetails.taxInformation": "organization.taxInformation",
   "companyOtherDetails.vatNumber": "organization.vatNumber",
   "companyOtherDetails.vatAbsenceReason": "organization.vatAbsenceReason",
@@ -21395,7 +21346,7 @@ const trackNavigation = ({
     }
   });
 };
-const getOpeningStep$1 = (forms2, remediationActions) => {
+const getOpeningStep = (forms2, remediationActions) => {
   var _a;
   if (remediationActions && Object.keys(remediationActions).length > 0) {
     const allRemediationActions = Object.values(remediationActions).flat().filter((rem) => {
@@ -21443,7 +21394,7 @@ const useFormComposer = ({
   useEffect(() => {
     if (hasAlreadyNavigatedForm)
       return;
-    const openingStep = getOpeningStep$1(forms2, problems == null ? void 0 : problems.remediationActions);
+    const openingStep = getOpeningStep(forms2, problems == null ? void 0 : problems.remediationActions);
     if (activeForm !== openingStep) {
       setActiveForm(openingStep);
     }
@@ -23015,7 +22966,7 @@ const getTargetLegalEntityType = (businessType, legalArrangement, trusteeType, c
   }
   return currentLegalEntityType;
 };
-const FormComposer = "";
+const FormWrapper$1 = "";
 const logger$c = createLogger("FormRouterContextProvider");
 function FormRouterContextProvider({
   children,
@@ -23270,16 +23221,16 @@ const FormWrapper = ({
     })
   });
 };
-const parseConfiguration$3 = ({
+const parseConfiguration$5 = ({
   country: country2,
   matchingScenario
 }) => parseCompanyScenarios(matchingScenario == null ? void 0 : matchingScenario[LegalEntityType.ORGANIZATION], country2);
-const canSubmit$1 = (data) => mandatoryApiFields.ORGANIZATION.every((detail) => {
+const canSubmit$2 = (data) => mandatoryApiFields.ORGANIZATION.every((detail) => {
   const value = getProp(data, detail);
   return !isEmpty(value);
 });
-const isDocumentsRequired$1 = (forms2) => forms2.some((form) => [companyForms.companyRegistrationDocument.formId, companyForms.companyTaxDocument.formId].includes(form.formId));
-const formatFileSummaryData = (companyRegistrationDocument2, companyTaxDocument) => {
+const isDocumentsRequired$2 = (forms2) => forms2.some((form) => [companyForms.companyRegistrationDocument.formId, companyForms.companyTaxDocument.formId].includes(form.formId));
+const formatFileSummaryData$1 = (companyRegistrationDocument2, companyTaxDocument) => {
   var _a, _b;
   const registrationDocument2 = (_a = companyRegistrationDocument2 == null ? void 0 : companyRegistrationDocument2.registrationDocument) == null ? void 0 : _a[0];
   const taxDocument2 = (_b = companyTaxDocument == null ? void 0 : companyTaxDocument.taxDocument) == null ? void 0 : _b[0];
@@ -23367,7 +23318,7 @@ function CompanyDropinComponent({
     fieldConfigurations,
     requiredFields
   } = useScenarioConfiguration({
-    parseConfiguration: parseConfiguration$3,
+    parseConfiguration: parseConfiguration$5,
     getConfigurationData,
     setLoadingStatus,
     country: country2
@@ -23403,7 +23354,7 @@ function CompanyDropinComponent({
     legalEntity,
     dataSubmitted
   }) => {
-    if (!isDocumentsRequired$1(forms22))
+    if (!isDocumentsRequired$2(forms22))
       return;
     const formattedDocument = await mapCompanyDocumentToApiDocument(dataSubmitted, legalEntity.id);
     if (formattedDocument) {
@@ -23571,16 +23522,16 @@ function CompanyDropinComponent({
       summaryData.companyRegistrationAddress.operationalAddress = mapAddressLabels(summaryData == null ? void 0 : summaryData.companyRegistrationAddress.operationalAddress, datasetUtils);
     }
     if ((_h = summaryData.companyRegistrationDetails) == null ? void 0 : _h.vatAbsenceReason) {
-      const vatAbsenceReason = vatAbsenceReasons.find((absenceReason) => absenceReason === summaryData.companyRegistrationDetails.vatAbsenceReason);
-      if (vatAbsenceReason) {
-        summaryData.companyRegistrationDetails.vatAbsenceReason = i18n.get(vatAbsenceReason);
+      const vatAbsenceReason2 = vatAbsenceReasons.find((absenceReason) => absenceReason === summaryData.companyRegistrationDetails.vatAbsenceReason);
+      if (vatAbsenceReason2) {
+        summaryData.companyRegistrationDetails.vatAbsenceReason = i18n.get(vatAbsenceReason2);
       }
     }
-    if (isDocumentsRequired$1(forms22)) {
+    if (isDocumentsRequired$2(forms22)) {
       companyDocumentForms.forEach((formId) => delete summaryData[formId]);
       summaryData = {
         ...summaryData,
-        ...formatFileSummaryData(data2.companyRegistrationDocument, data2.companyTaxDocument)
+        ...formatFileSummaryData$1(data2.companyRegistrationDocument, data2.companyTaxDocument)
       };
     }
     return summaryData;
@@ -23616,7 +23567,7 @@ function CompanyDropinComponent({
     baseTrackingPayload,
     onSubmit,
     problems,
-    canSubmit: canSubmit$1(data) && hasDataChanged(dataFromResponse, data),
+    canSubmit: canSubmit$2(data) && hasDataChanged(dataFromResponse, data),
     summary: {
       data: formatDataForSummary2(data, forms2),
       omittedKeys: ["operationalAddressIsSame"]
@@ -23650,6 +23601,7 @@ function useCompanySearch({
   taxIdentificationNumber: taxIdentificationNumber2,
   canVerify,
   limit = 15,
+  setKompanyAddress,
   handleChangeFor,
   handleCompanyIndexSearch,
   handleCompanyDeepSearch,
@@ -23705,7 +23657,7 @@ function useCompanySearch({
     } finally {
       setStatus((prevStatus) => prevStatus !== "error" ? "loaded" : prevStatus);
     }
-  }, 500), []);
+  }, 700), []);
   const retrySearch = useCallback(async () => {
     if (!legalCompanyName2 || !country2 || !stateOrProvince2) {
       return setStatus("idle");
@@ -23789,17 +23741,17 @@ function useCompanySearch({
     setStatus("loading");
     setSelectedCompanyId(void 0);
     setVerifiedCompany(void 0);
+    setKompanyAddress(void 0);
     setCompaniesList([]);
     if (defaultData) {
-      entriesOf(defaultData).forEach(([field, value]) => {
-        handleChangeFor(field)(value);
-      });
+      handleChangeFor("legalCompanyName")(defaultData.legalCompanyName);
     }
-  }, [defaultData, handleChangeFor]);
+  }, [defaultData, handleChangeFor, setKompanyAddress]);
   useEffect(() => {
     var _a;
     setError(void 0);
-    if (!legalCompanyName2 || !country2 || !stateOrProvince2 || !taxIdentificationNumber2 || !canVerify) {
+    const isMinLength = legalCompanyName2 && legalCompanyName2.split("").length > 3;
+    if (!legalCompanyName2 || !country2 || !stateOrProvince2 || !taxIdentificationNumber2 || !canVerify || !isMinLength) {
       return setStatus("idle");
     }
     if (!verifiedCompany) {
@@ -23834,6 +23786,15 @@ function useCompanySearch({
     reset
   };
 }
+const mapKompanyOrganizationTypeToCompanyType = (organizationType) => {
+  const organizationTypeValue = organizationType == null ? void 0 : organizationType.toLowerCase();
+  switch (organizationTypeValue) {
+    case "business":
+      return CompanyTypesValue.PRIVATE_COMPANY;
+    default:
+      return void 0;
+  }
+};
 const mapCompanyDataResponseToFormSchema = (company2) => ({
   companyBasics: {
     country: company2.country,
@@ -23848,8 +23809,11 @@ const mapCompanyDataResponseToFormSchema = (company2) => ({
       postalCode: company2.zipcode
     }
   },
+  companyStructure: {
+    entityType: mapKompanyOrganizationTypeToCompanyType(company2.organizationType)
+  },
   companyOtherDetails: {
-    businessRegistrationNumber: company2.registrationNumber
+    registrationNumber: company2.registrationNumber
   }
 });
 const CompanyLookupResultsHeader = ({
@@ -23971,13 +23935,17 @@ const LookupResult = ({
         return "verified";
     }
   }, [status, isError]);
-  const selectAndVerify = (companyTin, company2) => {
-    if (ref.current) {
-      ref.current.scrollIntoView({
-        behavior: "smooth"
-      });
+  const selectAndVerify = async (companyTin, company2) => {
+    try {
+      await onSelect(companyTin, company2);
+    } finally {
+      if (ref.current) {
+        ref.current.scrollIntoView({
+          behavior: "smooth",
+          block: "center"
+        });
+      }
     }
-    return onSelect(companyTin, company2);
   };
   if (isSelected && verifiedCompany) {
     return jsxs("div", {
@@ -24047,9 +24015,17 @@ const CompanyLookupResultsList = ({
     }
     return "adyen-company-lookup-results-list__result-option";
   };
+  const resultsList = useMemo(() => {
+    if (verifiedCompany) {
+      const filtered = results.filter((option) => option.id !== verifiedCompany.id);
+      const verified2 = results.find((option) => option.id === verifiedCompany.id);
+      return verified2 ? [verified2, ...filtered] : results;
+    }
+    return results;
+  }, [verifiedCompany, results]);
   return jsx("div", {
     className: "adyen-company-lookup-results-list",
-    children: results.map((option) => jsx("div", {
+    children: resultsList.map((option) => jsx("div", {
       children: jsx(LookupResult, {
         classes: optionClasses(option),
         option,
@@ -24091,6 +24067,7 @@ function CompanyLookup({
   taxInformationNumber: taxInformationNumber2,
   setLoading,
   setKompanyAddress,
+  setKompanyVerifiedData,
   handleChangeFor,
   handleCompanyIndexSearch,
   handleCompanyDeepSearch,
@@ -24118,6 +24095,7 @@ function CompanyLookup({
     stateOrProvince: stateOrProvince2,
     taxIdentificationNumber: taxInformationNumber2,
     canVerify,
+    setKompanyAddress,
     handleChangeFor,
     handleCompanyIndexSearch,
     handleCompanyDeepSearch,
@@ -24131,11 +24109,14 @@ function CompanyLookup({
   const companyLookupClasses = status === "idle" || !canVerify ? "adyen-kyc-company-lookup adyen-kyc-company-lookup--hidden" : "adyen-kyc-company-lookup";
   const mappedData = useMemo$1(() => {
     if (verifiedCompany) {
+      const verifiedData = mapCompanyDataResponseToFormSchema(verifiedCompany);
       setKompanyAddress(verifiedCompany.address);
-      return mapCompanyDataResponseToFormSchema(verifiedCompany);
+      setKompanyVerifiedData(verifiedData);
+      return verifiedData;
     }
+    setKompanyVerifiedData(void 0);
     setKompanyAddress(void 0);
-  }, [setKompanyAddress, verifiedCompany]);
+  }, [setKompanyAddress, setKompanyVerifiedData, verifiedCompany]);
   useEffect$1(() => {
     if (mappedData == null ? void 0 : mappedData.companyBasics) {
       entriesOf(mappedData.companyBasics).forEach(([field, data]) => {
@@ -24171,13 +24152,36 @@ function CompanyLookup({
   });
 }
 const CompanyLookupComponent = memo(CompanyLookup, (prevProps, nextProps) => objectsDeepEqual(prevProps.defaultData, nextProps.defaultData) && prevProps.canVerify === nextProps.canVerify && prevProps.legalCompanyName === nextProps.legalCompanyName && prevProps.country === nextProps.country && prevProps.stateOrProvince === nextProps.stateOrProvince && prevProps.taxInformationNumber === nextProps.taxInformationNumber && prevProps.setLoading === nextProps.setLoading && prevProps.setKompanyAddress === nextProps.setKompanyAddress && prevProps.handleCompanyIndexSearch === nextProps.handleCompanyIndexSearch && prevProps.handleCompanyDeepSearch === nextProps.handleCompanyDeepSearch && prevProps.handleGetCompanyDataset === nextProps.handleGetCompanyDataset && prevProps.handleRefreshCompanyDataset === nextProps.handleRefreshCompanyDataset && prevProps.handleVerifyTin === nextProps.handleVerifyTin);
+const CountryFieldValidation = () => ({
+  country: {
+    modes: ["blur"],
+    validate: (country2) => !isEmpty(country2),
+    errorMessage: "fieldIsRequired"
+  }
+});
+const LegalCompanyNameFieldValidation = () => ({
+  legalCompanyName: {
+    modes: ["blur"],
+    validate: (legalCompanyName2) => !isEmpty(legalCompanyName2),
+    errorMessage: "fieldIsRequired"
+  }
+});
+const StateFieldValidation = () => ({
+  stateOrProvince: {
+    modes: ["blur"],
+    validate: (stateOrProvince2) => !isEmpty(stateOrProvince2),
+    errorMessage: "fieldIsRequired"
+  }
+});
 const TAX_INFORMATION_FIELD = ["taxInformation", "exemptedFromTax", "isUen"];
 function TaxInformationField({
   data,
   valid,
   errors,
   labels: labels2,
-  helperText,
+  mask,
+  guidanceText,
+  placeholders,
   readonly,
   handleChangeFor,
   country: country2,
@@ -24187,11 +24191,7 @@ function TaxInformationField({
     var _a;
     return (_a = data == null ? void 0 : data.taxInformation) == null ? void 0 : _a.find((taxInfo) => taxInfo.country === country2);
   }, [data, country2]);
-  const handleTaxInformationInput = (e) => {
-    var _a;
-    const {
-      value
-    } = e.target;
+  const handleTaxInformationInput = (value) => {
     if (!data.taxInformation) {
       const updatedTaxInformation2 = [{
         country: country2,
@@ -24200,7 +24200,12 @@ function TaxInformationField({
       }];
       return handleChangeFor("taxInformation", "input")(updatedTaxInformation2);
     }
-    const updatedTaxInformation = (_a = data.taxInformation) == null ? void 0 : _a.map((taxInfo) => {
+    const taxInformation = currentCountryTaxInformation ? data.taxInformation : [...data.taxInformation, {
+      country: country2,
+      number: value,
+      type: countryToTaxInfoTypeMap[country2]
+    }];
+    const updatedTaxInformation = taxInformation.map((taxInfo) => {
       if (taxInfo.country !== country2)
         return taxInfo;
       return {
@@ -24212,7 +24217,6 @@ function TaxInformationField({
     return handleChangeFor("taxInformation", "input")(updatedTaxInformation);
   };
   const handleTaxInformationBlur = (e) => {
-    var _a;
     const {
       value
     } = e.target;
@@ -24224,7 +24228,12 @@ function TaxInformationField({
       }];
       return handleChangeFor("taxInformation", "blur")(updatedTaxInformation2);
     }
-    const updatedTaxInformation = (_a = data.taxInformation) == null ? void 0 : _a.map((taxInfo) => {
+    const taxInformation = currentCountryTaxInformation ? data.taxInformation : [...data.taxInformation, {
+      country: country2,
+      number: value,
+      type: countryToTaxInfoTypeMap[country2]
+    }];
+    const updatedTaxInformation = taxInformation.map((taxInfo) => {
       if (taxInfo.country !== country2)
         return taxInfo;
       return {
@@ -24236,23 +24245,22 @@ function TaxInformationField({
     return handleChangeFor("taxInformation", "blur")(updatedTaxInformation);
   };
   return jsxs(Fragment, {
-    children: [jsx(Field, {
-      name: "taxInformationField",
-      label: labels2.taxInformation,
-      helper: helperText == null ? void 0 : helperText.taxInformation,
+    children: [jsx(MaskedInputText, {
+      name: "taxInformationNumber",
+      label: labels2.taxInformation ?? "",
+      formatGuidance: (guidanceText == null ? void 0 : guidanceText.taxInformation) ?? "",
+      value: (currentCountryTaxInformation == null ? void 0 : currentCountryTaxInformation.number) ?? "",
       errorMessage: errors.taxInformation,
-      isValid: valid.taxInformation,
-      children: (childProps) => jsx(InputText, {
-        ...childProps,
-        "aria-required": true,
-        "aria-label": labels2.taxInformation,
-        "aria-invalid": !valid.taxInformation,
-        name: "taxInformationNumber",
-        value: currentCountryTaxInformation == null ? void 0 : currentCountryTaxInformation.number,
-        onInput: handleTaxInformationInput,
-        onBlur: handleTaxInformationBlur,
-        readonly
-      })
+      placeholder: placeholders == null ? void 0 : placeholders.taxInformation,
+      isValid: Boolean(valid.taxInformation),
+      "aria-required": true,
+      "aria-label": labels2.taxInformation,
+      "aria-invalid": !valid.taxInformation,
+      onInput: handleTaxInformationInput,
+      onBlur: handleTaxInformationBlur,
+      disabled: data.exemptedFromTax,
+      readonly,
+      ...mask
     }), canExempt && jsx(Checkbox, {
       "aria-required": false,
       "aria-label": labels2.exemptedFromTax,
@@ -24266,116 +24274,37 @@ function TaxInformationField({
     })]
   });
 }
-const DateOfIncorporationFieldValidation = () => ({
-  dateOfIncorporation: [{
-    modes: ["blur"],
-    validate: (dateOfIncorporation2) => !isEmpty(dateOfIncorporation2),
-    errorMessage: "fieldIsRequired"
-  }, {
-    modes: ["blur"],
-    validate: (dateOfIncorporation2) => dateOfIncorporation2 ? new Date(dateOfIncorporation2) < /* @__PURE__ */ new Date() : false,
-    errorMessage: "invalidDateOfIncorporation"
-  }]
-});
-const StockExchangeMICFieldValidation = () => ({
-  stockExchangeMIC: [{
-    modes: ["blur"],
-    validate: (stockExchangeMIC2) => !isEmpty(stockExchangeMIC2),
-    errorMessage: "fieldIsRequired"
-  }]
-});
-const StockISINFieldValidation = () => ({
-  stockISIN: [{
-    modes: ["blur"],
-    validate: (stockISIN2) => !isEmpty(stockISIN2),
-    errorMessage: "fieldIsRequired"
-  }, {
-    modes: ["blur"],
-    validate: (input) => exactLength(input, 12),
-    errorMessage: "validationPleaseEnterAValidStockISIN"
-  }]
-});
-const TradingNameFieldValidation = () => ({
-  tradingName: [{
-    modes: ["blur"],
-    validate: (tradingName2) => !isEmpty(tradingName2),
-    errorMessage: "fieldIsRequired"
-  }]
-});
-const BusinessRegistrationNumberValidation = (country2, companyType2, registrationNumberType) => {
-  const metadata = resolveFieldMetadata(defaultFieldConfig$2[country2], {
-    companyType: companyType2,
-    registrationNumberType
-  }, defaultFieldMetadata$2);
-  return {
-    businessRegistrationNumber: metadata.validators
-  };
-};
-const TaxInformationFieldValidation = (country2, taxIdNumberType) => {
-  const metadata = resolveFieldMetadata(defaultFieldConfig$1[country2], {
+const defaultFieldMetadata = defaultFieldMetadata$2;
+const defaultFieldConfig = entriesOf(defaultFieldConfig$2).reduce((fieldConfig, [country2, countryEntry]) => ({
+  ...fieldConfig,
+  [country2]: ({
     taxIdNumberType
-  }, defaultFieldMetadata$1);
-  if (!metadata.validators)
-    return {};
-  const validators = Array.isArray(metadata.validators) ? metadata.validators : [metadata.validators];
-  return {
-    taxInformation: validators.map((validator) => ({
-      modes: ["blur"],
-      validate: (taxInfos) => (taxInfos == null ? void 0 : taxInfos.every((taxInfo) => validator.validate(taxInfo.number))) ?? false,
-      errorMessage: metadata.helperText
-    }))
-  };
-};
-const VatNumberFieldValidation = (country2, vatNumberType) => {
-  const metadata = resolveFieldMetadata(defaultFieldConfig[country2], {
-    vatNumberType
-  }, defaultFieldMetadata);
-  if (!metadata.validators)
-    return {};
-  const validators = Array.isArray(metadata.validators) ? metadata.validators : [metadata.validators];
-  return {
-    vatNumber: validators.map((validator) => ({
+  }) => {
+    const fieldMetadata = resolveFieldMetadata(countryEntry, {
+      taxIdNumberType
+    }, defaultFieldMetadata$2);
+    const taxIdValidators = fieldMetadata.validators ? Array.isArray(fieldMetadata.validators) ? fieldMetadata.validators : [fieldMetadata.validators] : [];
+    const mappedValidators = taxIdValidators.map((validator) => ({
       ...validator,
-      errorMessage: metadata.helperText
-    }))
-  };
-};
-const CompanyOtherDetailsValidationRules = (country2, companyType2) => ({
-  ...TradingNameFieldValidation(),
-  ...StockISINFieldValidation(),
-  ...StockExchangeMICFieldValidation(),
-  ...TaxInformationFieldValidation(country2),
-  ...DateOfIncorporationFieldValidation(),
-  ...BusinessRegistrationNumberValidation(country2, companyType2),
-  ...VatNumberFieldValidation(country2)
-});
-const CountryFieldValidation = () => ({
-  country: {
-    modes: ["blur"],
-    validate: (country2) => !isEmpty(country2),
-    errorMessage: "fieldIsRequired"
-  }
-});
-const LegalCompanyNameFieldValidation = () => ({
-  legalCompanyName: {
-    modes: ["blur"],
-    validate: (legalCompanyName2) => !isEmpty(legalCompanyName2),
-    errorMessage: "fieldIsRequired"
-  }
-});
-const StateFieldValidation = () => ({
-  stateOrProvince: {
-    modes: ["blur"],
-    validate: (stateOrProvince2) => !isEmpty(stateOrProvince2),
-    errorMessage: "fieldIsRequired"
+      validate: (taxInformation) => {
+        var _a;
+        const taxIdNumber2 = (_a = taxInformation == null ? void 0 : taxInformation.find((taxId2) => country2 === taxId2.country)) == null ? void 0 : _a.number;
+        return taxIdNumber2 ? validator.validate(taxIdNumber2) : false;
+      },
+      errorMessage: (taxInformation) => {
+        var _a;
+        const taxIdNumber2 = (_a = taxInformation == null ? void 0 : taxInformation.find((taxId2) => country2 === taxId2.country)) == null ? void 0 : _a.number;
+        if (!taxIdNumber2)
+          return void 0;
+        return typeof validator.errorMessage === "function" ? validator.errorMessage(taxIdNumber2) : validator.errorMessage;
+      }
+    }));
+    return {
+      ...fieldMetadata,
+      validators: mappedValidators
+    };
   }
-});
-const CompanyBasicsValidationRules = (country2) => ({
-  ...LegalCompanyNameFieldValidation(),
-  ...CountryFieldValidation(),
-  ...StateFieldValidation(),
-  ...TaxInformationFieldValidation(country2)
-});
+}), {});
 const COMPANY_BASICS_FORM_ID = "companyBasics";
 const companyBasicsFields = [...LEGAL_COMPANY_NAME_FIELD, ...COUNTRY_FIELD, ...STATE_FIELD, ...TAX_INFORMATION_FIELD];
 function CompanyBasics({
@@ -24398,8 +24327,11 @@ function CompanyBasics({
   handleGetCompanyDataset,
   handleRefreshCompanyDataset,
   handleVerifyTin,
+  country: country2,
+  isTopLevelEntity,
   kompanyAddress,
-  setKompanyAddress
+  setKompanyAddress,
+  setKompanyVerifiedData
 }) {
   var _a, _b;
   const {
@@ -24409,12 +24341,59 @@ function CompanyBasics({
     isSettingEnabled
   } = useSettingsContext();
   const {
-    sliceData,
     updateStateSlice
   } = useGlobalDataSlice(COMPANY_BASICS_FORM_ID);
-  const schema = (requiredFields == null ? void 0 : requiredFields.length) ? requiredFields : ["legalCompanyName", "country"];
-  const validationRules = CompanyBasicsValidationRules((sliceData == null ? void 0 : sliceData.country) ?? (data == null ? void 0 : data.country));
   const [loading2, setLoading] = useState$1(false);
+  const allowedCountries = useAllowedCountries();
+  const initialFormUtilsProps = useMemo$1(() => ({
+    labels: labels2,
+    placeholders,
+    helperText,
+    readOnly,
+    requiredFields,
+    readOnlyFields,
+    optionalFields,
+    maskedFields,
+    shouldValidate
+  }), [helperText, labels2, maskedFields, optionalFields, placeholders, readOnly, readOnlyFields, requiredFields, shouldValidate]);
+  const mergedFieldProps = useMemo$1(() => {
+    var _a2;
+    return (_a2 = initialFormUtilsProps.requiredFields) == null ? void 0 : _a2.reduce((acc, field) => {
+      switch (field) {
+        case "legalCompanyName":
+          return {
+            ...acc,
+            validators: {
+              ...acc.validators,
+              ...LegalCompanyNameFieldValidation()
+            }
+          };
+        case "country":
+          return {
+            ...acc,
+            validators: {
+              ...acc.validators,
+              ...CountryFieldValidation()
+            }
+          };
+        case "stateOrProvince":
+          return {
+            ...acc,
+            validators: {
+              ...acc.validators,
+              ...StateFieldValidation()
+            }
+          };
+        case "taxInformation":
+          return mergeFieldMetadataIntoProps(field, resolveFieldMetadata(defaultFieldConfig[country2], {
+            taxIdNumberType: countryToTaxInfoTypeMap[country2]
+          }, defaultFieldMetadata), acc);
+        default:
+          return acc;
+      }
+    }, initialFormUtilsProps);
+  }, [country2, initialFormUtilsProps]);
+  const schema = (requiredFields == null ? void 0 : requiredFields.length) ? requiredFields : ["legalCompanyName", "country"];
   const {
     schema: formSchema,
     data: formData,
@@ -24426,35 +24405,17 @@ function CompanyBasics({
   } = useForm({
     schema,
     defaultData: data,
-    rules: validationRules,
+    rules: mergedFieldProps == null ? void 0 : mergedFieldProps.validators,
+    optionalFields: mergedFieldProps == null ? void 0 : mergedFieldProps.optionalFields,
+    maskedFields: mergedFieldProps == null ? void 0 : mergedFieldProps.maskedFields,
     fieldProblems: fieldValidationErrors,
-    optionalFields,
-    maskedFields,
     shouldValidate
   });
   const isAllowedEditPrefilledCountry = isSettingEnabled(SettingNames.AllowPrefilledCountryEdit);
-  const formUtils = formUtilities({
-    labels: labels2,
-    placeholders,
-    helperText,
-    readOnly,
-    requiredFields,
-    readOnlyFields,
-    optionalFields
-  }, i18n);
+  const formUtils = formUtilities(mergedFieldProps ?? initialFormUtilsProps, i18n);
   const hasCompanySearchProvider = formData.country && COUNTRIES_WITH_IN_APP_SEARCH_COMPANY_VERIFICATION.includes(formData.country);
   const currentCountryTaxIdNumber = (_b = (_a = formData.taxInformation) == null ? void 0 : _a.find((taxInfo) => taxInfo.country === formData.country)) == null ? void 0 : _b.number;
-  const {
-    legalCompanyNameDisabled,
-    countryDisabled,
-    stateOrProvinceDisabled,
-    taxInformationDisabled
-  } = useMemo$1(() => ({
-    legalCompanyNameDisabled: formUtils.isReadOnly("legalCompanyName") || Boolean(kompanyAddress) || loading2,
-    countryDisabled: !isAllowedEditPrefilledCountry || formUtils.isReadOnly("country") || Boolean(kompanyAddress) || loading2,
-    stateOrProvinceDisabled: formUtils.isReadOnly("stateOrProvince") || Boolean(kompanyAddress) || loading2,
-    taxInformationDisabled: formUtils.isReadOnly("taxInformation") || Boolean(kompanyAddress) || loading2
-  }), [kompanyAddress, formUtils, isAllowedEditPrefilledCountry, loading2]);
+  const disabled = (field) => formUtils.isReadOnly(field) || Boolean(kompanyAddress) || loading2;
   useEffect$1(() => {
     updateStateSlice({
       schema: formSchema,
@@ -24485,7 +24446,7 @@ function CompanyBasics({
           helperText: formUtils.getFieldHelperText(LEGAL_COMPANY_NAME_FIELD, {
             legalCompanyName: "legalCompanyName__helperText"
           }),
-          readonly: legalCompanyNameDisabled,
+          readonly: disabled("legalCompanyName"),
           handleChangeFor
         })
       }), formUtils.isRequiredField("country") && jsx("div", {
@@ -24495,8 +24456,9 @@ function CompanyBasics({
           valid: formUtils.getFieldValid(formValid, COUNTRY_FIELD),
           errors: formUtils.getFieldErrors(formErrors, formFieldProblems, COUNTRY_FIELD),
           labels: formUtils.getFieldLabels(COUNTRY_FIELD),
-          readonly: countryDisabled,
-          handleChangeFor
+          readonly: disabled("country") || !isAllowedEditPrefilledCountry,
+          handleChangeFor,
+          allowedCountries: isTopLevelEntity ? allowedCountries : void 0
         })
       }), formUtils.isRequiredField("stateOrProvince") && jsx("div", {
         className: "adyen-kyc-field-wrapper",
@@ -24505,7 +24467,7 @@ function CompanyBasics({
           valid: formUtils.getFieldValid(formValid, STATE_FIELD),
           errors: formUtils.getFieldErrors(formErrors, formFieldProblems, STATE_FIELD),
           labels: formUtils.getFieldLabels(STATE_FIELD),
-          readonly: stateOrProvinceDisabled,
+          readonly: disabled("stateOrProvince"),
           handleChangeFor,
           selectedCountry: formData.country
         })
@@ -24516,11 +24478,14 @@ function CompanyBasics({
           valid: formUtils.getFieldValid(formValid, TAX_INFORMATION_FIELD),
           errors: formUtils.getFieldErrors(formErrors, formFieldProblems, TAX_INFORMATION_FIELD),
           labels: formUtils.getFieldLabels(TAX_INFORMATION_FIELD),
-          readonly: taxInformationDisabled,
+          mask: formUtils.getMask("taxInformation"),
+          helperText: formUtils.getFieldHelperText(TAX_INFORMATION_FIELD),
+          guidanceText: formUtils.getFieldGuidanceText(TAX_INFORMATION_FIELD),
+          readonly: disabled("taxInformation"),
           handleChangeFor,
-          country: formData.country,
           canExempt: formUtils.isRequiredField("exemptedFromTax"),
-          isUen: formUtils.isRequiredField("isUen")
+          isUen: formUtils.isRequiredField("isUen"),
+          country: formData.country
         })
       }), hasCompanySearchProvider && jsx(CompanyLookupComponent, {
         defaultData: data,
@@ -24532,6 +24497,7 @@ function CompanyBasics({
         handleChangeFor,
         setLoading,
         setKompanyAddress,
+        setKompanyVerifiedData,
         handleCompanyIndexSearch,
         handleCompanyDeepSearch,
         handleGetCompanyDataset,
@@ -24543,54 +24509,52 @@ function CompanyBasics({
 }
 const CompanyBasicsComponent = memo(CompanyBasics, (prevProps, nextProps) => objectsDeepEqual(prevProps.data, nextProps.data) && objectsDeepEqual(prevProps.labels, nextProps.labels) && objectsDeepEqual(prevProps.placeholders, nextProps.placeholders) && objectsDeepEqual(prevProps.helperText, nextProps.helperText) && objectsDeepEqual(prevProps.formVerificationErrors, nextProps.formVerificationErrors) && objectsDeepEqual(prevProps.fieldValidationErrors, nextProps.fieldValidationErrors) && prevProps.heading === nextProps.heading && prevProps.description === nextProps.description && prevProps.readOnly === nextProps.readOnly && prevProps.requiredFields === nextProps.requiredFields && prevProps.maskedFields === nextProps.maskedFields && prevProps.optionalFields === nextProps.optionalFields && prevProps.readOnlyFields === nextProps.readOnlyFields && prevProps.shouldValidate === nextProps.shouldValidate && prevProps.kompanyAddress === nextProps.kompanyAddress);
 const CompanyOtherDetailsComponent$1 = "";
-const BUSINESS_REGISTRATION_NUMBER_FIELD = ["businessRegistrationNumber", "exemptedFromBusinessRegistrationNumber"];
+const BUSINESS_REGISTRATION_NUMBER_FIELD = ["registrationNumber", "exemptedFromRegistrationNumber"];
 function BusinessRegistrationNumberField({
   data,
   valid,
   errors,
   labels: labels2,
+  mask,
+  guidanceText,
   placeholders,
-  helperText,
   readonly,
-  classNameModifiers,
   canExempt,
   handleChangeFor
 }) {
   return jsxs(Fragment, {
-    children: [jsx(Field, {
-      name: "businessRegistrationNumberField",
-      label: labels2 == null ? void 0 : labels2.businessRegistrationNumber,
-      helper: helperText == null ? void 0 : helperText.businessRegistrationNumber,
-      errorMessage: errors.businessRegistrationNumber,
-      isValid: valid.businessRegistrationNumber,
-      classNameModifiers,
-      children: (childProps) => jsx(InputText, {
-        ...childProps,
-        "aria-required": true,
-        "aria-label": labels2 == null ? void 0 : labels2.businessRegistrationNumber,
-        "aria-invalid": !valid.businessRegistrationNumber,
-        name: "businessRegistrationNumber",
-        value: data.businessRegistrationNumber,
-        placeholder: placeholders == null ? void 0 : placeholders.businessRegistrationNumber,
-        disabled: data.exemptedFromBusinessRegistrationNumber,
-        readonly,
-        required: true,
-        classNameModifiers: ["businessRegistrationNumber"],
-        onInput: handleChangeFor("businessRegistrationNumber", "input"),
-        onBlur: handleChangeFor("businessRegistrationNumber", "blur")
-      })
-    }), canExempt && jsx(Checkbox, {
-      "aria-required": false,
-      "aria-label": labels2 == null ? void 0 : labels2.exemptedFromBusinessRegistrationNumber,
-      "aria-invalid": false,
-      name: "exemptedFromBusinessRegistrationNumber",
-      value: "exemptedFromBusinessRegistrationNumber",
-      checked: Boolean(data.exemptedFromBusinessRegistrationNumber),
-      label: labels2 == null ? void 0 : labels2.exemptedFromBusinessRegistrationNumber,
-      readonly,
-      classNameModifiers: ["exempted-from-registration"],
-      onChange: handleChangeFor("exemptedFromBusinessRegistrationNumber")
-    })]
+    children: [jsx(MaskedInputText, {
+      "aria-required": true,
+      "aria-label": labels2.registrationNumber,
+      "aria-invalid": !valid.registrationNumber,
+      classNameModifiers: {
+        field: ["registrationNumber"],
+        input: ["registrationNumber"]
+      },
+      name: "registrationNumber",
+      value: (data == null ? void 0 : data.registrationNumber) ?? "",
+      label: labels2.registrationNumber ?? "",
+      formatGuidance: (guidanceText == null ? void 0 : guidanceText.registrationNumber) ?? "",
+      placeholder: placeholders == null ? void 0 : placeholders.registrationNumber,
+      errorMessage: errors.registrationNumber,
+      isValid: Boolean(valid.registrationNumber),
+      onInput: handleChangeFor("registrationNumber", "input"),
+      onBlur: handleChangeFor("registrationNumber", "blur"),
+      disabled: data.exemptedFromRegistrationNumber,
+      readonly,
+      ...mask
+    }), canExempt && jsx(Checkbox, {
+      "aria-required": false,
+      "aria-label": labels2 == null ? void 0 : labels2.exemptedFromRegistrationNumber,
+      "aria-invalid": false,
+      name: "exemptedFromRegistrationNumber",
+      value: "exemptedFromRegistrationNumber",
+      checked: Boolean(data.exemptedFromRegistrationNumber),
+      label: labels2 == null ? void 0 : labels2.exemptedFromRegistrationNumber,
+      readonly,
+      classNameModifiers: ["exempted-from-registration"],
+      onChange: handleChangeFor("exemptedFromRegistrationNumber")
+    })]
   });
 }
 const DATE_OF_INCORPORATION_FIELD = ["dateOfIncorporation"];
@@ -24624,6 +24588,17 @@ function DateOfIncorporationField({
     })
   });
 }
+const DateOfIncorporationFieldValidation = () => ({
+  dateOfIncorporation: [{
+    modes: ["blur"],
+    validate: (dateOfIncorporation2) => !isEmpty(dateOfIncorporation2),
+    errorMessage: "fieldIsRequired"
+  }, {
+    modes: ["blur"],
+    validate: (dateOfIncorporation2) => dateOfIncorporation2 ? new Date(dateOfIncorporation2) < /* @__PURE__ */ new Date() : false,
+    errorMessage: "invalidDateOfIncorporation"
+  }]
+});
 const STOCK_EXCHANGE_MIC_FIELD = ["stockExchangeMIC"];
 function StockExchangeMICField({
   data,
@@ -24657,6 +24632,13 @@ function StockExchangeMICField({
     })
   });
 }
+const StockExchangeMICFieldValidation = () => ({
+  stockExchangeMIC: [{
+    modes: ["blur"],
+    validate: (stockExchangeMIC2) => !isEmpty(stockExchangeMIC2),
+    errorMessage: "fieldIsRequired"
+  }]
+});
 const STOCK_ISIN_FIELD = ["stockISIN"];
 function StockISINField({
   data,
@@ -24690,6 +24672,17 @@ function StockISINField({
     })
   });
 }
+const StockISINFieldValidation = () => ({
+  stockISIN: [{
+    modes: ["blur"],
+    validate: (stockISIN2) => !isEmpty(stockISIN2),
+    errorMessage: "fieldIsRequired"
+  }, {
+    modes: ["blur"],
+    validate: (input) => exactLength(input, 12),
+    errorMessage: "validationPleaseEnterAValidStockISIN"
+  }]
+});
 const TRADING_NAME_FIELD = ["tradingName", "sameNameAsLegalName"];
 function TradingNameField({
   data,
@@ -24741,12 +24734,21 @@ function TradingNameField({
     })]
   });
 }
+const TradingNameFieldValidation = () => ({
+  tradingName: [{
+    modes: ["blur"],
+    validate: (tradingName2) => !isEmpty(tradingName2),
+    errorMessage: "fieldIsRequired"
+  }]
+});
 const VAT_NUMBER_FIELD = ["vatNumber", "exemptedFromVat", "vatAbsenceReason"];
 function VatNumberField({
   data,
   valid,
   errors,
   labels: labels2,
+  mask,
+  guidanceText,
   placeholders,
   readonly,
   handleChangeFor,
@@ -24756,25 +24758,26 @@ function VatNumberField({
     i18n
   } = useI18nContext();
   return jsxs(Fragment, {
-    children: [jsx(Field, {
+    children: [jsx(MaskedInputText, {
+      "aria-required": true,
+      "aria-label": labels2.vatNumber,
+      "aria-invalid": !valid.vatNumber,
+      classNameModifiers: {
+        field: ["tax-id"],
+        input: ["vatNumber"]
+      },
       name: "vatNumber",
-      label: labels2 == null ? void 0 : labels2.vatNumber,
-      classNameModifiers: ["tax-id"],
+      value: (data == null ? void 0 : data.vatNumber) ?? "",
+      label: labels2.vatNumber ?? "",
+      formatGuidance: (guidanceText == null ? void 0 : guidanceText.vatNumber) ?? "",
+      placeholder: placeholders == null ? void 0 : placeholders.vatNumber,
       errorMessage: errors.vatNumber,
-      isValid: valid.vatNumber,
-      children: (childProps) => jsx(InputText, {
-        ...childProps,
-        "aria-required": true,
-        "aria-label": labels2 == null ? void 0 : labels2.vatNumber,
-        "aria-invalid": !valid.vatNumber,
-        name: "vatNumber",
-        value: data.vatNumber,
-        readonly,
-        classNameModifiers: ["vatNumber"],
-        onInput: handleChangeFor("vatNumber", "input"),
-        onBlur: handleChangeFor("vatNumber", "blur"),
-        disabled: data.exemptedFromVat
-      })
+      isValid: Boolean(valid.vatNumber),
+      onInput: handleChangeFor("vatNumber", "input"),
+      onBlur: handleChangeFor("vatNumber", "blur"),
+      disabled: data.exemptedFromVat,
+      readonly,
+      ...mask
     }), canExempt && jsx(Checkbox, {
       "aria-required": false,
       "aria-label": labels2 == null ? void 0 : labels2.exemptedFromVat,
@@ -24824,43 +24827,119 @@ function CompanyOtherDetails({
   readOnlyFields,
   country: country2,
   legalCompanyName: legalCompanyName2,
-  companyType: companyType2
+  companyType: companyType2,
+  kompanyVerifiedData
 }) {
+  var _a, _b, _c, _d;
   const {
     i18n
   } = useI18nContext();
+  const {
+    isExperimentEnabled
+  } = useExperimentsContext();
   const {
     sliceData,
     updateStateSlice
   } = useGlobalDataSlice(COMPANY_OTHER_DETAILS_FORM_ID);
+  const [registrationNumberType, setRegistrationNumberType] = useState$1((data == null ? void 0 : data.registrationNumber) ? inferCompanyRegistrationNumberType(data == null ? void 0 : data.registrationNumber, country2, companyType2) : (_a = companyRegistrationNumberOptions[country2]) == null ? void 0 : _a[0].id);
+  const existingTaxIdentificationNumber = (data == null ? void 0 : data.vatNumber) ?? ((_c = (_b = data == null ? void 0 : data.taxInformation) == null ? void 0 : _b.find((taxId2) => taxId2.country === country2)) == null ? void 0 : _c.number);
+  const [taxIdentificationNumberType, setTaxIdentificationNumberType] = useState$1(existingTaxIdentificationNumber ? inferTaxIdNumberType(existingTaxIdentificationNumber, country2) : (_d = taxIdNumberOptions[country2]) == null ? void 0 : _d[0].id);
+  const isTypeSelectorEnabled = isExperimentEnabled(ExperimentNames.EnableIdentityFieldTypeSelector);
   const directChildFields = companyOtherDetailsFields.filter((field) => ["tradingName", "sameNameAsLegalName", "stockExchangeMIC", "stockISIN", "dateOfIncorporation"].includes(field));
   const schema = useMemo$1(() => !(sliceData == null ? void 0 : sliceData.exemptedFromVat) ? (requiredFields == null ? void 0 : requiredFields.filter((field) => field !== "vatAbsenceReason")) ?? directChildFields : (requiredFields == null ? void 0 : requiredFields.filter((field) => field !== "vatNumber")) ?? directChildFields, [requiredFields, directChildFields, sliceData]);
-  const validationRules = useMemo$1(() => CompanyOtherDetailsValidationRules(country2, companyType2), [companyType2, country2]);
+  const initialFormUtilsProps = useMemo$1(() => ({
+    labels: labels2,
+    placeholders,
+    helperText,
+    readOnly,
+    requiredFields,
+    readOnlyFields,
+    optionalFields,
+    maskedFields,
+    shouldValidate
+  }), [helperText, labels2, maskedFields, optionalFields, placeholders, readOnly, readOnlyFields, requiredFields, shouldValidate]);
+  const mergedFieldProps = useMemo$1(() => {
+    var _a2;
+    return (_a2 = initialFormUtilsProps.requiredFields) == null ? void 0 : _a2.reduce((acc, field) => {
+      switch (field) {
+        case "tradingName":
+          return {
+            ...acc,
+            validators: {
+              ...acc.validators,
+              ...TradingNameFieldValidation()
+            }
+          };
+        case "dateOfIncorporation":
+          return {
+            ...acc,
+            validators: {
+              ...acc.validators,
+              ...DateOfIncorporationFieldValidation()
+            }
+          };
+        case "stockExchangeMIC":
+          return {
+            ...acc,
+            validators: {
+              ...acc.validators,
+              ...StockExchangeMICFieldValidation()
+            }
+          };
+        case "stockISIN":
+          return {
+            ...acc,
+            validators: {
+              ...acc.validators,
+              ...StockISINFieldValidation()
+            }
+          };
+        case "registrationNumber":
+          return mergeFieldMetadataIntoProps(field, resolveFieldMetadata(defaultFieldConfig$3[country2], {
+            companyType: companyType2,
+            registrationNumberType
+          }, defaultFieldMetadata$3), acc);
+        case "taxInformation":
+          return mergeFieldMetadataIntoProps(field, resolveFieldMetadata(defaultFieldConfig[country2], {
+            taxIdNumberType: taxIdentificationNumberType
+          }, defaultFieldMetadata), acc);
+        case "vatNumber":
+          return mergeFieldMetadataIntoProps(field, resolveFieldMetadata(defaultFieldConfig$1[country2], {
+            vatNumberType: taxIdentificationNumberType
+          }, defaultFieldMetadata$1), acc);
+        default:
+          return acc;
+      }
+    }, initialFormUtilsProps);
+  }, [companyType2, country2, initialFormUtilsProps, registrationNumberType, taxIdentificationNumberType]);
   const {
     schema: formSchema,
     data: formData,
     errors: formErrors,
     valid: formValid,
     fieldProblems: formFieldProblems,
-    handleChangeFor
+    handleChangeFor,
+    triggerValidation
   } = useForm({
     schema,
     defaultData: data,
-    rules: validationRules,
+    rules: mergedFieldProps == null ? void 0 : mergedFieldProps.validators,
+    optionalFields: mergedFieldProps == null ? void 0 : mergedFieldProps.optionalFields,
+    maskedFields: mergedFieldProps == null ? void 0 : mergedFieldProps.maskedFields,
     fieldProblems: fieldValidationErrors,
-    optionalFields,
-    maskedFields,
     shouldValidate
   });
-  const formUtils = formUtilities({
-    labels: labels2,
-    placeholders,
-    helperText,
-    readOnly,
-    requiredFields,
-    readOnlyFields,
-    optionalFields
-  }, i18n);
+  const formUtils = formUtilities(mergedFieldProps ?? initialFormUtilsProps, i18n);
+  const handleBusinessRegistrationNumberTypeChange = useCallback$1((type) => {
+    setRegistrationNumberType(type);
+    triggerValidation(["registrationNumber"]);
+  }, [triggerValidation]);
+  const handleTaxIdentificationNumberTypeChange = useCallback$1((type) => {
+    setTaxIdentificationNumberType(type);
+    triggerValidation(["vatNumber", "taxInformation"]);
+  }, [triggerValidation]);
+  useEffect$1(() => {
+  }, [kompanyVerifiedData]);
   useEffect$1(() => {
     updateStateSlice({
       schema: formSchema,
@@ -24898,6 +24977,61 @@ function CompanyOtherDetails({
           handleChangeFor,
           legalCompanyName: legalCompanyName2
         })
+      }), isTypeSelectorEnabled && companyType2 && formUtils.isRequiredField("registrationNumber") && jsx(CompanyRegistrationNumberTypeSelector, {
+        companyType: companyType2,
+        country: country2,
+        setSelected: handleBusinessRegistrationNumberTypeChange,
+        selected: registrationNumberType
+      }), formUtils.isRequiredField("registrationNumber") && jsx("div", {
+        className: "adyen-kyc-field-wrapper",
+        children: jsx(BusinessRegistrationNumberField, {
+          data: formUtils.getFieldData(formData, BUSINESS_REGISTRATION_NUMBER_FIELD),
+          valid: formUtils.getFieldValid(formValid, BUSINESS_REGISTRATION_NUMBER_FIELD),
+          errors: formUtils.getFieldErrors(formErrors, formFieldProblems, BUSINESS_REGISTRATION_NUMBER_FIELD),
+          labels: formUtils.getFieldLabels(BUSINESS_REGISTRATION_NUMBER_FIELD),
+          mask: formUtils.getMask("registrationNumber"),
+          guidanceText: formUtils.getFieldGuidanceText(BUSINESS_REGISTRATION_NUMBER_FIELD),
+          placeholders: formUtils.getFieldPlaceholders(BUSINESS_REGISTRATION_NUMBER_FIELD),
+          helperText: formUtils.getFieldHelperText(BUSINESS_REGISTRATION_NUMBER_FIELD),
+          readonly: formUtils.isReadOnly("registrationNumber"),
+          handleChangeFor,
+          canExempt: formUtils.isRequiredField("exemptedFromRegistrationNumber")
+        })
+      }), isTypeSelectorEnabled && formUtils.isRequiredField("vatNumber") && jsx(TaxIdNumberTypeSelector, {
+        country: country2,
+        setSelected: handleTaxIdentificationNumberTypeChange,
+        selected: taxIdentificationNumberType
+      }), formUtils.isRequiredField("vatNumber") && jsx("div", {
+        className: "adyen-kyc-field-wrapper",
+        children: jsx(VatNumberField, {
+          data: formUtils.getFieldData(formData, VAT_NUMBER_FIELD),
+          valid: formUtils.getFieldValid(formValid, VAT_NUMBER_FIELD),
+          errors: formUtils.getFieldErrors(formErrors, formFieldProblems, VAT_NUMBER_FIELD),
+          labels: formUtils.getFieldLabels(VAT_NUMBER_FIELD),
+          mask: formUtils.getMask("vatNumber"),
+          guidanceText: formUtils.getFieldGuidanceText(VAT_NUMBER_FIELD),
+          placeholders: formUtils.getFieldPlaceholders(VAT_NUMBER_FIELD),
+          readonly: formUtils.isReadOnly("vatNumber"),
+          handleChangeFor,
+          country: country2,
+          canExempt: formUtils.isRequiredField("exemptedFromVat")
+        })
+      }), formUtils.isRequiredField("taxInformation") && jsx("div", {
+        className: "adyen-kyc-field-wrapper",
+        children: jsx(TaxInformationField, {
+          data: formUtils.getFieldData(formData, TAX_INFORMATION_FIELD),
+          valid: formUtils.getFieldValid(formValid, TAX_INFORMATION_FIELD),
+          errors: formUtils.getFieldErrors(formErrors, formFieldProblems, TAX_INFORMATION_FIELD),
+          labels: formUtils.getFieldLabels(TAX_INFORMATION_FIELD),
+          mask: formUtils.getMask("taxInformation"),
+          helperText: formUtils.getFieldHelperText(TAX_INFORMATION_FIELD),
+          guidanceText: formUtils.getFieldGuidanceText(TAX_INFORMATION_FIELD),
+          readonly: formUtils.isReadOnly("taxInformation"),
+          handleChangeFor,
+          country: country2,
+          canExempt: formUtils.isRequiredField("exemptedFromTax"),
+          isUen: formUtils.isRequiredField("isUen")
+        })
       }), formUtils.isRequiredField("dateOfIncorporation") && jsx("div", {
         className: "adyen-kyc-field-wrapper",
         children: jsx(DateOfIncorporationField, {
@@ -24936,50 +25070,11 @@ function CompanyOtherDetails({
           readonly: formUtils.isReadOnly("stockISIN"),
           handleChangeFor
         })
-      }), formUtils.isRequiredField("businessRegistrationNumber") && jsx("div", {
-        className: "adyen-kyc-field-wrapper",
-        children: jsx(BusinessRegistrationNumberField, {
-          data: formUtils.getFieldData(formData, BUSINESS_REGISTRATION_NUMBER_FIELD),
-          valid: formUtils.getFieldValid(formValid, BUSINESS_REGISTRATION_NUMBER_FIELD),
-          errors: formUtils.getFieldErrors(formErrors, formFieldProblems, BUSINESS_REGISTRATION_NUMBER_FIELD),
-          labels: formUtils.getFieldLabels(BUSINESS_REGISTRATION_NUMBER_FIELD),
-          placeholders: formUtils.getFieldPlaceholders(BUSINESS_REGISTRATION_NUMBER_FIELD),
-          helperText: formUtils.getFieldHelperText(BUSINESS_REGISTRATION_NUMBER_FIELD),
-          readonly: formUtils.isReadOnly("businessRegistrationNumber"),
-          handleChangeFor,
-          canExempt: formUtils.isRequiredField("exemptedFromBusinessRegistrationNumber")
-        })
-      }), formUtils.isRequiredField("taxInformation") && jsx("div", {
-        className: "adyen-kyc-field-wrapper",
-        children: jsx(TaxInformationField, {
-          data: formUtils.getFieldData(formData, TAX_INFORMATION_FIELD),
-          valid: formUtils.getFieldValid(formValid, TAX_INFORMATION_FIELD),
-          errors: formUtils.getFieldErrors(formErrors, formFieldProblems, TAX_INFORMATION_FIELD),
-          labels: formUtils.getFieldLabels(TAX_INFORMATION_FIELD),
-          readonly: formUtils.isReadOnly("taxInformation"),
-          handleChangeFor,
-          country: country2,
-          canExempt: formUtils.isRequiredField("exemptedFromTax"),
-          isUen: formUtils.isRequiredField("isUen")
-        })
-      }), formUtils.isRequiredField("vatNumber") && jsx("div", {
-        className: "adyen-kyc-field-wrapper",
-        children: jsx(VatNumberField, {
-          data: formUtils.getFieldData(formData, VAT_NUMBER_FIELD),
-          valid: formUtils.getFieldValid(formValid, VAT_NUMBER_FIELD),
-          errors: formUtils.getFieldErrors(formErrors, formFieldProblems, VAT_NUMBER_FIELD),
-          labels: formUtils.getFieldLabels(VAT_NUMBER_FIELD),
-          placeholders: formUtils.getFieldPlaceholders(VAT_NUMBER_FIELD),
-          readonly: formUtils.isReadOnly("vatNumber"),
-          handleChangeFor,
-          country: country2,
-          canExempt: formUtils.isRequiredField("exemptedFromVat")
-        })
       })]
     })]
   });
 }
-const CompanyOtherDetailsComponent = memo(CompanyOtherDetails, (prevProps, nextProps) => objectsDeepEqual(prevProps.data, nextProps.data) && objectsDeepEqual(prevProps.labels, nextProps.labels) && objectsDeepEqual(prevProps.placeholders, nextProps.placeholders) && objectsDeepEqual(prevProps.helperText, nextProps.helperText) && objectsDeepEqual(prevProps.heading, nextProps.heading) && objectsDeepEqual(prevProps.description, nextProps.description) && objectsDeepEqual(prevProps.readOnly, nextProps.readOnly) && objectsDeepEqual(prevProps.requiredFields, nextProps.requiredFields) && objectsDeepEqual(prevProps.maskedFields, nextProps.maskedFields) && objectsDeepEqual(prevProps.optionalFields, nextProps.optionalFields) && objectsDeepEqual(prevProps.readOnlyFields, nextProps.readOnlyFields) && objectsDeepEqual(prevProps.shouldValidate, nextProps.shouldValidate) && objectsDeepEqual(prevProps.formVerificationErrors, nextProps.formVerificationErrors) && objectsDeepEqual(prevProps.fieldValidationErrors, nextProps.fieldValidationErrors) && prevProps.country === nextProps.country && prevProps.legalCompanyName === nextProps.legalCompanyName && prevProps.companyType === nextProps.companyType);
+const CompanyOtherDetailsComponent = memo(CompanyOtherDetails, (prevProps, nextProps) => objectsDeepEqual(prevProps.data, nextProps.data) && objectsDeepEqual(prevProps.labels, nextProps.labels) && objectsDeepEqual(prevProps.placeholders, nextProps.placeholders) && objectsDeepEqual(prevProps.helperText, nextProps.helperText) && objectsDeepEqual(prevProps.formVerificationErrors, nextProps.formVerificationErrors) && objectsDeepEqual(prevProps.fieldValidationErrors, nextProps.fieldValidationErrors) && prevProps.heading === nextProps.heading && prevProps.description === nextProps.description && prevProps.requiredFields === nextProps.requiredFields && prevProps.maskedFields === nextProps.maskedFields && prevProps.optionalFields === nextProps.optionalFields && prevProps.readOnlyFields === nextProps.readOnlyFields && prevProps.shouldValidate === nextProps.shouldValidate && prevProps.readOnly === nextProps.readOnly && prevProps.country === nextProps.country && prevProps.legalCompanyName === nextProps.legalCompanyName && prevProps.companyType === nextProps.companyType && prevProps.kompanyVerifiedData === nextProps.kompanyVerifiedData);
 const CompanyStructureComponent$1 = "";
 const CompanyStructureValidation = {
   entityType: {
@@ -24997,7 +25092,8 @@ function CompanyStructure({
   description: description2,
   formVerificationErrors,
   fieldValidationErrors,
-  requiredFields
+  requiredFields,
+  kompanyVerifiedData
 }) {
   const {
     i18n
@@ -25023,6 +25119,12 @@ function CompanyStructure({
     labels: labels2,
     requiredFields
   }, i18n);
+  useEffect(() => {
+    var _a, _b;
+    if ((_a = kompanyVerifiedData == null ? void 0 : kompanyVerifiedData.companyStructure) == null ? void 0 : _a.entityType) {
+      handleChangeFor("entityType")((_b = kompanyVerifiedData == null ? void 0 : kompanyVerifiedData.companyStructure) == null ? void 0 : _b.entityType);
+    }
+  }, [kompanyVerifiedData]);
   useEffect(() => {
     updateStateSlice({
       schema: formSchema,
@@ -25060,7 +25162,7 @@ function CompanyStructure({
     })]
   });
 }
-const CompanyStructureComponent = memo(CompanyStructure, (prevProps, nextProps) => objectsDeepEqual(prevProps.data, nextProps.data) && objectsDeepEqual(prevProps.labels, nextProps.labels) && objectsDeepEqual(prevProps.heading, nextProps.heading) && objectsDeepEqual(prevProps.description, nextProps.description) && objectsDeepEqual(prevProps.formVerificationErrors, nextProps.formVerificationErrors) && objectsDeepEqual(prevProps.fieldValidationErrors, nextProps.fieldValidationErrors) && objectsDeepEqual(prevProps.requiredFields, nextProps.requiredFields));
+const CompanyStructureComponent = memo(CompanyStructure, (prevProps, nextProps) => objectsDeepEqual(prevProps.data, nextProps.data) && objectsDeepEqual(prevProps.labels, nextProps.labels) && objectsDeepEqual(prevProps.heading, nextProps.heading) && objectsDeepEqual(prevProps.description, nextProps.description) && objectsDeepEqual(prevProps.formVerificationErrors, nextProps.formVerificationErrors) && objectsDeepEqual(prevProps.fieldValidationErrors, nextProps.fieldValidationErrors) && objectsDeepEqual(prevProps.requiredFields, nextProps.requiredFields) && prevProps.kompanyVerifiedData === nextProps.kompanyVerifiedData);
 const forms = {
   companyBasics: {
     formId: "companyBasics",
@@ -25097,32 +25199,40 @@ const forms = {
     fields: ["taxDocument"]
   }
 };
-const parseConfiguration$2 = ({
+const parseConfiguration$4 = ({
   country: country2,
   matchingScenario
 }) => parseCompanySearchScenarios(matchingScenario == null ? void 0 : matchingScenario[LegalEntityType.ORGANIZATION], country2);
 const mandatoryApiFieldsForCompanySearch = ["companyBasics.legalCompanyName", "companyBasics.country"];
-const canSubmit = (data) => mandatoryApiFieldsForCompanySearch.every((detail) => {
+const canSubmit$1 = (data) => mandatoryApiFieldsForCompanySearch.every((detail) => {
   const value = getProp(data, detail);
   return !isEmpty$1(value);
 });
-const isDocumentsRequired = (forms$1) => forms$1.some((form) => [forms.companyRegistrationDocument.formId, forms.companyTaxDocument.formId].includes(form.formId));
-const formatOtherDetails = (formData, i18n) => {
+const isDocumentsRequired$1 = (forms$1) => forms$1.some((form) => [forms.companyRegistrationDocument.formId, forms.companyTaxDocument.formId].includes(form.formId));
+const formatOtherDetails = (formData, i18n, country2, labels2) => {
+  var _a, _b, _c;
+  const summaryData = {
+    ...formData,
+    [((_a = labels2 == null ? void 0 : labels2.companyOtherDetails) == null ? void 0 : _a.taxInformation) ?? "taxId"]: (_c = (_b = formData.taxInformation) == null ? void 0 : _b.find((taxId2) => country2 === taxId2.country)) == null ? void 0 : _c.number
+  };
+  if (formData.taxInformation) {
+    delete summaryData.taxInformation;
+  }
   if (formData.exemptedFromVat) {
-    const summaryData = {
-      ...formData,
-      "VAT absence reason": i18n.get(formData.vatAbsenceReason)
-    };
-    delete summaryData.vatAbsenceReason;
+    summaryData.vatAbsenceReason = i18n.get(formData.vatAbsenceReason);
     delete summaryData.vatNumber;
-    return summaryData;
   }
-  return formData;
+  return summaryData;
 };
-const formatDataForSummary = (data, forms2, i18n) => {
+const formatDataForSummary = (data, forms2, labels2, i18n) => {
+  var _a;
   const datasetUtils = datasetUtilities(i18n.locale);
+  const country2 = (_a = data.companyBasics) == null ? void 0 : _a.country;
+  const taxIdLabel = resolveFieldMetadata(defaultFieldConfig[country2], {
+    taxIdNumberType: countryToTaxInfoTypeMap[country2]
+  }, defaultFieldMetadata).label;
   return entriesOf(data).reduce((summaryData, [form, formData]) => {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j;
     if (!form)
       return summaryData;
     switch (form) {
@@ -25130,10 +25240,10 @@ const formatDataForSummary = (data, forms2, i18n) => {
         return {
           ...summaryData,
           [form]: {
-            legalCompanyName: formData.legalCompanyName,
-            country: datasetUtils.getCountryName(formData.country),
+            [((_a2 = labels2 == null ? void 0 : labels2.companyBasics) == null ? void 0 : _a2.legalCompanyName) ?? "legalCompanyName"]: formData.legalCompanyName,
+            [((_b = labels2 == null ? void 0 : labels2.companyBasics) == null ? void 0 : _b.country) ?? "country"]: datasetUtils.getCountryName(formData.country),
             [getKeyForField("stateOrProvince", formData.country)]: datasetUtils.getStateName(formData.stateOrProvince, formData.country),
-            taxInformationNumber: (_b = (_a = formData.taxInformation) == null ? void 0 : _a.find((taxId2) => formData.country === taxId2.country)) == null ? void 0 : _b.number
+            [taxIdLabel]: (_d = (_c = formData.taxInformation) == null ? void 0 : _c.find((taxId2) => formData.country === taxId2.country)) == null ? void 0 : _d.number
           }
         };
       case "companyRegistrationAddress":
@@ -25149,33 +25259,33 @@ const formatDataForSummary = (data, forms2, i18n) => {
         return {
           ...summaryData,
           [form]: {
-            entityType: i18n.get((_c = companyTypes.find((type) => type.id === formData.entityType)) == null ? void 0 : _c.name)
+            entityType: i18n.get((_e = companyTypes.find((type) => type.id === formData.entityType)) == null ? void 0 : _e.name)
           }
         };
       case "companyOtherDetails":
         return {
           ...summaryData,
-          [form]: formatOtherDetails(formData, i18n)
+          [form]: formatOtherDetails(formData, i18n, (_f = data.companyBasics) == null ? void 0 : _f.country, labels2)
         };
       case "companyRegistrationDocument":
-        if (!isDocumentsRequired(forms2))
+        if (!isDocumentsRequired$1(forms2))
           return summaryData;
         return {
           ...summaryData,
           [form]: {
             companyRegistrationDocument: {
-              fileName: (_e = (_d = formData == null ? void 0 : formData.registrationDocument) == null ? void 0 : _d[0]) == null ? void 0 : _e.name
+              fileName: (_h = (_g = formData == null ? void 0 : formData.registrationDocument) == null ? void 0 : _g[0]) == null ? void 0 : _h.name
             }
           }
         };
       case "companyTaxDocument":
-        if (!isDocumentsRequired(forms2))
+        if (!isDocumentsRequired$1(forms2))
           return summaryData;
         return {
           ...summaryData,
           [form]: {
             companyTaxDocument: {
-              fileName: (_g = (_f = formData == null ? void 0 : formData.taxDocument) == null ? void 0 : _f[0]) == null ? void 0 : _g.name
+              fileName: (_j = (_i = formData == null ? void 0 : formData.taxDocument) == null ? void 0 : _i[0]) == null ? void 0 : _j.name
             }
           }
         };
@@ -25335,7 +25445,7 @@ function useCompanySearchTaskSubmit({
     legalEntity,
     currentForms
   }) => {
-    if (!isDocumentsRequired(currentForms))
+    if (!isDocumentsRequired$1(currentForms))
       return;
     const formattedDocument = await mapCompanySearchDocumentToApiDocument(data, legalEntity.id);
     try {
@@ -25446,6 +25556,7 @@ function CompanySearchComponent(props) {
   } = useI18nContext();
   const {
     country: country2,
+    isTopLevelEntity,
     activeForm,
     problems,
     handleAddressSearch,
@@ -25458,6 +25569,7 @@ function CompanySearchComponent(props) {
   } = props;
   const globalData = useGlobalData();
   const [kompanyAddress, setKompanyAddress] = useState();
+  const [kompanyVerifiedData, setKompanyVerifiedData] = useState();
   const formWrapperClasses = (formId) => (activeForm == null ? void 0 : activeForm.formId) !== formId ? "adyen-kyc-form-wrapper adyen-kyc-form-wrapper--hidden" : "adyen-kyc-form-wrapper";
   return jsxs("div", {
     className: "adyen-kyc-company",
@@ -25468,13 +25580,15 @@ function CompanySearchComponent(props) {
         id: forms.companyBasics.formId,
         heading: i18n.get(forms.companyBasics.formName),
         country: country2,
+        isTopLevelEntity,
         handleCompanyIndexSearch,
         handleCompanyDeepSearch,
         handleGetCompanyDataset,
         handleRefreshCompanyDataset,
         handleVerifyTin,
         kompanyAddress,
-        setKompanyAddress
+        setKompanyAddress,
+        setKompanyVerifiedData
       })
     }), jsx("div", {
       className: formWrapperClasses(forms.companyRegistrationAddress.formId),
@@ -25497,7 +25611,8 @@ function CompanySearchComponent(props) {
         ...getFormProps(props, forms.companyStructure.formId),
         id: forms.companyStructure.formId,
         heading: i18n.get(forms.companyStructure.formName),
-        description: i18n.get(forms.companyStructure.formDescription)
+        description: i18n.get(forms.companyStructure.formDescription),
+        kompanyVerifiedData
       })
     }), jsx("div", {
       className: formWrapperClasses(forms.companyOtherDetails.formId),
@@ -25507,7 +25622,8 @@ function CompanySearchComponent(props) {
         heading: i18n.get(forms.companyOtherDetails.formName),
         country: country2,
         legalCompanyName: (_a = globalData == null ? void 0 : globalData.companyBasics) == null ? void 0 : _a.legalCompanyName,
-        companyType: (_b = globalData == null ? void 0 : globalData.companyStructure) == null ? void 0 : _b.entityType
+        companyType: (_b = globalData == null ? void 0 : globalData.companyStructure) == null ? void 0 : _b.entityType,
+        kompanyVerifiedData
       })
     }), jsx("div", {
       className: formWrapperClasses(forms.companyRegistrationDocument.formId),
@@ -25652,13 +25768,13 @@ function CompanySearchDropinComponent({
   }, [documentUtils, eventEmitter, i18n, initialData, legalEntityResponse, setLocale, showToast]);
   const getConfigurationData = useCallback(() => getConfiguration2({
     legalEntityType: LegalEntityType.ORGANIZATION,
-    capabilities: capabilities ?? [],
+    capabilities: capabilities ?? Object.keys(legalEntityResponse == null ? void 0 : legalEntityResponse.capabilities),
     country: country2
-  }), [getConfiguration2, capabilities, country2]);
+  }), [getConfiguration2, capabilities, country2, legalEntityResponse == null ? void 0 : legalEntityResponse.capabilities]);
   const {
     fieldConfigurations
   } = useScenarioConfiguration({
-    parseConfiguration: parseConfiguration$2,
+    parseConfiguration: parseConfiguration$4,
     getConfigurationData,
     setLoadingStatus,
     country: country2
@@ -25694,10 +25810,10 @@ function CompanySearchDropinComponent({
     return addValidityToForms(requiredForms, currentState.validityByForm, problems);
   }, [derivedProps, problems, currentState.validityByForm]);
   const summaryData = useMemo(() => ({
-    data: formatDataForSummary(currentState.data, forms$1, i18n),
+    data: formatDataForSummary(currentState.data, forms$1, derivedProps == null ? void 0 : derivedProps.labels, i18n),
     omittedKeys: ["operationalAddressIsSame"]
-  }), [currentState.data, forms$1, i18n]);
-  const canSubmitForm = useMemo(() => canSubmit(currentState.data) && hasDataChanged(initialData, currentState.data), [initialData, currentState.data]);
+  }), [currentState.data, derivedProps == null ? void 0 : derivedProps.labels, forms$1, i18n]);
+  const canSubmitForm = useMemo(() => canSubmit$1(currentState.data) && hasDataChanged(initialData, currentState.data), [initialData, currentState.data]);
   const baseTrackingPayload = useMemo(() => getBaseTrackingPayload({
     trackingConfig,
     parentLegalEntity,
@@ -25769,6 +25885,7 @@ function CompanySearchDropinComponent({
       problems,
       activeForm,
       shouldValidate,
+      isTopLevelEntity: taskType === TaskTypes.COMPANY_SEARCH,
       handleAddressSearch,
       handleFindAddress,
       handleCompanyIndexSearch,
@@ -28036,7 +28153,7 @@ const omitMaskedFieldsIfUnchanged = (maskedFields, dataSubmitted, savedData) =>
   });
   return filtered;
 };
-const parseConfiguration$1 = ({
+const parseConfiguration$3 = ({
   country: country2,
   matchingScenario
 }) => parseIndividualScenarios(matchingScenario == null ? void 0 : matchingScenario[LegalEntityType.INDIVIDUAL], country2);
@@ -28120,7 +28237,7 @@ function IndividualDropinComponent({
   const {
     fieldConfigurations
   } = useScenarioConfiguration({
-    parseConfiguration: parseConfiguration$1,
+    parseConfiguration: parseConfiguration$3,
     getConfigurationData,
     setLoadingStatus,
     country: country2
@@ -28592,14 +28709,14 @@ const rules$1 = ({
   }
 });
 const getRegistrationCountry = (legalEntityResponse) => legalEntityResponse.type === LegalEntityType.INDIVIDUAL ? legalEntityResponse.individual.residentialAddress.country : legalEntityResponse.organization.registeredAddress.country;
-const labels$1 = () => ({
+const labels = () => ({
   verifiedAccountHolder: () => "accountHolder",
   verifiedBankCountry: () => "bankCountry",
   verifiedBankName: () => "bankName",
   verifiedCurrencyCode: () => "currencyCode",
   verifiedBankAccountNumber: () => "bankAccountNumber"
 });
-const parseConfiguration = ({
+const parseConfiguration$2 = ({
   requiredFields,
   country: country2,
   bankVerificationAvailable
@@ -28725,7 +28842,7 @@ function PayoutDetailsDropinComponent({
     requiredFields,
     bankVerificationVendors
   } = useScenarioConfiguration({
-    parseConfiguration,
+    parseConfiguration: parseConfiguration$2,
     getConfigurationData,
     getPayoutAccountFormatData,
     instantVerificationEnabled,
@@ -28739,7 +28856,7 @@ function PayoutDetailsDropinComponent({
     taskType,
     requiredFields
   }), [bankAccountCountry2, data, taskType]);
-  const fieldsFormCustomLabels = useMemo(() => labels$1 ? labels$1() : {}, [data, bankAccountCountry2]);
+  const fieldsFormCustomLabels = useMemo(() => labels ? labels() : {}, [data, bankAccountCountry2]);
   const payoutDetailsSteps = useMemo(() => {
     var _a2;
     return getAppropriatePayoutDetailsSteps(taskType, Boolean((_a2 = prefilledData == null ? void 0 : prefilledData.payoutAccountDetails) == null ? void 0 : _a2.transferInstrumentId), !transferInstrument && isInstantVerificationAvailable({
@@ -30202,668 +30319,61 @@ function ServiceAgreementDropinComponent({
     })
   });
 }
-function removeObjectPropsWithEmptyValues(obj) {
-  keysOf(obj).forEach((key) => {
-    if (obj[key] === null || isEmpty(obj[key]))
-      delete obj[key];
-  });
-  return obj;
-}
-const INITIAL_STATE = {
-  data: {},
-  allData: {},
-  initialData: {},
-  errors: {},
-  valid: {},
-  fieldProblems: {},
-  isValid: false
-};
-function StateReducer() {
-  const [schemas, setSchemas] = useState({});
-  const [activeForms, setActiveForms] = useState([]);
-  const setCurrentForms = (forms2) => {
-    setActiveForms(forms2);
+const parseConfiguration$1 = ({
+  matchingScenario,
+  country: country2
+}) => parseSolePropScenarios(matchingScenario[LegalEntityType.SOLE_PROPRIETORSHIP], country2);
+const isDocumentsRequired = (forms2) => forms2.some((form) => [solePropForms.solePropConstitutionalDocument.formId].includes(form.formId));
+const formatFileSummaryData = (solePropConstitutionalDocument) => {
+  var _a;
+  const constitutionalDocument2 = (_a = solePropConstitutionalDocument == null ? void 0 : solePropConstitutionalDocument.constitutionalDocument) == null ? void 0 : _a[0];
+  return {
+    ...constitutionalDocument2 && {
+      solePropConstitutionalDocument: {
+        fileName: constitutionalDocument2.name
+      }
+    }
   };
-  function reducer2({
-    currentState: currState
-  }, action) {
-    var _a, _b, _c, _d, _e;
-    switch (action.type) {
-      case "addToState": {
-        const state2 = structuredClone(currState);
-        const dataStoreId = action.value.dataStoreId ?? action.value.caller;
-        const schema = action.value.schema || null;
-        const schemaHasChanged = schema && ((_a = schemas == null ? void 0 : schemas[dataStoreId]) == null ? void 0 : _a.toString()) !== schema.toString();
-        const mergedState = {
-          ...state2,
-          data: {
-            ...state2.data,
-            [dataStoreId]: {
-              ...state2.data[dataStoreId],
-              ...action.value.data
-            }
-          },
-          // Add data in allData state prop in case we will need them later
-          allData: {
-            ...state2.allData,
-            [dataStoreId]: {
-              ...state2.allData[dataStoreId],
-              ...removeObjectPropsWithEmptyValues(action.value.data)
-            }
-          },
-          errors: {
-            ...state2.errors,
-            [dataStoreId]: {
-              ...state2.errors[dataStoreId],
-              ...action.value.errors
-            }
-          },
-          valid: {
-            ...state2.valid,
-            [dataStoreId]: {
-              ...state2.valid[dataStoreId],
-              ...action.value.valid
-            }
-          },
-          fieldProblems: {
-            ...state2.fieldProblems,
-            [dataStoreId]: {
-              ...state2.fieldProblems[dataStoreId],
-              ...action.value.fieldProblems
-            }
-          }
-        };
-        if (schemaHasChanged) {
-          setSchemas({
-            ...schemas,
-            [dataStoreId]: schema
-          });
-          const processedBySchema = schema.reduce((acc, fieldKey) => {
-            const dataObjByFormId = mergedState.data[dataStoreId];
-            const allDataObjByFormId = mergedState.allData[dataStoreId];
-            const validObjByFormId = mergedState.valid[dataStoreId];
-            const errorsObjByFormId = mergedState.errors[dataStoreId];
-            const fieldProblemsObjByFormId = mergedState.fieldProblems[dataStoreId];
-            return {
-              data: {
-                ...acc.data,
-                [fieldKey]: dataObjByFormId[fieldKey] ?? allDataObjByFormId[fieldKey]
-              },
-              valid: {
-                ...acc.valid,
-                [fieldKey]: validObjByFormId[fieldKey]
-              },
-              errors: {
-                ...acc.errors,
-                [fieldKey]: errorsObjByFormId[fieldKey]
-              },
-              fieldProblems: {
-                ...acc.fieldProblems,
-                [fieldKey]: fieldProblemsObjByFormId[fieldKey]
-              }
-            };
-          }, {
-            data: {},
-            valid: {},
-            errors: {},
-            fieldProblems: {}
-          });
-          mergedState.data[dataStoreId] = processedBySchema.data;
-          mergedState.valid[dataStoreId] = processedBySchema.valid;
-          mergedState.errors[dataStoreId] = processedBySchema.errors;
-          mergedState.fieldProblems[dataStoreId] = processedBySchema.fieldProblems;
-        }
-        mergedState.validityByForm = {
-          ...mergedState.validityByForm,
-          [dataStoreId]: Object.values(mergedState.valid[dataStoreId]).every((isValid) => isValid)
-        };
-        mergedState.hasDataChanged = {
-          ...state2.hasDataChanged,
-          [dataStoreId]: {
-            hasDataChanged: hasDataChanged((_b = state2.initialData) == null ? void 0 : _b[dataStoreId], (_c = mergedState.data) == null ? void 0 : _c[dataStoreId])
-          }
-        };
-        mergedState.hasAnyDataChanged = Object.values(mergedState.hasDataChanged).some(({
-          hasDataChanged: hasDataChanged2
-        }) => hasDataChanged2);
-        mergedState.allValid = Object.values(mergedState.validityByForm).every((isValid) => isValid);
-        mergedState.isValid = !activeForms.length ? mergedState.allValid : activeForms.every((item) => mergedState.validityByForm[item]);
-        mergedState.initialData = structuredClone(state2.initialData);
-        return {
-          currentState: mergedState,
-          prevState: state2,
-          changeInitiatedBy: dataStoreId
-        };
-      }
-      case "resetState": {
-        const dataStoreId = ((_d = action.value) == null ? void 0 : _d.dataStoreId) ?? ((_e = action.value) == null ? void 0 : _e.caller);
-        return {
-          currentState: INITIAL_STATE,
-          prevState: currState,
-          changeInitiatedBy: dataStoreId
-        };
-      }
-      default: {
-        throw new Error(`Unhandled action type: ${action.type}`);
-      }
-    }
-  }
-  return {
-    reducer: reducer2,
-    setCurrentForms
-  };
-}
-function StateProvider({
-  defaultData = {},
-  children
-}) {
-  const defaultState = {
-    currentState: {
-      data: defaultData,
-      allData: defaultData,
-      valid: {},
-      errors: {},
-      fieldProblems: {},
-      validityByForm: {},
-      initialData: defaultData
-    },
-    prevState: {},
-    changeInitiatedBy: null
-  };
-  const reducerObj = StateReducer();
-  const [state2, dispatch] = useReducer(reducerObj.reducer, defaultState);
-  const contextValue = useMemo(() => ({
-    state: state2,
-    dispatch,
-    setActiveForms: reducerObj.setCurrentForms,
-    getData: () => {
-      var _a;
-      return ((_a = state2 == null ? void 0 : state2.currentState) == null ? void 0 : _a.data) ?? {};
-    },
-    getState: () => state2 == null ? void 0 : state2.currentState
-  }), [reducerObj, state2]);
-  return jsx(StateContext.Provider, {
-    value: contextValue,
-    children
-  });
-}
-const labels = (data, country2) => ({
-  registrationNumber: () => {
-    var _a;
-    if (country2 === CountryCodes.Monaco && ((_a = data == null ? void 0 : data.solePropNameAndCountry) == null ? void 0 : _a.country) === CountryCodes.Monaco) {
-      return "mcRegistrationNumberSoleProp";
-    }
-  }
-});
-const fontFormats = ["eot", "woff", "woff2", "ttf", "otf"];
-const formatFullNames = {
-  eot: "embedded-opentype",
-  woff: "woff",
-  woff2: "woff2",
-  ttf: "truetype",
-  otf: "opentype"
-};
-const getFontFaceRule = (fontFamily, fontStyle, fontWeight, fontPath, formats) => {
-  const fontSources = formats.map((format) => `url(${fontPath}.${format}) format(${formatFullNames[format]})`);
-  const ruleLines = [`font-family: '${fontFamily}'`, `font-style: ${fontStyle}`, `font-weight: ${fontWeight}`, `src: ${fontSources.join(",")}`];
-  return `@font-face {${ruleLines.join(";")}}`;
-};
-const addStyleTagForFont = (fontFamily, fontStyle, fontWeight, fontPath, formats) => {
-  const style = document.createElement("style");
-  style.setAttribute("type", "text/css");
-  style.innerText = getFontFaceRule(fontFamily, fontStyle, fontWeight, fontPath, formats);
-  document.head.insertBefore(style, document.head.firstChild);
-};
-const addStyleTagForADLIconFont = (loadingContext) => {
-  const fontPath = `${loadingContext}static/fonts`;
-  const iconFontPath = `${fontPath}/adyen-kyc-icons`;
-  addStyleTagForFont("adyen-kyc-icons", "normal", "normal", iconFontPath, fontFormats);
-};
-let isFlagsLoaded = false;
-let isDocumentGuidanceLoaded = false;
-const getIconContainer = () => {
-  const container = document.createElement("div");
-  container.setAttribute("aria-hidden", "true");
-  container.setAttribute("id", "adl-icon-container");
-  container.style.height = "0";
-  return container;
-};
-const buildSpriteDOMFromResponse = (responseData) => {
-  const iconContainer = getIconContainer();
-  iconContainer.innerHTML = responseData;
-  return iconContainer;
-};
-const loadFlags = async (loadingContext) => {
-  if (isFlagsLoaded)
-    return;
-  isFlagsLoaded = true;
-  const responseData = await http({
-    loadingContext,
-    path: "static/images/country-flags.svg"
-  }, null, "text");
-  document.body.insertBefore(buildSpriteDOMFromResponse(responseData), document.body.firstChild);
-};
-const loadDocumentGuidance = async (loadingContext) => {
-  if (isDocumentGuidanceLoaded)
-    return;
-  isDocumentGuidanceLoaded = true;
-  const responseData = await http({
-    loadingContext,
-    path: "static/images/document-guidance.svg"
-  }, null, "text");
-  document.body.insertBefore(buildSpriteDOMFromResponse(responseData), document.body.firstChild);
 };
-const getOpeningStep = (forms2, remediationActions) => {
+const canSubmit = (data) => mandatoryApiFields.SOLE_PROPRIETORSHIP.every((detail) => {
+  const value = getProp(data, detail);
+  return !isEmpty(value);
+});
+const hasRegisteredAddress = (dataFromResponse) => {
   var _a;
-  if (remediationActions && Object.keys(remediationActions).length > 0) {
-    const allRemediationActions = Object.values(remediationActions).flat().filter((rem) => {
-      var _a2;
-      return ((_a2 = rem.forms) == null ? void 0 : _a2.length) > 0;
-    });
-    if (allRemediationActions.length === 1 && ((_a = allRemediationActions[0]) == null ? void 0 : _a.forms.length) === 1) {
-      const form = forms2.find((form2) => {
-        var _a2;
-        return (form2 == null ? void 0 : form2.formId) === ((_a2 = allRemediationActions[0]) == null ? void 0 : _a2.forms[0]);
-      });
-      if (form)
-        return form;
-    }
-    return forms2[forms2.length - 1];
-  }
-  return forms2[0];
+  const registeredAddress2 = ((_a = dataFromResponse == null ? void 0 : dataFromResponse.solePropRegistrationAddress) == null ? void 0 : _a.registrationAddress) || {};
+  return Object.entries(registeredAddress2).some(([key, value]) => key !== "country" && Boolean(value));
+};
+const getDataWithDefaultAddress = (legalEntityResponse, parentLegalEntity) => {
+  var _a;
+  let solePropData = mapLegalEntityToSoleProp(legalEntityResponse);
+  if (!hasRegisteredAddress(solePropData)) {
+    const defaultAddress = (_a = mapLegalEntityToIndividual(parentLegalEntity, false)) == null ? void 0 : _a.address;
+    solePropData = {
+      ...solePropData,
+      solePropRegistrationAddress: {
+        ...solePropData == null ? void 0 : solePropData.solePropRegistrationAddress,
+        registrationAddress: {
+          ...defaultAddress
+        }
+      }
+    };
+  }
+  return solePropData;
 };
-function withFormComposer(WrappedComponent, {
-  getComponentForms,
-  parseConfiguration: parseConfiguration2,
-  rules: rules2,
-  labels: labels2,
-  defaultTaskName,
-  getConfigFor = "contextCountry"
-}) {
-  const WithFormComposer = (props) => {
-    var _a, _b, _c, _d;
-    const {
-      i18n
-    } = useI18nContext();
-    const {
-      contextCountry: initialContextCountry,
-      setContextCountry: setInitialContextCountry
-    } = useCoreContext();
-    const {
-      loadingContext
-    } = useAuthContext();
-    const {
-      getConfiguration: getConfiguration2,
-      getPayoutAccountFormat: getPayoutAccountFormat2
-    } = useConfigurationApi();
-    const {
-      isSettingEnabled
-    } = useSettingsContext();
-    const {
-      getData,
-      getState
-    } = useStateContext();
-    const {
-      getOmittedKeys: getSummaryOmittedKeys = null,
-      formatData: formatDataForSummary2 = null,
-      omittedForms
-    } = props.summary || {};
-    const taskName = props.taskName ?? defaultTaskName;
-    const [hideDropinLayout, setHideDropinLayout] = useState(false);
-    const [hideNavigation, setHideNavigation] = useState(false);
-    const [hideFooter, setHideFooter] = useState(false);
-    const [hideOnHomeButton, setHideOnHomeButton] = useState(false);
-    const [hideBackButton, setHideBackButton] = useState(false);
-    const [submitButtonLabel, setSubmitButtonLabel] = useState(null);
-    const [skipSubmitAndGoTaskList, setSkipSubmitAndGoTaskList] = useState(false);
-    const [customFormNavigationHandlers, setCustomFormNavigationHandlers] = useState({});
-    const [shouldValidate, setShouldValidate] = useState(false);
-    const [formValidity, setFormValidity] = useState({});
-    const formRef = useRef(null);
-    const [loadingStatus, setLoadingStatus] = useState("success");
-    const [derivedProps, setDerivedProps] = useState(props);
-    const [contextCountry, setContextCountry] = useState(props.country || initialContextCountry);
-    const {
-      sliceData: payoutMethodData
-    } = useGlobalDataSlice("payoutVerificationMethod");
-    const configCountry = (getConfigFor === "bankCountry" ? payoutMethodData == null ? void 0 : payoutMethodData.bankCountry : contextCountry) ?? contextCountry;
-    useEffect(() => {
-      loadDocumentGuidance(loadingContext);
-    }, [loadingContext]);
-    const getConfigurationData = useCallback(() => getConfiguration2({
-      legalEntityType: props.legalEntityType,
-      capabilities: props.capabilities,
-      // for payout forms, we need to get config for the selected bankCountry, not necessarily the same as the residency/registration country
-      country: configCountry
-    }), [configCountry, props.capabilities, props.legalEntityType]);
-    const getPayoutAccountFormatData = useCallback(() => getPayoutAccountFormat2(configCountry), [configCountry]);
-    const {
-      fieldConfigurations,
-      requiredFields,
-      bankVerificationVendors
-    } = useScenarioConfiguration({
-      getConfigurationData,
-      getPayoutAccountFormatData,
-      parseConfiguration: parseConfiguration2,
-      country: configCountry,
-      instantVerificationEnabled: derivedProps.instantVerificationEnabled && derivedProps.handleGetBankVerificationVendors,
-      setLoadingStatus
-    });
-    const isFormStepVisible = (formId) => {
-      if (derivedProps.requiredFields || derivedProps.optionalFields) {
-        return !!derivedProps.requiredFields[formId] || !!derivedProps.optionalFields[formId];
-      }
-      return true;
-    };
-    const isFormSummaryStep = (form) => form.formId === summaryStep.formId;
-    const componentForms = useMemo(() => getComponentForms({
-      ...props,
-      bankVerificationVendors
-    }, isSettingEnabled), [bankVerificationVendors, isSettingEnabled, props]);
-    const componentFormsWithSummary = [...Object.values(componentForms), summaryStep];
-    const allowedForms = componentFormsWithSummary.filter((form) => isFormStepVisible(form.formId) || isFormSummaryStep(form));
-    const [activeForm, setActiveForm] = useState(getOpeningStep(allowedForms, (_a = props == null ? void 0 : props.problems) == null ? void 0 : _a.remediationActions));
-    const [hasAlreadyNavigatedForm, setHasAlreadyNavigatedForm] = useState(false);
-    const getFormIndex = (formId) => allowedForms.findIndex((form) => form.formId === formId);
-    const isFinalStep = getFormIndex(activeForm.formId) === allowedForms.length - 1;
-    const isFirstStep = getFormIndex(activeForm.formId) === 0;
-    useEffect(() => {
-      var _a2;
-      if (hasAlreadyNavigatedForm)
-        return;
-      const openingStep = getOpeningStep(allowedForms, (_a2 = props == null ? void 0 : props.problems) == null ? void 0 : _a2.remediationActions);
-      if (activeForm !== openingStep) {
-        setActiveForm(openingStep);
-      }
-    }, [activeForm, allowedForms, (_b = props == null ? void 0 : props.problems) == null ? void 0 : _b.remediationActions, hasAlreadyNavigatedForm]);
-    const evaluateConfiguration = useCallback((scenarioConfiguration, country2, formData, isSettingEnabled2, requiredFields2) => {
-      var _a2, _b2, _c2;
-      const fieldsFromCustomRules = rules2 ? rules2({
-        data: formData,
-        country: country2,
-        taskType: props.taskType,
-        isSettingEnabled: isSettingEnabled2,
-        requiredFields: requiredFields2
-      }) : {};
-      const fieldsFormCustomLabels = labels2 ? labels2(formData, country2) : {};
-      const scenarioProps = getPropsFromConfigurations(scenarioConfiguration, componentForms, ((_a2 = props == null ? void 0 : props.problems) == null ? void 0 : _a2.remediationActions) ? Object.values((_b2 = props == null ? void 0 : props.problems) == null ? void 0 : _b2.remediationActions) : [], ((_c2 = props.problems) == null ? void 0 : _c2.missingData) ?? [], props.legalEntityResponse ? getFieldsWithExistingData(props.legalEntityResponse) : [], fieldsFromCustomRules, fieldsFormCustomLabels);
-      setShouldValidate(false);
-      setDerivedProps({
-        ...props,
-        ...scenarioProps,
-        country: configCountry
-      });
-    }, [componentForms, configCountry, props]);
-    useEffect(() => {
-      if (!fieldConfigurations)
-        return;
-      evaluateConfiguration(fieldConfigurations, configCountry, getData(), isSettingEnabled, requiredFields);
-    }, [fieldConfigurations, configCountry, evaluateConfiguration, getData, isSettingEnabled, requiredFields]);
-    const trackNavigation2 = ({
-      fromForm,
-      toForm,
-      component
-    }) => {
-      userEvents.addEvent("Navigated form", {
-        segmentation: {
-          ...props == null ? void 0 : props.baseTrackingPayload,
-          component,
-          from: fromForm.formId,
-          fromLabel: i18n.get(fromForm.formName),
-          to: toForm.formId,
-          toLabel: i18n.get(toForm.formName)
-        }
-      });
-    };
-    const trackSectionCompletion = (form) => {
-      userEvents.addEvent("Completed form section", {
-        segmentation: {
-          ...props == null ? void 0 : props.baseTrackingPayload,
-          sectionName: form.formId
-        }
-      });
-    };
-    const gotoFormByFormIndex = (nextFormIndex) => {
-      if (formRef.current.verifyForm) {
-        formRef.current.verifyForm(activeForm.formId).then((isVerified) => {
-          if (isVerified) {
-            setHasAlreadyNavigatedForm(true);
-            setActiveForm(allowedForms[nextFormIndex]);
-          }
-        });
-      } else {
-        setHasAlreadyNavigatedForm(true);
-        setActiveForm(allowedForms[nextFormIndex]);
-      }
-    };
-    const validateCurrentForm = () => {
-      setShouldValidate(true);
-    };
-    const handleNextClick = () => {
-      var _a2, _b2;
-      if (formRef.current.customNavigationHandler) {
-        formRef.current.customNavigationHandler();
-        return;
-      }
-      if ((_a2 = customFormNavigationHandlers[activeForm.formId]) == null ? void 0 : _a2.onNext) {
-        (_b2 = customFormNavigationHandlers[activeForm.formId]) == null ? void 0 : _b2.onNext();
-        return;
-      }
-      const allFields = (derivedProps == null ? void 0 : derivedProps.allFields) || {};
-      if (isFormSummaryStep(activeForm)) {
-        if (skipSubmitAndGoTaskList) {
-          props.navigateBackToTaskList();
-        } else {
-          props.onSubmit({
-            data: getData(),
-            forms: allowedForms,
-            allFields,
-            setLoadingStatus
-          });
-        }
-        return;
-      }
-      if (formValidity[activeForm.formId]) {
-        if (isFinalStep) {
-          props.onSubmit({
-            data: getData(),
-            forms: allowedForms,
-            allFields,
-            setLoadingStatus
-          });
-          return;
-        }
-        setShouldValidate(false);
-        const toFormIndex = allowedForms.findIndex((form) => form.formId === activeForm.formId) + 1;
-        gotoFormByFormIndex(toFormIndex);
-        const toForm = allowedForms[toFormIndex];
-        trackNavigation2({
-          fromForm: activeForm,
-          toForm,
-          component: "ActionBar"
-        });
-        trackSectionCompletion(activeForm);
-      } else {
-        validateCurrentForm();
-      }
-    };
-    const handleBackClick = () => {
-      const currentFormIndex = allowedForms.findIndex((form) => form.formId === activeForm.formId);
-      if (currentFormIndex) {
-        const fromForm = allowedForms[currentFormIndex];
-        const toForm = allowedForms[currentFormIndex - 1];
-        setActiveForm(toForm);
-        setHasAlreadyNavigatedForm(true);
-        trackNavigation2({
-          fromForm,
-          toForm,
-          component: "ActionBar"
-        });
-      }
-    };
-    const setCustomHandlers = (formId, onNext, onBack) => {
-      setCustomFormNavigationHandlers({
-        ...customFormNavigationHandlers,
-        [formId]: {
-          onNext,
-          onBack
-        }
-      });
-    };
-    const nextButtonText = isFinalStep ? i18n.get(submitButtonLabel ?? "submit") : i18n.get("next");
-    useEffect(() => {
-      props.eventEmitter.on("next", handleNextClick);
-      props.eventEmitter.on("back", handleBackClick);
-      props.eventEmitter.on("validate", validateCurrentForm);
-      return () => {
-        props.eventEmitter.off("next", handleNextClick);
-        props.eventEmitter.off("back", handleNextClick);
-        props.eventEmitter.off("validate", validateCurrentForm);
-      };
-    }, [activeForm, allowedForms]);
-    const onCountryChange = (country2) => {
-      setContextCountry(country2);
-    };
-    const onWrappedComponentChange = (state2) => {
-      var _a2;
-      setFormValidity(state2.validityByForm);
-      (_a2 = props.onChange) == null ? void 0 : _a2.call(props, state2);
-    };
-    const handleStateChange = ({
-      currentState
-    }) => {
-      onWrappedComponentChange(currentState);
-    };
-    const handleLeaveDropin = async () => {
-      var _a2;
-      const data = getData();
-      const hasDataChanged2 = getState().hasAnyDataChanged;
-      if (hasDataChanged2 && ((_a2 = props.canSubmit) == null ? void 0 : _a2.call(props, data))) {
-        setInitialContextCountry(contextCountry);
-        const allFields = (derivedProps == null ? void 0 : derivedProps.allFields) || {};
-        await props.onSubmit({
-          data,
-          forms: allowedForms,
-          allFields,
-          setLoadingStatus
-        });
-      } else {
-        props.handleHomeClick();
-      }
-    };
-    const formFooter = !hideDropinLayout && !hideFooter && jsx(ActionBar, {
-      onNext: handleNextClick,
-      onBack: isFirstStep ? props.handleBackClick : handleBackClick,
-      backButtonLabel: i18n.get("back"),
-      nextButtonLabel: nextButtonText,
-      onHome: handleLeaveDropin,
-      homeButtonLabel: props.homeButtonLabel,
-      hideOnHomeButton,
-      hideBackButton
-    });
-    const wrappedComponent = jsx("div", {
-      className: "adyen-kyc-form-container",
-      children: jsx(LoaderWrapper, {
-        status: loadingStatus,
-        formOpacityWhenLoading: 0.3,
-        loaderSize: "large",
-        children: jsxs(FormRouterContextProvider, {
-          setFormIndex: gotoFormByFormIndex,
-          forms: allowedForms,
-          handleGetIdVerificationToken: props.handleGetIdVerificationToken,
-          children: [jsx(StateContextWatcher, {
-            owner: "FormComposer",
-            onChange: handleStateChange
-          }), jsx(WrappedComponent, {
-            ref: formRef,
-            forms: allowedForms,
-            activeForm,
-            ...derivedProps,
-            data: props.data,
-            onChange: onWrappedComponentChange,
-            evaluateConfiguration: (data) => evaluateConfiguration(fieldConfigurations, configCountry, data, isSettingEnabled, requiredFields),
-            country: contextCountry,
-            onCountryChange,
-            legalEntityId: (_c = props.legalEntityResponse) == null ? void 0 : _c.id,
-            problems: props == null ? void 0 : props.problems,
-            shouldValidate,
-            onNext: handleNextClick,
-            onBack: handleBackClick,
-            setHideDropinLayout,
-            setHideNavigation,
-            setHideFooter,
-            setCustomFormNavigationHandlers: setCustomHandlers,
-            setHideOnHomeButton,
-            setHideBackButton,
-            setSubmitButtonLabel,
-            setSkipSubmitAndGoTaskList,
-            bankVerificationVendors
-          }), activeForm.formId === summaryStep.formId && jsx("div", {
-            className: "adyen-kyc-form-wrapper",
-            children: jsx(Summary, {
-              trackNavigation: trackNavigation2,
-              data: formatDataForSummary2 ? formatDataForSummary2(getData(), allowedForms) : getData(),
-              omittedKeys: getSummaryOmittedKeys ? getSummaryOmittedKeys(getData()) : null,
-              omittedForms,
-              forms: allowedForms,
-              gotoForm: gotoFormByFormIndex,
-              labels: derivedProps.labels,
-              problems: props == null ? void 0 : props.problems
-            })
-          }), formFooter]
-        })
-      })
-    });
-    const allowedFormsWithValidity = addValidityToForms(allowedForms, formValidity, props.problems);
-    const sidebar = !hideDropinLayout && !hideNavigation && jsx(LoaderWrapper, {
-      status: loadingStatus,
-      formOpacityWhenLoading: 0.3,
-      showSpinner: false,
-      className: "adyen-kyc-dropin__sidebar-wrapper",
-      children: jsx(FormNavigation, {
-        forms: allowedFormsWithValidity,
-        activeForm: allowedFormsWithValidity.find((form) => form.formId === activeForm.formId),
-        gotoForm: gotoFormByFormIndex,
-        validateForm: validateCurrentForm,
-        taskName,
-        trackNavigation: trackNavigation2,
-        verificationErrors: (_d = props == null ? void 0 : props.problems) == null ? void 0 : _d.verificationErrors
-      })
-    });
-    const content = jsxs(Fragment, {
-      children: [sidebar, wrappedComponent]
-    });
-    if (!props.hideDropinLayout) {
-      return jsx(DropinLayout, {
-        content
-      });
-    }
-    return wrappedComponent;
-  };
-  return WithFormComposer;
-}
-const SolePropWithFormComposer = withFormComposer(SolePropComponent, {
-  getComponentForms: () => solePropForms,
-  // TODO: change trust to soleprop once the configurations for soleprops are added in backend.
-  parseConfiguration: ({
-    matchingScenario,
-    country: country2
-  }) => parseSolePropScenarios([matchingScenario[LegalEntityType.TRUST]], country2),
-  rules: rules$2,
-  labels,
-  defaultTaskName: "solePropDetails"
-});
 function SolePropDropinComponent({
   problems: problemsProp,
   capabilities,
-  country: country2,
+  country: externalCountry,
   parentLegalEntity,
   legalEntityResponse,
   eventEmitter,
   homeButtonLabel,
   hideDropinLayout,
-  onSubmit,
+  onSubmit: onExternalSubmit,
   onChange,
+  taskType,
+  trackingConfig,
   handleHomeClick,
   handleCreateDocument,
   handleGetDocument,
@@ -30873,7 +30383,7 @@ function SolePropDropinComponent({
   handleUpdateLegalEntity,
   handleCreateLegalEntity
 }) {
-  var _a;
+  var _a, _b;
   const {
     i18n,
     setLocale
@@ -30883,43 +30393,72 @@ function SolePropDropinComponent({
   } = useExperimentsContext();
   const [problems, setProblems] = useState(problemsProp);
   const datasetUtils = datasetUtilities(i18n.locale);
-  const getOmittedKeys = () => ["operationalAddressIsSame"];
   const [newSoleProp, setNewSoleProp] = useState(null);
   const {
-    showToast,
-    clearToasts
+    showToast
   } = useToastContext();
-  const hasRegisteredAddress = (dataFromResponse) => {
-    var _a2;
-    const registeredAddress2 = ((_a2 = dataFromResponse == null ? void 0 : dataFromResponse.solePropRegistrationAddress) == null ? void 0 : _a2.registrationAddress) || {};
-    return Object.entries(registeredAddress2).some(([key, value]) => key !== "country" && Boolean(value));
-  };
-  const getDataWithDefaultAddress = (legalEntityResponse2, parentLegalEntity2) => {
-    var _a2;
-    let solePropData = mapLegalEntityToSoleProp(legalEntityResponse2);
-    if (!hasRegisteredAddress(solePropData)) {
-      const defaultAddress = (_a2 = mapLegalEntityToIndividual(parentLegalEntity2, false)) == null ? void 0 : _a2.address;
-      solePropData = {
-        ...solePropData,
-        solePropRegistrationAddress: {
-          ...solePropData == null ? void 0 : solePropData.solePropRegistrationAddress,
-          registrationAddress: {
-            ...defaultAddress
-          }
-        }
-      };
+  const {
+    getConfiguration: getConfiguration2
+  } = useConfigurationApi();
+  const {
+    isSettingEnabled
+  } = useSettingsContext();
+  const [loadingStatus, setLoadingStatus] = useState("success");
+  const formRef = useRef(null);
+  const dataFromResponse = getDataWithDefaultAddress(legalEntityResponse, parentLegalEntity);
+  const [data, setData] = useState(dataFromResponse);
+  const country2 = ((_a = dataFromResponse == null ? void 0 : dataFromResponse.solePropRegistrationAddress) == null ? void 0 : _a.registrationAddress.country) || externalCountry;
+  const baseTrackingPayload = getBaseTrackingPayload({
+    trackingConfig,
+    parentLegalEntity,
+    legalEntity: legalEntityResponse,
+    task: taskType
+  });
+  const getConfigurationData = useCallback(() => getConfiguration2({
+    legalEntityType: LegalEntityType.SOLE_PROPRIETORSHIP,
+    capabilities,
+    country: country2
+  }), [country2, capabilities]);
+  const {
+    fieldConfigurations,
+    requiredFields
+  } = useScenarioConfiguration({
+    parseConfiguration: parseConfiguration$1,
+    getConfigurationData,
+    setLoadingStatus,
+    country: country2
+  });
+  const fieldsFromCustomRules = useMemo(() => rules$2({
+    data,
+    country: country2,
+    taskType,
+    requiredFields,
+    isSettingEnabled
+  }), [country2, data, taskType, requiredFields, isSettingEnabled]);
+  const derivedProps = useMemo(() => getPropsFromConfigurations(fieldConfigurations, solePropForms, (problems == null ? void 0 : problems.remediationActions) ? Object.values(problems == null ? void 0 : problems.remediationActions) : [], (problems == null ? void 0 : problems.missingData) ?? [], legalEntityResponse ? getFieldsWithExistingData(legalEntityResponse) : [], fieldsFromCustomRules), [fieldConfigurations, fieldsFromCustomRules, problems == null ? void 0 : problems.remediationActions]);
+  const {
+    state: {
+      currentState
     }
-    return solePropData;
-  };
-  const [data, setData] = useState(getDataWithDefaultAddress(legalEntityResponse, parentLegalEntity));
-  const isDocumentsRequired2 = (forms2) => forms2.some((form) => [solePropForms.solePropConstitutionalDocument.formId].includes(form.formId));
+  } = useStateContext();
+  const formValidity = currentState.validityByForm;
+  useEffect(() => {
+    setData({
+      ...currentState.data
+    });
+    onChange == null ? void 0 : onChange(currentState);
+  }, [currentState]);
+  const forms2 = useMemo(() => {
+    const requiredForms = getRequiredForms(solePropForms, derivedProps == null ? void 0 : derivedProps.requiredFields, derivedProps == null ? void 0 : derivedProps.optionalFields);
+    return addValidityToForms(requiredForms, formValidity, problems);
+  }, [derivedProps, formValidity, problems]);
   const documentUtils = documentApiUtils(handleCreateDocument, handleGetDocument, handleUpdateDocument);
   const submitDocuments = async ({
-    forms: forms2,
+    forms: forms22,
     legalEntity,
     dataSubmitted
   }) => {
-    if (isDocumentsRequired2(forms2)) {
+    if (isDocumentsRequired(forms22)) {
       const formattedDocument = await mapSolePropDocumentToApiDocument(dataSubmitted, legalEntity.id);
       if (formattedDocument) {
         await documentUtils.uploadDocuments(formattedDocument, legalEntity.id);
@@ -30974,11 +30513,8 @@ function SolePropDropinComponent({
     const updatedLegalEntity = await handleUpdateLegalEntity(drop("type").from(mappedLegalEntity), (legalEntityResponse == null ? void 0 : legalEntityResponse.id) || (newSoleProp == null ? void 0 : newSoleProp.id));
     return updatedLegalEntity;
   };
-  const handleOnSubmit = async ({
-    data: dataSubmitted,
-    forms: forms2,
-    setLoadingStatus
-  }) => {
+  const handleOnSubmit = async () => {
+    const dataSubmitted = data;
     setLoadingStatus("loading");
     try {
       const legalEntity = await handleSubmitLegalEntity(mapSolePropToLegalEntity(dataSubmitted));
@@ -30995,7 +30531,7 @@ function SolePropDropinComponent({
         label: i18n.get("successfullyUpdatedDetails"),
         type: ToastType.SUCCESS
       });
-      onSubmit(dataSubmitted);
+      onExternalSubmit == null ? void 0 : onExternalSubmit(dataSubmitted);
     } catch (e) {
       showToast({
         label: i18n.get("failedToUpdateDetails"),
@@ -31018,15 +30554,12 @@ function SolePropDropinComponent({
       setLoadingStatus("success");
     }
   };
-  const formatDataForSummary2 = (data2, forms2) => {
-    var _a2, _b, _c, _d;
+  const formatDataForSummary2 = (data2, forms22) => {
+    var _a2, _b2, _c, _d;
     let summaryData = cloneObject(data2);
-    let solePropCountry;
-    if ((_a2 = summaryData == null ? void 0 : summaryData.solePropNameAndCountry) == null ? void 0 : _a2.country) {
-      solePropCountry = datasetUtils.getCountryName(summaryData.solePropNameAndCountry.country);
-    }
+    const solePropCountry = ((_a2 = summaryData == null ? void 0 : summaryData.solePropNameAndCountry) == null ? void 0 : _a2.country) ? datasetUtils.getCountryName(summaryData.solePropNameAndCountry.country) : void 0;
     summaryData.solePropNameAndCountry = {
-      legalNameOfSoleProprietor: (_b = data2.solePropNameAndCountry) == null ? void 0 : _b.legalCompanyName,
+      legalNameOfSoleProprietor: (_b2 = data2.solePropNameAndCountry) == null ? void 0 : _b2.legalCompanyName,
       countryOfEstablishment: solePropCountry
     };
     if ((_c = summaryData == null ? void 0 : summaryData.solePropRegistrationAddress) == null ? void 0 : _c.registrationAddress) {
@@ -31036,53 +30569,62 @@ function SolePropDropinComponent({
     if ((_d = summaryData == null ? void 0 : summaryData.solePropRegistrationAddress) == null ? void 0 : _d.operationalAddress) {
       summaryData.solePropRegistrationAddress.operationalAddress = mapAddressLabels(summaryData == null ? void 0 : summaryData.solePropRegistrationAddress.operationalAddress, datasetUtils);
     }
-    if (isDocumentsRequired2(forms2)) {
+    if (isDocumentsRequired(forms22)) {
       delete summaryData[solePropDocumentFormId];
       summaryData = {
         ...summaryData,
-        ...formatFileSummaryData2(data2.solePropConstitutionalDocument)
+        ...formatFileSummaryData(data2.solePropConstitutionalDocument)
       };
     }
     return summaryData;
   };
-  const formatFileSummaryData2 = (solePropConstitutionalDocument) => {
-    var _a2;
-    const constitutionalDocument2 = (_a2 = solePropConstitutionalDocument == null ? void 0 : solePropConstitutionalDocument.constitutionalDocument) == null ? void 0 : _a2[0];
-    return {
-      ...constitutionalDocument2 && {
-        solePropConstitutionalDocument: {
-          fileName: constitutionalDocument2.name
-        }
-      }
-    };
-  };
-  const canSubmit2 = (data2) => mandatoryApiFields.SOLE_PROPRIETORSHIP.every((detail) => {
-    const value = getProp(data2, detail);
-    return !isEmpty(value);
+  const {
+    handleNextClick,
+    handleBackClick,
+    activeForm,
+    shouldValidate,
+    setShouldValidate,
+    gotoFormByFormIndex,
+    nextButtonLabel
+  } = useFormComposer({
+    problems,
+    baseTrackingPayload,
+    forms: forms2,
+    formRef,
+    onSubmit: handleOnSubmit
   });
-  return jsx(StateProvider, {
-    defaultData: data,
-    children: jsx(SolePropWithFormComposer, {
+  return jsx(FormWrapper, {
+    taskName: isExperimentEnabled("EnableNewEntryFlow") ? "soleProprietorshipDetails" : "solePropDetails",
+    handleBackClick,
+    handleNextClick,
+    gotoFormByFormIndex,
+    handleHomeClick,
+    hideDropinLayout,
+    nextButtonLabel,
+    homeButtonLabel,
+    loadingStatus,
+    forms: forms2,
+    activeForm,
+    onSubmit: handleOnSubmit,
+    validateForm: () => setShouldValidate(true),
+    canSubmit: canSubmit(data) && hasDataChanged(dataFromResponse, data),
+    baseTrackingPayload,
+    problems,
+    summary: {
+      data: formatDataForSummary2(data, forms2),
+      omittedKeys: ["operationalAddressIsSame"]
+    },
+    children: jsx(SolePropComponent, {
+      ...derivedProps,
+      activeForm,
       capabilities,
-      data,
-      country: ((_a = data == null ? void 0 : data.solePropNameAndCountry) == null ? void 0 : _a.country) || country2,
+      data: dataFromResponse,
+      country: ((_b = data == null ? void 0 : data.solePropNameAndCountry) == null ? void 0 : _b.country) || country2,
       problems,
-      eventEmitter,
-      hideDropinLayout,
-      legalEntityType: LegalEntityType.TRUST,
-      taskName: isExperimentEnabled("EnableNewEntryFlow") ? "soleProprietorshipDetails" : "solePropDetails",
-      legalEntityResponse,
-      summary: {
-        formatData: formatDataForSummary2,
-        getOmittedKeys
-      },
-      canSubmit: canSubmit2,
-      onChange,
-      onSubmit: handleOnSubmit,
-      handleHomeClick,
-      homeButtonLabel,
       handleAddressSearch,
-      handleFindAddress
+      handleFindAddress,
+      ref: formRef,
+      shouldValidate
     })
   });
 }
@@ -31109,53 +30651,99 @@ const rules = ({
     }
   }
 });
-const TrustWithFormComposer = withFormComposer(TrustComponent, {
-  getComponentForms: () => trustForms,
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  parseConfiguration: ({
-    matchingScenario,
-    country: country2
-  }) => parseTrustScenarios(matchingScenario == null ? void 0 : matchingScenario[LegalEntityType.TRUST], country2),
-  rules,
-  defaultTaskName: "trustDetails"
-});
-function TrustDropinComponent(props) {
-  const {
-    parentLegalEntity,
-    legalEntityResponse,
-    handleCreateDocument,
-    handleGetDocument,
-    handleUpdateDocument,
-    handleAddressSearch,
-    handleFindAddress
-  } = props;
+const parseConfiguration = ({
+  matchingScenario,
+  country: country2
+}) => parseTrustScenarios(matchingScenario == null ? void 0 : matchingScenario[LegalEntityType.TRUST], country2);
+function TrustDropinComponent({
+  parentLegalEntity,
+  capabilities,
+  country: country2,
+  legalEntityResponse,
+  handleCreateLegalEntity,
+  handleUpdateLegalEntity,
+  handleCreateDocument,
+  handleGetDocument,
+  handleUpdateDocument,
+  handleAddressSearch,
+  handleFindAddress,
+  trackingConfig,
+  taskType,
+  problems: problemsProp,
+  onSubmit: externalOnSubmit,
+  onChange,
+  hideDropinLayout,
+  handleHomeClick,
+  homeButtonLabel
+}) {
+  var _a;
   const {
     i18n
   } = useI18nContext();
   const dataFromResponse = mapLegalEntityToTrust(legalEntityResponse);
-  const [data] = useState(dataFromResponse || props.data);
-  const [problems, setProblems] = useState(props.problems);
+  const [data, setData] = useState(dataFromResponse);
+  const [problems, setProblems] = useState(problemsProp);
   const datasetUtils = datasetUtilities(i18n.locale);
-  const getOmittedKeys = () => ["operationalAddressIsSame"];
   const [newTrust, setNewTrust] = useState(null);
+  const {
+    getConfiguration: getConfiguration2
+  } = useConfigurationApi();
+  const {
+    isSettingEnabled
+  } = useSettingsContext();
   const {
     showToast,
     clearToasts
   } = useToastContext();
-  const onSubmit = async ({
-    data: data2,
+  const [loadingStatus, setLoadingStatus] = useState("success");
+  const formRef = useRef(null);
+  const getConfigurationData = useCallback(() => getConfiguration2({
+    legalEntityType: LegalEntityType.TRUST,
+    capabilities,
+    country: country2
+  }), [country2, capabilities]);
+  const {
+    fieldConfigurations,
+    requiredFields
+  } = useScenarioConfiguration({
+    parseConfiguration,
+    getConfigurationData,
     setLoadingStatus,
-    forms: forms2
-  }) => {
-    var _a;
+    country: country2
+  });
+  const fieldsFromCustomRules = useMemo(() => rules({
+    data,
+    country: country2,
+    taskType,
+    requiredFields,
+    isSettingEnabled
+  }), [country2, data, taskType, requiredFields, isSettingEnabled]);
+  const derivedProps = useMemo(() => getPropsFromConfigurations(fieldConfigurations, trustForms, (problems == null ? void 0 : problems.remediationActions) ? Object.values(problems == null ? void 0 : problems.remediationActions) : [], (problems == null ? void 0 : problems.missingData) ?? [], legalEntityResponse ? getFieldsWithExistingData(legalEntityResponse) : [], fieldsFromCustomRules), [fieldConfigurations, fieldsFromCustomRules, problems == null ? void 0 : problems.remediationActions]);
+  const {
+    state: {
+      currentState
+    }
+  } = useStateContext();
+  const formValidity = currentState.validityByForm;
+  useEffect(() => {
+    setData({
+      ...currentState.data
+    });
+    onChange == null ? void 0 : onChange(currentState);
+  }, [currentState]);
+  const forms2 = useMemo(() => {
+    const requiredForms = getRequiredForms(trustForms, derivedProps == null ? void 0 : derivedProps.requiredFields, derivedProps == null ? void 0 : derivedProps.optionalFields);
+    return addValidityToForms(requiredForms, formValidity, problems);
+  }, [derivedProps, formValidity, problems]);
+  const onSubmit = async () => {
     setLoadingStatus("loading");
-    const trustDetails2 = mapTrustToLegalEntity(data2);
+    const trustDetails2 = mapTrustToLegalEntity(data);
     try {
       const updatedTrust = await submitTrustDetails(trustDetails2);
       await submitDocuments({
         forms: forms2,
         legalEntity: updatedTrust,
-        dataSubmitted: data2
+        dataSubmitted: data
       });
       await attachTrustToParentLegalEntity(updatedTrust);
       setLoadingStatus("success");
@@ -31163,7 +30751,7 @@ function TrustDropinComponent(props) {
         label: i18n.get("successfullyUpdatedDetails"),
         type: ToastType.SUCCESS
       });
-      (_a = props.onSubmit) == null ? void 0 : _a.call(props, data2);
+      externalOnSubmit == null ? void 0 : externalOnSubmit(data);
     } catch (e) {
       showToast({
         label: i18n.get("failedToUpdateDetails"),
@@ -31189,27 +30777,27 @@ function TrustDropinComponent(props) {
   const submitTrustDetails = async (legalEntity) => {
     let updatedTrust;
     if (!(legalEntityResponse == null ? void 0 : legalEntityResponse.id) && !(newTrust == null ? void 0 : newTrust.id)) {
-      updatedTrust = await props.handleCreateLegalEntity(legalEntity);
+      updatedTrust = await handleCreateLegalEntity(legalEntity);
       setNewTrust(legalEntity);
     } else {
-      updatedTrust = await props.handleUpdateLegalEntity(drop("type").from(legalEntity), (legalEntityResponse == null ? void 0 : legalEntityResponse.id) || (newTrust == null ? void 0 : newTrust.id));
+      updatedTrust = await handleUpdateLegalEntity(drop("type").from(legalEntity), (legalEntityResponse == null ? void 0 : legalEntityResponse.id) || (newTrust == null ? void 0 : newTrust.id));
     }
     return updatedTrust;
   };
   const documentUtils = documentApiUtils(handleCreateDocument, handleGetDocument, handleUpdateDocument);
   const submitDocuments = async ({
-    forms: forms2,
+    forms: forms22,
     legalEntity,
     dataSubmitted
   }) => {
-    if (isDocumentsRequired2(forms2)) {
+    if (isDocumentsRequired2(forms22)) {
       const formattedDocument = await mapTrustDocumentToApiDocument(dataSubmitted, legalEntity.id);
       if (formattedDocument) {
         await documentUtils.uploadDocuments(formattedDocument, legalEntity.id);
       }
     }
   };
-  const isDocumentsRequired2 = (forms2) => forms2.some((form) => [trustForms.trustConstitutionalDocument.formId].includes(form.formId));
+  const isDocumentsRequired2 = (forms22) => forms22.some((form) => [trustForms.trustConstitutionalDocument.formId].includes(form.formId));
   const attachTrustToParentLegalEntity = async (trust2) => {
     if (legalEntityResponse == null ? void 0 : legalEntityResponse.id) {
       return;
@@ -31221,30 +30809,25 @@ function TrustDropinComponent(props) {
         legalEntityId: trust2.id
       }, ...existingEntityAssociations]
     };
-    await props.handleUpdateLegalEntity(updatedParentLegalEntity, parentLegalEntity.id);
+    await handleUpdateLegalEntity(updatedParentLegalEntity, parentLegalEntity.id);
   };
-  const formatDataForSummary2 = (data2, forms2) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
-    let summaryData = cloneObject(data2);
-    let trustCountry;
-    let trustType2;
-    if ((_a = summaryData == null ? void 0 : summaryData.trustRegistrationDetails) == null ? void 0 : _a.country) {
-      trustCountry = datasetUtils.getCountryName(summaryData.trustRegistrationDetails.country);
+  const formatDataForSummary2 = (data2, forms22) => {
+    var _a2, _b, _c, _d, _e, _f, _g, _h;
+    let summaryData = cloneObject(data2) || {};
+    if (summaryData == null ? void 0 : summaryData.trustRegistrationDetails) {
+      const trustCountry = ((_a2 = summaryData == null ? void 0 : summaryData.trustRegistrationDetails) == null ? void 0 : _a2.country) ? datasetUtils.getCountryName(summaryData.trustRegistrationDetails.country) : void 0;
+      const trustType2 = ((_b = summaryData == null ? void 0 : summaryData.trustRegistrationDetails) == null ? void 0 : _b.trustType) ? i18n.get((_c = trustTypeOptions.find((trustType22) => {
+        var _a3;
+        return trustType22.id === ((_a3 = summaryData.trustRegistrationDetails) == null ? void 0 : _a3.trustType);
+      })) == null ? void 0 : _c.name) : void 0;
+      summaryData.trustRegistrationDetails = {
+        nameOfTrustAgreement: (_d = summaryData == null ? void 0 : summaryData.trustRegistrationDetails) == null ? void 0 : _d.legalName,
+        countryOfEstablishment: trustCountry,
+        typeOfTrustAgreement: trustType2,
+        objectOfTrust: (_e = summaryData == null ? void 0 : summaryData.trustRegistrationDetails) == null ? void 0 : _e.objectOfTrust,
+        taxId: (_f = summaryData == null ? void 0 : summaryData.trustRegistrationDetails) == null ? void 0 : _f.taxId
+      };
     }
-    if ((_b = summaryData == null ? void 0 : summaryData.trustRegistrationDetails) == null ? void 0 : _b.trustType) {
-      const selectedTrustType = (_c = trustTypeOptions.find((trustType22) => {
-        var _a2;
-        return trustType22.id === ((_a2 = summaryData.trustRegistrationDetails) == null ? void 0 : _a2.trustType);
-      })) == null ? void 0 : _c.name;
-      trustType2 = i18n.get(selectedTrustType);
-    }
-    summaryData.trustRegistrationDetails = {
-      nameOfTrustAgreement: (_d = data2.trustRegistrationDetails) == null ? void 0 : _d.legalName,
-      countryOfEstablishment: trustCountry,
-      typeOfTrustAgreement: trustType2,
-      objectOfTrust: (_e = data2.trustRegistrationDetails) == null ? void 0 : _e.objectOfTrust,
-      taxId: (_f = data2.trustRegistrationDetails) == null ? void 0 : _f.taxId
-    };
     if ((_g = summaryData == null ? void 0 : summaryData.trustRegistrationAddress) == null ? void 0 : _g.registrationAddress) {
       summaryData.trustRegistrationAddress.hasInnerForms = true;
       summaryData.trustRegistrationAddress.registrationAddress = mapAddressLabels(summaryData == null ? void 0 : summaryData.trustRegistrationAddress.registrationAddress, datasetUtils);
@@ -31252,18 +30835,18 @@ function TrustDropinComponent(props) {
     if ((_h = summaryData == null ? void 0 : summaryData.trustRegistrationAddress) == null ? void 0 : _h.operationalAddress) {
       summaryData.trustRegistrationAddress.operationalAddress = mapAddressLabels(summaryData == null ? void 0 : summaryData.trustRegistrationAddress.operationalAddress, datasetUtils);
     }
-    if (isDocumentsRequired2(forms2)) {
+    if (isDocumentsRequired2(forms22)) {
       delete summaryData[trustConstitutionalDocumentFormId];
       summaryData = {
         ...summaryData,
-        ...formatFileSummaryData2(data2.trustConstitutionalDocument)
+        ...formatFileSummaryData2(summaryData == null ? void 0 : summaryData.trustConstitutionalDocument)
       };
     }
     return summaryData;
   };
   const formatFileSummaryData2 = (trustConstitutionalDocument) => {
-    var _a;
-    const constitutionalDocument2 = (_a = trustConstitutionalDocument == null ? void 0 : trustConstitutionalDocument.constitutionalDocument) == null ? void 0 : _a[0];
+    var _a2;
+    const constitutionalDocument2 = (_a2 = trustConstitutionalDocument == null ? void 0 : trustConstitutionalDocument.constitutionalDocument) == null ? void 0 : _a2[0];
     return {
       ...constitutionalDocument2 && {
         trustConstitutionalDocument: {
@@ -31276,28 +30859,59 @@ function TrustDropinComponent(props) {
     const value = getProp(data2, detail);
     return !isEmpty(value);
   });
-  return jsx(StateProvider, {
-    defaultData: data,
-    children: jsx(TrustWithFormComposer, {
-      capabilities: props.capabilities,
+  const baseTrackingPayload = getBaseTrackingPayload({
+    trackingConfig,
+    parentLegalEntity,
+    legalEntity: legalEntityResponse,
+    task: taskType
+  });
+  const {
+    handleNextClick,
+    handleBackClick,
+    activeForm,
+    shouldValidate,
+    setShouldValidate,
+    gotoFormByFormIndex,
+    nextButtonLabel
+  } = useFormComposer({
+    problems,
+    baseTrackingPayload,
+    forms: forms2,
+    formRef,
+    onSubmit
+  });
+  return jsx(FormWrapper, {
+    taskName: "trustDetails",
+    handleNextClick,
+    handleBackClick,
+    gotoFormByFormIndex,
+    nextButtonLabel,
+    loadingStatus,
+    forms: forms2,
+    activeForm,
+    baseTrackingPayload,
+    onSubmit,
+    hideDropinLayout,
+    handleHomeClick,
+    homeButtonLabel,
+    validateForm: () => setShouldValidate(true),
+    canSubmit: canSubmit2(data) && hasDataChanged(dataFromResponse, data),
+    problems,
+    summary: {
+      data: formatDataForSummary2(data, forms2),
+      omittedKeys: ["operationalAddressIsSame"]
+    },
+    children: jsx(TrustComponent, {
+      ...derivedProps,
+      activeForm,
+      capabilities,
       data,
-      country: props.country,
+      country: ((_a = data == null ? void 0 : data.trustRegistrationDetails) == null ? void 0 : _a.country) ?? country2,
       problems,
-      eventEmitter: props.eventEmitter,
-      hideDropinLayout: props.hideDropinLayout,
-      onChange: props.onChange,
-      handleHomeClick: props.handleHomeClick,
-      homeButtonLabel: props.homeButtonLabel,
-      onSubmit,
-      legalEntityType: LegalEntityType.TRUST,
-      legalEntityResponse,
-      summary: {
-        formatData: formatDataForSummary2,
-        getOmittedKeys
-      },
-      canSubmit: canSubmit2,
       handleAddressSearch,
-      handleFindAddress
+      handleFindAddress,
+      shouldValidate,
+      ref: formRef
     })
   });
 }
@@ -31315,7 +30929,7 @@ function DropinComposerComponent({
   onNavigate = noop,
   ...args
 }) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
   const {
     contextCountry,
     accountHolder: accountHolder2,
@@ -32209,7 +31823,7 @@ function DropinComposerComponent({
         onSubmit: componentOnSubmit,
         handleHomeClick: navigateBack,
         homeButtonLabel: i18n.get("saveAndGoToOverview"),
-        country: (_l = (_k = rootLegalEntity == null ? void 0 : rootLegalEntity.individual) == null ? void 0 : _k.residentialAddress) == null ? void 0 : _l.country,
+        country: (((_k = solePropietor == null ? void 0 : solePropietor.soleProprietorship) == null ? void 0 : _k.countryOfGoverningLaw) || ((_m = (_l = solePropietor == null ? void 0 : solePropietor.soleProprietorship) == null ? void 0 : _l.registeredAddress) == null ? void 0 : _m.country)) ?? rootLegalEntityCountry,
         handleAddressSearch: args == null ? void 0 : args.handleAddressSearch,
         handleFindAddress: args == null ? void 0 : args.handleFindAddress
       });
@@ -32800,6 +32414,64 @@ const AuthProvider = ({
     children
   });
 };
+const fontFormats = ["eot", "woff", "woff2", "ttf", "otf"];
+const formatFullNames = {
+  eot: "embedded-opentype",
+  woff: "woff",
+  woff2: "woff2",
+  ttf: "truetype",
+  otf: "opentype"
+};
+const getFontFaceRule = (fontFamily, fontStyle, fontWeight, fontPath, formats) => {
+  const fontSources = formats.map((format) => `url(${fontPath}.${format}) format(${formatFullNames[format]})`);
+  const ruleLines = [`font-family: '${fontFamily}'`, `font-style: ${fontStyle}`, `font-weight: ${fontWeight}`, `src: ${fontSources.join(",")}`];
+  return `@font-face {${ruleLines.join(";")}}`;
+};
+const addStyleTagForFont = (fontFamily, fontStyle, fontWeight, fontPath, formats) => {
+  const style = document.createElement("style");
+  style.setAttribute("type", "text/css");
+  style.innerText = getFontFaceRule(fontFamily, fontStyle, fontWeight, fontPath, formats);
+  document.head.insertBefore(style, document.head.firstChild);
+};
+const addStyleTagForADLIconFont = (loadingContext) => {
+  const fontPath = `${loadingContext}static/fonts`;
+  const iconFontPath = `${fontPath}/adyen-kyc-icons`;
+  addStyleTagForFont("adyen-kyc-icons", "normal", "normal", iconFontPath, fontFormats);
+};
+let isFlagsLoaded = false;
+let isDocumentGuidanceLoaded = false;
+const getIconContainer = () => {
+  const container = document.createElement("div");
+  container.setAttribute("aria-hidden", "true");
+  container.setAttribute("id", "adl-icon-container");
+  container.style.height = "0";
+  return container;
+};
+const buildSpriteDOMFromResponse = (responseData) => {
+  const iconContainer = getIconContainer();
+  iconContainer.innerHTML = responseData;
+  return iconContainer;
+};
+const loadFlags = async (loadingContext) => {
+  if (isFlagsLoaded)
+    return;
+  isFlagsLoaded = true;
+  const responseData = await http({
+    loadingContext,
+    path: "static/images/country-flags.svg"
+  }, null, "text");
+  document.body.insertBefore(buildSpriteDOMFromResponse(responseData), document.body.firstChild);
+};
+const loadDocumentGuidance = async (loadingContext) => {
+  if (isDocumentGuidanceLoaded)
+    return;
+  isDocumentGuidanceLoaded = true;
+  const responseData = await http({
+    loadingContext,
+    path: "static/images/document-guidance.svg"
+  }, null, "text");
+  document.body.insertBefore(buildSpriteDOMFromResponse(responseData), document.body.firstChild);
+};
 const accountFormatsImports = /* @__PURE__ */ Object.assign({ "./AD.json": () => import("./AD-43128b9f.mjs"), "./AE.json": () => import("./AE-81598d61.mjs"), "./AG.json": () => import("./AG-ed98ae0e.mjs"), "./AI.json": () => import("./AI-3e78c886.mjs"), "./AL.json": () => import("./AL-3ad2778a.mjs"), "./AM.json": () => import("./AM-6a5175fb.mjs"), "./AN.json": () => import("./AN-311f7139.mjs"), "./AO.json": () => import("./AO-99b5ef59.mjs"), "./AQ.json": () => import("./AQ-effe27c7.mjs"), "./AR.json": () => import("./AR-4013d95c.mjs"), "./AS.json": () => import("./AS-f15d56b2.mjs"), "./AT.json": () => import("./AT-d4d62b74.mjs"), "./AU.json": () => import("./AU-b9cba969.mjs"), "./AW.json": () => import("./AW-581f73fb.mjs"), "./AX.json": () => import("./AX-07af957a.mjs"), "./AZ.json": () => import("./AZ-be214142.mjs"), "./BA.json": () => import("./BA-af4be83f.mjs"), "./BB.json": () => import("./BB-df28f015.mjs"), "./BD.json": () => import("./BD-7aef0af6.mjs"), "./BE.json": () => import("./BE-fc7cf8d5.mjs"), "./BF.json": () => import("./BF-090b06e2.mjs"), "./BG.json": () => import("./BG-1f54cf4f.mjs"), "./BH.json": () => import("./BH-1e9cc2b9.mjs"), "./BJ.json": () => import("./BJ-d5dd5c6f.mjs"), "./BM.json": () => import("./BM-a808b13f.mjs"), "./BN.json": () => import("./BN-b13f6f6a.mjs"), "./BR.json": () => import("./BR-55d93100.mjs"), "./BS.json": () => import("./BS-db6a5bce.mjs"), "./BT.json": () => import("./BT-dfed2604.mjs"), "./BV.json": () => import("./BV-e123b0a8.mjs"), "./BW.json": () => import("./BW-08473bd7.mjs"), "./BY.json": () => import("./BY-2762d989.mjs"), "./BZ.json": () => import("./BZ-7f28b1ff.mjs"), "./CA.json": () => import("./CA-aa1f78ab.mjs"), "./CC.json": () => import("./CC-2cc6ac39.mjs"), "./CF.json": () => import("./CF-78ae0244.mjs"), "./CH.json": () => import("./CH-47f538c0.mjs"), "./CI.json": () => import("./CI-10feb889.mjs"), "./CK.json": () => import("./CK-e308c734.mjs"), "./CL.json": () => import("./CL-4a6c3e0b.mjs"), "./CM.json": () => import("./CM-fddc630d.mjs"), "./CN.json": () => import("./CN-46bb9203.mjs"), "./CO.json": () => import("./CO-1b150cda.mjs"), "./CR.json": () => import("./CR-2bf50f66.mjs"), "./CU.json": () => import("./CU-904aea8f.mjs"), "./CX.json": () => import("./CX-750ccd92.mjs"), "./CY.json": () => import("./CY-1508b23e.mjs"), "./CZ.json": () => import("./CZ-b6eaa1d5.mjs"), "./DE.json": () => import("./DE-e02051d4.mjs"), "./DJ.json": () => import("./DJ-0032728a.mjs"), "./DK.json": () => import("./DK-6116657e.mjs"), "./DM.json": () => import("./DM-a2c158c9.mjs"), "./DO.json": () => import("./DO-cedffa27.mjs"), "./DZ.json": () => import("./DZ-d44be6f8.mjs"), "./EC.json": () => import("./EC-c2e5813b.mjs"), "./EE.json": () => import("./EE-1a10f52d.mjs"), "./EG.json": () => import("./EG-8f29aebd.mjs"), "./EH.json": () => import("./EH-2dafda3e.mjs"), "./ES.json": () => import("./ES-42b3562e.mjs"), "./ET.json": () => import("./ET-ffa87ef0.mjs"), "./FI.json": () => import("./FI-8e3bb2bb.mjs"), "./FJ.json": () => import("./FJ-088ea689.mjs"), "./FK.json": () => import("./FK-16d84ff5.mjs"), "./FM.json": () => import("./FM-32616e6f.mjs"), "./FO.json": () => import("./FO-62c08e45.mjs"), "./FR.json": () => import("./FR-3db03e20.mjs"), "./GA.json": () => import("./GA-4de2f994.mjs"), "./GB.json": () => import("./GB-28ea0b5a.mjs"), "./GD.json": () => import("./GD-0ad67069.mjs"), "./GE.json": () => import("./GE-0f594b35.mjs"), "./GF.json": () => import("./GF-a062cea7.mjs"), "./GG.json": () => import("./GG-e00581ea.mjs"), "./GH.json": () => import("./GH-80209e7e.mjs"), "./GI.json": () => import("./GI-b0f7c8b3.mjs"), "./GL.json": () => import("./GL-8f5e8ba9.mjs"), "./GM.json": () => import("./GM-ff3ca013.mjs"), "./GN.json": () => import("./GN-fc7c0f8c.mjs"), "./GP.json": () => import("./GP-68f23382.mjs"), "./GQ.json": () => import("./GQ-f9867fbd.mjs"), "./GR.json": () => import("./GR-64a2d25c.mjs"), "./GS.json": () => import("./GS-49ce0f4c.mjs"), "./GT.json": () => import("./GT-fa779b14.mjs"), "./GU.json": () => import("./GU-f0dceb37.mjs"), "./GW.json": () => import("./GW-471336ea.mjs"), "./GY.json": () => import("./GY-2889ae39.mjs"), "./HK.json": () => import("./HK-675b8651.mjs"), "./HM.json": () => import("./HM-924a724f.mjs"), "./HN.json": () => import("./HN-6dae206e.mjs"), "./HR.json": () => import("./HR-85763090.mjs"), "./HT.json": () => import("./HT-a659da85.mjs"), "./HU.json": () => import("./HU-f9ea5037.mjs"), "./ID.json": () => import("./ID-cb5cfce1.mjs"), "./IE.json": () => import("./IE-b341cbd2.mjs"), "./IL.json": () => import("./IL-657901df.mjs"), "./IM.json": () => import("./IM-5bd6279a.mjs"), "./IN.json": () => import("./IN-3c11df0e.mjs"), "./IO.json": () => import("./IO-24f6d2e7.mjs"), "./IQ.json": () => import("./IQ-241c0148.mjs"), "./IS.json": () => import("./IS-4a7e436f.mjs"), "./IT.json": () => import("./IT-f9755e76.mjs"), "./JE.json": () => import("./JE-46968fa2.mjs"), "./JM.json": () => import("./JM-a6657a34.mjs"), "./JO.json": () => import("./JO-bd1eabea.mjs"), "./JP.json": () => import("./JP-9b5a30fa.mjs"), "./KE.json": () => import("./KE-2a866579.mjs"), "./KG.json": () => import("./KG-7713761d.mjs"), "./KH.json": () => import("./KH-a5f0f831.mjs"), "./KI.json": () => import("./KI-8376e298.mjs"), "./KM.json": () => import("./KM-48c8c9c0.mjs"), "./KN.json": () => import("./KN-b34777c7.mjs"), "./KR.json": () => import("./KR-8bcf8499.mjs"), "./KW.json": () => import("./KW-4dd6ab01.mjs"), "./KY.json": () => import("./KY-4f921c93.mjs"), "./KZ.json": () => import("./KZ-68b655f3.mjs"), "./LA.json": () => import("./LA-582a34e2.mjs"), "./LB.json": () => import("./LB-7e5023a3.mjs"), "./LC.json": () => import("./LC-4e610f91.mjs"), "./LI.json": () => import("./LI-3979434e.mjs"), "./LK.json": () => import("./LK-23f5002d.mjs"), "./LT.json": () => import("./LT-2076ca77.mjs"), "./LU.json": () => import("./LU-b0538582.mjs"), "./LV.json": () => import("./LV-440617df.mjs"), "./MA.json": () => import("./MA-f2af9aa6.mjs"), "./MC.json": () => import("./MC-f619d821.mjs"), "./MD.json": () => import("./MD-ffe4e2f4.mjs"), "./ME.json": () => import("./ME-46686aa8.mjs"), "./MH.json": () => import("./MH-c535387d.mjs"), "./MK.json": () => import("./MK-11442cf1.mjs"), "./ML.json": () => import("./ML-b2c3720e.mjs"), "./MM.json": () => import("./MM-0ae1a124.mjs"), "./MN.json": () => import("./MN-baba0d9d.mjs"), "./MO.json": () => import("./MO-2c51f9f7.mjs"), "./MP.json": () => import("./MP-55044c4b.mjs"), "./MQ.json": () => import("./MQ-aaefd2b2.mjs"), "./MR.json": () => import("./MR-f122a6f0.mjs"), "./MS.json": () => import("./MS-7623ec5f.mjs"), "./MT.json": () => import("./MT-315c76bb.mjs"), "./MU.json": () => import("./MU-126673fe.mjs"), "./MV.json": () => import("./MV-d8748aca.mjs"), "./MW.json": () => import("./MW-26492427.mjs"), "./MX.json": () => import("./MX-ca79b44b.mjs"), "./MY.json": () => import("./MY-443e729e.mjs"), "./MZ.json": () => import("./MZ-192a5094.mjs"), "./NC.json": () => import("./NC-3849aac0.mjs"), "./NE.json": () => import("./NE-bf76bc84.mjs"), "./NF.json": () => import("./NF-46f5dffa.mjs"), "./NG.json": () => import("./NG-458396e5.mjs"), "./NI.json": () => import("./NI-efe8c864.mjs"), "./NL.json": () => import("./NL-3e38d0eb.mjs"), "./NO.json": () => import("./NO-088fac56.mjs"), "./NP.json": () => import("./NP-26b20587.mjs"), "./NR.json": () => import("./NR-ba1f7da1.mjs"), "./NU.json": () => import("./NU-6dc3ed45.mjs"), "./NZ.json": () => import("./NZ-12ed2cb9.mjs"), "./OM.json": () => import("./OM-4976855b.mjs"), "./PA.json": () => import("./PA-3b45122a.mjs"), "./PE.json": () => import("./PE-ad6e8281.mjs"), "./PF.json": () => import("./PF-2b1b6f30.mjs"), "./PG.json": () => import("./PG-b94ea47f.mjs"), "./PH.json": () => import("./PH-1b96a1eb.mjs"), "./PK.json": () => import("./PK-35cadd30.mjs"), "./PL.json": () => import("./PL-6a490cd1.mjs"), "./PM.json": () => import("./PM-d508f3c5.mjs"), "./PN.json": () => import("./PN-1f6ccf43.mjs"), "./PR.json": () => import("./PR-730f2830.mjs"), "./PS.json": () => import("./PS-f3ef78cd.mjs"), "./PT.json": () => import("./PT-66954cea.mjs"), "./PW.json": () => import("./PW-0d1c7797.mjs"), "./PY.json": () => import("./PY-c8e58794.mjs"), "./QA.json": () => import("./QA-35be8b1e.mjs"), "./RE.json": () => import("./RE-9f92ed9b.mjs"), "./RO.json": () => import("./RO-5c62edb1.mjs"), "./RS.json": () => import("./RS-bc256d90.mjs"), "./RU.json": () => import("./RU-bbee5e73.mjs"), "./RW.json": () => import("./RW-95b5d859.mjs"), "./SA.json": () => import("./SA-69b2f72a.mjs"), "./SB.json": () => import("./SB-567c239a.mjs"), "./SC.json": () => import("./SC-9e5a0d31.mjs"), "./SE.json": () => import("./SE-4ed53265.mjs"), "./SG.json": () => import("./SG-970463e3.mjs"), "./SH.json": () => import("./SH-d8ab21b7.mjs"), "./SI.json": () => import("./SI-3b6d3545.mjs"), "./SJ.json": () => import("./SJ-e3430cfd.mjs"), "./SK.json": () => import("./SK-2385e057.mjs"), "./SL.json": () => import("./SL-92bf45d9.mjs"), "./SM.json": () => import("./SM-bafbc267.mjs"), "./SN.json": () => import("./SN-5733e740.mjs"), "./SO.json": () => import("./SO-d5b69054.mjs"), "./SR.json": () => import("./SR-0a8c71c0.mjs"), "./ST.json": () => import("./ST-d40d86c1.mjs"), "./TC.json": () => import("./TC-ccbc7116.mjs"), "./TD.json": () => import("./TD-679d137c.mjs"), "./TF.json": () => import("./TF-6bfcf75d.mjs"), "./TG.json": () => import("./TG-a20ef9ed.mjs"), "./TH.json": () => import("./TH-e39a447c.mjs"), "./TK.json": () => import("./TK-89a81d38.mjs"), "./TL.json": () => import("./TL-8d6ca9b7.mjs"), "./TN.json": () => import("./TN-6e746476.mjs"), "./TO.json": () => import("./TO-a8c55d73.mjs"), "./TR.json": () => import("./TR-b1175ddc.mjs"), "./TT.json": () => import("./TT-5c4a3940.mjs"), "./TV.json": () => import("./TV-e1a267b9.mjs"), "./TW.json": () => import("./TW-9e0e34fa.mjs"), "./TZ.json": () => import("./TZ-c8a8159b.mjs"), "./UA.json": () => import("./UA-7014199a.mjs"), "./UG.json": () => import("./UG-1fe39fa7.mjs"), "./UM.json": () => import("./UM-3fcbf872.mjs"), "./US.json": () => import("./US-6fbdfc0c.mjs"), "./UY.json": () => import("./UY-e6d05d75.mjs"), "./UZ.json": () => import("./UZ-433656c8.mjs"), "./VA.json": () => import("./VA-e8e13d32.mjs"), "./VC.json": () => import("./VC-331669c0.mjs"), "./VE.json": () => import("./VE-5e7b0d3b.mjs"), "./VG.json": () => import("./VG-43e85e33.mjs"), "./VI.json": () => import("./VI-3d9d6d8b.mjs"), "./VN.json": () => import("./VN-9442a8c1.mjs"), "./VU.json": () => import("./VU-96fae02f.mjs"), "./WF.json": () => import("./WF-90a27056.mjs"), "./WS.json": () => import("./WS-ddcb2b71.mjs"), "./YE.json": () => import("./YE-02c4c81e.mjs"), "./YT.json": () => import("./YT-33751cc9.mjs"), "./ZA.json": () => import("./ZA-0084b083.mjs"), "./ZM.json": () => import("./ZM-c6a4d6cc.mjs") });
 const getAccountFormatsForCountry = async (country2) => {
   const importForCountry = accountFormatsImports[`./${country2}.json`];
@@ -33248,6 +32920,182 @@ function SettingsContextProvider({
     children
   });
 }
+function removeObjectPropsWithEmptyValues(obj) {
+  keysOf(obj).forEach((key) => {
+    if (obj[key] === null || isEmpty(obj[key]))
+      delete obj[key];
+  });
+  return obj;
+}
+const INITIAL_STATE = {
+  data: {},
+  allData: {},
+  initialData: {},
+  errors: {},
+  valid: {},
+  fieldProblems: {},
+  isValid: false
+};
+function StateReducer() {
+  const [schemas, setSchemas] = useState({});
+  const [activeForms, setActiveForms] = useState([]);
+  const setCurrentForms = (forms2) => {
+    setActiveForms(forms2);
+  };
+  function reducer2({
+    currentState: currState
+  }, action) {
+    var _a, _b, _c;
+    switch (action.type) {
+      case "addToState": {
+        const state2 = structuredClone(currState);
+        const dataStoreId = action.value.dataStoreId ?? action.value.caller;
+        const schema = action.value.schema || null;
+        const schemaHasChanged = schema && ((_a = schemas == null ? void 0 : schemas[dataStoreId]) == null ? void 0 : _a.toString()) !== schema.toString();
+        const mergedState = {
+          ...state2,
+          data: {
+            ...state2.data,
+            [dataStoreId]: {
+              ...state2.data[dataStoreId],
+              ...action.value.data
+            }
+          },
+          // Add data in allData state prop in case we will need them later
+          allData: {
+            ...state2.allData,
+            [dataStoreId]: {
+              ...state2.allData[dataStoreId],
+              ...removeObjectPropsWithEmptyValues(action.value.data)
+            }
+          },
+          errors: {
+            ...state2.errors,
+            [dataStoreId]: {
+              ...state2.errors[dataStoreId],
+              ...action.value.errors
+            }
+          },
+          valid: {
+            ...state2.valid,
+            [dataStoreId]: {
+              ...state2.valid[dataStoreId],
+              ...action.value.valid
+            }
+          },
+          fieldProblems: {
+            ...state2.fieldProblems,
+            [dataStoreId]: {
+              ...state2.fieldProblems[dataStoreId],
+              ...action.value.fieldProblems
+            }
+          }
+        };
+        if (schemaHasChanged) {
+          setSchemas({
+            ...schemas,
+            [dataStoreId]: schema
+          });
+          const processedBySchema = schema.reduce((acc, fieldKey) => {
+            const dataObjByFormId = mergedState.data[dataStoreId];
+            const allDataObjByFormId = mergedState.allData[dataStoreId];
+            const validObjByFormId = mergedState.valid[dataStoreId];
+            const errorsObjByFormId = mergedState.errors[dataStoreId];
+            const fieldProblemsObjByFormId = mergedState.fieldProblems[dataStoreId];
+            return {
+              data: {
+                ...acc.data,
+                [fieldKey]: dataObjByFormId[fieldKey] ?? allDataObjByFormId[fieldKey]
+              },
+              valid: {
+                ...acc.valid,
+                [fieldKey]: validObjByFormId[fieldKey]
+              },
+              errors: {
+                ...acc.errors,
+                [fieldKey]: errorsObjByFormId[fieldKey]
+              },
+              fieldProblems: {
+                ...acc.fieldProblems,
+                [fieldKey]: fieldProblemsObjByFormId[fieldKey]
+              }
+            };
+          }, {
+            data: {},
+            valid: {},
+            errors: {},
+            fieldProblems: {}
+          });
+          mergedState.data[dataStoreId] = processedBySchema.data;
+          mergedState.valid[dataStoreId] = processedBySchema.valid;
+          mergedState.errors[dataStoreId] = processedBySchema.errors;
+          mergedState.fieldProblems[dataStoreId] = processedBySchema.fieldProblems;
+        }
+        mergedState.validityByForm = {
+          ...mergedState.validityByForm,
+          [dataStoreId]: Object.values(mergedState.valid[dataStoreId]).every((isValid) => isValid)
+        };
+        mergedState.allValid = Object.values(mergedState.validityByForm).every((isValid) => isValid);
+        mergedState.isValid = !activeForms.length ? mergedState.allValid : activeForms.every((item) => mergedState.validityByForm[item]);
+        mergedState.initialData = structuredClone(state2.initialData);
+        return {
+          currentState: mergedState,
+          prevState: state2,
+          changeInitiatedBy: dataStoreId
+        };
+      }
+      case "resetState": {
+        const dataStoreId = ((_b = action.value) == null ? void 0 : _b.dataStoreId) ?? ((_c = action.value) == null ? void 0 : _c.caller);
+        return {
+          currentState: INITIAL_STATE,
+          prevState: currState,
+          changeInitiatedBy: dataStoreId
+        };
+      }
+      default: {
+        throw new Error(`Unhandled action type: ${action.type}`);
+      }
+    }
+  }
+  return {
+    reducer: reducer2,
+    setCurrentForms
+  };
+}
+function StateProvider({
+  defaultData = {},
+  children
+}) {
+  const defaultState = {
+    currentState: {
+      data: defaultData,
+      allData: defaultData,
+      valid: {},
+      errors: {},
+      fieldProblems: {},
+      validityByForm: {},
+      initialData: defaultData
+    },
+    prevState: {},
+    changeInitiatedBy: null
+  };
+  const reducerObj = StateReducer();
+  const [state2, dispatch] = useReducer(reducerObj.reducer, defaultState);
+  const contextValue = useMemo(() => ({
+    state: state2,
+    dispatch,
+    setActiveForms: reducerObj.setCurrentForms,
+    getData: () => {
+      var _a;
+      return ((_a = state2 == null ? void 0 : state2.currentState) == null ? void 0 : _a.data) ?? {};
+    },
+    getState: () => state2 == null ? void 0 : state2.currentState
+  }), [reducerObj, state2]);
+  return jsx(StateContext.Provider, {
+    value: contextValue,
+    children
+  });
+}
 function ToastContextProvider({
   children
 }) {