@adyen/kyc-components 2.53.1 → 2.54.1

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

@@ -125,6 +125,7 @@ const defaultTrans = {
   annualTurnover: "Annual turnover",
   annualTurnoverHelper: "The annual sales revenue minus all discounts and sales taxes. Also known as net sales.",
   apartmentSuite: "Apartment / Suite",
+  apartmentSuiteOther: "Apt, suite, other",
   apartmentSuiteOptional: "Apartment / Suite (optional)",
   areYouACompany: "Are you a company?",
   areYouAnIndividual: "Are you an individual?",
@@ -203,6 +204,7 @@ const defaultTrans = {
   businessSelection__footerButton: "Add details manually",
   businessSelection__heading: "Select your business",
   businessSelection__invalidTin: "This company's TIN doesn't match yours",
+  businessSelection__tinVerificationFailure: "Sorry, something went wrong. Try again or continue by pressing Add details manually",
   businessStructure: "Business structure",
   businessTrust: "Business trust",
   businessTrusteeDetails: "Business trustee details",
@@ -985,7 +987,7 @@ const defaultTrans = {
   orSoleProprietorshipName: "or sole proprietorship's name",
   organisasjonsnummer: "Organisasjonsnummer",
   organisationsnummer: "Organisationsnummer",
-  otherAddressInformation: "Other address information (optional)",
+  otherAddressInformation: "Other address information",
   otherBusinessInformation: "Other business information",
   otherInformation: "Other information",
   otherTrust: "Other trust",
@@ -1041,6 +1043,8 @@ const defaultTrans = {
   postalCode: "Postal code",
   poweredBy: "Powered by",
   previous: "Previous",
+  principalPlaceOfBusiness: "Principal place of business",
+  principalPlaceOfBusinessDescription: "The physical location where a business's key officers oversee and manage its operations: this is usually the main office or headquarters.",
   privateCompanyDescription: "Your company is owned privately and not traded on a public stock exchange. ",
   privateCompanyTitle: "Private company",
   processing: "Processing",
@@ -1087,6 +1091,8 @@ const defaultTrans = {
   registeredAddressHeaderDescription__PR: "Your address as it appears on your Department of State Registration.",
   registeredAddressHeaderDescription__US: "Your address as it appears on your Secretary of State Registration.",
   registeredAddressTrustHeaderDescription: "The address registered to your trust",
+  registeredBusinessAddress: "Registered business address",
+  registeredBusinessAddressDescription: "Your business's official address used for government and other legal purposes.",
   registrationAddress: "Registration address",
   registrationDetails: "Registration details",
   registrationDocument: "Registration document",
@@ -1168,6 +1174,7 @@ const defaultTrans = {
   roleAndEntityType: "Role and entity type",
   routingNumberVisible: "Includes your routing number",
   salarySlip: "Salary slip",
+  sameAsRegisteredAddress: "Same as registered business address",
   sameNameAsLegalName: "Same as legal name of the company",
   "save&Leave": "Save & leave",
   saveAndGoToOverview: "Save and go to overview",
@@ -1422,6 +1429,7 @@ const defaultTrans = {
   xCharactersLeft: "%{charactersLeft} characters left",
   xMinutes: "%{minutes} minutes",
   xMinutesAndYSeconds: "%{minutes} and %{seconds}",
+  XOfYSteps: "%{currentStep} of %{totalSteps} ",
   xSeconds: "%{seconds} seconds",
   yes: "Yes",
   yesBankruptcyInsolvency: "Yes, the company is filling for bankruptcy or insolvency",
@@ -1647,6 +1655,12 @@ function useToastContext() {
   }
   return context;
 }
+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;
+};
 let suppressed = false;
 const consoleMethodsPrefixable = Object.freeze(["debug", "info", "log", "warn", "error", "trace"]);
 const stringSubstitutionRegex = /%([soOc]|(\.\d)?[dif])/;
@@ -2001,10 +2015,10 @@ function useBusinessData({
   handleVerifyTin,
   handleClearCompanyData
 }) {
-  const [isSearching, setIsSearching] = useState("idle");
-  const [isFetching, setIsFetching] = useState("idle");
-  const [isVerifying, setIsVerifying] = useState("idle");
-  const [isClearingTrustedData, setIsClearingTrustedData] = useState("idle");
+  const [searching, setSearching] = useState("idle");
+  const [fetching, setFetching] = useState("idle");
+  const [verifying, setVerifying] = useState("idle");
+  const [resettingTrustedData, setResettingTrustedData] = useState("idle");
   const [searchResults, setSearchResults] = useState();
   const [cachedSearch, setCachedSearch] = useState();
   const [cachedBusiness, setCachedBusiness] = useState();
@@ -2017,7 +2031,7 @@ function useBusinessData({
     }
     if (searchResults && objectsDeepEqual(cachedSearch, data)) return;
     try {
-      setIsSearching("loading");
+      setSearching("loading");
       const {
         results
       } = KNOWN_BROKEN_PRIMARY_SOURCE_CONNECTIONS.includes(data.state) ? await handleCompanyIndexSearch({
@@ -2030,11 +2044,11 @@ function useBusinessData({
       setSearchResults(results);
       return results;
     } catch (e) {
-      setIsSearching("error");
+      setSearching("error");
       logger$E.error(e);
     } finally {
       setCachedSearch(data);
-      setIsSearching((prevState) => prevState !== "error" ? "loaded" : prevState);
+      setSearching((prevState) => prevState !== "error" ? "loaded" : prevState);
     }
   }, [handleCompanyDeepSearch, handleCompanyIndexSearch, searchResults, cachedSearch]);
   const fetchBusinessData = useCallback(async (company) => {
@@ -2052,7 +2066,8 @@ function useBusinessData({
     const date = (/* @__PURE__ */ new Date()).toDateString();
     const isDataCompliant = company.lastUpdate ? Date.parse(date) - Date.parse(company.lastUpdate) < LOW_RISK_COMPANY_DATA_COMPLIANCE_WINDOW : false;
     try {
-      setIsFetching("loading");
+      setFetching("loading");
+      setVerifying("idle");
       setInvalidTin(false);
       const businessData = isDataCompliant ? await handleGetCompanyDataset({
         companyId: company.id,
@@ -2064,11 +2079,11 @@ function useBusinessData({
       setCachedBusiness(businessData);
       return businessData;
     } catch (e) {
-      setIsFetching("error");
+      setFetching("error");
       setCachedBusiness(void 0);
       logger$E.error(e);
     } finally {
-      setIsFetching((prevState) => prevState !== "error" ? "loaded" : prevState);
+      setFetching((prevState) => prevState !== "error" ? "loaded" : prevState);
     }
   }, [cachedBusiness, handleGetCompanyDataset, handleRefreshCompanyDataset]);
   const verifyBusinessData = useCallback(async (data, tin) => {
@@ -2077,7 +2092,7 @@ function useBusinessData({
       return;
     }
     try {
-      setIsVerifying("loading");
+      setVerifying("loading");
       setVerifiedBusiness(void 0);
       setInvalidTin(false);
       const {
@@ -2093,21 +2108,21 @@ function useBusinessData({
       }
       return matched;
     } catch (e) {
-      setIsVerifying("error");
+      setVerifying("error");
       logger$E.error(e);
     } finally {
-      setIsVerifying((prevState) => prevState !== "error" ? "loaded" : prevState);
+      setVerifying((prevState) => prevState !== "error" ? "loaded" : prevState);
     }
   }, [handleVerifyTin]);
   const clearTrustedBusinessData = useCallback(async () => {
     try {
-      setIsClearingTrustedData("loading");
+      setResettingTrustedData("loading");
       await (handleClearCompanyData == null ? void 0 : handleClearCompanyData());
     } catch (e) {
-      setIsClearingTrustedData("error");
+      setResettingTrustedData("error");
       logger$E.error(e);
     } finally {
-      setIsClearingTrustedData((prevState) => prevState !== "error" ? "loaded" : prevState);
+      setResettingTrustedData((prevState) => prevState !== "error" ? "loaded" : prevState);
     }
   }, [handleClearCompanyData]);
   const resetBusinessData = () => {
@@ -2126,10 +2141,10 @@ function useBusinessData({
     resetBusinessData,
     resetTinVerification,
     // Data
-    isSearching,
-    isFetching,
-    isVerifying,
-    isClearingTrustedData,
+    searching,
+    fetching,
+    verifying,
+    resettingTrustedData,
     currentSearchName: cachedSearch == null ? void 0 : cachedSearch.text,
     searchResults,
     verifiedBusiness,
@@ -2369,11 +2384,13 @@ const svgs = {
   bin: lazy(() => import("./bin-D7a-dmmy.js")),
   check: lazy(() => import("./checkmark-DS0ypPvH.js")),
   checkmark: lazy(() => import("./checkmark-circle-fill-hZq1T5e9.js")),
+  "checkmark-circle-fill": lazy(() => import("./checkmark-circle-fill-hZq1T5e9.js")),
   "checkmark-small": lazy(() => import("./checkmark-small-4ciES6ZR.js")),
   "chevron-down": lazy(() => import("./chevron-down-CSdvSDZq.js")),
   "chevron-right": lazy(() => import("./chevron-right-B5NJn8is.js")),
   "chevron-left": lazy(() => import("./chevron-left-Ctf1pv5s.js")),
   "chevron-up": lazy(() => import("./chevron-up-CXPd5NYI.js")),
+  circle: lazy(() => import("./circle-F380_Tya.js")),
   company: lazy(() => import("./headquarter-BVHLaPzn.js")),
   "company-2": lazy(() => import("./hotel-DLFFe_Ls.js")),
   contract: lazy(() => import("./contract-DFZ6WwMd.js")),
@@ -2404,7 +2421,6 @@ const svgs = {
   upload: lazy(() => import("./upload-XwV0PfcC.js")),
   "users-3": lazy(() => import("./4-people-BTQ6Okmp.js")),
   warning: lazy(() => import("./warning-filled-Od0v7tGX.js")),
-  wrong: lazy(() => import("./cross-circle-fill-BafKD3Av.js")),
   // images
   "document-blurred": lazy(() => import("./document-blurred-gtj03M4x.js")),
   "document-cutoff": lazy(() => import("./document-cut-off-D2vCeeIS.js")),
@@ -2434,7 +2450,7 @@ const svgs = {
   "plaid-logo": lazy(() => import("./plaid-logo-4nYeR9iX.js")),
   "trustly-logo": lazy(() => import("./trustly-logo-YJslAOYF.js"))
 };
-const unscalableIconNames = ["arrow-left", "arrow-right", "bank", "bin", "check", "checkmark", "checkmark-small", "chevron-down", "chevron-right", "chevron-left", "chevron-up", "company", "company-2", "contract", "cross", "decision-maker", "document", "download", "edit", "info-circle", "field-error", "image", "light-bulb", "location", "more-horiz", "new-document", "payout", "pci", "plus", "plus-small", "remove", "save", "search", "store", "trust", "user", "user-business", "upload", "users-3", "warning", "wrong"];
+const unscalableIconNames = ["bin", "check", "checkmark", "checkmark-small", "chevron-right", "chevron-left", "company", "contract", "cross", "decision-maker", "document", "download", "edit", "info-circle", "image", "location", "payout", "pci", "plus", "remove", "save", "search", "trust", "user", "upload", "warning"];
 const logger$D = createLogger("Icon");
 const Svg = ({
   className,
@@ -2450,7 +2466,7 @@ const Svg = ({
     return null;
   }
   return jsx("span", {
-    className: cx(`adyen-kyc-${type} adyen-kyc-${type}-${name}`, className),
+    className: cx(`adyen-kyc-${type}`, className),
     "data-testid": testId,
     children: jsx(Suspense, {
       fallback: null,
@@ -2733,15 +2749,6 @@ function useFormRouterContext() {
   return context;
 }
 const logger$C = createLogger("Link");
-const getIconClass = (icon, external) => {
-  if (external) {
-    return "adyen-kyc-link__icon adyen-kyc-icon-external-link";
-  }
-  if (icon) {
-    return `adyen-kyc-link__icon`;
-  }
-  return null;
-};
 const isValidLink = (href) => {
   if (href === "#") {
     logger$C.error('Links must include a valid href. If your href is "#", consider using a Button instead');
@@ -2762,7 +2769,6 @@ const Link = ({
   const target = external ? "_blank" : "_self";
   const rel = external ? "external noopener noreferrer" : void 0;
   const showIcon = icon || external;
-  const iconClass = showIcon && getIconClass(icon, external);
   const classNames = showAsButton ? cx("adyen-kyc-button", className, {
     "adyen-kyc-button--icon": showIcon
   }) : cx("adyen-kyc-link", className, {
@@ -2777,9 +2783,9 @@ const Link = ({
     children: [jsx("span", {
       className: "adyen-kyc-link__text adyen-kyc-link--inherit",
       children
-    }), showIcon && icon && iconClass && jsx(Icon, {
+    }), showIcon && icon && jsx(Icon, {
       name: icon,
-      className: iconClass
+      className: "adyen-kyc-link__icon"
     })]
   });
 };
@@ -2884,7 +2890,7 @@ function getFormProps(props, innerFormId) {
     return null;
   }
   const activeFormId = (_a = props.activeForm) == null ? void 0 : _a.formId;
-  const trustedFields2 = ((_b = props.trustedFields) == null ? void 0 : _b[innerFormId]) ?? [];
+  const trustedFields = ((_b = props.trustedFields) == null ? void 0 : _b[innerFormId]) ?? [];
   const readOnlyFields = ((_c = props.readOnlyFields) == null ? void 0 : _c[innerFormId]) ?? [];
   return {
     placeholders: ((_d = props.placeholders) == null ? void 0 : _d[innerFormId]) ?? {},
@@ -2893,12 +2899,12 @@ function getFormProps(props, innerFormId) {
     masks: ((_g = props.masks) == null ? void 0 : _g[innerFormId]) ?? {},
     data: ((_h = props.data) == null ? void 0 : _h[innerFormId]) ?? {},
     allFields: ((_i = props.allFields) == null ? void 0 : _i[innerFormId]) ?? [],
-    readOnlyFields: [...readOnlyFields, ...trustedFields2],
+    readOnlyFields: [...readOnlyFields, ...trustedFields],
     requiredFields: ((_j = props.requiredFields) == null ? void 0 : _j[innerFormId]) ?? [],
     optionalFields: ((_k = props.optionalFields) == null ? void 0 : _k[innerFormId]) ?? [],
     obscuredFields: ((_l = props.obscuredFields) == null ? void 0 : _l[innerFormId]) ?? [],
     verifyFields: ((_m = props.verifyFields) == null ? void 0 : _m[innerFormId]) ?? [],
-    trustedFields: trustedFields2,
+    trustedFields,
     trustedFieldsProvider: props.trustedFields,
     formVerificationErrors: ((_o = (_n = props.problems) == null ? void 0 : _n.verificationErrors) == null ? void 0 : _o[innerFormId]) ?? {},
     fieldValidationErrors: ((_q = (_p = props.problems) == null ? void 0 : _p.validationErrors) == null ? void 0 : _q[innerFormId]) ?? {},
@@ -2934,7 +2940,7 @@ function getNestedOuterFormPropsFromOuterFormProps(props, innerFormId) {
     optionalFields,
     obscuredFields,
     verifyFields,
-    trustedFields: trustedFields2,
+    trustedFields,
     problems,
     validators: validators2,
     shouldValidate
@@ -2951,7 +2957,7 @@ function getNestedOuterFormPropsFromOuterFormProps(props, innerFormId) {
     optionalFields,
     obscuredFields,
     verifyFields,
-    trustedFields: trustedFields2,
+    trustedFields,
     // the rest we just pass along for now, as they will be eventually be processed by getFormProps
     problems,
     validators: validators2,
@@ -3161,7 +3167,7 @@ function init({
   fieldProblems,
   obscuredFields,
   optionalFields,
-  trustedFields: trustedFields2,
+  trustedFields,
   formatters,
   staticValidate,
   asyncValidate
@@ -3178,7 +3184,7 @@ function init({
           data: defaultData,
           obscuredFields,
           optionalFields,
-          trustedFields: trustedFields2
+          trustedFields
         }
       },
       staticValidate,
@@ -3234,7 +3240,7 @@ function init({
     fieldProblems: {},
     obscuredFields,
     optionalFields,
-    trustedFields: trustedFields2
+    trustedFields
   });
   return formData;
 }
@@ -3243,7 +3249,7 @@ function reducer({
   asyncValidate,
   obscuredFields,
   optionalFields,
-  trustedFields: trustedFields2,
+  trustedFields,
   formatters
 }) {
   return (state, {
@@ -3315,7 +3321,7 @@ function reducer({
           fieldProblems,
           obscuredFields,
           optionalFields,
-          trustedFields: trustedFields2,
+          trustedFields,
           staticValidate,
           asyncValidate
         });
@@ -3349,7 +3355,7 @@ function reducer({
           fieldProblems: updatedFieldProblems,
           obscuredFields,
           optionalFields,
-          trustedFields: trustedFields2,
+          trustedFields,
           local
         };
       }
@@ -3543,7 +3549,7 @@ function useForm({
   fieldProblems,
   obscuredFields,
   optionalFields,
-  trustedFields: trustedFields2,
+  trustedFields,
   formatters,
   shouldValidate = false
 }) {
@@ -3561,20 +3567,20 @@ function useForm({
     asyncValidate: triggerAsyncValidation,
     obscuredFields,
     optionalFields,
-    trustedFields: trustedFields2,
+    trustedFields,
     formatters
-  }), [triggerStaticValidation, triggerAsyncValidation, obscuredFields, optionalFields, trustedFields2, formatters]);
+  }), [triggerStaticValidation, triggerAsyncValidation, obscuredFields, optionalFields, trustedFields, formatters]);
   const initialData = useMemo(() => ({
     schema: getSchema,
     defaultData,
     fieldProblems,
     obscuredFields,
     optionalFields,
-    trustedFields: trustedFields2,
+    trustedFields,
     formatters,
     staticValidate: triggerStaticValidation,
     asyncValidate: triggerAsyncValidation
-  }), [getSchema, defaultData, fieldProblems, obscuredFields, optionalFields, trustedFields2, formatters, triggerStaticValidation, triggerAsyncValidation]);
+  }), [getSchema, defaultData, fieldProblems, obscuredFields, optionalFields, trustedFields, formatters, triggerStaticValidation, triggerAsyncValidation]);
   const [state, dispatch] = useReducer(getReducer(), initialData, init);
   const isValid = useMemo(() => {
     var _a;
@@ -11874,10 +11880,10 @@ const LABELS = {
   },
   otherAddressInformation: {
     default: OTHER_ADDRESS_INFORMATION,
-    [CountryCodes.Canada]: "apartmentSuiteOptional",
-    [CountryCodes.PuertoRico]: "apartmentSuiteOptional",
+    [CountryCodes.Canada]: "apartmentSuiteOther",
+    [CountryCodes.PuertoRico]: "apartmentSuiteOther",
     // should exactly match CountryCodes.UnitedStates
-    [CountryCodes.UnitedStates]: "apartmentSuiteOptional"
+    [CountryCodes.UnitedStates]: "apartmentSuiteOther"
   },
   postalCode: {
     default: POSTAL_CODE,
@@ -11906,13 +11912,17 @@ const LABELS = {
 };
 const getKeyForField = (fieldName, country) => country ? LABELS[fieldName][country] || LABELS[fieldName].default : LABELS[fieldName].default;
 const getAddressSchemaForCountry = (country) => ADDRESS_SCHEMAS[country] || ADDRESS_SCHEMAS.default;
+const getAddressSchemaLabelsByCountry = (country) => {
+  const schema = getAddressSchemaForCountry(country);
+  return schema.reduce((labels2, field) => ({
+    ...labels2,
+    [field]: getKeyForField(field, country)
+  }), {});
+};
 const mapAddressLabels = (data, datasetUtils) => {
-  const {
-    country
-  } = data;
-  if (country) {
+  if (data == null ? void 0 : data.country) {
     return Object.entries(data).reduce((mappedAddress, [field, value]) => {
-      const mappedKey = getKeyForField(field, country);
+      const mappedKey = getKeyForField(field, data.country);
       switch (field) {
         case "country":
           return {
@@ -11922,7 +11932,7 @@ const mapAddressLabels = (data, datasetUtils) => {
         case "stateOrProvince":
           return {
             ...mappedAddress,
-            [mappedKey]: datasetUtils.getStateName(value, country)
+            [mappedKey]: datasetUtils.getStateName(value, data.country)
           };
         default:
           return {
@@ -11988,7 +11998,8 @@ function FieldContainer(props) {
     hideField,
     maxlength,
     handleChangeFor,
-    readOnly
+    readOnly,
+    optional
   } = props;
   const formUtils = formUtilities(props, i18n);
   const errorMessage = formUtils.getErrorMessage(fieldName, errors, fieldProblems);
@@ -12008,7 +12019,7 @@ function FieldContainer(props) {
             country: errorMessage
           },
           labels: {
-            country: formUtils.getLabel(field)
+            country: formUtils.getLabel(field, labelKey)
           },
           readonly: readOnly,
           classNameModifiers,
@@ -12027,7 +12038,7 @@ function FieldContainer(props) {
             stateOrProvince: errorMessage
           },
           labels: {
-            stateOrProvince: formUtils.getLabel(field)
+            stateOrProvince: formUtils.getLabel(field, labelKey)
           },
           readonly: readOnly,
           classNameModifiers,
@@ -12041,6 +12052,7 @@ function FieldContainer(props) {
           classNameModifiers,
           errorMessage,
           isValid: valid[field],
+          optional,
           children: (childProps) => jsx(InputText, {
             ...childProps,
             classNameModifiers,
@@ -12622,7 +12634,11 @@ const addressValidationRulesV4 = (country, i18n) => {
       errorMessage: "fieldIsRequired"
     }, {
       modes: ["blur"],
-      validate: (val) => !matchesRegex(EMOJI_REGEX, val) && !hasRepeatedCharacters(val) && !isInvalidName(val),
+      validate: (input) => !matchesRegex(NO_ALPHABET_REGEX, input),
+      errorMessage: "nameMustContainLetters"
+    }, {
+      modes: ["blur"],
+      validate: (val) => !matchesRegex(EMOJI_REGEX, val) && !hasRepeatedCharacters(val) && !isInvalidName(val) && matchesRegex(INDIVIDUAL_VALID_CHAR_REGEX, val),
       errorMessage: "checkForTypos"
     }, {
       modes: ["blur"],
@@ -12654,7 +12670,11 @@ const addressValidationRulesV4 = (country, i18n) => {
       errorMessage: "fieldIsRequired"
     }, {
       modes: ["blur"],
-      validate: (val) => !hasRepeatedCharacters(val) && !isInvalidName(val),
+      validate: (input) => !matchesRegex(NO_ALPHABET_REGEX, input),
+      errorMessage: "nameMustContainLetters"
+    }, {
+      modes: ["blur"],
+      validate: (val) => !matchesRegex(EMOJI_REGEX, val) && !hasRepeatedCharacters(val) && !isInvalidName(val) && matchesRegex(INDIVIDUAL_VALID_CHAR_REGEX, val),
       errorMessage: "checkForTypos"
     }, {
       modes: ["blur"],
@@ -12671,6 +12691,10 @@ const addressValidationRulesV4 = (country, i18n) => {
       modes: ["blur"],
       validate: (val) => !!val,
       errorMessage: "fieldIsRequired"
+    }, {
+      modes: ["blur"],
+      validate: (input) => !matchesRegex(NO_ALPHABET_REGEX, input),
+      errorMessage: "nameMustContainLetters"
     }, {
       modes: ["blur"],
       validate: (val) => !hasRepeatedCharacters(val) && !isInvalidName(val),
@@ -12682,7 +12706,11 @@ const addressValidationRulesV4 = (country, i18n) => {
       errorMessage: "fieldIsRequired"
     }, {
       modes: ["blur"],
-      validate: (val) => !hasRepeatedCharacters(val) && !isInvalidName(val),
+      validate: (input) => !matchesRegex(NO_ALPHABET_REGEX, input),
+      errorMessage: "nameMustContainLetters"
+    }, {
+      modes: ["blur"],
+      validate: (val) => !matchesRegex(EMOJI_REGEX, val) && !hasRepeatedCharacters(val) && !isInvalidName(val) && matchesRegex(INDIVIDUAL_VALID_CHAR_REGEX, val),
       errorMessage: "checkForTypos"
     }]
   };
@@ -12691,6 +12719,7 @@ function Address(props) {
   const {
     data: dataProp,
     requiredFields: requiredFieldsProp,
+    optionalFields: optionalFieldsProp = ["otherAddressInformation"],
     fieldValidationErrors: fieldValidationErrorsProp,
     formVerificationErrors: formVerificationErrorsProp,
     legalEntityId,
@@ -12741,11 +12770,13 @@ function Address(props) {
     formatters: addressFormatters,
     rules: isStrictNameAndAddressValidationEnabled ? rulesV4 : rules2,
     fieldProblems: fieldValidationErrorsProp,
+    optionalFields: optionalFieldsProp,
     obscuredFields: []
   });
   const formUtils = formUtilities({
     ...props,
-    requiredFields
+    requiredFields,
+    optionalFields: optionalFieldsProp
   }, i18n);
   useEffect(() => {
     if (dataProp.country !== data.country && dataProp.country) {
@@ -12842,7 +12873,7 @@ function Address(props) {
     }
   }, [canAutofillVerifiedBusinessAddress, verifiedBusiness]);
   const getComponent = (fieldName) => {
-    if (!formUtils.isRequiredField(fieldName)) return null;
+    if (!formUtils.isRequiredField(fieldName) && !formUtils.isOptionalField(fieldName)) return null;
     const hideField = fieldName === "country" && hideCountry;
     return jsx(FieldContainer, {
       classNameModifiers: [fieldName],
@@ -12856,6 +12887,7 @@ function Address(props) {
       hideField,
       "aria-label": formUtils.getLabel(fieldName, fieldName),
       readOnly: formUtils.isReadOnly(fieldName),
+      optional: formUtils.isOptionalField(fieldName),
       trimOnBlur: true
     }, fieldName);
   };
@@ -13903,32 +13935,30 @@ const businessDetailsBaseMapping = {
   "basicInformation.stateOrProvince": "organization.registeredAddress.stateOrProvince",
   "basicInformation.registrationNumber": "organization.registrationNumber",
   "basicInformation.taxInformation": "organization.taxInformation",
-  "basicInformation.isUen": "organization.isUen",
   "companyStructure.entityType": "organization.type",
   "additionalInformation.legalCompanyName": "organization.legalName",
   "additionalInformation.legalFormDescription": "organization.legalFormDescription",
   "additionalInformation.dbaName": "organization.doingBusinessAs",
   "additionalInformation.registrationNumber": "organization.registrationNumber",
   "additionalInformation.taxInformation": "organization.taxInformation",
-  "additionalInformation.isUen": "organization.isUen",
   "additionalInformation.vatNumber": "organization.vatNumber",
   "additionalInformation.vatAbsenceReason": "organization.vatAbsenceReason",
   "additionalInformation.dateOfIncorporation": "organization.dateOfIncorporation",
   "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",
-  "companyRegistrationAddress.registrationAddress.stateOrProvince": "organization.registeredAddress.stateOrProvince",
-  "companyRegistrationAddress.registrationAddress.address": "organization.registeredAddress.street",
-  "companyRegistrationAddress.registrationAddress.otherAddressInformation": "organization.registeredAddress.street2",
-  "companyRegistrationAddress.operationalAddress.city": "organization.principalPlaceOfBusiness.city",
-  "companyRegistrationAddress.operationalAddress.country": "organization.principalPlaceOfBusiness.country",
-  "companyRegistrationAddress.operationalAddress.postalCode": "organization.principalPlaceOfBusiness.postalCode",
-  "companyRegistrationAddress.operationalAddress.stateOrProvince": "organization.principalPlaceOfBusiness.stateOrProvince",
-  "companyRegistrationAddress.operationalAddress.address": "organization.principalPlaceOfBusiness.street",
-  "companyRegistrationAddress.operationalAddress.otherAddressInformation": "organization.principalPlaceOfBusiness.street2"
+  "additionalInformation.registrationAddress.city": "organization.registeredAddress.city",
+  "additionalInformation.registrationAddress.country": "organization.registeredAddress.country",
+  "additionalInformation.registrationAddress.postalCode": "organization.registeredAddress.postalCode",
+  "additionalInformation.registrationAddress.stateOrProvince": "organization.registeredAddress.stateOrProvince",
+  "additionalInformation.registrationAddress.address": "organization.registeredAddress.street",
+  "additionalInformation.registrationAddress.otherAddressInformation": "organization.registeredAddress.street2",
+  "additionalInformation.operationalAddress.city": "organization.principalPlaceOfBusiness.city",
+  "additionalInformation.operationalAddress.country": "organization.principalPlaceOfBusiness.country",
+  "additionalInformation.operationalAddress.postalCode": "organization.principalPlaceOfBusiness.postalCode",
+  "additionalInformation.operationalAddress.stateOrProvince": "organization.principalPlaceOfBusiness.stateOrProvince",
+  "additionalInformation.operationalAddress.address": "organization.principalPlaceOfBusiness.street",
+  "additionalInformation.operationalAddress.otherAddressInformation": "organization.principalPlaceOfBusiness.street2"
 };
 const companyBaseMapping = {
   "companyNameAndCountry.country": "organization.registeredAddress.country",
@@ -13941,7 +13971,6 @@ const companyBaseMapping = {
   "companyRegistrationDetails.vatNumber": "organization.vatNumber",
   "companyRegistrationDetails.vatAbsenceReason": "organization.vatAbsenceReason",
   "companyRegistrationDetails.dateOfIncorporation": "organization.dateOfIncorporation",
-  "companyRegistrationDetails.isUen": "organization.isUen",
   "companyRegistrationDetails.stockExchangeMIC": "organization.stockData.marketIdentifier",
   "companyRegistrationDetails.stockISIN": "organization.stockData.stockNumber",
   "companyRegistrationDetails.stockTickerSymbol": "organization.stockData.tickerSymbol",
@@ -13982,7 +14011,6 @@ const companySearchBaseMapping = {
   "companyOtherDetails.vatNumber": "organization.vatNumber",
   "companyOtherDetails.vatAbsenceReason": "organization.vatAbsenceReason",
   "companyOtherDetails.dateOfIncorporation": "organization.dateOfIncorporation",
-  "companyOtherDetails.isUen": "organization.isUen",
   "companyOtherDetails.stockExchangeMIC": "organization.stockData.marketIdentifier",
   "companyOtherDetails.stockISIN": "organization.stockData.stockNumber",
   "companyOtherDetails.stockTickerSymbol": "organization.stockData.tickerSymbol"
@@ -14338,23 +14366,23 @@ const mapLegalEntityToCompany = (legalEntity, isChangingType, accountHolder) =>
   return companyCompData;
 };
 const mapCompanyToLegalEntity = (data) => {
-  var _a, _b, _c, _d, _e, _f;
+  var _a, _b, _c, _d, _e, _f, _g;
   const requestObj = {
     ...formatObject(data, companyApiKeyMapping)
   };
   if (requestObj.organization.vatAbsenceReason) {
     requestObj.organization.vatNumber = "";
   }
-  const taxId = (_a = data.companyRegistrationDetails.taxInformation) == null ? void 0 : _a.find((tax) => {
+  const taxId = (_b = (_a = data.companyRegistrationDetails.taxInformation) == null ? void 0 : _a.find((tax) => {
     var _a2;
     return tax.country === ((_a2 = data.companyNameAndCountry) == null ? void 0 : _a2.country);
-  }).number;
-  if (taxId || ((_b = data.companyRegistrationDetails) == null ? void 0 : _b.isUen)) {
+  })) == null ? void 0 : _b.number;
+  if (taxId || ((_c = data.companyRegistrationDetails) == null ? void 0 : _c.isUen)) {
     requestObj.organization = updateTaxInformation({
-      taxId: ((_c = data.companyRegistrationDetails) == null ? void 0 : _c.isUen) ? data.companyRegistrationDetails.registrationNumber : taxId,
-      country: (_d = data.companyNameAndCountry) == null ? void 0 : _d.country,
-      exemptedFromTax: (_e = data.companyRegistrationDetails) == null ? void 0 : _e.exemptedFromTax,
-      isUen: (_f = data.companyRegistrationDetails) == null ? void 0 : _f.isUen,
+      taxId: ((_d = data.companyRegistrationDetails) == null ? void 0 : _d.isUen) ? data.companyRegistrationDetails.registrationNumber : taxId,
+      country: (_e = data.companyNameAndCountry) == null ? void 0 : _e.country,
+      exemptedFromTax: (_f = data.companyRegistrationDetails) == null ? void 0 : _f.exemptedFromTax,
+      isUen: (_g = data.companyRegistrationDetails) == null ? void 0 : _g.isUen,
       entity: requestObj.organization
     });
   }
@@ -16510,7 +16538,8 @@ const DecisionMakerRoleComponent = (props) => {
     validators: validators2,
     fieldValidationErrors,
     requiredFields,
-    allowedRoles
+    allowedRoles,
+    trustedRoles
   } = props;
   const {
     i18n
@@ -16568,7 +16597,7 @@ const DecisionMakerRoleComponent = (props) => {
         onSelect: changeRoles,
         mapToSelectItem: (role) => ({
           ...makeSelectItemForRole(role, i18n),
-          disabled: !(allowedRoles == null ? void 0 : allowedRoles.includes(role))
+          disabled: allowedRoles ? !(allowedRoles == null ? void 0 : allowedRoles.includes(role)) : trustedRoles.includes(role)
         })
       })
     })]
@@ -17464,10 +17493,13 @@ function PersonalDetailsComponent(props) {
     isExperimentEnabled
   } = useExperimentsContext();
   const isAgeVerificationEnabled = isExperimentEnabled("EnableAgeVerification");
-  const PERSONAL_DETAILS = props.id;
   const {
-    residencyCountry
-  } = props.data;
+    id: PERSONAL_DETAILS,
+    trustedRoles,
+    data: {
+      residencyCountry
+    }
+  } = props;
   const [externalErrors, setExternalErrors] = useState(null);
   const [status, setStatus] = useState("success");
   const stateRef = useRef({
@@ -17646,7 +17678,8 @@ function PersonalDetailsComponent(props) {
         ...decisionMakerRoleProps,
         taskType: props.taskType,
         dataStoreId: PERSONAL_DETAILS,
-        allowedRoles: props == null ? void 0 : props.allowedRoles
+        allowedRoles: props == null ? void 0 : props.allowedRoles,
+        trustedRoles
       }), hasRequiredFields(nameProps) && jsx(Name, {
         ...nameProps,
         dataStoreId: PERSONAL_DETAILS
@@ -18097,7 +18130,8 @@ function IndividualComponent(props) {
           allowedRoles: props == null ? void 0 : props.allowedRoles,
           capabilities: props.capabilities,
           parentLegalEntity: props.parentLegalEntity,
-          trustedFieldsProvider: props.trustedFieldsProvider
+          trustedFieldsProvider: props.trustedFieldsProvider,
+          trustedRoles: props.trustedRoles
         })
       }), jsx("div", {
         className: activeForm.formId !== addressFormID ? "adyen-kyc-form-wrapper adyen-kyc-form-wrapper--hidden" : "adyen-kyc-form-wrapper",
@@ -19558,12 +19592,9 @@ function BankVerification(props) {
         heading
       }), jsxs("div", {
         className: "adyen-kyc-bank-verification-success",
-        children: [jsx("span", {
-          children: jsx("i", {
-            className: "adyen-kyc-icon adyen-kyc-icon-checkmark-small adyen-kyc-bank-verification-success__checkmark-icon",
-            role: "img",
-            "aria-hidden": "true"
-          })
+        children: [jsx(Icon, {
+          name: "check",
+          className: "adyen-kyc-u-margin-x-24"
         }), jsxs("span", {
           children: [" ", i18n.get("youSuccessfullyVerifiedAccount")]
         })]
@@ -19585,12 +19616,6 @@ 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 = {
@@ -22525,7 +22550,7 @@ const entityProblemInitialState = {
   // default status - if the entity is not listed in the problems array
   validationErrors: {}
 };
-const UNRELATED_DATA_MISSING_ERROR_CODES = ["2_8036", "2_8064", "2_8067", "2_8183", "2_8189"];
+const UNRELATED_DATA_MISSING_ERROR_CODES = ["2_8036", "2_8064", "2_8067", "2_8183", "2_8189", "2_8190", "2_8191", "2_8193"];
 const UNRELATED_INVALID_INPUT_ERROR_CODES = ["1_14", "2_901", "2_902"];
 function getCapabilityProblems(response, country, isExperimentEnabled) {
   const capabilities = (response == null ? void 0 : response.capabilities) || {};
@@ -23667,7 +23692,7 @@ function getPropsFromConfigurations(scenarioConfiguration, forms2, remediationAc
   const masks = {};
   const validators2 = {};
   const obscuredFields = {};
-  const trustedFields2 = {};
+  const trustedFields = {};
   if (!scenarioConfiguration) {
     return;
   }
@@ -23703,7 +23728,7 @@ function getPropsFromConfigurations(scenarioConfiguration, forms2, remediationAc
       }
       const isFieldTrusted = isTrustedField(trustedMappings, formId, field);
       if (isFieldTrusted) {
-        trustedFields2[formId] = trustedFields2[formId] ? [...trustedFields2[formId], field] : [field];
+        trustedFields[formId] = trustedFields[formId] ? [...trustedFields[formId], field] : [field];
       }
       if (fieldConfigurations) {
         const customLabel = (_a3 = customLabels2 == null ? void 0 : customLabels2[field]) == null ? void 0 : _a3.call(customLabels2);
@@ -23774,7 +23799,7 @@ function getPropsFromConfigurations(scenarioConfiguration, forms2, remediationAc
     placeholders,
     validators: validators2,
     obscuredFields,
-    trustedFields: trustedFields2,
+    trustedFields,
     helperText,
     masks
   };
@@ -23795,7 +23820,7 @@ const isFieldRequiredToRemediateDataMissingError = (formId, field, dataMissingEr
   const missingAndLinkedFields = addLinkedFields(missingFields);
   return missingAndLinkedFields.includes(makeTLDSFieldName(formId, field));
 };
-const isTrustedField = (trustedFields2, formId, field) => trustedFields2 == null ? void 0 : trustedFields2.some((trustedField) => {
+const isTrustedField = (trustedFields, formId, field) => trustedFields == null ? void 0 : trustedFields.some((trustedField) => {
   const split = trustedField.split(".");
   return split[0] === formId && split[split.length - 1] === field;
 });
@@ -24032,11 +24057,8 @@ function VerifiedBusinessCard({
       })]
     })
   }].filter((item) => !!item.value), [address, addressLink, i18n, verifiedBusiness == null ? void 0 : verifiedBusiness.legalForm]);
-  return jsxs("section", {
-    children: [jsx(Typography, {
-      el: "h3",
-      children: i18n.get("verifiedInformation")
-    }), jsxs("div", {
+  return jsx("section", {
+    children: jsxs("div", {
       className: "adyen-kyc-verified-business-card",
       children: [jsx(StructuredList, {
         items: baseItems
@@ -24052,11 +24074,11 @@ function VerifiedBusinessCard({
           onClick: () => setExpanded(!expanded)
         })
       })]
-    })]
+    })
   });
 }
 const ADDITIONAL_INFORMATION_FORM_ID = "additionalInformation";
-const ADDITIONAL_INFORMATION_FIELDS = [...LEGAL_COMPANY_NAME_FIELD, ...DBA_NAME_FIELD, ...BUSINESS_REGISTRATION_NUMBER_FIELD, ...TAX_INFORMATION_FIELD, ...VAT_NUMBER_FIELD, ...DATE_OF_INCORPORATION_FIELD, ...STOCK_EXCHANGE_MIC_FIELD, ...STOCK_ISIN_FIELD, ...STOCK_TICKER_SYMBOL_FIELD, "legalFormDescription"];
+const ADDITIONAL_INFORMATION_FIELDS = [...LEGAL_COMPANY_NAME_FIELD, ...DBA_NAME_FIELD, ...BUSINESS_REGISTRATION_NUMBER_FIELD, ...TAX_INFORMATION_FIELD, ...VAT_NUMBER_FIELD, ...DATE_OF_INCORPORATION_FIELD, ...STOCK_EXCHANGE_MIC_FIELD, ...STOCK_ISIN_FIELD, ...STOCK_TICKER_SYMBOL_FIELD, "legalFormDescription", ...registrationAddressFields];
 function AdditionalInformationComponent({
   data,
   labels: labels2,
@@ -24073,11 +24095,13 @@ function AdditionalInformationComponent({
   obscuredFields,
   optionalFields,
   readOnlyFields,
-  trustedFields: trustedFields2,
+  trustedFields,
   country,
   companyType = CompanyTypesValue.PRIVATE_COMPANY,
   verifiedBusiness,
-  showCompanyStructure
+  showCompanyStructure,
+  handleAddressSearch,
+  handleFindAddress
 }) {
   var _a, _b, _c, _d;
   const {
@@ -24088,6 +24112,12 @@ function AdditionalInformationComponent({
   } = useI18nContext();
   const showVerified = !!verifiedBusiness;
   const showStockData = companyType === CompanyTypesValue.PUBLIC_COMPANY;
+  const ADDRESS_SCHEMA2 = getAddressSchemaForCountry(country).filter((field) => {
+    if (!COUNTRIES_WITH_STATES_DATASET.includes(country)) {
+      return field !== "otherAddressInformation" && field !== "stateOrProvince";
+    }
+    return field !== "otherAddressInformation";
+  });
   const initialFormUtilsProps = useMemo(() => ({
     data,
     labels: labels2,
@@ -24099,9 +24129,9 @@ function AdditionalInformationComponent({
     readOnlyFields,
     optionalFields,
     obscuredFields,
-    trustedFields: trustedFields2,
+    trustedFields,
     shouldValidate
-  }), [data, labels2, placeholders, helperText, readOnly, allFields, requiredFields, readOnlyFields, optionalFields, obscuredFields, trustedFields2, shouldValidate]);
+  }), [data, labels2, placeholders, helperText, readOnly, allFields, requiredFields, readOnlyFields, optionalFields, obscuredFields, trustedFields, shouldValidate]);
   const registrationNumberOptions = useMemo(() => getCompanyRegistrationNumberOptions(country, companyType), [country, companyType]);
   const defaultRegistrationNumberType = (data == null ? void 0 : data.registrationNumber) ? inferCompanyRegistrationNumberType(data == null ? void 0 : data.registrationNumber, country, companyType) : registrationNumberOptions == null ? void 0 : registrationNumberOptions[0].id;
   const [registrationNumberType, setRegistrationNumberType] = useState(defaultRegistrationNumberType);
@@ -24176,6 +24206,20 @@ function AdditionalInformationComponent({
       }
     }, initialFormUtilsProps);
   }, [companyType, country, initialFormUtilsProps, registrationNumberType, taxIdNumberType, vatNumberType]);
+  const mergedDefaultData = useMemo(() => {
+    if (!verifiedBusiness) return data;
+    return {
+      ...data,
+      legalCompanyName: verifiedBusiness.name,
+      registrationAddress: {
+        address: verifiedBusiness.street,
+        city: verifiedBusiness.city,
+        postalCode: verifiedBusiness.zipcode,
+        stateOrProvince: verifiedBusiness.state,
+        country: verifiedBusiness.country
+      }
+    };
+  }, [data, verifiedBusiness]);
   const {
     schema: formSchema,
     data: formData,
@@ -24184,10 +24228,11 @@ function AdditionalInformationComponent({
     fieldProblems: formFieldProblems,
     handleChangeFor,
     resetToDefaultData,
-    setErrors
+    setErrors,
+    setValid
   } = useForm({
     schema: getFormSchema2,
-    defaultData: data,
+    defaultData: mergedDefaultData,
     rules: mergedFieldProps == null ? void 0 : mergedFieldProps.validators,
     optionalFields: mergedFieldProps == null ? void 0 : mergedFieldProps.optionalFields,
     obscuredFields: mergedFieldProps == null ? void 0 : mergedFieldProps.obscuredFields,
@@ -24209,9 +24254,7 @@ function AdditionalInformationComponent({
     if (verifiedBusiness && verifiedBusiness.name !== formData.legalCompanyName) return handleChangeFor("legalCompanyName")(verifiedBusiness.name);
   }, [formData.legalCompanyName, verifiedBusiness, showCompanyStructure]);
   useEffect(() => {
-    if (!verifiedBusiness && !showCompanyStructure) {
-      return resetToDefaultData();
-    }
+    if (!verifiedBusiness && !showCompanyStructure) resetToDefaultData();
   }, [verifiedBusiness]);
   const showField = (fieldKeys) => fieldKeys.some((field) => {
     switch (field) {
@@ -24222,6 +24265,15 @@ function AdditionalInformationComponent({
         return formUtils.isRequiredField(field) || formUtils.isOptionalField(field);
     }
   });
+  const handleRegistrationAddressChange = (state) => {
+    handleChangeFor("registrationAddress")(state.data);
+    setValid("registrationAddress", Boolean(state.isValid));
+  };
+  const handleOperationalAddressChange = (state) => {
+    handleChangeFor("operationalAddress")(state.data);
+    setValid("operationalAddress", Boolean(state.isValid));
+  };
+  const handleOperationalAddressIsSameChange = (isChecked) => isChecked ? handleChangeFor("operationalAddressIsSame")(operationalAddressIsSameIds.OPERATIONAL_ADDRESS_IS_SAME) : handleChangeFor("operationalAddressIsSame")(operationalAddressIsSameIds.OPERATIONAL_ADDRESS_IS_NOT_SAME);
   return jsxs("form", {
     id: ADDITIONAL_INFORMATION_FORM_ID,
     className: "adyen-kyc-additional-information",
@@ -24233,12 +24285,25 @@ function AdditionalInformationComponent({
       verificationErrors: formVerificationErrors,
       validationErrors: fieldValidationErrors,
       formUtils
-    }), showVerified && jsx(VerifiedBusinessCard, {
-      verifiedBusiness
+    }), showVerified && jsxs("div", {
+      children: [jsx("div", {
+        className: "adyen-kyc-additional-information__section-heading",
+        children: jsx(Typography, {
+          el: "h3",
+          variant: "title",
+          children: i18n.get("verifiedInformation")
+        })
+      }), jsx(VerifiedBusinessCard, {
+        verifiedBusiness
+      })]
     }), jsxs("fieldset", {
-      children: [showVerified && jsx(Typography, {
-        el: "h3",
-        children: i18n.get("otherBusinessInformation")
+      children: [showVerified && jsx("div", {
+        className: "adyen-kyc-additional-information__section-heading",
+        children: jsx(Typography, {
+          el: "h3",
+          variant: "title",
+          children: i18n.get("otherBusinessInformation")
+        })
       }), showField(LEGAL_COMPANY_NAME_FIELD) && jsx("div", {
         className: "adyen-kyc-field-wrapper",
         children: jsx(LegalCompanyNameField, {
@@ -24329,7 +24394,8 @@ function AdditionalInformationComponent({
           country,
           canExempt: formUtils.isRequiredField("exemptedFromVat"),
           vatNumberType,
-          setVatNumberType
+          setVatNumberType,
+          shouldValidate
         })
       }), showField(DATE_OF_INCORPORATION_FIELD) && jsx("div", {
         className: "adyen-kyc-field-wrapper",
@@ -24346,9 +24412,13 @@ function AdditionalInformationComponent({
         })
       })]
     }), showStockData && jsxs("fieldset", {
-      children: [jsx(Typography, {
-        el: "h3",
-        children: i18n.get("stockExchangeInformation")
+      children: [jsx("div", {
+        className: "adyen-kyc-additional-information__section-heading",
+        children: jsx(Typography, {
+          el: "h3",
+          variant: "title",
+          children: i18n.get("stockExchangeInformation")
+        })
       }), showField(STOCK_EXCHANGE_MIC_FIELD) && jsx("div", {
         className: "adyen-kyc-field-wrapper",
         children: jsx(StockExchangeMICField, {
@@ -24392,6 +24462,79 @@ function AdditionalInformationComponent({
           handleChangeFor
         })
       })]
+    }), jsxs("fieldset", {
+      children: [jsxs("div", {
+        className: "adyen-kyc-additional-information__section-heading",
+        children: [jsx(Typography, {
+          el: "h3",
+          variant: "title",
+          children: i18n.get("registeredBusinessAddress")
+        }), jsx(Typography, {
+          el: "h4",
+          variant: "caption",
+          children: i18n.get("registeredBusinessAddressDescription")
+        })]
+      }), jsx(Address, {
+        id: ADDITIONAL_INFORMATION_FORM_ID,
+        addressType: "registrationAddress",
+        data: {
+          ...mergedDefaultData == null ? void 0 : mergedDefaultData.registrationAddress,
+          country
+        },
+        labels: getAddressSchemaLabelsByCountry(country),
+        countryCode: country,
+        requiredFields: ADDRESS_SCHEMA2,
+        shouldValidate,
+        hideCountry: true,
+        optionalFields: ["otherAddressInformation"],
+        onChange: handleRegistrationAddressChange,
+        handleAddressSearch,
+        handleFindAddress,
+        verifiedBusiness
+      })]
+    }), jsxs("fieldset", {
+      children: [jsxs("div", {
+        className: "adyen-kyc-additional-information__section-heading",
+        children: [jsx(Typography, {
+          el: "h3",
+          variant: "title",
+          children: i18n.get("principalPlaceOfBusiness")
+        }), jsx(Typography, {
+          el: "h4",
+          variant: "caption",
+          children: i18n.get("principalPlaceOfBusinessDescription")
+        })]
+      }), jsx(Field, {
+        name: "operationalAddressIsSame",
+        classNameModifiers: ["operationalAddressIsSame"],
+        errorMessage: formErrors.operationalAddressIsSame,
+        isValid: formValid.operationalAddressIsSame,
+        children: (childProps) => jsx(Checkbox, {
+          ...childProps,
+          "aria-required": formUtils.isRequiredField("operationalAddressIsSame"),
+          "aria-label": formUtils.getLabel("sameAsRegisteredAddress"),
+          "aria-invalid": !formValid.operationalAddressIsSame,
+          name: "operationalAddressIsSame",
+          label: formUtils.getLabel("sameAsRegisteredAddress"),
+          checked: formData.operationalAddressIsSame ? formData.operationalAddressIsSame === operationalAddressIsSameIds.OPERATIONAL_ADDRESS_IS_SAME : true,
+          onChange: handleOperationalAddressIsSameChange
+        })
+      }), formData.operationalAddressIsSame === operationalAddressIsSameIds.OPERATIONAL_ADDRESS_IS_NOT_SAME && jsx(Address, {
+        id: ADDITIONAL_INFORMATION_FORM_ID,
+        addressType: "operationalAddress",
+        data: {
+          ...mergedDefaultData == null ? void 0 : mergedDefaultData.operationalAddress,
+          country
+        },
+        labels: getAddressSchemaLabelsByCountry(country),
+        countryCode: country,
+        requiredFields: ADDRESS_SCHEMA2,
+        shouldValidate,
+        optionalFields: ["otherAddressInformation"],
+        onChange: handleOperationalAddressChange,
+        handleAddressSearch,
+        handleFindAddress
+      })]
     })]
   });
 }
@@ -24538,8 +24681,8 @@ function BusinessInformationCard({
   result,
   selectedBusinessId,
   currentBusinessSelection,
-  fetching,
-  failedToLoad,
+  fetchStatus,
+  verifyStatus,
   invalidTin,
   resetTinVerification,
   setIsBusinessSelection,
@@ -24549,9 +24692,9 @@ function BusinessInformationCard({
   const {
     i18n
   } = useI18nContext();
-  const showSelectButton = !fetching && !failedToLoad && currentBusinessSelection;
+  const showSelectButton = fetchStatus !== "loading" && fetchStatus !== "error" && currentBusinessSelection;
   const selectBusiness = (searchResult) => {
-    if (failedToLoad && selectedBusinessId === searchResult.id) return;
+    if (fetchStatus === "error" && selectedBusinessId === searchResult.id) return;
     return handleSelectBusiness(searchResult);
   };
   const handleGoBack = () => {
@@ -24564,7 +24707,7 @@ function BusinessInformationCard({
     title: result.name,
     subTitle: result.registrationNumber,
     stateful: true,
-    fetching: fetching && selectedBusinessId === result.id,
+    fetching: fetchStatus === "loading" && selectedBusinessId === result.id,
     active: selectedBusinessId === result.id,
     headerButton: selectedBusinessId === result.id && showSelectButton ? jsx(Button, {
       label: i18n.get("thisIsMyBusiness"),
@@ -24586,7 +24729,11 @@ function BusinessInformationCard({
           showAsLink: true
         }),
         testId: "invalidTin"
-      }), failedToLoad && jsx(Alert, {
+      }), verifyStatus === "error" && jsx(Alert, {
+        variant: "error",
+        title: i18n.get("businessSelection__tinVerificationFailure"),
+        testId: "tinVerificationFailure"
+      }), fetchStatus === "error" && jsx(Alert, {
         variant: "info",
         type: "callToAction",
         title: i18n.get("businessSelection__failedToLoad"),
@@ -24597,8 +24744,8 @@ function BusinessInformationCard({
           showAsLink: true
         }),
         testId: "failedToLoad"
-      }), !failedToLoad && jsx(BusinessInformation, {
-        fetching,
+      }), fetchStatus !== "error" && jsx(BusinessInformation, {
+        fetching: fetchStatus === "loading",
         selectedBusiness: currentBusinessSelection
       })]
     })
@@ -24607,10 +24754,10 @@ function BusinessInformationCard({
 const logger$n = createLogger("BusinessSelection");
 function BusinessSelectionComponent({
   showCompanyStructure,
-  isSearching,
-  isFetching,
-  isVerifying,
-  isClearingTrustedData,
+  searching,
+  fetching,
+  verifying,
+  resettingTrustedData,
   searchResults,
   invalidTin,
   fetchBusinessData,
@@ -24638,19 +24785,19 @@ function BusinessSelectionComponent({
   }, [setShowCompanyStructure, verifyBusinessData]);
   const handleSelectBusiness = useCallback(async (result) => {
     try {
-      if (isFetching === "loading") return;
+      if (fetching === "loading") return;
       if (!selectedBusinessId || selectedBusinessId !== result.id) {
         setSelectedBusinessId(result.id);
         const businessData = await fetchBusinessData(result);
         setCurrentBusinessSelection(businessData);
-      } else if (isFetching === "error") {
+      } else if (fetching === "error") {
         const businessData = await fetchBusinessData(result);
         setCurrentBusinessSelection(businessData);
       }
     } catch (e) {
       logger$n.error(e);
     }
-  }, [fetchBusinessData, isFetching, selectedBusinessId]);
+  }, [fetchBusinessData, fetching, selectedBusinessId]);
   const handleConfirmSelection = useCallback(async (data) => {
     if (!currentTin) return;
     try {
@@ -24662,7 +24809,7 @@ function BusinessSelectionComponent({
       logger$n.error(e);
     }
   }, [currentTin, handleNextClick, handleBusinessVerification]);
-  const showLoader = isSearching === "loading" || isVerifying === "loading" || isClearingTrustedData === "loading" || isFetching === "loading" && (searchResults == null ? void 0 : searchResults.length) === 1;
+  const showLoader = searching === "loading" || verifying === "loading" || resettingTrustedData === "loading" || fetching === "loading" && (searchResults == null ? void 0 : searchResults.length) === 1;
   const businessSelectionClasses = cx("adyen-kyc-business-selection", {
     "adyen-kyc-business-selection--loading": showLoader
   });
@@ -24687,8 +24834,8 @@ function BusinessSelectionComponent({
             result,
             selectedBusinessId,
             currentBusinessSelection,
-            fetching: isFetching === "loading",
-            failedToLoad: isFetching === "error",
+            fetchStatus: fetching,
+            verifyStatus: verifying,
             invalidTin,
             resetTinVerification,
             handleSelectBusiness,
@@ -24802,7 +24949,7 @@ function BasicInformationComponent({
   obscuredFields,
   optionalFields,
   readOnlyFields,
-  trustedFields: trustedFields2,
+  trustedFields,
   country,
   companyType = CompanyTypesValue.PRIVATE_COMPANY,
   isTopLevelEntity,
@@ -24810,10 +24957,10 @@ function BasicInformationComponent({
   showBusinessSelection,
   showCompanyStructure,
   isActiveForm,
-  isSearching,
-  isFetching,
-  isVerifying,
-  isClearingTrustedData,
+  searching,
+  fetching,
+  verifying,
+  resettingTrustedData,
   searchResults,
   invalidTin,
   verifiedBusiness,
@@ -24856,9 +25003,9 @@ function BasicInformationComponent({
     readOnlyFields,
     optionalFields,
     obscuredFields,
-    trustedFields: trustedFields2,
+    trustedFields,
     shouldValidate
-  }), [allFields, helperText, labels2, obscuredFields, optionalFields, placeholders, readOnly, readOnlyFields, requiredFields, trustedFields2, shouldValidate]);
+  }), [allFields, helperText, labels2, obscuredFields, optionalFields, placeholders, readOnly, readOnlyFields, requiredFields, trustedFields, shouldValidate]);
   const registrationNumberOptions = useMemo(() => getCompanyRegistrationNumberOptions(country, companyType), [country, companyType]);
   const defaultRegistrationNumberType = (data == null ? void 0 : data.registrationNumber) ? inferCompanyRegistrationNumberType(data == null ? void 0 : data.registrationNumber, country, companyType) : (_a = registrationNumberOptions == null ? void 0 : registrationNumberOptions[0]) == null ? void 0 : _a.id;
   const [registrationNumberType, setRegistrationNumberType] = useState(defaultRegistrationNumberType);
@@ -24925,6 +25072,9 @@ function BasicInformationComponent({
       fieldProblems: formFieldProblems
     });
   }, [formSchema, formData, formErrors, formFieldProblems, formValid, updateStateSlice]);
+  useEffect(() => {
+    if (!isActiveForm && !(searchResults == null ? void 0 : searchResults.length)) setShowBusinessSelection(false);
+  }, [isActiveForm, searchResults == null ? void 0 : searchResults.length, setShowBusinessSelection]);
   useEffect(() => {
     if (showBusinessSelection && showCompanyStructure && isActiveForm) {
       handleNextClick();
@@ -24935,10 +25085,10 @@ function BasicInformationComponent({
   if (showBusinessSelection) {
     return jsx(BusinessSelectionComponent, {
       showCompanyStructure,
-      isSearching,
-      isFetching,
-      isVerifying,
-      isClearingTrustedData,
+      searching,
+      fetching,
+      verifying,
+      resettingTrustedData,
       searchResults,
       invalidTin,
       fetchBusinessData,
@@ -25390,12 +25540,6 @@ const getForms = (country) => ({
     formHeading: "additionalInformationFormHeading",
     fields: COUNTRIES_USING_COMPANY_SEARCH.includes(country) ? ADDITIONAL_INFORMATION_FIELDS.filter((field) => !FIELDS_NEEDED_FOR_COMPANY_SEARCH.includes(field)) : ADDITIONAL_INFORMATION_FIELDS
   },
-  companyRegistrationAddress: {
-    formId: "companyRegistrationAddress",
-    formName: "companyRegistrationAddressFormName",
-    formDescription: "companyRegistrationAddressFormDescription",
-    fields: ["registrationAddress", "operationalAddress", "operationalAddressIsSame"]
-  },
   companyRegistrationDocument: {
     formId: "companyRegistrationDocument",
     formName: "companyRegistrationDocumentFormName",
@@ -25437,7 +25581,7 @@ const mapBasicInformation = (data) => {
   }, {});
 };
 const mapAdditionalInformation = (data, legalEntity) => {
-  var _a, _b, _c, _d;
+  var _a, _b, _c, _d, _e;
   if (!data) return;
   const dbaName = ((_a = legalEntity.organization) == null ? void 0 : _a.doingBusinessAs) ? ((_b = legalEntity.organization) == null ? void 0 : _b.doingBusinessAs) !== ((_c = legalEntity.organization) == null ? void 0 : _c.legalName) ? {
     hasDba: true
@@ -25445,6 +25589,7 @@ const mapAdditionalInformation = (data, legalEntity) => {
     hasDba: false
   } : {};
   const currentCountry = (_d = legalEntity.organization) == null ? void 0 : _d.registeredAddress.country;
+  const operationalAddressIsSame = ((_e = legalEntity.organization) == null ? void 0 : _e.principalPlaceOfBusiness) ? operationalAddressIsSameIds.OPERATIONAL_ADDRESS_IS_NOT_SAME : operationalAddressIsSameIds.OPERATIONAL_ADDRESS_IS_SAME;
   return entriesOf(data).reduce((acc, [field]) => {
     if (!COUNTRIES_USING_COMPANY_SEARCH.includes(currentCountry)) {
       return {
@@ -25460,7 +25605,8 @@ const mapAdditionalInformation = (data, legalEntity) => {
     }
     return acc;
   }, {
-    ...dbaName
+    ...dbaName,
+    operationalAddressIsSame
   });
 };
 const mapLegalEntityToBusinessDetailsSchema = (legalEntity, isChangingType, accountHolder) => {
@@ -25474,7 +25620,6 @@ const mapLegalEntityToBusinessDetailsSchema = (legalEntity, isChangingType, acco
     companyTaxDocument
   };
   return entriesOf(businessDetailsSchema).reduce((componentData, [key]) => {
-    var _a;
     switch (key) {
       case "basicInformation": {
         return {
@@ -25497,15 +25642,6 @@ const mapLegalEntityToBusinessDetailsSchema = (legalEntity, isChangingType, acco
           [key]: mapAdditionalInformation(businessDetailsSchema[key], legalEntity)
         };
       }
-      case "companyRegistrationAddress": {
-        return {
-          ...componentData,
-          [key]: {
-            ...businessDetailsSchema[key],
-            operationalAddressIsSame: ((_a = legalEntity.organization) == null ? void 0 : _a.principalPlaceOfBusiness) ? operationalAddressIsSameIds.OPERATIONAL_ADDRESS_IS_NOT_SAME : operationalAddressIsSameIds.OPERATIONAL_ADDRESS_IS_SAME
-          }
-        };
-      }
       case "companyRegistrationDocument": {
         return {
           ...componentData,
@@ -25534,16 +25670,15 @@ function BusinessDetailsComponent(props) {
     country,
     isTopLevelEntity,
     activeForm,
-    problems,
     baseTrackingPayload,
     showCompanyStructure,
     showBusinessSelection,
     setShowBusinessSelection,
     setShowCompanyStructure,
-    isSearching,
-    isFetching,
-    isVerifying,
-    isClearingTrustedData,
+    searching,
+    fetching,
+    verifying,
+    resettingTrustedData,
     searchResults,
     invalidTin,
     verifiedBusiness,
@@ -25584,10 +25719,10 @@ function BusinessDetailsComponent(props) {
         showBusinessSelection,
         showCompanyStructure,
         isActiveForm: (activeForm == null ? void 0 : activeForm.formId) === forms2.basicInformation.formId,
-        isSearching,
-        isFetching,
-        isVerifying,
-        isClearingTrustedData,
+        searching,
+        fetching,
+        verifying,
+        resettingTrustedData,
         fetchBusinessData,
         verifyBusinessData,
         proceedToManualDataEntry,
@@ -25619,22 +25754,9 @@ function BusinessDetailsComponent(props) {
         country,
         companyType: companyStructure == null ? void 0 : companyStructure.entityType,
         verifiedBusiness,
-        showCompanyStructure
-      })
-    }), jsx("div", {
-      className: formWrapperClasses(forms2.companyRegistrationAddress.formId),
-      children: jsx(RegistrationAddressComponent, {
-        ...getNestedOuterFormPropsFromOuterFormProps(props, forms2.companyRegistrationAddress.formId),
-        id: forms2.companyRegistrationAddress.formId,
-        heading: i18n.get(forms2.companyRegistrationAddress.formName),
-        description: i18n.get(forms2.companyRegistrationAddress.formDescription, {
-          localizeFor: country
-        }),
-        country,
-        problems,
+        showCompanyStructure,
         handleAddressSearch,
-        handleFindAddress,
-        verifiedBusiness
+        handleFindAddress
       })
     }), jsx("div", {
       className: formWrapperClasses(forms2.companyRegistrationDocument.formId),
@@ -25888,32 +26010,37 @@ const Modal = ({
     onClose,
     children: jsxs("div", {
       className: "adyen-kyc-modal__wrapper",
-      children: [header && jsx("header", {
-        className: "adyen-kyc-modal__header",
-        children: header
-      }), jsx("section", {
-        className: "adyen-kyc-modal__content",
-        children
+      children: [jsxs("div", {
+        className: "adyen-kyc-modal__main",
+        children: [jsxs("section", {
+          className: "adyen-kyc-modal-top-bar",
+          children: [onBack ? jsx(Button, {
+            tertiary: true,
+            "aria-label": "back",
+            icon: "arrow-left",
+            className: "adyen-kyc-modal-button-blur",
+            onClick: onBack,
+            shaded: true
+          }) : jsx("div", {}), onClose ? jsx(Button, {
+            tertiary: true,
+            "aria-label": "close",
+            icon: "cross",
+            className: "adyen-kyc-modal-button-blur",
+            onClick: onClose,
+            shaded: true
+          }) : jsx("div", {})]
+        }), header && jsx("header", {
+          className: "adyen-kyc-modal__header",
+          children: header
+        }), jsx("section", {
+          className: "adyen-kyc-modal__content",
+          children
+        })]
       }), jsx("div", {
         children: footer && jsx("footer", {
           className: "adyen-kyc-modal__footer",
           children: footer
         })
-      }), jsxs("section", {
-        className: "adyen-kyc-modal-top-bar",
-        children: [onBack ? jsx(Button, {
-          tertiary: true,
-          "aria-label": "back",
-          icon: "arrow-left",
-          onClick: onBack,
-          shaded: true
-        }) : jsx("div", {}), jsx(Button, {
-          tertiary: true,
-          "aria-label": "close",
-          icon: "cross",
-          onClick: onClose,
-          shaded: true
-        })]
       })]
     })
   });
@@ -26150,30 +26277,48 @@ const StepProgressIndicator = ({
   activeStepIndex,
   stepsCount,
   fillBefore,
-  thick
-}) => stepsCount > 0 ? jsx("div", {
-  "aria-label": `Step ${activeStepIndex} of ${stepsCount}`,
-  className: "adyen-kyc-progress",
-  role: "group",
-  children: jsx("ol", {
-    className: cx("adyen-kyc-progress__bar", {
-      "adyen-kyc-progress__bar--thick": thick
-    }),
-    children: range(stepsCount).map((stepNumber) => {
-      const isHighlighted = shouldHighlight(activeStepIndex, stepNumber, fillBefore);
-      return jsx("li", {
-        "aria-current": isHighlighted ? "step" : void 0,
-        className: cx("adyen-kyc-progress__step", {
-          "adyen-kyc-progress__step--active": isHighlighted
-        }),
-        children: jsx("span", {
-          className: "adyen-kyc-progress__step-label",
-          children: `Step ${stepNumber}: ${stepNumber < activeStepIndex ? "completed" : "not completed"}`
-        })
-      }, stepNumber);
+  thick,
+  circles
+}) => {
+  const {
+    i18n
+  } = useI18nContext();
+  if (stepsCount === 0 || stepsCount > 10) {
+    return jsx(Typography, {
+      variant: "caption",
+      children: i18n.get("XOfYSteps", {
+        values: {
+          currentStep: activeStepIndex,
+          totalSteps: stepsCount
+        }
+      })
+    });
+  }
+  return jsx("div", {
+    "aria-label": `Step ${activeStepIndex} of ${stepsCount}`,
+    className: "adyen-kyc-progress",
+    role: "group",
+    children: jsx("ol", {
+      className: cx("adyen-kyc-progress__bar", {
+        "adyen-kyc-progress__bar--thick": thick,
+        "adyen-kyc-progress__bar--circles": circles
+      }),
+      children: range(stepsCount).map((stepNumber) => {
+        const isHighlighted = shouldHighlight(activeStepIndex, stepNumber, fillBefore);
+        return jsx("li", {
+          "aria-current": isHighlighted ? "step" : void 0,
+          className: cx("adyen-kyc-progress__step", {
+            "adyen-kyc-progress__step--active": isHighlighted
+          }),
+          children: jsx("span", {
+            className: "adyen-kyc-progress__step-label",
+            children: `Step ${stepNumber}: ${stepNumber < activeStepIndex ? "completed" : "not completed"}`
+          })
+        }, stepNumber);
+      })
     })
-  })
-}) : null;
+  });
+};
 const DropinLayout = ({
   content,
   footer,
@@ -26215,7 +26360,6 @@ const DropinLayout = ({
         children: jsx("div", {
           className: "adyen-kyc-dropin__content",
           children: jsx("div", {
-            className: "adyen-kyc-dropin__content-main",
             children: content
           })
         })
@@ -26601,21 +26745,7 @@ const canSubmit$3 = (data) => MANDATORY_API_FIELDS.every((detail) => {
   return !isEmpty(value);
 });
 const isDocumentsRequired$3 = (forms2) => forms2.some((form) => documentFormsIds.includes(form.formId));
-const removeConditionalForms = (forms2, problems, isSkippingCompanyStructure, isSkippingCompanyRegistrationDocument) => {
-  var _a;
-  const filteredForCompanyStructure = isSkippingCompanyStructure ? forms2.filter((f) => f.formId !== "companyStructure" && f.formId !== "companyType") : forms2;
-  switch (problems == null ? void 0 : problems.status) {
-    case 6:
-      return isSkippingCompanyRegistrationDocument && !Object.keys((problems == null ? void 0 : problems.remediationActions) ?? {}).includes("1_501") ? filteredForCompanyStructure.filter((f) => f.formId !== "companyRegistrationDocument") : filteredForCompanyStructure;
-    case 3:
-      return isSkippingCompanyRegistrationDocument && !((_a = problems == null ? void 0 : problems.missingData) == null ? void 0 : _a.some((missingData) => {
-        var _a2;
-        return (_a2 = missingData.remediatingActions) == null ? void 0 : _a2.some((remediation) => remediation.code === "1_501");
-      })) ? filteredForCompanyStructure.filter((f) => f.formId !== "companyRegistrationDocument") : filteredForCompanyStructure;
-    default:
-      return isSkippingCompanyRegistrationDocument ? filteredForCompanyStructure.filter((f) => f.formId !== "companyRegistrationDocument") : filteredForCompanyStructure;
-  }
-};
+const removeConditionalForms = (forms2, isSkippingCompanyStructure) => isSkippingCompanyStructure ? forms2.filter((f) => f.formId !== "companyStructure" && f.formId !== "companyType") : forms2;
 const formatBasicInformation = (data, labels2, datasetUtils, companyType) => {
   var _a, _b, _c;
   const country = data == null ? void 0 : data.country;
@@ -26682,15 +26812,11 @@ const formatDataForSummary$1 = (data, forms2, labels2, i18n) => {
           }
         };
       case "additionalInformation":
-        return {
-          ...summaryData,
-          [form]: formatAdditionalInformation(data[form], labels2, (_e = data.basicInformation) == null ? void 0 : _e.country, (_f = data.companyStructure) == null ? void 0 : _f.entityType)
-        };
-      case "companyRegistrationAddress":
         return {
           ...summaryData,
           [form]: {
             hasInnerForms: true,
+            additionalInformationFormName: formatAdditionalInformation(data[form], labels2, (_e = data.basicInformation) == null ? void 0 : _e.country, (_f = data.companyStructure) == null ? void 0 : _f.entityType),
             registrationAddress: mapAddressLabels(data[form].registrationAddress, datasetUtils),
             operationalAddress: data[form].operationalAddress ? mapAddressLabels(data[form].operationalAddress, datasetUtils) : void 0
           }
@@ -26770,22 +26896,23 @@ async function submit({
   showToast,
   clearToasts,
   handleUpdateLegalEntity,
-  onExternalSubmit
+  onExternalSubmit,
+  accountHolder
 }) {
-  var _a, _b, _c, _d;
+  var _a, _b, _c, _d, _e;
   const logger2 = createLogger("submitBusinessDetails");
   setLoadingStatus("loading");
   const trackingPayload = {
     companyStructure: ((_a = data.companyStructure) == null ? void 0 : _a.entityType) ?? null,
     countryOfRegistration: ((_b = data.basicInformation) == null ? void 0 : _b.country) ?? null,
     legalEntityName: ((_c = data.additionalInformation) == null ? void 0 : _c.legalCompanyName) ?? null,
-    usedAdditionalAddress: ((_d = data.companyRegistrationAddress) == null ? void 0 : _d.operationalAddressIsSame) === operationalAddressIsSameIds.OPERATIONAL_ADDRESS_IS_NOT_SAME
+    usedAdditionalAddress: ((_d = data.additionalInformation) == null ? void 0 : _d.operationalAddressIsSame) === operationalAddressIsSameIds.OPERATIONAL_ADDRESS_IS_NOT_SAME
   };
   const savedLegalEntityData = mapLegalEntityToBusinessDetailsSchema(legalEntityResponse, isTargetLegalEntityType);
   const filteredData = removeOldDataBySchema(data, savedLegalEntityData);
   const legalEntity = {
     ...mapBusinessDetailsSchemaToLegalEntity(filteredData),
-    entityAssociations: filterOutUnwantedAssociationsIfRootLE(TaskTypes.BUSINESS_DETAILS, legalEntityResponse, entityTypeToCorrespondingAccountHolderOption[legalEntityResponse.type])
+    entityAssociations: filterOutUnwantedAssociationsIfRootLE(TaskTypes.BUSINESS_DETAILS, legalEntityResponse, ((_e = data.companyStructure) == null ? void 0 : _e.accountHolder) || accountHolder)
   };
   try {
     userEvents.addEvent(BusinessDetailsEvents.TASK_SUBMIT, {
@@ -26857,7 +26984,6 @@ function BusinessDetailsDropinComponent({
   parentLegalEntity,
   trackingConfig,
   capabilities,
-  accountHolder,
   taskName,
   hideDropinLayout,
   homeButtonLabel,
@@ -26879,7 +27005,7 @@ function BusinessDetailsDropinComponent({
   handleClearCompanyData,
   onTypeSwitch
 }) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
   const {
     state: {
       currentState
@@ -26900,6 +27026,10 @@ function BusinessDetailsDropinComponent({
     });
   }, []);
   const formRef = useRef(null);
+  const {
+    accountHolder,
+    setAccountHolder
+  } = useCoreContext();
   const {
     showToast,
     clearToasts
@@ -26918,8 +27048,8 @@ function BusinessDetailsDropinComponent({
     var _a2;
     return ((_a2 = currentState.data.basicInformation) == null ? void 0 : _a2.country) ?? country;
   }, [(_a = currentState.data.basicInformation) == null ? void 0 : _a.country, country]);
-  const [initialData, setInitialData] = useState(mapLegalEntityToBusinessDetailsSchema(legalEntityResponse, Boolean(isTargetLegalEntityType), isNewEntryFlowEnabled ? accountHolder : void 0));
-  const [trustedFields2, setTrustedFields] = useState(legalEntityResponse.trustedFields);
+  const [initialData, setInitialData] = useState(mapLegalEntityToBusinessDetailsSchema(legalEntityResponse, Boolean(isTargetLegalEntityType), isNewEntryFlowEnabled && accountHolder ? accountHolder : void 0));
+  const [trustedFields, setTrustedFields] = useState(legalEntityResponse.trustedFields);
   const documentUtils = documentApiUtils(handleCreateDocument, handleGetDocument, handleUpdateDocument);
   useEffect(() => {
     var _a2;
@@ -26964,35 +27094,38 @@ function BusinessDetailsDropinComponent({
     isExperimentEnabled
   }), [currentCountry, currentState.data, isExperimentEnabled, taskType]);
   const initialForms = useMemo(() => getForms(currentCountry), [currentCountry]);
-  const derivedProps = useMemo(() => getPropsFromConfigurations(fieldConfigurations, initialForms, (currentProblems == null ? void 0 : currentProblems.remediationActions) ? Object.values(currentProblems == null ? void 0 : currentProblems.remediationActions) : [], (currentProblems == null ? void 0 : currentProblems.missingData) ?? [], legalEntityResponse ? getFieldsWithExistingData(legalEntityResponse, isExperimentEnabled) : [], customRules, {}, {}, trustedFields2), [fieldConfigurations, initialForms, currentProblems == null ? void 0 : currentProblems.remediationActions, currentProblems == null ? void 0 : currentProblems.missingData, legalEntityResponse, isExperimentEnabled, customRules, trustedFields2]);
+  const derivedProps = useMemo(() => getPropsFromConfigurations(fieldConfigurations, initialForms, (currentProblems == null ? void 0 : currentProblems.remediationActions) ? Object.values(currentProblems == null ? void 0 : currentProblems.remediationActions) : [], (currentProblems == null ? void 0 : currentProblems.missingData) ?? [], legalEntityResponse ? getFieldsWithExistingData(legalEntityResponse, isExperimentEnabled) : [], customRules, {}, {}, trustedFields), [fieldConfigurations, initialForms, currentProblems == null ? void 0 : currentProblems.remediationActions, currentProblems == null ? void 0 : currentProblems.missingData, legalEntityResponse, isExperimentEnabled, customRules, trustedFields]);
   const isSkippingCompanyStructure = useEnableNewEntryFlow() && organizationTypesToSkipCompanyStructureForm.includes((_d = legalEntityResponse == null ? void 0 : legalEntityResponse.organization) == null ? void 0 : _d.type) && accountHolder !== "aTrust";
-  const isSkippingCompanyRegistrationDocument = currentCountry === "CA" && ((_e = currentState.data.additionalInformation) == null ? void 0 : _e.registrationNumber) && ((_f = currentState.valid.additionalInformation) == null ? void 0 : _f.registrationNumber) && !((_g = currentState.data.companyRegistrationDocument) == null ? void 0 : _g.registrationDocument);
   const forms2 = useMemo(() => {
     const requiredForms = getRequiredForms(initialForms, derivedProps == null ? void 0 : derivedProps.requiredFields, derivedProps == null ? void 0 : derivedProps.optionalFields);
     const validityAddedForms = addValidityToForms(requiredForms, currentState.validityByForm, currentProblems);
-    return removeConditionalForms(validityAddedForms, currentProblems, currentCountry !== "US" ? isSkippingCompanyStructure : !showCompanyStructure, isSkippingCompanyRegistrationDocument);
-  }, [initialForms, derivedProps == null ? void 0 : derivedProps.requiredFields, derivedProps == null ? void 0 : derivedProps.optionalFields, currentState.validityByForm, currentProblems, currentCountry, isSkippingCompanyStructure, showCompanyStructure, isSkippingCompanyRegistrationDocument]);
+    return removeConditionalForms(validityAddedForms, currentCountry !== "US" ? isSkippingCompanyStructure : !showCompanyStructure);
+  }, [initialForms, derivedProps == null ? void 0 : derivedProps.requiredFields, derivedProps == null ? void 0 : derivedProps.optionalFields, currentState.validityByForm, currentProblems, currentCountry, isSkippingCompanyStructure, showCompanyStructure]);
   const canSubmitForm = useMemo(() => canSubmit$3(currentState.data) && hasDataChanged(initialData, currentState.data), [initialData, currentState.data]);
   const summaryData = useMemo(() => ({
     data: formatDataForSummary$1(currentState.data, forms2, derivedProps == null ? void 0 : derivedProps.labels, i18n),
     omittedKeys: ["operationalAddressIsSame"]
   }), [currentState.data, derivedProps == null ? void 0 : derivedProps.labels, forms2, i18n]);
-  const submitTask = useCallback(() => submit({
-    data: currentState.data,
-    legalEntityResponse,
-    isTargetLegalEntityType: Boolean(isTargetLegalEntityType),
-    baseTrackingPayload,
-    problems: currentProblems,
-    forms: forms2,
-    documentUtils,
-    i18n,
-    setLoadingStatus,
-    setProblems: setCurrentProblems,
-    showToast,
-    clearToasts,
-    handleUpdateLegalEntity,
-    onExternalSubmit
-  }), [baseTrackingPayload, clearToasts, currentState.data, documentUtils, forms2, handleUpdateLegalEntity, i18n, isTargetLegalEntityType, legalEntityResponse, onExternalSubmit, currentProblems, showToast]);
+  const submitTask = useCallback(() => {
+    var _a2;
+    setAccountHolder(((_a2 = currentState.data.companyStructure) == null ? void 0 : _a2.accountHolder) || accountHolder);
+    return submit({
+      data: currentState.data,
+      legalEntityResponse,
+      isTargetLegalEntityType: Boolean(isTargetLegalEntityType),
+      baseTrackingPayload,
+      problems: currentProblems,
+      forms: forms2,
+      documentUtils,
+      i18n,
+      setLoadingStatus,
+      setProblems: setCurrentProblems,
+      showToast,
+      clearToasts,
+      handleUpdateLegalEntity,
+      onExternalSubmit
+    });
+  }, [baseTrackingPayload, clearToasts, currentState.data, documentUtils, forms2, handleUpdateLegalEntity, i18n, isTargetLegalEntityType, legalEntityResponse, onExternalSubmit, currentProblems, showToast]);
   const {
     handleNextClick,
     handleBackClick,
@@ -27017,10 +27150,10 @@ function BusinessDetailsDropinComponent({
     clearTrustedBusinessData,
     resetBusinessData,
     resetTinVerification,
-    isSearching,
-    isFetching,
-    isVerifying,
-    isClearingTrustedData,
+    searching,
+    fetching,
+    verifying,
+    resettingTrustedData,
     currentSearchName,
     searchResults,
     invalidTin,
@@ -27049,34 +27182,34 @@ function BusinessDetailsDropinComponent({
         return tinMatch ? handleNextClick() : void 0;
       }
     }
-  }, [currentCountry, (_h = currentState.data.basicInformation) == null ? void 0 : _h.taxInformation, fetchBusinessData, handleNextClick, searchForBusiness, handleVerifyBusinessData]);
+  }, [currentCountry, (_e = currentState.data.basicInformation) == null ? void 0 : _e.taxInformation, fetchBusinessData, handleNextClick, searchForBusiness, handleVerifyBusinessData]);
   useEffect(() => {
-    if (searchResults && !searchResults.length || isSearching === "error") {
+    if (searchResults && !searchResults.length || searching === "error") {
       setShowCompanyStructure(true);
     }
-  }, [searchResults, isSearching]);
+  }, [searchResults, searching]);
   useEffect(() => {
     var _a2;
     if (((_a2 = currentState.data.basicInformation) == null ? void 0 : _a2.businessName) !== currentSearchName) {
       setShowCompanyStructure(false);
       resetBusinessData();
     }
-  }, [currentSearchName, (_i = currentState.data.basicInformation) == null ? void 0 : _i.businessName]);
+  }, [currentSearchName, (_f = currentState.data.basicInformation) == null ? void 0 : _f.businessName]);
   const [showBusinessSelection, setShowBusinessSelection] = useState(false);
   const isBusinessSelection = useMemo(() => showBusinessSelection && activeForm.formId === "basicInformation", [activeForm.formId, showBusinessSelection]);
   const hideBack = useMemo(() => {
     if (!COUNTRIES_USING_COMPANY_SEARCH.includes(currentCountry)) return hideBackButton;
     if (isBusinessSelection) {
-      return isSearching === "loading" || isFetching === "loading" || isVerifying === "loading" || isClearingTrustedData === "loading" ? hideBackButton : false;
+      return searching === "loading" || fetching === "loading" || verifying === "loading" || resettingTrustedData === "loading" ? hideBackButton : false;
     }
     return hideBackButton;
-  }, [currentCountry, hideBackButton, isBusinessSelection, isSearching, isFetching, isVerifying, isClearingTrustedData]);
+  }, [currentCountry, hideBackButton, isBusinessSelection, searching, fetching, verifying, resettingTrustedData]);
   const hideHome = useMemo(() => {
     if (!COUNTRIES_USING_COMPANY_SEARCH.includes(currentCountry)) return hideHomeButton;
     if (isBusinessSelection) {
-      return isSearching === "loading" || isFetching === "loading" || isVerifying === "loading" || isClearingTrustedData === "loading" ? true : hideHomeButton;
+      return searching === "loading" || fetching === "loading" || verifying === "loading" || resettingTrustedData === "loading" ? true : hideHomeButton;
     }
-  }, [currentCountry, hideHomeButton, isBusinessSelection, isSearching, isFetching, isVerifying, isClearingTrustedData]);
+  }, [currentCountry, hideHomeButton, isBusinessSelection, searching, fetching, verifying, resettingTrustedData]);
   const goToForm = useCallback((index) => {
     var _a2, _b2, _c2, _d2, _e2, _f2;
     const form = forms2[index].formId;
@@ -27092,7 +27225,7 @@ function BusinessDetailsDropinComponent({
         return gotoFormByFormIndex(index);
       }
       case "additionalInformation": {
-        if (verifiedBusiness) return gotoFormByFormIndex(index);
+        if (verifiedBusiness || activeForm.formId !== "basicInformation") return gotoFormByFormIndex(index);
         if (!isBusinessSelection) {
           if (!!((_a2 = currentState.data.basicInformation) == null ? void 0 : _a2.businessName) && !!((_b2 = currentState.data.basicInformation) == null ? void 0 : _b2.country) && !!((_c2 = currentState.data.basicInformation) == null ? void 0 : _c2.stateOrProvince)) {
             findBusiness({
@@ -27108,7 +27241,7 @@ function BusinessDetailsDropinComponent({
       default:
         return gotoFormByFormIndex(index);
     }
-  }, [canSubmitForm, currentCountry, (_j = currentState.data.basicInformation) == null ? void 0 : _j.businessName, (_k = currentState.data.basicInformation) == null ? void 0 : _k.country, (_l = currentState.data.basicInformation) == null ? void 0 : _l.stateOrProvince, findBusiness, forms2, gotoFormByFormIndex, isBusinessSelection, searchResults, verifiedBusiness]);
+  }, [canSubmitForm, currentCountry, (_g = currentState.data.basicInformation) == null ? void 0 : _g.businessName, (_h = currentState.data.basicInformation) == null ? void 0 : _h.country, (_i = currentState.data.basicInformation) == null ? void 0 : _i.stateOrProvince, findBusiness, forms2, gotoFormByFormIndex, isBusinessSelection, searchResults, verifiedBusiness, activeForm.formId]);
   const nextClick = useCallback(() => {
     var _a2, _b2, _c2, _d2, _e2, _f2, _g2;
     if (!COUNTRIES_USING_COMPANY_SEARCH.includes(currentCountry)) return handleNextClick();
@@ -27131,7 +27264,7 @@ function BusinessDetailsDropinComponent({
       default:
         return handleNextClick();
     }
-  }, [currentCountry, handleNextClick, activeForm.formId, verifiedBusiness, (_m = currentState.validityByForm) == null ? void 0 : _m.basicInformation, (_n = currentState.data.basicInformation) == null ? void 0 : _n.businessName, (_o = currentState.data.basicInformation) == null ? void 0 : _o.country, (_p = currentState.data.basicInformation) == null ? void 0 : _p.stateOrProvince, isBusinessSelection, findBusiness]);
+  }, [currentCountry, handleNextClick, activeForm.formId, verifiedBusiness, (_j = currentState.validityByForm) == null ? void 0 : _j.basicInformation, (_k = currentState.data.basicInformation) == null ? void 0 : _k.businessName, (_l = currentState.data.basicInformation) == null ? void 0 : _l.country, (_m = currentState.data.basicInformation) == null ? void 0 : _m.stateOrProvince, isBusinessSelection, findBusiness]);
   const backClick = useCallback(() => {
     if (!COUNTRIES_USING_COMPANY_SEARCH.includes(country)) return handleNextClick();
     switch (activeForm.formId) {
@@ -27139,12 +27272,12 @@ function BusinessDetailsDropinComponent({
         return showBusinessSelection ? setShowBusinessSelection(false) : void 0;
       }
       case "companyStructure": {
-        if (isSearching === "error") {
+        if (searching === "error") {
           setShowBusinessSelection(false);
           setShowCompanyStructure(false);
           return handleBackClick == null ? void 0 : handleBackClick();
         }
-        if (isSearching !== "loading" && searchResults && !searchResults.length) {
+        if (searching !== "loading" && searchResults && !searchResults.length) {
           setShowBusinessSelection(false);
         } else if (!verifiedBusiness) setShowCompanyStructure(false);
         return handleBackClick == null ? void 0 : handleBackClick();
@@ -27158,13 +27291,13 @@ function BusinessDetailsDropinComponent({
       default:
         return handleBackClick == null ? void 0 : handleBackClick();
     }
-  }, [activeForm.formId, country, handleBackClick, handleNextClick, isSearching, searchResults, showBusinessSelection, verifiedBusiness]);
+  }, [activeForm.formId, country, handleBackClick, handleNextClick, searching, searchResults, showBusinessSelection, verifiedBusiness]);
   const proceedToManualDataEntry = useCallback(async () => {
     await clearTrustedBusinessData().then(() => setShowCompanyStructure(true));
   }, [clearTrustedBusinessData]);
   useEffect(() => {
     var _a2;
-    if ((trustedFields2 == null ? void 0 : trustedFields2.length) && ((_a2 = legalEntityResponse.organization) == null ? void 0 : _a2.registeredAddress.country) !== currentCountry) {
+    if ((trustedFields == null ? void 0 : trustedFields.length) && ((_a2 = legalEntityResponse.organization) == null ? void 0 : _a2.registeredAddress.country) !== currentCountry) {
       setTrustedFields(void 0);
     }
   }, [currentCountry]);
@@ -27209,10 +27342,10 @@ function BusinessDetailsDropinComponent({
       invalidTin,
       resetTinVerification,
       verifiedBusiness,
-      isSearching,
-      isFetching,
-      isVerifying,
-      isClearingTrustedData,
+      searching,
+      fetching,
+      verifying,
+      resettingTrustedData,
       searchForBusiness,
       fetchBusinessData,
       verifyBusinessData,
@@ -27273,9 +27406,9 @@ function CompanyDropinComponent({
   handleHomeClick,
   onTypeSwitch,
   onChange,
-  trustedFields: trustedFields2
+  trustedFields
 }) {
-  var _a, _b, _c, _d, _e;
+  var _a, _b;
   const {
     accountHolder,
     setAccountHolder
@@ -27354,12 +27487,11 @@ function CompanyDropinComponent({
     onChange == null ? void 0 : onChange(currentState);
   }, [currentState]);
   const isSkippingCompanyStructure = useEnableNewEntryFlow() && organizationTypesToSkipCompanyStructureForm.includes((_b = legalEntityResponse == null ? void 0 : legalEntityResponse.organization) == null ? void 0 : _b.type) && accountHolder !== "aTrust";
-  const isSkippingCompanyRegistrationDocument = country === "CA" && ((_c = currentState.data.companyRegistrationDetails) == null ? void 0 : _c.registrationNumber) && ((_d = currentState.valid.companyRegistrationDetails) == null ? void 0 : _d.registrationNumber) && !((_e = currentState.data.companyRegistrationDocument) == null ? void 0 : _e.registrationDocument);
   const forms2 = useMemo(() => {
     const requiredForms = getRequiredForms(companyForms, derivedProps == null ? void 0 : derivedProps.requiredFields, derivedProps == null ? void 0 : derivedProps.optionalFields);
     const validityAddedForms = addValidityToForms(requiredForms, formValidity, problems);
-    return removeConditionalForms(validityAddedForms, problems, isSkippingCompanyStructure, isSkippingCompanyRegistrationDocument);
-  }, [derivedProps == null ? void 0 : derivedProps.requiredFields, derivedProps == null ? void 0 : derivedProps.optionalFields, formValidity, problems, isSkippingCompanyStructure, isSkippingCompanyRegistrationDocument]);
+    return removeConditionalForms(validityAddedForms, isSkippingCompanyStructure);
+  }, [derivedProps == null ? void 0 : derivedProps.requiredFields, derivedProps == null ? void 0 : derivedProps.optionalFields, formValidity, problems, isSkippingCompanyStructure]);
   const submitDocuments2 = async ({
     forms: forms22,
     legalEntity,
@@ -27510,7 +27642,7 @@ function CompanyDropinComponent({
   }, []);
   const datasetUtils = datasetUtilities(i18n.locale);
   const formatDataForSummary2 = (data2, forms22) => {
-    var _a2, _b2, _c2, _d2, _e2, _f, _g;
+    var _a2, _b2, _c, _d, _e, _f, _g;
     let summaryData = cloneObject(data2);
     if (summaryData.companyNameAndCountry) {
       if (isCountryOfGoverningLawEnabled) {
@@ -27525,14 +27657,14 @@ function CompanyDropinComponent({
       const companyType = (_b2 = companyTypes.find((type) => type.id === summaryData.companyType.entityType)) == null ? void 0 : _b2.name;
       summaryData.companyType.entityType = i18n.get(companyType);
     }
-    if ((_c2 = summaryData.companyType) == null ? void 0 : _c2.accountHolder) {
+    if ((_c = summaryData.companyType) == null ? void 0 : _c.accountHolder) {
       summaryData.companyType.accountHolder = i18n.get(summaryData.companyType.accountHolder);
     }
-    if ((_d2 = summaryData.companyRegistrationAddress) == null ? void 0 : _d2.registrationAddress) {
+    if ((_d = summaryData.companyRegistrationAddress) == null ? void 0 : _d.registrationAddress) {
       summaryData.companyRegistrationAddress.hasInnerForms = true;
       summaryData.companyRegistrationAddress.registrationAddress = mapAddressLabels(summaryData.companyRegistrationAddress.registrationAddress, datasetUtils);
     }
-    if ((_e2 = summaryData.companyRegistrationAddress) == null ? void 0 : _e2.operationalAddress) {
+    if ((_e = summaryData.companyRegistrationAddress) == null ? void 0 : _e.operationalAddress) {
       summaryData.companyRegistrationAddress.operationalAddress = mapAddressLabels(summaryData.companyRegistrationAddress.operationalAddress, datasetUtils);
     }
     if ((_f = summaryData.companyRegistrationDetails) == null ? void 0 : _f.vatAbsenceReason) {
@@ -27614,7 +27746,7 @@ function CompanyDropinComponent({
       ref: formRef,
       shouldValidate,
       isTopLevelEntity: taskType === TaskTypes.COMPANY,
-      readOnlyFields: trustedFields2
+      readOnlyFields: trustedFields
     })
   });
 }
@@ -28627,7 +28759,8 @@ function useCompanySearchTaskSubmit({
   setProblems,
   setLoadingStatus,
   onExternalSubmit,
-  handleUpdateLegalEntity
+  handleUpdateLegalEntity,
+  accountHolder
 }) {
   const {
     showToast,
@@ -28672,7 +28805,7 @@ function useCompanySearchTaskSubmit({
   const submit2 = useCallback(async ({
     data
   }) => {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e;
     setLoadingStatus("loading");
     const trackingPayload = {
       companyStructure: ((_a = data.companyStructure) == null ? void 0 : _a.entityType) ?? null,
@@ -28684,7 +28817,7 @@ function useCompanySearchTaskSubmit({
     const filteredData = removeOldDataBySchema(data, savedLegalEntityData);
     const legalEntity = {
       ...mapCompanySearchSchemaToLegalEntity(filteredData),
-      entityAssociations: filterOutUnwantedAssociationsIfRootLE(task, legalEntityResponse, entityTypeToCorrespondingAccountHolderOption[legalEntityResponse.type])
+      entityAssociations: filterOutUnwantedAssociationsIfRootLE(task, legalEntityResponse, (((_e = data.companyStructure) == null ? void 0 : _e.accountHolder) || accountHolder) ?? void 0)
     };
     try {
       userEvents.addEvent(CompanySearchEvents.TASK_SUBMIT, {
@@ -28891,7 +29024,6 @@ function CompanySearchDropinComponent({
   taskName,
   hideDropinLayout,
   homeButtonLabel,
-  accountHolder,
   onChange,
   onSubmit: onExternalSubmit,
   handleHomeClick,
@@ -28907,9 +29039,9 @@ function CompanySearchDropinComponent({
   handleRefreshCompanyDataset,
   handleVerifyTin,
   onTypeSwitch,
-  trustedFields: trustedFields2
+  trustedFields
 }) {
-  var _a, _b, _c, _d, _e, _f, _g;
+  var _a, _b, _c, _d;
   const {
     state: {
       currentState
@@ -28918,6 +29050,10 @@ function CompanySearchDropinComponent({
   useEffect(() => {
     onChange == null ? void 0 : onChange(currentState);
   }, [currentState, onChange]);
+  const {
+    accountHolder,
+    setAccountHolder
+  } = useCoreContext();
   const formRef = useRef(null);
   const {
     showToast
@@ -28933,7 +29069,7 @@ function CompanySearchDropinComponent({
   } = useExperimentsContext();
   const isNewEntryFlowEnabled = useEnableNewEntryFlow();
   const [loadingStatus, setLoadingStatus] = useState("success");
-  const [initialData, setInitialData] = useState(mapLegalEntityToCompanySearchSchema(legalEntityResponse, Boolean(isTargetLegalEntityType), isNewEntryFlowEnabled ? accountHolder : void 0));
+  const [initialData, setInitialData] = useState(mapLegalEntityToCompanySearchSchema(legalEntityResponse, Boolean(isTargetLegalEntityType), isNewEntryFlowEnabled && accountHolder ? accountHolder : void 0));
   const country = useMemo(() => {
     var _a2;
     return ((_a2 = currentState.data.companyBasics) == null ? void 0 : _a2.country) ?? parentCountry;
@@ -28994,12 +29130,11 @@ function CompanySearchDropinComponent({
     }
   }, [fieldConfigurations, problems == null ? void 0 : problems.remediationActions, problems == null ? void 0 : problems.missingData, legalEntityResponse, isExperimentEnabled, customRules, country]);
   const isSkippingCompanyStructure = useEnableNewEntryFlow() && organizationTypesToSkipCompanyStructureForm.includes((_d = legalEntityResponse == null ? void 0 : legalEntityResponse.organization) == null ? void 0 : _d.type) && accountHolder !== "aTrust";
-  const isSkippingCompanyRegistrationDocument = country === "CA" && ((_e = currentState.data.companyOtherDetails) == null ? void 0 : _e.registrationNumber) && ((_f = currentState.valid.companyOtherDetails) == null ? void 0 : _f.registrationNumber) && !((_g = currentState.data.companyRegistrationDocument) == null ? void 0 : _g.registrationDocument);
   const forms$1 = useMemo(() => {
     const requiredForms = getRequiredForms(forms, derivedProps == null ? void 0 : derivedProps.requiredFields, derivedProps == null ? void 0 : derivedProps.optionalFields);
     const validityAddedForms = addValidityToForms(requiredForms, currentState.validityByForm, problems);
-    return removeConditionalForms(validityAddedForms, problems, isSkippingCompanyStructure, isSkippingCompanyRegistrationDocument);
-  }, [derivedProps == null ? void 0 : derivedProps.requiredFields, derivedProps == null ? void 0 : derivedProps.optionalFields, currentState.validityByForm, problems, isSkippingCompanyStructure, isSkippingCompanyRegistrationDocument]);
+    return removeConditionalForms(validityAddedForms, isSkippingCompanyStructure);
+  }, [derivedProps == null ? void 0 : derivedProps.requiredFields, derivedProps == null ? void 0 : derivedProps.optionalFields, currentState.validityByForm, problems, isSkippingCompanyStructure]);
   const summaryData = useMemo(() => ({
     data: formatDataForSummary(currentState.data, forms$1, derivedProps == null ? void 0 : derivedProps.labels, i18n),
     omittedKeys: ["operationalAddressIsSame"]
@@ -29024,7 +29159,8 @@ function CompanySearchDropinComponent({
     setProblems,
     setLoadingStatus,
     onExternalSubmit,
-    handleUpdateLegalEntity
+    handleUpdateLegalEntity,
+    accountHolder
   });
   const {
     handleNextClick,
@@ -29062,9 +29198,13 @@ function CompanySearchDropinComponent({
     activeForm,
     validateForm: () => setShouldValidate(true),
     baseTrackingPayload,
-    onSubmit: () => submit2({
-      data: currentState.data
-    }),
+    onSubmit: () => {
+      var _a2;
+      setAccountHolder(((_a2 = currentState.data.companyStructure) == null ? void 0 : _a2.accountHolder) || accountHolder);
+      return submit2({
+        data: currentState.data
+      });
+    },
     problems,
     canSubmit: canSubmitForm,
     summary: summaryData,
@@ -29091,7 +29231,7 @@ function CompanySearchDropinComponent({
       handleGetCompanyDataset,
       handleRefreshCompanyDataset,
       handleVerifyTin,
-      readOnlyFields: trustedFields2
+      readOnlyFields: trustedFields
     })
   });
 }
@@ -29191,10 +29331,9 @@ const useHasSeenSingpassSelection = ({
     setHasSeenSingpassSelection
   };
 };
-const getTrustedFieldsByProvider = (provider, trustedFields2) => trustedFields2.find((tf) => tf.provider === provider);
-const parseTrustedFieldsIntoReadOnlyFields = (trustedFields2, mapping) => {
+const parseTrustedFieldsIntoReadOnlyFields = (trustedFields, mapping) => {
   const formFieldsMapped = [];
-  trustedFields2.fields.forEach((field) => {
+  trustedFields.forEach((field) => {
     for (const [key, value] of Object.entries(mapping)) {
       if (value === field) {
         formFieldsMapped.push(key);
@@ -29216,17 +29355,6 @@ const parseTrustedFieldsIntoReadOnlyFields = (trustedFields2, mapping) => {
   });
   return readOnlyFields;
 };
-const trustedFields = ({
-  fields,
-  trustedFieldsProvider,
-  apiMapping
-}) => {
-  if (!fields || !trustedFieldsProvider || !apiMapping) {
-    return {};
-  }
-  const trustedFieldsOfProvider = getTrustedFieldsByProvider(trustedFieldsProvider, fields);
-  return trustedFieldsOfProvider ? parseTrustedFieldsIntoReadOnlyFields(trustedFieldsOfProvider, apiMapping) : {};
-};
 const defaultSingpassState = {
   isLoading: false,
   isSuccess: false
@@ -29270,6 +29398,27 @@ const getApiMapping = (enableCompanySearchFlow, legalEntity) => {
     return companyComponentsKeyMapping;
   }
 };
+const getTrustedEntityAssociations = (legalEntityTrustedFields) => {
+  const rawTrustedEntityAssociations = legalEntityTrustedFields.filter((f) => f.startsWith("entityAssociations")) ?? [];
+  const leIdMap = {};
+  rawTrustedEntityAssociations.forEach((rtea) => {
+    const [_, role, leId] = rtea.split(".");
+    const trustedRole = role;
+    if (!leIdMap[leId]) {
+      leIdMap[leId] = {
+        roles: [trustedRole]
+      };
+    } else {
+      leIdMap[leId] = {
+        roles: [...leIdMap[leId].roles, trustedRole]
+      };
+    }
+  });
+  return Object.keys(leIdMap).map((reference) => ({
+    reference,
+    types: leIdMap[reference].roles
+  }));
+};
 const useSingpassMyInfoLogin = ({
   legalEntity,
   accountHolder,
@@ -29283,6 +29432,7 @@ const useSingpassMyInfoLogin = ({
   const isSingpassForIndividualsEnabled = isExperimentEnabled("ShowSingPassButtonForIndividuals");
   const enableCompanySearchFlow = isExperimentEnabled("EnableCompanySearchFlow");
   const apiMapping = getApiMapping(enableCompanySearchFlow, legalEntity);
+  const legalEntityTrustedFields = legalEntity == null ? void 0 : legalEntity.trustedFields;
   const isEligibleForSingpass = useMemo(() => {
     if (!legalEntity) {
       return false;
@@ -29303,17 +29453,13 @@ const useSingpassMyInfoLogin = ({
     const isVanillaIndividual = legalEntityType === LegalEntityType.INDIVIDUAL && !hasSoleProprietor;
     return isVanillaOrganization && isSingpassForCompaniesEnabled || isVanillaIndividual && isSingpassForIndividualsEnabled;
   }, [legalEntity, accountHolder, handleOpenSingpassAuthorizationLink]);
-  const trustedFields$1 = useMemo(() => {
-    const legalEntityTrustedFields = legalEntity == null ? void 0 : legalEntity.trustedFields;
-    if (!isEligibleForSingpass || !legalEntityTrustedFields) {
-      return {};
-    }
-    return trustedFields({
-      fields: legalEntityTrustedFields,
-      trustedFieldsProvider: TrustedFieldsProvider.SINGPASS,
-      apiMapping
-    });
-  }, [legalEntity, isEligibleForSingpass, apiMapping]);
+  const singpassTrustedFields = useMemo(() => {
+    var _a;
+    const allTrustedFields = isEligibleForSingpass && legalEntityTrustedFields ? legalEntityTrustedFields : [];
+    return ((_a = allTrustedFields.find((tf) => tf.provider === TrustedFieldsProvider.SINGPASS)) == null ? void 0 : _a.fields) || [];
+  }, [isEligibleForSingpass, legalEntity]);
+  const trustedFields = useMemo(() => apiMapping ? parseTrustedFieldsIntoReadOnlyFields(singpassTrustedFields, apiMapping) : {}, [singpassTrustedFields, apiMapping]);
+  const trustedEntityAssociations = useMemo(() => getTrustedEntityAssociations(singpassTrustedFields), [singpassTrustedFields]);
   const handleInitiateSingpassMyInfoLogin = async () => {
     if (handleOpenSingpassAuthorizationLink) {
       dispatch({
@@ -29358,7 +29504,8 @@ const useSingpassMyInfoLogin = ({
     handleSingpassMyInfoLoginSuccess,
     handleSingpassMyInfoLoginFailure,
     handleSingpassMyInfoLoginReset,
-    trustedFields: trustedFields$1
+    trustedFields,
+    trustedEntityAssociations
   };
 };
 const logger$i = createLogger("useAssociatedLegalArrangement");
@@ -30198,17 +30345,9 @@ function useDataMissingRemediations({
     }
   };
 }
-const iconStatus = (current, min, max) => {
-  const isEmpty2 = current === 0;
-  const isWithinObligatoryRange = current === max || min > 0 && current >= min;
-  const isWithinConditionalRange = current >= min;
-  if (isEmpty2) {
-    return min > 0 ? "obligatoryEmpty" : "conditionalEmpty";
-  }
-  if (isWithinObligatoryRange) {
-    return "obligatoryFinished";
-  }
-  return isWithinConditionalRange ? "conditionalFinished" : "conditionalEmpty";
+const iconStatus = (current, min) => {
+  const isSatisfied = current > 0 && current >= min;
+  return isSatisfied ? "satisfied" : "empty";
 };
 const getEntityStatusRuleDescription = (country, currentTask, entityLabel) => currentTask === TaskTypes.TRUST_MEMBER_OVERVIEW ? TRUST_DEFAULT_DESCRIPTIONS_MAP[entityLabel] : getDecisionMakerDescriptionMap(country)[entityLabel];
 const Status = ({
@@ -30563,67 +30702,26 @@ const EntityStatusIcon = ({
   status
 }) => {
   switch (status) {
-    case "obligatoryEmpty":
-      return jsx(Icon, {
-        name: "checkmark-small",
-        className: "adyen-kyc-entity-status__icon adyen-kyc-entity-status__icon--obligatory",
-        testId: "obligatoryEmpty-icon"
-      });
-    case "conditionalEmpty":
+    case "empty":
       return jsx(Icon, {
-        name: "checkmark-small",
-        className: "adyen-kyc-entity-status__icon adyen-kyc-entity-status__icon--conditional",
-        testId: "conditionalEmpty-icon"
+        name: "circle",
+        className: "adyen-kyc-entity-status__icon adyen-kyc-entity-status__icon--empty",
+        testId: "empty-icon"
       });
-    case "obligatoryFinished":
+    case "satisfied":
       return jsx(Icon, {
-        name: "checkmark-small",
-        className: "adyen-kyc-entity-status__icon adyen-kyc-entity-status__icon--obligatory-success",
-        testId: "obligatoryFinished-icon"
-      });
-    case "conditionalFinished":
-      return jsx(Icon, {
-        name: "checkmark-small",
-        className: "adyen-kyc-entity-status__icon adyen-kyc-entity-status__icon--conditional-success",
-        testId: "conditionalFinished-icon"
+        name: "checkmark-circle-fill",
+        className: "adyen-kyc-entity-status__icon adyen-kyc-entity-status__icon--satisfied",
+        testId: "satisfied-icon"
       });
     default:
       return jsx(Icon, {
-        name: "checkmark-small",
-        className: "adyen-kyc-entity-status__icon adyen-kyc-entity-status__icon--conditional",
-        testId: "conditionalEmpty-icon"
+        name: "circle",
+        className: "adyen-kyc-entity-status__icon adyen-kyc-entity-status__icon--empty",
+        testId: "empty-icon"
       });
   }
 };
-const EntityGuidanceLegend = () => {
-  const {
-    i18n
-  } = useI18nContext();
-  return jsxs("div", {
-    className: "adyen-kyc-entity-status__legend",
-    children: [jsxs("span", {
-      className: "adyen-kyc-entity-status__legend--rule",
-      children: [jsx(EntityStatusIcon, {
-        status: "obligatoryEmpty"
-      }), jsx("span", {
-        className: "adyen-kyc-entity-status--text",
-        dangerouslySetInnerHTML: {
-          __html: i18n.get("obligatory")
-        }
-      })]
-    }), jsxs("span", {
-      className: "adyen-kyc-entity-status__legend--rule",
-      children: [jsx(EntityStatusIcon, {
-        status: "conditionalEmpty"
-      }), jsx("span", {
-        className: "adyen-kyc-entity-status--text",
-        dangerouslySetInnerHTML: {
-          __html: i18n.get("requiredIfApplicable")
-        }
-      })]
-    })]
-  });
-};
 const EntityGuidanceStatus = ({
   country,
   currentTask,
@@ -30659,8 +30757,7 @@ const DecisionMakersComponent = ({
   handleUpdateLegalEntity,
   navigateBackToTaskList,
   onDecisionMakerDelete,
-  disableAddDecisionMakers,
-  disableDeleteDecisionMakers
+  trustedEntityAssociations
 }) => {
   var _a, _b;
   const {
@@ -30756,17 +30853,16 @@ const DecisionMakersComponent = ({
       children: [hasExpired && jsx(ExpiredBanner, {}), jsx(FormHeader, {
         heading: i18n.get("decisionMaker"),
         description: i18n.get("decisionMakerDescription")
-      }), jsx(EntityGuidanceLegend, {}), jsx("div", {
+      }), jsx("div", {
         className: "adyen-kyc-decision-makers__container",
         children: availableDecisionMakers.map(({
           roleType,
-          min,
-          max
+          min
         }) => jsx(EntityGuidanceStatus, {
           country: registeredCountry,
           currentTask: TaskTypes.DECISION_MAKER_OVERVIEW,
           entityLabel: roleType,
-          status: iconStatus(uniqueDecisionMakersPerType(roleType), min, max)
+          status: iconStatus(uniqueDecisionMakersPerType(roleType), min)
         }, roleType))
       }), jsx(ContextGuidance, {
         page: "Decision makers",
@@ -30800,7 +30896,7 @@ const DecisionMakersComponent = ({
           removeEntity: () => {
             deleteDecisionMaker(decisionMaker);
           },
-          isRemoveDisabled: isRemoveDisabled || disableDeleteDecisionMakers,
+          isRemoveDisabled: isRemoveDisabled || trustedEntityAssociations.some((ea) => ea.reference === decisionMaker.reference),
           handleIsRemoveDisabled: setIsRemoveDisabled
         }, decisionMaker.reference))
       }) : null, jsx(Button, {
@@ -30811,7 +30907,7 @@ const DecisionMakersComponent = ({
         icon: "plus",
         onClick: addDecisionMakerOnClick,
         label: i18n.get("addDecisionMaker"),
-        disabled: haveMaxDecisionMakers || disableAddDecisionMakers
+        disabled: haveMaxDecisionMakers
       }), jsx(ActionBar, {
         onHome: () => {
           userEvents.addEvent("Saved decision makers list", {
@@ -32189,18 +32285,17 @@ const TrustMembersOverview = ({
       children: [hasExpired && jsx(ExpiredBanner, {}), jsx(FormHeader, {
         heading: i18n.get("trustMembers"),
         description: i18n.get("trustMembersDescription")
-      }), jsx(EntityGuidanceLegend, {}), jsx("div", {
+      }), jsx("div", {
         className: "adyen-kyc-trust-members__container",
         children: trustMemberRequirements.map(({
           roleTypes,
           min,
-          max,
           label
         }) => jsx(EntityGuidanceStatus, {
           country: CountryCodes.Australia,
           currentTask: TaskTypes.TRUST_MEMBER_OVERVIEW,
           entityLabel: label,
-          status: iconStatus(trustMembersWithOneOfGivenRoles(roleTypes).length, min, max)
+          status: iconStatus(trustMembersWithOneOfGivenRoles(roleTypes).length, min)
         }, label))
       }), jsx(ContextGuidance, {
         page: "Trust members",
@@ -32390,8 +32485,9 @@ function IndividualDropinComponent({
   hideNavigation = false,
   asModal = false,
   handleBackClick: externalBackClick,
-  trustedFields: trustedFields2,
-  trustedFieldsProvider
+  trustedFields,
+  trustedFieldsProvider,
+  trustedRoles
 }) {
   var _a, _b, _c, _d;
   const {
@@ -32417,7 +32513,7 @@ function IndividualDropinComponent({
   let dataFromResponse = mapLegalEntityToIndividual(legalEntityResponse, isTargetLegalEntityType);
   const documentUtils = documentApiUtils(handleCreateDocument, handleGetDocument, handleUpdateDocument);
   let roleTypes = [];
-  const [newDecisionMaker, setNewDecisionMaker] = useState();
+  const [newDecisionMaker] = useState();
   const [problems, setProblems] = useState(propProblems);
   const formRef = useRef(null);
   const [loadingStatus, setLoadingStatus] = useState("success");
@@ -32426,7 +32522,7 @@ function IndividualDropinComponent({
   const [country, setCountry] = useState(((_a = dataFromResponse == null ? void 0 : dataFromResponse.personalDetails) == null ? void 0 : _a.residencyCountry) ?? parentCountry);
   const [hideFooter, setHideFooter] = useState(false);
   const {
-    trustedFields: singpassTrustedFields
+    trustedFields: associatedLegalEntityTrustedFields
   } = useSingpassMyInfoLogin({
     legalEntity: legalEntityResponse,
     accountHolder,
@@ -32552,7 +32648,6 @@ function IndividualDropinComponent({
         throw new Error("Provide handler to create legalEntity");
       }
       updatedLegalEntity = await handleCreateLegalEntity(legalEntity);
-      setNewDecisionMaker(legalEntity);
       userEvents.addEvent("Added decision maker", {
         segmentation: {
           ...baseTrackingPayload,
@@ -32672,7 +32767,8 @@ function IndividualDropinComponent({
         }
       });
       const accountHolderToEvaluated = ((_c2 = dataSubmitted.personalDetails) == null ? void 0 : _c2.accountHolder) || accountHolder;
-      legalEntity.entityAssociations = filterOutUnwantedAssociationsIfRootLE(taskType, legalEntityResponse, accountHolderToEvaluated ?? void 0);
+      const filteredEntityAssociation = filterOutUnwantedAssociationsIfRootLE(taskType, legalEntityResponse, accountHolderToEvaluated || void 0);
+      legalEntity.entityAssociations = filteredEntityAssociation;
       const createdLegalEntity = await submitLegalEntity({
         dataSubmitted,
         legalEntity,
@@ -32883,8 +32979,9 @@ function IndividualDropinComponent({
       shouldValidate,
       accountHolder,
       parentLegalEntity,
-      trustedFields: !parentLegalEntity ? trustedFields2 : singpassTrustedFields,
-      trustedFieldsProvider
+      trustedFields: !parentLegalEntity ? trustedFields : associatedLegalEntityTrustedFields,
+      trustedFieldsProvider,
+      trustedRoles
     })
   });
 }
@@ -35474,7 +35571,7 @@ function DropinComposerComponent({
   onNavigate = noop,
   ...args
 }) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
   const {
     contextCountry,
     accountHolder,
@@ -35518,13 +35615,14 @@ function DropinComposerComponent({
     handleSingpassMyInfoLoginSuccess,
     handleSingpassMyInfoLoginFailure,
     handleSingpassMyInfoLoginReset,
-    trustedFields: singpassTrustedFields
+    trustedFields: singpassTrustedFields,
+    trustedEntityAssociations
   } = useSingpassMyInfoLogin({
     legalEntity: rootLegalEntity,
     accountHolder,
     handleOpenSingpassAuthorizationLink
   });
-  const hasUsedSingpass = Boolean(Object.keys(singpassTrustedFields).length);
+  const singpassTabRef = useRef(null);
   const rootLegalEntityCountry = getLegalEntityCountry(rootLegalEntity);
   const [associatedLegalEntity, setAssociatedLegalEntity] = useState(null);
   const {
@@ -35836,7 +35934,8 @@ function DropinComposerComponent({
       try {
         const authUrl = await handleInitiateSingpassMyInfoLogin();
         setHasSeenSingpassSelection(true);
-        window.open(authUrl, "_blank").focus();
+        singpassTabRef.current = window.open(authUrl, "_blank");
+        singpassTabRef.current.focus();
       } catch (e) {
         logger$d.error(e);
         handleSingpassMyInfoLoginFailure(e);
@@ -36074,7 +36173,8 @@ function DropinComposerComponent({
     onClick: async () => {
       try {
         const authUrl = await handleInitiateSingpassMyInfoLogin();
-        window.open(authUrl, "_blank").focus();
+        singpassTabRef.current = window.open(authUrl);
+        singpassTabRef.current.focus();
       } catch (e) {
         logger$d.error(e);
         handleSingpassMyInfoLoginFailure(e);
@@ -36088,6 +36188,7 @@ function DropinComposerComponent({
       if (isSuccessful) {
         handleSingpassMyInfoLoginSuccess();
         await refreshLegalEntity();
+        singpassTabRef.current.close();
       } else {
         handleSingpassMyInfoLoginFailure(legalEntityResponse.type === LegalEntityType.INDIVIDUAL ? "weCouldntConnectToMyinfo" : "weCouldntConnectToMyinfoBusiness");
       }
@@ -36164,8 +36265,7 @@ function DropinComposerComponent({
         navigateBackToTaskList: navigateBack,
         onDecisionMakerDelete: refreshLegalEntity,
         capabilityProblems,
-        disableAddDecisionMakers: hasUsedSingpass,
-        disableDeleteDecisionMakers: hasUsedSingpass
+        trustedEntityAssociations
       });
     case TaskTypes.INDIVIDUAL:
       return jsx(IndividualDropinComponent, {
@@ -36234,7 +36334,8 @@ function DropinComposerComponent({
         handleGetIdVerificationStartCheck: args == null ? void 0 : args.handleGetIdVerificationStartCheck,
         handleOpenSingpassAuthorizationLink: args == null ? void 0 : args.handleOpenSingpassAuthorizationLink,
         trustedFields: singpassTrustedFields,
-        trustedFieldsProvider: isEligibleForSingpass && TrustedFieldsProvider.SINGPASS
+        trustedFieldsProvider: isEligibleForSingpass && TrustedFieldsProvider.SINGPASS,
+        trustedRoles: ((_d = trustedEntityAssociations.find((ea) => ea.reference === (associatedLegalEntity == null ? void 0 : associatedLegalEntity.id))) == null ? void 0 : _d.types) || []
       });
     case TaskTypes.TRUST_MEMBER_COMPANY_OWNER:
       return jsx(IndividualDropinComponent, {
@@ -36315,8 +36416,7 @@ function DropinComposerComponent({
         handleFindAddress: args == null ? void 0 : args.handleFindAddress,
         onTypeSwitch: navigateToTypeSwitcher,
         isTargetLegalEntityType: legalEntityType === LegalEntityType.ORGANIZATION,
-        trustedFields: singpassTrustedFields,
-        trustedFieldsProvider: isEligibleForSingpass && TrustedFieldsProvider.SINGPASS
+        trustedFields: singpassTrustedFields
       });
     case TaskTypes.COMPANY_SEARCH:
       return jsx(CompanySearchDropinComponent, {
@@ -36352,7 +36452,6 @@ function DropinComposerComponent({
         handleVerifyTin: args.handleVerifyTin,
         onTypeSwitch: navigateToTypeSwitcher,
         isTargetLegalEntityType: legalEntityType === LegalEntityType.ORGANIZATION,
-        accountHolder,
         trustedFields: singpassTrustedFields,
         trustedFieldsProvider: isEligibleForSingpass && TrustedFieldsProvider.SINGPASS
       });
@@ -36392,8 +36491,7 @@ function DropinComposerComponent({
           handleVerifyTin: args.handleVerifyTin,
           handleClearCompanyData: args.handleClearCompanyData,
           onTypeSwitch: navigateToTypeSwitcher,
-          isTargetLegalEntityType: legalEntityType === LegalEntityType.ORGANIZATION,
-          accountHolder
+          isTargetLegalEntityType: legalEntityType === LegalEntityType.ORGANIZATION
         })
       });
     case TaskTypes.TRUST_MEMBER_COMPANY:
@@ -36406,7 +36504,7 @@ function DropinComposerComponent({
         parentLegalEntity: associatedLegalArrangement,
         legalEntityResponse: associatedLegalEntity,
         capabilities: getCapabilities(legalEntityResponse),
-        problems: (_d = capabilityProblems == null ? void 0 : capabilityProblems.LegalEntity) == null ? void 0 : _d[rootLegalEntity.id],
+        problems: (_e = capabilityProblems == null ? void 0 : capabilityProblems.LegalEntity) == null ? void 0 : _e[rootLegalEntity.id],
         onChange: componentOnChange,
         onSubmit: (data) => refreshLegalArrangementAndRunOnSubmit(data, 2),
         handleBackClick: navigateBack,
@@ -36424,7 +36522,7 @@ function DropinComposerComponent({
         },
         taskType: currentTask,
         taskName: currentTask === TaskTypes.PAYIN ? "payinDetails" : "payoutDetails",
-        problems: (_e = capabilityProblems == null ? void 0 : capabilityProblems.BankAccount) == null ? void 0 : _e[transferInstrument == null ? void 0 : transferInstrument.id],
+        problems: (_f = capabilityProblems == null ? void 0 : capabilityProblems.BankAccount) == null ? void 0 : _f[transferInstrument == null ? void 0 : transferInstrument.id],
         transferInstrument,
         setTransferInstrument,
         legalEntityResponse: rootLegalEntity,
@@ -36452,7 +36550,7 @@ function DropinComposerComponent({
           topLevelLegalEntity: legalEntityResponse
         },
         taskType: TaskTypes.TRUST,
-        problems: (_f = capabilityProblems == null ? void 0 : capabilityProblems.LegalEntity) == null ? void 0 : _f[associatedLegalArrangement == null ? void 0 : associatedLegalArrangement.id],
+        problems: (_g = capabilityProblems == null ? void 0 : capabilityProblems.LegalEntity) == null ? void 0 : _g[associatedLegalArrangement == null ? void 0 : associatedLegalArrangement.id],
         parentLegalEntity: rootLegalEntity,
         legalEntityResponse: associatedLegalArrangement,
         capabilities: getCapabilities(legalEntityResponse),
@@ -36460,7 +36558,7 @@ function DropinComposerComponent({
         onSubmit: (data) => refreshLegalArrangementAndRunOnSubmit(data, 1),
         handleHomeClick: navigateBack,
         homeButtonLabel: i18n.get("saveAndGoToOverview"),
-        country: (((_g = associatedLegalArrangement == null ? void 0 : associatedLegalArrangement.trust) == null ? void 0 : _g.countryOfGoverningLaw) || ((_h = associatedLegalArrangement == null ? void 0 : associatedLegalArrangement.trust) == null ? void 0 : _h.registeredAddress.country)) ?? rootLegalEntityCountry,
+        country: (((_h = associatedLegalArrangement == null ? void 0 : associatedLegalArrangement.trust) == null ? void 0 : _h.countryOfGoverningLaw) || ((_i = associatedLegalArrangement == null ? void 0 : associatedLegalArrangement.trust) == null ? void 0 : _i.registeredAddress.country)) ?? rootLegalEntityCountry,
         handleAddressSearch: args == null ? void 0 : args.handleAddressSearch,
         handleFindAddress: args == null ? void 0 : args.handleFindAddress
       });
@@ -36506,12 +36604,12 @@ function DropinComposerComponent({
         parentLegalEntity: rootLegalEntity,
         legalEntityResponse: associatedLegalArrangement,
         capabilities: getCapabilities(legalEntityResponse),
-        problems: (_i = capabilityProblems == null ? void 0 : capabilityProblems.LegalEntity) == null ? void 0 : _i[associatedLegalArrangement == null ? void 0 : associatedLegalArrangement.id],
+        problems: (_j = capabilityProblems == null ? void 0 : capabilityProblems.LegalEntity) == null ? void 0 : _j[associatedLegalArrangement == null ? void 0 : associatedLegalArrangement.id],
         onChange: componentOnChange,
         onSubmit: (data) => refreshLegalArrangementAndRunOnSubmit(data, 1),
         handleHomeClick: navigateBack,
         homeButtonLabel: i18n.get("saveAndGoToOverview"),
-        country: (((_j = associatedLegalArrangement == null ? void 0 : associatedLegalArrangement.soleProprietorship) == null ? void 0 : _j.countryOfGoverningLaw) || ((_l = (_k = associatedLegalArrangement == null ? void 0 : associatedLegalArrangement.soleProprietorship) == null ? void 0 : _k.registeredAddress) == null ? void 0 : _l.country)) ?? rootLegalEntityCountry,
+        country: (((_k = associatedLegalArrangement == null ? void 0 : associatedLegalArrangement.soleProprietorship) == null ? void 0 : _k.countryOfGoverningLaw) || ((_m = (_l = associatedLegalArrangement == null ? void 0 : associatedLegalArrangement.soleProprietorship) == null ? void 0 : _l.registeredAddress) == null ? void 0 : _m.country)) ?? rootLegalEntityCountry,
         handleAddressSearch: args == null ? void 0 : args.handleAddressSearch,
         handleFindAddress: args == null ? void 0 : args.handleFindAddress
       });
@@ -39360,7 +39458,7 @@ const ConfigurationApiProvider = ({
     isEmbeddedDropin,
     loadingContext
   } = authContext;
-  const sdkVersion = "2.53.1";
+  const sdkVersion = "2.54.1";
   useAnalytics({
     onUserEvent,
     legalEntityId: rootLegalEntityId,
@@ -40038,7 +40136,7 @@ const DebugModal = ({
   };
   const copyToClipboard = async () => {
     const toCopy = {
-      sdkVersion: "2.53.1",
+      sdkVersion: "2.54.1",
       experiments: Object.fromEntries(allExperimentsWithValues),
       settings: Object.fromEntries(allSettingsWithValues)
     };
@@ -40077,7 +40175,7 @@ const DebugModal = ({
       children: [jsxs("div", {
         className: "adyen-kyc-debug-modal__meta",
         children: [jsxs("span", {
-          children: ["SDK version: ", "2.53.1"]
+          children: ["SDK version: ", "2.54.1"]
         }), jsxs("span", {
           children: ["rootLegalEntityId: ", rootLegalEntityId]
         })]