@adyen/kyc-components 3.18.1 → 3.19.1

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

@@ -4,9 +4,12 @@ import { sanitize } from "isomorphic-dompurify";
 import cx from "classnames";
 import { lazy, Suspense, useId, forwardRef, memo, useMemo as useMemo$1, useEffect as useEffect$1, useState as useState$1 } from "preact/compat";
 import { jsx, jsxs, Fragment } from "preact/jsx-runtime";
-import { debounce, noop as noop$1, isEmpty as isEmpty$1, range } from "lodash";
+import debounce from "lodash-es/debounce";
 import isISIN from "validator/es/lib/isISIN.js";
 import OpenBankingSDK from "@adyen/openbankingsdk";
+import isEmpty$1 from "lodash-es/isEmpty";
+import noop$1 from "lodash-es/noop";
+import range from "lodash-es/range";
 import { jsxs as jsxs$1, jsx as jsx$1 } from "preact/compat/jsx-runtime";
 import "@adyen/adyen-document-viewer/dist/adyen-document-viewer.min.css";
 import AdyenDocumentViewer from "@adyen/adyen-document-viewer";
@@ -43,7 +46,8 @@ const payoutAccount = "Payout account";
 const payinAccount = "Payin account";
 const firstName = "First name";
 const lastName = "Last name";
-const country = "Country/region of establishment";
+const country = "Country/region";
+const countryRegionOfEstablishment = "Country/region of establishment";
 const street = "Street";
 const otherAddressInformation = "Other address information (optional)";
 const postalCode = "Postal code";
@@ -481,6 +485,7 @@ const companyLegalName = "Company legal name";
 const companyName = "Company name";
 const companyType = "Company type";
 const taxReferenceNumber = "Tax reference number";
+const taxpayerReferenceNumber = "Taxpayer reference number";
 const SST = "SST";
 const companyProfile = "Company profile";
 const companyNumber = "Company number";
@@ -580,7 +585,6 @@ const otherTrust = "Other trust";
 const pooledSuperannuationTrust = "Pooled superannuation trust";
 const publicTradingTrust = "Public trading trust";
 const unlistedPublicUnitTrust = "Unlisted public unit trust";
-const countryRegionOfEstablishment = "Country/region of establishment";
 const nameOfTrustAgreement = "Name of trust agreement";
 const typeOfTrustAgreement = "Type of trust agreement";
 const objectOfCharitableTrust = "Object of charitable trust";
@@ -852,7 +856,9 @@ const addresses = "Addresses";
 const loading = "Loading";
 const businessIncorporationNumber = "Business incorporation number";
 const doNotHaveBusinessIncorporationNumber = "I do not have a Business incorporation number";
+const retrieveMyInfo = "Retrieve Myinfo";
 const retrieveMyInfoBusiness = "Retrieve Myinfo business";
+const getYourVerifiedDetailsInstantly = "Get your verified details instantly and skip uploading documents.";
 const getYourBusinessVerifiedDetails = "Get your business's verified details instantly and skip uploading documents.";
 const enterTheDetailsYourself = "Enter the details yourself";
 const youAlsoHaveToUploadSomeSupportingDocuments = "You'll also have to upload some supporting documents.";
@@ -933,6 +939,7 @@ const taxInformationNumber = "Tax Identification Number";
 const taxInformationNumber__HK = "Business Registration number (BRN)";
 const stockExchangeMIC = "Market Identifier Code (MIC)";
 const stockISIN = "International Securities Identification Number (ISIN)";
+const stockTickerSymbol = "Stock ticker symbol";
 const companyLookupResultsHeader = "Let's find your company";
 const companyLookupResultsHeader__searching = "Searching for companies...";
 const companyLookupResultsHeader__verifying = "Verifying company selection...";
@@ -1320,8 +1327,9 @@ const onboardingRedirectOpenError = "Pop-up blocker prevented redirecting, pleas
 const forExample_ = "For example: %{examples}";
 const failToLaunchSingpass = "failed to launch Singpass";
 const retrieveMyinfoBusinessWith = "Retrieve Myinfo business with";
+const retrieveMyinfoWith = "Retrieve Myinfo with";
 const getSetUpInstantly = "Get set up instantly";
-const MyInfoBusinessYouCanGetVerifiedDetails = "With Myinfo business, you can get your business's verified details instantly and skip uploading documents.";
+const myInfoBusinessYouCanGetVerifiedDetails = "With Myinfo business, you can get your business's verified details instantly and skip uploading documents.";
 const addBankDetails = "Add bank details";
 const addMissingBankDetails = "We are missing your bank details in order to perform payouts, please add your bank account.";
 const bankDetails = "Bank details";
@@ -1335,6 +1343,7 @@ const missingDetailsToPerformPayouts = "We are missing some details in order to
 const completeAddingAccount = "Complete adding account";
 const removeThisBankAccount = "Remove this bank account";
 const editDetails = "Edit details";
+const myInfoYouCanGetVerifiedDetails = "With Myinfo, you can get your verified details instantly and skip uploading documents.";
 const sessionTimeout = "Session timeout";
 const thisSessionWillExpireIn = "This session will expire in %{timeUntilExpiry}. Continue working to avoid losing any unsaved data.";
 const xMinutes = "%{minutes} minutes";
@@ -1345,6 +1354,14 @@ const thisPageIsNowInactive = "This page is now inactive";
 const startANewSessionFromTheSamePlaceYouOriginallyAccessed = "Start a new session from the same place you originally accessed this page.";
 const differentCountryOfGoverningLaw = "This company has a different country/region of governing law";
 const countryOfGoverningLaw = "Country/region of governing law";
