@adyen/kyc-components 2.3.3 → 2.4.0

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

@@ -1199,6 +1199,10 @@ const deceased = "My settlor is deceased";
 const noneOfTheAbove = "None of the above";
 const settlorExemptionReason = "Settlor exemption reasons";
 const otherInformation = "Other information";
+const firstNameOfSettlor = "First name of settlor";
+const lastNameOfSettlor = "Last name of settlor";
+const enterSettlorsFirstNameExactlyAsItAppearsInID = "Enter the settlor's first name(s) exactly as it appears on their identity document";
+const enterSettlorsLastNameExactlyAsItAppearsInID = "Enter the settlor's last name(s) exactly as it appears on their identity document";
 const defaultTrans = {
   close,
   individual,
@@ -2169,7 +2173,11 @@ const defaultTrans = {
   deceased,
   noneOfTheAbove,
   settlorExemptionReason,
-  otherInformation
+  otherInformation,
+  firstNameOfSettlor,
+  lastNameOfSettlor,
+  enterSettlorsFirstNameExactlyAsItAppearsInID,
+  enterSettlorsLastNameExactlyAsItAppearsInID
 };
 const FALLBACK_LOCALE = "en-US";
 const defaultTranslation = defaultTrans;
@@ -3059,10 +3067,11 @@ function StateContextWatcher({
     }
   }, [JSON.stringify(formState == null ? void 0 : formState.currentState)]);
   return o(StateContext.Consumer, {
-    children: ({
-      state: state2
-    }) => {
-      setFormState(state2);
+    children: (stateContextValue) => {
+      if (!stateContextValue) {
+        throw new Error("<StateContextWatcher> needs to be mounted inside a <StateProvider>");
+      }
+      setFormState(stateContextValue.state);
       return null;
     }
   });
@@ -3179,10 +3188,14 @@ function StateContextSetter({
     return null;
   }
   return o(StateContext.Consumer, {
-    children: ({
-      dispatch,
-      setActiveForms
-    }) => {
+    children: (stateContextValue) => {
+      if (!stateContextValue) {
+        throw new Error("<StateContextSetter> needs to be mounted inside a <StateProvider>");
+      }
+      const {
+        dispatch,
+        setActiveForms
+      } = stateContextValue;
       stateRef.current.setState = dispatch;
       stateRef.current.setActiveForms = setActiveForms;
       return null;
@@ -4509,7 +4522,7 @@ const lengthValidationPatterns = {
     message: "validationEnter9Or12Digits"
   }
 };
-const bankStatementDescriptionPattern = /^[\s+$\xA2-\xA5\u058F\u060B\u09F2\u09F3\u09FB\u0AF1\u0BF9\u0E3F\u17DB\u20A0-\u20BD\uA838\uFDFC\uFE69\uFF04\uFFE0\uFFE1\uFFE5\uFFE6a-zA-Z0-9-."_,:;'*!@#%()+?¿/&「」]*$/;
+const bankStatementDescriptionPattern = /^[$\xA2-\xA5\u058F\u060B\u09F2\u09F3\u09FB\u0AF1\u0BF9\u0E3F\u17DB\u20A0-\u20BD\uA838\uFDFC\uFE69\uFF04\uFFE0\uFFE1\uFFE5\uFFE6a-zA-Z0-9-."_,:;'*!@#%()+?¿/&「」]*$/;
 const businessRegistrationNumberPatterns = {
   [CountryCodes.Australia]: {
     default: {
@@ -8799,7 +8812,7 @@ var TrustMemberTypes = /* @__PURE__ */ ((TrustMemberTypes2) => {
   TrustMemberTypes2["DEFINED_BENEFICIARY"] = "definedBeneficiary";
   TrustMemberTypes2["UNDEFINED_BENEFICIARY"] = "undefinedBeneficiary";
   TrustMemberTypes2["PROTECTOR"] = "protector";
-  TrustMemberTypes2["TRUSTEE"] = "trustee";
+  TrustMemberTypes2["TRUSTEE"] = "secondaryTrustee";
   TrustMemberTypes2["SETTLOR"] = "settlor";
   return TrustMemberTypes2;
 })(TrustMemberTypes || {});
@@ -11834,21 +11847,6 @@ const getOwnTrustMembers = (trustEntity) => {
     return [];
   return trustEntity.entityAssociations.filter((entityAssociation) => Object.values(TrustMemberTypes).includes(entityAssociation.type) && entityAssociation.associatorId === trustEntity.id);
 };
-const getRootTrusteeInfo = (rootLegalEntity) => ({
-  id: rootLegalEntity.id,
-  type: TrustMemberTypes.TRUSTEE
-});
-const getUndefinedBeneficiaries = (legalEntity) => {
-  var _a;
-  return ((_a = legalEntity.trust) == null ? void 0 : _a.undefinedBeneficiaryInfo) || [];
-};
-const getAllTrustMembers = (rootLegalEntity, trustEntity) => [getRootTrusteeInfo(rootLegalEntity), ...getOwnTrustMembers(trustEntity).map((association) => ({
-  id: association.legalEntityId || "",
-  type: association.type
-})), ...getUndefinedBeneficiaries(trustEntity).map((undefinedBeneficiaryInfo) => ({
-  id: undefinedBeneficiaryInfo.reference,
-  type: TrustMemberTypes.UNDEFINED_BENEFICIARY
-}))];
 const getOwnTrustMembersLegalEntityIds = (legalEntity) => getOwnTrustMembers(legalEntity).map((ea) => ea.legalEntityId).filter((id2) => id2 !== void 0);
 const getOwnTrustLegalEntityId = (legalEntity) => {
   var _a, _b;
@@ -12136,7 +12134,7 @@ function formatSwedenPersonnummer(value) {
 }
 const formattedCountries = [CountryCodes.Denmark, CountryCodes.Sweden];
 const stripCountryIdFormat = (value, country2) => {
-  if (value && formattedCountries.includes(country2)) {
+  if (formattedCountries.includes(country2)) {
     return cleanNonNumbers(value);
   }
   return value;
@@ -15147,7 +15145,8 @@ function NameComponent(props) {
     setState: null
   });
   p(() => {
-    stateRef.current.setState({
+    var _a, _b, _c;
+    (_b = (_a = stateRef.current) == null ? void 0 : _a.setState) == null ? void 0 : _b.call(_a, {
       type: "addToState",
       value: {
         data,
@@ -15158,6 +15157,14 @@ function NameComponent(props) {
         dataStoreId
       }
     });
+    (_c = props.onChange) == null ? void 0 : _c.call(props, {
+      schema,
+      data,
+      valid,
+      errors,
+      fieldProblems,
+      isValid
+    });
   }, [data, valid, errors, isValid]);
   const formUtils = formUtilities(props, i18n);
   return o("div", {
@@ -15170,7 +15177,7 @@ function NameComponent(props) {
       classNameModifiers: ["firstName", "col-50"],
       errorMessage: formUtils.getErrorMessage("firstName", errors, fieldProblems),
       isValid: valid.firstName,
-      helper: i18n.get("enterNameExactlyAsAppearInID"),
+      helper: formUtils.getLabel("enterNameExactlyAsAppearInID"),
       children: (childProps) => o(InputText, {
         ...childProps,
         name: "firstName",
@@ -15191,7 +15198,7 @@ function NameComponent(props) {
       classNameModifiers: ["lastName", "col-50"],
       errorMessage: formUtils.getErrorMessage("lastName", errors, fieldProblems),
       isValid: valid.lastName,
-      helper: i18n.get("enterLastNameExactlyAsAppearInID"),
+      helper: formUtils.getLabel("enterLastNameExactlyAsAppearInID"),
       children: (childProps) => o(InputText, {
         ...childProps,
         name: "lastName",
@@ -17589,7 +17596,7 @@ function PayoutBankStatementComponent(props) {
     }) : null]
   });
 }
-const PayoutBankStatement = x(PayoutBankStatementComponent, (prevProps, nextProps) => objectsDeepEqual(prevProps.requiredFields, nextProps.requiredFields) && objectsDeepEqual(prevProps.optionalFields, nextProps.optionalFields) && objectsDeepEqual(prevProps.data, nextProps.data) && objectsDeepEqual(prevProps.formVerificationErrors, nextProps.formVerificationErrors) && objectsDeepEqual(prevProps.fieldValidationErrors, nextProps.fieldValidationErrors) && prevProps.country === nextProps.country && prevProps.shouldValidate === nextProps.shouldValidate);
+const PayoutBankStatement = x(PayoutBankStatementComponent, (prevProps, nextProps) => objectsDeepEqual(prevProps.requiredFields, nextProps.requiredFields) && objectsDeepEqual(prevProps.optionalFields, nextProps.optionalFields) && objectsDeepEqual(prevProps.data, nextProps.data) && objectsDeepEqual(prevProps.formVerificationErrors, nextProps.formVerificationErrors) && objectsDeepEqual(prevProps.fieldValidationErrors, nextProps.fieldValidationErrors) && prevProps.country === nextProps.country && prevProps.shouldValidate === nextProps.shouldValidate && prevProps.heading === nextProps.heading);
 const VerificationMethod = "";
 const hasLoaded = (loadedValue) => loadedValue !== "loading";
 const eeaCountries = [CountryCodes.Austria, CountryCodes.Belgium, CountryCodes.Bulgaria, CountryCodes.Croatia, CountryCodes.Cyprus, CountryCodes.CzechRepublic, CountryCodes.Denmark, CountryCodes.Estonia, CountryCodes.Finland, CountryCodes.France, CountryCodes.Germany, CountryCodes.Greece, CountryCodes.Hungary, CountryCodes.Ireland, CountryCodes.Italy, CountryCodes.Latvia, CountryCodes.Lithuania, CountryCodes.Luxembourg, CountryCodes.Netherlands, CountryCodes.Norway, CountryCodes.Poland, CountryCodes.Portugal, CountryCodes.Romania, CountryCodes.Slovakia, CountryCodes.Slovenia, CountryCodes.Spain, CountryCodes.Sweden];
@@ -19686,6 +19693,9 @@ const solePropBase = {
   tradingName: {
     rule: "REQUIRED"
   },
+  dateOfIncorporation: {
+    rule: "countryRequiresDateOfIncorporationForCompanies"
+  },
   exemptedFromRegistrationNumber: {
     rule: "countryHasRegistrationExemptionsForSomeSoleProps"
   },
@@ -20031,12 +20041,14 @@ const getRequiredForms = (forms, requiredFields, optionalFields) => {
 };
 const addValidityToForms = (forms, formValidity, problems) => forms.map(({
   formId,
-  formName
+  formName,
+  fields
 }) => {
   var _a;
   return {
     formId,
     formName,
+    fields,
     isValid: (formValidity == null ? void 0 : formValidity[formId]) ?? false,
     hasServerValidationErrors: Boolean((_a = problems == null ? void 0 : problems.validationErrors) == null ? void 0 : _a[formId])
   };
@@ -20130,6 +20142,7 @@ const FormNavigationItem = ({
   const {
     i18n
   } = useCoreContext();
+  const hasError = form.hasServerValidationErrors || hasVerificationErrors;
   return o("li", {
     className: cx("adyen-kyc-form-navigation__item", {
       "adyen-kyc-form-navigation__item--active": isActive,
@@ -20142,7 +20155,7 @@ const FormNavigationItem = ({
       children: o(AlertIcon, {
         type: AlertTypes.WARNING
       })
-    }), form.isValid && !form.hasServerValidationErrors && !hasVerificationErrors && o("span", {
+    }), form.isValid && !hasError && o("span", {
       className: "adyen-kyc-form-navigation__item-icon adyen-kyc-form-navigation__item-icon--success",
       children: o(Icon, {
         name: "checkmark-small"
@@ -20157,7 +20170,7 @@ function FormNavigation({
   validateForm,
   className,
   taskName,
-  hasVerificationErrors = false,
+  verificationErrors,
   trackNavigation: trackNavigation2 = noop
 }) {
   const {
@@ -20205,7 +20218,7 @@ function FormNavigation({
         form,
         isActive: form.formId === activeForm.formId,
         onClick: getNavigateHandler(form, activeForm),
-        hasVerificationErrors
+        hasVerificationErrors: Boolean((verificationErrors == null ? void 0 : verificationErrors[form.formId]) ?? false)
       }, form.formId))]
     })]
   });
@@ -20314,7 +20327,7 @@ const FormWrapper = ({
         baseTrackingPayload,
         i18n
       }),
-      hasVerificationErrors: Object.keys((problems == null ? void 0 : problems.verificationErrors) ?? {}).length > 0
+      verificationErrors: problems == null ? void 0 : problems.verificationErrors
     })
   });
   return o(DropinLayout, {
@@ -20475,7 +20488,7 @@ function CompanyDropinComponent({
       const existingRoles = (_a2 = existingEntityAssociations == null ? void 0 : existingEntityAssociations.filter((ea) => ea.legalEntityId === parentLegalEntity.id)) == null ? void 0 : _a2.map(({
         type
       }) => type);
-      const newRoles = associationDetail == null ? void 0 : associationDetail.types;
+      const newRoles = associationDetail == null ? void 0 : associationDetail.roles;
       if (newRoles && !doArraysMatch(existingRoles, newRoles)) {
         const updatedParentLegalEntity = {
           entityAssociations: [...newRoles.map((role2) => ({
@@ -20662,6 +20675,7 @@ function CompanyDropinComponent({
     validateForm: () => setShouldValidate(true),
     baseTrackingPayload,
     onSubmit,
+    problems,
     canSubmit: canSubmit(data) && hasDataChanged(dataFromResponse, data),
     summary: {
       data: formatDataForSummary(data, forms),
@@ -20683,6 +20697,22 @@ function CompanyDropinComponent({
     })
   });
 }
+const logger$3 = createLogger("useExemptSettlor");
+const useExemptSettlor = ({
+  trust,
+  handleGetLegalEntity
+}) => {
+  const [exemptSettlor, setExemptSettlor] = h();
+  const updateExemptSettlor = T$1(async (trustLE) => {
+    const exemptSettlorAssociation = getOwnEntityAssociations(trustLE).find((association) => association.type === TrustMemberTypes.SETTLOR && Boolean(association.settlorExemptionReason));
+    const exemptSettlorLE = (exemptSettlorAssociation == null ? void 0 : exemptSettlorAssociation.legalEntityId) ? await handleGetLegalEntity(exemptSettlorAssociation.legalEntityId) : void 0;
+    setExemptSettlor(exemptSettlorLE);
+  }, [handleGetLegalEntity]);
+  p(() => {
+    updateExemptSettlor(trust).catch(logger$3.error);
+  }, [trust, updateExemptSettlor]);
+  return exemptSettlor;
+};
 const downloadFile = async (base64, filename) => {
   saveBlobAsFile(base64ToBlob(base64), filename);
 };
@@ -20745,6 +20775,190 @@ const getPayoutAccountHolderName = (legalEntity, i18n) => {
   }
   return getLegalEntityNameBasedOnType(legalEntity);
 };
+const splitAtFirstOccurrence = (str, separator) => {
+  const firstOccurrence = str.indexOf(separator);
+  if (firstOccurrence === -1)
+    return [str];
+  return [str.slice(0, firstOccurrence), str.slice(firstOccurrence + 1)];
+};
+const getTrustMemberOwnerId = (trustMemberId, entityAssociations) => {
+  var _a;
+  return (_a = entityAssociations.find((association) => association.associatorId === trustMemberId && association.type === TrustMemberTypes.TRUSTEE)) == null ? void 0 : _a.legalEntityId;
+};
+const getFallbackName = (exemptSettlorAssociation) => {
+  const [firstName2, lastName2] = splitAtFirstOccurrence(exemptSettlorAssociation.name ?? "", " ");
+  return {
+    firstName: firstName2,
+    lastName: lastName2
+  };
+};
+const convertEntityAssociationIntoTrustMember = (association, associations, exemptSettlorLE) => {
+  var _a;
+  if (association.settlorExemptionReason)
+    return {
+      trustMemberType: "exemptSettlor",
+      roles: [TrustMemberTypes.SETTLOR],
+      legalEntityType: LegalEntityType.INDIVIDUAL,
+      legalEntityId: association.legalEntityId,
+      settlorExemptionReason: association.settlorExemptionReason,
+      exemptSettlorName: ((_a = exemptSettlorLE == null ? void 0 : exemptSettlorLE.individual) == null ? void 0 : _a.name) ?? getFallbackName(association)
+    };
+  if (association.entityType === LegalEntityType.ORGANIZATION)
+    return {
+      trustMemberType: "company",
+      roles: [],
+      legalEntityType: LegalEntityType.ORGANIZATION,
+      legalEntityId: association.legalEntityId,
+      name: association.name,
+      ownerId: getTrustMemberOwnerId(association.legalEntityId, associations)
+    };
+  if (association.entityType === LegalEntityType.INDIVIDUAL)
+    return {
+      trustMemberType: "regular",
+      roles: [],
+      legalEntityType: LegalEntityType.INDIVIDUAL,
+      legalEntityId: association.legalEntityId,
+      name: association.name
+    };
+  throw new Error(`Not a valid trust member: ${JSON.stringify(association)}`);
+};
+const mapEntityAssociationsToTrustMembers = (trustEntityId, entityAssociations, exemptSettlorLE) => {
+  const mappedTrustMembers = entityAssociations.reduce((acc, entityAssociation) => {
+    if (!Object.values(TrustMemberTypes).includes(entityAssociation.type) || entityAssociation.associatorId !== trustEntityId || !entityAssociation.legalEntityId) {
+      return acc;
+    }
+    const trustMember = acc[entityAssociation.legalEntityId] ?? convertEntityAssociationIntoTrustMember(entityAssociation, entityAssociations, exemptSettlorLE);
+    const trustMemberType = entityAssociation.type;
+    acc[entityAssociation.legalEntityId] = {
+      ...trustMember,
+      roles: [.../* @__PURE__ */ new Set([...trustMember.roles, trustMemberType])]
+    };
+    return acc;
+  }, {});
+  return Object.values(mappedTrustMembers);
+};
+const mapRootLegalEntityToTrustMember = (rootLegalEntity) => ({
+  trustMemberType: "rootTrustee",
+  roles: [TrustMemberTypes.TRUSTEE],
+  legalEntityType: rootLegalEntity.type,
+  legalEntityId: rootLegalEntity.id,
+  name: getLegalEntityNameBasedOnType(rootLegalEntity)
+});
+const mapUndefinedBeneficiaryInfoToTrustMembers = (undefinedBeneficiaryInfo) => undefinedBeneficiaryInfo.map(({
+  reference,
+  description: description2
+}) => ({
+  trustMemberType: "undefinedBeneficiary",
+  roles: [TrustMemberTypes.UNDEFINED_BENEFICIARY],
+  reference,
+  description: description2
+}));
+const getTrustMembers = (trustLE, rootLegalEntity, exemptSettlorLE) => {
+  var _a;
+  return [mapRootLegalEntityToTrustMember(rootLegalEntity), ...mapEntityAssociationsToTrustMembers(trustLE.id, trustLE.entityAssociations ?? [], exemptSettlorLE), ...mapUndefinedBeneficiaryInfoToTrustMembers(((_a = trustLE.trust) == null ? void 0 : _a.undefinedBeneficiaryInfo) ?? [])];
+};
+const mapTrustMemberToEntityAssociations = (trustMember) => {
+  if (trustMember.trustMemberType === "exemptSettlor")
+    return [{
+      legalEntityId: trustMember.legalEntityId,
+      entityType: trustMember.legalEntityType,
+      type: TrustMemberTypes.SETTLOR,
+      settlorExemptionReason: trustMember.settlorExemptionReason,
+      name: `${trustMember.exemptSettlorName.firstName} ${trustMember.exemptSettlorName.lastName}`
+    }];
+  return trustMember.roles.map((role2) => ({
+    legalEntityId: trustMember.legalEntityId,
+    type: role2
+  }));
+};
+const addOrUpdateAssociatedTrustMember = async ({
+  newOrUpdated,
+  trust,
+  handleUpdateLegalEntity
+}) => {
+  const otherAssociations = getOwnEntityAssociations(trust).filter((existingAssociation) => existingAssociation.legalEntityId !== newOrUpdated.legalEntityId);
+  const updatedAssociations = mapTrustMemberToEntityAssociations(newOrUpdated);
+  const patchLE = {
+    entityAssociations: [...otherAssociations, ...updatedAssociations]
+  };
+  await handleUpdateLegalEntity(patchLE, trust.id);
+};
+const addOrUpdateUndefinedBeneficiary = async ({
+  newOrUpdated,
+  trust,
+  handleUpdateLegalEntity
+}) => {
+  var _a, _b;
+  const otherUndefinedBeneficiaries = ((_b = (_a = trust.trust) == null ? void 0 : _a.undefinedBeneficiaryInfo) == null ? void 0 : _b.filter((ub) => ub.reference !== newOrUpdated.reference)) ?? [];
+  const patchLE = {
+    trust: {
+      undefinedBeneficiaryInfo: [...otherUndefinedBeneficiaries, {
+        reference: newOrUpdated.reference,
+        description: newOrUpdated.description
+      }]
+    }
+  };
+  await handleUpdateLegalEntity(patchLE, trust.id);
+};
+const createExemptSettlor = async ({
+  exemptSettlor,
+  trust,
+  handleCreateLegalEntity
+}) => {
+  const exemptSettlorLE = {
+    type: LegalEntityType.INDIVIDUAL,
+    individual: {
+      name: {
+        firstName: exemptSettlor.exemptSettlorName.firstName,
+        lastName: exemptSettlor.exemptSettlorName.lastName
+      },
+      residentialAddress: {
+        country: trust.trust.registeredAddress.country
+      }
+    }
+  };
+  return handleCreateLegalEntity(exemptSettlorLE);
+};
+const deleteAssociatedTrustMember = async ({
+  associatedTrustMember,
+  trust,
+  handleUpdateLegalEntity
+}) => {
+  const ownEntityAssociations = getOwnEntityAssociations(trust);
+  const updatedTrustAssociations = {
+    entityAssociations: ownEntityAssociations.filter((entityAssociation) => entityAssociation.legalEntityId !== associatedTrustMember.legalEntityId)
+  };
+  await handleUpdateLegalEntity(updatedTrustAssociations, trust.id);
+};
+const deleteUndefinedBeneficiary = async ({
+  undefinedBeneficiary: undefinedBeneficiary2,
+  trust,
+  handleUpdateLegalEntity
+}) => {
+  var _a;
+  const existingUndefinedBeneficiaries = ((_a = trust.trust) == null ? void 0 : _a.undefinedBeneficiaryInfo) ?? [];
+  const updatedTrust = {
+    trust: {
+      undefinedBeneficiaryInfo: existingUndefinedBeneficiaries.filter((ub) => ub.reference !== undefinedBeneficiary2.reference)
+    }
+  };
+  await handleUpdateLegalEntity(updatedTrust, trust.id);
+};
+const exemptSettlorNamesTheSame = (existingSettlor, newSettlor) => JSON.stringify(existingSettlor.exemptSettlorName) === JSON.stringify(newSettlor.exemptSettlorName);
+const updateExemptSettlorName = async ({
+  exemptSettlor,
+  handleUpdateLegalEntity
+}) => {
+  const exemptSettlorPatch = {
+    individual: {
+      name: {
+        firstName: exemptSettlor.exemptSettlorName.firstName,
+        lastName: exemptSettlor.exemptSettlorName.lastName
+      }
+    }
+  };
+  return handleUpdateLegalEntity(exemptSettlorPatch, exemptSettlor.legalEntityId);
+};
 const DecisionMakers = "";
 const iconStatus = (current, min, max) => {
   const isEmpty2 = current === 0;
@@ -21364,7 +21578,6 @@ const DecisionMakersComponent = ({
       }), (uniqueDecisionMakers == null ? void 0 : uniqueDecisionMakers.length) > 0 ? o(CardGroup, {
         children: uniqueDecisionMakers.map((decisionMaker2) => o(EntityAssociation, {
           types: decisionMaker2.types,
-          reference: decisionMaker2.reference,
           name: decisionMaker2.name,
           status: decisionMaker2.status,
           actions: actions(decisionMaker2),
@@ -21863,221 +22076,210 @@ function TaskListComponent({
     })
   });
 }
-const TrustMembers = "";
-const getReference = (entityAssociation) => entityAssociation.legalEntityId ?? (entityAssociation.type === "settlor" ? "exemptSettlor" : "");
-const mapEntityAssociationsToUniqueTrustMembers = (entityAssociations, getTaskStatusForEntityAssociation) => {
-  const mappedTrustMembers = entityAssociations.reduce((acc, entityAssociation) => {
-    const reference = getReference(entityAssociation);
-    const mappedTrustMember = acc[reference];
-    const trustMemberType = entityAssociation.type;
-    acc[reference] = {
-      reference,
-      types: mappedTrustMember ? [...mappedTrustMember.types, trustMemberType] : [trustMemberType],
-      status: getTaskStatusForEntityAssociation(entityAssociation),
-      name: entityAssociation.name ?? "",
-      legalEntityType: entityAssociation.entityType,
-      settlorExemptionReason: entityAssociation.settlorExemptionReason
-    };
-    return acc;
-  }, {});
-  return Object.values(mappedTrustMembers);
-};
-const makeUndefinedBeneficiaryTrustMember = (undefinedBeneficiary2) => ({
-  types: [TrustMemberTypes.UNDEFINED_BENEFICIARY],
-  reference: undefinedBeneficiary2.reference,
-  descriptionUndefinedBeneficiary: undefinedBeneficiary2.description,
-  status: TaskStatus.FINISHED,
-  name: ""
-});
-function UndefinedBeneficiaries({
-  undefinedBeneficiaries,
-  onDelete,
-  onEdit
-}) {
+const TrustMembersOverview$1 = "";
+const CompanyTrustMemberTaskItem = ({
+  companyTrustMember,
+  taskStatus,
+  onEditOwner,
+  onAddOwner,
+  onEdit,
+  onDelete
+}) => {
   const {
     i18n
   } = useCoreContext();
-  const actions = (undefinedBeneficiary2) => {
-    const trustMember = makeUndefinedBeneficiaryTrustMember(undefinedBeneficiary2);
-    return [{
-      icon: "edit",
-      onSelect: () => onEdit(trustMember),
-      label: i18n.get("editEntityDetails"),
-      title: i18n.get("editTrustMember", {
-        values: {
-          trustMember: i18n.get("undefinedBeneficiary")
-        }
-      })
-    }, {
-      icon: "bin",
-      onSelect: () => onDelete(trustMember.reference),
-      label: i18n.get("remove"),
-      title: i18n.get("removeTrustMember", {
-        values: {
-          trustMember: i18n.get("undefinedBeneficiary")
-        }
-      })
-    }];
-  };
-  return o(Fragment, {
-    children: undefinedBeneficiaries.map((undefinedBeneficiary2) => o(EntityAssociation, {
-      types: [TrustMemberTypes.UNDEFINED_BENEFICIARY],
-      reference: undefinedBeneficiary2.reference,
-      status: TaskStatus.FINISHED,
-      name: undefinedBeneficiary2.description,
-      actions: actions(undefinedBeneficiary2),
-      onNavigateToEntity: () => onEdit(makeUndefinedBeneficiaryTrustMember(undefinedBeneficiary2))
-    }, undefinedBeneficiary2.reference))
-  });
-}
-const TrustMembersComponent = ({
-  parentLegalEntity,
-  trustResponse,
-  capabilityProblems,
+  const actions = [{
+    icon: "edit",
+    onSelect: onEdit,
+    label: i18n.get("editEntityDetails"),
+    title: i18n.get("editTrustMember", {
+      values: {
+        trustMember: companyTrustMember.name
+      }
+    })
+  }, companyTrustMember.ownerId ? {
+    icon: "edit",
+    onSelect: onEditOwner,
+    label: i18n.get("editEntityOwner"),
+    title: i18n.get("editOwnerOfTrustMember", {
+      values: {
+        trustMember: companyTrustMember.name
+      }
+    })
+  } : {
+    icon: "plus",
+    onSelect: onAddOwner,
+    label: i18n.get("addEntityOwner"),
+    title: i18n.get("addOwnerToTrustMember", {
+      values: {
+        trustMember: companyTrustMember.name
+      }
+    })
+  }, {
+    icon: "bin",
+    onSelect: onDelete,
+    label: i18n.get("remove"),
+    title: i18n.get("removeTrustMember", {
+      values: {
+        trustMember: companyTrustMember.name
+      }
+    })
+  }];
+  const infoContent = companyTrustMember.ownerId ? void 0 : o(Alert, {
+    type: AlertTypes.BASIC,
+    hasCloseButton: false,
+    title: o(Fragment, {
+      children: [i18n.get("helpUsVerifyCompany"), " ", o(Link, {
+        onClick: (e2) => {
+          e2.preventDefault();
+          onAddOwner();
+        },
+        href: "to-company-owner",
+        children: i18n.get("providePersonalDetailsOfOwner")
+      })]
+    }),
+    className: "adl-u-margin-top-16"
+  });
+  return o(EntityAssociation, {
+    types: companyTrustMember.roles,
+    name: companyTrustMember.name,
+    status: taskStatus,
+    actions,
+    infoContent,
+    onNavigateToEntity: onEdit
+  }, companyTrustMember.legalEntityId);
+};
+const ExemptSettlorTaskItem = ({
+  exemptSettlor,
+  taskStatus,
+  onEdit,
+  onDelete
+}) => {
+  const {
+    i18n
+  } = useCoreContext();
+  const settlorName = `${exemptSettlor.exemptSettlorName.firstName} ${exemptSettlor.exemptSettlorName.lastName}`;
+  const actions = [{
+    icon: "edit",
+    onSelect: onEdit,
+    label: i18n.get("editEntityDetails"),
+    title: i18n.get("editTrustMember", {
+      values: {
+        trustMember: settlorName
+      }
+    })
+  }, {
+    icon: "bin",
+    onSelect: onDelete,
+    label: i18n.get("remove"),
+    title: i18n.get("removeTrustMember", {
+      values: {
+        trustMember: settlorName
+      }
+    })
+  }];
+  return o(EntityAssociation, {
+    types: exemptSettlor.roles,
+    name: settlorName,
+    status: taskStatus,
+    actions,
+    onNavigateToEntity: onEdit
+  }, exemptSettlor.legalEntityId);
+};
+const RegularTrustMemberTaskItem = ({
+  trustMember,
+  taskStatus,
+  onEdit,
+  onDelete
+}) => {
+  const {
+    i18n
+  } = useCoreContext();
+  const actions = [{
+    icon: "edit",
+    onSelect: onEdit,
+    label: i18n.get("editEntityDetails"),
+    title: i18n.get("editTrustMember", {
+      values: {
+        trustMember: trustMember.name
+      }
+    })
+  }, {
+    icon: "bin",
+    onSelect: onDelete,
+    label: i18n.get("remove"),
+    title: i18n.get("removeTrustMember", {
+      values: {
+        trustMember: trustMember.name
+      }
+    })
+  }];
+  return o(EntityAssociation, {
+    types: trustMember.roles,
+    name: trustMember.name,
+    status: taskStatus,
+    actions,
+    onNavigateToEntity: onEdit
+  }, trustMember.legalEntityId);
+};
+const RootTrusteeTaskItem = ({
+  rootTrustee,
+  taskStatus
+}) => o(EntityAssociation, {
+  types: [TrustMemberTypes.TRUSTEE],
+  name: rootTrustee.name,
+  status: taskStatus
+}, rootTrustee.legalEntityId);
+const UndefinedBeneficiaryTaskItem = ({
+  undefinedBeneficiary: undefinedBeneficiary2,
+  onEdit,
+  onDelete
+}) => {
+  const {
+    i18n
+  } = useCoreContext();
+  const actions = [{
+    icon: "edit",
+    onSelect: onEdit,
+    label: i18n.get("editEntityDetails"),
+    title: i18n.get("editTrustMember", {
+      values: {
+        trustMember: i18n.get("undefinedBeneficiary")
+      }
+    })
+  }, {
+    icon: "bin",
+    onSelect: onDelete,
+    label: i18n.get("remove"),
+    title: i18n.get("removeTrustMember", {
+      values: {
+        trustMember: i18n.get("undefinedBeneficiary")
+      }
+    })
+  }];
+  return o(EntityAssociation, {
+    name: undefinedBeneficiary2.description,
+    types: [TrustMemberTypes.UNDEFINED_BENEFICIARY],
+    status: TaskStatus.FINISHED,
+    actions,
+    onNavigateToEntity: onEdit
+  }, undefinedBeneficiary2.reference);
+};
+const TrustMembersOverview = ({
+  trustMembers: trustMembers2,
   navigateBackToTaskList,
   navigateToEditTrustMember,
   navigateToEditTrustMemberOwner,
-  handleUpdateLegalEntity,
-  onTrustMemberDelete
+  deleteTrustMember,
+  getTrustMemberTaskStatus
 }) => {
-  var _a;
   const {
     i18n
   } = useCoreContext();
-  const {
-    showToast
-  } = useToastContext();
   const trustMemberRequirements = DEFAULT_TRUST_MEMBER_REQUIREMENTS;
-  const allTrustMembers = getAllTrustMembers(parentLegalEntity, trustResponse);
-  const allMappedTrustMembers = allTrustMembers.reduce((mappedTrustMembers, trustMember) => {
-    const existingMapping = mappedTrustMembers[trustMember.id];
-    mappedTrustMembers[trustMember.id] = {
-      id: trustMember.id,
-      types: [...(existingMapping == null ? void 0 : existingMapping.types) ?? [], trustMember.type]
-    };
-    return mappedTrustMembers;
-  }, {});
-  const allUniqueTrustMembers = allMappedTrustMembers ? Object.values(allMappedTrustMembers) : [];
-  const uniqueTrustMembersPerType = (roleTypes) => {
-    const filteredTrustMembers = allUniqueTrustMembers.filter(({
-      types
-    }) => {
-      const typeSet = new Set(types);
-      return roleTypes.some((label) => typeSet.has(label));
-    });
-    return filteredTrustMembers.length;
-  };
-  const trusteeName = getLegalEntityNameBasedOnType(parentLegalEntity);
-  const uniqueTrustMembers = mapEntityAssociationsToUniqueTrustMembers(getOwnTrustMembers(trustResponse), (entityAssociation) => getTaskStatus(EntityType.LEGAL_ENTITY, capabilityProblems, parentLegalEntity, entityAssociation.legalEntityId ? [entityAssociation.legalEntityId] : void 0));
-  const deleteTrustMember = async (legalEntityId) => {
-    try {
-      const ownEntityAssociations = getOwnEntityAssociations(trustResponse);
-      const updatedTrustAssociations = {
-        entityAssociations: ownEntityAssociations.filter((entityAssociation) => entityAssociation.legalEntityId !== legalEntityId)
-      };
-      await handleUpdateLegalEntity(updatedTrustAssociations, trustResponse.id);
-      onTrustMemberDelete();
-      showToast({
-        type: ToastType.SUCCESS,
-        label: i18n.get("successFullyRemovedTrustMember")
-      });
-    } catch (e2) {
-      showToast({
-        type: ToastType.ERROR,
-        label: i18n.get("failedToRemoveTrustMember")
-      });
-    }
-  };
-  const deleteUndefinedBeneficiary = async (undefinedBeneficiaryReference) => {
-    var _a2;
-    try {
-      const existingUndefinedBeneficiaries = ((_a2 = trustResponse.trust) == null ? void 0 : _a2.undefinedBeneficiaryInfo) ?? [];
-      const updatedTrust = {
-        trust: {
-          undefinedBeneficiaryInfo: existingUndefinedBeneficiaries.filter((undefinedBeneficiary2) => undefinedBeneficiary2.reference !== undefinedBeneficiaryReference)
-        }
-      };
-      await handleUpdateLegalEntity(updatedTrust, trustResponse.id);
-      onTrustMemberDelete();
-      showToast({
-        type: ToastType.SUCCESS,
-        label: i18n.get("successFullyRemovedTrustMember")
-      });
-    } catch (e2) {
-      showToast({
-        type: ToastType.ERROR,
-        label: i18n.get("failedToRemoveTrustMember")
-      });
-    }
-  };
-  const getTrustMemberOwnerId = (trustMemberId, trustResponse2) => {
-    var _a2;
-    const associations = trustResponse2.entityAssociations;
-    if (associations) {
-      return (_a2 = associations.find((association) => association.associatorId === trustMemberId && association.type === TrustMemberTypes.TRUSTEE)) == null ? void 0 : _a2.legalEntityId;
-    }
-  };
-  const infoContent = (trustMember) => {
-    const ownerId = getTrustMemberOwnerId(trustMember.reference, trustResponse);
-    if (trustMember.legalEntityType === LegalEntityType.ORGANIZATION && !ownerId) {
-      return o(Alert, {
-        type: AlertTypes.BASIC,
-        hasCloseButton: false,
-        title: o(Fragment, {
-          children: [i18n.get("helpUsVerifyCompany"), " ", o(Link, {
-            onClick: (e2) => {
-              e2.preventDefault();
-              navigateToEditTrustMemberOwner("", trustMember.reference);
-            },
-            href: "to-company-owner",
-            children: i18n.get("providePersonalDetailsOfOwner")
-          })]
-        }),
-        className: "adl-u-margin-top-16"
-      });
-    }
-  };
-  const actions = (trustMember) => {
-    const ownerId = getTrustMemberOwnerId(trustMember.reference, trustResponse);
-    const editCompanyTrusteeAction = trustMember.legalEntityType === LegalEntityType.ORGANIZATION ? ownerId ? {
-      icon: "edit",
-      onSelect: () => navigateToEditTrustMemberOwner(ownerId, trustMember.reference),
-      label: i18n.get("editEntityOwner"),
-      title: i18n.get("editOwnerOfTrustMember", {
-        values: {
-          trustMember: trustMember.name
-        }
-      })
-    } : {
-      icon: "plus",
-      onSelect: () => navigateToEditTrustMemberOwner("", trustMember.reference),
-      label: i18n.get("addEntityOwner"),
-      title: i18n.get("addOwnerToTrustMember", {
-        values: {
-          trustMember: trustMember.name
-        }
-      })
-    } : void 0;
-    return [{
-      icon: "edit",
-      onSelect: () => navigateToEditTrustMember(trustMember),
-      label: i18n.get("editEntityDetails"),
-      title: i18n.get("editTrustMember", {
-        values: {
-          trustMember: trustMember.name
-        }
-      })
-    }, editCompanyTrusteeAction, {
-      icon: "bin",
-      onSelect: () => deleteTrustMember(trustMember.reference),
-      label: i18n.get("remove"),
-      title: i18n.get("removeTrustMember", {
-        values: {
-          trustMember: trustMember.name
-        }
-      })
-    }].filter((action) => Boolean(action));
-  };
+  const trustMembersWithOneOfGivenRoles = (roleTypes) => trustMembers2.filter(({
+    roles
+  }) => roleTypes.some((label) => roles.includes(label)));
   return o(DropinLayout, {
     content: o("div", {
       className: "adl-trust-members adl-u-width-full",
@@ -22092,10 +22294,10 @@ const TrustMembersComponent = ({
           max,
           label
         }) => o(EntityGuidanceStatus, {
-          country: "AU",
+          country: CountryCodes.Australia,
           currentTask: TaskTypes.TRUST_MEMBER_OVERVIEW,
           entityLabel: label,
-          status: iconStatus(uniqueTrustMembersPerType(roleTypes), min, max)
+          status: iconStatus(trustMembersWithOneOfGivenRoles(roleTypes).length, min, max)
         }, label))
       }), o(ReviewAlert, {}), o(ContextGuidance, {
         page: "Trust members",
@@ -22113,36 +22315,54 @@ const TrustMembersComponent = ({
         titleId: "whatIsTheDifferenceBetweenTheseRoles",
         contentId: "differenceBetweenTrustMemberRoles"
       }), o(CardGroup, {
-        children: [o(EntityAssociation, {
-          types: [TrustMemberTypes.TRUSTEE],
-          reference: parentLegalEntity.id,
-          status: getTaskStatus(EntityType.LEGAL_ENTITY, capabilityProblems, parentLegalEntity, [parentLegalEntity.id]),
-          name: trusteeName,
-          legalEntityType: parentLegalEntity.type
-        }, parentLegalEntity.id), uniqueTrustMembers.map((trustMember) => o(EntityAssociation, {
-          types: trustMember.types,
-          reference: trustMember.reference,
-          status: trustMember.status,
-          name: trustMember.name,
-          legalEntityType: trustMember.legalEntityType,
-          actions: actions(trustMember),
-          infoContent: infoContent(trustMember),
-          onNavigateToEntity: () => navigateToEditTrustMember(trustMember)
-        }, trustMember.reference)), o(UndefinedBeneficiaries, {
-          undefinedBeneficiaries: ((_a = trustResponse.trust) == null ? void 0 : _a.undefinedBeneficiaryInfo) ?? [],
-          onDelete: deleteUndefinedBeneficiary,
-          onEdit: navigateToEditTrustMember
-        })]
+        children: trustMembers2.map((trustMember) => {
+          switch (trustMember.trustMemberType) {
+            case "rootTrustee":
+              return o(RootTrusteeTaskItem, {
+                rootTrustee: trustMember,
+                taskStatus: getTrustMemberTaskStatus(trustMember)
+              });
+            case "regular":
+              return o(RegularTrustMemberTaskItem, {
+                trustMember,
+                taskStatus: getTrustMemberTaskStatus(trustMember),
+                onEdit: () => navigateToEditTrustMember(trustMember),
+                onDelete: () => deleteTrustMember(trustMember)
+              });
+            case "company":
+              return o(CompanyTrustMemberTaskItem, {
+                companyTrustMember: trustMember,
+                taskStatus: getTrustMemberTaskStatus(trustMember),
+                onEdit: () => navigateToEditTrustMember(trustMember),
+                onDelete: () => deleteTrustMember(trustMember),
+                onEditOwner: () => navigateToEditTrustMemberOwner(trustMember.ownerId, trustMember.legalEntityId),
+                onAddOwner: () => navigateToEditTrustMemberOwner("", trustMember.legalEntityId)
+              });
+            case "exemptSettlor":
+              return o(ExemptSettlorTaskItem, {
+                exemptSettlor: trustMember,
+                taskStatus: getTrustMemberTaskStatus(trustMember),
+                onEdit: () => navigateToEditTrustMember(trustMember),
+                onDelete: () => deleteTrustMember(trustMember)
+              });
+            case "undefinedBeneficiary":
+              return o(UndefinedBeneficiaryTaskItem, {
+                undefinedBeneficiary: trustMember,
+                onEdit: () => navigateToEditTrustMember(trustMember),
+                onDelete: () => deleteTrustMember(trustMember)
+              });
+          }
+        })
       }), o(Button, {
         secondary: true,
         className: cx("adl-trust-members__add", {
-          "adl-trust-members__add--more": uniqueTrustMembers.length > 0
+          "adl-trust-members__add--more": trustMembers2.length > 0
         }),
         icon: "plus",
         title: i18n.get("addTrustMember"),
         onClick: (e2) => {
           e2.stopPropagation();
-          navigateToEditTrustMember();
+          navigateToEditTrustMember("new");
         },
         label: i18n.get("addTrustMember")
       }), o(ActionBar, {
@@ -22257,7 +22477,7 @@ function IndividualDropinComponent({
   onChange,
   problems: propProblems,
   handleUpdateLegalEntity,
-  associationDetail,
+  trustMember,
   onSubmit: externalOnSubmit,
   onTypeSwitch
 }) {
@@ -22415,22 +22635,22 @@ function IndividualDropinComponent({
     legalEntity,
     dataSubmitted
   }) => {
-    if (!isDocumentsRequired2(forms2))
-      return;
-    if (hasInstantIdVerification(dataSubmitted)) {
-      await handleInstantIdVerificationStartCheck(dataSubmitted.idDocument.instantIdVerificationData, legalEntity.id);
-    } else {
-      const formattedDocuments = await mapIndividualDocumentToApiDocument(dataSubmitted, legalEntity.id);
-      const uploadedDocuments = await documentUtils.uploadDocuments(formattedDocuments, legalEntity.id);
-      uploadedDocuments == null ? void 0 : uploadedDocuments.forEach((doc) => {
-        userEvents.addEvent("Saved document", {
-          segmentation: {
-            ...baseTrackingPayload,
-            documentType: doc.type,
-            fileExtention: doc.attachments.map((item) => getFileExtention(item.pageName))
-          }
+    if (isDocumentsRequired2(forms2)) {
+      if (hasInstantIdVerification(dataSubmitted)) {
+        await handleInstantIdVerificationStartCheck(dataSubmitted.idDocument.instantIdVerificationData, legalEntity.id);
+      } else {
+        const formattedDocument = await mapIndividualDocumentToApiDocument(dataSubmitted, legalEntity.id);
+        await documentUtils.uploadDocuments(formattedDocument, legalEntity.id);
+        formattedDocument == null ? void 0 : formattedDocument.forEach((doc) => {
+          userEvents.addEvent("Saved document", {
+            segmentation: {
+              ...baseTrackingPayload,
+              documentType: doc.type,
+              fileExtention: doc.attachments.map((item) => getFileExtention(item.pageName))
+            }
+          });
         });
-      });
+      }
     }
   };
   const hasInstantIdVerification = (dataSubmitted) => {
@@ -22456,7 +22676,7 @@ function IndividualDropinComponent({
     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 ? associationDetail == null ? void 0 : associationDetail.types : null;
+    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);
     if (newRoles && hasRolesChanged(legalEntity, existingEntityAssociations, newRoles)) {
       const updatedParentLegalEntity = {
@@ -22597,11 +22817,14 @@ function IndividualDropinComponent({
     };
   };
   const formatDataForSummary = () => {
-    var _a2, _b2;
+    var _a2, _b2, _c2;
     let summaryData = cloneObject(data);
     if ((_a2 = summaryData.personalDetails) == null ? void 0 : _a2.residencyCountry) {
       summaryData.personalDetails.residencyCountry = datasetUtils.getCountryName(summaryData.personalDetails.residencyCountry);
     }
+    if ((_b2 = summaryData.personalDetails) == null ? void 0 : _b2.nationality) {
+      summaryData.personalDetails.nationality = datasetUtils.getCountryName(summaryData.personalDetails.nationality);
+    }
     if (summaryData.address) {
       summaryData.address = mapAddressLabels(summaryData.address, datasetUtils);
     }
@@ -22612,7 +22835,7 @@ function IndividualDropinComponent({
         ...formatFileSummaryData2(data)
       };
     }
-    if ((_b2 = summaryData == null ? void 0 : summaryData.personalDetails) == null ? void 0 : _b2.accountHolder) {
+    if ((_c2 = summaryData == null ? void 0 : summaryData.personalDetails) == null ? void 0 : _c2.accountHolder) {
       summaryData.personalDetails.accountHolder = i18n.get(summaryData.personalDetails.accountHolder);
     }
     return summaryData;
@@ -22780,7 +23003,8 @@ function PayoutDetailsDropinComponent({
 }) {
   var _a, _b, _c;
   const {
-    i18n
+    i18n,
+    setLocale
   } = useCoreContext();
   const {
     showToast,
@@ -22831,6 +23055,7 @@ function PayoutDetailsDropinComponent({
     task: taskType
   });
   p(() => {
+    eventEmitter.on("updateLocale", (locale) => setLocale(locale));
     userEvents.addPageView("Payout dropin");
     userEvents.addEvent("Started payout task", {
       segmentation: {
@@ -23712,11 +23937,42 @@ function PciDropinComponent({
     footer
   });
 }
+const convertExistingSettlorExemptionReasons = (existingReasons) => {
+  if (!existingReasons || !existingReasons.length)
+    return ["noneOfTheAbove"];
+  return existingReasons;
+};
+const convertExistingTrustMember = (trustMember) => {
+  switch (trustMember.trustMemberType) {
+    case "undefinedBeneficiary":
+      return {
+        entityType: LegalEntityType.INDIVIDUAL,
+        role: ["undefinedBeneficiary"],
+        descriptionUndefinedBeneficiary: trustMember.description
+      };
+    case "regular":
+    case "company":
+    case "rootTrustee":
+      return {
+        entityType: trustMember.legalEntityType,
+        role: trustMember.roles,
+        settlorExemptionReason: ["noneOfTheAbove"]
+      };
+    case "exemptSettlor":
+      return {
+        entityType: LegalEntityType.INDIVIDUAL,
+        role: ["settlor"],
+        settlorExemptionReason: convertExistingSettlorExemptionReasons(trustMember.settlorExemptionReason),
+        firstName: trustMember.exemptSettlorName.firstName,
+        lastName: trustMember.exemptSettlorName.lastName
+      };
+  }
+};
 const allowedCrossoverRolesMatrix = {
-  settlor: ["trustee", "protector"],
-  trustee: ["settlor", "protector", "definedBeneficiary"],
-  protector: ["settlor", "trustee", "definedBeneficiary"],
-  definedBeneficiary: ["trustee", "protector"],
+  settlor: ["secondaryTrustee", "protector"],
+  secondaryTrustee: ["settlor", "protector", "definedBeneficiary"],
+  protector: ["settlor", "secondaryTrustee", "definedBeneficiary"],
+  definedBeneficiary: ["secondaryTrustee", "protector"],
   undefinedBeneficiary: []
 };
 const getAvailableRoles = (currentRoles) => {
@@ -23773,31 +24029,22 @@ const decideFields = (data) => {
     return ["role", "descriptionUndefinedBeneficiary"];
   }
   if ((_b = data.role) == null ? void 0 : _b.length) {
-    return couldBeExemptSettlor(data) ? ["role", "entityType", "settlorExemptionReason"] : ["role", "entityType"];
+    if (couldBeExemptSettlor(data)) {
+      return isExemptSettlor(data) ? ["role", "entityType", "settlorExemptionReason", "firstName", "lastName"] : ["role", "entityType", "settlorExemptionReason"];
+    }
+    return ["role", "entityType"];
   }
   return ["role"];
 };
-const convertExistingSettlorExemptionReasons = (existingReasons) => {
-  if (!existingReasons || !existingReasons.length)
-    return ["noneOfTheAbove"];
-  return existingReasons;
-};
-function TrustRoleAndEntityTypeComponent(props) {
+const TrustRoleAndEntityType = (props) => {
   const {
-    trustMember,
+    existingTrustMember,
     id: id2
   } = props;
   const {
     i18n
   } = useCoreContext();
-  const defaultData = {
-    entityType: trustMember == null ? void 0 : trustMember.legalEntityType,
-    role: trustMember == null ? void 0 : trustMember.types,
-    descriptionUndefinedBeneficiary: trustMember == null ? void 0 : trustMember.descriptionUndefinedBeneficiary
-  };
-  if (couldBeExemptSettlor(defaultData)) {
-    defaultData.settlorExemptionReason = convertExistingSettlorExemptionReasons(trustMember == null ? void 0 : trustMember.settlorExemptionReason);
-  }
+  const defaultData = existingTrustMember ? convertExistingTrustMember(existingTrustMember) : {};
   const formUtils = formUtilities(props, i18n);
   const {
     data,
@@ -23806,7 +24053,10 @@ function TrustRoleAndEntityTypeComponent(props) {
     errors,
     fieldProblems,
     handleChangeFor,
-    isValid
+    isValid,
+    setData,
+    setValid,
+    setErrors
   } = useForm({
     ...props,
     schema: decideFields,
@@ -23849,6 +24099,19 @@ function TrustRoleAndEntityTypeComponent(props) {
     }
     handleChangeFor("settlorExemptionReason")(exemptionReasons);
   };
+  const nameProps = getFieldProps(props, nameFields);
+  const onNameChange = ({
+    data: data2,
+    valid: valid2,
+    errors: errors2
+  }) => {
+    setData("firstName", data2.firstName);
+    setValid("firstName", valid2.firstName);
+    setErrors("firstName", errors2.firstName);
+    setData("lastName", data2.lastName);
+    setValid("lastName", valid2.lastName);
+    setErrors("lastName", errors2.lastName);
+  };
   return o("form", {
     className: "adyen-kyc-trust__role-and-entity-type adl-u-width-full",
     children: [o(FormHeader, {
@@ -23882,7 +24145,7 @@ function TrustRoleAndEntityTypeComponent(props) {
       errorMessage: formUtils.getErrorMessage("entityType", errors, fieldProblems),
       label: formUtils.getLabel("entityType", "whatTypeOfYourMembersEntity"),
       classNameModifiers: ["entityType"],
-      disabled: !!(trustMember == null ? void 0 : trustMember.reference),
+      disabled: Boolean(existingTrustMember),
       children: (childProps) => o(RadioCardSelect, {
         ...childProps,
         options: trustMemberLegalEntityTypes,
@@ -23928,14 +24191,29 @@ function TrustRoleAndEntityTypeComponent(props) {
           name: i18n.get(reason)
         })
       })
-    })]
+    }), (schema == null ? void 0 : schema.includes("firstName")) || schema.includes("lastName") ? o(Name, {
+      ...nameProps,
+      data: {
+        firstName: defaultData.firstName,
+        lastName: defaultData.lastName
+      },
+      requiredFields: schema.filter((field) => nameFields.includes(field)),
+      labels: {
+        firstName: "firstNameOfSettlor",
+        lastName: "lastNameOfSettlor",
+        enterNameExactlyAsAppearInID: "enterSettlorsFirstNameExactlyAsItAppearsInID",
+        enterLastNameExactlyAsAppearInID: "enterSettlorsLastNameExactlyAsItAppearsInID"
+      },
+      onChange: onNameChange,
+      dataStoreId: id2
+    }) : void 0]
   });
-}
+};
 const summary = {
   formId: "summary",
   formName: "summary"
 };
-const roleAndTypeForms = {
+const regularForms = {
   roleAndEntityType: {
     formId: "roleAndEntityType",
     formName: "roleAndEntityType",
@@ -23963,124 +24241,98 @@ const exemptSettlorForms = {
   },
   summary
 };
-const logger$3 = createLogger("RoleAndTypeDropin");
-function RoleAndTypeDropinComponent(props) {
-  var _a, _b;
+const decideForms = (trustMember) => {
+  if (trustMember === "incomplete")
+    return regularForms;
+  switch (trustMember.trustMemberType) {
+    case "undefinedBeneficiary":
+      return undefinedBeneficiaryForms;
+    case "exemptSettlor":
+      return exemptSettlorForms;
+    case "rootTrustee":
+    case "regular":
+    case "company":
+      return regularForms;
+  }
+};
+const convertDataToTrustMember = (data, existingTrustMember) => {
+  var _a;
+  const existingId = existingTrustMember ? existingTrustMember.trustMemberType === "undefinedBeneficiary" ? existingTrustMember.reference : existingTrustMember.legalEntityId : void 0;
+  if ((_a = data.role) == null ? void 0 : _a.length) {
+    if (isExemptSettlor(data))
+      return {
+        trustMemberType: "exemptSettlor",
+        roles: [TrustMemberTypes.SETTLOR],
+        legalEntityType: LegalEntityType.INDIVIDUAL,
+        settlorExemptionReason: data.settlorExemptionReason.filter((reason) => reason !== "noneOfTheAbove"),
+        exemptSettlorName: {
+          firstName: data.firstName ?? "",
+          lastName: data.lastName ?? ""
+        },
+        legalEntityId: existingId ?? ""
+      };
+    if (data.role.includes("undefinedBeneficiary"))
+      return {
+        trustMemberType: "undefinedBeneficiary",
+        roles: [TrustMemberTypes.UNDEFINED_BENEFICIARY],
+        description: data.descriptionUndefinedBeneficiary ?? "",
+        reference: existingId ?? ""
+      };
+    if (data.entityType === LegalEntityType.ORGANIZATION)
+      return {
+        trustMemberType: "company",
+        roles: data.role,
+        legalEntityType: LegalEntityType.ORGANIZATION,
+        legalEntityId: existingId ?? "",
+        name: ""
+      };
+    if (data.entityType === LegalEntityType.INDIVIDUAL)
+      return {
+        trustMemberType: "regular",
+        roles: data.role,
+        legalEntityType: LegalEntityType.INDIVIDUAL,
+        legalEntityId: existingId ?? "",
+        name: ""
+      };
+  }
+  return "incomplete";
+};
+function RoleAndTypeDropinComponent({
+  existingTrustMember,
+  navigateToFullDropinFor,
+  navigateBack,
+  addOrUpdateTrustMember
+}) {
   const {
     i18n
   } = useCoreContext();
-  const {
-    showToast
-  } = useToastContext();
-  const [trustMember, setTrustMember] = h(props.trustMember);
+  const [trustMember, setTrustMember] = h(existingTrustMember ?? "incomplete");
   const [shouldValidate, setShouldValidate] = h(false);
-  const roleAndEntityTypeFormID = "roleAndEntityType";
-  const [formList, setFormList] = h([...Object.values(roleAndTypeForms)]);
+  const formList = decideForms(trustMember);
+  const forms = Object.values(formList);
   const [formValidity, setFormValidity] = h({
-    [roleAndEntityTypeFormID]: false
+    roleAndEntityType: false
   });
-  const taskName = "trustMembers";
-  const [activeForm, setActiveForm] = h(formList[0]);
+  const [activeForm, setActiveForm] = h(regularForms.roleAndEntityType);
   const isSummaryStep = activeForm.formId === summaryStep.formId;
-  const trustMemberCase = ((_a = trustMember == null ? void 0 : trustMember.settlorExemptionReason) == null ? void 0 : _a.length) ? "exemptSettlor" : ((_b = trustMember == null ? void 0 : trustMember.types) == null ? void 0 : _b.includes(TrustMemberTypes.UNDEFINED_BENEFICIARY)) ? "undefinedBeneficiary" : "fullEntity";
-  const navigateToTrustMember = () => {
-    const trustMemberAssociation = {
-      ...props.trustMember,
-      legalEntityType: trustMember == null ? void 0 : trustMember.legalEntityType,
-      types: trustMember == null ? void 0 : trustMember.types
-    };
-    props.navigateNext(trustMemberAssociation);
-  };
-  const submitExemptSettlor = async (exemptSettlor, trustLE) => {
-    var _a2;
-    const existingTrustMembers = getOwnTrustMembers(trustLE);
-    const existingSettlor = existingTrustMembers.find((member) => member.type === "settlor");
-    const updatedAssociations = [...(trustLE.entityAssociations ?? []).filter((association) => association !== existingSettlor), exemptSettlor];
-    const updatedTrustLE = {
-      ...trustLE,
-      entityAssociations: updatedAssociations
-    };
-    try {
-      await ((_a2 = props.handleUpdateLegalEntity) == null ? void 0 : _a2.call(props, updatedTrustLE, trustLE.id));
-      showToast({
-        label: i18n.get("successfullyUpdatedDetails"),
-        type: ToastType.SUCCESS
-      });
-      props.onSubmit(updatedTrustLE);
-    } catch (e2) {
-      logger$3.error(e2);
-      showToast({
-        label: i18n.get("failedToUpdateDetails"),
-        type: ToastType.ERROR
-      });
-    }
-  };
-  const submitUndefinedBeneficiary = async () => {
-    var _a2, _b2, _c;
-    if (((_a2 = props.trustMember) == null ? void 0 : _a2.descriptionUndefinedBeneficiary) === (trustMember == null ? void 0 : trustMember.descriptionUndefinedBeneficiary)) {
-      props.onSubmit(props.trust);
-      return;
-    }
-    const existingUndefinedBeneficiaryInfo = (((_b2 = props.trust.trust) == null ? void 0 : _b2.undefinedBeneficiaryInfo) ?? []).filter((ub) => ub.reference !== (trustMember == null ? void 0 : trustMember.reference));
-    const updatedTrust = {
-      trust: {
-        undefinedBeneficiaryInfo: [{
-          ...(trustMember == null ? void 0 : trustMember.reference) && {
-            reference: trustMember == null ? void 0 : trustMember.reference
-          },
-          description: (trustMember == null ? void 0 : trustMember.descriptionUndefinedBeneficiary) || ""
-        }, ...existingUndefinedBeneficiaryInfo]
-      }
-    };
-    try {
-      await ((_c = props.handleUpdateLegalEntity) == null ? void 0 : _c.call(props, updatedTrust, props.trust.id));
-      showToast({
-        label: i18n.get("successfullyUpdatedDetails"),
-        type: ToastType.SUCCESS
-      });
-      props.onSubmit(updatedTrust);
-    } catch (e2) {
-      logger$3.error(e2);
-      showToast({
-        label: i18n.get("failedToUpdateDetails"),
-        type: ToastType.ERROR
-      });
-    }
-  };
   const formatRolesForSummary = (roles) => roles.map((role2) => i18n.get(getTrustMemberName(role2))).join(", ");
   const formatSettlorExemptionReasonsForSummary = (reasons) => reasons.map((reason) => i18n.get(reason)).join(", ");
-  const summaryData = {
+  const summaryData = trustMember === "incomplete" ? {} : {
     roleAndEntityType: {
-      role: formatRolesForSummary((trustMember == null ? void 0 : trustMember.types) ?? []),
-      entityType: (trustMember == null ? void 0 : trustMember.legalEntityType) ? i18n.get(trustMember == null ? void 0 : trustMember.legalEntityType) : void 0,
-      descriptionUndefinedBeneficiary: trustMember == null ? void 0 : trustMember.descriptionUndefinedBeneficiary,
-      otherInformation: formatSettlorExemptionReasonsForSummary((trustMember == null ? void 0 : trustMember.settlorExemptionReason) ?? [])
+      role: formatRolesForSummary(trustMember.roles),
+      entityType: trustMember.trustMemberType !== "undefinedBeneficiary" ? i18n.get(trustMember.legalEntityType) : void 0,
+      descriptionUndefinedBeneficiary: trustMember.trustMemberType === "undefinedBeneficiary" ? trustMember.description : void 0,
+      otherInformation: trustMember.trustMemberType === "exemptSettlor" ? formatSettlorExemptionReasonsForSummary(trustMember.settlorExemptionReason ?? []) : void 0,
+      firstName: trustMember.trustMemberType === "exemptSettlor" ? trustMember.exemptSettlorName.firstName : void 0,
+      lastName: trustMember.trustMemberType === "exemptSettlor" ? trustMember.exemptSettlorName.lastName : void 0
     }
   };
   const onNavigateToNextStep = () => {
-    if (isSummaryStep) {
-      switch (trustMemberCase) {
-        case "exemptSettlor":
-          if (!trustMember)
-            return;
-          submitExemptSettlor(trustMember, props.trust).catch(logger$3.error);
-          break;
-        case "undefinedBeneficiary":
-          submitUndefinedBeneficiary().catch(logger$3.error);
-          break;
-        default:
-          return;
-      }
-    }
-    if (!formValidity[roleAndEntityTypeFormID]) {
-      setShouldValidate(true);
+    if (isSummaryStep && trustMember !== "incomplete") {
+      addOrUpdateTrustMember(trustMember);
       return;
     }
-    if (trustMemberCase === "fullEntity") {
-      navigateToTrustMember();
-    } else {
-      setActiveForm(summary);
-    }
+    gotoFormByFormIndex(forms.findIndex((form) => form.formId === activeForm.formId) + 1);
   };
   const onTrustMemberChange = ({
     data,
@@ -24093,69 +24345,51 @@ function RoleAndTypeDropinComponent(props) {
         [dataStoreId]: isValid
       });
     }
-    if ((data == null ? void 0 : data.role) && data.role.includes(TrustMemberTypes.UNDEFINED_BENEFICIARY)) {
-      setFormList([...Object.values(undefinedBeneficiaryForms)]);
-    } else if (isExemptSettlor(data)) {
-      setFormList([...Object.values(exemptSettlorForms)]);
-    } else {
-      setFormList([...Object.values(roleAndTypeForms)]);
-    }
-    setTrustMember({
-      ...props.trustMember,
-      ...data.role ? {
-        types: data.role
-      } : {},
-      legalEntityType: data.entityType,
-      ...data.descriptionUndefinedBeneficiary ? {
-        descriptionUndefinedBeneficiary: data.descriptionUndefinedBeneficiary
-      } : {},
-      ...isExemptSettlor(data) ? {
-        settlorExemptionReason: data.settlorExemptionReason.filter((reason) => reason !== "noneOfTheAbove")
-      } : {}
-    });
+    setTrustMember(convertDataToTrustMember(data, existingTrustMember));
   };
   const saveRolesAndNavigate = async () => {
-    var _a2, _b2, _c;
-    if (!trustMember) {
+    if (trustMember === "incomplete")
       return;
+    if (hasRolesChanged(trustMember.roles, existingTrustMember == null ? void 0 : existingTrustMember.roles)) {
+      addOrUpdateTrustMember(trustMember);
     }
-    const {
-      reference
-    } = trustMember;
-    if (reference && hasRolesChanged(trustMember.types, (_a2 = props.trustMember) == null ? void 0 : _a2.types) && props.trust.id) {
-      const existingTrustAssociations = getOwnEntityAssociations(props.trust);
-      const updatedTrustAssociations = {
-        entityAssociations: [...((_b2 = trustMember.types) == null ? void 0 : _b2.map((role2) => ({
-          type: role2,
-          reference
-        }))) || [], ...existingTrustAssociations.filter((ea) => ea.legalEntityId !== trustMember.reference) || []]
-      };
-      await ((_c = props.handleUpdateLegalEntity) == null ? void 0 : _c.call(props, updatedTrustAssociations, props.trust.id));
-    }
-    props.navigateBack();
+    navigateBack();
   };
   const hasRolesChanged = (newRoles = [], existingRoles = []) => newRoles.length !== existingRoles.length || !newRoles.every((newRole) => existingRoles.includes(newRole));
-  const formsWithValidity = Object.values(formList).map((form) => ({
+  const formsWithValidity = forms.map((form) => ({
     formId: form.formId,
     formName: form.formName,
     isValid: formValidity[form.formId]
   }));
   const gotoFormByFormIndex = (formIndex) => {
-    setActiveForm(formList[formIndex]);
+    const targetForm = forms[formIndex];
+    if (!formValidity.roleAndEntityType || trustMember === "incomplete") {
+      setShouldValidate(true);
+      return;
+    }
+    if (trustMember.trustMemberType === "regular" || trustMember.trustMemberType === "company") {
+      if (targetForm.formId === regularForms.memberDetails.formId) {
+        navigateToFullDropinFor(trustMember);
+        return;
+      }
+      if (targetForm.formId === summaryStep.formId)
+        return;
+    }
+    setActiveForm(targetForm);
   };
   const content = o(Fragment, {
     children: [o(FormNavigation, {
       forms: formsWithValidity,
       activeForm: formsWithValidity.find((form) => form.formId === activeForm.formId),
-      taskName,
-      gotoForm: noop
+      taskName: "trustMembers",
+      gotoForm: gotoFormByFormIndex
     }), o("div", {
       className: "adyen-kyc-form-container",
       children: [o("div", {
         className: activeForm.formId !== "roleAndEntityType" ? "adyen-kyc-form-wrapper adyen-kyc-form-wrapper--hidden" : "adyen-kyc-form-wrapper",
-        children: o(TrustRoleAndEntityTypeComponent, {
-          id: roleAndEntityTypeFormID,
-          trustMember: props.trustMember,
+        children: o(TrustRoleAndEntityType, {
+          id: "roleAndEntityType",
+          existingTrustMember,
           onChange: onTrustMemberChange,
           shouldValidate
         })
@@ -24699,7 +24933,7 @@ function withFormComposer(WrappedComponent, {
   getConfigFor = "contextCountry"
 }) {
   const WithFormComposer = (props) => {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c;
     const {
       i18n,
       loadingContext,
@@ -25045,7 +25279,7 @@ function withFormComposer(WrappedComponent, {
         validateForm: validateCurrentForm,
         taskName,
         trackNavigation: trackNavigation2,
-        hasVerificationErrors: ((_c = props == null ? void 0 : props.problems) == null ? void 0 : _c.verificationErrors) && ((_e = Object.keys((_d = props == null ? void 0 : props.problems) == null ? void 0 : _d.verificationErrors)) == null ? void 0 : _e.length) > 0
+        verificationErrors: (_c = props == null ? void 0 : props.problems) == null ? void 0 : _c.verificationErrors
       })
     });
     const content = o(Fragment, {
@@ -25514,6 +25748,10 @@ function DropinComposerComponent({
   const [legalEntityType, setLegalEntityType] = h(null);
   const [solePropietor, setSolePropietor] = h(null);
   const [trust, setTrust] = h(null);
+  const exemptSettlor = useExemptSettlor({
+    trust,
+    handleGetLegalEntity: args.handleGetLegalEntity
+  });
   const [trustMember, setTrustMember] = h(null);
   const [pciTemplateResponse, setPciTemplateResponse] = h(null);
   const [pciStatus, setPciStatus] = h(null);
@@ -25655,6 +25893,101 @@ function DropinComposerComponent({
       }
     }
   };
+  const deleteTrustMember = async (trustMember2) => {
+    try {
+      switch (trustMember2.trustMemberType) {
+        case "regular":
+        case "exemptSettlor":
+        case "company":
+          await deleteAssociatedTrustMember({
+            associatedTrustMember: trustMember2,
+            trust,
+            handleUpdateLegalEntity: args.handleUpdateLegalEntity
+          });
+          break;
+        case "undefinedBeneficiary":
+          await deleteUndefinedBeneficiary({
+            undefinedBeneficiary: trustMember2,
+            trust,
+            handleUpdateLegalEntity: args.handleUpdateLegalEntity
+          });
+          break;
+        case "rootTrustee":
+          throw new Error("Cannot delete root trustee");
+      }
+      await refreshTrust();
+      showToast({
+        type: ToastType.SUCCESS,
+        label: i18n.get("successFullyRemovedTrustMember")
+      });
+    } catch (err) {
+      logger$1.error(`Failed to delete trust member`, err);
+      showToast({
+        type: ToastType.ERROR,
+        label: i18n.get("failedToRemoveTrustMember")
+      });
+    }
+  };
+  const addOrUpdateTrustMember = async (updated, existing) => {
+    if ((existing == null ? void 0 : existing.trustMemberType) === "undefinedBeneficiary" && updated.trustMemberType === "undefinedBeneficiary" && existing.description === updated.description) {
+      await refreshTrustAndRunOnSubmit(trust);
+      return;
+    }
+    try {
+      switch (updated.trustMemberType) {
+        case "undefinedBeneficiary":
+          await addOrUpdateUndefinedBeneficiary({
+            newOrUpdated: updated,
+            trust,
+            handleUpdateLegalEntity: args.handleUpdateLegalEntity
+          });
+          break;
+        case "exemptSettlor":
+          if (!existing) {
+            const newSettlorLE = await createExemptSettlor({
+              exemptSettlor: updated,
+              trust,
+              handleCreateLegalEntity: args.handleCreateLegalEntity
+            });
+            updated.legalEntityId = newSettlorLE.id;
+          }
+          if (existing && !exemptSettlorNamesTheSame(existing, updated)) {
+            await updateExemptSettlorName({
+              exemptSettlor: updated,
+              handleUpdateLegalEntity: args.handleUpdateLegalEntity
+            });
+          }
+          await addOrUpdateAssociatedTrustMember({
+            newOrUpdated: updated,
+            trust,
+            handleUpdateLegalEntity: args.handleUpdateLegalEntity
+          });
+          break;
+        case "regular":
+        case "company":
+          await addOrUpdateAssociatedTrustMember({
+            newOrUpdated: updated,
+            trust,
+            handleUpdateLegalEntity: args.handleUpdateLegalEntity
+          });
+          break;
+        case "rootTrustee":
+        default:
+          logger$1.warn(`Updating trust member type "${trustMember.trustMemberType}" is not implemented.`);
+      }
+      showToast({
+        label: i18n.get("successfullyUpdatedDetails"),
+        type: ToastType.SUCCESS
+      });
+      await refreshTrustAndRunOnSubmit(trust);
+    } catch (err) {
+      logger$1.error(err);
+      showToast({
+        label: i18n.get("failedToUpdateDetails"),
+        type: ToastType.ERROR
+      });
+    }
+  };
   const onNavigateTo = (task) => {
     setTaskHistory([...taskHistory, task]);
     onNavigate(task);
@@ -25735,14 +26068,14 @@ function DropinComposerComponent({
   };
   const onNavigateToTrustMember = async (tm) => {
     try {
-      if (tm == null ? void 0 : tm.reference) {
-        const response = await (args == null ? void 0 : args.handleGetLegalEntity(tm.reference));
+      if (tm == null ? void 0 : tm.legalEntityId) {
+        const response = await (args == null ? void 0 : args.handleGetLegalEntity(tm.legalEntityId));
         setAssociatedLegalEntity(response);
       } else {
         setAssociatedLegalEntity(null);
       }
       setTrustMember(tm);
-      onNavigateTo(tm.legalEntityType === LegalEntityType.ORGANIZATION ? TaskTypes.TRUST_MEMBER_COMPANY : TaskTypes.TRUST_MEMBER_INDIVIDUAL);
+      onNavigateTo(tm.trustMemberType === "company" ? TaskTypes.TRUST_MEMBER_COMPANY : TaskTypes.TRUST_MEMBER_INDIVIDUAL);
     } catch (e2) {
       showToast({
         label: i18n.get("failedToFetchTrustMemberDetails"),
@@ -25751,11 +26084,7 @@ function DropinComposerComponent({
     }
   };
   const onNavigateToTrustMemberRoleAndType = (tm) => {
-    if (tm) {
-      setTrustMember(tm);
-    } else {
-      setTrustMember(null);
-    }
+    setTrustMember(tm === "new" ? null : tm);
     onNavigateTo(TaskTypes.TRUST_MEMBER_ROLE_AND_TYPE);
   };
   const navigateBack = (stepCount = 1) => {
@@ -26026,7 +26355,7 @@ function DropinComposerComponent({
           handleBackClick: navigateBack,
           handleHomeClick: () => onNavigateTo(TaskTypes.TRUST_MEMBER_OVERVIEW),
           homeButtonLabel: i18n.get("saveAndGoToOverview"),
-          associationDetail: trustMember,
+          trustMember,
           handleAddressSearch: args == null ? void 0 : args.handleAddressSearch,
           handleFindAddress: args == null ? void 0 : args.handleFindAddress,
           handleGetIdVerificationToken: args == null ? void 0 : args.handleGetIdVerificationToken
@@ -26123,27 +26452,23 @@ function DropinComposerComponent({
           handleFindAddress: args == null ? void 0 : args.handleFindAddress
         });
       case TaskTypes.TRUST_MEMBER_OVERVIEW:
-        return o(TrustMembersComponent, {
-          parentLegalEntity: legalEntity,
-          trustResponse: trust,
-          capabilityProblems,
+        return o(TrustMembersOverview, {
+          trustMembers: getTrustMembers(trust, legalEntity, exemptSettlor),
+          getTrustMemberTaskStatus: (member) => getTaskStatus(EntityType.LEGAL_ENTITY, capabilityProblems, legalEntity, member.trustMemberType === "undefinedBeneficiary" ? void 0 : [member.legalEntityId]),
+          navigateBackToTaskList: navigateBack,
           navigateToEditTrustMember: onNavigateToTrustMemberRoleAndType,
           navigateToEditTrustMemberOwner: (trustMemberOwnerId, trustMemberId) => onNavigateToDecisionMakerIndividual(TaskTypes.TRUST_MEMBER_COMPANY_OWNER, trustMemberOwnerId, trustMemberId),
-          navigateBackToTaskList: navigateBack,
-          handleUpdateLegalEntity: args == null ? void 0 : args.handleUpdateLegalEntity,
-          onTrustMemberDelete: refreshTrust
+          deleteTrustMember
         });
       case TaskTypes.TRUST_MEMBER_ROLE_AND_TYPE:
         return o(RoleAndTypeDropinComponent, {
-          navigateNext: onNavigateToTrustMember,
+          navigateToFullDropinFor: onNavigateToTrustMember,
           navigateBack: async () => {
             await refreshTrust();
             navigateBack();
           },
-          trust,
-          trustMember,
-          handleUpdateLegalEntity: args == null ? void 0 : args.handleUpdateLegalEntity,
-          onSubmit: refreshTrustAndRunOnSubmit
+          existingTrustMember: trustMember,
+          addOrUpdateTrustMember: (newOrUpdated) => addOrUpdateTrustMember(newOrUpdated, trustMember)
         });
       case TaskTypes.PCI_DSS:
         return o(PciDropinComponent, {