@adyen/kyc-components 2.19.1 → 2.21.0

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

@@ -139,13 +139,18 @@ const privateCompanyTitle = "Private company";
 const privateCompanyDescription = "Owned privately. The shareholders don’t necessarily trade on public exchanges (like the stock market).";
 const publicCompanyTitle = "Public company";
 const publicCompanyDescription = "Owned by public shareholders. They’re also required to disclose financial information to the public regularly.";
+const partnershipIncorporated = "Incorporated partnership";
+const partnershipUnincorporated = "Unincorporated partnership";
+const associationIncorporated = "Incorporated association";
 const incorporatedPartnership = "Incorporated partnership";
 const unincorporatedPartnership = "Unincorporated partnership";
 const incorporatedPartnershipTitle = "Incorporated partnership";
+const partnershipIncorporatedDescription = "An agreement between two or more people who run a business together.";
+const partnershipUnincorporatedDescription = "You or your partners are personally liable for business debts.";
+const partnershipIncorporatedNewEntryFlowDescription = "You and your partners have limited liability for business debts.";
+const partnershipUnincorporatedNewEntryFlowDescription = "You or your partners are personally liable for business debts.";
 const incorporatedPartnershipDescription = "An agreement between two or more people who run a business together.";
-const incorporatedPartnershipNewEntryFlowDescription = "You and your partners have limited liability for business debts.";
 const unincorporatedPartnershipDescription = "You or your partners are personally liable for business debts.";
-const unincorporatedPartnershipNewEntryFlowDescription = "You or your partners are personally liable for business debts.";
 const nonProfitOrCharitableOrgTitle = "Non-profit or charitable organization";
 const nonProfitOrCharitableOrgDescription = "An organization that has an official status as not for profit or tax exempt, sometimes called an NGO.";
 const governmentalOrganizationTitle = "Governmental organization";
@@ -266,6 +271,7 @@ const signedDocuments = "Signed documents";
 const paymentProcessingTerms = "Payment Processing Terms";
 const accountHolderTerms = "Account Holder Terms";
 const capitalUserTerms = "Capital User Terms";
+const pccr = "PCCR";
 const businessAccountTerms = "Business Account Terms";
 const cardUserTerms = "Card User Terms";
 const franchiseesTAndCs = "Franchisees T&C's";
@@ -645,6 +651,7 @@ const failedToFetchSoleProp = "Failed to fetch the sole propietor";
 const uniqueIdentificationCode = "Unique identification code (ЕИК/UIC)";
 const identifikacionenNomerDDS = "VAT number (ДДС)";
 const MBS = "Matični broj subjekta trgovačkog suda (MBS)";
+const MBO = "MBO";
 const PDVIdBrojOIB = "PDV Id. Broj OIB";
 const cyRegistrationNumber = "Αριθμός Εγγραφής";
 const arithmosEngraphes = "Αριθμός Εγγραφής Φ.Π.Α.";
@@ -1261,13 +1268,18 @@ const defaultTrans = {
   privateCompanyDescription,
   publicCompanyTitle,
   publicCompanyDescription,
+  partnershipIncorporated,
+  partnershipUnincorporated,
+  associationIncorporated,
   incorporatedPartnership,
   unincorporatedPartnership,
   incorporatedPartnershipTitle,
+  partnershipIncorporatedDescription,
+  partnershipUnincorporatedDescription,
+  partnershipIncorporatedNewEntryFlowDescription,
+  partnershipUnincorporatedNewEntryFlowDescription,
   incorporatedPartnershipDescription,
-  incorporatedPartnershipNewEntryFlowDescription,
   unincorporatedPartnershipDescription,
-  unincorporatedPartnershipNewEntryFlowDescription,
   nonProfitOrCharitableOrgTitle,
   nonProfitOrCharitableOrgDescription,
   governmentalOrganizationTitle,
@@ -1388,6 +1400,7 @@ const defaultTrans = {
   paymentProcessingTerms,
   accountHolderTerms,
   capitalUserTerms,
+  pccr,
   businessAccountTerms,
   cardUserTerms,
   franchiseesTAndCs,
@@ -1772,6 +1785,7 @@ const defaultTrans = {
   uniqueIdentificationCode,
   identifikacionenNomerDDS,
   MBS,
+  MBO,
   PDVIdBrojOIB,
   cyRegistrationNumber,
   arithmosEngraphes,
@@ -2386,43 +2400,30 @@ class Language {
     });
   }
 }
-function isArray(prop) {
-  return typeof prop === "object" && prop !== null && Object.prototype.toString.call(prop) === "[object Array]";
-}
-function pick(...args) {
-  const myArgs = isArray(args[0]) ? args[0] : args;
-  return {
-    from: (obj) => (
-      // eslint-disable-line
-      myArgs.map((k) => k in obj ? {
-        [k]: obj[k]
-      } : {}).reduce((res, o) => ({
-        ...res,
-        ...o
-      }), {})
-    )
-  };
-}
-function drop(...args) {
-  const myArgs = isArray(args[0]) ? args[0] : args;
-  return {
-    from: (obj) => {
-      const vkeys = Object.keys(obj).filter((k) => !myArgs.includes(k));
-      return pick(...vkeys).from(obj);
-    }
-  };
-}
-function doArraysMatch(arr1, arr2) {
-  return arr1.length === arr2.length && arr1.every((element) => arr2.includes(element));
-}
+const entriesOf = (object) => Object.entries(object);
+const keysOf = (object) => Object.keys(object);
+const keyIsInObject = (key, obj) => key in obj;
+const pick = (...propertiesToKeep) => ({
+  from: (obj) => propertiesToKeep.map((k) => keyIsInObject(k, obj) ? {
+    [k]: obj[k]
+  } : {}).reduce((res, o) => ({
+    ...res,
+    ...o
+  }), {})
+});
+const drop = (...propertiesToDrop) => ({
+  from: (obj) => {
+    const remainingProperties = keysOf(obj).filter((k) => !propertiesToDrop.includes(k));
+    return pick(...remainingProperties).from(obj);
+  }
+});
+const doArraysMatch = (arr1, arr2) => arr1.length === arr2.length && arr1.every((element) => arr2.includes(element));
 const objectsDeepEqual = (x, y) => {
-  const xType = typeof x;
-  const yType = typeof y;
-  if (x && y && xType === "object" && xType === yType) {
+  if (x && y && typeof x === "object" && typeof y === "object") {
     if (Object.keys(x).length !== Object.keys(y).length) {
       return false;
     }
-    return Object.keys(x).every((key) => objectsDeepEqual(x[key], y[key]));
+    return keysOf(x).every((key) => objectsDeepEqual(x[key], y[key]));
   }
   return x === y;
 };
@@ -2463,7 +2464,6 @@ function useSettingsContext() {
   }
   return context;
 }