+const nationalInsuranceNumber = "National Insurance Number (NINO)";
+const detailsForCapital = "Details for capital";
+const parentCompany = "Parent company";
+const ultimateParentCompany = "Ultimate parent company";
+const numberOfEmployees = "Number of employees";
+const parentCompanyDetails = "Parent company details";
+const ultimateParentCompanyDetails = "Ultimate parent company details";
+const euFinancialRegulationsRequireUs = "EU financial regulations require us to collect this information. This won’t affect your business credit score.";
 const defaultTrans = {
   smartling,
   close,
@@ -1354,6 +1371,7 @@ const defaultTrans = {
   firstName,
   lastName,
   country,
+  countryRegionOfEstablishment,
   street,
   otherAddressInformation,
   postalCode,
@@ -1791,6 +1809,7 @@ const defaultTrans = {
   companyName,
   companyType,
   taxReferenceNumber,
+  taxpayerReferenceNumber,
   SST,
   companyProfile,
   companyNumber,
@@ -1895,7 +1914,6 @@ const defaultTrans = {
   pooledSuperannuationTrust,
   publicTradingTrust,
   unlistedPublicUnitTrust,
-  countryRegionOfEstablishment,
   nameOfTrustAgreement,
   typeOfTrustAgreement,
   objectOfCharitableTrust,
@@ -2170,7 +2188,9 @@ const defaultTrans = {
   loading,
   businessIncorporationNumber,
   doNotHaveBusinessIncorporationNumber,
+  retrieveMyInfo,
   retrieveMyInfoBusiness,
+  getYourVerifiedDetailsInstantly,
   getYourBusinessVerifiedDetails,
   enterTheDetailsYourself,
   youAlsoHaveToUploadSomeSupportingDocuments,
@@ -2251,6 +2271,7 @@ const defaultTrans = {
   taxInformationNumber__HK,
   stockExchangeMIC,
   stockISIN,
+  stockTickerSymbol,
   companyLookupResultsHeader,
   companyLookupResultsHeader__searching,
   companyLookupResultsHeader__verifying,
@@ -2638,8 +2659,9 @@ const defaultTrans = {
   forExample_,
   failToLaunchSingpass,
   retrieveMyinfoBusinessWith,
+  retrieveMyinfoWith,
   getSetUpInstantly,
-  MyInfoBusinessYouCanGetVerifiedDetails,
+  myInfoBusinessYouCanGetVerifiedDetails,
   addBankDetails,
   addMissingBankDetails,
   bankDetails,
@@ -2653,6 +2675,7 @@ const defaultTrans = {
   completeAddingAccount,
   removeThisBankAccount,
   editDetails,
+  myInfoYouCanGetVerifiedDetails,
   sessionTimeout,
   thisSessionWillExpireIn,
   xMinutes,
@@ -2664,7 +2687,15 @@ const defaultTrans = {
   thisPageIsNowInactive,
   startANewSessionFromTheSamePlaceYouOriginallyAccessed,
   differentCountryOfGoverningLaw,
-  countryOfGoverningLaw
+  countryOfGoverningLaw,
+  nationalInsuranceNumber,
+  detailsForCapital,
+  parentCompany,
+  ultimateParentCompany,
+  numberOfEmployees,
+  parentCompanyDetails,
+  ultimateParentCompanyDetails,
+  euFinancialRegulationsRequireUs
 };
 const FALLBACK_LOCALE = "en-US";
 const defaultTranslation = Object.entries(defaultTrans).reduce((acc, [translationKey, translationValue]) => translationKey !== "smartling" ? {
@@ -3106,7 +3137,7 @@ const icons = {
   warning: lazy(() => import("./warning-99uFf1WU.js")),
   wrong: lazy(() => import("./wrong-1wvh7nZe.js"))
 };
-const logger$y = createLogger("Icon");
+const logger$z = createLogger("Icon");
 const Icon = ({
   className,
   name,
@@ -3114,7 +3145,7 @@ const Icon = ({
 }) => {
   const LazyLoadedIcon = icons[name];
   if (!LazyLoadedIcon) {
-    logger$y.error(`No such icon: "${name}"`);
+    logger$z.error(`No such icon: "${name}"`);
     return null;
   }
   return jsx("span", {
@@ -3330,7 +3361,7 @@ function useFormRouterContext() {
   }
   return context;
 }
-const logger$x = createLogger("Link");
+const logger$y = createLogger("Link");
 const getIconClass = (icon, external) => {
   if (external) {
     return "adyen-kyc-link__icon adyen-kyc-icon-external-link";
@@ -3342,7 +3373,7 @@ const getIconClass = (icon, external) => {
 };
 const isValidLink = (href) => {
   if (href === "#") {
-    logger$x.error('Links must include a valid href. If your href is "#", consider using a Button instead');
+    logger$y.error('Links must include a valid href. If your href is "#", consider using a Button instead');
     return false;
   }
   return true;
@@ -3517,6 +3548,49 @@ function getFormProps(props, innerFormId) {
     shouldValidate: (activeFormId ? activeFormId === innerFormId : true) && props.shouldValidate
   };
 }
+function removeFormLayer(obj, formId) {
+  if (!obj) {
+    return obj;
+  }
+  const formIdWithDelimiter = `${formId}.`;
+  return Object.entries(obj).reduce((acc, [key, value]) => {
+    const newKey = key.startsWith(formIdWithDelimiter) ? key.substring(formIdWithDelimiter.length, key.length) : key;
+    return {
+      ...acc,
+      [newKey]: value
+    };
+  }, {});
+}
+function getNestedOuterFormPropsFromOuterFormProps(props, innerFormId) {
+  const newProps = getFormProps(props, innerFormId);
+  if (newProps === null) {
+    return null;
+  }
+  const {
+    placeholders,
+    labels: labels2,
+    data,
+    helperText,
+    masks
+  } = newProps;
+  return {
+    placeholders,
+    labels: labels2,
+    data,
+    helperText,
+    masks,
+    // maintain the structure of the special fields
+    readOnlyFields: removeFormLayer(props.readOnlyFields, innerFormId),
+    requiredFields: removeFormLayer(props.requiredFields, innerFormId),
+    optionalFields: removeFormLayer(props.optionalFields, innerFormId),
+    obscuredFields: removeFormLayer(props.obscuredFields, innerFormId),
+    verifyFields: removeFormLayer(props.verifyFields, innerFormId),
+    // the rest we just pass along for now, as they will be eventually be processed by getFormProps
+    problems: props.problems,
+    validators: props.validators,
+    shouldValidate: props.shouldValidate
+  };
+}
 function getFieldProps(props, innerFormFields) {
   if (innerFormFields) {
     const nestedFormProps = {
@@ -3657,7 +3731,7 @@ const useSetting = (settingName) => {
   } = context;
   return getSetting(settingName);
 };
-const logger$w = createLogger("useAllowedCountries");
+const logger$x = createLogger("useAllowedCountries");
 const useAllowedCountries = () => {
   const acceptedCountries = useSetting("acceptedCountries");
   const {
@@ -3666,7 +3740,7 @@ const useAllowedCountries = () => {
   const [allowedCountries, setAllowedCountries] = useState(acceptedCountries);
   useEffect(() => {
     if (acceptedCountries !== void 0) return;
-    getAllowedCountries2().then((response) => setAllowedCountries(response.countries)).catch(logger$w.error);
+    getAllowedCountries2().then((response) => setAllowedCountries(response.countries)).catch(logger$x.error);
   }, [acceptedCountries]);
   return allowedCountries;
 };
@@ -4019,7 +4093,7 @@ function reducer({
     }
   };
 }
-const logger$v = createLogger("useAsyncValidator");
+const logger$w = createLogger("useAsyncValidator");
 const useAsyncValidator = (asyncRules) => {
   const [asyncValidationResults, setAsyncValidationResults] = useState({});
   const clearAsyncValidationResults = useCallback(() => setAsyncValidationResults({}), []);
@@ -4040,7 +4114,7 @@ const useAsyncValidator = (asyncRules) => {
           hasError: !isValid
         }])
       });
-    }).catch(logger$v.error);
+    }).catch(logger$w.error);
   }, [asyncRules, clearAsyncValidationResults]);
   return {
     asyncValidationResults,
@@ -4317,10 +4391,13 @@ const ARIA_ERROR_SUFFIX = "-ariaError";
 const MaybeLabelElement = ({
   children,
   ...props
-}) => props.useLabelElement === true ? jsx("label", {
-  ...props,
-  children
-}) : jsx("div", {
+}) => props.useLabelElement === true ? (
+  // eslint-disable-next-line jsx-a11y/label-has-associated-control
+  jsx("label", {
+    ...props,
+    children
+  })
+) : jsx("div", {
   ...props,
   role: "form",
   children
@@ -5965,7 +6042,7 @@ const deriveInputState = (isValid, isFocused, isDisabled, isOptional, hasNullish
   };
 };
 const MISMATCH_ANIMATION_NAME = "mismatchShake";
-const logger$u = createLogger("MaskedInputText");
+const logger$v = createLogger("MaskedInputText");
 const MaskedInputText = ({
   value,
   onInput,
@@ -6006,7 +6083,7 @@ const MaskedInputText = ({
   };
   useEffect(() => {
     if (!mask) {
-      logger$u.warn("`mask` is undefined. No masking of input will take place.");
+      logger$v.warn("`mask` is undefined. No masking of input will take place.");
     }
   }, [mask]);
   const getMaskResult = useCallback((pureValue) => {
@@ -6031,7 +6108,7 @@ const MaskedInputText = ({
         return;
       }
       const fallback = displayValueToPure(maskResult.partialDisplayValue);
-      logger$u.warn(`Value received "${value}" does not match mask`, maskResult, `
+      logger$v.warn(`Value received "${value}" does not match mask`, maskResult, `
 Falling back to partially valid value "${fallback}"`);
       onInput(fallback);
     }
@@ -6311,6 +6388,14 @@ const taxIdNumberOptions = {
   }, {
     id: "uen",
     name: "uen"
+  }],
+  [CountryCodes.Jersey]: [{
+    id: "taxIdentificationNumber",
+    name: "taxIdentificationNumber"
+  }, {
+    id: "socialSecurityNumber",
+    name: "socialSecurityNumber",
+    applicableOnlyFor: [CompanyTypesValue.SOLE_PROPRIETORSHIP]
   }]
 };
 const getTaxIdNumberOptions = (country2, companyType2) => {
@@ -7791,20 +7876,21 @@ const Accordion = ({
   };
   return jsxs("details", {
     onToggle: handleToggle,
-    className,
+    className: cx(className, "adyen-kyc-accordion__details"),
     children: [jsxs("summary", {
+      className: "adyen-kyc-accordion__summary",
       role: "button",
       children: [expandOnLeft && jsx("img", {
-        className: "arrow",
+        className: "adyen-kyc-accordion__arrow",
         src: ChevronDownIcon,
         alt: ""
       }), icon, title, !expandOnLeft && jsx("img", {
-        className: "arrow arrow-right",
+        className: "adyen-kyc-accordion__arrow adyen-kyc-accordion__arrow--right",
         src: ChevronDownIcon,
         alt: ""
       })]
     }), jsx("section", {
-      className: "content",
+      className: "adyen-kyc-accordion__content",
       children
     })]
   });
@@ -7969,6 +8055,54 @@ const stockISINFieldMetadata = {
     }
   }
 };
+const STOCK_TICKER_SYMBOL_FIELD = ["stockTickerSymbol"];
+function StockTickerSymbolField({
+  data,
+  valid,
+  errors,
+  labels: labels2,
+  placeholders,
+  readonly,
+  mask,
+  guidanceText,
+  handleChangeFor
+}) {
+  return jsx(MaskedInputText, {
+    name: "stockTickerSymbol",
+    label: labels2.stockTickerSymbol ?? "",
+    formatGuidance: guidanceText == null ? void 0 : guidanceText.stockTickerSymbol,
+    placeholder: placeholders == null ? void 0 : placeholders.stockTickerSymbol,
+    ...mask,
+    classNameModifiers: {
+      field: ["stockTickerSymbol"],
+      input: ["stockTickerSymbol"]
+    },
+    errorMessage: errors.stockTickerSymbol,
+    isValid: valid.stockTickerSymbol ?? false,
+    value: data.stockTickerSymbol ?? "",
+    readonly,
+    onInput: handleChangeFor("stockTickerSymbol", "input"),
+    onBlur: handleChangeFor("stockTickerSymbol", "blur"),
+    "aria-required": true,
+    "aria-label": labels2.stockTickerSymbol,
+    "aria-invalid": !valid.stockTickerSymbol
+  });
+}
+const stockTickerSymbolFieldMetadata = {
+  label: "stockTickerSymbol",
+  validators: [validatePatternOnBlur(/^[A-Z\d]{1,5}$/)],
+  mask: {
+    mask: makeMask(...alphanumericInputs(1), ...alphanumericInputs(4)),
+    transformOnType: uppercase
+  },
+  guidanceText: {
+    key: "enterAMaximumOfNCharactersForExample",
+    values: {
+      maxChars: "5",
+      example: "ADYEN"
+    }
+  }
+};
 const defaultFieldMetadata$7 = {
   label: "taxId"
 };
@@ -8072,6 +8206,136 @@ const defaultFieldConfig$7 = {
       }
     }
   },
+  [CountryCodes.Guernsey]: ({
+    companyType: companyType2
+  }) => {
+    switch (companyType2) {
+      case CompanyTypesValue.SOLE_PROPRIETORSHIP:
+        return {
+          label: "nationalInsuranceNumber",
+          validators: validatePatternOnBlur(/^GY\d{6}[A-D]$/),
+          mask: {
+            mask: makeMask(...nonInputs("GY", {
+              includeInValue: true
+            }), spacer, ...numericInputs(2), spacer, ...numericInputs(2), spacer, ...numericInputs(2), spacer, {
+              type: "input",
+              allow: /[A-D]/
+            }),
+            transformOnType: uppercase
+          },
+          guidanceText: {
+            key: "enterTheRemainingNCharactersForExample",
+            values: {
+              numChars: "7",
+              example: "GY 12 34 56 A"
+            }
+          }
+        };
+      default:
+        return {
+          label: "registrationNumber",
+          mask: businessRegistrationNumberMasks[CountryCodes.Guernsey].default,
+          validators: validatePatternOnBlur(businessRegistrationNumberPatterns[CountryCodes.Guernsey].default),
+          guidanceText: {
+            key: "enterAMaximumOfNDigitsForExample",
+            values: {
+              maxDigits: "9",
+              example: "123456"
+            }
+          }
+        };
+    }
+  },
+  [CountryCodes.Jersey]: ({
+    taxIdNumberType,
+    companyType: companyType2
+  }) => {
+    switch (taxIdNumberType) {
+      case "socialSecurityNumber":
+        return {
+          label: "socialSecurityNumber",
+          validators: validatePatternOnBlur(/^[A-Z]{2}\d{6}[A-Z]$/),
+          mask: {
+            mask: makeMask(...alphaInputs(2), ...numericInputs(6), ...alphaInputs(1)),
+            transformOnType: uppercase
+          },
+          guidanceText: {
+            key: "enterNCharactersForExample",
+            values: {
+              numChars: "9",
+              example: "JY000000A"
+            }
+          }
+        };
+      case "taxIdentificationNumber":
+      default:
+        switch (companyType2) {
+          case CompanyTypesValue.SOLE_PROPRIETORSHIP:
+            return {
+              label: "taxIdentificationNumber",
+              validators: validatePatternOnBlur(/^\d{10}$/),
+              mask: {
+                mask: makeMask(...numericInputs(3), ...nonInputs(" - "), ...numericInputs(3), ...nonInputs(" - "), ...numericInputs(4))
+              },
+              guidanceText: {
+                key: "enterNDigitsForExample",
+                values: {
+                  numDigits: "10",
+                  example: "100-100-1000"
+                }
+              }
+            };
+          default:
+            return {
+              label: "taxIdentificationNumber",
+              validators: validatePatternOnBlur(/^[A-Z]{2}\d{5}$/),
+              mask: {
+                mask: makeMask(...alphaInputs(2), ...numericInputs(5)),
+                transformOnType: uppercase
+              },
+              guidanceText: {
+                key: "enterNCharactersForExample",
+                values: {
+                  numChars: "7",
+                  example: "CC17261"
+                }
+              }
+            };
+        }
+    }
+  },
+  [CountryCodes.IsleOfMan]: {
+    label: "taxReferenceNumber",
+    validators: validatePatternOnBlur(/^[HCX]\d{8}$/),
+    mask: {
+      mask: makeMask({
+        type: "input",
+        allow: /[HCX]/
+      }, ...numericInputs(6), ...nonInputs(" - "), ...numericInputs(2)),
+      transformOnType: uppercase
+    },
+    guidanceText: {
+      key: "enterNCharactersForExample",
+      values: {
+        numChars: "9",
+        example: "C155673-79"
+      }
+    }
+  },
+  [CountryCodes.Gibraltar]: {
+    label: "taxpayerReferenceNumber",
+    validators: validatePatternOnBlur(/^\d{1,7}$/),
+    mask: {
+      mask: makeMask(...numericInputs(1), ...numericInputs(6, true))
+    },
+    guidanceText: {
+      key: "enterAMaximumOfNDigitsForExample",
+      values: {
+        maxDigits: "7",
+        example: "123456"
+      }
+    }
+  },
   /**
    * NOT YET SUPPORTED
    * These are brought over from the old pattern files. We have no idea if they are accurate or not.
@@ -8721,14 +8985,15 @@ const defaultFieldConfig$6 = {
     validators: validatePatternOnBlur(/^[JGVE]-\d{8}-?\d$/)
   }
 };
-const inferTaxIdNumberType = (taxId2, country2) => {
+const inferTaxIdNumberType = (taxId2, country2, companyType2) => {
   const optionsForCountry = taxIdNumberOptions[country2];
   const metadataFn = defaultFieldConfig$6[country2] ?? defaultFieldConfig$7[country2];
   if (!optionsForCountry || !metadataFn || typeof metadataFn !== "function") return void 0;
   for (const option of optionsForCountry) {
     const fieldMetadata = metadataFn({
       taxIdNumberType: option.id,
-      vatNumberType: option.id
+      vatNumberType: option.id,
+      companyType: companyType2
     });
     if (!fieldMetadata.validators) continue;
     const validators = Array.isArray(fieldMetadata.validators) ? fieldMetadata.validators : [fieldMetadata.validators];
@@ -8795,10 +9060,11 @@ function TaxId(props) {
     fieldConfig = defaultFieldConfig$7
   } = props;
   const existingTaxId = propData == null ? void 0 : propData.taxId;
-  const defaultTaxIdNumberType = existingTaxId ? inferTaxIdNumberType(existingTaxId, country2) : (_a = getTaxIdNumberOptions(country2, companyType2)) == null ? void 0 : _a[0].id;
+  const defaultTaxIdNumberType = existingTaxId ? inferTaxIdNumberType(existingTaxId, country2, companyType2) : (_a = getTaxIdNumberOptions(country2, companyType2)) == null ? void 0 : _a[0].id;
   const [taxIdNumberType, setTaxIdNumberType] = useState(defaultTaxIdNumberType);
   const metadata = resolveFieldMetadata(fieldConfig[country2], {
-    taxIdNumberType
+    taxIdNumberType,
+    companyType: companyType2
   }, defaultFieldMetadata$7);
   const mergedProps = mergeFieldMetadataIntoProps("taxId", metadata, props);
   const {
@@ -8939,6 +9205,7 @@ var ExperimentNames = /* @__PURE__ */ ((ExperimentNames2) => {
   ExperimentNames2["AllowMoreRolesForMainRootTrustee"] = "AllowMoreRolesForMainRootTrustee";
   ExperimentNames2["ShowUnsupportedEntityType"] = "ShowUnsupportedEntityType";
   ExperimentNames2["ShowSingPassButtonForCompanies"] = "ShowSingPassButtonForCompanies";
+  ExperimentNames2["ShowSingPassButtonForIndividuals"] = "ShowSingPassButtonForIndividuals";
   ExperimentNames2["ShowExtraTaxExemptionReasons"] = "ShowExtraTaxExemptionReasons";
   ExperimentNames2["EnableCountryOfGoverningLawForUKCompanies"] = "EnableCountryOfGoverningLawForUKCompanies";
   ExperimentNames2["HidePayoutAccountTask"] = "HidePayoutAccountTask";
@@ -8978,7 +9245,7 @@ function VatNumber(props) {
     name: VatAbsenceReason.CountryWithoutVatOrGstSystem
   }]);
   const existingTaxId = propData == null ? void 0 : propData.vatNumber;
-  const defaultTaxIdNumberType = existingTaxId ? inferTaxIdNumberType(existingTaxId, country2) : (_a = taxIdNumberOptions[country2]) == null ? void 0 : _a[0].id;
+  const defaultTaxIdNumberType = existingTaxId ? inferTaxIdNumberType(existingTaxId, country2, void 0) : (_a = taxIdNumberOptions[country2]) == null ? void 0 : _a[0].id;
   const [taxIdNumberType, setTaxIdNumberType] = useState(defaultTaxIdNumberType);
   const metadata = resolveFieldMetadata(fieldConfig[country2], {
     vatNumberType: taxIdNumberType
@@ -9135,7 +9402,7 @@ const FLOWS_THAT_HIDE_REGISTRATION_NUMBER = [{
   companyType: [CompanyTypesValue.SOLE_PROPRIETORSHIP],
   country: CountryCodes.PuertoRico
 }];
-const companyRegistrationDetailsFields = ["tradingName", "sameNameAsLegalName", ...businessRegistrationNumberFields, "stockExchangeMIC", "stockISIN", ...vatNumberFields, ...taxIdFields, "dateOfIncorporation"];
+const companyRegistrationDetailsFields = ["tradingName", "sameNameAsLegalName", ...businessRegistrationNumberFields, "stockExchangeMIC", "stockISIN", "stockTickerSymbol", ...vatNumberFields, ...taxIdFields, "dateOfIncorporation"];
 function CompanyRegistrationDetailsComponent(props) {
   var _a, _b;
   const {
@@ -9144,13 +9411,14 @@ function CompanyRegistrationDetailsComponent(props) {
   let mergedProps = props;
   mergedProps = mergeFieldMetadataIntoProps("stockExchangeMIC", stockExchangeMICFieldMetadata, mergedProps);
   mergedProps = mergeFieldMetadataIntoProps("stockISIN", stockISINFieldMetadata, mergedProps);
+  mergedProps = mergeFieldMetadataIntoProps("stockTickerSymbol", stockTickerSymbolFieldMetadata, mergedProps);
   const hideOptionalRegistrationNumberField = FLOWS_THAT_HIDE_REGISTRATION_NUMBER.some((f) => f.country === mergedProps.country && f.companyType.includes(mergedProps.companyType));
   const stateRef = useRef({
     setState: null
   });
   const COMPANY_REGISTRATION_DETAILS = mergedProps.id;
   const requiredFields = mergedProps.requiredFields || companyRegistrationDetailsFields;
-  const directChildFields = requiredFields.filter((field) => ["tradingName", "sameNameAsLegalName", "stockExchangeMIC", "stockISIN", "dateOfIncorporation"].includes(field));
+  const directChildFields = requiredFields.filter((field) => ["tradingName", "sameNameAsLegalName", "stockExchangeMIC", "stockISIN", "stockTickerSymbol", "dateOfIncorporation"].includes(field));
   const {
     getData
   } = useStateContext();
@@ -9320,6 +9588,16 @@ function CompanyRegistrationDetailsComponent(props) {
         guidanceText: formUtils.getFieldGuidanceText(STOCK_ISIN_FIELD),
         readonly: formUtils.isReadOnly("stockISIN"),
         handleChangeFor
+      }), formUtils.isRequiredField("stockTickerSymbol") && jsx(StockTickerSymbolField, {
+        data: formUtils.getFieldData(data, STOCK_TICKER_SYMBOL_FIELD),
+        valid: formUtils.getFieldValid(valid, STOCK_TICKER_SYMBOL_FIELD),
+        errors: formUtils.getFieldErrors(errors, fieldProblems, STOCK_TICKER_SYMBOL_FIELD),
+        labels: formUtils.getFieldLabels(STOCK_TICKER_SYMBOL_FIELD),
+        placeholders: formUtils.getFieldPlaceholders(STOCK_TICKER_SYMBOL_FIELD),
+        mask: formUtils.getMask("stockTickerSymbol"),
+        guidanceText: formUtils.getFieldGuidanceText(STOCK_TICKER_SYMBOL_FIELD),
+        readonly: formUtils.isReadOnly("stockTickerSymbol"),
+        handleChangeFor
       }), formUtils.isRequiredField("registrationNumber", !hideOptionalRegistrationNumberField) && jsx(BusinessRegistrationNumber, {
         ...registrationNumberProps,
         companyType: mergedProps.companyType,
@@ -9389,10 +9667,13 @@ const companyBase = {
     rule: "REQUIRED"
   },
   stockExchangeMIC: {
-    rule: "stockExchangeMICIfTypePublic"
+    rule: "ifPubliclyTradedCompany"
   },
   stockISIN: {
-    rule: "stockISINIfTypePublic"
+    rule: "ifPubliclyTradedCompany"
+  },
+  stockTickerSymbol: {
+    rule: "ifPubliclyTradedCompany"
   },
   tradingName: {
     rule: "REQUIRED"
@@ -9442,10 +9723,13 @@ const companySearchBase = {
     rule: "countryRequiresStateOrProvince"
   },
   stockExchangeMIC: {
-    rule: "stockExchangeMICIfTypePublic"
+    rule: "ifPubliclyTradedCompany"
   },
   stockISIN: {
-    rule: "stockISINIfTypePublic"
+    rule: "ifPubliclyTradedCompany"
+  },
+  stockTickerSymbol: {
+    rule: "ifPubliclyTradedCompany"
   },
   dateOfIncorporation: {
     rule: "countryRequiresDateOfIncorporationForCompanies"
@@ -9489,10 +9773,13 @@ const businessDetailsBase = {
     rule: "countryRequiresStateOrProvince"
   },
   stockExchangeMIC: {
-    rule: "stockExchangeMICIfTypePublic"
+    rule: "ifPubliclyTradedCompany"
   },
   stockISIN: {
-    rule: "stockISINIfTypePublic"
+    rule: "ifPubliclyTradedCompany"
+  },
+  stockTickerSymbol: {
+    rule: "ifPubliclyTradedCompany"
   },
   dateOfIncorporation: {
     rule: "countryRequiresDateOfIncorporationForCompanies"
@@ -10086,12 +10373,6 @@ const EntityTypeSelectionRadioCardBody = ({
     })]
   });
 };
-const CoreContext = createContext(void 0);
-const useCoreContext = () => {
-  const context = useContext(CoreContext);
-  if (!context) throw Error("You need a <CoreProvider> to use core context");
-  return context;
-};
 var TrustMemberTypes = /* @__PURE__ */ ((TrustMemberTypes2) => {
   TrustMemberTypes2["DEFINED_BENEFICIARY"] = "definedBeneficiary";
   TrustMemberTypes2["UNDEFINED_BENEFICIARY"] = "undefinedBeneficiary";
@@ -10287,7 +10568,7 @@ var VerificationStatus = /* @__PURE__ */ ((VerificationStatus2) => {
   VerificationStatus2["REJECTED"] = "rejected";
   return VerificationStatus2;
 })(VerificationStatus || {});
-function getNestedPropertyKeys(obj, includeUndefined = false) {
+function getNestedPropertyKeys(obj, includeUndefined = false, includeFalsy = true) {
   const fieldNames = [];
   Object.entries(obj).forEach(([key, value]) => {
     if (typeof value === "object" && value !== null) {
@@ -10295,7 +10576,7 @@ function getNestedPropertyKeys(obj, includeUndefined = false) {
       fieldNames.push(...nested);
       return;
     }
-    if (value !== void 0 || includeUndefined) {
+    if ((value !== void 0 || includeUndefined) && (value || !includeFalsy)) {
       fieldNames.push(key);
     }
   });
@@ -10336,8 +10617,10 @@ function isEmptyEntity(legalEntity) {
   const minimumFields = emptyFieldsByEntityType[type];
   const typeSpecificSection = legalEntity[type];
   if (!typeSpecificSection) return true;
-  const fieldsOnEntity = getNestedPropertyKeys(typeSpecificSection);
-  return !fieldsOnEntity.some((field) => !minimumFields.includes(field));
+  const fieldsOnEntity = getNestedPropertyKeys(typeSpecificSection, false, false);
+  const sortedMinimumFields = minimumFields.toSorted();
+  const sortedFieldsOnEntity = fieldsOnEntity.toSorted();
+  return sortedFieldsOnEntity.every((value, index) => value === sortedMinimumFields[index]);
 }
 const capabilitiesToPreventTypeChange = ["receivePayments", "issueCard", "useCard", "withdrawFromAtm", "withdrawFromAtmInRestrictedCountries", "receiveFromTransferInstrument", "useCardInRestrictedCountries", "useCardInRestrictedIndustries", "issueBankAccount", "sendToThirdParty", "receiveFromThirdParty", "getGrantOffers", "receiveGrants"];
 const entityTypeToCorrespondingAccountHolderOption = {
@@ -10489,7 +10772,7 @@ const accountHolderValidationRules = {
   }
 };
 const accountHolderFields = ["accountHolder"];
-const logger$t = createLogger("AccountHolder");
+const logger$u = createLogger("AccountHolder");
 function getAvailableAccountHolderOptions(legalEntityType, isChangeOfLegalEntityTypeAllowed, isTrustFlowEnabled, isSoleProprietorshipAllowed, isChangeToMyNameAllowed) {
   switch (legalEntityType) {
     case LegalEntityType.ORGANIZATION: {
@@ -10499,7 +10782,7 @@ function getAvailableAccountHolderOptions(legalEntityType, isChangeOfLegalEntity
       return [...isChangeToMyNameAllowed ? ["myName"] : [], ...isChangeOfLegalEntityTypeAllowed ? ["theCompanyIWorkFor"] : [], ...isTrustFlowEnabled ? ["aTrust"] : [], ...isSoleProprietorshipAllowed ? ["mySoleProprietorName"] : []];
     }
     default:
-      logger$t.error(`No available account holder options for legal entity type '${legalEntityType}'`);
+      logger$u.error(`No available account holder options for legal entity type '${legalEntityType}'`);
       return [];
   }
 }
@@ -10515,9 +10798,6 @@ function AccountHolder(props) {
     dataStoreId,
     capabilities
   } = props;
-  const {
-    setAccountHolder
-  } = useCoreContext();
   const {
     isSettingEnabled
   } = useSettingsContext();
@@ -10566,9 +10846,6 @@ function AccountHolder(props) {
         dataStoreId
       }
     });
-    if (data == null ? void 0 : data.accountHolder) {
-      setAccountHolder(data.accountHolder);
-    }
   }, [data, errors, valid, dataStoreId]);
   const formUtils = formUtilities(props, i18n);
   const questionLabel = i18n.get("nameOfBankAccountHolder");
@@ -10741,7 +11018,7 @@ function DocumentGuidance({
     className: cx("adyen-kyc-document-guidance", className),
     children: jsx("div", {
       className: "adyen-kyc-document-guidance__container",
-      children: documentGuidanceItems.map((item) => jsxs("div", {
+      children: documentGuidanceItems.map((item) => jsxs("figure", {
         className: "adyen-kyc-document-guidance__item",
         children: [jsx("svg", {
           width: "100%",
@@ -10750,7 +11027,7 @@ function DocumentGuidance({
           children: jsx("use", {
             href: `#adyen-kyc-${guidancePrefix}-${item.type}`
           })
-        }), jsx("span", {
+        }), jsx("figcaption", {
           className: "adyen-kyc-document-guidance__description",
           children: i18n.get(item.translationKey)
         })]
@@ -11059,7 +11336,7 @@ function Dropzone(props) {
     })]
   });
 }
-const logger$s = createLogger("TextArea");
+const logger$t = createLogger("TextArea");
 function TextArea(props) {
   const {
     classNameModifiers,
@@ -11080,7 +11357,7 @@ function TextArea(props) {
   } = useI18nContext();
   const [value, setValue] = useState("");
   if (Object.prototype.hasOwnProperty.call(props, "onChange")) {
-    logger$s.error("Error: Form fields that rely on InputBase may not have an onChange property");
+    logger$t.error("Error: Form fields that rely on InputBase may not have an onChange property");
   }
   const handleInput = (e) => {
     var _a;
@@ -11523,7 +11800,7 @@ function useIsElementVisible(ref, fallback = true) {
   }, [ref]);
   return isOnScreen;
 }
-const logger$r = createLogger("SearchAddress");
+const logger$s = createLogger("SearchAddress");
 const SearchAddress = ({
   data,
   legalEntityId,
@@ -11566,7 +11843,7 @@ const SearchAddress = ({
       const response = await handleFindAddress(selectedAddressId);
       autocompleteAddressForm(response);
     } catch (e) {
-      logger$r.error(e);
+      logger$s.error(e);
     }
   };
   const onDrilldown = async (selectedAddress) => {
@@ -11578,7 +11855,7 @@ const SearchAddress = ({
       }, legalEntityId);
       setItems((response == null ? void 0 : response.results) || []);
     } catch (e) {
-      logger$r.error(e);
+      logger$s.error(e);
     }
   };
   const onChange = (e) => {
@@ -11633,7 +11910,7 @@ const SearchAddress = ({
           setItems([]);
         }
       } catch (e) {
-        logger$r.error(e);
+        logger$s.error(e);
       }
       setLoading(false);
     }
@@ -12193,6 +12470,7 @@ function Address(props) {
       maxlength: getMaxLengthByFieldAndCountry(countrySpecificFormatters, fieldName, data.country),
       hideField,
       "aria-label": formUtils.getLabel(fieldName, fieldName),
+      readOnly: formUtils.isReadOnly(fieldName),
       trimOnBlur: true
     }, fieldName);
   };
@@ -12320,16 +12598,22 @@ function RegistrationAddressComponent(props) {
   } = useI18nContext();
   const {
     id: id2,
-    data,
-    country: country2,
-    validators,
     heading,
     description: description2,
     handleAddressSearch,
     handleFindAddress,
-    optionalFields,
+    country: country2,
+    data,
+    validators,
     kompanyAddress
   } = props;
+  const {
+    requiredFields: registrationAddressRequiredFields,
+    optionalFields: registrationAddressOptionalFields,
+    readOnlyFields: registrationAddressReadOnlyFields,
+    obscuredFields: registrationAddressObscuredFields,
+    verifyFields: registrationAddressVerifyFields
+  } = getFormProps(props, props.id);
   const {
     data: formData,
     valid: formValid,
@@ -12342,9 +12626,17 @@ function RegistrationAddressComponent(props) {
     defaultData: data,
     rules: validators || registrationAddressValidationRules,
     obscuredFields: [],
-    optionalFields
+    optionalFields: registrationAddressOptionalFields
   });
-  const formUtils = formUtilities(props, i18n);
+  const mergedProps = {
+    ...props,
+    requiredFields: registrationAddressRequiredFields,
+    optionalFields: registrationAddressOptionalFields,
+    readOnlyFields: registrationAddressReadOnlyFields,
+    obscuredFields: registrationAddressObscuredFields,
+    verifyFields: registrationAddressVerifyFields
+  };
+  const formUtils = formUtilities(mergedProps, i18n);
   const stateRef = useRef({
     setState: null
   });
@@ -12374,8 +12666,8 @@ function RegistrationAddressComponent(props) {
       heading,
       description: description2
     }), jsx(ErrorPanel, {
-      verificationErrors: id2 ? (_b = (_a = props == null ? void 0 : props.problems) == null ? void 0 : _a.verificationErrors) == null ? void 0 : _b[id2] : void 0,
-      validationErrors: id2 ? (_d = (_c = props == null ? void 0 : props.problems) == null ? void 0 : _c.validationErrors) == null ? void 0 : _d[id2] : void 0,
+      verificationErrors: id2 ? (_b = (_a = props.problems) == null ? void 0 : _a.verificationErrors) == null ? void 0 : _b[id2] : void 0,
+      validationErrors: id2 ? (_d = (_c = props.problems) == null ? void 0 : _c.validationErrors) == null ? void 0 : _d[id2] : void 0,
       formUtils,
       id: "ariaErrorField"
     }), jsx(ContextGuidance, {
@@ -12750,7 +13042,7 @@ function CompanyComponent(props) {
   const companyNameAndCountryFormProps = getFormProps(props, CompanyNameAndCountryFormID);
   const companyTypeFormProps = getFormProps(props, CompanyTypeFormID);
   const companyRegistrationDetailsFormProps = getFormProps(props, CompanyRegistrationDetailsFormID);
-  const companyRegistrationAddressFormProps = getFormProps(props, CompanyRegistrationAddressFormID);
+  const companyRegistrationAddressFormProps = getNestedOuterFormPropsFromOuterFormProps(props, CompanyRegistrationAddressFormID);
   const companyRegistrationDocumentFormProps = getFormProps(props, CompanyRegistrationDocumentFormID);
   const companyTaxDocumentFormProps = getFormProps(props, CompanyTaxDocumentFormID);
   const handleStateChange = ({
@@ -13028,7 +13320,7 @@ const COUNTRIES_THAT_DONT_REQUIRE_SOLE_PROP_REGISTRATION = [CountryCodes.Austral
 const COUNTRIES_THAT_DONT_REQUIRE_COMPANY_REGISTRATION = [CountryCodes.PuertoRico, CountryCodes.UnitedStates];
 const COUNTRIES_WITH_POSSIBLE_REGISTRATION_EXEMPTIONS_FOR_SOLE_PROPS = [CountryCodes.Austria, CountryCodes.Canada, CountryCodes.Finland, CountryCodes.Germany, CountryCodes.Lithuania, CountryCodes.Luxembourg, CountryCodes.Poland, CountryCodes.Sweden, CountryCodes.Switzerland];
 const COUNTRIES_WITH_OPTIONAL_REGISTRATION_NUMBER = [CountryCodes.PuertoRico, CountryCodes.UnitedStates];
-const COUNTRIES_THAT_USE_TAX_ID_INSTEAD_OF_VAT = [CountryCodes.Australia, CountryCodes.Canada, CountryCodes.Gibraltar, CountryCodes.HongKong, CountryCodes.NewZealand, CountryCodes.PuertoRico, CountryCodes.Singapore, CountryCodes.UnitedStates];
+const COUNTRIES_THAT_USE_TAX_ID_INSTEAD_OF_VAT = [CountryCodes.Australia, CountryCodes.Canada, CountryCodes.Gibraltar, CountryCodes.HongKong, CountryCodes.NewZealand, CountryCodes.PuertoRico, CountryCodes.Singapore, CountryCodes.UnitedStates, CountryCodes.Guernsey, CountryCodes.Jersey, CountryCodes.IsleOfMan];
 const COUNTRIES_THAT_DO_NOT_USE_TAX_ID_FOR_SOLE_PROP = [CountryCodes.NewZealand, CountryCodes.Singapore];
 const COUNTRIES_WITH_POSSIBLE_TAX_EXEMPTION_FOR_COMPANIES = [
   // strictly a subset of countries which use tax ID
@@ -13054,16 +13346,7 @@ const rules$2 = ({
       return "REQUIRED";
     }
   },
-  stockExchangeMICIfTypePublic: () => {
-    var _a, _b;
-    if ("companyType" in data && ((_a = data.companyType) == null ? void 0 : _a.entityType) === CompanyTypesValue.PUBLIC_COMPANY) {
-      return "REQUIRED";
-    }
-    if ("companyStructure" in data && ((_b = data.companyStructure) == null ? void 0 : _b.entityType) === CompanyTypesValue.PUBLIC_COMPANY) {
-      return "REQUIRED";
-    }
-  },
-  stockISINIfTypePublic: () => {
+  ifPubliclyTradedCompany: () => {
     var _a, _b;
     if ("companyType" in data && ((_a = data.companyType) == null ? void 0 : _a.entityType) === CompanyTypesValue.PUBLIC_COMPANY) {
       return "REQUIRED";
@@ -13324,7 +13607,8 @@ const mandatoryApiFields = {
   DECISION_MAKER_OWNER: ["personalDetails.firstName", "personalDetails.lastName", "personalDetails.residencyCountry", "personalDetails.role"],
   ORGANIZATION: ["companyNameAndCountry.legalCompanyName", "companyNameAndCountry.country"],
   SOLE_PROPRIETORSHIP: ["solePropNameAndCountry.legalCompanyName", "solePropNameAndCountry.country"],
-  TRUST: ["trustRegistrationDetails.legalName", "trustRegistrationDetails.country"]
+  TRUST: ["trustRegistrationDetails.legalName", "trustRegistrationDetails.country"],
+  HIGH_EXPOSURE: ["company.numberOfEmployees", "parentCompany.numberOfEmployees", "ultimateParentCompany.numberOfEmployees"]
 };
 const individualObscuredFields = ["personalDetails.idNumber", "personalDetails.idNumberExempt"];
 const individualBaseMapping = {
@@ -13389,6 +13673,7 @@ const businessDetailsBaseMapping = {
   "additionalInformation.isUen": "organization.isUen",
   "additionalInformation.stockExchangeMIC": "organization.stockData.marketIdentifier",
   "additionalInformation.stockISIN": "organization.stockData.stockNumber",
+  "additionalInformation.stockTickerSymbol": "organization.stockData.tickerSymbol",
   "companyRegistrationAddress.registrationAddress.city": "organization.registeredAddress.city",
   "companyRegistrationAddress.registrationAddress.country": "organization.registeredAddress.country",
   "companyRegistrationAddress.registrationAddress.postalCode": "organization.registeredAddress.postalCode",
@@ -13415,6 +13700,7 @@ const companyBaseMapping = {
   "companyRegistrationDetails.isUen": "organization.isUen",
   "companyRegistrationDetails.stockExchangeMIC": "organization.stockData.marketIdentifier",
   "companyRegistrationDetails.stockISIN": "organization.stockData.stockNumber",
+  "companyRegistrationDetails.stockTickerSymbol": "organization.stockData.tickerSymbol",
   "companyRegistrationAddress.registrationAddress.city": "organization.registeredAddress.city",
   "companyRegistrationAddress.registrationAddress.country": "organization.registeredAddress.country",
   "companyRegistrationAddress.registrationAddress.postalCode": "organization.registeredAddress.postalCode",
@@ -13454,7 +13740,8 @@ const companySearchBaseMapping = {
   "companyOtherDetails.dateOfIncorporation": "organization.dateOfIncorporation",
   "companyOtherDetails.isUen": "organization.isUen",
   "companyOtherDetails.stockExchangeMIC": "organization.stockData.marketIdentifier",
-  "companyOtherDetails.stockISIN": "organization.stockData.stockNumber"
+  "companyOtherDetails.stockISIN": "organization.stockData.stockNumber",
+  "companyOtherDetails.stockTickerSymbol": "organization.stockData.tickerSymbol"
 };
 const trustBaseMapping = {
   "trustRegistrationDetails.trustType": "trust.type",
@@ -13496,6 +13783,11 @@ const solePropBaseMapping = {
   "solePropRegistrationAddress.operationalAddress.address": "soleProprietorship.principalPlaceOfBusiness.street",
   "solePropRegistrationAddress.operationalAddress.otherAddressInformation": "soleProprietorship.principalPlaceOfBusiness.street2"
 };
+const highExposureBaseMapping = {
+  "company.numberOfEmployees": "company.numberOfEmployees",
+  "parentCompany.numberOfEmployees": "parentCompany.numberOfEmployees",
+  "ultimateParentCompany.numberOfEmployees": "ultimateParentCompany.numberOfEmployees"
+};
 const businessDetailsComponentsKeyMapping = {
   "additionalInformation.exemptedFromVat": "organization.vatAbsenceReason",
   ...businessDetailsBaseMapping
@@ -13529,6 +13821,12 @@ const trustComponentsKeyMapping = {
 const trustApiKeyMapping = {
   ...reverseObject(trustBaseMapping)
 };
+const highExposureComponentsKeyMapping = {
+  ...highExposureBaseMapping
+};
+const highExposureApiKeyMapping = {
+  ...reverseObject(highExposureBaseMapping)
+};
 const solePropComponentsKeyMapping = {
   "solePropRegistrationDetails.exemptedFromVat": "soleProprietorship.vatAbsenceReason",
   ...solePropBaseMapping
@@ -13868,6 +14166,10 @@ const mapTrustToLegalEntity = (data) => {
   requestObj.type = LegalEntityType.TRUST;
   return requestObj;
 };
+const mapLegalEntityToHighExposure = (legalEntity) => formatObject(legalEntity, highExposureComponentsKeyMapping);
+const mapHighExposureToLegalEntity = (data) => ({
+  ...formatObject(data, highExposureApiKeyMapping)
+});
 const mapLegalEntityToSoleProp = (legalEntity) => {
   var _a, _b, _c, _d, _e, _f, _g, _h;
   let solePropCompData;
@@ -14485,7 +14787,7 @@ const initOnfido = async ({
     language: getOnfidoLocaleConfig(i18n)
   });
 };
-const logger$q = createLogger("IdVerificationComponent");
+const logger$r = createLogger("IdVerificationComponent");
 function IdVerificationComponent({
   userDetails,
   legalEntityId,
@@ -14517,7 +14819,7 @@ function IdVerificationComponent({
         onIdVerificationError,
         onIdVerificationComplete
       });
-    })().catch(logger$q.error);
+    })().catch(logger$r.error);
     return () => {
       if (onfidoSdk.current) onfidoSdk.current.tearDown();
     };
@@ -14567,7 +14869,7 @@ function IdDocumentAlreadyUpload(props) {
     })]
   });
 }
-const logger$p = createLogger("IdDocumentInstantVerificationComponent");
+const logger$q = createLogger("IdDocumentInstantVerificationComponent");
 const idVerificationSchema = ["instantIdVerificationData", "idDocumentType"];
 const documentTypeValidationRules = {
   instantIdVerificationData: {
@@ -14649,7 +14951,7 @@ function IdDocumentInstantVerificationComponent(props) {
         userDetails: props.userDetails,
         legalEntityId: props.legalEntityId,
         onIdVerificationComplete: handleIdVerificationComplete,
-        onIdVerificationError: logger$p.error
+        onIdVerificationError: logger$q.error
       }), jsxs("div", {
         className: "adyen-kyc-document-upload__manual-upload",
         children: [i18n.get("canNotCompleteInstantVerification"), " ", jsx("button", {
@@ -14925,54 +15227,83 @@ function IdVerificationMethodComponent(props) {
     })]
   });
 }
-const FIELD = "idNumber";
-const verifyIdNumberHelper = (idRtnData) => {
-  if ((idRtnData == null ? void 0 : idRtnData.status) === 422 || (idRtnData == null ? void 0 : idRtnData.verified) === "false") {
-    return {
-      status: "error",
-      data: idRtnData,
-      fieldName: FIELD,
-      translationKey: "unableToVerifyTheIdNumber"
-    };
-  }
-  if ((idRtnData == null ? void 0 : idRtnData.status) === 500) {
-    return {
-      status: "verified",
-      data: idRtnData,
-      fieldName: FIELD
-    };
-  }
-  if ((idRtnData == null ? void 0 : idRtnData.verified) === "true") {
-    return {
-      status: "verified",
-      data: idRtnData,
-      fieldName: FIELD
-    };
+const COUNTRY_ID_NUMBER_MASKS = {
+  [CountryCodes.PuertoRico]: {
+    length: 4
+  },
+  [CountryCodes.UnitedStates]: {
+    length: 4
   }
 };
+const FIELD = "idNumber";
+const handleVerifyIdNumber = async (formData, country2, verifyFn) => {
+  var _a, _b;
+  const verified2 = {
+    field: "idNumber",
+    isVerified: true
+  };
+  if (formData.idNumberExempt) return verified2;
+  const isCountryWithMaskedIdNumber = Object.keys(COUNTRY_ID_NUMBER_MASKS).includes(country2);
+  const isValueMasked = ((_a = formData.idNumber) == null ? void 0 : _a.length) === ((_b = COUNTRY_ID_NUMBER_MASKS[country2]) == null ? void 0 : _b.length);
+  if (isCountryWithMaskedIdNumber && isValueMasked) return verified2;
+  const response = await verifyFn({
+    name: {
+      firstName: formData.firstName || "",
+      lastName: formData.lastName || ""
+    },
+    countryCode: country2,
+    idNumber: formData.idNumber || ""
+  });
+  const isNotVerified = (response == null ? void 0 : response.status) === 422 || (response == null ? void 0 : response.verified) === "false";
+  if (isNotVerified) return {
+    field: FIELD,
+    isVerified: false,
+    messageKey: "unableToVerifyTheIdNumber"
+  };
+  return {
+    field: FIELD,
+    isVerified: true
+  };
+};
+const FIELDS_WITH_EXTERNAL_VERIFICATION = ["idNumber"];
 function useVerification(fieldsToVerify, country2) {
   const {
     verifyIdNumber: verifyIdNumber2
   } = useConfigurationApi();
   const hasFieldsToVerify = !!(fieldsToVerify == null ? void 0 : fieldsToVerify.length);
   const verifyFields = useCallback(async (formState, savedData) => {
-    const verificationPromises = [];
-    fieldsToVerify.forEach((field) => {
-      if (field === "idNumber" && formState.data[field]) {
-        if (formState.data[field] === savedData[field] || country2 === "US" && formState.data[field].length === 4) return;
-        const request = {
-          name: {
-            firstName: formState.data.firstName,
-            lastName: formState.data.lastName
-          },
-          countryCode: country2,
-          idNumber: formState.data.idNumber
-        };
-        const verifyIdPromise = verifyIdNumber2(request).then((response) => verifyIdNumberHelper(response));
-        verificationPromises.push(verifyIdPromise);
+    const isVerifications = fieldsToVerify.some((field) => FIELDS_WITH_EXTERNAL_VERIFICATION.includes(field));
+    if (!isVerifications) return [];
+    const verifications = fieldsToVerify.filter((f) => {
+      const field = f;
+      const isValue = formState.data[field];
+      if (!isValue) return false;
+      const isDirty = isValue && formState.data[field] !== savedData[field];
+      if (!isDirty) return false;
+      if (typeof field !== "string") return false;
+      const hasVerification = FIELDS_WITH_EXTERNAL_VERIFICATION.includes(field);
+      if (hasVerification) return true;
+      return false;
+    }).map(async (field) => {
+      switch (field) {
+        case "idNumber":
+          return handleVerifyIdNumber(
+            // made this hook more agnostic in general
+            // and removed the ts-strict-ignore
+            //
+            // need to coerce the schema here to make the check happy
+            formState.data,
+            country2,
+            verifyIdNumber2
+          );
+        default:
+          return {
+            field,
+            isVerified: true
+          };
       }
     });
-    return Promise.all(verificationPromises);
+    return Promise.all(verifications);
   }, [fieldsToVerify, country2]);
   return {
     hasFieldsToVerify,
@@ -16894,7 +17225,7 @@ function PersonalDetailsComponent(props) {
       verifyFields({
         data: personalDetailsData
       }, props.data).then((verifiedArr) => {
-        const isVerified = verifiedArr.every((item) => item.status === "verified");
+        const isVerified = verifiedArr.every((item) => (item == null ? void 0 : item.isVerified) === true);
         const t1 = performance.now();
         const elapsedTime = Math.floor(t1 - t0);
         if (elapsedTime < minTime) {
@@ -16911,10 +17242,10 @@ function PersonalDetailsComponent(props) {
             ...externalErrors
           };
           verifiedArr.forEach((error) => {
-            if (error.status === "error") {
-              errorObj[error.fieldName] = {
+            if (error.isVerified === false) {
+              errorObj[error.field] = {
                 isValid: false,
-                errorMessage: error.translationKey
+                errorMessage: error.messageKey
               };
             }
           });
@@ -18093,7 +18424,7 @@ class AdyenKycSdkError extends Error {
 }
 let sdkToken;
 let fetchSdkToken;
-const logger$o = createLogger("Session");
+const logger$p = createLogger("Session");
 const setSdkToken = (token) => {
   sdkToken = token;
 };
@@ -18116,7 +18447,7 @@ const refreshSession = async () => {
     setSdkToken(token);
     isSessionRefreshed = true;
   } catch (e) {
-    logger$o.error("Failed to fetch sdk token", e);
+    logger$p.error("Failed to fetch sdk token", e);
   }
   return isSessionRefreshed;
 };
@@ -18126,7 +18457,7 @@ const addAnimationStartListener = (element, listener) => {
 const removeAnimationStartListener = (element, listener) => {
   element.removeEventListener("animationstart", listener, false);
 };
-const logger$n = createLogger("Fetch");
+const logger$o = createLogger("Fetch");
 const getRequestObject = (options, data) => {
   const {
     headers = [],
@@ -18173,10 +18504,10 @@ const logFetchError = (message, level) => {
     case "info":
     case "warn":
     case "error":
-      logger$n[level](message);
+      logger$o[level](message);
       break;
     default:
-      logger$n.error(message);
+      logger$o.error(message);
   }
 };
 const handleFetchResponse = async (response, responseType) => {
@@ -18274,7 +18605,7 @@ const RELEVANT_MESSAGE_TYPES = ["account_verification_report_id", "error"];
 const TERMINAL_DATA_PROPS = ["accounts", "error", "reference"];
 const MOUNT_TIMEOUT = 10 * 1e3;
 const TINK_VENDOR = "Tink";
-const logger$m = createLogger("iframeWidget");
+const logger$n = createLogger("iframeWidget");
 const isObjectData = (data) => typeof data === "object" && !Array.isArray(data) && data !== null;
 const isTerminalMessageData = (data) => isObjectData(data) && Object.entries(data).some(([prop]) => TERMINAL_DATA_PROPS.includes(prop));
 const parseMessageJson = (message) => {
@@ -18292,7 +18623,7 @@ const callbackErrorHandler = async (response) => {
   try {
     await response;
   } catch (ex) {
-    logger$m.error(ex);
+    logger$n.error(ex);
   }
   return {
     error: "UNKNOWN_ERROR",
@@ -18395,7 +18726,7 @@ class IFrameWidget {
             message = responseData.errorMessage;
           }
         } catch (ex) {
-          logger$m.error(ex);
+          logger$n.error(ex);
         }
         throw new AdyenKycSdkError(reason, jsonData.error);
       }
@@ -18582,7 +18913,7 @@ function BankVerificationWidget({
     ref: widgetContainerRef
   });
 }
-const logger$l = createLogger("BankVerification");
+const logger$m = createLogger("BankVerification");
 const accountVerificationFields = ["verifiedAccountHolder", "verifiedBankCountry", "verifiedBankName", "verifiedCurrencyCode", "verifiedBankAccountNumber"];
 const InstantVerificationErrorContext = createContext(null);
 const useInstantVerificationErrorNotification = (notificationVisibilityDuration) => {
@@ -18614,7 +18945,7 @@ const usePreferredVendorForCountry = (country2, getBankVerificationVendors) => {
       const vendor = vendors[0];
       setPreferredVendor(vendor.name ? vendor : void 0);
     };
-    getPreferredVendor().catch(logger$l.error);
+    getPreferredVendor().catch(logger$m.error);
   }, [country2, getBankVerificationVendors]);
   return preferredVendor;
 };
@@ -18813,6 +19144,12 @@ function BankVerification(props) {
   });
 }
 const BankVerification$1 = memo(BankVerification);
+const CoreContext = createContext(void 0);
+const useCoreContext = () => {
+  const context = useContext(CoreContext);
+  if (!context) throw Error("You need a <CoreProvider> to use core context");
+  return context;
+};
 const countriesWithMultipleCurrencies = /* @__PURE__ */ new Set([CountryCodes.Bulgaria, CountryCodes.Canada, CountryCodes.Croatia, CountryCodes.CzechRepublic, CountryCodes.Hungary, CountryCodes.Romania, CountryCodes.Switzerland]);
 const countriesWithLocalFormat = /* @__PURE__ */ new Set([CountryCodes.Denmark, CountryCodes.Norway, CountryCodes.Poland, CountryCodes.Sweden, CountryCodes.UnitedKingdom]);
 const payoutCurrencySupport = {
@@ -20514,7 +20851,7 @@ function SolePropComponent(props) {
   const [tradingName2, setTradingName] = useState();
   const solePropNameAndCountryFormProps = getFormProps(props, solePropNameAndCountryFormId);
   const solePropsRegistrationDetailsFormProps = getFormProps(props, solePropRegistrationDetailsFormId);
-  const solePropRegistrationAddressFormProps = getFormProps(props, solePropRegistrationAddressFormId);
+  const solePropRegistrationAddressFormProps = getNestedOuterFormPropsFromOuterFormProps(props, solePropRegistrationAddressFormId);
   const solePropDocumentsFormProps = getFormProps(props, solePropDocumentFormId);
   const handleStateChange = ({
     currentState
@@ -21111,10 +21448,11 @@ function TrustComponent(props) {
     i18n
   } = useI18nContext();
   const trustRegistrationDetailsFormProps = getFormProps(props, trustRegistrationDetailsFormId);
-  const trustRegistrationAddressFormProps = getFormProps(props, trustRegistrationAddressFormId);
+  const trustRegistrationAddressFormProps = getNestedOuterFormPropsFromOuterFormProps(props, trustRegistrationAddressFormId);
   const trustDocumentFormProps = getFormProps(props, trustConstitutionalDocumentFormId);
   const handleStateChange = () => {
   };
+  console.log("trustRegistrationDetailsFormProps", trustRegistrationDetailsFormProps);
   const renderActiveForm = (activeForm) => jsxs("div", {
     className: "adyen-kyc-trust",
     children: [jsx(StateContextWatcher, {
@@ -21841,6 +22179,55 @@ function ErrorPanel({
     })]
   });
 }
+const headingTypes = {
+  1: ({
+    children,
+    className
+  }) => jsx("h1", {
+    className,
+    children
+  }),
+  2: ({
+    children,
+    className
+  }) => jsx("h2", {
+    className,
+    children
+  }),
+  3: ({
+    children,
+    className
+  }) => jsx("h3", {
+    className,
+    children
+  }),
+  4: ({
+    children,
+    className
+  }) => jsx("h4", {
+    className,
+    children
+  }),
+  sub: ({
+    children,
+    className
+  }) => jsx("div", {
+    className,
+    children
+  })
+};
+function Heading({
+  className,
+  level,
+  children
+}) {
+  const HeadingElement = headingTypes[level] || headingTypes[1];
+  const classNames = cx("adyen-kyc-heading", `adyen-kyc-heading--${level}`, className);
+  return jsx(HeadingElement, {
+    className: classNames,
+    children
+  });
+}
 const summaryStep = {
   formId: "summary",
   formName: "summary"
@@ -21869,61 +22256,58 @@ function Summary({
       gotoForm(formIndex);
     }
   };
-  const allValidationErrors = (problems == null ? void 0 : problems.validationErrors) && ((_a = Object.values(problems == null ? void 0 : problems.validationErrors)) == null ? void 0 : _a.reduce((acc, validError) => ({
+  const allValidationErrors = (problems == null ? void 0 : problems.validationErrors) && ((_a = Object.values(problems.validationErrors)) == null ? void 0 : _a.reduce((acc, validError) => ({
     ...acc,
     ...validError
   }), {}));
-  const allVerificationErrors = (problems == null ? void 0 : problems.verificationErrors) && ((_b = Object.values(problems == null ? void 0 : problems.verificationErrors)) == null ? void 0 : _b.reduce((acc, verifError) => ({
+  const allVerificationErrors = (problems == null ? void 0 : problems.verificationErrors) && ((_b = Object.values(problems.verificationErrors)) == null ? void 0 : _b.reduce((acc, verifError) => ({
     ...acc,
     ...verifError
   }), {}));
   const formUtils = formUtilities({
     labels: labels2
   }, i18n);
-  const summaryItemHeader = (formName, formId) => jsxs("ul", {
-    className: "adyen-kyc-summary__heading-section",
-    children: [jsx("li", {
-      children: jsx("span", {
-        className: "adyen-kyc-summary__form-heading",
-        children: formName
-      })
-    }), jsx("li", {
-      children: jsx(Button, {
-        className: "adyen-kyc-summary__edit-form-button",
-        ghost: true,
-        circle: true,
-        tertiary: true,
-        icon: "edit",
-        onClick: () => {
-          trackNavigation2({
-            fromForm: {
-              formName: "summary",
-              formId: "summary"
-            },
-            toForm: {
-              formId,
-              formName
-            },
-            component: "Pencil icon"
-          });
-          editForm(formId);
-        },
-        title: i18n.get("edit"),
-        label: i18n.get("edit"),
-        labelHoverBox: true
-      })
+  const summarySectionHeader = (formName, formId) => jsxs("header", {
+    className: "adyen-kyc-summary-section__header",
+    children: [jsx(Heading, {
+      level: 4,
+      className: "adyen-kyc-summary-section__heading",
+      children: formName
+    }), jsx(Button, {
+      className: "adyen-kyc-summary-section__edit-button",
+      ghost: true,
+      circle: true,
+      tertiary: true,
+      icon: "edit",
+      onClick: () => {
+        trackNavigation2({
+          fromForm: {
+            formName: "summary",
+            formId: "summary"
+          },
+          toForm: {
+            formId,
+            formName
+          },
+          component: "Pencil icon"
+        });
+        editForm(formId);
+      },
+      title: i18n.get("edit"),
+      label: i18n.get("edit"),
+      labelHoverBox: true
     })]
   });
-  const renderSummaryItem = (fieldData, labelData, formName, formId) => jsxs("li", {
-    className: "adyen-kyc-summary__item",
-    children: [showSectionHeader && summaryItemHeader(formName, formId), jsx("ul", {
-      className: cx("adyen-kyc-summary__content-section", {
-        "adyen-kyc-summary__content-section--with-header": showSectionHeader
+  const renderSummarySection = (fieldData, labelData, formName, formId) => jsxs("section", {
+    className: "adyen-kyc-summary-section",
+    children: [showSectionHeader && summarySectionHeader(formName, formId), jsx("dl", {
+      className: cx("adyen-kyc-summary-section__content", {
+        "adyen-kyc-summary-section__content--no-header": !showSectionHeader
       }),
-      children: renderFormData(fieldData, labelData)
+      children: renderSummaryItems(fieldData, labelData)
     })]
   });
-  const renderSummary = (data2) => {
+  const renderSummaryContent = (data2) => {
     const summaryList = [];
     forms2.forEach(({
       formId,
@@ -21931,53 +22315,44 @@ function Summary({
     }) => {
       const currentFormData = data2[formId];
       const isFormEmpty = !currentFormData || Object.values(currentFormData).every((value) => isEmpty(value));
-      if (isFormEmpty || formId === summaryStep.formId || omittedForms.includes(formId)) {
-        return;
-      }
-      const summaryItems = currentFormData.hasInnerForms ? renderInnerForms(labels2 == null ? void 0 : labels2[formId], formId, currentFormData) : currentFormData ? renderSummaryItem(currentFormData, labels2 == null ? void 0 : labels2[formId], i18n.get(formName), formId) : null;
+      if (isFormEmpty || formId === summaryStep.formId || omittedForms.includes(formId)) return;
+      const summaryItems = currentFormData.hasInnerForms ? renderInnerForms(labels2 == null ? void 0 : labels2[formId], formId, currentFormData) : renderSummarySection(currentFormData, labels2 == null ? void 0 : labels2[formId], i18n.get(formName), formId);
       summaryList.push(summaryItems);
     });
     return summaryList;
   };
   const renderInnerForms = (labelData, parentFormId, innerForms = {}) => {
+    if (!innerForms) return [];
     const dataList = [];
-    if (innerForms) {
-      Object.entries(innerForms).forEach(([innerFormName, innerFormFieldData]) => {
-        const formName = i18n.get(labelData == null ? void 0 : labelData[innerFormName]) || i18n.get(innerFormName);
-        if (typeof innerFormFieldData === "object" && innerFormFieldData !== null) {
-          dataList.push(renderSummaryItem(innerFormFieldData, labelData, formName, parentFormId));
-        }
-      });
-    }
+    Object.entries(innerForms).forEach(([innerFormName, innerFormFieldData]) => {
+      const formName = i18n.get(labelData == null ? void 0 : labelData[innerFormName]) || i18n.get(innerFormName);
+      if (typeof innerFormFieldData === "object" && innerFormFieldData !== null) {
+        dataList.push(renderSummarySection(innerFormFieldData, labelData, formName, parentFormId));
+      }
+    });
     return dataList;
   };
-  const renderFormData = (formData = {}, labelData = {}) => {
+  const renderSummaryItems = (formData = {}, labelData = {}) => {
+    if (!formData) return [];
     const dataList = [];
-    if (formData) {
-      Object.entries(formData).forEach(([field, fieldData]) => {
-        const fieldName = i18n.get(labelData[field]) || i18n.get(field);
-        if (typeof fieldData === "object" && fieldData !== null && !(omittedKeys == null ? void 0 : omittedKeys.includes(field))) {
-          dataList.push(jsx("li", {
-            className: "adyen-kyc-summary__item-nested",
-            children: jsx("ul", {
-              className: "adyen-kyc-summary__content-section-nested",
-              children: renderFormData(fieldData, labelData)
-            })
-          }));
-        } else if (typeof fieldData === "string" && !(omittedKeys == null ? void 0 : omittedKeys.includes(field))) {
-          dataList.push(jsxs("li", {
-            className: "adyen-kyc-summary__data-item",
-            children: [jsx("span", {
-              className: "adyen-kyc-summary__field",
-              children: fieldName
-            }), jsx("span", {
-              className: "adyen-kyc-summary__data",
-              children: fieldData
-            })]
-          }));
-        }
-      });
-    }
+    Object.entries(formData).forEach(([field, fieldData]) => {
+      if ((omittedKeys == null ? void 0 : omittedKeys.includes(field)) || !fieldData) return;
+      const fieldName = i18n.get(labelData[field]) || i18n.get(field);
+      if (typeof fieldData === "object") {
+        dataList.push(renderSummaryItems(fieldData, labelData));
+      } else if (typeof fieldData === "string") {
+        dataList.push(jsxs("div", {
+          className: "adyen-kyc-summary-section__field",
+          children: [jsx("dt", {
+            className: "adyen-kyc-summary-section__label",
+            children: fieldName
+          }), jsx("dd", {
+            className: "adyen-kyc-summary-section__data",
+            children: fieldData
+          })]
+        }));
+      }
+    });
     return dataList;
   };
   return jsxs("div", {
@@ -21991,9 +22366,9 @@ function Summary({
       verificationErrors: allVerificationErrors,
       formUtils,
       id: "ariaErrorField"
-    }), jsx("ul", {
-      className: "adyen-kyc-summary",
-      children: renderSummary(data)
+    }), jsx("div", {
+      className: "adyen-kyc-summary__content",
+      children: renderSummaryContent(data)
     }), showLegalCaption && jsx("span", {
       className: "adyen-kyc-summary__legal-caption",
       children: i18n.get("summaryLegalCaption")
@@ -22217,7 +22592,7 @@ const defaultPayoutAccountFormat = {
   [CountryCodes.Sweden]: "local",
   [CountryCodes.UnitedKingdom]: "local"
 };
-const logger$k = createLogger("useScenarioConfiguration");
+const logger$l = createLogger("useScenarioConfiguration");
 const useScenarioConfiguration = ({
   getConfigurationData,
   getPayoutAccountFormatData,
@@ -22240,12 +22615,12 @@ const useScenarioConfiguration = ({
         const response = await getConfigurationData();
         setConfigurationResponse(response);
       } catch (err) {
-        logger$k.warn("WARNING: Configuration request failed - error:", err);
+        logger$l.warn("WARNING: Configuration request failed - error:", err);
       } finally {
         setLoadingStatus("success");
       }
     };
-    makeConfigCallAndSave().catch(logger$k.error);
+    makeConfigCallAndSave().catch(logger$l.error);
   }, [getConfigurationData, setLoadingStatus]);
   useEffect(() => {
     setLoadingStatus("loading");
@@ -22262,12 +22637,12 @@ const useScenarioConfiguration = ({
         const defaultAccountFormat = defaultPayoutAccountFormat[country2] ?? allowedBankAccountFormats[0];
         setAccountFormat(existingBankAccountFormat ?? defaultAccountFormat);
       } catch (err) {
-        logger$k.warn("WARNING: Payout format request failed - error:", err);
+        logger$l.warn("WARNING: Payout format request failed - error:", err);
       } finally {
         setLoadingStatus("success");
       }
     };
-    makePayoutFormatCallAndSave().catch(logger$k.error);
+    makePayoutFormatCallAndSave().catch(logger$l.error);
   }, [country2, setAccountFormat, getPayoutAccountFormatData, setLoadingStatus, existingBankAccountFormat]);
   const {
     fieldConfigurations,
@@ -22436,10 +22811,13 @@ const solePropBase = {
     rule: "REQUIRED"
   },
   stockExchangeMIC: {
-    rule: "stockExchangeMICIfTypePublic"
+    rule: "ifPubliclyTradedCompany"
   },
   stockISIN: {
-    rule: "stockISINIfTypePublic"
+    rule: "ifPubliclyTradedCompany"
+  },
+  stockTickerSymbol: {
+    rule: "ifPubliclyTradedCompany"
   },
   tradingName: {
     rule: "REQUIRED"
@@ -22563,6 +22941,10 @@ function parseTrustScenarios(scenario, country2) {
     return fieldConfigurations;
   }
 }
+const parseHighExposureScenarios = (scenario) => scenario == null ? void 0 : scenario.reduce((scenarios, scenarioName) => ({
+  ...scenarios,
+  ...fieldsPerScenario$1[scenarioName]
+}), {});
 function parseSolePropScenarios(scenario, country2) {
   if (scenario) {
     let fieldConfigurations = scenario.reduce((scenarios, scenarioName) => ({
@@ -23365,7 +23747,7 @@ function VatNumberField({
 }
 const BUSINESS_NAME_FIELD = ["businessName"];
 const basicInformationFields = [...COUNTRY_FIELD, ...BUSINESS_NAME_FIELD, ...STATE_FIELD, ...TAX_INFORMATION_FIELD, ...BUSINESS_REGISTRATION_NUMBER_FIELD];
-const additionalInformationFields = [...LEGAL_COMPANY_NAME_FIELD, ...TRADING_NAME_FIELD, ...STOCK_EXCHANGE_MIC_FIELD, ...STOCK_ISIN_FIELD, ...DATE_OF_INCORPORATION_FIELD, ...BUSINESS_REGISTRATION_NUMBER_FIELD, ...TAX_INFORMATION_FIELD, ...VAT_NUMBER_FIELD];
+const additionalInformationFields = [...LEGAL_COMPANY_NAME_FIELD, ...TRADING_NAME_FIELD, ...STOCK_EXCHANGE_MIC_FIELD, ...STOCK_ISIN_FIELD, ...STOCK_TICKER_SYMBOL_FIELD, ...DATE_OF_INCORPORATION_FIELD, ...BUSINESS_REGISTRATION_NUMBER_FIELD, ...TAX_INFORMATION_FIELD, ...VAT_NUMBER_FIELD];
 const FIELDS_NEEDED_FOR_COMPANY_SEARCH = [...BUSINESS_NAME_FIELD, ...TAX_INFORMATION_FIELD, ...BUSINESS_REGISTRATION_NUMBER_FIELD];
 const getForms = (country2) => ({
   basicInformation: {
@@ -23843,7 +24225,7 @@ const useExpiryThreshold = (expiry) => {
   };
 };
 const ExpiryContext = createContext(false);
-const logger$j = createLogger("ExpiryProvider");
+const logger$k = createLogger("ExpiryProvider");
 const ExpiryProvider = ({
   expiry: initialExpiry,
   eventEmitter,
@@ -23876,7 +24258,7 @@ const ExpiryProvider = ({
           refreshExpiry().then((newExpiry) => {
             setExpiry(newExpiry);
             setModalDismissed(false);
-          }).catch(logger$j.error);
+          }).catch(logger$k.error);
         }
       }), children]
     });
@@ -23896,7 +24278,7 @@ const ExpiryProvider = ({
   });
 };
 const useHasExpired = () => useContext(ExpiryContext);
-const logger$i = createLogger("FormRouterContextProvider");
+const logger$j = createLogger("FormRouterContextProvider");
 function FormRouterContextProvider({
   children,
   forms: forms2,
@@ -23916,7 +24298,7 @@ function FormRouterContextProvider({
       if (formIndex > -1) {
         setFormIndex(formIndex);
       } else {
-        logger$i.error("No form was found to have that field so form navigation failed.");
+        logger$j.error("No form was found to have that field so form navigation failed.");
       }
     }
   }), [forms2, handleGetIdVerificationToken, setFormIndex]);
@@ -24081,7 +24463,7 @@ const FormWrapper = ({
     isExperimentEnabled
   } = useExperimentsContext();
   const showExtraTaxExemptionReasons = isExperimentEnabled(ExperimentNames.ShowExtraTaxExemptionReasons);
-  const showTaxExemptedLegalCaption = showExtraTaxExemptionReasons && ((_a = summaryData.companyRegistrationDetails) == null ? void 0 : _a.vatAbsenceReason);
+  const showTaxExemptedLegalCaption = showExtraTaxExemptionReasons && ((_a = summaryData.companyRegistrationDetails) == null ? void 0 : _a.vatAbsenceReason) && ["companyDetails"].includes(taskName);
   const summaryContent = jsx("div", {
     className: "adyen-kyc-form-wrapper",
     children: jsx(Summary, {
@@ -24178,11 +24560,16 @@ const validateErrorCode = (error, errorCode) => error && "errorCode" in error &&
 const isValidationError = (error) => validateErrorCode(error, API_VALIDATION_ERROR_CODE);
 const isIdDocumentUploadError = (error) => validateErrorCode(error, ID_DOCUMENT_UPLOAD_ERROR_CODE);
 const isBankStatementUploadError = (error) => validateErrorCode(error, BANK_STATEMENT_UPLOAD_ERROR_CODE);
-const processValidationErrors = (validationError, dropinTask) => {
+const processValidationErrors = (validationError, dropinTask, keyMappings) => {
   if ((validationError == null ? void 0 : validationError.invalidFields) && (validationError == null ? void 0 : validationError.invalidFields.length) > 0) {
     return validationError == null ? void 0 : validationError.invalidFields.reduce((acc, invalidField) => {
       if (invalidField == null ? void 0 : invalidField.name) {
-        const mappedFieldPath = mapField(invalidField == null ? void 0 : invalidField.name, dropinTask);
+        let mappedFieldPath = mapField(invalidField == null ? void 0 : invalidField.name, dropinTask);
+        if (keyMappings) {
+          mappedFieldPath = {
+            ...keyMappings
+          };
+        }
         if (mappedFieldPath) {
           assignToProp(mappedFieldPath, acc, true);
         }
@@ -24244,7 +24631,7 @@ const mapBusinessDetailsSchemaToLegalEntity = (data) => {
   return requestObj;
 };
 const MANDATORY_API_FIELDS = ["basicInformation.legalCompanyName", "basicInformation.country"];
-const parseConfiguration$6 = ({
+const parseConfiguration$7 = ({
   country: country2,
   matchingScenario
 }) => parseBusinessDetailsScenarios(matchingScenario == null ? void 0 : matchingScenario[LegalEntityType.ORGANIZATION], country2);
@@ -24260,15 +24647,7 @@ const formatDataForSummary$1 = (data, forms2, labels2, i18n) => {
     if (!form) return summaryData;
     switch (form) {
       case "basicInformation":
-        return {
-          ...summaryData,
-          [form]: formData
-        };
       case "companyStructure":
-        return {
-          ...summaryData,
-          [form]: formData
-        };
       case "additionalInformation":
         return {
           ...summaryData,
@@ -24504,7 +24883,7 @@ function BusinessDetailsDropinComponent({
   const {
     fieldConfigurations
   } = useScenarioConfiguration({
-    parseConfiguration: parseConfiguration$6,
+    parseConfiguration: parseConfiguration$7,
     getConfigurationData,
     setLoadingStatus,
     country: currentCountry
@@ -24791,7 +25170,7 @@ const getTargetLegalEntityType = (businessType, legalArrangement, trusteeType, c
   return currentLegalEntityType;
 };
 const isLegalArrangementOrganizationSubtype = (legalArrangementOption) => legalArrangementOption === "partnershipIncorporated" || legalArrangementOption === "associationIncorporated";
-const parseConfiguration$5 = ({
+const parseConfiguration$6 = ({
   country: country2,
   matchingScenario
 }) => parseCompanyScenarios(matchingScenario == null ? void 0 : matchingScenario[LegalEntityType.ORGANIZATION], country2);
@@ -24840,10 +25219,13 @@ function CompanyDropinComponent({
   handleUpdateLegalEntity,
   handleHomeClick,
   onTypeSwitch,
-  onChange,
-  accountHolder: accountHolder2
+  onChange
 }) {
   var _a, _b;
+  const {
+    accountHolder: accountHolder2,
+    setAccountHolder
+  } = useCoreContext();
   const {
     showToast,
     clearToasts
@@ -24888,7 +25270,7 @@ function CompanyDropinComponent({
     fieldConfigurations,
     requiredFields
   } = useScenarioConfiguration({
-    parseConfiguration: parseConfiguration$5,
+    parseConfiguration: parseConfiguration$6,
     getConfigurationData,
     setLoadingStatus,
     country: country2
@@ -24975,7 +25357,8 @@ function CompanyDropinComponent({
       legalEntityName: dataSubmitted.companyNameAndCountry.legalCompanyName,
       usedAdditionalAddress: dataSubmitted.companyRegistrationAddress.operationalAddressIsSame === operationalAddressIsSameIds.OPERATIONAL_ADDRESS_IS_NOT_SAME
     };
-    legalEntity.entityAssociations = filterOutUnwantedAssociationsIfRootLE(taskType, legalEntityResponse, dataSubmitted.companyType.accountHolder);
+    const newAccountHolder = dataSubmitted.companyType.accountHolder ?? accountHolder2;
+    legalEntity.entityAssociations = filterOutUnwantedAssociationsIfRootLE(taskType, legalEntityResponse, newAccountHolder);
     if (!isCountryOfGoverningLawEnabled && ((_a2 = legalEntity.organization) == null ? void 0 : _a2.countryOfGoverningLaw)) {
       delete legalEntity.organization.countryOfGoverningLaw;
     }
@@ -24991,6 +25374,7 @@ function CompanyDropinComponent({
       } else {
         legalEntity = await handleUpdateLegalEntity(drop("type").from(legalEntity), legalEntityResponse.id);
       }
+      setAccountHolder(newAccountHolder);
       userEvents.addEvent("Saved company details", {
         segmentation: {
           ...baseTrackingPayload,
@@ -25069,33 +25453,32 @@ function CompanyDropinComponent({
   }, []);
   const datasetUtils = datasetUtilities(i18n.locale);
   const formatDataForSummary2 = (data2, forms22) => {
-    var _a2, _b2, _c, _d, _e, _f, _g, _h;
+    var _a2, _b2, _c, _d, _e, _f;
     let summaryData = cloneObject(data2);
-    if ((_a2 = summaryData == null ? void 0 : summaryData.companyNameAndCountry) == null ? void 0 : _a2.country) {
-      summaryData.companyNameAndCountry.countryRegionOfEstablishment = datasetUtils.getCountryName(summaryData.companyNameAndCountry.country);
+    if (summaryData.companyNameAndCountry) {
+      if (isCountryOfGoverningLawEnabled) {
+        summaryData.companyNameAndCountry = getUpdatedCountryOfGoverningLaw(summaryData.companyNameAndCountry);
+      } else {
+        summaryData.companyNameAndCountry.country = datasetUtils.getCountryName(summaryData.companyNameAndCountry.country);
+      }
+      summaryData.companyNameAndCountry.countryRegionOfEstablishment = summaryData.companyNameAndCountry.country;
       delete summaryData.companyNameAndCountry.country;
     }
-    if (isCountryOfGoverningLawEnabled) {
-      summaryData.companyNameAndCountry = getUpdatedCountryOfGoverningLaw(summaryData.companyNameAndCountry);
-    }
-    if ((_b2 = summaryData == null ? void 0 : summaryData.companyType) == null ? void 0 : _b2.entityType) {
-      const companyType2 = (_c = companyTypes.find((companyType22) => {
-        var _a3;
-        return companyType22.id === ((_a3 = summaryData.companyType) == null ? void 0 : _a3.entityType);
-      })) == null ? void 0 : _c.name;
+    if ((_a2 = summaryData.companyType) == null ? void 0 : _a2.entityType) {
+      const companyType2 = (_b2 = companyTypes.find((type) => type.id === summaryData.companyType.entityType)) == null ? void 0 : _b2.name;
       summaryData.companyType.entityType = i18n.get(companyType2);
     }
-    if ((_d = summaryData == null ? void 0 : summaryData.companyType) == null ? void 0 : _d.accountHolder) {
-      summaryData.companyType.accountHolder = i18n.get((_e = summaryData == null ? void 0 : summaryData.companyType) == null ? void 0 : _e.accountHolder);
+    if ((_c = summaryData.companyType) == null ? void 0 : _c.accountHolder) {
+      summaryData.companyType.accountHolder = i18n.get(summaryData.companyType.accountHolder);
     }
-    if ((_f = summaryData == null ? void 0 : summaryData.companyRegistrationAddress) == null ? void 0 : _f.registrationAddress) {
+    if ((_d = summaryData.companyRegistrationAddress) == null ? void 0 : _d.registrationAddress) {
       summaryData.companyRegistrationAddress.hasInnerForms = true;
-      summaryData.companyRegistrationAddress.registrationAddress = mapAddressLabels(summaryData == null ? void 0 : summaryData.companyRegistrationAddress.registrationAddress, datasetUtils);
+      summaryData.companyRegistrationAddress.registrationAddress = mapAddressLabels(summaryData.companyRegistrationAddress.registrationAddress, datasetUtils);
     }
-    if ((_g = summaryData == null ? void 0 : summaryData.companyRegistrationAddress) == null ? void 0 : _g.operationalAddress) {
-      summaryData.companyRegistrationAddress.operationalAddress = mapAddressLabels(summaryData == null ? void 0 : summaryData.companyRegistrationAddress.operationalAddress, datasetUtils);
+    if ((_e = summaryData.companyRegistrationAddress) == null ? void 0 : _e.operationalAddress) {
+      summaryData.companyRegistrationAddress.operationalAddress = mapAddressLabels(summaryData.companyRegistrationAddress.operationalAddress, datasetUtils);
     }
-    if ((_h = summaryData.companyRegistrationDetails) == null ? void 0 : _h.vatAbsenceReason) {
+    if ((_f = summaryData.companyRegistrationDetails) == null ? void 0 : _f.vatAbsenceReason) {
       const vatAbsenceReason2 = vatAbsenceReasons.find((absenceReason) => absenceReason === summaryData.companyRegistrationDetails.vatAbsenceReason);
       if (vatAbsenceReason2) {
         summaryData.companyRegistrationDetails.vatAbsenceReason = i18n.get(vatAbsenceReason2);
@@ -25177,7 +25560,7 @@ var CompanySearchEvents = /* @__PURE__ */ ((CompanySearchEvents2) => {
   CompanySearchEvents2["SELECTION_ERROR"] = "CompanySearch_CompanySelectionError";
   return CompanySearchEvents2;
 })(CompanySearchEvents || {});
-const logger$h = createLogger("useCompanySearch");
+const logger$i = createLogger("useCompanySearch");
 const LOW_RISK_COMPANY_DATA_COMPLIANCE_WINDOW = 1577664e5;
 function useCompanySearch({
   defaultData,
@@ -25301,7 +25684,7 @@ function useCompanySearch({
         state: companyData.state ?? stateOrProvince2
       });
     } catch (e) {
-      logger$h.error(e);
+      logger$i.error(e);
       setError(e);
       setStatus("error");
     } finally {
@@ -25334,7 +25717,7 @@ function useCompanySearch({
         indexSearch: handleCompanyIndexSearch,
         deepSearch: handleCompanyDeepSearch,
         resultsLimit: limit
-      })) == null ? void 0 : _a.catch((e) => logger$h.error(e));
+      })) == null ? void 0 : _a.catch((e) => logger$i.error(e));
     }
   }, [legalCompanyName2, country2, stateOrProvince2, taxIdentificationNumber2, verifiedCompany, searchCompanies, handleCompanyIndexSearch, handleCompanyDeepSearch, limit, canVerify, baseTrackingPayload]);
   useEffect(() => {
@@ -25793,10 +26176,12 @@ const defaultFieldMetadata = defaultFieldMetadata$7;
 const defaultFieldConfig = entriesOf(defaultFieldConfig$7).reduce((fieldConfig, [country2, countryEntry]) => ({
   ...fieldConfig,
   [country2]: ({
-    taxIdNumberType
+    taxIdNumberType,
+    companyType: companyType2
   }) => {
     const fieldMetadata = resolveFieldMetadata(countryEntry, {
-      taxIdNumberType
+      taxIdNumberType,
+      companyType: companyType2
     }, defaultFieldMetadata$7);
     const taxIdValidators = fieldMetadata.validators ? Array.isArray(fieldMetadata.validators) ? fieldMetadata.validators : [fieldMetadata.validators] : [];
     const mappedValidators = taxIdValidators.map((validator) => ({
@@ -25863,7 +26248,7 @@ function CompanyBasics({
   const [loading2, setLoading] = useState$1(false);
   const allowedCountries = useAllowedCountries();
   const existingTaxId = (_b = (_a = data == null ? void 0 : data.taxInformation) == null ? void 0 : _a.find((taxId2) => taxId2.country === country2)) == null ? void 0 : _b.number;
-  const defaultTaxIdNumberType = existingTaxId ? inferTaxIdNumberType(existingTaxId, country2) : (_c = getTaxIdNumberOptions(country2, companyType2)) == null ? void 0 : _c[0].id;
+  const defaultTaxIdNumberType = existingTaxId ? inferTaxIdNumberType(existingTaxId, country2, companyType2) : (_c = getTaxIdNumberOptions(country2, companyType2)) == null ? void 0 : _c[0].id;
   const [taxIdNumberType, setTaxIdNumberType] = useState$1(defaultTaxIdNumberType);
   const initialFormUtilsProps = useMemo$1(() => ({
     allFields,
@@ -25907,7 +26292,8 @@ function CompanyBasics({
           };
         case "taxInformation":
           return mergeFieldMetadataIntoProps(field, resolveFieldMetadata(defaultFieldConfig[country2], {
-            taxIdNumberType
+            taxIdNumberType,
+            companyType: companyType2
           }, defaultFieldMetadata), acc);
         default:
           return acc;
@@ -26054,7 +26440,7 @@ const TradingNameFieldValidation = () => ({
   }]
 });
 const COMPANY_OTHER_DETAILS_FORM_ID = "companyOtherDetails";
-const companyOtherDetailsFields = [...TRADING_NAME_FIELD, ...STOCK_EXCHANGE_MIC_FIELD, ...STOCK_ISIN_FIELD, ...DATE_OF_INCORPORATION_FIELD, ...BUSINESS_REGISTRATION_NUMBER_FIELD, ...TAX_INFORMATION_FIELD, ...VAT_NUMBER_FIELD];
+const companyOtherDetailsFields = [...TRADING_NAME_FIELD, ...STOCK_EXCHANGE_MIC_FIELD, ...STOCK_ISIN_FIELD, ...STOCK_TICKER_SYMBOL_FIELD, ...DATE_OF_INCORPORATION_FIELD, ...BUSINESS_REGISTRATION_NUMBER_FIELD, ...TAX_INFORMATION_FIELD, ...VAT_NUMBER_FIELD];
 function CompanyOtherDetails({
   data,
   labels: labels2,
@@ -26085,12 +26471,12 @@ function CompanyOtherDetails({
   const registrationNumberOptions = useMemo$1(() => getCompanyRegistrationNumberOptions(country2, companyType2), [country2, companyType2]);
   const defaultRegistrationNumberType = (data == null ? void 0 : data.registrationNumber) ? inferCompanyRegistrationNumberType(data == null ? void 0 : data.registrationNumber, country2, companyType2) : registrationNumberOptions == null ? void 0 : registrationNumberOptions[0].id;
   const [registrationNumberType, setRegistrationNumberType] = useState$1(defaultRegistrationNumberType);
-  const defaultVatNumberType = (data == null ? void 0 : data.vatNumber) ? inferTaxIdNumberType(data == null ? void 0 : data.vatNumber, country2) : (_a = taxIdNumberOptions[country2]) == null ? void 0 : _a[0].id;
+  const defaultVatNumberType = (data == null ? void 0 : data.vatNumber) ? inferTaxIdNumberType(data == null ? void 0 : data.vatNumber, country2, companyType2) : (_a = taxIdNumberOptions[country2]) == null ? void 0 : _a[0].id;
   const [vatNumberType, setVatNumberType] = useState$1(defaultVatNumberType);
   const existingTaxId = (_c = (_b = data == null ? void 0 : data.taxInformation) == null ? void 0 : _b.find((taxId2) => taxId2.country === country2)) == null ? void 0 : _c.number;
-  const defaultTaxIdNumberType = existingTaxId ? inferTaxIdNumberType(existingTaxId, country2) : (_d = getTaxIdNumberOptions(country2, companyType2)) == null ? void 0 : _d[0].id;
+  const defaultTaxIdNumberType = existingTaxId ? inferTaxIdNumberType(existingTaxId, country2, companyType2) : (_d = getTaxIdNumberOptions(country2, companyType2)) == null ? void 0 : _d[0].id;
   const [taxIdNumberType, setTaxIdNumberType] = useState$1(defaultTaxIdNumberType);
-  const directChildFields = companyOtherDetailsFields.filter((field) => ["tradingName", "sameNameAsLegalName", "stockExchangeMIC", "stockISIN", "dateOfIncorporation"].includes(field));
+  const directChildFields = companyOtherDetailsFields.filter((field) => ["tradingName", "sameNameAsLegalName", "stockExchangeMIC", "stockISIN", "stockTickerSymbol", "dateOfIncorporation"].includes(field));
   const initialFormUtilsProps = useMemo$1(() => ({
     allFields,
     labels: labels2,
@@ -26127,6 +26513,8 @@ function CompanyOtherDetails({
           return mergeFieldMetadataIntoProps("stockExchangeMIC", stockExchangeMICFieldMetadata, acc);
         case "stockISIN":
           return mergeFieldMetadataIntoProps("stockISIN", stockISINFieldMetadata, acc);
+        case "stockTickerSymbol":
+          return mergeFieldMetadataIntoProps("stockTickerSymbol", stockTickerSymbolFieldMetadata, acc);
         case "registrationNumber":
           return mergeFieldMetadataIntoProps(field, resolveFieldMetadata(defaultFieldConfig$8[country2], {
             companyType: companyType2,
@@ -26134,7 +26522,8 @@ function CompanyOtherDetails({
           }, defaultFieldMetadata$8), acc);
         case "taxInformation":
           return mergeFieldMetadataIntoProps(field, resolveFieldMetadata(defaultFieldConfig[country2], {
-            taxIdNumberType
+            taxIdNumberType,
+            companyType: companyType2
           }, defaultFieldMetadata), acc);
         case "vatNumber":
           return mergeFieldMetadataIntoProps(field, resolveFieldMetadata(defaultFieldConfig$6[country2], {
@@ -26300,6 +26689,19 @@ function CompanyOtherDetails({
           readonly: formUtils.isReadOnly("stockISIN"),
           handleChangeFor
         })
+      }), formUtils.isRequiredField("stockTickerSymbol") && jsx("div", {
+        className: "adyen-kyc-field-wrapper",
+        children: jsx(StockTickerSymbolField, {
+          data: formUtils.getFieldData(formData, STOCK_TICKER_SYMBOL_FIELD),
+          valid: formUtils.getFieldValid(formValid, STOCK_TICKER_SYMBOL_FIELD),
+          errors: formUtils.getFieldErrors(formErrors, formFieldProblems, STOCK_TICKER_SYMBOL_FIELD),
+          labels: formUtils.getFieldLabels(STOCK_TICKER_SYMBOL_FIELD),
+          placeholders: formUtils.getFieldPlaceholders(STOCK_TICKER_SYMBOL_FIELD),
+          mask: formUtils.getMask("stockTickerSymbol"),
+          guidanceText: formUtils.getFieldGuidanceText(STOCK_TICKER_SYMBOL_FIELD),
+          readonly: formUtils.isReadOnly("stockTickerSymbol"),
+          handleChangeFor
+        })
       })]
     })]
   });
@@ -26343,7 +26745,7 @@ const forms = {
     fields: ["taxDocument"]
   }
 };
-const parseConfiguration$4 = ({
+const parseConfiguration$5 = ({
   country: country2,
   matchingScenario
 }) => parseCompanySearchScenarios(matchingScenario == null ? void 0 : matchingScenario[LegalEntityType.ORGANIZATION], country2);
@@ -26373,7 +26775,8 @@ const formatDataForSummary = (data, forms2, labels2, i18n) => {
   const datasetUtils = datasetUtilities(i18n.locale);
   const country2 = (_a = data.companyBasics) == null ? void 0 : _a.country;
   const taxIdLabel = resolveFieldMetadata(defaultFieldConfig[country2], {
-    taxIdNumberType: countryToTaxInfoTypeMap[country2]
+    taxIdNumberType: countryToTaxInfoTypeMap[country2],
+    companyType: void 0
   }, defaultFieldMetadata).label;
   return entriesOf(data).reduce((summaryData, [form, formData]) => {
     var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j;
@@ -26561,7 +26964,7 @@ const mapLegalEntityToCompanySearchSchema = (legalEntity, isChangingType, accoun
     }
   }, {});
 };
-const logger$g = createLogger("useFormTaskSubmit");
+const logger$h = createLogger("useFormTaskSubmit");
 function useCompanySearchTaskSubmit({
   task,
   forms: forms2,
@@ -26604,7 +27007,7 @@ function useCompanySearchTaskSubmit({
         });
       }
     } catch (e) {
-      logger$g.error(e);
+      logger$h.error(e);
       userEvents.addEvent(CompanySearchEvents.DOCUMENTS_ERROR, {
         segmentation: {
           ...baseTrackingPayload,
@@ -26656,7 +27059,7 @@ function useCompanySearchTaskSubmit({
           ...trackingPayload
         }
       });
-      logger$g.log(submittedLegalEntity);
+      logger$h.log(submittedLegalEntity);
       clearToasts();
       onExternalSubmit == null ? void 0 : onExternalSubmit(data);
     } catch (e) {
@@ -26680,7 +27083,7 @@ function useCompanySearchTaskSubmit({
           type: ToastType.ERROR
         });
       }
-      logger$g.error(e);
+      logger$h.error(e);
       userEvents.addEvent(CompanySearchEvents.TASK_ERROR, {
         segmentation: {
           ...baseTrackingPayload,
@@ -26746,7 +27149,7 @@ function CompanySearchComponent(props) {
     }), jsx("div", {
       className: formWrapperClasses(forms.companyRegistrationAddress.formId),
       children: jsx(RegistrationAddressComponent, {
-        ...getFormProps(props, forms.companyRegistrationAddress.formId),
+        ...getNestedOuterFormPropsFromOuterFormProps(props, forms.companyRegistrationAddress.formId),
         id: forms.companyRegistrationAddress.formId,
         heading: i18n.get(forms.companyRegistrationAddress.formName),
         description: i18n.get(forms.companyRegistrationAddress.formDescription, {
@@ -26907,7 +27310,7 @@ function CompanySearchDropinComponent({
   const {
     fieldConfigurations
   } = useScenarioConfiguration({
-    parseConfiguration: parseConfiguration$4,
+    parseConfiguration: parseConfiguration$5,
     getConfigurationData,
     setLoadingStatus,
     country: country2
@@ -27033,7 +27436,7 @@ function CompanySearchDropinComponent({
     })
   });
 }
-const logger$f = createLogger("useLocalStorage");
+const logger$g = createLogger("useLocalStorage");
 const useLocalStorage = (key, defaultValue, options) => {
   const {
     serializer,
@@ -27053,7 +27456,7 @@ const useLocalStorage = (key, defaultValue, options) => {
       const res = rawValueRef.current ? parser(rawValueRef.current) : defaultValue;
       return res;
     } catch (err) {
-      logger$f.error(err);
+      logger$g.error(err);
       return defaultValue;
     }
   });
@@ -27084,7 +27487,7 @@ const useLocalStorage = (key, defaultValue, options) => {
     try {
       updateLocalStorage();
     } catch (err) {
-      logger$f.error(err);
+      logger$g.error(err);
     }
   }, [value]);
   useEffect(() => {
@@ -27097,7 +27500,7 @@ const useLocalStorage = (key, defaultValue, options) => {
           setValue(event.newValue ? parser(event.newValue) : void 0);
         }
       } catch (err) {
-        logger$f.error(err);
+        logger$g.error(err);
       }
     };
     if (typeof window === "undefined") return;
@@ -27134,15 +27537,25 @@ const useIsEligibleForSingpass = ({
   const {
     isExperimentEnabled
   } = useExperimentsContext();
-  if (!isExperimentEnabled("ShowSingPassButtonForCompanies")) return false;
-  const isSingpassEnabled = Boolean(handleOpenSingpassAuthorizationLink) && getLegalEntityCountry(legalEntity) === CountryCodes.Singapore;
+  if (getLegalEntityCountry(legalEntity) !== CountryCodes.Singapore) {
+    return false;
+  }
+  const isSingpassForCompaniesEnabled = isExperimentEnabled("ShowSingPassButtonForCompanies");
+  const isSingpassForIndividualsEnabled = isExperimentEnabled("ShowSingPassButtonForIndividuals");
+  if (!isSingpassForCompaniesEnabled && !isSingpassForIndividualsEnabled) return false;
+  const isSingpassEnabled = Boolean(handleOpenSingpassAuthorizationLink);
   if (!isSingpassEnabled) return false;
   if (accountHolder2) {
-    return accountHolder2 === "theCompanyIWorkFor";
+    return accountHolder2 === "theCompanyIWorkFor" && isSingpassForCompaniesEnabled || accountHolder2 === "myName" && isSingpassForIndividualsEnabled;
   }
-  return legalEntity.type === LegalEntityType.ORGANIZATION;
+  const legalEntityType = legalEntity.type;
+  const isPartOfTrust = isPartOfTrustFromLegalEntity(legalEntity);
+  const isVanillaOrganization = legalEntityType === LegalEntityType.ORGANIZATION && !isPartOfTrust;
+  const hasSoleProprietor = hasSolePropInLegalEntity(legalEntity);
+  const isVanillaIndividual = legalEntityType === LegalEntityType.INDIVIDUAL && !hasSoleProprietor;
+  return isVanillaOrganization && isSingpassForCompaniesEnabled || isVanillaIndividual && isSingpassForIndividualsEnabled;
 };
-const logger$e = createLogger("useAssociatedLegalArrangement");
+const logger$f = createLogger("useAssociatedLegalArrangement");
 function useAssociatedLegalArrangement({
   rootLegalEntity,
   getLegalEntity: getLegalEntity2
@@ -27153,7 +27566,7 @@ function useAssociatedLegalArrangement({
     var _a;
     const foundEntity = (_a = rootLegalEntity == null ? void 0 : rootLegalEntity.entityAssociations) == null ? void 0 : _a.find((entity) => entity.type === LegalEntityType.SOLE_PROPRIETORSHIP || entity.type === LegalEntityType.TRUST);
     if (foundEntity == null ? void 0 : foundEntity.legalEntityId) {
-      getAssociatedEntity(foundEntity == null ? void 0 : foundEntity.legalEntityId).then((res) => setAssociatedLegalArrangement(res)).catch(logger$e.error);
+      getAssociatedEntity(foundEntity == null ? void 0 : foundEntity.legalEntityId).then((res) => setAssociatedLegalArrangement(res)).catch(logger$f.error);
     }
   }, [getAssociatedEntity, rootLegalEntity == null ? void 0 : rootLegalEntity.entityAssociations]);
   useEffect(() => {
@@ -27167,7 +27580,15 @@ function useAssociatedLegalArrangement({
     refreshAssociatedLegalArrangement
   };
 }
-const logger$d = createLogger("useExemptSettlor");
+const getCanSeeEntitySelectionStorageKey = (legalEntityId) => `ENTITY_SELECTION_SEEN-${legalEntityId}`;
+const useCanSeeEntitySelection = (legalEntityId) => {
+  const [canSeeEntitySelectionFromLocalStorage, setCanSeeEntitySelectionIntoLocalStorage] = useLocalStorage(getCanSeeEntitySelectionStorageKey(legalEntityId), true);
+  return {
+    canSeeEntitySelection: canSeeEntitySelectionFromLocalStorage,
+    setCanSeeEntitySelection: setCanSeeEntitySelectionIntoLocalStorage
+  };
+};
+const logger$e = createLogger("useExemptSettlor");
 const useExemptSettlor = ({
   trust: trust2,
   handleGetLegalEntity
@@ -27180,7 +27601,7 @@ const useExemptSettlor = ({
   }, [handleGetLegalEntity]);
   useEffect(() => {
     if (!(trust2 == null ? void 0 : trust2.trust)) return;
-    updateExemptSettlor(trust2).catch(logger$d.error);
+    updateExemptSettlor(trust2).catch(logger$e.error);
   }, [trust2, updateExemptSettlor]);
   return exemptSettlor;
 };
@@ -27540,55 +27961,6 @@ const useBusinessTypeExamples = (country2) => {
   }, [country2]);
   return examples;
 };
-const headingTypes = {
-  1: ({
-    children,
-    className
-  }) => jsx("h1", {
-    className,
-    children
-  }),
-  2: ({
-    children,
-    className
-  }) => jsx("h2", {
-    className,
-    children
-  }),
-  3: ({
-    children,
-    className
-  }) => jsx("h3", {
-    className,
-    children
-  }),
-  4: ({
-    children,
-    className
-  }) => jsx("h4", {
-    className,
-    children
-  }),
-  sub: ({
-    children,
-    className
-  }) => jsx("div", {
-    className,
-    children
-  })
-};
-function Heading({
-  className,
-  level,
-  children
-}) {
-  const HeadingElement = headingTypes[level] || headingTypes[1];
-  const classNames = cx("adyen-kyc-heading", `adyen-kyc-heading--${level}`, className);
-  return jsx(HeadingElement, {
-    className: classNames,
-    children
-  });
-}
 const trusteeTypeItems = [{
   id: "individual",
   name: "individual"
@@ -28200,7 +28572,8 @@ function Card({
         level: "sub",
         children: subTitle
       })]
-    }), jsx("main", {
+    }), jsx("div", {
+      role: "region",
       className: "adyen-kyc-card__body",
       children
     }), warning && jsx(Alert, {
@@ -29172,33 +29545,57 @@ const SvgSingpassLogo = (props) => /* @__PURE__ */ jsxs$1("svg", { xmlns: "http:
 ] });
 const setupAccountMethods = ["singpass", "manual"];
 const setupAccountMethodFields = ["setupAccountMethod"];
-const getSetupAccountMethodMetadata = () => ({
-  singpass: {
-    name: "retrieveMyInfoBusiness",
-    description: "getYourBusinessVerifiedDetails",
-    icon: jsx("span", {
-      className: "adyen-kyc-setup-singpass-container",
-      children: jsx(SvgSetupSingpass, {})
-    }),
-    provider: {
-      name: "singpass",
+const getSingpassSelectionDisabled = (legalEntityType) => {
+  switch (legalEntityType) {
+    case LegalEntityType.INDIVIDUAL:
+    case LegalEntityType.ORGANIZATION:
+      return false;
+    default:
+      return true;
+  }
+};
+const legalEntityTypeToSelectionTranslationKeyMap = {
+  [LegalEntityType.INDIVIDUAL]: "retrieveMyInfo",
+  [LegalEntityType.ORGANIZATION]: "retrieveMyInfoBusiness"
+};
+const legalEntityTypeToSelectionDescriptionTranslationKeyMap = {
+  [LegalEntityType.INDIVIDUAL]: "getYourVerifiedDetailsInstantly",
+  [LegalEntityType.ORGANIZATION]: "getYourBusinessVerifiedDetails"
+};
+const getSetupAccountMethodMetadata = (legalEntityType) => {
+  const translationSingpassNameKey = legalEntityTypeToSelectionTranslationKeyMap[legalEntityType] ?? "retrieveMyInfoBusiness";
+  const translationSingpassDescriptionKey = legalEntityTypeToSelectionDescriptionTranslationKeyMap[legalEntityType] ?? "getYourBusinessVerifiedDetails";
+  const isSingpassSelectionDisabled = getSingpassSelectionDisabled(legalEntityType);
+  return {
+    singpass: {
+      name: translationSingpassNameKey,
+      description: translationSingpassDescriptionKey,
+      icon: jsx("span", {
+        className: "adyen-kyc-setup-singpass-container",
+        children: jsx(SvgSetupSingpass, {})
+      }),
+      provider: {
+        name: "singpass",
+        icon: jsx("span", {
+          className: "adyen-kyc-singpass-logo-container",
+          children: jsx(SvgSingpassLogo, {})
+        })
+      },
+      isOptionDisabled: isSingpassSelectionDisabled
+    },
+    manual: {
+      name: "enterTheDetailsYourself",
+      description: "youAlsoHaveToUploadSomeSupportingDocuments",
       icon: jsx("span", {
-        className: "adyen-kyc-singpass-logo-container",
-        children: jsx(SvgSingpassLogo, {})
+        className: "adyen-kyc-setup-manual-container",
+        children: jsx(SvgSetupManual, {})
       })
     }
-  },
-  manual: {
-    name: "enterTheDetailsYourself",
-    description: "youAlsoHaveToUploadSomeSupportingDocuments",
-    icon: jsx("span", {
-      className: "adyen-kyc-setup-manual-container",
-      children: jsx(SvgSetupManual, {})
-    })
-  }
-});
+  };
+};
 const SingpassSelection = (props) => {
   const {
+    legalEntityType,
     handleNextClick
   } = props;
   const {
@@ -29217,7 +29614,7 @@ const SingpassSelection = (props) => {
     schema: setupAccountMethodFields,
     defaultData: {}
   });
-  const methodsMetadata = getSetupAccountMethodMetadata();
+  const methodsMetadata = getSetupAccountMethodMetadata(legalEntityType);
   return jsx("div", {
     children: jsxs("div", {
       className: "adyen-kyc-singpass-selection",
@@ -29309,10 +29706,21 @@ const hasPayoutAccount = (legalEntityResponse) => {
   var _a;
   return Boolean((_a = legalEntityResponse.transferInstruments) == null ? void 0 : _a.length);
 };
+const legalEntityTypeToSubtitleTranslationKey = {
+  [LegalEntityType.INDIVIDUAL]: "myInfoYouCanGetVerifiedDetails",
+  [LegalEntityType.ORGANIZATION]: "myInfoBusinessYouCanGetVerifiedDetails"
+};
+const legalEntityTypeToButtonTextTranslationKeyMap = {
+  [LegalEntityType.INDIVIDUAL]: "retrieveMyinfoWith",
+  [LegalEntityType.ORGANIZATION]: "retrieveMyinfoBusinessWith"
+};
 const SingpassBanner = (props) => {
   const {
+    legalEntityType,
     onClick
   } = props;
+  const subtitleTranslationKey = legalEntityTypeToSubtitleTranslationKey[legalEntityType];
+  const buttonTextTranslationKey = legalEntityTypeToButtonTextTranslationKeyMap[legalEntityType];
   const {
     i18n
   } = useI18nContext();
@@ -29321,14 +29729,14 @@ const SingpassBanner = (props) => {
     hasCloseButton: false,
     icon: false,
     title: i18n.get("getSetUpInstantly"),
-    children: [jsx("div", {
+    children: [subtitleTranslationKey && jsx("div", {
       className: cx("adyen-task-list-singpass-banner__subtitle"),
-      children: i18n.get("MyInfoBusinessYouCanGetVerifiedDetails")
+      children: i18n.get(subtitleTranslationKey)
     }), jsxs("button", {
       type: "button",
       className: cx("adyen-kyc-button adyen-task-list-singpass-banner__button"),
       onClick,
-      children: [i18n.get("retrieveMyinfoBusinessWith"), jsx(SvgSingpassLogo, {})]
+      children: [buttonTextTranslationKey && i18n.get(buttonTextTranslationKey), jsx(SvgSingpassLogo, {})]
     })]
   });
 };
@@ -29469,7 +29877,7 @@ const TaskListGroup = ({
       level: 4,
       children: title
     })
-  }), jsx("main", {
+  }), jsx("div", {
     className: "adyen-kyc-card__body",
     children: jsx(CardGroup, {
       className: "adyen-task-list-group__items",
@@ -29611,7 +30019,8 @@ function TaskListComponent({
         })]
       })]
     }), onRetrieveMyinfoBusinessWithSingpass && jsx(SingpassBanner, {
-      onClick: onRetrieveMyinfoBusinessWithSingpass
+      onClick: onRetrieveMyinfoBusinessWithSingpass,
+      legalEntityType: legalEntityResponse.type
     }), hasExpired && jsx(ExpiredBanner, {}), jsxs("div", {
       children: [hasTaskOfGroupAccountDetails && jsxs(TaskListGroup, {
         title: isCompany ? i18n.get(companyTaskDescriptionKey) : i18n.get(isEnableNewEntryFlowEnabled ? "provideFewDetailsAboutYourself" : "accountDetailsDescription"),
@@ -30070,7 +30479,7 @@ const omitObscuredFieldsIfUnchanged = (obscuredFields, dataSubmitted, savedData)
   });
   return filtered;
 };
-const parseConfiguration$3 = ({
+const parseConfiguration$4 = ({
   matchingScenario
 }) => parseIndividualScenarios(matchingScenario == null ? void 0 : matchingScenario[LegalEntityType.INDIVIDUAL]);
 function IndividualDropinComponent({
@@ -30102,6 +30511,10 @@ function IndividualDropinComponent({
   handleBackClick: externalBackClick
 }) {
   var _a, _b, _c, _d;
+  const {
+    accountHolder: accountHolder2,
+    setAccountHolder
+  } = useCoreContext();
   const {
     i18n
   } = useI18nContext();
@@ -30151,7 +30564,7 @@ function IndividualDropinComponent({
   const {
     fieldConfigurations
   } = useScenarioConfiguration({
-    parseConfiguration: parseConfiguration$3,
+    parseConfiguration: parseConfiguration$4,
     getConfigurationData,
     setLoadingStatus,
     country: country2
@@ -30337,12 +30750,14 @@ function IndividualDropinComponent({
           idDocumentType: idDocumentType || null
         }
       });
-      legalEntity.entityAssociations = filterOutUnwantedAssociationsIfRootLE(taskType, legalEntityResponse, (_c2 = dataSubmitted.personalDetails) == null ? void 0 : _c2.accountHolder);
+      const accountHolderToEvaluated = ((_c2 = dataSubmitted.personalDetails) == null ? void 0 : _c2.accountHolder) ?? accountHolder2;
+      legalEntity.entityAssociations = filterOutUnwantedAssociationsIfRootLE(taskType, legalEntityResponse, accountHolderToEvaluated ?? void 0);
       const createdLegalEntity = await submitLegalEntity({
         dataSubmitted,
         legalEntity,
         idDocumentType
       });
+      setAccountHolder(accountHolderToEvaluated);
       await submitDocuments2({
         forms: forms2,
         legalEntity: createdLegalEntity,
@@ -30466,7 +30881,7 @@ function IndividualDropinComponent({
         ...formatFileSummaryData2(data)
       };
     }
-    if ((_c2 = summaryData == null ? void 0 : summaryData.personalDetails) == null ? void 0 : _c2.accountHolder) {
+    if ((_c2 = summaryData.personalDetails) == null ? void 0 : _c2.accountHolder) {
       summaryData.personalDetails.accountHolder = i18n.get(summaryData.personalDetails.accountHolder);
     }
     return summaryData;
@@ -30534,7 +30949,8 @@ function IndividualDropinComponent({
       handleFindAddress,
       onTypeSwitch,
       onCountryChange: setCountry,
-      shouldValidate
+      shouldValidate,
+      accountHolder: accountHolder2
     })
   });
 }
@@ -30637,7 +31053,7 @@ const labels = () => ({
   verifiedCurrencyCode: () => "currencyCode",
   verifiedBankAccountNumber: () => "bankAccountNumber"
 });
-const parseConfiguration$2 = ({
+const parseConfiguration$3 = ({
   requiredFields,
   country: country2,
   bankVerificationAvailable
@@ -30777,7 +31193,7 @@ function PayoutDetailsDropinComponent({
     requiredFields,
     bankVerificationVendors
   } = useScenarioConfiguration({
-    parseConfiguration: parseConfiguration$2,
+    parseConfiguration: parseConfiguration$3,
     getConfigurationData,
     getPayoutAccountFormatData,
     instantVerificationEnabled,
@@ -31938,7 +32354,7 @@ const serviceAgreementValidationRules = {
     errorMessage: "fieldIsRequired"
   }
 };
-const logger$c = createLogger("useServiceAgreement");
+const logger$d = createLogger("useServiceAgreement");
 const FALLBACK_LANGUAGE_CODE = "en";
 const useServiceAgreement = ({
   handleGetServiceAgreement,
@@ -31971,7 +32387,7 @@ const useServiceAgreement = ({
         contract
       });
     };
-    requestAcceptedServiceAgreement().catch(logger$c.error).finally(() => setLoading("success"));
+    requestAcceptedServiceAgreement().catch(logger$d.error).finally(() => setLoading("success"));
   }, [acceptanceId, handleViewAcceptedTermsOfServiceDocument]);
   useEffect(() => {
     const requestServiceAgreement = async () => {
@@ -31986,7 +32402,7 @@ const useServiceAgreement = ({
           language: agreementLanguage
         });
         if (!document2) {
-          logger$c.log('"document" field was missing in response');
+          logger$d.log('"document" field was missing in response');
           return;
         }
         const contract = JSON.parse(decodeURIComponent(escape(window.atob(document2))));
@@ -32004,7 +32420,7 @@ const useServiceAgreement = ({
         throw err;
       }
     };
-    requestServiceAgreement().catch(logger$c.error);
+    requestServiceAgreement().catch(logger$d.error);
   }, [handleGetServiceAgreement, handleServiceAgreementIsNotAvailableInThatLanguage, agreementLanguage, legalEntityId, serviceAgreementType]);
   return {
     loading: loading2,
@@ -32308,7 +32724,7 @@ function ServiceAgreementDropinComponent({
     })
   });
 }
-const parseConfiguration$1 = ({
+const parseConfiguration$2 = ({
   matchingScenario,
   country: country2
 }) => parseSolePropScenarios(matchingScenario[LegalEntityType.SOLE_PROPRIETORSHIP], country2);
@@ -32410,7 +32826,7 @@ function SolePropDropinComponent({
     fieldConfigurations,
     requiredFields
   } = useScenarioConfiguration({
-    parseConfiguration: parseConfiguration$1,
+    parseConfiguration: parseConfiguration$2,
     getConfigurationData,
     setLoadingStatus,
     country: country2
@@ -32547,18 +32963,18 @@ function SolePropDropinComponent({
     if (isCountryOfGoverningLawEnabled) {
       summaryData.solePropNameAndCountry = getUpdatedCountryOfGoverningLaw(summaryData.solePropNameAndCountry);
     }
-    const solePropCountry = ((_a2 = summaryData == null ? void 0 : summaryData.solePropNameAndCountry) == null ? void 0 : _a2.country) ? datasetUtils.getCountryName(summaryData.solePropNameAndCountry.country) : void 0;
+    const solePropCountry = ((_a2 = summaryData.solePropNameAndCountry) == null ? void 0 : _a2.country) && datasetUtils.getCountryName(summaryData.solePropNameAndCountry.country);
     summaryData.solePropNameAndCountry = {
       legalNameOfSoleProprietor: (_b2 = data2.solePropNameAndCountry) == null ? void 0 : _b2.legalCompanyName,
       countryRegionOfEstablishment: solePropCountry,
-      countryOfGoverningLaw: ((_c = summaryData == null ? void 0 : summaryData.solePropNameAndCountry) == null ? void 0 : _c.countryOfGoverningLaw) ? datasetUtils.getCountryName(summaryData.solePropNameAndCountry.countryOfGoverningLaw) : void 0
+      countryOfGoverningLaw: ((_c = summaryData.solePropNameAndCountry) == null ? void 0 : _c.countryOfGoverningLaw) && datasetUtils.getCountryName(summaryData.solePropNameAndCountry.countryOfGoverningLaw)
     };
-    if ((_d = summaryData == null ? void 0 : summaryData.solePropRegistrationAddress) == null ? void 0 : _d.registrationAddress) {
+    if ((_d = summaryData.solePropRegistrationAddress) == null ? void 0 : _d.registrationAddress) {
       summaryData.solePropRegistrationAddress.hasInnerForms = true;
-      summaryData.solePropRegistrationAddress.registrationAddress = mapAddressLabels(summaryData == null ? void 0 : summaryData.solePropRegistrationAddress.registrationAddress, datasetUtils);
+      summaryData.solePropRegistrationAddress.registrationAddress = mapAddressLabels(summaryData.solePropRegistrationAddress.registrationAddress, datasetUtils);
     }
-    if ((_e = summaryData == null ? void 0 : summaryData.solePropRegistrationAddress) == null ? void 0 : _e.operationalAddress) {
-      summaryData.solePropRegistrationAddress.operationalAddress = mapAddressLabels(summaryData == null ? void 0 : summaryData.solePropRegistrationAddress.operationalAddress, datasetUtils);
+    if ((_e = summaryData.solePropRegistrationAddress) == null ? void 0 : _e.operationalAddress) {
+      summaryData.solePropRegistrationAddress.operationalAddress = mapAddressLabels(summaryData.solePropRegistrationAddress.operationalAddress, datasetUtils);
     }
     if (isDocumentsRequired(forms22)) {
       delete summaryData[solePropDocumentFormId];
@@ -32641,7 +33057,7 @@ const rules = ({
     }
   }
 });
-const parseConfiguration = ({
+const parseConfiguration$1 = ({
   matchingScenario,
   country: country2
 }) => parseTrustScenarios(matchingScenario == null ? void 0 : matchingScenario[LegalEntityType.TRUST], country2);
@@ -32695,7 +33111,7 @@ function TrustDropinComponent({
     fieldConfigurations,
     requiredFields
   } = useScenarioConfiguration({
-    parseConfiguration,
+    parseConfiguration: parseConfiguration$1,
     getConfigurationData,
     setLoadingStatus,
     country: country2
@@ -32826,34 +33242,31 @@ function TrustDropinComponent({
     await handleUpdateLegalEntity(updatedParentLegalEntity, parentLegalEntity.id);
   };
   const formatDataForSummary2 = (data2, forms22) => {
-    var _a2, _b, _c, _d, _e, _f, _g, _h;
+    var _a2, _b, _c;
     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;
+    if (summaryData.trustRegistrationDetails) {
+      const trustCountry = summaryData.trustRegistrationDetails.country && datasetUtils.getCountryName(summaryData.trustRegistrationDetails.country);
+      const trustType2 = summaryData.trustRegistrationDetails.trustType && i18n.get((_a2 = trustTypeOptions.find((option) => option.id === summaryData.trustRegistrationDetails.trustType)) == null ? void 0 : _a2.name);
       summaryData.trustRegistrationDetails = {
-        nameOfTrustAgreement: (_d = summaryData == null ? void 0 : summaryData.trustRegistrationDetails) == null ? void 0 : _d.legalName,
+        nameOfTrustAgreement: summaryData.trustRegistrationDetails.legalName,
         countryRegionOfEstablishment: 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
+        objectOfTrust: summaryData.trustRegistrationDetails.objectOfTrust,
+        taxId: summaryData.trustRegistrationDetails.taxId
       };
     }
-    if ((_g = summaryData == null ? void 0 : summaryData.trustRegistrationAddress) == null ? void 0 : _g.registrationAddress) {
+    if ((_b = summaryData.trustRegistrationAddress) == null ? void 0 : _b.registrationAddress) {
       summaryData.trustRegistrationAddress.hasInnerForms = true;
-      summaryData.trustRegistrationAddress.registrationAddress = mapAddressLabels(summaryData == null ? void 0 : summaryData.trustRegistrationAddress.registrationAddress, datasetUtils);
+      summaryData.trustRegistrationAddress.registrationAddress = mapAddressLabels(summaryData.trustRegistrationAddress.registrationAddress, datasetUtils);
     }
-    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 ((_c = summaryData.trustRegistrationAddress) == null ? void 0 : _c.operationalAddress) {
+      summaryData.trustRegistrationAddress.operationalAddress = mapAddressLabels(summaryData.trustRegistrationAddress.operationalAddress, datasetUtils);
     }
     if (isDocumentsRequired2(forms22)) {
       delete summaryData[trustConstitutionalDocumentFormId];
       summaryData = {
         ...summaryData,
-        ...formatFileSummaryData2(summaryData == null ? void 0 : summaryData.trustConstitutionalDocument)
+        ...formatFileSummaryData2(summaryData.trustConstitutionalDocument)
       };
     }
     return summaryData;
@@ -32959,6 +33372,9 @@ const useNavigation = ({
   const {
     accountHolder: accountHolder2
   } = useCoreContext();
+  const {
+    canSeeEntitySelection
+  } = useCanSeeEntitySelection(legalEntity.id);
   const eligibleForSingpass = useIsEligibleForSingpass({
     legalEntity,
     accountHolder: accountHolder2,
@@ -32995,7 +33411,7 @@ const useNavigation = ({
     if (pushedTask === "default") {
       const defaultTask = getDefaultTask({
         legalEntity,
-        accountHolder: accountHolder2,
+        canSeeEntitySelection,
         showIntroduction,
         isNewEntryFlowEnabled,
         shouldShowSingpassSelection
@@ -33012,13 +33428,13 @@ const useNavigation = ({
 };
 const getDefaultTask = ({
   legalEntity,
-  accountHolder: accountHolder2,
+  canSeeEntitySelection,
   isNewEntryFlowEnabled,
   showIntroduction,
   shouldShowSingpassSelection
 }) => {
   const hasLegalEntityProgressedBeyondEntitySelection = hasProgressedBeyondEntitySelection(legalEntity);
-  if (isNewEntryFlowEnabled && !accountHolder2 && !hasLegalEntityProgressedBeyondEntitySelection) return TaskTypes.BUSINESS_TYPE_SELECTION;
+  if (isNewEntryFlowEnabled && canSeeEntitySelection && !hasLegalEntityProgressedBeyondEntitySelection) return TaskTypes.BUSINESS_TYPE_SELECTION;
   if (showIntroduction) return TaskTypes.INTRODUCTION;
   if (shouldShowSingpassSelection) return TaskTypes.SINGPASS_SELECTION;
   return TaskTypes.TASKS_OVERVIEW;
@@ -33031,7 +33447,7 @@ const hasProgressedBeyondEntitySelection = (legalEntity) => {
 };
 const PAGES_WITH_POLLING = [TaskTypes.DECISION_MAKER_OVERVIEW, TaskTypes.TASKS_OVERVIEW];
 const POLLING_INTERVAL = 3e3;
-const logger$b = createLogger("DropinComposerComponent");
+const logger$c = createLogger("DropinComposerComponent");
 const isOrganizationSettlorWithExemptionReasonEnabled = (enabled, country2) => country2 === CountryCodes.Australia && enabled;
 function DropinComposerComponent({
   capabilities,
@@ -33048,6 +33464,9 @@ function DropinComposerComponent({
     accountHolder: accountHolder2,
     setAccountHolder
   } = useCoreContext();
+  const {
+    setCanSeeEntitySelection
+  } = useCanSeeEntitySelection(legalEntityResponse.id);
   const {
     i18n
   } = useI18nContext();
@@ -33074,13 +33493,13 @@ function DropinComposerComponent({
   } = useHasSeenIntroduction({
     legalEntityId: legalEntityResponse.id
   });
+  const [tasks, setTasks] = useState([]);
+  const [rootLegalEntity, setRootLegalEntity] = useState(legalEntityResponse);
   const eligibleForSingpass = useIsEligibleForSingpass({
-    legalEntity: legalEntityResponse,
+    legalEntity: rootLegalEntity,
     accountHolder: accountHolder2,
     handleOpenSingpassAuthorizationLink
   });
-  const [tasks, setTasks] = useState([]);
-  const [rootLegalEntity, setRootLegalEntity] = useState(legalEntityResponse);
   const rootLegalEntityCountry = getLegalEntityCountry(rootLegalEntity);
   const [associatedLegalEntity, setAssociatedLegalEntity] = useState(null);
   const {
@@ -33139,7 +33558,7 @@ function DropinComposerComponent({
         setPciStatus(response);
         return response;
       } catch (e) {
-        logger$b.warn(i18n.get("failedToGetPciStatus"));
+        logger$c.warn(i18n.get("failedToGetPciStatus"));
       }
     }
     return void 0;
@@ -33167,7 +33586,7 @@ function DropinComposerComponent({
   }, [additionalSalesChannels, i18n, rootLegalEntity.id, args.handleGetPciTemplate]);
   useEffect(() => {
     if (!tasks.includes(TaskTypes.PCI_DSS)) return;
-    getPciTemplate2().catch(logger$b.error);
+    getPciTemplate2().catch(logger$c.error);
   }, [getPciTemplate2, tasks]);
   const addFetchedAcceptedByName = async (acceptanceInfo) => {
     try {
@@ -33177,21 +33596,21 @@ function DropinComposerComponent({
         acceptedByName: getLegalEntityNameBasedOnType(acceptedByEntity)
       };
     } catch (e) {
-      logger$b.warn(i18n.get("failedToFetchAcceptedByName"));
+      logger$c.warn(i18n.get("failedToFetchAcceptedByName"));
       return {
         ...acceptanceInfo,
         acceptedByName: null
       };
     }
   };
-  const getServiceAgreementAcceptanceInfos = async () => {
+  const getServiceAgreementAcceptanceInfos2 = async () => {
     if (rootLegalEntity.id && (args == null ? void 0 : args.handleGetServiceAgreementAcceptanceInfos)) {
       try {
         const response = await args.handleGetServiceAgreementAcceptanceInfos(rootLegalEntity.id);
         const serviceAgreementAcceptanceInfosWithNames2 = await Promise.all(response.data.map(addFetchedAcceptedByName));
         setServiceAgreementAcceptanceInfosWithNames(serviceAgreementAcceptanceInfosWithNames2);
       } catch (e) {
-        logger$b.warn(i18n.get("failedToGetServiceAgreementStatus"));
+        logger$c.warn(i18n.get("failedToGetServiceAgreementStatus"));
       }
     }
   };
@@ -33201,7 +33620,7 @@ function DropinComposerComponent({
         const response = await args.handleGetServiceAgreementStatus(rootLegalEntity.id);
         setServiceAgreementTypes(response.termsOfServiceTypes);
       } catch (e) {
-        logger$b.warn(i18n.get("failedToGetServiceAgreementStatus"));
+        logger$c.warn(i18n.get("failedToGetServiceAgreementStatus"));
       }
     }
   };
@@ -33240,7 +33659,7 @@ function DropinComposerComponent({
         setCapabilityProblems(getCapabilityProblems(response, rootLegalEntityCountry, isExperimentEnabled));
         return response;
       } catch (e) {
-        logger$b.warn(i18n.get("failedToFetchLegalEntityDetails"));
+        logger$c.warn(i18n.get("failedToFetchLegalEntityDetails"));
       }
     }
     return void 0;
@@ -33290,7 +33709,7 @@ function DropinComposerComponent({
         label: i18n.get("successFullyRemovedTrustMember")
       });
     } catch (err) {
-      logger$b.error(`Failed to delete trust member`, err);
+      logger$c.error(`Failed to delete trust member`, err);
       showToast({
         type: ToastType.ERROR,
         label: i18n.get("failedToRemoveTrustMember")
@@ -33360,7 +33779,7 @@ function DropinComposerComponent({
           }
           break;
         default:
-          logger$b.warn(`Updating trust member type "${trustMember.trustMemberType}" is not implemented.`);
+          logger$c.warn(`Updating trust member type "${trustMember.trustMemberType}" is not implemented.`);
       }
       showToast({
         label: i18n.get("successfullyUpdatedDetails"),
@@ -33368,7 +33787,7 @@ function DropinComposerComponent({
       });
       await refreshLegalArrangementAndRunOnSubmit(associatedLegalArrangement, 1);
     } catch (err) {
-      logger$b.error(err);
+      logger$c.error(err);
       showToast({
         label: i18n.get("failedToUpdateDetails"),
         type: ToastType.ERROR
@@ -33389,7 +33808,7 @@ function DropinComposerComponent({
           navigateTo(TaskTypes.TASKS_OVERVIEW);
         }
       } catch (e) {
-        logger$b.error(e);
+        logger$c.error(e);
         showToast({
           label: i18n.get("failToLaunchSingpass"),
           type: ToastType.ERROR
@@ -33592,11 +34011,11 @@ function DropinComposerComponent({
           await getPciStatus2();
         }
         await getServiceAgreementStatus2();
-        await getServiceAgreementAcceptanceInfos();
+        await getServiceAgreementAcceptanceInfos2();
       }
     };
     setIsLoadingConfiguration(true);
-    fetchConfiguration().catch(logger$b.error).finally(() => {
+    fetchConfiguration().catch(logger$c.error).finally(() => {
       setIsLoadingConfiguration(false);
       onLoad();
     });
@@ -33614,12 +34033,16 @@ function DropinComposerComponent({
       return;
     }
     const timeoutId = setTimeout(() => {
-      refreshLegalEntity().catch(logger$b.error);
+      refreshLegalEntity().catch(logger$c.error);
     }, POLLING_INTERVAL);
     return () => {
       clearInterval(timeoutId);
     };
   }, [refreshLegalEntity, rootLegalEntity]);
+  useEffect(() => {
+    const newAccountHolder = getDefaultAccountHolderType(rootLegalEntity, false, accountHolder2);
+    if (newAccountHolder !== accountHolder2) setAccountHolder(newAccountHolder);
+  }, [accountHolder2, rootLegalEntity]);
   if (isLoadingConfiguration) {
     return jsx(Shimmer, {});
   }
@@ -33633,6 +34056,7 @@ function DropinComposerComponent({
           accountHolder: accountHolder2,
           onComplete: async (newAccountHolder) => {
             setAccountHolder(newAccountHolder);
+            setCanSeeEntitySelection(false);
             await refreshLegalEntity();
             navigateTo("default");
           },
@@ -33644,7 +34068,9 @@ function DropinComposerComponent({
       });
     case TaskTypes.SINGPASS_SELECTION:
       return jsx(SingpassSelection, {
-        handleNextClick: handleSingpassSelectionNextClick
+        handleNextClick: handleSingpassSelectionNextClick,
+        accountHolder: accountHolder2,
+        legalEntityType: rootLegalEntity.type
       });
     case TaskTypes.INTRODUCTION:
       return jsx(Introduction, {
@@ -33826,8 +34252,7 @@ function DropinComposerComponent({
         handleAddressSearch: args == null ? void 0 : args.handleAddressSearch,
         handleFindAddress: args == null ? void 0 : args.handleFindAddress,
         onTypeSwitch: navigateToTypeSwitcher,
-        isTargetLegalEntityType: legalEntityType === LegalEntityType.ORGANIZATION,
-        accountHolder: accountHolder2
+        isTargetLegalEntityType: legalEntityType === LegalEntityType.ORGANIZATION
       });
     case TaskTypes.COMPANY_SEARCH:
       return jsx(CompanySearchDropinComponent, {
@@ -33920,8 +34345,7 @@ function DropinComposerComponent({
         homeButtonLabel: i18n.get("saveAndGoToOverview"),
         associationDetail: trustMember,
         handleAddressSearch: args == null ? void 0 : args.handleAddressSearch,
-        handleFindAddress: args == null ? void 0 : args.handleFindAddress,
-        accountHolder: accountHolder2
+        handleFindAddress: args == null ? void 0 : args.handleFindAddress
       });
     case TaskTypes.PAYOUT:
     case TaskTypes.PAYIN:
@@ -34040,7 +34464,7 @@ function DropinComposerComponent({
         handleSign: async (...params) => {
           await args.handleSignServiceAgreement(...params);
           await getServiceAgreementStatus2();
-          await getServiceAgreementAcceptanceInfos();
+          await getServiceAgreementAcceptanceInfos2();
         }
       });
     case TaskTypes.LEGAL_ENTITY_TYPE_SWITCHER:
@@ -34083,7 +34507,7 @@ const createLegalEntity = async (context, legalEntity) => {
   return httpPost({
     loadingContext,
     errorLevel: "warn",
-    errorMessage: `LegalEntity creation available`,
+    errorMessage: "LegalEntity create failed",
     path: `${legalEntityId}`,
     authentication: "jwt",
     headers: {
@@ -34412,7 +34836,7 @@ const getIdverificationToken = async (context, request) => {
     loadingContext,
     errorLevel: "warn",
     errorMessage: `Failed to find address`,
-    path: `${legalEntityId}/providers/IdVerification/initiate`,
+    path: `${legalEntityId}/providers/idVerification/initiate`,
     authentication: "jwt",
     headers: {
       "Content-Type": "application/json"
@@ -34499,7 +34923,7 @@ const getServiceAgreement = async (context, data) => {
     }
   }, data);
 };
-const getServiceAgreementAcceptanceInfo = async (context) => {
+const getServiceAgreementAcceptanceInfos = async (context) => {
   const {
     loadingContext,
     legalEntityId
@@ -34508,7 +34932,7 @@ const getServiceAgreementAcceptanceInfo = async (context) => {
     loadingContext,
     errorLevel: "warn",
     errorMessage: `Failed to get service agreement acceptance info`,
-    path: `${legalEntityId}/termsOfService/termsOfServiceAcceptanceInfo`,
+    path: `${legalEntityId}/termsOfService/termsOfServiceAcceptanceInfos`,
     authentication: "jwt",
     headers: {
       "Content-Type": "application/json"
@@ -34562,7 +34986,7 @@ const idVerificationStartcheck = async (context, request) => {
     loadingContext,
     errorLevel: "warn",
     errorMessage: `Failed to find address`,
-    path: `${legalEntityId}/providers/IdVerification/process`,
+    path: `${legalEntityId}/providers/idVerification/process`,
     authentication: "jwt",
     headers: {
       "Content-Type": "application/json"
@@ -34626,10 +35050,7 @@ const useComponentApi = (rootLegalEntityId) => {
         ...baseRequestContext,
         legalEntityId
       }, legalEntity),
-      createLegalEntity: async (legalEntity) => createLegalEntity({
-        ...baseRequestContext,
-        legalEntityId: rootLegalEntityId
-      }, legalEntity),
+      createLegalEntity: async (legalEntity) => createLegalEntity(baseRequestContext, legalEntity),
       getTransferInstrument: async (transferInstrumentId) => getTransferInstrument(baseRequestContext, transferInstrumentId),
       getBankVerificationVendor: async (country2, openBankingPartnerConfigId) => getBankVerificationVendor(baseRequestContext, country2, openBankingPartnerConfigId),
       getDocument: async (documentId) => getDocument(baseRequestContext, documentId),
@@ -34667,7 +35088,7 @@ const useComponentApi = (rootLegalEntityId) => {
         ...baseRequestContext,
         legalEntityId
       }, pciReference),
-      getServiceAgreementAcceptanceInfos: async (legalEntityId) => getServiceAgreementAcceptanceInfo({
+      getServiceAgreementAcceptanceInfos: async (legalEntityId) => getServiceAgreementAcceptanceInfos({
         ...baseRequestContext,
         legalEntityId
       }),
@@ -34686,7 +35107,7 @@ const useComponentApi = (rootLegalEntityId) => {
     };
   }, [base, rootLegalEntityId]);
 };
-const logger$a = createLogger("CreateIndividualComponent");
+const logger$b = createLogger("CreateIndividualComponent");
 function CreateIndividualComponent({
   parentLegalEntityId,
   legalEntityId,
@@ -34722,13 +35143,13 @@ function CreateIndividualComponent({
       setParentLegalEntity(parentEntity);
       setLegalEntity(entity);
     } catch (error) {
-      logger$a.error(error);
+      logger$b.error(error);
     } finally {
       setLoadingStatus("success");
     }
   }, [parentLegalEntityId, legalEntityId, getLegalEntity2]);
   useEffect(() => {
-    fetchLegalEntity().catch(logger$a.error);
+    fetchLegalEntity().catch(logger$b.error);
   }, [fetchLegalEntity]);
   const country2 = ((_a = legalEntity == null ? void 0 : legalEntity.individual) == null ? void 0 : _a.residentialAddress.country) ?? contextCountry;
   return loadingStatus === "loading" ? jsx(Loader, {
@@ -34752,7 +35173,7 @@ function CreateIndividualComponent({
     taskType
   });
 }
-const logger$9 = createLogger("CreateTransferInstrumentComponent");
+const logger$a = createLogger("CreateTransferInstrumentComponent");
 function CreateTransferInstrumentComponent({
   legalEntityId,
   transferInstrumentId,
@@ -34794,7 +35215,7 @@ function CreateTransferInstrumentComponent({
         const ti = await getTransferInstrument2(transferInstrumentId);
         setTransferInstrument(ti);
       }
-    })().catch(logger$9.error).finally(() => {
+    })().catch(logger$a.error).finally(() => {
       setLoadingStatus("success");
     });
   }, [transferInstrumentId, fetchLegalEntity, getTransferInstrument2]);
@@ -34993,7 +35414,7 @@ function ManageTransferInstrumentOverviewItem({
     })
   }, transferInstrumentReference.transferInstrument.id);
 }
-const logger$8 = createLogger("ManageTransferInstrumentOverview");
+const logger$9 = createLogger("ManageTransferInstrumentOverview");
 function ManageTransferInstrumentOverview({
   transferInstrumentReferences,
   onAdd,
@@ -35018,7 +35439,7 @@ function ManageTransferInstrumentOverview({
         ...transferInstrumentsMap
       });
     } catch (e) {
-      logger$8.error(e);
+      logger$9.error(e);
     }
   };
   const onRemoveTransferinstrument = async (transferInstrumentId) => {
@@ -35026,7 +35447,7 @@ function ManageTransferInstrumentOverview({
       await deleteTransferInstrument2(transferInstrumentId);
       onRemove(transferInstrumentId);
     } catch (e) {
-      logger$8.error(e);
+      logger$9.error(e);
     }
   };
   const transferInstrumentListEle = transferInstrumentReferences.map((transferInstrumentRef) => jsx(ManageTransferInstrumentOverviewItem, {
@@ -35051,7 +35472,7 @@ function ManageTransferInstrumentOverview({
     })]
   });
 }
-const logger$7 = createLogger("ManageTransferInstrumentComponent");
+const logger$8 = createLogger("ManageTransferInstrumentComponent");
 function ManageTransferInstrumentComponent({
   legalEntityId,
   onAdd,
@@ -35087,7 +35508,7 @@ function ManageTransferInstrumentComponent({
   }, [getTransferInstruments2, getLegalEntity2, i18n, legalEntityId]);
   useEffect(() => {
     eventEmitter == null ? void 0 : eventEmitter.on("updateLocale", (locale) => setLocale(locale));
-    init2().catch(logger$7.error).finally(() => {
+    init2().catch(logger$8.error).finally(() => {
       setLoadingStatus("success");
     });
   }, [init2, setLocale, eventEmitter]);
@@ -35097,7 +35518,7 @@ function ManageTransferInstrumentComponent({
     }
   }, [hasOnlyVerifiedTransferInstruments, timeoutId, transferInstruments]);
   const onRemove = (transferInstrumentId) => {
-    refreshTransferInstruments().catch(logger$7.error);
+    refreshTransferInstruments().catch(logger$8.error);
     onRemoveSuccess == null ? void 0 : onRemoveSuccess(transferInstrumentId, legalEntityId);
   };
   const render2 = () => {
@@ -35125,9 +35546,10 @@ function ManageTransferInstrumentComponent({
     children: render2()
   });
 }
-const logger$6 = createLogger("CreateIndividualComponent");
+const logger$7 = createLogger("CreateIndividualComponent");
 function OnboardingDropinComponent({
-  legalEntityId
+  legalEntityId,
+  openBankingPartnerConfigId
 }) {
   if (!legalEntityId) {
     throw new Error("Must provide at-least legalEntityId");
@@ -35153,10 +35575,11 @@ function OnboardingDropinComponent({
     signPci: signPci2,
     getPciQuestionnaires: getPciQuestionnaires2,
     downloadPci: downloadPci2,
-    getServiceAgreementAcceptanceInfos,
+    getServiceAgreementAcceptanceInfos: getServiceAgreementAcceptanceInfos2,
     getServiceAgreementStatus: getServiceAgreementStatus2,
     getServiceAgreement: getServiceAgreement2,
-    acceptServiceAgreement: acceptServiceAgreement2
+    acceptServiceAgreement: acceptServiceAgreement2,
+    getBankVerificationVendor: getBankVerificationVendor2
   } = useComponentApi(legalEntityId);
   const [legalEntity, setLegalEntity] = useState();
   const [loadingStatus, setLoadingStatus] = useState("loading");
@@ -35165,13 +35588,13 @@ function OnboardingDropinComponent({
       const le = await getLegalEntity2(legalEntityId);
       setLegalEntity(le);
     } catch (error) {
-      logger$6.error(error);
+      logger$7.error(error);
     } finally {
       setLoadingStatus("success");
     }
   }, [legalEntityId, getLegalEntity2]);
   useEffect(() => {
-    fetchLegalEntity().catch(logger$6.error);
+    fetchLegalEntity().catch(logger$7.error);
   }, [fetchLegalEntity]);
   return loadingStatus === "loading" || !legalEntity ? jsx(Loader, {
     size: "medium"
@@ -35192,7 +35615,7 @@ function OnboardingDropinComponent({
     handleSignPci: signPci2,
     handleGetPciQuestionnaires: getPciQuestionnaires2,
     handleDownloadPci: downloadPci2,
-    handleGetServiceAgreementAcceptanceInfos: getServiceAgreementAcceptanceInfos,
+    handleGetServiceAgreementAcceptanceInfos: getServiceAgreementAcceptanceInfos2,
     handleGetServiceAgreementStatus: getServiceAgreementStatus2,
     handleGetServiceAgreement: getServiceAgreement2,
     handleSignServiceAgreement: acceptServiceAgreement2,
@@ -35200,7 +35623,448 @@ function OnboardingDropinComponent({
     handleGetTransferInstrument: getTransferInstrument2,
     handleDeleteTransferInstrument: deleteTransferInstrument2,
     handleUpdateTransferInstrument: updateTransferInstrument2,
-    handleCreateTrustedTransferInstrument: createTrustedTransferInstrument2
+    handleCreateTrustedTransferInstrument: createTrustedTransferInstrument2,
+    handleGetBankVerificationVendors: (country2) => getBankVerificationVendor2(country2, openBankingPartnerConfigId)
+  });
+}
+const highExposureCompanyDetailsValidations = {
+  country: {
+    modes: ["blur"],
+    validate: (country2) => !isEmpty(country2),
+    errorMessage: "fieldIsRequired"
+  },
+  numberOfEmployees: {
+    modes: ["blur"],
+    validate: (numberOfEmployees2) => !isEmpty(numberOfEmployees2),
+    errorMessage: "fieldIsRequired"
+  }
+};
+const highExposureCompanyDetailsFields = ["numberOfEmployees"];
+function AdditionalFieldsForHighExposureCompany({
+  requiredFields,
+  ...props
+}) {
+  const {
+    i18n
+  } = useI18nContext();
+  const {
+    handleChangeFor,
+    data,
+    valid,
+    errors,
+    fieldProblems
+  } = useForm({
+    ...props,
+    schema: ["numberOfEmployees"],
+    defaultData: {
+      ...props.data
+    },
+    rules: props.validators || highExposureCompanyDetailsValidations,
+    fieldProblems: props == null ? void 0 : props.fieldValidationErrors
+  });
+  const formUtils = formUtilities(props, i18n);
+  const {
+    updateStateSlice
+  } = useGlobalDataSlice("company");
+  useEffect(() => {
+    updateStateSlice({
+      data,
+      valid,
+      errors,
+      fieldProblems
+    });
+  }, [data, valid, errors, fieldProblems]);
+  return jsxs("form", {
+    className: "adyen-kyc__registration-details",
+    children: [jsx(FormHeader, {
+      heading: props.heading
+    }), jsx(ErrorPanel, {
+      verificationErrors: props.formVerificationErrors,
+      validationErrors: props == null ? void 0 : props.fieldValidationErrors,
+      formUtils,
+      id: "ariaErrorField"
+    }), formUtils.isRequiredField("numberOfEmployees") && jsx(Field, {
+      name: "numberOfEmployees",
+      label: formUtils.getLabel("numberOfEmployees", "numberOfEmployees"),
+      classNameModifiers: ["legalName"],
+      errorMessage: formUtils.getErrorMessage("numberOfEmployees", errors, fieldProblems),
+      isValid: valid.numberOfEmployees,
+      children: (childProps) => jsx(InputText, {
+        ...childProps,
+        name: "numberOfEmployees",
+        value: data.numberOfEmployees,
+        readonly: formUtils.isReadOnly("numberOfEmployees"),
+        classNameModifiers: ["legalName"],
+        onInput: handleChangeFor("numberOfEmployees", "input"),
+        onBlur: handleChangeFor("numberOfEmployees", "blur"),
+        "aria-required": true,
+        "aria-label": formUtils.getLabel("numberOfEmployees"),
+        "aria-invalid": !valid.numberOfEmployees
+      })
+    })]
+  });
+}
+const highExposureParentCompanyDetailsFields = ["numberOfEmployees"];
+function AdditionalFieldsForHighExposureParentCompany({
+  requiredFields,
+  ...props
+}) {
+  const {
+    i18n
+  } = useI18nContext();
+  const {
+    handleChangeFor,
+    data,
+    valid,
+    errors,
+    fieldProblems
+  } = useForm({
+    ...props,
+    schema: ["numberOfEmployees"],
+    defaultData: {
+      ...props.data
+    },
+    rules: props.validators || highExposureCompanyDetailsValidations,
+    fieldProblems: props == null ? void 0 : props.fieldValidationErrors
+  });
+  const formUtils = formUtilities(props, i18n);
+  const {
+    updateStateSlice
+  } = useGlobalDataSlice("parentCompany");
+  useEffect(() => {
+    updateStateSlice({
+      data,
+      valid,
+      errors,
+      fieldProblems
+    });
+  }, [data, valid, errors, fieldProblems]);
+  return jsxs("form", {
+    className: "adyen-kyc__registration-details",
+    children: [jsx(FormHeader, {
+      heading: props.heading
+    }), jsx(ErrorPanel, {
+      verificationErrors: props.formVerificationErrors,
+      validationErrors: props == null ? void 0 : props.fieldValidationErrors,
+      formUtils,
+      id: "ariaErrorField"
+    }), formUtils.isRequiredField("numberOfEmployees") && jsx(Field, {
+      name: "numberOfEmployees",
+      label: formUtils.getLabel("numberOfEmployees", "numberOfEmployees"),
+      classNameModifiers: ["legalName"],
+      errorMessage: formUtils.getErrorMessage("numberOfEmployees", errors, fieldProblems),
+      isValid: valid.numberOfEmployees,
+      children: (childProps) => jsx(InputText, {
+        ...childProps,
+        name: "numberOfEmployees",
+        value: data.numberOfEmployees,
+        readonly: formUtils.isReadOnly("numberOfEmployees"),
+        classNameModifiers: ["legalName"],
+        onInput: handleChangeFor("numberOfEmployees", "input"),
+        onBlur: handleChangeFor("numberOfEmployees", "blur"),
+        "aria-required": true,
+        "aria-label": formUtils.getLabel("numberOfEmployees"),
+        "aria-invalid": !valid.numberOfEmployees
+      })
+    })]
+  });
+}
+function AdditionalFieldsForHighExposureUltimateParentCompany({
+  requiredFields,
+  ...props
+}) {
+  const {
+    i18n
+  } = useI18nContext();
+  const {
+    handleChangeFor,
+    data,
+    valid,
+    errors,
+    fieldProblems
+  } = useForm({
+    ...props,
+    schema: ["numberOfEmployees"],
+    defaultData: {
+      ...props.data
+    },
+    rules: props.validators || highExposureCompanyDetailsValidations,
+    fieldProblems: props == null ? void 0 : props.fieldValidationErrors
+  });
+  const formUtils = formUtilities(props, i18n);
+  const {
+    updateStateSlice
+  } = useGlobalDataSlice("ultimateParentCompany");
+  useEffect(() => {
+    updateStateSlice({
+      data,
+      valid,
+      errors,
+      fieldProblems
+    });
+  }, [data, valid, errors, fieldProblems]);
+  return jsxs("form", {
+    className: "adyen-kyc__registration-details",
+    children: [jsx(FormHeader, {
+      heading: props.heading
+    }), jsx(ErrorPanel, {
+      verificationErrors: props.formVerificationErrors,
+      validationErrors: props == null ? void 0 : props.fieldValidationErrors,
+      formUtils,
+      id: "ariaErrorField"
+    }), formUtils.isRequiredField("numberOfEmployees") && jsx(Field, {
+      name: "numberOfEmployees",
+      label: formUtils.getLabel("numberOfEmployees", "numberOfEmployees"),
+      classNameModifiers: ["legalName"],
+      errorMessage: formUtils.getErrorMessage("numberOfEmployees", errors, fieldProblems),
+      isValid: valid.numberOfEmployees,
+      children: (childProps) => jsx(InputText, {
+        ...childProps,
+        name: "numberOfEmployees",
+        value: data.numberOfEmployees,
+        readonly: formUtils.isReadOnly("numberOfEmployees"),
+        classNameModifiers: ["legalName"],
+        onInput: handleChangeFor("numberOfEmployees", "input"),
+        onBlur: handleChangeFor("numberOfEmployees", "blur"),
+        "aria-required": true,
+        "aria-label": formUtils.getLabel("numberOfEmployees"),
+        "aria-invalid": !valid.numberOfEmployees
+      })
+    })]
+  });
+}
+const highExposureForms = {
+  company: {
+    formId: "company",
+    formName: "company",
+    fields: [...highExposureCompanyDetailsFields]
+  },
+  parentCompany: {
+    formId: "parentCompany",
+    formName: "parentCompany",
+    fields: [...highExposureParentCompanyDetailsFields]
+  },
+  ultimateParentCompany: {
+    formId: "ultimateParentCompany",
+    formName: "ultimateParentCompany",
+    fields: [...highExposureCompanyDetailsFields]
+  }
+};
+const parentCompanyFormId = highExposureForms.parentCompany.formId;
+const companyFormId = highExposureForms.company.formId;
+const ultimateParentCompanyFormId = highExposureForms.ultimateParentCompany.formId;
+function HighExposureDropinComponent(props) {
+  const {
+    i18n
+  } = useI18nContext();
+  const highExposureCompanyDetailsFormProps = getFormProps(props, companyFormId);
+  const highExposureParentCompanyDetailsFormProps = getFormProps(props, companyFormId);
+  const highExposureUltimateParentCompanyDetailsFormProps = getFormProps(props, companyFormId);
+  const renderActiveForm = (activeForm) => jsxs("div", {
+    className: "adyen-kyc",
+    children: [jsx(ContextGuidance, {
+      page: "High exposure company details page",
+      titleId: "whyDoINeedToFillInThisInformation",
+      contentId: "euFinancialRegulationsRequireUs",
+      title: i18n.get("whyDoINeedToFillInThisInformation"),
+      content: i18n.get("euFinancialRegulationsRequireUs")
+    }), jsxs("div", {
+      className: "adyen-kyc-form-wrapper",
+      children: [activeForm.formId === companyFormId && jsx(AdditionalFieldsForHighExposureCompany, {
+        ...highExposureCompanyDetailsFormProps,
+        heading: i18n.get("detailsForCapital"),
+        id: companyFormId,
+        country: props.country
+      }), activeForm.formId === parentCompanyFormId && jsx(AdditionalFieldsForHighExposureParentCompany, {
+        ...highExposureParentCompanyDetailsFormProps,
+        heading: i18n.get("parentCompanyDetails"),
+        id: companyFormId,
+        country: props.country
+      }), activeForm.formId === ultimateParentCompanyFormId && jsx(AdditionalFieldsForHighExposureUltimateParentCompany, {
+        ...highExposureUltimateParentCompanyDetailsFormProps,
+        heading: i18n.get("ultimateParentCompanyDetails"),
+        id: companyFormId,
+        country: props.country
+      })]
+    })]
+  });
+  return jsx("div", {
+    className: "adyen-kyc",
+    children: renderActiveForm(props.activeForm || highExposureForms.company)
+  });
+}
+const parseConfiguration = ({
+  matchingScenario
+}) => parseHighExposureScenarios(matchingScenario == null ? void 0 : matchingScenario[LegalEntityType.ORGANIZATION]);
+const logger$6 = createLogger("UpdateLegalEntityForHighExposure");
+function UpdateLegalEntityForHighExposure({
+  parentLegalEntity,
+  capabilities,
+  country: country2,
+  trackingConfig,
+  problems: problemsProp,
+  onSubmit: externalOnSubmit,
+  onChange,
+  hideDropinLayout,
+  handleHomeClick,
+  homeButtonLabel,
+  legalEntityId
+}) {
+  var _a;
+  const {
+    getLegalEntity: getLegalEntity2
+  } = useComponentApi(legalEntityId);
+  const {
+    i18n
+  } = useI18nContext();
+  const [legalEntity, setLegalEntity] = useState();
+  const fetchLegalEntity = useCallback(async () => {
+    const legalEntityResponse = await getLegalEntity2(legalEntityId);
+    setLegalEntity(legalEntityResponse);
+    if (legalEntityResponse) {
+      setData(mapLegalEntityToHighExposure(legalEntityResponse));
+    }
+    return legalEntityResponse;
+  }, [getLegalEntity2, legalEntityId]);
+  useEffect(() => {
+    (async () => {
+      await fetchLegalEntity();
+    })().catch(logger$6.error);
+  }, [fetchLegalEntity]);
+  const dataFromResponse = legalEntity ? mapLegalEntityToHighExposure(legalEntity) : {};
+  const [data, setData] = useState(dataFromResponse);
+  const [problems, setProblems] = useState(problemsProp ?? {});
+  const {
+    getConfiguration: getConfiguration2
+  } = useConfigurationApi();
+  const {
+    showToast
+  } = useToastContext();
+  const [loadingStatus, setLoadingStatus] = useState("success");
+  const formRef = useRef(null);
+  const getConfigurationData = useCallback(() => getConfiguration2({
+    legalEntityType: LegalEntityType.ORGANIZATION,
+    capabilities,
+    country: country2
+  }), [country2, capabilities]);
+  const {
+    fieldConfigurations
+  } = useScenarioConfiguration({
+    parseConfiguration,
+    getConfigurationData,
+    setLoadingStatus,
+    country: country2
+  });
+  const derivedProps = useMemo(() => getPropsFromConfigurations(fieldConfigurations, highExposureForms, (problems == null ? void 0 : problems.remediationActions) ? Object.values(problems == null ? void 0 : problems.remediationActions) : [], (problems == null ? void 0 : problems.missingData) ?? [], legalEntity ? getFieldsWithExistingData(legalEntity) : []), [fieldConfigurations, 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(highExposureForms, 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 exposureDetails = mapHighExposureToLegalEntity(data);
+    try {
+      console.log({
+        exposureDetails
+      });
+      setLoadingStatus("success");
+      showToast({
+        label: i18n.get("successfullyUpdatedDetails"),
+        type: ToastType.SUCCESS
+      });
+      externalOnSubmit == null ? void 0 : externalOnSubmit(data);
+    } catch (e) {
+      showToast({
+        label: i18n.get("failedToUpdateDetails"),
+        type: ToastType.ERROR
+      });
+      if (isValidationError(e)) {
+        const validationErrors = processValidationErrors(e, void 0, highExposureApiKeyMapping);
+        setProblems({
+          ...problems,
+          validationErrors
+        });
+      } else if (isMaintenanceModeError(e)) {
+        showToast({
+          label: i18n.get("failedToUpdateDetails"),
+          subLabel: i18n.get("maintenanceModeMessage"),
+          type: ToastType.ERROR,
+          duration: "indefinite"
+        });
+      }
+      setLoadingStatus("success");
+    }
+  };
+  const formatDataForSummary2 = (data2) => {
+    const summaryData = cloneObject(data2) || {};
+    return summaryData;
+  };
+  const canSubmit2 = (data2) => mandatoryApiFields.HIGH_EXPOSURE.every((detail) => {
+    const value = getProp(data2, detail);
+    return !isEmpty(value);
+  });
+  const baseTrackingPayload = getBaseTrackingPayload({
+    trackingConfig,
+    parentLegalEntity,
+    legalEntity
+  });
+  const {
+    handleNextClick,
+    handleBackClick,
+    activeForm,
+    shouldValidate,
+    setShouldValidate,
+    gotoFormByFormIndex,
+    nextButtonLabel
+  } = useFormComposer({
+    problems,
+    baseTrackingPayload,
+    forms: forms2,
+    formRef,
+    onSubmit
+  });
+  return jsx(FormWrapper, {
+    taskName: "detailsForCapital",
+    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)
+    },
+    children: jsx(HighExposureDropinComponent, {
+      ...derivedProps,
+      activeForm,
+      capabilities,
+      data: dataFromResponse,
+      country: ((_a = data == null ? void 0 : data.company) == null ? void 0 : _a.country) ?? country2,
+      problems,
+      shouldValidate,
+      ref: formRef
+    })
   });
 }
 var OnboardingUrlTarget = /* @__PURE__ */ ((OnboardingUrlTarget2) => {
@@ -35408,7 +36272,8 @@ const componentsMap = {
   createIndividualComponent: CreateIndividualComponent,
   manageTransferInstrumentComponent: ManageTransferInstrumentComponent,
   onboardingDropinComponent: OnboardingDropinComponent,
-  viewVerificationStatusComponent: ViewVerificationStatusComponent
+  viewVerificationStatusComponent: ViewVerificationStatusComponent,
+  updateLegalEntityForHighExposureComponent: UpdateLegalEntityForHighExposure
 };
 const AuthProvider = ({
   children,
@@ -35460,14 +36325,13 @@ const pushEvents = async (loadingContext, sessionId, event) => httpPost({
 }, event);
 const convertToEmbeddedEvent = (eventQueueItem) => {
   const [eventType, event] = eventQueueItem;
-  const hasEventData = typeof event === "object";
-  const eventName = hasEventData ? event.key : event;
+  const isObject = typeof event === "object";
+  const eventName = isObject ? event.key : event;
+  const eventData = isObject ? event.segmentation : {};
   return {
     eventType,
     eventName,
-    ...hasEventData && {
-      eventData: event.segmentation
-    }
+    eventData: eventData ?? {}
   };
 };
 const useAnalytics = async ({
@@ -35476,6 +36340,9 @@ const useAnalytics = async ({
   sdkVersion,
   componentName
 }) => {
+  const {
+    i18n
+  } = useI18nContext();
   const {
     isEmbeddedDropin,
     loadingContext: base
@@ -35494,6 +36361,9 @@ const useAnalytics = async ({
       }
       userEvents.subscribe((data) => {
         const eventItem = convertToEmbeddedEvent(data);
+        if (eventItem.eventData) {
+          eventItem.eventData.locale = i18n.locale;
+        }
         pushEvents(loadingContext, sessionResponse.id, eventItem);
       });
     } catch (e) {
@@ -35840,7 +36710,7 @@ const ConfigurationApiProvider = ({
     isEmbeddedDropin,
     loadingContext
   } = authContext;
-  const sdkVersion = "3.18.1";
+  const sdkVersion = "3.19.1";
   useAnalytics({
     onUserEvent,
     legalEntityId: rootLegalEntityId,
@@ -37162,6 +38032,18 @@ const viewVerificationStatusComponentSchema = {
   }
 };
 const onboardingDropinComponentSchema = {
+  legalEntityId: {
+    type: "string",
+    required: true
+  },
+  openBankingPartnerConfigId: {
+    type: "string"
+  }
+};
+const updateLegalEntityForHighExposureComponentSchema = {
+  country: {
+    type: "string"
+  },
   legalEntityId: {
     type: "string",
     required: true
@@ -37181,6 +38063,7 @@ const componentsSchemaMap = {
   createIndividualComponent: createIndividualComponentSchema,
   createTransferInstrumentComponent: createTransferInstrumentComponentSchema,
   viewVerificationStatusComponent: viewVerificationStatusComponentSchema,
+  updateLegalEntityForHighExposureComponent: updateLegalEntityForHighExposureComponentSchema,
   onboardingDropinComponent: onboardingDropinComponentSchema
 };
 const validateComponentName = (componentName) => {