-const entriesOf = (object) => Object.entries(object);
 const hasDataChanged = (initialData, currentData) => entriesOf(currentData ?? {}).some(([key, value]) => {
   if (typeof value === "object") {
     return !objectsDeepEqual(value, initialData == null ? void 0 : initialData[key]);
@@ -2493,6 +2493,41 @@ const useCoreContext = () => {
     throw Error("You need a <CoreProvider> to use core context");
   return context;
 };
+const ExperimentsContext = createContext({
+  isExperimentEnabled: () => false
+});
+function useExperimentsContext() {
+  const context = useContext(ExperimentsContext);
+  if (context === void 0) {
+    throw new Error("useExperimentContext must be used within a ExperimentProvider");
+  }
+  return context;
+}
+var SettingNames = /* @__PURE__ */ ((SettingNames2) => {
+  SettingNames2["AllowBankAccountFormatSelection"] = "allowBankAccountFormatSelection";
+  SettingNames2["AllowIntraRegionCrossBorderPayout"] = "allowIntraRegionCrossBorderPayout";
+  SettingNames2["AllowLegalEntityTypeChange"] = "changeLegalEntityType";
+  SettingNames2["AllowPrefilledCountryEdit"] = "editPrefilledCountry";
+  SettingNames2["RequirePciSignEcommerce"] = "requirePciSignEcommerce";
+  SettingNames2["RequirePciSignPos"] = "requirePciSignPos";
+  SettingNames2["RequirePciSignEcomMoto"] = "requirePciSignEcomMoto";
+  SettingNames2["RequirePciSignPosMoto"] = "requirePciSignPosMoto";
+  SettingNames2["HideOnboardingIntroductionIndividual"] = "hideOnboardingIntroductionIndividual";
+  SettingNames2["HideOnboardingIntroductionOrganization"] = "hideOnboardingIntroductionOrganization";
+  SettingNames2["HideOnboardingIntroductionTrust"] = "hideOnboardingIntroductionTrust";
+  SettingNames2["HideOnboardingIntroductionSoleProprietor"] = "hideOnboardingIntroductionSoleProprietor";
+  SettingNames2["ViewOnboardingGuidance"] = "viewOnboardingGuidance";
+  return SettingNames2;
+})(SettingNames || {});
+const useEnableNewEntryFlow = () => {
+  const {
+    isSettingEnabled
+  } = useSettingsContext();
+  const {
+    isExperimentEnabled
+  } = useExperimentsContext();
+  return isSettingEnabled(SettingNames.AllowLegalEntityTypeChange) && isExperimentEnabled("EnableNewEntryFlow");
+};
 const Summary$1 = "";
 const omitKeys = (obj, omit) => Object.keys(obj).filter((k) => !omit.includes(k)).reduce((a, c) => {
   a[c] = obj[c];
@@ -3018,12 +3053,11 @@ const NavigateToFieldLink = ({
   const {
     goToFormByFieldName
   } = useFormRouterContext();
-  const onClick = (e) => {
-    e.preventDefault();
-    goToFormByFieldName(fieldName);
-  };
   return jsx(Link, {
-    onClick,
+    onClick: (e) => {
+      e.preventDefault();
+      goToFormByFieldName(fieldName);
+    },
     href: "to-field-link",
     children: label
   });
@@ -3195,22 +3229,6 @@ function getFieldProps(props, innerFormFields) {
   }
   return null;
 }
-var SettingNames = /* @__PURE__ */ ((SettingNames2) => {
-  SettingNames2["AllowBankAccountFormatSelection"] = "allowBankAccountFormatSelection";
-  SettingNames2["AllowIntraRegionCrossBorderPayout"] = "allowIntraRegionCrossBorderPayout";
-  SettingNames2["AllowLegalEntityTypeChange"] = "changeLegalEntityType";
-  SettingNames2["AllowPrefilledCountryEdit"] = "editPrefilledCountry";
-  SettingNames2["RequirePciSignEcommerce"] = "requirePciSignEcommerce";
-  SettingNames2["RequirePciSignPos"] = "requirePciSignPos";
-  SettingNames2["RequirePciSignEcomMoto"] = "requirePciSignEcomMoto";
-  SettingNames2["RequirePciSignPosMoto"] = "requirePciSignPosMoto";
-  SettingNames2["HideOnboardingIntroductionIndividual"] = "hideOnboardingIntroductionIndividual";
-  SettingNames2["HideOnboardingIntroductionOrganization"] = "hideOnboardingIntroductionOrganization";
-  SettingNames2["HideOnboardingIntroductionTrust"] = "hideOnboardingIntroductionTrust";
-  SettingNames2["HideOnboardingIntroductionSoleProprietor"] = "hideOnboardingIntroductionSoleProprietor";
-  SettingNames2["ViewOnboardingGuidance"] = "viewOnboardingGuidance";
-  return SettingNames2;
-})(SettingNames || {});
 const ON_CHANGE_DEBOUNCE_DURATION = 200;
 const KEYBOARD_KEYS = {
   arrowDown: "ArrowDown",
@@ -3925,7 +3943,7 @@ const Field = ({
   errorMessage,
   filled,
   focused,
-  helper: helper2,
+  helper,
   inputWrapperModifiers = [],
   isLoading,
   isValid,
@@ -3970,9 +3988,9 @@ const Field = ({
           "adyen-kyc-label__text--error": !!errorMessage
         }),
         children: label
-      }), helper2 && jsx("span", {
+      }), helper && jsx("span", {
         className: "adyen-kyc-helper-text",
-        children: helper2
+        children: helper
       }), jsxs("div", {
         className: cx("adyen-kyc-input-wrapper", ...inputWrapperModifiers.map((m) => `adyen-kyc-input-wrapper--${m}`)),
         children: [children({
@@ -4023,16 +4041,14 @@ const Field = ({
 };
 const Select$1 = "";
 const getScrollParent = (node) => {
+  if (!node)
+    return null;
   const isElement = node instanceof HTMLElement;
   const overflowY = isElement && window.getComputedStyle(node).overflowY;
   const isScrollable = overflowY !== "visible" && overflowY !== "hidden";
-  if (!node) {
-    return -1;
-  }
-  if (isScrollable) {
+  if (isElement && isScrollable)
     return node;
-  }
-  return getScrollParent(node.parentNode) || document.body;
+  return getScrollParent(node.parentNode) ?? document.body;
 };
 function uuidv4() {
   return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, (c) => {
@@ -4558,13 +4574,13 @@ function SelectButton({
       "adyen-kyc-dropdown-button-search": isSearch
     }),
     filterable,
-    onClick: !readonly ? toggleList : null,
-    onKeyDown: !readonly ? onButtonKeyDown : null,
-    role: filterable || isMulti ? "button" : null,
-    tabIndex: "0",
+    onClick: !readonly ? toggleList : void 0,
+    onKeyDown: !readonly ? onButtonKeyDown : void 0,
+    role: filterable || isMulti ? "button" : void 0,
+    tabIndex: 0,
     title,
     toggleButtonRef,
-    type: !filterable && !isMulti ? "button" : null,
+    type: !filterable && !isMulti ? "button" : void 0,
     "aria-describedby": ariaDescribedBy,
     isMulti,
     id: id2,
@@ -4658,7 +4674,7 @@ function Checkbox({
   label,
   isInvalid,
   onChange,
-  helper: helper2,
+  helper,
   checked,
   disabled,
   ...props
@@ -4680,9 +4696,9 @@ function Checkbox({
     }), jsx("span", {
       className: "adyen-kyc-checkbox__label",
       children: label
-    }), helper2 && jsx("span", {
+    }), helper && jsx("span", {
       className: "adyen-kyc-checkbox__helper-text",
-      children: helper2
+      children: helper
     })]
   });
 }
@@ -5781,6 +5797,13 @@ const businessRegistrationNumberPatterns = {
       values: {
         digits: 9
       }
+    },
+    [CompanyTypesValue.SOLE_PROPRIETORSHIP]: {
+      regex: /^\d{8}$/,
+      format: "Xdigits",
+      values: {
+        digits: 8
+      }
     }
   },
   [CountryCodes.Cyprus]: {
@@ -6338,9 +6361,7 @@ const validateBusinessRegistrationNumber = (input, fallbackCountry = null, compa
     return {
       isValid: CHARACTER_PATTERNS.noHtml.test(input),
       translationMessage: {
-        translationKey: "validationPleaseEnterAValidRegistrationNumber",
-        format: null,
-        values: null
+        translationKey: "validationPleaseEnterAValidRegistrationNumber"
       }
     };
   }
@@ -6356,9 +6377,7 @@ const validateBusinessRegistrationNumber = (input, fallbackCountry = null, compa
   return {
     isValid: CHARACTER_PATTERNS.noHtml.test(input),
     translationMessage: {
-      translationKey: "validationPleaseEnterAValidRegistrationNumber",
-      format: null,
-      values: null
+      translationKey: "validationPleaseEnterAValidRegistrationNumber"
     }
   };
 };
@@ -6368,20 +6387,32 @@ const getValidationRulesPerCountryAndType = (country2, companyType2, trustType2,
     if (!registrationNumber2)
       return false;
     const {
-      isValid,
-      translationMessage
+      isValid
+    } = validateBusinessRegistrationNumber(registrationNumber2, country2, companyType2, trustType2);
+    return isValid;
+  },
+  errorMessage: (registrationNumber2) => {
+    if (!registrationNumber2)
+      return;
+    const {
+      translationMessage: {
+        translationKey,
+        format,
+        values
+      }
     } = validateBusinessRegistrationNumber(registrationNumber2, country2, companyType2, trustType2);
-    this.errorMessage = {
-      translationKey: translationMessage.translationKey,
+    if (!format)
+      return translationKey;
+    return {
+      translationKey,
       translationObject: {
         values: {
-          format: translationMessage.values ? i18n.get(translationMessage.format, {
-            values: translationMessage.values
-          }) : i18n.get(translationMessage.format)
+          format: values ? i18n.get(format, {
+            values
+          }) : i18n.get(format)
         }
       }
     };
-    return isValid;
   }
 });
 const defaultValidationRules = {
@@ -6401,6 +6432,7 @@ const getRegistrationNumberValidationRules = (country2, companyType2, trustType2
 };
 const businessRegistrationNumberFields = ["registrationNumber", "exemptedFromRegistrationNumber"];
 function BusinessRegistrationNumber(props) {
+  var _a;
   const {
     i18n
   } = useI18nContext();
@@ -6413,7 +6445,7 @@ function BusinessRegistrationNumber(props) {
     country: country2,
     trustType: trustType2
   } = props;
-  const validationRules = useMemo(() => getRegistrationNumberValidationRules(country2, companyType2, trustType2, i18n), [country2, companyType2, i18n]);
+  const validationRules = useMemo(() => getRegistrationNumberValidationRules(country2, companyType2, trustType2, i18n), [country2, companyType2, trustType2, i18n]);
   const registrationNumberFormatters = getRegistrationNumberFormatters(props.country);
   const {
     handleChangeFor,
@@ -6429,13 +6461,14 @@ function BusinessRegistrationNumber(props) {
     formatters: registrationNumberFormatters,
     defaultData: {
       ...props.data,
-      exemptedFromRegistrationNumber: !!props.data.exemptedFromRegistrationNumber
+      exemptedFromRegistrationNumber: !!((_a = props.data) == null ? void 0 : _a.exemptedFromRegistrationNumber)
     },
     // exemptedFromRegistrationNumber should be a boolean
     fieldProblems: props == null ? void 0 : props.fieldValidationErrors
   });
   useEffect(() => {
-    stateRef.current.setState({
+    var _a2, _b;
+    (_b = (_a2 = stateRef == null ? void 0 : stateRef.current) == null ? void 0 : _a2.setState) == null ? void 0 : _b.call(_a2, {
       type: "addToState",
       value: {
         data,
@@ -6485,7 +6518,7 @@ function BusinessRegistrationNumber(props) {
       value: "exemptedFromRegistrationNumber",
       readonly: formUtils.isReadOnly("exemptedFromRegistrationNumber"),
       classNameModifiers: ["exempted-from-registration"],
-      checked: data.exemptedFromRegistrationNumber,
+      checked: data.exemptedFromRegistrationNumber ?? false,
       onChange: handleChangeFor("exemptedFromRegistrationNumber"),
       "aria-required": formUtils.isRequiredField("exemptedFromRegistrationNumber"),
       "aria-label": formUtils.getLabel("exemptedFromRegistrationNumber"),
@@ -7675,7 +7708,7 @@ const companyRegistrationDetailsValidationRules = {
   },
   stockExchangeMIC: {
     modes: ["blur"],
-    validate: (input) => /^[A-Z0-9]{4}$/.test(input),
+    validate: (input) => !isEmpty(input) && /^[A-Z0-9]{4}$/.test(input),
     errorMessage: "validationPleaseEnterAValidMarketIdentifier"
   },
   stockISIN: [{
@@ -7693,7 +7726,7 @@ const companyRegistrationDetailsValidationRules = {
     errorMessage: "fieldIsRequired"
   }, {
     modes: ["blur"],
-    validate: (dateOfIncorporation2) => dateOfIncorporation2 && new Date(dateOfIncorporation2) < /* @__PURE__ */ new Date(),
+    validate: (dateOfIncorporation2) => !isEmpty(dateOfIncorporation2) && new Date(dateOfIncorporation2) < /* @__PURE__ */ new Date(),
     errorMessage: "invalidDateOfIncorporation"
   }]
 };
@@ -8628,16 +8661,6 @@ const countryConfig$4 = {
     }
   }
 };
-const ExperimentsContext = createContext({
-  isExperimentEnabled: () => false
-});
-function useExperimentsContext() {
-  const context = useContext(ExperimentsContext);
-  if (context === void 0) {
-    throw new Error("useExperimentContext must be used within a ExperimentProvider");
-  }
-  return context;
-}
 var TrustMemberTypes = /* @__PURE__ */ ((TrustMemberTypes2) => {
   TrustMemberTypes2["DEFINED_BENEFICIARY"] = "definedBeneficiary";
   TrustMemberTypes2["UNDEFINED_BENEFICIARY"] = "undefinedBeneficiary";
@@ -9371,16 +9394,13 @@ function DropzoneFile(props) {
     i18n
   } = useI18nContext();
   const formatSize = (bytes) => {
-    if (bytes) {
-      const sizes = ["Bytes", "KB", "MB", "GB", "TB"];
-      if (bytes === 0)
-        return "n/a";
-      const i = parseInt(Math.floor(Math.log(bytes) / Math.log(1024)).toString());
-      if (i === 0)
-        return `${bytes} ${sizes[i]}`;
-      return `(${(bytes / 1024 ** i).toFixed(1)} ${sizes[i]})`;
-    }
-    return null;
+    const sizes = ["Bytes", "KB", "MB", "GB", "TB"];
+    if (!bytes || bytes === 0)
+      return "n/a";
+    const i = parseInt(Math.floor(Math.log(bytes) / Math.log(1024)).toString());
+    if (i === 0)
+      return `${bytes} ${sizes[i]}`;
+    return `(${(bytes / 1024 ** i).toFixed(1)} ${sizes[i]})`;
   };
   return jsxs("div", {
     className: "adyen-kyc-dropzone-file",
@@ -9527,10 +9547,10 @@ function Dropzone(props) {
   const isRequired = ((_a = errors == null ? void 0 : errors[name]) == null ? void 0 : _a.errorMessage) === "fieldIsRequired";
   const allowedFiletypes = allowedFileTypes.join(", ");
   useEffect(() => {
-    var _a2;
+    var _a2, _b2, _c;
     const hasMaxNumberOfFiles = ((_a2 = data == null ? void 0 : data[name]) == null ? void 0 : _a2.length) >= maxNumberOfFiles;
     setShowDropzone(!hasMaxNumberOfFiles);
-    stateRef.current.setState({
+    (_c = (_b2 = stateRef == null ? void 0 : stateRef.current) == null ? void 0 : _b2.setState) == null ? void 0 : _c.call(_b2, {
       type: "addToState",
       value: {
         data,
@@ -10838,10 +10858,10 @@ Address.defaultProps = {
 };
 const RadioGroup$1 = "";
 function RadioGroup({
-  items,
+  items = [],
   i18n,
   name,
-  onChange,
+  onChange = noop,
   value,
   isInvalid,
   uniqueId: uniqueId2,
@@ -10876,11 +10896,6 @@ function RadioGroup({
     })
   });
 }
-RadioGroup.defaultProps = {
-  onChange: () => {
-  },
-  items: []
-};
 var operationalAddressIsSameIds = /* @__PURE__ */ ((operationalAddressIsSameIds2) => {
   operationalAddressIsSameIds2["OPERATIONAL_ADDRESS_IS_SAME"] = "OperationAddressAnswerYes";
   operationalAddressIsSameIds2["OPERATIONAL_ADDRESS_IS_NOT_SAME"] = "OperationAddressAnswerNo";
@@ -11478,443 +11493,26 @@ const getMaskedAccountNumber = ({
   accountIdentifier,
   realLastFour
 }) => realLastFour ? `*******${realLastFour}` : accountIdentifier;
-const DEFAULT_DECISION_MAKER_REQUIREMENTS = [{
-  roleTypes: [DecisionMakerType.OWNER, DecisionMakerType.CONTROLLING_PERSON],
-  min: 1,
-  max: Infinity
-}, {
-  roleTypes: [DecisionMakerType.OWNER],
-  min: 0,
-  max: 4
-}, {
-  roleTypes: [DecisionMakerType.CONTROLLING_PERSON],
-  min: 0,
-  max: Infinity
-}, {
-  roleTypes: [DecisionMakerType.SIGNATORY],
-  min: 1,
-  max: Infinity
-}];
-const PER_COUNTRY_DECISION_MAKER_REQUIREMENTS_OVERRIDES = {
-  US: [{
-    roleTypes: [DecisionMakerType.CONTROLLING_PERSON],
-    min: 1,
-    max: Infinity
-  }, {
-    roleTypes: [DecisionMakerType.OWNER],
-    min: 0,
-    max: 4
-  }, {
-    roleTypes: [DecisionMakerType.SIGNATORY],
-    min: 1,
-    max: Infinity
-  }],
-  BR: [{
-    roleTypes: [DecisionMakerType.CONTROLLING_PERSON],
-    min: 1,
-    max: Infinity
-  }, {
-    roleTypes: [DecisionMakerType.OWNER],
-    min: 0,
-    max: 4
-  }, {
-    roleTypes: [DecisionMakerType.SIGNATORY],
-    min: 1,
-    max: Infinity
-  }],
-  AU: [...DEFAULT_DECISION_MAKER_REQUIREMENTS, {
-    roleTypes: [DecisionMakerType.DIRECTOR],
-    min: 3,
-    max: Infinity
-  }],
-  CA: [...DEFAULT_DECISION_MAKER_REQUIREMENTS, {
-    roleTypes: [DecisionMakerType.DIRECTOR],
-    min: 1,
-    max: Infinity
-  }],
-  HK: [...DEFAULT_DECISION_MAKER_REQUIREMENTS, {
-    roleTypes: [DecisionMakerType.DIRECTOR],
-    min: 1,
-    max: Infinity
-  }],
-  IN: [...DEFAULT_DECISION_MAKER_REQUIREMENTS, {
-    roleTypes: [DecisionMakerType.DIRECTOR],
-    min: 3,
-    max: 15
-  }],
-  NZ: [...DEFAULT_DECISION_MAKER_REQUIREMENTS, {
-    roleTypes: [DecisionMakerType.DIRECTOR],
-    min: 1,
-    max: Infinity
-  }],
-  SG: [...DEFAULT_DECISION_MAKER_REQUIREMENTS, {
-    roleTypes: [DecisionMakerType.DIRECTOR],
-    min: 1,
-    max: Infinity
-  }]
-};
-const getDecisionMakerRequirements = (country2) => PER_COUNTRY_DECISION_MAKER_REQUIREMENTS_OVERRIDES[country2] || DEFAULT_DECISION_MAKER_REQUIREMENTS;
-function getAvailableDecisionMakerRoleTypes(country2) {
-  const requirements2 = getDecisionMakerRequirements(country2);
-  return requirements2.filter((req) => req.roleTypes.length === 1).map((req) => ({
-    roleType: req.roleTypes[0],
-    min: req.min,
-    max: req.max
-  }));
-}
-const DEFAULT_DESCRIPTIONS_MAP = {
-  [DecisionMakerType.OWNER]: "provideAllOwners",
-  [DecisionMakerType.CONTROLLING_PERSON]: "ifNoOwnersSpecifyControllingPersons",
-  [DecisionMakerType.DIRECTOR]: "provideAllDirectors",
-  [DecisionMakerType.SIGNATORY]: "provideAtLeastOneSignatory"
-};
-const PER_COUNTRY_DESCRIPTION_OVERRIDES = {
-  US: {
-    [DecisionMakerType.CONTROLLING_PERSON]: "provideOneControllingPerson"
-  },
-  BR: {
-    [DecisionMakerType.CONTROLLING_PERSON]: "provideOneControllingPerson"
-  }
-};
-const getDecisionMakerDescriptionMap = (country2) => ({
-  ...DEFAULT_DESCRIPTIONS_MAP,
-  ...PER_COUNTRY_DESCRIPTION_OVERRIDES[country2]
-});
-const decisionMakerRoles = {
-  [DecisionMakerType.CONTROLLING_PERSON]: {
-    id: DecisionMakerType.CONTROLLING_PERSON,
-    name: "controllingPerson",
-    description: "controllingPersonDescription",
-    className: "adl-tag--teal"
-  },
-  [DecisionMakerType.OWNER]: {
-    id: DecisionMakerType.OWNER,
-    name: "owner",
-    description: "ownerDescription",
-    className: "adl-tag--purple"
-  },
-  [DecisionMakerType.SIGNATORY]: {
-    id: DecisionMakerType.SIGNATORY,
-    name: "signatory",
-    description: "signatoryDescription",
-    className: "adl-tag--light-blue"
-  },
-  [DecisionMakerType.DIRECTOR]: {
-    id: DecisionMakerType.DIRECTOR,
-    name: "director",
-    description: "directorDescription",
-    className: "adl-tag--orange"
-  }
+const getDirectEntityAssociations = (rootLE, legalEntityId) => {
+  var _a;
+  return ((_a = rootLE == null ? void 0 : rootLE.entityAssociations) == null ? void 0 : _a.filter((association2) => association2.associatorId === legalEntityId)) ?? [];
 };
-const getTranslatedDecisionMakerRoles = (i18n, allowedRoles) => Object.values(decisionMakerRoles).filter((decisionMakerRole) => (allowedRoles == null ? void 0 : allowedRoles.length) === 0 || (allowedRoles == null ? void 0 : allowedRoles.includes(decisionMakerRole.id))).map((decisionMakerRole) => ({
-  ...decisionMakerRole,
-  id: decisionMakerRole.id,
-  name: i18n.get(decisionMakerRole.name),
-  description: i18n.get(decisionMakerRole.description)
-}));
-const getOwnDecisionMakers = (legalEntity) => {
-  if (legalEntity == null ? void 0 : legalEntity.entityAssociations) {
-    const decisionMakerTypes = Object.values(DecisionMakerType);
-    return legalEntity.entityAssociations.filter((entityAssociation) => decisionMakerTypes.includes(entityAssociation.type) && entityAssociation.associatorId === legalEntity.id);
-  }
-  return [];
+const getOwnEntityAssociations = (legalEntity) => getDirectEntityAssociations(legalEntity, legalEntity.id);
+const getOwnSoleProprietorshipIdArray = (legalEntity) => {
+  const ownAssociations = getOwnEntityAssociations(legalEntity);
+  return ownAssociations.filter((ea) => ea.entityType === LegalEntityType.SOLE_PROPRIETORSHIP).map((ea) => ea.legalEntityId).filter((id2) => id2 !== void 0);
 };
-const getOwnSignatories = (legalEntity) => getOwnDecisionMakers(legalEntity).filter((decisionMaker2) => decisionMaker2.type === DecisionMakerType.SIGNATORY);
-const getOwnDecisionMakersLegalEntityIds = (legalEntity) => {
+const hasSolePropInLegalEntity = (rootLegalEntity) => {
   var _a;
-  return (_a = getOwnDecisionMakers(legalEntity)) == null ? void 0 : _a.map((ea) => ea.legalEntityId);
+  return ((_a = rootLegalEntity.entityAssociations) == null ? void 0 : _a.some((ea) => ea.entityType === LegalEntityType.SOLE_PROPRIETORSHIP && ea.associatorId === rootLegalEntity.id)) ?? false;
 };
-const getDecisionMakerCount = (legalEntityResponse) => {
-  const decisionMakers2 = getOwnDecisionMakers(legalEntityResponse);
-  return decisionMakers2.reduce((decisionMakerCount, decisionMaker2) => {
-    decisionMakerCount[decisionMaker2.type] = (decisionMakerCount[decisionMaker2.type] ?? 0) + 1;
-    return decisionMakerCount;
-  }, {});
+const getOwnSolePropProblems = (rootLegalEntity, capabilityProblems) => {
+  var _a;
+  const solePropLegalEntityId = getOwnSoleProprietorshipIdArray(rootLegalEntity)[0];
+  return (_a = capabilityProblems == null ? void 0 : capabilityProblems.LegalEntity) == null ? void 0 : _a[solePropLegalEntityId];
 };
-const getAllowedDecisionMakerRoles = (legalEntityResponse, taskType) => {
-  var _a, _b;
-  if (taskType === TaskTypes.TRUST_MEMBER_COMPANY_OWNER) {
-    return [DecisionMakerType.OWNER];
-  }
-  const existingDecisionMakerCount = getDecisionMakerCount(legalEntityResponse);
-  const registeredCountry = (_b = (_a = legalEntityResponse == null ? void 0 : legalEntityResponse.organization) == null ? void 0 : _a.registeredAddress) == null ? void 0 : _b.country;
-  const decisionMakerCountRange = getDecisionMakerRequirements(registeredCountry);
-  const allowedRoles = decisionMakerCountRange.reduce((acc, requirements2) => {
-    const {
-      roleTypes,
-      max
-    } = requirements2;
-    if (roleTypes.length === 1) {
-      const role2 = roleTypes[0];
-      const isBelowMaxRange = ((existingDecisionMakerCount == null ? void 0 : existingDecisionMakerCount[role2]) ?? 0) < max;
-      if (isBelowMaxRange) {
-        acc.push(role2);
-      }
-    }
-    return acc;
-  }, []);
-  const uniqueAllowedRoles = [...new Set(allowedRoles)];
-  return uniqueAllowedRoles;
-};
-const hasMinRequiredDecisionMakerCount = (legalEntityResponse) => {
-  var _a, _b;
-  const existingDecisionMakerCount = getDecisionMakerCount(legalEntityResponse);
-  const registeredCountry = (_b = (_a = legalEntityResponse == null ? void 0 : legalEntityResponse.organization) == null ? void 0 : _a.registeredAddress) == null ? void 0 : _b.country;
-  const decisionMakerCountRange = getDecisionMakerRequirements(registeredCountry);
-  return decisionMakerCountRange.every((requirements2) => {
-    const {
-      roleTypes,
-      min
-    } = requirements2;
-    return roleTypes.some((role2) => min ? (existingDecisionMakerCount == null ? void 0 : existingDecisionMakerCount[role2]) ?? min <= 0 : true);
-  });
-};
-var TrustTypes = /* @__PURE__ */ ((TrustTypes2) => {
-  TrustTypes2["BUSINESS_TRUST"] = "businessTrust";
-  TrustTypes2["CASH_MANAGEMENT_TRUST"] = "cashManagementTrust";
-  TrustTypes2["CHARITABLE_TRUST"] = "charitableTrust";
-  TrustTypes2["CORPORATE_UNIT_TRUST"] = "corporateUnitTrust";
-  TrustTypes2["DECEASED_ESTATE"] = "deceasedEstate";
-  TrustTypes2["DISCRETIONARY_INVESTMENT_TRUST"] = "discretionaryInvestmentTrust";
-  TrustTypes2["DISCRETIONARY_SERVICES_MANAGEMENT_TRUST"] = "discretionaryServicesManagementTrust";
-  TrustTypes2["DISCRETIONARY_TRADING_TRUST"] = "discretionaryTradingTrust";
-  TrustTypes2["DISCRETIONARY_TRUST"] = "discretionaryTrust";
-  TrustTypes2["FAMILY_TRUST"] = "familyTrust";
-  TrustTypes2["FIRST_HOME_SAVER_ACCOUNTS_TRUST"] = "firstHomeSaverAccountsTrust";
-  TrustTypes2["FIXED_TRUST"] = "fixedTrust";
-  TrustTypes2["FIXED_UNIT_TRUST"] = "fixedUnitTrust";
-  TrustTypes2["HYBRID_TRUST"] = "hybridTrust";
-  TrustTypes2["LISTED_PUBLIC_UNIT_TRUST"] = "listedPublicUnitTrust";
-  TrustTypes2["OTHER_TRUST"] = "otherTrust";
-  TrustTypes2["POOLED_SUPERANNUATION_TRUST"] = "pooledSuperannuationTrust";
-  TrustTypes2["PUBLIC_TRADING_TRUST"] = "publicTradingTrust";
-  TrustTypes2["UNLISTED_PUBLIC_UNIT_TRUST"] = "unlistedPublicUnitTrust";
-  return TrustTypes2;
-})(TrustTypes || {});
-const trustTypeOptions = [{
-  id: TrustTypes.BUSINESS_TRUST,
-  name: "businessTrust"
-}, {
-  id: TrustTypes.CASH_MANAGEMENT_TRUST,
-  name: "cashManagementTrust"
-}, {
-  id: TrustTypes.CHARITABLE_TRUST,
-  name: "charitableTrust"
-}, {
-  id: TrustTypes.CORPORATE_UNIT_TRUST,
-  name: "corporateUnitTrust"
-}, {
-  id: TrustTypes.DECEASED_ESTATE,
-  name: "deceasedEstate"
-}, {
-  id: TrustTypes.DISCRETIONARY_INVESTMENT_TRUST,
-  name: "discretionaryInvestmentTrust"
-}, {
-  id: TrustTypes.DISCRETIONARY_SERVICES_MANAGEMENT_TRUST,
-  name: "discretionaryServicesManagementTrust"
-}, {
-  id: TrustTypes.DISCRETIONARY_TRADING_TRUST,
-  name: "discretionaryTradingTrust"
-}, {
-  id: TrustTypes.DISCRETIONARY_TRUST,
-  name: "discretionaryTrust"
-}, {
-  id: TrustTypes.FAMILY_TRUST,
-  name: "familyTrust"
-}, {
-  id: TrustTypes.FIRST_HOME_SAVER_ACCOUNTS_TRUST,
-  name: "firstHomeSaverAccountsTrust"
-}, {
-  id: TrustTypes.FIXED_TRUST,
-  name: "fixedTrust"
-}, {
-  id: TrustTypes.FIXED_UNIT_TRUST,
-  name: "fixedUnitTrust"
-}, {
-  id: TrustTypes.HYBRID_TRUST,
-  name: "hybridTrust"
-}, {
-  id: TrustTypes.LISTED_PUBLIC_UNIT_TRUST,
-  name: "listedPublicUnitTrust"
-}, {
-  id: TrustTypes.OTHER_TRUST,
-  name: "otherTrust"
-}, {
-  id: TrustTypes.POOLED_SUPERANNUATION_TRUST,
-  name: "pooledSuperannuationTrust"
-}, {
-  id: TrustTypes.PUBLIC_TRADING_TRUST,
-  name: "publicTradingTrust"
-}, {
-  id: TrustTypes.UNLISTED_PUBLIC_UNIT_TRUST,
-  name: "unlistedPublicUnitTrust"
-}];
-const nzSpecificTrustTypes = [TrustTypes.DISCRETIONARY_TRUST, TrustTypes.FAMILY_TRUST, TrustTypes.CHARITABLE_TRUST, TrustTypes.BUSINESS_TRUST, TrustTypes.OTHER_TRUST];
-const auSpecificTrustTypes = [TrustTypes.CASH_MANAGEMENT_TRUST, TrustTypes.CORPORATE_UNIT_TRUST, TrustTypes.DECEASED_ESTATE, TrustTypes.DISCRETIONARY_INVESTMENT_TRUST, TrustTypes.DISCRETIONARY_SERVICES_MANAGEMENT_TRUST, TrustTypes.DISCRETIONARY_TRADING_TRUST, TrustTypes.FIRST_HOME_SAVER_ACCOUNTS_TRUST, TrustTypes.FIXED_TRUST, TrustTypes.FIXED_UNIT_TRUST, TrustTypes.HYBRID_TRUST, TrustTypes.LISTED_PUBLIC_UNIT_TRUST, TrustTypes.OTHER_TRUST, TrustTypes.POOLED_SUPERANNUATION_TRUST, TrustTypes.PUBLIC_TRADING_TRUST, TrustTypes.UNLISTED_PUBLIC_UNIT_TRUST];
-const countryToTrustTypes = {
-  [CountryCodes.Australia]: auSpecificTrustTypes,
-  [CountryCodes.NewZealand]: nzSpecificTrustTypes
-};
-const TRUST_MEMBER_COUNT_RANGE = {
-  [TrustMemberTypes.DEFINED_BENEFICIARY]: {
-    min: 1
-  },
-  [TrustMemberTypes.SETTLOR]: {
-    min: 1
-  }
-};
-const isPartOfTrustFromLegalEntity = (legalEntity) => {
-  var _a;
-  return (_a = legalEntity == null ? void 0 : legalEntity.entityAssociations) == null ? void 0 : _a.some((ea) => ea.entityType === LegalEntityType.TRUST && ea.associatorId === legalEntity.id);
-};
-const getRootTrusteeLegalEntityId = (trustEntity) => {
-  var _a;
-  if (!trustEntity.entityAssociations)
-    return "";
-  return (_a = trustEntity.entityAssociations.filter((entityAssociation) => entityAssociation.type === LegalEntityType.TRUST)[0]) == null ? void 0 : _a.legalEntityId;
-};
-const getOwnTrustMembers = (trustEntity) => {
-  if (!trustEntity.entityAssociations)
-    return [];
-  const rootTrusteeLegalEntityId = getRootTrusteeLegalEntityId(trustEntity);
-  return trustEntity.entityAssociations.filter((entityAssociation) => Object.values(TrustMemberTypes).includes(entityAssociation.type) && rootTrusteeLegalEntityId === (entityAssociation == null ? void 0 : entityAssociation.associatorId));
-};
-const getOwnTrustMembersLegalEntityIds = (legalEntity) => getOwnTrustMembers(legalEntity).map((ea) => ea.legalEntityId).filter((id2) => id2 !== void 0);
-const getOwnTrustLegalEntityId = (legalEntity) => {
-  var _a, _b;
-  return (_b = (_a = legalEntity == null ? void 0 : legalEntity.entityAssociations) == null ? void 0 : _a.find((ea) => ea.entityType === LegalEntityType.TRUST && ea.associatorId === legalEntity.id)) == null ? void 0 : _b.legalEntityId;
-};
-const getOwnTrustLegalEntityIdAsArray = (legalEntity) => {
-  const trustLegalEntityId = getOwnTrustLegalEntityId(legalEntity);
-  return trustLegalEntityId ? [trustLegalEntityId] : [];
-};
-const getOwnTrustProblems = (legalEntity, capabilityProblems) => {
-  var _a;
-  const trustLegalEntityId = getOwnTrustLegalEntityId(legalEntity);
-  if (trustLegalEntityId) {
-    return (_a = capabilityProblems == null ? void 0 : capabilityProblems.LegalEntity) == null ? void 0 : _a[trustLegalEntityId];
-  }
-};
-const getTrustMemberCount = (legalEntity) => {
-  const trustMembers2 = getOwnTrustMembers(legalEntity);
-  return trustMembers2.reduce((trustMemberCount, trustMember) => {
-    trustMemberCount[trustMember.type] = (trustMemberCount[trustMember.type] ?? 0) + 1;
-    return trustMemberCount;
-  }, {});
-};
-const hasMinRequiredTrustMemberCount = (legalEntity) => {
-  const existingTrustMemberCount = getTrustMemberCount(legalEntity);
-  const countRangeEntries = Object.entries(TRUST_MEMBER_COUNT_RANGE);
-  return countRangeEntries.every(([trustMemberType, requiredRange]) => requiredRange.min ? (existingTrustMemberCount == null ? void 0 : existingTrustMemberCount[trustMemberType]) ?? requiredRange.min <= 0 : true);
-};
-const makeSelectItemForTrustRole = (role2, i18n) => ({
-  ...trustMemberRoles[role2],
-  name: i18n.get(trustMemberRoles[role2].name),
-  description: i18n.get(trustMemberRoles[role2].description)
-});
-const getTrustMemberName = (trustMemberType) => trustMemberRoles[trustMemberType].name;
-const trustMemberRoles = {
-  [TrustMemberTypes.DEFINED_BENEFICIARY]: {
-    id: TrustMemberTypes.DEFINED_BENEFICIARY,
-    name: "definedBeneficiary",
-    description: "definedBeneficiaryDescription",
-    className: "adl-tag--orange"
-  },
-  [TrustMemberTypes.UNDEFINED_BENEFICIARY]: {
-    id: TrustMemberTypes.UNDEFINED_BENEFICIARY,
-    name: "undefinedBeneficiary",
-    description: "undefinedBeneficiaryDescription",
-    className: "adl-tag--orange"
-  },
-  [TrustMemberTypes.PROTECTOR]: {
-    id: TrustMemberTypes.PROTECTOR,
-    name: "protector",
-    description: "personAppointmentUnderTrustInstrument",
-    className: "adl-tag--orange"
-  },
-  [TrustMemberTypes.TRUSTEE]: {
-    id: TrustMemberTypes.TRUSTEE,
-    name: "trustee",
-    description: "legalOwnerOfProperty",
-    className: "adl-tag--light-blue"
-  },
-  [TrustMemberTypes.SETTLOR]: {
-    id: TrustMemberTypes.SETTLOR,
-    name: "settlor",
-    description: "entityEstablishingTrust",
-    className: "adl-tag--orange"
-  }
-};
-const trustMemberGuidanceRoles = {
-  [TrustMemberGuidanceLabel.BENEFICIARY]: {
-    id: TrustMemberGuidanceLabel.BENEFICIARY,
-    name: TrustMemberGuidanceLabel.BENEFICIARY,
-    className: "adl-tag--orange"
-  },
-  [TrustMemberGuidanceLabel.PROTECTOR]: {
-    id: TrustMemberGuidanceLabel.PROTECTOR,
-    name: TrustMemberGuidanceLabel.PROTECTOR,
-    className: "adl-tag--orange"
-  },
-  [TrustMemberGuidanceLabel.TRUSTEE]: {
-    id: TrustMemberGuidanceLabel.TRUSTEE,
-    name: TrustMemberGuidanceLabel.TRUSTEE,
-    className: "adl-tag--light-blue"
-  },
-  [TrustMemberGuidanceLabel.SETTLOR]: {
-    id: TrustMemberGuidanceLabel.SETTLOR,
-    name: TrustMemberGuidanceLabel.SETTLOR,
-    className: "adl-tag--orange"
-  }
-};
-const getCountrySpecificTrustTypeOptions = (country2) => {
-  const countrySpecificTrustTypes = countryToTrustTypes[country2];
-  if (!countrySpecificTrustTypes) {
-    return [];
-  }
-  return countrySpecificTrustTypes.map((countrySpecificTrustType) => {
-    const countrySpecificTrustTypeOption = trustTypeOptions.find((trustTypeOption) => trustTypeOption.id === countrySpecificTrustType);
-    if (!countrySpecificTrustTypeOption) {
-      throw new Error("getCountrySpecificTrustTypeOptions(): unknown trust type");
-    }
-    return countrySpecificTrustTypeOption;
-  });
-};
-const entityAssociationRoles = {
-  ...trustMemberRoles,
-  ...decisionMakerRoles
-};
-const getEntityAssociationTagColor = (entityAssociationType) => {
-  var _a;
-  return (_a = entityAssociationRoles[entityAssociationType]) == null ? void 0 : _a.className;
-};
-const getEntityAssociationName = (entityAssociationType) => {
-  var _a;
-  return (_a = entityAssociationRoles[entityAssociationType]) == null ? void 0 : _a.name;
-};
-const getOwnEntityAssociations = (legalEntity) => {
-  if (legalEntity == null ? void 0 : legalEntity.entityAssociations) {
-    return legalEntity.entityAssociations.filter((entityAssociation) => entityAssociation.associatorId === legalEntity.id);
-  }
-  return [];
-};
-const getOwnSoleProprietorshipIdArray = (legalEntity) => {
-  const ownAssociations = getOwnEntityAssociations(legalEntity);
-  return ownAssociations.filter((ea) => ea.entityType === LegalEntityType.SOLE_PROPRIETORSHIP).map((ea) => ea.legalEntityId);
-};
-const hasSolePropInLegalEntity = (legalEntity) => {
-  var _a;
-  return (_a = legalEntity == null ? void 0 : legalEntity.entityAssociations) == null ? void 0 : _a.some((ea) => ea.entityType === LegalEntityType.SOLE_PROPRIETORSHIP && ea.associatorId === legalEntity.id);
-};
-const getOwnSolePropProblems = (legalEntity, capabilityProblems) => {
-  var _a;
-  const solePropLegalEntityId = getOwnSoleProprietorshipIdArray(legalEntity)[0];
-  if (solePropLegalEntityId) {
-    return (_a = capabilityProblems == null ? void 0 : capabilityProblems.LegalEntity) == null ? void 0 : _a[solePropLegalEntityId];
-  }
-};
-const hasOwnEntityAssociationOfType = (type, entityAssociations, legalEntityId) => entityAssociations == null ? void 0 : entityAssociations.some((ea) => ea.type === type && ea.associatorId === legalEntityId);
-const removeEntityAssociationByType = (type, entityAssociations, legalEntityId) => entityAssociations == null ? void 0 : entityAssociations.filter((ea) => ea.type !== type || ea.associatorId !== legalEntityId);
+const hasOwnEntityAssociationOfType = (type, entityAssociations, legalEntityId) => (entityAssociations == null ? void 0 : entityAssociations.some((ea) => ea.type === type && ea.associatorId === legalEntityId)) ?? false;
+const removeEntityAssociationByType = (type, entityAssociations, legalEntityId) => entityAssociations.filter((ea) => ea.type !== type || ea.associatorId !== legalEntityId);
 const isRootLegalEntity = (legalEntity, taskType) => legalEntity.type === LegalEntityType.INDIVIDUAL && taskType === TaskTypes.INDIVIDUAL || legalEntity.type === LegalEntityType.ORGANIZATION && taskType === TaskTypes.COMPANY;
 const filterOutUnwantedAssociationsIfRootLE = (taskType, legalEntity, accountHolder2) => {
   if (!(legalEntity == null ? void 0 : legalEntity.entityAssociations)) {
@@ -11953,19 +11551,19 @@ function getNestedPropertyKeys(obj, includeUndefined = false) {
   });
   return fieldNames;
 }
-const getTaskStatus = (type, capabilityProblems, legalEntity, entityIds, skipPendingCapabilitiesCheck = false) => {
-  if (!(entityIds == null ? void 0 : entityIds.length) || entityIds.includes(legalEntity.id) && isEmptyEntity(legalEntity))
+const getTaskStatus = (type, capabilityProblems, rootLegalEntity, entityIds, skipPendingCapabilitiesCheck = false) => {
+  if (!(entityIds == null ? void 0 : entityIds.length) || entityIds.includes(rootLegalEntity.id) && isEmptyEntity(rootLegalEntity))
     return TaskStatus.EMPTY;
   const importantCapabilityStatus = checkForImportantCapabilityStatus(type, capabilityProblems, entityIds);
   if (importantCapabilityStatus)
     return importantCapabilityStatus;
-  if (!skipPendingCapabilitiesCheck && hasPendingCapabilities(legalEntity))
+  if (!skipPendingCapabilitiesCheck && hasPendingCapabilities(rootLegalEntity))
     return TaskStatus.PROCESSING;
   return TaskStatus.FINISHED;
 };
 const IMPORTANT_STATUSES = [TaskStatus.DETAILS_REQUIRED, TaskStatus.DOWNLOAD, TaskStatus.ERROR, TaskStatus.PROCESSING];
 function checkForImportantCapabilityStatus(type, capabilityProblems, entityIds) {
-  if (!(capabilityProblems == null ? void 0 : capabilityProblems[type]))
+  if (!(capabilityProblems == null ? void 0 : capabilityProblems[type]) || !entityIds)
     return;
   const importantStatuses = Object.entries(capabilityProblems[type]).filter(([key]) => entityIds.includes(key)).map(([, value]) => value.status).filter((status) => IMPORTANT_STATUSES.includes(status));
   if (!importantStatuses.length)
@@ -11993,7 +11591,10 @@ function isEmptyEntity(legalEntity) {
   if ((_a = legalEntity.documentDetails) == null ? void 0 : _a.length)
     return false;
   const minimumFields = emptyFieldsByEntityType[type];
-  const fieldsOnEntity = getNestedPropertyKeys(legalEntity[type]);
+  const typeSpecificSection = legalEntity[type];
+  if (!typeSpecificSection)
+    return true;
+  const fieldsOnEntity = getNestedPropertyKeys(typeSpecificSection);
   return !fieldsOnEntity.some((field) => !minimumFields.includes(field));
 }
 const entityTypeToCorrespondingAccountHolderOption = {
@@ -14248,7 +13849,8 @@ function ContactDetailsComponent(props) {
     setState: null
   });
   useEffect(() => {
-    stateRef.current.setState({
+    var _a, _b;
+    (_b = (_a = stateRef == null ? void 0 : stateRef.current) == null ? void 0 : _a.setState) == null ? void 0 : _b.call(_a, {
       type: "addToState",
       value: {
         data,
@@ -14306,86 +13908,86 @@ ContactDetailsComponent.defaultProps = {
   data: {}
 };
 const IdentityNumber$1 = "";
+const CHECKCHARACTER_ODD_VALUE = {
+  0: 1,
+  1: 0,
+  2: 5,
+  3: 7,
+  4: 9,
+  5: 13,
+  6: 15,
+  7: 17,
+  8: 19,
+  9: 21,
+  A: 1,
+  B: 0,
+  C: 5,
+  D: 7,
+  E: 9,
+  F: 13,
+  G: 15,
+  H: 17,
+  I: 19,
+  J: 21,
+  K: 2,
+  L: 4,
+  M: 18,
+  N: 20,
+  O: 11,
+  P: 3,
+  Q: 6,
+  R: 8,
+  S: 12,
+  T: 14,
+  U: 16,
+  V: 10,
+  W: 22,
+  X: 25,
+  Y: 24,
+  Z: 23
+};
+const CHECKCHARACTER_EVEN_VALUE = {
+  0: 0,
+  1: 1,
+  2: 2,
+  3: 3,
+  4: 4,
+  5: 5,
+  6: 6,
+  7: 7,
+  8: 8,
+  9: 9,
+  A: 0,
+  B: 1,
+  C: 2,
+  D: 3,
+  E: 4,
+  F: 5,
+  G: 6,
+  H: 7,
+  I: 8,
+  J: 9,
+  K: 10,
+  L: 11,
+  M: 12,
+  N: 13,
+  O: 14,
+  P: 15,
+  Q: 16,
+  R: 17,
+  S: 18,
+  T: 19,
+  U: 20,
+  V: 21,
+  W: 22,
+  X: 23,
+  Y: 24,
+  Z: 25
+};
 function validCheckCharacter(input, calculationInput) {
   if (!/^[A-Z]$/.test(input)) {
     return false;
   }
-  const CHECKCHARACTER_ODD_VALUE = {
-    0: 1,
-    9: 21,
-    I: 19,
-    R: 8,
-    1: 0,
-    A: 1,
-    J: 21,
-    S: 12,
-    2: 5,
-    B: 0,
-    K: 2,
-    T: 14,
-    3: 7,
-    C: 5,
-    L: 4,
-    U: 16,
-    4: 9,
-    D: 7,
-    M: 18,
-    V: 10,
-    5: 13,
-    E: 9,
-    N: 20,
-    W: 22,
-    6: 15,
-    F: 13,
-    O: 11,
-    X: 25,
-    7: 17,
-    G: 15,
-    P: 3,
-    Y: 24,
-    8: 19,
-    H: 17,
-    Q: 6,
-    Z: 23
-  };
-  const CHECKCHARACTER_EVEN_VALUE = {
-    0: 0,
-    9: 9,
-    I: 8,
-    R: 17,
-    1: 1,
-    A: 0,
-    J: 9,
-    S: 18,
-    2: 2,
-    B: 1,
-    K: 10,
-    T: 19,
-    3: 3,
-    C: 2,
-    L: 11,
-    U: 20,
-    4: 4,
-    D: 3,
-    M: 12,
-    V: 21,
-    5: 5,
-    E: 4,
-    N: 13,
-    W: 22,
-    6: 6,
-    F: 5,
-    O: 14,
-    X: 23,
-    7: 7,
-    G: 6,
-    P: 15,
-    Y: 24,
-    8: 8,
-    H: 7,
-    Q: 16,
-    Z: 25
-  };
   let total = 0;
   for (let i = 0; i < 15; i += 1) {
     const set = i % 2 === 1 ? CHECKCHARACTER_EVEN_VALUE : CHECKCHARACTER_ODD_VALUE;
@@ -14396,14 +13998,8 @@ function validCheckCharacter(input, calculationInput) {
     }
     total = (total + value) % 26;
   }
-  if (total >= 0 && total <= 26 && "ABCDEFGHIJKLMNOPQRSTUVWXYZ".charAt(total) === input) {
-    return true;
-  }
-  return false;
+  return total >= 0 && total <= 26 && "ABCDEFGHIJKLMNOPQRSTUVWXYZ".charAt(total) === input;
 }
-const helper = {
-  validCheckCharacter
-};
 const countryIdNumberFormatters = {
   [CountryCodes.Brazil]: {
     idNumber: {
@@ -14465,7 +14061,7 @@ const countryIdNumberValidationRules = {
   },
   [CountryCodes.Italy]: {
     idNumber: [{
-      validate: (idNumber2) => idNumber2 ? CountryIdNumberPatterns.IT.test(idNumber2) && helper.validCheckCharacter(idNumber2.substring(15, 16), idNumber2.substring(0, 15)) : false,
+      validate: (idNumber2) => idNumber2 ? CountryIdNumberPatterns.IT.test(idNumber2) && validCheckCharacter(idNumber2.substring(15, 16), idNumber2.substring(0, 15)) : false,
       modes: ["blur"],
       errorMessage: "invalidFormatIdentityNumberIT"
     }]
@@ -14529,7 +14125,7 @@ function IdentityNumber(props) {
     dataStoreId,
     country: country2,
     errors: propErrors,
-    data: propData,
+    data: propData = {},
     requiredFields,
     fieldValidationErrors,
     maskedFields,
@@ -14673,32 +14269,106 @@ function IdentityNumber(props) {
   });
 }
 const IdentityNumberComponent = memo(IdentityNumber, (prevProps, nextProps) => prevProps.country === nextProps.country && prevProps.shouldValidate === nextProps.shouldValidate && objectsDeepEqual(prevProps.errors, nextProps.errors) && objectsDeepEqual(prevProps.labels, nextProps.labels) && objectsDeepEqual(prevProps.requiredFields, nextProps.requiredFields) && objectsDeepEqual(prevProps.formVerificationErrors, nextProps.formVerificationErrors) && objectsDeepEqual(prevProps.fieldValidationErrors, nextProps.fieldValidationErrors));
-IdentityNumberComponent.defaultProps = {
-  data: {},
-  onChange: () => {
-  }
-};
-const handleKeys = (keys, callback, propagationMode = "stopIfMatches") => (event) => {
-  if (propagationMode === "stop")
-    event.stopPropagation();
-  if (keys.includes(event.key)) {
-    if (propagationMode === "stopIfMatches")
-      event.stopPropagation();
-    callback();
-  }
-};
-const styles = {
-  "adyen-kyc-multi-select-list": "adyen-kyc-multi-select-list",
-  "adyen-kyc-multi-select-list-item": "adyen-kyc-multi-select-list-item",
-  "adyen-kyc-multi-select-list-item--with-description": "adyen-kyc-multi-select-list-item--with-description",
-  "adyen-kyc-checkbox__label": "adyen-kyc-checkbox__label"
-};
-const MultiSelectList = ({
-  options,
-  selected,
-  onSelect,
-  mapToSelectItem
-}) => jsx("ul", {
+const roleMetadata = {
+  [DecisionMakerType.CONTROLLING_PERSON]: {
+    name: "controllingPerson",
+    description: "controllingPersonDescription",
+    className: "adl-tag--teal"
+  },
+  [DecisionMakerType.OWNER]: {
+    name: "owner",
+    description: "ownerDescription",
+    className: "adl-tag--purple"
+  },
+  [DecisionMakerType.SIGNATORY]: {
+    name: "signatory",
+    description: "signatoryDescription",
+    className: "adl-tag--light-blue"
+  },
+  [DecisionMakerType.DIRECTOR]: {
+    name: "director",
+    description: "directorDescription",
+    className: "adl-tag--orange"
+  },
+  [TrustMemberTypes.DEFINED_BENEFICIARY]: {
+    name: "definedBeneficiary",
+    description: "definedBeneficiaryDescription",
+    className: "adl-tag--orange"
+  },
+  [TrustMemberTypes.UNDEFINED_BENEFICIARY]: {
+    name: "undefinedBeneficiary",
+    description: "undefinedBeneficiaryDescription",
+    className: "adl-tag--orange"
+  },
+  [TrustMemberTypes.PROTECTOR]: {
+    name: "protector",
+    description: "personAppointmentUnderTrustInstrument",
+    className: "adl-tag--orange"
+  },
+  [TrustMemberTypes.TRUSTEE]: {
+    name: "trustee",
+    description: "legalOwnerOfProperty",
+    className: "adl-tag--light-blue"
+  },
+  [TrustMemberTypes.SETTLOR]: {
+    name: "settlor",
+    description: "entityEstablishingTrust",
+    className: "adl-tag--orange"
+  },
+  [TrustMemberGuidanceLabel.BENEFICIARY]: {
+    name: TrustMemberGuidanceLabel.BENEFICIARY,
+    className: "adl-tag--orange"
+  },
+  [TrustMemberGuidanceLabel.TRUSTEE]: {
+    name: TrustMemberGuidanceLabel.TRUSTEE,
+    className: "adl-tag--light-blue"
+  }
+};
+const getRoleTagColor = (role2) => {
+  var _a;
+  return ((_a = roleMetadata[role2]) == null ? void 0 : _a.className) ?? "adl-tag--blue";
+};
+const getRoleName = (role2) => {
+  var _a;
+  return ((_a = roleMetadata[role2]) == null ? void 0 : _a.name) ?? role2;
+};
+const makeSelectItemForRole = (role2, i18n) => {
+  const metadata = roleMetadata[role2];
+  if (!metadata)
+    throw Error(`Cannot make select item for role "${role2}"; no metadata found. Valid roles include: ${Object.keys(roleMetadata).join("\n")}`);
+  const {
+    name,
+    description: description2,
+    className
+  } = metadata;
+  return {
+    id: role2,
+    name: i18n.get(name),
+    description: description2 ? i18n.get(description2) : void 0,
+    className
+  };
+};
+const handleKeys = (keys, callback, propagationMode = "stopIfMatches") => (event) => {
+  if (propagationMode === "stop")
+    event.stopPropagation();
+  if (keys.includes(event.key)) {
+    if (propagationMode === "stopIfMatches")
+      event.stopPropagation();
+    callback();
+  }
+};
+const styles = {
+  "adyen-kyc-multi-select-list": "adyen-kyc-multi-select-list",
+  "adyen-kyc-multi-select-list-item": "adyen-kyc-multi-select-list-item",
+  "adyen-kyc-multi-select-list-item--with-description": "adyen-kyc-multi-select-list-item--with-description",
+  "adyen-kyc-checkbox__label": "adyen-kyc-checkbox__label"
+};
+const MultiSelectList = ({
+  options,
+  selected,
+  onSelect,
+  mapToSelectItem
+}) => jsx("ul", {
   className: styles["adyen-kyc-multi-select-list"],
   children: options.map((option) => {
     const item = mapToSelectItem(option);
@@ -14753,19 +14423,10 @@ const DecisionMakerRoleComponent = (props) => {
     defaultData: dataProp,
     fieldProblems: fieldValidationErrors
   });
-  const [decisionMakerRoles2, setDecisionMakerRoles] = useState([]);
   const stateRef = useRef({
     setState: null
   });
   const formUtils = formUtilities(props, i18n);
-  const allowedRolesString = allowedRoles == null ? void 0 : allowedRoles.toString();
-  const makeSelectItemForDecisionMakerRole = (role2) => {
-    const validRole = decisionMakerRoles2.find((item) => item.id === role2);
-    return {
-      ...validRole,
-      disabled: !(allowedRoles == null ? void 0 : allowedRoles.includes(validRole == null ? void 0 : validRole.id))
-    };
-  };
   const changeRoles = (roles) => {
     handleChangeFor("role", "input")(roles);
   };
@@ -14783,9 +14444,6 @@ const DecisionMakerRoleComponent = (props) => {
       }
     });
   }, [data, valid, errors, isValid, dataStoreId, fieldProblems]);
-  useEffect(() => {
-    setDecisionMakerRoles(getTranslatedDecisionMakerRoles(i18n, allowedRoles));
-  }, [allowedRoles, allowedRolesString, i18n, i18n.languageCode, i18n.locale]);
   return jsxs("div", {
     className: "adyen-kyc-field__role",
     children: [jsx(StateContextSetter, {
@@ -14802,7 +14460,10 @@ const DecisionMakerRoleComponent = (props) => {
         options: allowedRoles ?? [],
         selected: data.role ?? [],
         onSelect: changeRoles,
-        mapToSelectItem: makeSelectItemForDecisionMakerRole
+        mapToSelectItem: (role2) => ({
+          ...makeSelectItemForRole(role2, i18n),
+          disabled: !(allowedRoles == null ? void 0 : allowedRoles.includes(role2))
+        })
       })
     })]
   });
@@ -14945,7 +14606,7 @@ const personalDetailsValidationRules = {
     errorMessage: "fieldIsRequired"
   }, {
     modes: ["blur"],
-    validate: (birthDate2) => birthDate2 && new Date(birthDate2) < /* @__PURE__ */ new Date(),
+    validate: (birthDate2) => !isEmpty(birthDate2) && new Date(birthDate2) < /* @__PURE__ */ new Date(),
     errorMessage: "invalidDateOfBirth"
   }],
   residencyCountry: {
@@ -16444,13 +16105,9 @@ const refreshSession = async () => {
 };
 const addAnimationStartListener = (element, listener) => {
   element.addEventListener("animationstart", listener, false);
-  element.addEventListener("MSAnimationStart", listener, false);
-  element.addEventListener("webkitAnimationStart", listener, false);
 };
 const removeAnimationStartListener = (element, listener) => {
   element.removeEventListener("animationstart", listener, false);
-  element.removeEventListener("MSAnimationStart", listener, false);
-  element.removeEventListener("webkitAnimationStart", listener, false);
 };
 const logger$e = createLogger("Fetch");
 const getRequestObject = (options, data) => {
@@ -16580,6 +16237,8 @@ const httpPost = async (options, data) => http({
 }, data);
 const removeElementSiblings = (element) => {
   const parent = element.parentNode;
+  if (!parent)
+    return;
   let child = parent.firstChild;
   while (child) {
     if (child !== element)
@@ -17258,7 +16917,8 @@ function BankAccountNumber(props) {
     maskedFields: props.maskedFields
   });
   useEffect(() => {
-    stateRef.current.setState({
+    var _a, _b;
+    (_b = (_a = stateRef == null ? void 0 : stateRef.current) == null ? void 0 : _a.setState) == null ? void 0 : _b.call(_a, {
       type: "addToState",
       value: {
         data,
@@ -17322,7 +16982,8 @@ function BankCity(props) {
     fieldProblems: props == null ? void 0 : props.fieldValidationErrors
   });
   useEffect(() => {
-    stateRef.current.setState({
+    var _a, _b;
+    (_b = (_a = stateRef == null ? void 0 : stateRef.current) == null ? void 0 : _a.setState) == null ? void 0 : _b.call(_a, {
       type: "addToState",
       value: {
         data,
@@ -17385,7 +17046,8 @@ function BankCode(props) {
     fieldProblems: props == null ? void 0 : props.fieldValidationErrors
   });
   useEffect(() => {
-    stateRef.current.setState({
+    var _a, _b;
+    (_b = (_a = stateRef == null ? void 0 : stateRef.current) == null ? void 0 : _a.setState) == null ? void 0 : _b.call(_a, {
       type: "addToState",
       value: {
         data,
@@ -17448,7 +17110,8 @@ function BankName(props) {
     fieldProblems: props == null ? void 0 : props.fieldValidationErrors
   });
   useEffect(() => {
-    stateRef.current.setState({
+    var _a, _b;
+    (_b = (_a = stateRef == null ? void 0 : stateRef.current) == null ? void 0 : _a.setState) == null ? void 0 : _b.call(_a, {
       type: "addToState",
       value: {
         data,
@@ -17511,7 +17174,8 @@ function BranchCode(props) {
     fieldProblems: props == null ? void 0 : props.fieldValidationErrors
   });
   useEffect(() => {
-    stateRef.current.setState({
+    var _a, _b;
+    (_b = (_a = stateRef == null ? void 0 : stateRef.current) == null ? void 0 : _a.setState) == null ? void 0 : _b.call(_a, {
       type: "addToState",
       value: {
         data,
@@ -17765,7 +17429,8 @@ function SwiftCode(props) {
     fieldProblems: props == null ? void 0 : props.fieldValidationErrors
   });
   useEffect(() => {
-    stateRef.current.setState({
+    var _a, _b;
+    (_b = (_a = stateRef == null ? void 0 : stateRef.current) == null ? void 0 : _a.setState) == null ? void 0 : _b.call(_a, {
       type: "addToState",
       value: {
         data,
@@ -18841,94 +18506,415 @@ const solePropForms = {
     formName: "constitutionalDocument",
     fields: ["constitutionalDocument"]
   }
-};
-const solePropNameAndCountryFormId = solePropForms.solePropNameAndCountry.formId;
-const solePropRegistrationAddressFormId = solePropForms.solePropRegistrationAddress.formId;
-const solePropRegistrationDetailsFormId = solePropForms.solePropRegistrationDetails.formId;
-const solePropDocumentFormId = solePropForms.solePropConstitutionalDocument.formId;
-function SolePropComponent(props) {
-  const {
-    i18n
-  } = useI18nContext();
-  const {
-    isExperimentEnabled
-  } = useExperimentsContext();
-  const [tradingName2, setTradingName] = useState();
-  const solePropNameAndCountryFormProps = getFormProps(props, solePropNameAndCountryFormId);
-  const solePropsRegistrationDetailsFormProps = getFormProps(props, solePropRegistrationDetailsFormId);
-  const solePropRegistrationAddressFormProps = getFormProps(props, solePropRegistrationAddressFormId);
-  const solePropDocumentsFormProps = getFormProps(props, solePropDocumentFormId);
-  const handleStateChange = ({
-    currentState
-  }) => {
-    var _a, _b, _c;
-    const legalCompanyName2 = (_b = (_a = currentState.data) == null ? void 0 : _a.solePropNameAndCountry) == null ? void 0 : _b.legalCompanyName;
-    setTradingName(((_c = solePropsRegistrationDetailsFormProps == null ? void 0 : solePropsRegistrationDetailsFormProps.data) == null ? void 0 : _c.tradingName) || legalCompanyName2);
-  };
-  const renderActiveForm = (activeForm) => {
-    var _a;
-    return jsxs(Fragment, {
-      children: [jsx(StateContextWatcher, {
-        owner: "SolePropComponent",
-        onChange: handleStateChange
-      }), jsx("div", {
-        className: activeForm.formId !== solePropNameAndCountryFormId ? "adyen-kyc-form-wrapper adyen-kyc-form-wrapper--hidden" : "adyen-kyc-form-wrapper",
-        children: jsx(CompanyNameAndCountryComponent, {
-          ...solePropNameAndCountryFormProps,
-          data: {
-            ...solePropNameAndCountryFormProps == null ? void 0 : solePropNameAndCountryFormProps.data,
-            country: props == null ? void 0 : props.country,
-            legalCompanyName: (_a = solePropNameAndCountryFormProps == null ? void 0 : solePropNameAndCountryFormProps.data) == null ? void 0 : _a.legalCompanyName
-          },
-          labels: {
-            country: "countryOfEstablishment",
-            legalCompanyName: isExperimentEnabled("EnableNewEntryFlow") ? "legalNameOfSoleProprietorship" : "legalNameOfSoleProprietor"
-          },
-          heading: i18n.get("nameAndCountry"),
-          id: solePropNameAndCountryFormId,
-          disableCountry: true,
-          isTopLevelEntity: false
-        })
-      }), jsx("div", {
-        className: activeForm.formId !== solePropRegistrationDetailsFormId ? "adyen-kyc-form-wrapper adyen-kyc-form-wrapper--hidden" : "adyen-kyc-form-wrapper",
-        children: jsx(CompanyRegistrationDetailsComponent, {
-          ...solePropsRegistrationDetailsFormProps,
-          data: {
-            ...solePropsRegistrationDetailsFormProps == null ? void 0 : solePropsRegistrationDetailsFormProps.data,
-            tradingName: tradingName2
-          },
-          heading: i18n.get("registrationDetails"),
-          id: solePropRegistrationDetailsFormId,
-          companyType: CompanyTypesValue.SOLE_PROPRIETORSHIP,
-          country: props.country
-        })
-      }), jsx("div", {
-        className: activeForm.formId !== solePropRegistrationAddressFormId ? "adyen-kyc-form-wrapper adyen-kyc-form-wrapper--hidden" : "adyen-kyc-form-wrapper",
-        children: jsx(RegistrationAddressComponent, {
-          ...solePropRegistrationAddressFormProps,
-          heading: i18n.get("registeredAddress"),
-          id: solePropRegistrationAddressFormId,
-          country: props.country,
-          problems: props == null ? void 0 : props.problems,
-          handleAddressSearch: props.handleAddressSearch,
-          handleFindAddress: props.handleFindAddress
-        })
-      }), jsx("div", {
-        className: activeForm.formId !== solePropDocumentFormId ? "adyen-kyc-form-wrapper adyen-kyc-form-wrapper--hidden" : "adyen-kyc-form-wrapper",
-        children: jsx(ConstitutionalDocumentUpload, {
-          ...solePropDocumentsFormProps,
-          id: solePropDocumentFormId,
-          legalEntityType: LegalEntityType.SOLE_PROPRIETORSHIP
-        })
-      })]
-    });
-  };
-  return jsx("div", {
-    className: "adyen-kyc-sol-prop",
-    children: renderActiveForm(props.activeForm || solePropForms.solePropNameAndCountry)
+};
+const solePropNameAndCountryFormId = solePropForms.solePropNameAndCountry.formId;
+const solePropRegistrationAddressFormId = solePropForms.solePropRegistrationAddress.formId;
+const solePropRegistrationDetailsFormId = solePropForms.solePropRegistrationDetails.formId;
+const solePropDocumentFormId = solePropForms.solePropConstitutionalDocument.formId;
+function SolePropComponent(props) {
+  const {
+    i18n
+  } = useI18nContext();
+  const {
+    isExperimentEnabled
+  } = useExperimentsContext();
+  const [tradingName2, setTradingName] = useState();
+  const solePropNameAndCountryFormProps = getFormProps(props, solePropNameAndCountryFormId);
+  const solePropsRegistrationDetailsFormProps = getFormProps(props, solePropRegistrationDetailsFormId);
+  const solePropRegistrationAddressFormProps = getFormProps(props, solePropRegistrationAddressFormId);
+  const solePropDocumentsFormProps = getFormProps(props, solePropDocumentFormId);
+  const handleStateChange = ({
+    currentState
+  }) => {
+    var _a, _b, _c;
+    const legalCompanyName2 = (_b = (_a = currentState.data) == null ? void 0 : _a.solePropNameAndCountry) == null ? void 0 : _b.legalCompanyName;
+    setTradingName(((_c = solePropsRegistrationDetailsFormProps == null ? void 0 : solePropsRegistrationDetailsFormProps.data) == null ? void 0 : _c.tradingName) || legalCompanyName2);
+  };
+  const renderActiveForm = (activeForm) => {
+    var _a;
+    return jsxs(Fragment, {
+      children: [jsx(StateContextWatcher, {
+        owner: "SolePropComponent",
+        onChange: handleStateChange
+      }), jsx("div", {
+        className: activeForm.formId !== solePropNameAndCountryFormId ? "adyen-kyc-form-wrapper adyen-kyc-form-wrapper--hidden" : "adyen-kyc-form-wrapper",
+        children: jsx(CompanyNameAndCountryComponent, {
+          ...solePropNameAndCountryFormProps,
+          data: {
+            ...solePropNameAndCountryFormProps == null ? void 0 : solePropNameAndCountryFormProps.data,
+            country: props == null ? void 0 : props.country,
+            legalCompanyName: (_a = solePropNameAndCountryFormProps == null ? void 0 : solePropNameAndCountryFormProps.data) == null ? void 0 : _a.legalCompanyName
+          },
+          labels: {
+            country: "countryOfEstablishment",
+            legalCompanyName: isExperimentEnabled("EnableNewEntryFlow") ? "legalNameOfSoleProprietorship" : "legalNameOfSoleProprietor"
+          },
+          heading: i18n.get("nameAndCountry"),
+          id: solePropNameAndCountryFormId,
+          disableCountry: true,
+          isTopLevelEntity: false
+        })
+      }), jsx("div", {
+        className: activeForm.formId !== solePropRegistrationDetailsFormId ? "adyen-kyc-form-wrapper adyen-kyc-form-wrapper--hidden" : "adyen-kyc-form-wrapper",
+        children: jsx(CompanyRegistrationDetailsComponent, {
+          ...solePropsRegistrationDetailsFormProps,
+          data: {
+            ...solePropsRegistrationDetailsFormProps == null ? void 0 : solePropsRegistrationDetailsFormProps.data,
+            tradingName: tradingName2
+          },
+          heading: i18n.get("registrationDetails"),
+          id: solePropRegistrationDetailsFormId,
+          companyType: CompanyTypesValue.SOLE_PROPRIETORSHIP,
+          country: props.country
+        })
+      }), jsx("div", {
+        className: activeForm.formId !== solePropRegistrationAddressFormId ? "adyen-kyc-form-wrapper adyen-kyc-form-wrapper--hidden" : "adyen-kyc-form-wrapper",
+        children: jsx(RegistrationAddressComponent, {
+          ...solePropRegistrationAddressFormProps,
+          heading: i18n.get("registeredAddress"),
+          id: solePropRegistrationAddressFormId,
+          country: props.country,
+          problems: props == null ? void 0 : props.problems,
+          handleAddressSearch: props.handleAddressSearch,
+          handleFindAddress: props.handleFindAddress
+        })
+      }), jsx("div", {
+        className: activeForm.formId !== solePropDocumentFormId ? "adyen-kyc-form-wrapper adyen-kyc-form-wrapper--hidden" : "adyen-kyc-form-wrapper",
+        children: jsx(ConstitutionalDocumentUpload, {
+          ...solePropDocumentsFormProps,
+          id: solePropDocumentFormId,
+          legalEntityType: LegalEntityType.SOLE_PROPRIETORSHIP
+        })
+      })]
+    });
+  };
+  return jsx("div", {
+    className: "adyen-kyc-sol-prop",
+    children: renderActiveForm(props.activeForm || solePropForms.solePropNameAndCountry)
+  });
+}
+const Trust = "";
+var TrustTypes = /* @__PURE__ */ ((TrustTypes2) => {
+  TrustTypes2["BUSINESS_TRUST"] = "businessTrust";
+  TrustTypes2["CASH_MANAGEMENT_TRUST"] = "cashManagementTrust";
+  TrustTypes2["CHARITABLE_TRUST"] = "charitableTrust";
+  TrustTypes2["CORPORATE_UNIT_TRUST"] = "corporateUnitTrust";
+  TrustTypes2["DECEASED_ESTATE"] = "deceasedEstate";
+  TrustTypes2["DISCRETIONARY_INVESTMENT_TRUST"] = "discretionaryInvestmentTrust";
+  TrustTypes2["DISCRETIONARY_SERVICES_MANAGEMENT_TRUST"] = "discretionaryServicesManagementTrust";
+  TrustTypes2["DISCRETIONARY_TRADING_TRUST"] = "discretionaryTradingTrust";
+  TrustTypes2["DISCRETIONARY_TRUST"] = "discretionaryTrust";
+  TrustTypes2["FAMILY_TRUST"] = "familyTrust";
+  TrustTypes2["FIRST_HOME_SAVER_ACCOUNTS_TRUST"] = "firstHomeSaverAccountsTrust";
+  TrustTypes2["FIXED_TRUST"] = "fixedTrust";
+  TrustTypes2["FIXED_UNIT_TRUST"] = "fixedUnitTrust";
+  TrustTypes2["HYBRID_TRUST"] = "hybridTrust";
+  TrustTypes2["LISTED_PUBLIC_UNIT_TRUST"] = "listedPublicUnitTrust";
+  TrustTypes2["OTHER_TRUST"] = "otherTrust";
+  TrustTypes2["POOLED_SUPERANNUATION_TRUST"] = "pooledSuperannuationTrust";
+  TrustTypes2["PUBLIC_TRADING_TRUST"] = "publicTradingTrust";
+  TrustTypes2["UNLISTED_PUBLIC_UNIT_TRUST"] = "unlistedPublicUnitTrust";
+  return TrustTypes2;
+})(TrustTypes || {});
+const trustTypeOptions = [{
+  id: TrustTypes.BUSINESS_TRUST,
+  name: "businessTrust"
+}, {
+  id: TrustTypes.CASH_MANAGEMENT_TRUST,
+  name: "cashManagementTrust"
+}, {
+  id: TrustTypes.CHARITABLE_TRUST,
+  name: "charitableTrust"
+}, {
+  id: TrustTypes.CORPORATE_UNIT_TRUST,
+  name: "corporateUnitTrust"
+}, {
+  id: TrustTypes.DECEASED_ESTATE,
+  name: "deceasedEstate"
+}, {
+  id: TrustTypes.DISCRETIONARY_INVESTMENT_TRUST,
+  name: "discretionaryInvestmentTrust"
+}, {
+  id: TrustTypes.DISCRETIONARY_SERVICES_MANAGEMENT_TRUST,
+  name: "discretionaryServicesManagementTrust"
+}, {
+  id: TrustTypes.DISCRETIONARY_TRADING_TRUST,
+  name: "discretionaryTradingTrust"
+}, {
+  id: TrustTypes.DISCRETIONARY_TRUST,
+  name: "discretionaryTrust"
+}, {
+  id: TrustTypes.FAMILY_TRUST,
+  name: "familyTrust"
+}, {
+  id: TrustTypes.FIRST_HOME_SAVER_ACCOUNTS_TRUST,
+  name: "firstHomeSaverAccountsTrust"
+}, {
+  id: TrustTypes.FIXED_TRUST,
+  name: "fixedTrust"
+}, {
+  id: TrustTypes.FIXED_UNIT_TRUST,
+  name: "fixedUnitTrust"
+}, {
+  id: TrustTypes.HYBRID_TRUST,
+  name: "hybridTrust"
+}, {
+  id: TrustTypes.LISTED_PUBLIC_UNIT_TRUST,
+  name: "listedPublicUnitTrust"
+}, {
+  id: TrustTypes.OTHER_TRUST,
+  name: "otherTrust"
+}, {
+  id: TrustTypes.POOLED_SUPERANNUATION_TRUST,
+  name: "pooledSuperannuationTrust"
+}, {
+  id: TrustTypes.PUBLIC_TRADING_TRUST,
+  name: "publicTradingTrust"
+}, {
+  id: TrustTypes.UNLISTED_PUBLIC_UNIT_TRUST,
+  name: "unlistedPublicUnitTrust"
+}];
+const nzSpecificTrustTypes = [TrustTypes.DISCRETIONARY_TRUST, TrustTypes.FAMILY_TRUST, TrustTypes.CHARITABLE_TRUST, TrustTypes.BUSINESS_TRUST, TrustTypes.OTHER_TRUST];
+const auSpecificTrustTypes = [TrustTypes.CASH_MANAGEMENT_TRUST, TrustTypes.CORPORATE_UNIT_TRUST, TrustTypes.DECEASED_ESTATE, TrustTypes.DISCRETIONARY_INVESTMENT_TRUST, TrustTypes.DISCRETIONARY_SERVICES_MANAGEMENT_TRUST, TrustTypes.DISCRETIONARY_TRADING_TRUST, TrustTypes.FIRST_HOME_SAVER_ACCOUNTS_TRUST, TrustTypes.FIXED_TRUST, TrustTypes.FIXED_UNIT_TRUST, TrustTypes.HYBRID_TRUST, TrustTypes.LISTED_PUBLIC_UNIT_TRUST, TrustTypes.OTHER_TRUST, TrustTypes.POOLED_SUPERANNUATION_TRUST, TrustTypes.PUBLIC_TRADING_TRUST, TrustTypes.UNLISTED_PUBLIC_UNIT_TRUST];
+const countryToTrustTypes = {
+  [CountryCodes.Australia]: auSpecificTrustTypes,
+  [CountryCodes.NewZealand]: nzSpecificTrustTypes
+};
+const DEFAULT_DECISION_MAKER_REQUIREMENTS = [{
+  roleTypes: [DecisionMakerType.OWNER, DecisionMakerType.CONTROLLING_PERSON],
+  min: 1,
+  max: Infinity
+}, {
+  roleTypes: [DecisionMakerType.OWNER],
+  min: 0,
+  max: 4
+}, {
+  roleTypes: [DecisionMakerType.CONTROLLING_PERSON],
+  min: 0,
+  max: Infinity
+}, {
+  roleTypes: [DecisionMakerType.SIGNATORY],
+  min: 1,
+  max: Infinity
+}];
+const PER_COUNTRY_DECISION_MAKER_REQUIREMENTS_OVERRIDES = {
+  US: [{
+    roleTypes: [DecisionMakerType.CONTROLLING_PERSON],
+    min: 1,
+    max: Infinity
+  }, {
+    roleTypes: [DecisionMakerType.OWNER],
+    min: 0,
+    max: 4
+  }, {
+    roleTypes: [DecisionMakerType.SIGNATORY],
+    min: 1,
+    max: Infinity
+  }],
+  BR: [{
+    roleTypes: [DecisionMakerType.CONTROLLING_PERSON],
+    min: 1,
+    max: Infinity
+  }, {
+    roleTypes: [DecisionMakerType.OWNER],
+    min: 0,
+    max: 4
+  }, {
+    roleTypes: [DecisionMakerType.SIGNATORY],
+    min: 1,
+    max: Infinity
+  }],
+  AU: [...DEFAULT_DECISION_MAKER_REQUIREMENTS, {
+    roleTypes: [DecisionMakerType.DIRECTOR],
+    min: 3,
+    max: Infinity
+  }],
+  CA: [...DEFAULT_DECISION_MAKER_REQUIREMENTS, {
+    roleTypes: [DecisionMakerType.DIRECTOR],
+    min: 1,
+    max: Infinity
+  }],
+  HK: [...DEFAULT_DECISION_MAKER_REQUIREMENTS, {
+    roleTypes: [DecisionMakerType.DIRECTOR],
+    min: 1,
+    max: Infinity
+  }],
+  IN: [...DEFAULT_DECISION_MAKER_REQUIREMENTS, {
+    roleTypes: [DecisionMakerType.DIRECTOR],
+    min: 3,
+    max: 15
+  }],
+  NZ: [...DEFAULT_DECISION_MAKER_REQUIREMENTS, {
+    roleTypes: [DecisionMakerType.DIRECTOR],
+    min: 1,
+    max: Infinity
+  }],
+  SG: [...DEFAULT_DECISION_MAKER_REQUIREMENTS, {
+    roleTypes: [DecisionMakerType.DIRECTOR],
+    min: 1,
+    max: Infinity
+  }]
+};
+const getDecisionMakerRequirements = (country2) => {
+  if (!country2)
+    return DEFAULT_DECISION_MAKER_REQUIREMENTS;
+  return PER_COUNTRY_DECISION_MAKER_REQUIREMENTS_OVERRIDES[country2] ?? DEFAULT_DECISION_MAKER_REQUIREMENTS;
+};
+function getAvailableDecisionMakerRoleTypes(country2) {
+  const requirements2 = getDecisionMakerRequirements(country2);
+  return requirements2.filter((req) => req.roleTypes.length === 1).map((req) => ({
+    roleType: req.roleTypes[0],
+    min: req.min,
+    max: req.max
+  }));
+}
+const DEFAULT_DESCRIPTIONS_MAP = {
+  [DecisionMakerType.OWNER]: "provideAllOwners",
+  [DecisionMakerType.CONTROLLING_PERSON]: "ifNoOwnersSpecifyControllingPersons",
+  [DecisionMakerType.DIRECTOR]: "provideAllDirectors",
+  [DecisionMakerType.SIGNATORY]: "provideAtLeastOneSignatory"
+};
+const PER_COUNTRY_DESCRIPTION_OVERRIDES = {
+  US: {
+    [DecisionMakerType.CONTROLLING_PERSON]: "provideOneControllingPerson"
+  },
+  BR: {
+    [DecisionMakerType.CONTROLLING_PERSON]: "provideOneControllingPerson"
+  }
+};
+const getDecisionMakerDescriptionMap = (country2) => ({
+  ...DEFAULT_DESCRIPTIONS_MAP,
+  ...PER_COUNTRY_DESCRIPTION_OVERRIDES[country2]
+});
+const getOwnDecisionMakers = (rootLegalEntity) => {
+  if (!(rootLegalEntity == null ? void 0 : rootLegalEntity.entityAssociations))
+    return [];
+  return rootLegalEntity.entityAssociations.filter((entityAssociation) => Object.values(DecisionMakerType).includes(entityAssociation.type) && entityAssociation.associatorId === rootLegalEntity.id);
+};
+const getDecisionMakers = (rootLegalEntity, companyLegalEntityId) => getDirectEntityAssociations(rootLegalEntity, companyLegalEntityId).filter((association2) => Object.values(DecisionMakerType).includes(association2.type));
+const getOwnSignatories = (rootLegalEntity) => getOwnDecisionMakers(rootLegalEntity).filter((decisionMaker2) => decisionMaker2.type === DecisionMakerType.SIGNATORY);
+const getOwnDecisionMakersLegalEntityIds = (rootLegalEntity) => getOwnDecisionMakers(rootLegalEntity).map((ea) => ea.legalEntityId).filter((id2) => id2 !== void 0);
+const getDecisionMakerCount = (rootLegalEntity) => {
+  const decisionMakers2 = getOwnDecisionMakers(rootLegalEntity);
+  return decisionMakers2.reduce((decisionMakerCount, decisionMaker2) => {
+    decisionMakerCount[decisionMaker2.type] = (decisionMakerCount[decisionMaker2.type] ?? 0) + 1;
+    return decisionMakerCount;
+  }, {});
+};
+const getAllowedDecisionMakerRoles = (rootLegalEntity, taskType) => {
+  var _a, _b;
+  if (taskType === TaskTypes.TRUST_MEMBER_COMPANY_OWNER) {
+    return [DecisionMakerType.OWNER];
+  }
+  const existingDecisionMakerCount = getDecisionMakerCount(rootLegalEntity);
+  const registeredCountry = (_b = (_a = rootLegalEntity == null ? void 0 : rootLegalEntity.organization) == null ? void 0 : _a.registeredAddress) == null ? void 0 : _b.country;
+  const decisionMakerCountRange = getDecisionMakerRequirements(registeredCountry);
+  const allowedRoles = decisionMakerCountRange.reduce((acc, requirements2) => {
+    const {
+      roleTypes,
+      max
+    } = requirements2;
+    if (roleTypes.length === 1) {
+      const role2 = roleTypes[0];
+      const isBelowMaxRange = ((existingDecisionMakerCount == null ? void 0 : existingDecisionMakerCount[role2]) ?? 0) < max;
+      if (isBelowMaxRange) {
+        acc.push(role2);
+      }
+    }
+    return acc;
+  }, []);
+  const uniqueAllowedRoles = [...new Set(allowedRoles)];
+  return uniqueAllowedRoles;
+};
+const hasMinRequiredDecisionMakerCount = (rootLegalEntity) => {
+  var _a, _b;
+  const existingDecisionMakerCount = getDecisionMakerCount(rootLegalEntity);
+  const registeredCountry = (_b = (_a = rootLegalEntity == null ? void 0 : rootLegalEntity.organization) == null ? void 0 : _a.registeredAddress) == null ? void 0 : _b.country;
+  const decisionMakerCountRange = getDecisionMakerRequirements(registeredCountry);
+  return decisionMakerCountRange.every((requirements2) => {
+    const {
+      roleTypes,
+      min
+    } = requirements2;
+    return roleTypes.some((role2) => min ? (existingDecisionMakerCount == null ? void 0 : existingDecisionMakerCount[role2]) ?? min <= 0 : true);
+  });
+};
+const TRUST_MEMBER_COUNT_RANGE = {
+  [TrustMemberTypes.DEFINED_BENEFICIARY]: {
+    min: 1
+  },
+  [TrustMemberTypes.SETTLOR]: {
+    min: 1
+  }
+};
+const isPartOfTrustFromLegalEntity = (legalEntity) => {
+  var _a;
+  return (_a = legalEntity == null ? void 0 : legalEntity.entityAssociations) == null ? void 0 : _a.some((ea) => ea.entityType === LegalEntityType.TRUST && ea.associatorId === legalEntity.id);
+};
+const getTrustLegalEntityId = (rootLegalEntity) => {
+  var _a;
+  if (!rootLegalEntity.entityAssociations)
+    return void 0;
+  return (_a = rootLegalEntity.entityAssociations.find((entityAssociation) => entityAssociation.type === LegalEntityType.TRUST)) == null ? void 0 : _a.legalEntityId;
+};
+const getOwnTrustMembers = (rootLegalEntity) => {
+  const trustLegalEntityId = getTrustLegalEntityId(rootLegalEntity);
+  if (!trustLegalEntityId || !rootLegalEntity.entityAssociations)
+    return [];
+  return rootLegalEntity.entityAssociations.filter((entityAssociation) => Object.values(TrustMemberTypes).includes(entityAssociation.type) && trustLegalEntityId === entityAssociation.associatorId);
+};
+const getOwnTrustMembersLegalEntityIds = (rootLegalEntity) => {
+  const trustLegalEntityId = getOwnTrustLegalEntityId(rootLegalEntity);
+  if (!trustLegalEntityId)
+    return [];
+  const trustMemberAssociations = getDirectEntityAssociations(rootLegalEntity, trustLegalEntityId);
+  const trustMemberIds = trustMemberAssociations.map((association2) => association2.legalEntityId).filter((id2) => id2 !== void 0);
+  return [...trustMemberIds, ...trustMemberIds.flatMap((trustMemberId) => getTrustMemberCompanyDecisionMakerIds(rootLegalEntity, trustMemberId))];
+};
+const getTrustMemberCompanyDecisionMakerIds = (rootLegalEntity, trustMemberCompanyId) => {
+  const decisionMakerAssociations = getDecisionMakers(rootLegalEntity, trustMemberCompanyId);
+  return decisionMakerAssociations.map((association2) => association2.legalEntityId).filter((id2) => id2 !== void 0);
+};
+const getOwnTrustLegalEntityId = (legalEntity) => {
+  var _a, _b;
+  return (_b = (_a = legalEntity == null ? void 0 : legalEntity.entityAssociations) == null ? void 0 : _a.find((ea) => ea.entityType === LegalEntityType.TRUST && ea.associatorId === legalEntity.id)) == null ? void 0 : _b.legalEntityId;
+};
+const getOwnTrustLegalEntityIdAsArray = (legalEntity) => {
+  const trustLegalEntityId = getOwnTrustLegalEntityId(legalEntity);
+  return trustLegalEntityId ? [trustLegalEntityId] : [];
+};
+const getOwnTrustProblems = (legalEntity, capabilityProblems) => {
+  var _a;
+  const trustLegalEntityId = getOwnTrustLegalEntityId(legalEntity);
+  if (trustLegalEntityId) {
+    return (_a = capabilityProblems == null ? void 0 : capabilityProblems.LegalEntity) == null ? void 0 : _a[trustLegalEntityId];
+  }
+};
+const getTrustMemberCount = (rootLegalEntity) => {
+  const trustMembers2 = getOwnTrustMembers(rootLegalEntity);
+  return trustMembers2.reduce((trustMemberCount, trustMember) => {
+    trustMemberCount[trustMember.type] = (trustMemberCount[trustMember.type] ?? 0) + 1;
+    return trustMemberCount;
+  }, {});
+};
+const hasMinRequiredTrustMemberCount = (rootLegalEntity) => {
+  const existingTrustMemberCount = getTrustMemberCount(rootLegalEntity);
+  const countRangeEntries = Object.entries(TRUST_MEMBER_COUNT_RANGE);
+  return countRangeEntries.every(([trustMemberType, requiredRange]) => requiredRange.min ? (existingTrustMemberCount == null ? void 0 : existingTrustMemberCount[trustMemberType]) ?? requiredRange.min <= 0 : true);
+};
+const getCountrySpecificTrustTypeOptions = (country2) => {
+  const countrySpecificTrustTypes = countryToTrustTypes[country2];
+  if (!countrySpecificTrustTypes) {
+    return [];
+  }
+  return countrySpecificTrustTypes.map((countrySpecificTrustType) => {
+    const countrySpecificTrustTypeOption = trustTypeOptions.find((trustTypeOption) => trustTypeOption.id === countrySpecificTrustType);
+    if (!countrySpecificTrustTypeOption) {
+      throw new Error("getCountrySpecificTrustTypeOptions(): unknown trust type");
+    }
+    return countrySpecificTrustTypeOption;
   });
-}
-const Trust = "";
+};
 const ContextHelper$1 = "";
 const ContextHelper = ({
   content
@@ -19194,7 +19180,7 @@ function TrustComponent(props) {
     children: renderActiveForm(props.activeForm || trustForms.trustRegistrationDetails)
   });
 }
-const remediationActionMappings = {
+const invalidInputRemediationActionMappings = {
   "1_100": [],
   "1_101": [],
   "1_102": [{
@@ -19331,6 +19317,7 @@ const remediationActionMappings = {
   }]
 };
 const dataMissingRemediationsToFieldsMap = {
+  "1_501": [DocumentType.REGISTRATION_DOCUMENT],
   "2_158": ["vatNumber", "exemptedFromVat", "vatAbsenceReason"]
 };
 const DATA_MISSING_DECISION_MAKER_ERROR_CODE_MAPPING = {
@@ -19437,7 +19424,7 @@ function setInvalidInputError(parentVerificationError, entityProblems) {
     remediatingActions
   }) => {
     const mappedRemActions = remediatingActions == null ? void 0 : remediatingActions.reduce((acc2, remediatingAction) => {
-      const remMapping = remediationActionMappings[remediatingAction.code];
+      const remMapping = invalidInputRemediationActionMappings[remediatingAction.code];
       if (remMapping) {
         const {
           entityType: entityType2
@@ -20346,7 +20333,7 @@ const nationality = {
   }
 };
 const fieldsPerScenario$1 = {
-  L0: drop(["address", "birthDate"]).from(identityBase),
+  L0: drop("address", "birthDate").from(identityBase),
   L1: identityBase,
   L1_ID: {
     ...identityBase,
@@ -20509,6 +20496,12 @@ const countryConfig = {
     registrationNumber: {
       label: "NZBN"
     }
+  },
+  [CountryCodes.Croatia]: {
+    ...countryConfig$4[CountryCodes.Croatia],
+    registrationNumber: {
+      label: "MBO"
+    }
   }
 };
 function parseIndividualScenarios(scenario, country2) {
@@ -21178,6 +21171,7 @@ function CompanyDropinComponent({
     isSettingEnabled
   } = useSettingsContext();
   const {
+    accountHolder: accountHolder2,
     setAccountHolder
   } = useCoreContext();
   const {
@@ -21239,10 +21233,12 @@ function CompanyDropinComponent({
     });
     onChange == null ? void 0 : onChange(currentState);
   }, [currentState]);
+  const isSkippingCompanyStructure = useEnableNewEntryFlow() && accountHolder2 === "partnershipIncorporated";
   const forms = useMemo(() => {
     const requiredForms = getRequiredForms(companyForms, derivedProps == null ? void 0 : derivedProps.requiredFields, derivedProps == null ? void 0 : derivedProps.optionalFields);
-    return addValidityToForms(requiredForms, formValidity, problems);
-  }, [derivedProps, formValidity, problems]);
+    const validityAddedForms = addValidityToForms(requiredForms, formValidity, problems);
+    return isSkippingCompanyStructure ? validityAddedForms.filter((f) => f.formName !== "companyStructure") : validityAddedForms;
+  }, [derivedProps, formValidity, problems, isSkippingCompanyStructure]);
   const submitDocuments = async ({
     forms: forms2,
     legalEntity,
@@ -21647,6 +21643,8 @@ const useExemptSettlor = ({
     setExemptSettlor(exemptSettlorLE);
   }, [handleGetLegalEntity]);
   useEffect(() => {
+    if (!trust2)
+      return;
     updateExemptSettlor(trust2).catch(logger$8.error);
   }, [trust2, updateExemptSettlor]);
   return exemptSettlor;
@@ -21687,7 +21685,7 @@ const base64ToBlob = (base64, mimeType = "application/octet-stream") => {
   });
 };
 const saveBlobAsFile = (fileData, filename) => {
-  if (typeof window.navigator.msSaveBlob !== "undefined") {
+  if ("msSaveBlob" in window.navigator && typeof window.navigator.msSaveBlob === "function") {
     window.navigator.msSaveBlob(fileData, filename);
   } else {
     const blobUrl = window.URL.createObjectURL(fileData);
@@ -22138,6 +22136,53 @@ function Toast({
     })]
   });
 }
+const getBusinessType = (businessTypeItems, accountHolder2, legalEntityType, companyTypesValue) => {
+  const legalArrangementSuboptions = ["partnershipIncorporated"];
+  const findBusinessType = (id2) => businessTypes.find((bt) => bt.id === id2);
+  if (legalArrangementSuboptions.includes(companyTypesValue ?? "")) {
+    return findBusinessType("legalArrangement");
+  }
+  if (accountHolder2) {
+    if (["aTrust", "partnershipUnincorporated", "anAssociation"].includes(accountHolder2)) {
+      return findBusinessType("legalArrangement");
+    }
+    return businessTypeItems.find((businessTypeItem) => businessTypeItem.accountHolder === accountHolder2);
+  }
+  switch (legalEntityType) {
+    case LegalEntityType.ORGANIZATION:
+      return findBusinessType("company");
+    case LegalEntityType.INDIVIDUAL:
+      return findBusinessType("individual");
+  }
+};
+const mapLegalArrangementOptionToCompanyTypesValue = (legalArrangement) => {
+  switch (legalArrangement) {
+    case "partnershipIncorporated":
+      return CompanyTypesValue.INCORPORATED_PARTNERSHIP;
+    default:
+      return "";
+  }
+};
+const mapCompanyTypesValueToLegalArrangementOption = (companyTypesValue) => {
+  switch (companyTypesValue) {
+    case CompanyTypesValue.INCORPORATED_PARTNERSHIP:
+      return "partnershipIncorporated";
+    default:
+      return void 0;
+  }
+};
+const getTargetLegalEntityType = (businessType, legalArrangement, trusteeType, currentLegalEntityType) => {
+  if (businessType === "legalArrangement" && legalArrangement === "aTrust" && trusteeType === "company" || businessType === "company") {
+    return LegalEntityType.ORGANIZATION;
+  }
+  if (businessType === "legalArrangement" && legalArrangement === "aTrust" && trusteeType === "individual" || businessType === "individual" || businessType === "soleProprietorship") {
+    return LegalEntityType.INDIVIDUAL;
+  }
+  if (legalArrangement === "partnershipIncorporated") {
+    return LegalEntityType.ORGANIZATION;
+  }
+  return currentLegalEntityType;
+};
 const businessTypes = [{
   id: "individual",
   accountHolder: "myName",
@@ -22164,18 +22209,18 @@ const legalArrangementItems = [{
   name: "trust",
   description: "youAreTrusteeManagingTheTrustForBeneficiaries"
 }, {
-  id: "incorporatedPartnership",
-  accountHolder: "incorporatedPartnership",
+  id: "partnershipIncorporated",
+  accountHolder: "theCompanyIWorkFor",
   name: "incorporatedPartnership",
-  description: "incorporatedPartnershipNewEntryFlowDescription"
+  description: "partnershipIncorporatedNewEntryFlowDescription"
 }, {
-  id: "unincorporatedPartnership",
-  accountHolder: "unincorporatedPartnership",
+  id: "partnershipUnincorporated",
+  accountHolder: "theCompanyIWorkFor",
   name: "unincorporatedPartnership",
-  description: "unincorporatedPartnershipNewEntryFlowDescription"
+  description: "partnershipUnincorporatedNewEntryFlowDescription"
 }, {
-  id: "anAssociation",
-  accountHolder: "anAssociation",
+  id: "associationIncorporated",
+  accountHolder: "associationIncorporated",
   name: "associationIncorporatedTitle",
   description: "groupOfPeopleActingTogetherForNonCommercialPurpose"
 }];
@@ -22237,20 +22282,6 @@ const businessTypeSelectionStepTitles = {
     /* CONFIRM_BUSINESS_SETUP_CHANGE */
   ]: "changeYourBusinessSetup"
 };
-const getTargetLegalEntityType = (businessType, legalArrangement, trusteeType, currentLegalEntityType) => {
-  const isIndividual = currentLegalEntityType === LegalEntityType.INDIVIDUAL;
-  const isOrganization = currentLegalEntityType === LegalEntityType.ORGANIZATION;
-  if (isIndividual && businessType === "legalArrangement" && legalArrangement === "aTrust" && trusteeType === "company" || businessType === "company") {
-    return LegalEntityType.ORGANIZATION;
-  }
-  if (isOrganization && businessType === "legalArrangement" && legalArrangement === "aTrust" && trusteeType === "individual" || businessType === "individual" || businessType === "soleProprietorship") {
-    return LegalEntityType.INDIVIDUAL;
-  }
-  if (legalArrangement === "incorporatedPartnership") {
-    return LegalEntityType.ORGANIZATION;
-  }
-  return currentLegalEntityType;
-};
 const BusinessTypeSelection = ({
   legalEntityResponse,
   accountHolder: accountHolder2,
@@ -22259,7 +22290,7 @@ const BusinessTypeSelection = ({
   onAccountHolderSelect,
   handleUpdateLegalEntity
 }) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
   const {
     i18n
   } = useI18nContext();
@@ -22278,21 +22309,11 @@ const BusinessTypeSelection = ({
     /* WE_CANNOT_SET_UP_ACCOUNT */
   ].includes(currentStep);
   const businessTypeItems = getBusinessTypes(showTrustOption, showSolePropOption);
-  const getDefaultBusinessType = () => {
-    if (accountHolder2) {
-      if (["aTrust", "incorporatedPartnership", "unincorporatedPartnership", "anAssociation"].includes(accountHolder2)) {
-        return businessTypeItems.find((businessTypeItem) => businessTypeItem.id === "legalArrangement");
-      }
-      return businessTypeItems.find((businessTypeItem) => businessTypeItem.accountHolder === accountHolder2);
-    }
-    switch (legalEntityResponse.type) {
-      case LegalEntityType.ORGANIZATION:
-        return businessTypeItems.find((businessTypeItem) => businessTypeItem.id === "company");
-      case LegalEntityType.INDIVIDUAL:
-        return businessTypeItems.find((businessTypeItem) => businessTypeItem.id === "individual");
-    }
-  };
-  const getDefaultLegalArrangementType = () => accountHolder2 && legalArrangementItems.find((item) => item.accountHolder === accountHolder2);
+  const currentLegalEntityType = legalEntityResponse == null ? void 0 : legalEntityResponse.type;
+  const currentCompanyTypesValue = (_a = legalEntityResponse == null ? void 0 : legalEntityResponse.organization) == null ? void 0 : _a.type;
+  const defaultBusinessType = getBusinessType(businessTypeItems, accountHolder2, legalEntityResponse == null ? void 0 : legalEntityResponse.type, (_b = legalEntityResponse == null ? void 0 : legalEntityResponse.organization) == null ? void 0 : _b.type);
+  const getDefaultLegalArrangementType = () => legalArrangementItems.find((item) => item.id === mapCompanyTypesValueToLegalArrangementOption(currentCompanyTypesValue));
+  const defaultLegalArrangementType = getDefaultLegalArrangementType();
   const defaultTrusteeType = legalEntityResponse.type === LegalEntityType.INDIVIDUAL ? trusteeTypeItems[0] : trusteeTypeItems[1];
   const {
     handleChangeFor,
@@ -22304,20 +22325,23 @@ const BusinessTypeSelection = ({
   } = useForm({
     schema: formSchema,
     defaultData: {
-      businessType: getDefaultBusinessType(),
-      legalArrangement: getDefaultLegalArrangementType(),
+      businessType: defaultBusinessType,
+      legalArrangement: defaultLegalArrangementType,
       trusteeType: defaultTrusteeType
     },
     rules: businessTypeSelectionValidationRules
   });
-  const newAccountHolder = ((_a = data.businessType) == null ? void 0 : _a.accountHolder) || ((_b = data.legalArrangement) == null ? void 0 : _b.accountHolder);
-  const targetLegalEntityType = getTargetLegalEntityType((_c = data.businessType) == null ? void 0 : _c.id, (_d = data.legalArrangement) == null ? void 0 : _d.id, (_e = data.trusteeType) == null ? void 0 : _e.id, legalEntityResponse == null ? void 0 : legalEntityResponse.type);
+  const newAccountHolder = ((_c = data.businessType) == null ? void 0 : _c.accountHolder) || ((_d = data.legalArrangement) == null ? void 0 : _d.accountHolder);
+  const targetLegalArrangement = (_e = data.legalArrangement) == null ? void 0 : _e.id;
+  const targetLegalEntityType = getTargetLegalEntityType((_f = data.businessType) == null ? void 0 : _f.id, (_g = data.legalArrangement) == null ? void 0 : _g.id, (_h = data.trusteeType) == null ? void 0 : _h.id, legalEntityResponse == null ? void 0 : legalEntityResponse.type);
+  const isLegalEntityTypeChanging = currentLegalEntityType !== targetLegalEntityType;
+  const isLegalArrangementChanging = currentCompanyTypesValue !== targetLegalArrangement;
   useEffect(() => {
     var _a2, _b2;
     setFormSchema(getFormSchema(((_a2 = data.businessType) == null ? void 0 : _a2.id) === "legalArrangement" && !!data.legalArrangement || currentStep === 1, ((_b2 = data.legalArrangement) == null ? void 0 : _b2.id) === "aTrust"));
   }, [data.businessType, data.legalArrangement, currentStep]);
   const handleNextClick = async () => {
-    var _a2, _b2;
+    var _a2;
     if (loadingStatus === "loading")
       return;
     triggerValidation();
@@ -22330,8 +22354,7 @@ const BusinessTypeSelection = ({
           );
           return;
         }
-        const legalArrangementId = (_b2 = data.legalArrangement) == null ? void 0 : _b2.id;
-        if (legalArrangementId === "anAssociation" || legalArrangementId === "unincorporatedPartnership") {
+        if (targetLegalArrangement === "associationIncorporated" || targetLegalArrangement === "partnershipUnincorporated") {
           setCurrentStep(
             2
             /* WE_CANNOT_SET_UP_ACCOUNT */
@@ -22339,49 +22362,46 @@ const BusinessTypeSelection = ({
           return;
         }
       }
-    }
-    if (newAccountHolder !== accountHolder2 || targetLegalEntityType !== legalEntityResponse.type) {
-      if (accountHolder2) {
-        setCurrentStep(
-          3
-          /* CONFIRM_BUSINESS_SETUP_CHANGE */
-        );
+      if (newAccountHolder !== accountHolder2 || isLegalEntityTypeChanging) {
+        if (accountHolder2) {
+          setCurrentStep(
+            3
+            /* CONFIRM_BUSINESS_SETUP_CHANGE */
+          );
+          return;
+        }
+        await updateLegalEntityAndSelectAccountHolder();
       } else {
+        onAccountHolderSelect(newAccountHolder);
+      }
+      if (isLegalArrangementChanging) {
         await updateLegalEntityAndSelectAccountHolder();
       }
-    } else {
-      onAccountHolderSelect(newAccountHolder);
     }
   };
   const updateLegalEntityAndSelectAccountHolder = async () => {
-    var _a2;
-    const selectedLegalArrangement = (_a2 = data.legalArrangement) == null ? void 0 : _a2.id;
     try {
-      if (legalEntityResponse.type !== targetLegalEntityType) {
+      if (isLegalEntityTypeChanging) {
         setLoadingStatus("loading");
         const updateLegalEntityPayload = {
           type: targetLegalEntityType
         };
         await (handleUpdateLegalEntity == null ? void 0 : handleUpdateLegalEntity(updateLegalEntityPayload, legalEntityResponse == null ? void 0 : legalEntityResponse.id));
-        if (selectedLegalArrangement === "incorporatedPartnership") {
-          await (handleUpdateLegalEntity == null ? void 0 : handleUpdateLegalEntity({
-            type: LegalEntityType.ORGANIZATION
-          }, legalEntityResponse == null ? void 0 : legalEntityResponse.id));
+        if (targetLegalEntityType === LegalEntityType.ORGANIZATION && targetLegalEntityType) {
           await (handleUpdateLegalEntity == null ? void 0 : handleUpdateLegalEntity({
             organization: {
-              type: CompanyTypesValue.INCORPORATED_PARTNERSHIP
-            }
-          }, legalEntityResponse == null ? void 0 : legalEntityResponse.id));
-        }
-      } else if (newAccountHolder !== accountHolder2) {
-        if (newAccountHolder === "theCompanyIWorkFor") {
-          await (handleUpdateLegalEntity == null ? void 0 : handleUpdateLegalEntity({
-            organization: {
-              type: ""
+              type: mapLegalArrangementOptionToCompanyTypesValue(targetLegalArrangement)
             }
           }, legalEntityResponse == null ? void 0 : legalEntityResponse.id));
         }
       }
+      if (isLegalArrangementChanging) {
+        await (handleUpdateLegalEntity == null ? void 0 : handleUpdateLegalEntity({
+          organization: {
+            type: mapLegalArrangementOptionToCompanyTypesValue(targetLegalArrangement)
+          }
+        }, legalEntityResponse == null ? void 0 : legalEntityResponse.id));
+      }
     } catch (e) {
       showToast({
         label: i18n.get("failedToUpdateDetails"),
@@ -22413,15 +22433,19 @@ const BusinessTypeSelection = ({
     showSpinner: false,
     children: jsxs("div", {
       className: "adyen-kyc-business-type-selection",
-      children: [jsx("header", {
-        children: jsx(Heading, {
+      children: [jsxs("header", {
+        className: "adl-u-margin-bottom-32",
+        children: [jsx(Heading, {
           level: 1,
           children: i18n.get(businessTypeSelectionStepTitles[currentStep])
-        })
+        }), currentStep === 3 && jsx(Heading, {
+          level: "sub",
+          children: i18n.get("someInformationWillNotBeSaved")
+        })]
       }), currentStep === 0 && jsx(Field, {
         name: "businessType",
         useLabelElement: false,
-        errorMessage: i18n.get((_f = errors.businessType) == null ? void 0 : _f.errorMessage),
+        errorMessage: i18n.get((_i = errors.businessType) == null ? void 0 : _i.errorMessage),
         showErrorIconBottom: true,
         isValid: valid.businessType,
         children: (childProps) => jsx(RadioGroupCard, {
@@ -22438,7 +22462,7 @@ const BusinessTypeSelection = ({
         children: [jsx(Field, {
           name: "legalArrangement",
           useLabelElement: false,
-          errorMessage: i18n.get((_g = errors.legalArrangement) == null ? void 0 : _g.errorMessage),
+          errorMessage: i18n.get((_j = errors.legalArrangement) == null ? void 0 : _j.errorMessage),
           showErrorIconBottom: true,
           isValid: valid.legalArrangement,
           children: (childProps) => jsx(RadioGroupCard, {
@@ -22451,18 +22475,17 @@ const BusinessTypeSelection = ({
             }),
             onSelect: (item) => handleChangeFor("legalArrangement")(item)
           })
-        }), ((_h = data.legalArrangement) == null ? void 0 : _h.id) === "aTrust" && jsx(Field, {
+        }), ((_k = data.legalArrangement) == null ? void 0 : _k.id) === "aTrust" && jsx(Field, {
           name: "trusteeType",
           label: i18n.get("whatTypeOfTrusteeAreYou"),
           className: "adl-u-margin-top-32",
           useLabelElement: false,
-          errorMessage: i18n.get((_i = errors.trusteeType) == null ? void 0 : _i.errorMessage),
+          errorMessage: i18n.get((_l = errors.trusteeType) == null ? void 0 : _l.errorMessage),
           showErrorIconBottom: true,
           isValid: valid.trusteeType,
           children: (childProps) => jsx(RadioGroupCard, {
-            className: "adyen-kyc-trustee-type-radio-group-card",
-            itemLabelClassName: () => "adl-u-width-full",
             ...childProps,
+            className: "adyen-kyc-trustee-type-radio-group-card",
             name: "trusteeType",
             items: trusteeTypeItems,
             selected: trusteeTypeItems.find((type) => {
@@ -22479,24 +22502,20 @@ const BusinessTypeSelection = ({
           className: "u-margin-top-32",
           children: i18n.get("needHelpYouCanAlwaysReachOutToCustomerSupport")
         })]
-      }), currentStep === 3 ? jsxs(Fragment, {
-        children: [jsx("p", {
-          children: i18n.get("someInformationWillNotBeSaved")
-        }), jsxs("div", {
-          className: "adyen-kyc-business-type-selection__confirm",
-          children: [jsx(Button, {
-            label: i18n.get("cancel"),
-            secondary: true,
-            onClick: () => setCurrentStep(
-              0
-              /* BUSINESS_TYPE_SELECTION */
-            ),
-            type: "button"
-          }), jsx(Button, {
-            label: i18n.get("yesChange"),
-            onClick: () => updateLegalEntityAndSelectAccountHolder(),
-            type: "button"
-          })]
+      }), currentStep === 3 ? jsxs("div", {
+        className: "adyen-kyc-business-type-selection__confirm",
+        children: [jsx(Button, {
+          label: i18n.get("cancel"),
+          secondary: true,
+          onClick: () => setCurrentStep(
+            0
+            /* BUSINESS_TYPE_SELECTION */
+          ),
+          type: "button"
+        }), jsx(Button, {
+          label: i18n.get("yesChange"),
+          onClick: () => updateLegalEntityAndSelectAccountHolder(),
+          type: "button"
         })]
       }) : jsxs("div", {
         className: "adyen-kyc-business-type-selection__nav",
@@ -22561,18 +22580,6 @@ const iconStatus = (current, min, max) => {
   }
   return isWithinConditionalRange ? "conditionalFinished" : "conditionalEmpty";
 };
-const entityStatusRoles = {
-  ...decisionMakerRoles,
-  ...trustMemberGuidanceRoles
-};
-const getEntityStatusTagColor = (entityLabel) => {
-  var _a;
-  return (_a = entityStatusRoles[entityLabel]) == null ? void 0 : _a.className;
-};
-const getEntityStatusName = (entityLabel) => {
-  var _a;
-  return (_a = entityStatusRoles[entityLabel]) == null ? void 0 : _a.name;
-};
 const getEntityStatusRuleDescription = (country2, currentTask, entityLabel) => currentTask === TaskTypes.TRUST_MEMBER_OVERVIEW ? TRUST_DEFAULT_DESCRIPTIONS_MAP[entityLabel] : getDecisionMakerDescriptionMap(country2)[entityLabel];
 const _cardGroup_component = "";
 function CardGroup({
@@ -22981,9 +22988,9 @@ const EntityAssociation = ({
       })]
     }), jsx("div", {
       children: types.map((type) => jsx(Tag, {
-        className: `adl-entity-association__tag ${getEntityAssociationTagColor(type)}`,
+        className: `adl-entity-association__tag ${getRoleTagColor(type)}`,
         isBasic: true,
-        children: i18n.get(getEntityAssociationName(type))
+        children: i18n.get(getRoleName(type))
       }, type))
     }), status === TaskStatus.ERROR && jsx(VerificationErrorAlert, {
       className: "adl-entity-association-alert",
@@ -23071,9 +23078,9 @@ const EntityGuidanceStatus = ({
     children: [jsx(EntityStatusIcon, {
       status
     }), jsx(Tag, {
-      className: `adl-entity-status__tag ${getEntityStatusTagColor(entityLabel)}`,
+      className: `adl-entity-status__tag ${getRoleTagColor(entityLabel)}`,
       isBasic: true,
-      children: i18n.get(getEntityStatusName(entityLabel))
+      children: i18n.get(getRoleName(entityLabel))
     }, entityLabel), jsx("span", {
       className: "adl-entity-status--text",
       "data-testid": `${entityLabel}-rule--description`,
@@ -23465,7 +23472,7 @@ function LegalEntityTypeSwitcher({
   const {
     i18n
   } = useI18nContext();
-  const [loadingStatus, setLoadingStatus] = useState(null);
+  const [loadingStatus, setLoadingStatus] = useState();
   const {
     showToast
   } = useToastContext();
@@ -23516,7 +23523,7 @@ function LegalEntityTypeSwitcher({
           })]
         });
       default:
-        jsx("p", {
+        return jsx("p", {
           children: "Change not supported"
         });
     }
@@ -23617,26 +23624,29 @@ const businessTypeMapping = {
     /* COMPANY_TRUSTEE */
   }
 };
+const companyTypesMapping = {
+  [CompanyTypesValue.INCORPORATED_PARTNERSHIP]: "incorporatedPartnership",
+  [CompanyTypesValue.PUBLIC_COMPANY]: "company",
+  [CompanyTypesValue.PRIVATE_COMPANY]: "company",
+  [CompanyTypesValue.UNLISTED_PUBLIC_COMPANY]: "company",
+  [CompanyTypesValue.INCORPORATED_ASSOCIATION]: "company",
+  [CompanyTypesValue.GOVERNMENTAL_ORGANIZATION]: "company",
+  [CompanyTypesValue.NON_PROFIT_OR_CHARITABLE]: "company",
+  [CompanyTypesValue.SOLE_PROPRIETORSHIP]: "soleProprietorship"
+  /* SOLE_PROPRIETORSHIP */
+};
 const useBusinessSetup = (legalEntityResponse) => {
-  var _a;
+  var _a, _b;
   const {
     accountHolder: accountHolder2
   } = useCoreContext();
   const accountHolderType = accountHolder2 || getDefaultAccountHolderType(legalEntityResponse);
-  const businessSetup = (_a = businessTypeMapping[accountHolderType]) == null ? void 0 : _a[legalEntityResponse == null ? void 0 : legalEntityResponse.type];
+  const organizationType = (_a = legalEntityResponse == null ? void 0 : legalEntityResponse.organization) == null ? void 0 : _a.type;
+  const businessSetup = accountHolderType === "theCompanyIWorkFor" && organizationType ? companyTypesMapping[organizationType] : (_b = businessTypeMapping[accountHolderType]) == null ? void 0 : _b[legalEntityResponse == null ? void 0 : legalEntityResponse.type];
   return {
-    businessSetup: businessSetup || accountHolder2
+    businessSetup
   };
 };
-const useEnableNewEntryFlow = () => {
-  const {
-    isSettingEnabled
-  } = useSettingsContext();
-  const {
-    isExperimentEnabled
-  } = useExperimentsContext();
-  return isSettingEnabled(SettingNames.AllowLegalEntityTypeChange) && isExperimentEnabled("EnableNewEntryFlow");
-};
 const hasPayoutAccount = (legalEntityResponse) => {
   var _a;
   return Boolean((_a = legalEntityResponse.transferInstruments) == null ? void 0 : _a.length);
@@ -24552,11 +24562,12 @@ function IndividualDropinComponent({
   };
   const attachAssociationToParentLegalEntity = async ({
     legalEntity,
+    parentLE,
     dataSubmitted
   }) => {
     var _a2;
     const newRoles = taskType === TaskTypes.DECISION_MAKER || taskType === TaskTypes.TRUST_MEMBER_COMPANY_OWNER ? (_a2 = dataSubmitted == null ? void 0 : dataSubmitted.personalDetails) == null ? void 0 : _a2.role : taskType === TaskTypes.TRUST_MEMBER_INDIVIDUAL ? trustMember == null ? void 0 : trustMember.roles : null;
-    const existingEntityAssociations = getOwnEntityAssociations(parentLegalEntity);
+    const existingEntityAssociations = getOwnEntityAssociations(parentLE);
     if (newRoles && hasRolesChanged(legalEntity, existingEntityAssociations, newRoles)) {
       const updatedParentLegalEntity = {
         entityAssociations: [...newRoles.map((role2) => {
@@ -24568,7 +24579,7 @@ function IndividualDropinComponent({
           };
         }) || [], ...existingEntityAssociations.filter((ea) => ea.legalEntityId !== legalEntity.id) || []]
       };
-      await handleUpdateLegalEntity(updatedParentLegalEntity, parentLegalEntity.id);
+      await handleUpdateLegalEntity(updatedParentLegalEntity, parentLE.id);
     }
   };
   const onSubmit = async () => {
@@ -24601,10 +24612,13 @@ function IndividualDropinComponent({
         legalEntity: createdLegalEntity,
         dataSubmitted
       });
-      await attachAssociationToParentLegalEntity({
-        legalEntity: createdLegalEntity,
-        dataSubmitted
-      });
+      if (parentLegalEntity) {
+        await attachAssociationToParentLegalEntity({
+          legalEntity: createdLegalEntity,
+          parentLE: parentLegalEntity,
+          dataSubmitted
+        });
+      }
       if (taskType === TaskTypes.INDIVIDUAL) {
         setAccountHolder((_b2 = dataSubmitted == null ? void 0 : dataSubmitted.personalDetails) == null ? void 0 : _b2.accountHolder);
       }
@@ -25355,7 +25369,7 @@ function InternalReference({
   const label = displayText ? displayText.content : referencedLabel;
   const scrollIntoView = () => {
     const scrollParent = getScrollParent(document.getElementById(referencedLabel));
-    const element = scrollParent !== -1 && scrollParent.querySelector(`#${referencedLabel}`);
+    const element = scrollParent == null ? void 0 : scrollParent.querySelector(`#${referencedLabel}`);
     element == null ? void 0 : element.scrollIntoView({
       behavior: "smooth"
     });
@@ -25486,78 +25500,82 @@ const Weblink = ({
     ...displayText
   }) : url
 });
+const components = {
+  chapter: Chapter,
+  section: Section,
+  paragraph: Paragraph,
+  text: Text,
+  weblink: Weblink,
+  list: ListElement,
+  table: Table,
+  internalReference: InternalReference,
+  breakline: "br"
+};
+const getKey = (type) => `key-${type}-${getUniqueId()}`;
+const getProps = (element, isTopLevel) => {
+  if (!("type" in element))
+    return null;
+  switch (element.type) {
+    case ElementTypes.Chapter:
+      return {
+        title: element.title,
+        contentElements: element.contentElements
+      };
+    case ElementTypes.Section:
+      return {
+        isTopLevel,
+        title: element.title,
+        label: element.label,
+        contentElements: element.contentElements
+      };
+    case ElementTypes.Paragraph:
+      return {
+        isTopLevel,
+        contentElements: element.contentElements
+      };
+    case ElementTypes.Text:
+      return {
+        content: element.content,
+        styles: element.styles
+      };
+    case ElementTypes.Weblink:
+      return {
+        url: element.url,
+        displayText: element.displayText
+      };
+    case ElementTypes.List:
+      return {
+        items: element.items,
+        style: element.style
+      };
+    case ElementTypes.Table:
+      return {
+        rows: element.rows,
+        label: element.label,
+        captions: element.captions,
+        titlePrefix: element.titlePrefix,
+        title: element.title
+      };
+    case ElementTypes.InternalReference:
+      return {
+        referencedLabel: element.referencedLabel,
+        displayText: element.displayText
+      };
+    default:
+      return null;
+  }
+};
 function ContentElements({
   contentElements,
   isTopLevel = false,
   onExpandSection
 }) {
-  const components = {
-    chapter: Chapter,
-    section: Section,
-    paragraph: Paragraph,
-    text: Text,
-    weblink: Weblink,
-    list: ListElement,
-    table: Table,
-    internalReference: InternalReference,
-    breakline: "br"
-  };
-  const getKey = (type) => `key-${type}-${getUniqueId()}`;
-  const getProps = (element) => {
-    switch (element.type) {
-      case ElementTypes.Chapter:
-        return {
-          title: element.title,
-          contentElements: element.contentElements
-        };
-      case ElementTypes.Section:
-        return {
-          isTopLevel,
-          title: element.title,
-          label: element.label,
-          contentElements: element.contentElements
-        };
-      case ElementTypes.Paragraph:
-        return {
-          isTopLevel,
-          contentElements: element.contentElements
-        };
-      case ElementTypes.Text:
-        return {
-          content: element.content,
-          styles: element.styles
-        };
-      case ElementTypes.Weblink:
-        return {
-          url: element.url,
-          displayText: element.displayText
-        };
-      case ElementTypes.List:
-        return {
-          items: element.items,
-          style: element.style
-        };
-      case ElementTypes.Table:
-        return {
-          rows: element.rows,
-          label: element.label,
-          captions: element.captions,
-          titlePrefix: element.titlePrefix,
-          title: element.title
-        };
-      case ElementTypes.InternalReference:
-        return {
-          referencedLabel: element.referencedLabel,
-          displayText: element.displayText
-        };
-      default:
-        return null;
-    }
-  };
   const elements = contentElements.map((contentElement) => {
+    if (!("type" in contentElement))
+      return null;
     const Component = components[contentElement.type];
     return jsx(Component, {
-      ...getProps(contentElement)
+      ...getProps(contentElement, isTopLevel)
     }, getKey(contentElement.type));
   });
   return isTopLevel ? jsx(Accordion, {
@@ -25592,7 +25610,7 @@ function ContractViewer({
 const pciValidationRules = {
   signer: {
     modes: ["blur"],
-    validate: (signer2) => !!signer2,
+    validate: (signer2) => !isEmpty(signer2),
     errorMessage: "fieldIsRequired"
   },
   acceptPci: {
@@ -25607,7 +25625,7 @@ function PciDropinComponent({
   pciTemplateResponse,
   handleHomeClick,
   handleSign,
-  taskType,
+  taskType = TaskTypes.PCI_DSS,
   eventEmitter,
   trackingConfig
 }) {
@@ -25624,7 +25642,7 @@ function PciDropinComponent({
     legalEntity: legalEntityResponse,
     task: taskType
   });
-  const [loadingStatus, setLoadingStatus] = useState(null);
+  const [loadingStatus, setLoadingStatus] = useState();
   const {
     handleChangeFor,
     triggerValidation,
@@ -25641,15 +25659,15 @@ function PciDropinComponent({
   } = pciTemplateResponse;
   const pciQuestionnaire = JSON.parse(decodeURIComponent(escape(window.atob(pciTemplateResponse.content))));
   const uniqueEntityAssociations = [...new Map(getOwnDecisionMakers(legalEntityResponse).map((entityAssociation) => [entityAssociation.legalEntityId, entityAssociation])).values()];
-  const signers = legalEntityResponse.type === LegalEntityType.ORGANIZATION ? uniqueEntityAssociations.map(({
+  const signers = legalEntityResponse.type === LegalEntityType.ORGANIZATION ? uniqueEntityAssociations.filter((ea) => Boolean(ea.legalEntityId && ea.name)).map(({
     legalEntityId: id2,
     name
   }) => ({
     id: id2,
     name
   })) : [{
-    id: legalEntityResponse == null ? void 0 : legalEntityResponse.id,
-    name: `${(_a = legalEntityResponse == null ? void 0 : legalEntityResponse.individual) == null ? void 0 : _a.name.firstName} ${(_b = legalEntityResponse == null ? void 0 : legalEntityResponse.individual) == null ? void 0 : _b.name.lastName}`
+    id: legalEntityResponse.id,
+    name: `${(_a = legalEntityResponse == null ? void 0 : legalEntityResponse.individual) == null ? void 0 : _a.name.firstName} ${(_b = legalEntityResponse.individual) == null ? void 0 : _b.name.lastName}`
   }];
   const handleSignClick = async () => {
     if (loadingStatus === "loading")
@@ -25767,7 +25785,7 @@ function PciDropinComponent({
       children: (childProps) => jsx(Checkbox, {
         ...childProps,
         label: acceptPciLabel,
-        checked: data.acceptPci,
+        checked: data.acceptPci ?? false,
         name: "acceptPci",
         onChange: handleChangeFor("acceptPci")
       })
@@ -26111,7 +26129,7 @@ const TrustRoleAndEntityType = (props) => {
         selected: data.role ?? [],
         onSelect: changeRoles,
         mapToSelectItem: (role2) => ({
-          ...makeSelectItemForTrustRole(role2, i18n),
+          ...makeSelectItemForRole(role2, i18n),
           disabled: !availableRoles.includes(role2)
         })
       })
@@ -26190,7 +26208,7 @@ const TrustRoleAndEntityType = (props) => {
         labels: formUtils.getFieldLabels(COUNTRY_FIELD),
         readonly: false,
         classNameModifiers: COUNTRY_FIELD,
-        allowedCountries: [],
+        allowedCountries: void 0,
         handleChangeFor
       }), jsx(LegalCompanyNameField, {
         data: formUtils.getFieldData(data, LEGAL_COMPANY_NAME_FIELD),
@@ -26339,7 +26357,7 @@ function RoleAndTypeDropinComponent({
   });
   const [activeForm, setActiveForm] = useState(regularForms.roleAndEntityType);
   const isSummaryStep = activeForm.formId === summaryStep.formId;
-  const formatRolesForSummary = (roles) => roles.map((role2) => i18n.get(getTrustMemberName(role2))).join(", ");
+  const formatRolesForSummary = (roles) => roles.map((role2) => i18n.get(getRoleName(role2))).join(", ");
   const formatSettlorExemptionReasonsForSummary = (reasons) => reasons.map((reason) => i18n.get(reason)).join(", ");
   const summaryData = trustMember === "incomplete" ? {} : {
     roleAndEntityType: {
@@ -26513,7 +26531,8 @@ const serviceAgreementTypesTranslationMapping = {
   adyenCapital: "capitalUserTerms",
   adyenAccount: "businessAccountTerms",
   adyenCard: "cardUserTerms",
-  adyenFranchisee: "franchiseesTAndCs"
+  adyenFranchisee: "franchiseesTAndCs",
+  adyenPccr: "pccr"
 };
 function ServiceAgreementDropinComponent({
   legalEntityResponse,
@@ -26741,7 +26760,7 @@ function ServiceAgreementDropinComponent({
   });
 }
 function removeObjectPropsWithEmptyValues(obj) {
-  Object.keys(obj).forEach((key) => {
+  keysOf(obj).forEach((key) => {
     if (obj[key] === null || isEmpty(obj[key]))
       delete obj[key];
   });
@@ -27892,7 +27911,7 @@ function DropinComposerComponent({
     return TaskTypes.TASKS_OVERVIEW;
   }, [showBusinessTypeSelection, showIntroduction]);
   const [taskHistory, setTaskHistory] = useState([initialTask]);
-  const [legalEntity, setLegalEntity] = useState(legalEntityResponse);
+  const [rootLegalEntity, setRootLegalEntity] = useState(legalEntityResponse);
   const [associatedLegalEntity, setAssociatedLegalEntity] = useState(null);
   const [associatedLegalEntityParent, setAssociatedLegalEntityParent] = useState(null);
   const [legalEntityType, setLegalEntityType] = useState(null);
@@ -27910,9 +27929,9 @@ function DropinComposerComponent({
   const [transferInstrument, setTransferInstrument] = useState(null);
   const [capabilityProblems, setCapabilityProblems] = useState(getCapabilityProblems(legalEntityResponse));
   const [bankVerificationVendors, setBankVerificationVendors] = useState();
-  const rootLegalEntityCountry = legalEntity.type === LegalEntityType.INDIVIDUAL ? (_a = legalEntity.individual.residentialAddress) == null ? void 0 : _a.country : (_b = legalEntity.organization.registeredAddress) == null ? void 0 : _b.country;
+  const rootLegalEntityCountry = rootLegalEntity.type === LegalEntityType.INDIVIDUAL ? (_a = rootLegalEntity.individual.residentialAddress) == null ? void 0 : _a.country : (_b = rootLegalEntity.organization.registeredAddress) == null ? void 0 : _b.country;
   const hasTrust = isExperimentEnabled("EnableTrustFlow") && (accountHolder2 === "aTrust" || isPartOfTrustFromLegalEntity(legalEntityResponse));
-  const reviewRequired = (legalEntity == null ? void 0 : legalEntity.id) && ((_d = (_c = capabilityProblems == null ? void 0 : capabilityProblems.LegalEntity) == null ? void 0 : _c[legalEntity.id]) == null ? void 0 : _d.isReviewRequired);
+  const reviewRequired = (rootLegalEntity == null ? void 0 : rootLegalEntity.id) && ((_d = (_c = capabilityProblems == null ? void 0 : capabilityProblems.LegalEntity) == null ? void 0 : _c[rootLegalEntity.id]) == null ? void 0 : _d.isReviewRequired);
   const additionalSalesChannels = useSalesChannelsSettings();
   const isOrganizationSettlorWithExemptionEnabled = isOrganizationSettlorWithExemptionReasonEnabled(isExperimentEnabled("AllowOrganizationSettlorWithExemptionReason"), trust2 == null ? void 0 : trust2.trust.countryOfGoverningLaw);
   const allowMoreRolesForMainRootTrustee = isExperimentEnabled("AllowMoreRolesForMainRootTrustee");
@@ -27925,12 +27944,12 @@ function DropinComposerComponent({
   };
   const getPciStatus = async () => {
     var _a2, _b2;
-    if (legalEntity.id && (args == null ? void 0 : args.handleGetPciStatus)) {
+    if (rootLegalEntity.id && (args == null ? void 0 : args.handleGetPciStatus)) {
       try {
-        const response = await args.handleGetPciStatus(legalEntity.id, {
+        const response = await args.handleGetPciStatus(rootLegalEntity.id, {
           additionalSalesChannels
         });
-        response.hasDocuments = ((_b2 = (_a2 = await (args == null ? void 0 : args.handleGetPciQuestionnaires(legalEntity.id))) == null ? void 0 : _a2.data) == null ? void 0 : _b2.length) > 0;
+        response.hasDocuments = ((_b2 = (_a2 = await (args == null ? void 0 : args.handleGetPciQuestionnaires(rootLegalEntity.id))) == null ? void 0 : _a2.data) == null ? void 0 : _b2.length) > 0;
         setPciStatus(response);
         return response;
       } catch (e) {
@@ -27941,7 +27960,7 @@ function DropinComposerComponent({
   };
   const getPciTemplate = useCallback(async () => {
     const requestPciTemplate = async (language) => {
-      const response = await args.handleGetPciTemplate(legalEntity.id, {
+      const response = await args.handleGetPciTemplate(rootLegalEntity.id, {
         language,
         additionalSalesChannels
       });
@@ -27959,16 +27978,16 @@ function DropinComposerComponent({
         await requestPciTemplate(fallbackLanguageCode);
       }
     }
-  }, [additionalSalesChannels, i18n, legalEntity.id, args.handleGetPciTemplate]);
+  }, [additionalSalesChannels, i18n, rootLegalEntity.id, args.handleGetPciTemplate]);
   useEffect(() => {
     if (!tasks.includes(TaskTypes.PCI_DSS))
       return;
     getPciTemplate().catch(logger$6.error);
   }, [getPciTemplate, tasks]);
   const getServiceAgreementAcceptanceInfos = async () => {
-    if (legalEntity.id && (args == null ? void 0 : args.handleGetServiceAgreementAcceptanceInfos)) {
+    if (rootLegalEntity.id && (args == null ? void 0 : args.handleGetServiceAgreementAcceptanceInfos)) {
       try {
-        const response = await args.handleGetServiceAgreementAcceptanceInfos(legalEntity.id);
+        const response = await args.handleGetServiceAgreementAcceptanceInfos(rootLegalEntity.id);
         setServiceAgreementAcceptanceInfos(response.data);
       } catch (e) {
         logger$6.warn(i18n.get("failedToGetServiceAgreementStatus"));
@@ -27976,9 +27995,9 @@ function DropinComposerComponent({
     }
   };
   const getServiceAgreementStatus = async () => {
-    if (legalEntity.id && (args == null ? void 0 : args.handleGetServiceAgreementStatus)) {
+    if (rootLegalEntity.id && (args == null ? void 0 : args.handleGetServiceAgreementStatus)) {
       try {
-        const response = await args.handleGetServiceAgreementStatus(legalEntity.id);
+        const response = await args.handleGetServiceAgreementStatus(rootLegalEntity.id);
         setServiceAgreementTypes(response.termsOfServiceTypes);
       } catch (e) {
         logger$6.warn(i18n.get("failedToGetServiceAgreementStatus"));
@@ -27986,7 +28005,7 @@ function DropinComposerComponent({
     }
   };
   const getSolePropietor = async () => {
-    const id2 = getOwnSoleProprietorshipIdArray(legalEntity)[0];
+    const id2 = getOwnSoleProprietorshipIdArray(rootLegalEntity)[0];
     if (id2) {
       try {
         const response = await (args == null ? void 0 : args.handleGetLegalEntity(id2));
@@ -28013,10 +28032,10 @@ function DropinComposerComponent({
     }
   };
   const refreshLegalEntity = async () => {
-    if (legalEntity.id && (args == null ? void 0 : args.handleGetLegalEntity)) {
+    if (rootLegalEntity.id && (args == null ? void 0 : args.handleGetLegalEntity)) {
       try {
-        const response = await (args == null ? void 0 : args.handleGetLegalEntity(legalEntity.id));
-        setLegalEntity(response);
+        const response = await (args == null ? void 0 : args.handleGetLegalEntity(rootLegalEntity.id));
+        setRootLegalEntity(response);
         setCapabilityProblems(getCapabilityProblems(response));
         return response;
       } catch (e) {
@@ -28172,11 +28191,11 @@ function DropinComposerComponent({
     onNavigate(task);
   };
   const onNavigateToDecisionMakerIndividual = async (task, id2, parentId) => {
-    if (parentId && parentId !== legalEntity.id) {
+    if (parentId && parentId !== rootLegalEntity.id) {
       const parentLegalEntity = await (args == null ? void 0 : args.handleGetLegalEntity(parentId));
       setAssociatedLegalEntityParent(parentLegalEntity);
     } else {
-      setAssociatedLegalEntityParent(legalEntity);
+      setAssociatedLegalEntityParent(rootLegalEntity);
     }
     if (id2 && (args == null ? void 0 : args.handleGetLegalEntity)) {
       try {
@@ -28198,7 +28217,7 @@ function DropinComposerComponent({
     if (id2) {
       try {
         await getTransferInstrument2(id2);
-        if (hasSolePropInLegalEntity(legalEntity) && !solePropietor) {
+        if (hasSolePropInLegalEntity(rootLegalEntity) && !solePropietor) {
           await getSolePropietor();
         }
       } finally {
@@ -28229,7 +28248,7 @@ function DropinComposerComponent({
   };
   const onNavigateToTrust = async (task = TaskTypes.TRUST) => {
     var _a2, _b2;
-    const trustId = (_b2 = (_a2 = legalEntity == null ? void 0 : legalEntity.entityAssociations) == null ? void 0 : _a2.find((association2) => association2.type === LegalEntityType.TRUST)) == null ? void 0 : _b2.legalEntityId;
+    const trustId = (_b2 = (_a2 = rootLegalEntity == null ? void 0 : rootLegalEntity.entityAssociations) == null ? void 0 : _a2.find((association2) => association2.type === LegalEntityType.TRUST)) == null ? void 0 : _b2.legalEntityId;
     if (trustId) {
       try {
         const currentTrust = await (args == null ? void 0 : args.handleGetLegalEntity(trustId));
@@ -28337,13 +28356,13 @@ function DropinComposerComponent({
       trackingConfig: {
         topLevelLegalEntity: legalEntityResponse
       },
-      legalEntity,
+      legalEntity: rootLegalEntity,
       task: TaskTypes.PCI_DSS
     });
     try {
-      const response = await (args == null ? void 0 : args.handleGetPciQuestionnaires(legalEntity.id));
+      const response = await (args == null ? void 0 : args.handleGetPciQuestionnaires(rootLegalEntity.id));
       await Promise.all(response.data.map(async (pciQuestionnaireInfo) => {
-        const pciQuestionnaire = await (args == null ? void 0 : args.handleDownloadPci(legalEntity.id, pciQuestionnaireInfo.id));
+        const pciQuestionnaire = await (args == null ? void 0 : args.handleDownloadPci(rootLegalEntity.id, pciQuestionnaireInfo.id));
         await downloadFile(pciQuestionnaire.content, `${pciQuestionnaire.id}.pdf`);
       }));
     } catch (e) {
@@ -28368,7 +28387,7 @@ function DropinComposerComponent({
       const data = await getConfiguration2({
         country: contextCountry,
         capabilities,
-        legalEntityType: legalEntity.type
+        legalEntityType: rootLegalEntity.type
       });
       if (data == null ? void 0 : data.bankVerificationProviders) {
         setBankVerificationVendors(data.bankVerificationProviders);
@@ -28387,21 +28406,21 @@ function DropinComposerComponent({
       setIsLoadingConfiguration(false);
       onLoad();
     });
-  }, [legalEntity.type, contextCountry]);
+  }, [rootLegalEntity.type, contextCountry]);
   useEffect(() => {
-    if (hasRejectedCapabilities(legalEntity)) {
+    if (hasRejectedCapabilities(rootLegalEntity)) {
       setTaskHistory([TaskTypes.CAPABILITY_REJECTED]);
     }
-  }, [legalEntity]);
+  }, [rootLegalEntity]);
   useEffect(() => {
     if (PAGES_WITH_STATUS.includes(taskHistory[taskHistory.length - 1])) {
       if (!pollingId) {
         const pollingInterval = setInterval(async () => {
-          if (hasRejectedCapabilities(legalEntity)) {
+          if (hasRejectedCapabilities(rootLegalEntity)) {
             setTaskHistory([TaskTypes.CAPABILITY_REJECTED]);
             clearInterval(pollingId);
             setPollingId(null);
-          } else if (hasResolvedCapabilities(legalEntity)) {
+          } else if (hasResolvedCapabilities(rootLegalEntity)) {
             clearInterval(pollingId);
             setPollingId(null);
           } else {
@@ -28426,7 +28445,7 @@ function DropinComposerComponent({
     case TaskTypes.BUSINESS_TYPE_SELECTION:
       return jsx(BusinessTypeSelection, {
         ...args,
-        legalEntityResponse: legalEntity,
+        legalEntityResponse: rootLegalEntity,
         accountHolder: accountHolder2,
         showTrustOption: isExperimentEnabled("EnableTrustFlow") && TRUST_COUNTRIES.includes(rootLegalEntityCountry),
         showSolePropOption: SOLE_PROP_COUNTRIES.includes(rootLegalEntityCountry),
@@ -28438,7 +28457,7 @@ function DropinComposerComponent({
       });
     case TaskTypes.INTRODUCTION:
       return jsx(Introduction, {
-        legalEntity,
+        legalEntity: rootLegalEntity,
         onExitIntroduction: () => {
           setHasSeenIntroduction(true);
           onNavigateTo(TaskTypes.TASKS_OVERVIEW);
@@ -28451,7 +28470,7 @@ function DropinComposerComponent({
       return jsx(TaskListComponent, {
         onNavigateToTask: navigateTo,
         tasks,
-        legalEntityResponse: legalEntity,
+        legalEntityResponse: rootLegalEntity,
         capabilityProblems,
         onPciDownload,
         pciStatus,
@@ -28467,7 +28486,7 @@ function DropinComposerComponent({
           topLevelLegalEntity: legalEntityResponse
         },
         parentLegalEntity: associatedLegalEntityParent,
-        legalEntityResponse: legalEntity,
+        legalEntityResponse: rootLegalEntity,
         onNavigateToIndividual: (legalEntityId) => onNavigateToDecisionMakerIndividual(TaskTypes.DECISION_MAKER, legalEntityId),
         handleUpdateLegalEntity: args == null ? void 0 : args.handleUpdateLegalEntity,
         navigateBackToTaskList: navigateBack,
@@ -28483,8 +28502,8 @@ function DropinComposerComponent({
         taskType: TaskTypes.INDIVIDUAL,
         taskName: hasTrust ? "individualTrusteeDetails" : "individualDetails",
         parentLegalEntity: null,
-        legalEntityResponse: legalEntity,
-        problems: getLegalEntityProblems(legalEntity),
+        legalEntityResponse: rootLegalEntity,
+        problems: getLegalEntityProblems(rootLegalEntity),
         capabilities: Object.keys((legalEntityResponse == null ? void 0 : legalEntityResponse.capabilities) ?? {}),
         onChange: componentOnChange,
         eventEmitter,
@@ -28504,7 +28523,7 @@ function DropinComposerComponent({
       });
     case TaskTypes.REVIEW:
       return jsx(ReviewComponent, {
-        legalEntityId: legalEntity.id,
+        legalEntityId: rootLegalEntity.id,
         handleReviewConfirm: args.handleReviewConfirm,
         handleHomeClick: () => onNavigateTo(TaskTypes.TASKS_OVERVIEW)
       });
@@ -28581,9 +28600,9 @@ function DropinComposerComponent({
         },
         taskType: TaskTypes.COMPANY,
         taskName: hasTrust ? "companyTrusteeDetails" : "companyDetails",
-        legalEntityResponse: legalEntity,
+        legalEntityResponse: rootLegalEntity,
         capabilities: Object.keys((legalEntityResponse == null ? void 0 : legalEntityResponse.capabilities) ?? {}),
-        problems: getLegalEntityProblems(legalEntity),
+        problems: getLegalEntityProblems(rootLegalEntity),
         onChange: componentOnChange,
         eventEmitter,
         onSubmit: async (data) => {
@@ -28609,7 +28628,7 @@ function DropinComposerComponent({
         parentLegalEntity: trust2,
         legalEntityResponse: associatedLegalEntity,
         capabilities: Object.keys((legalEntityResponse == null ? void 0 : legalEntityResponse.capabilities) ?? {}),
-        problems: (_e = capabilityProblems == null ? void 0 : capabilityProblems.LegalEntity) == null ? void 0 : _e[legalEntity.id],
+        problems: (_e = capabilityProblems == null ? void 0 : capabilityProblems.LegalEntity) == null ? void 0 : _e[rootLegalEntity.id],
         onChange: componentOnChange,
         eventEmitter,
         onSubmit: (data) => refreshTrustAndRunOnSubmit(data, 2),
@@ -28632,9 +28651,9 @@ function DropinComposerComponent({
         problems: (_f = capabilityProblems == null ? void 0 : capabilityProblems.BankAccount) == null ? void 0 : _f[transferInstrument == null ? void 0 : transferInstrument.id],
         transferInstrument,
         setTransferInstrument,
-        legalEntityResponse: legalEntity,
+        legalEntityResponse: rootLegalEntity,
         refreshLegalEntity,
-        accountHolder: getPayoutAccountHolderName(legalEntity, i18n),
+        accountHolder: getPayoutAccountHolderName(rootLegalEntity, i18n),
         capabilities: Object.keys((legalEntityResponse == null ? void 0 : legalEntityResponse.capabilities) ?? {}),
         onChange: componentOnChange,
         eventEmitter,
@@ -28652,7 +28671,7 @@ function DropinComposerComponent({
         },
         taskType: TaskTypes.TRUST,
         problems: (_g = capabilityProblems == null ? void 0 : capabilityProblems.LegalEntity) == null ? void 0 : _g[trust2 == null ? void 0 : trust2.id],
-        parentLegalEntity: legalEntity,
+        parentLegalEntity: rootLegalEntity,
         legalEntityResponse: trust2,
         capabilities: Object.keys((legalEntityResponse == null ? void 0 : legalEntityResponse.capabilities) ?? {}),
         onChange: componentOnChange,
@@ -28666,8 +28685,8 @@ function DropinComposerComponent({
       });
     case TaskTypes.TRUST_MEMBER_OVERVIEW:
       return jsx(TrustMembersOverview, {
-        trustMembers: allowMoreRolesForMainRootTrustee ? getRootTrusteeTrustMembers(trust2, legalEntity, exemptSettlor) : getTrustMembers(trust2, legalEntity, exemptSettlor),
-        getTrustMemberTaskStatus: (member) => getTaskStatus(EntityType.LEGAL_ENTITY, capabilityProblems, legalEntity, member.trustMemberType === "undefinedBeneficiary" ? void 0 : [member.legalEntityId]),
+        trustMembers: allowMoreRolesForMainRootTrustee ? getRootTrusteeTrustMembers(trust2, rootLegalEntity, exemptSettlor) : getTrustMembers(trust2, rootLegalEntity, exemptSettlor),
+        getTrustMemberTaskStatus: (member) => getTaskStatus(EntityType.LEGAL_ENTITY, capabilityProblems, rootLegalEntity, member.trustMemberType === "undefinedBeneficiary" ? void 0 : [member.legalEntityId, ...getDirectEntityAssociations(rootLegalEntity, member.legalEntityId).map((association2) => association2.legalEntityId)]),
         navigateBackToTaskList: navigateBack,
         navigateToEditTrustMember: onNavigateToTrustMemberRoleAndType,
         navigateToEditTrustMemberOwner: (trustMemberOwnerId, trustMemberId) => onNavigateToDecisionMakerIndividual(TaskTypes.TRUST_MEMBER_COMPANY_OWNER, trustMemberOwnerId, trustMemberId),
@@ -28687,7 +28706,7 @@ function DropinComposerComponent({
       });
     case TaskTypes.PCI_DSS:
       return jsx(PciDropinComponent, {
-        legalEntityResponse: legalEntity,
+        legalEntityResponse: rootLegalEntity,
         pciTemplateResponse,
         trackingConfig: {
           topLevelLegalEntity: legalEntityResponse
@@ -28704,7 +28723,7 @@ function DropinComposerComponent({
       return jsx(SolePropDropinComponent, {
         ...args,
         taskType: TaskTypes.SOLE_PROPRIETOR_COMPANY,
-        parentLegalEntity: legalEntity,
+        parentLegalEntity: rootLegalEntity,
         legalEntityResponse: solePropietor,
         capabilities: Object.keys((legalEntityResponse == null ? void 0 : legalEntityResponse.capabilities) ?? {}),
         problems: (_j = capabilityProblems == null ? void 0 : capabilityProblems.LegalEntity) == null ? void 0 : _j[solePropietor == null ? void 0 : solePropietor.id],
@@ -28713,13 +28732,13 @@ function DropinComposerComponent({
         onSubmit: componentOnSubmit,
         handleHomeClick: navigateBack,
         homeButtonLabel: i18n.get("saveAndGoToOverview"),
-        country: (_l = (_k = legalEntity == null ? void 0 : legalEntity.individual) == null ? void 0 : _k.residentialAddress) == null ? void 0 : _l.country,
+        country: (_l = (_k = rootLegalEntity == null ? void 0 : rootLegalEntity.individual) == null ? void 0 : _k.residentialAddress) == null ? void 0 : _l.country,
         handleAddressSearch: args == null ? void 0 : args.handleAddressSearch,
         handleFindAddress: args == null ? void 0 : args.handleFindAddress
       });
     case TaskTypes.SERVICE_AGREEMENT:
       return jsx(ServiceAgreementDropinComponent, {
-        legalEntityResponse: legalEntity,
+        legalEntityResponse: rootLegalEntity,
         trackingConfig: {
           topLevelLegalEntity: legalEntityResponse
         },
@@ -28738,6 +28757,7 @@ function DropinComposerComponent({
     case TaskTypes.LEGAL_ENTITY_TYPE_SWITCHER:
       return jsx(LegalEntityTypeSwitcher, {
         ...args,
+        handleUpdateLegalEntity: args.handleUpdateLegalEntity,
         targetLegalEntityType: legalEntityType,
         legalEntityResponse,
         handleHomeClick: navigateBack,