@adyen/kyc-components 2.59.11 → 2.60.0

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

@@ -1257,6 +1257,7 @@ const defaultTrans = {
   sortCode: "Sort code",
   ssn: "SSN",
   stamregister: "Stamregister erhverv (SE-nummer)",
+  start: "Start",
   startANewSessionFromTheSamePlaceYouOriginallyAccessed: "Start a new session from the same place you originally accessed this page.",
   startTypingTheAddress: "Start typing the address",
   state: "State",
@@ -2853,12 +2854,13 @@ var ExperimentNames = /* @__PURE__ */ ((ExperimentNames2) => {
   ExperimentNames2["HidePciTask"] = "HidePciTask";
   ExperimentNames2["EnableAgeVerification"] = "EnableAgeVerification";
   ExperimentNames2["PreserveMismatchedInitialValues"] = "PreserveMismatchedInitialValues";
-  ExperimentNames2["StrictNameAndAddressValidationV4"] = "StrictNameAndAddressValidationV4";
   ExperimentNames2["EnableNationalitySGHK"] = "EnableNationalitySGHK";
   ExperimentNames2["EnableAUGovernmentalOrganizationSkipRegistrationNumber"] = "EnableAUGovernmentalOrganizationSkipRegistrationNumber";
   ExperimentNames2["EnableMinimalRegistrationNumberValidationForAuIncorporatedAssociation"] = "EnableMinimalRegistrationNumberValidationForAuIncorporatedAssociation";
-  ExperimentNames2["EnableFinancialInformationComponentV4"] = "EnableFinancialInformationComponentV4";
   ExperimentNames2["EnablePreferInstantVerificationFlow"] = "EnablePreferInstantVerificationFlow";
+  ExperimentNames2["EnableFinancialInformationComponentV4"] = "EnableFinancialInformationComponentV4";
+  ExperimentNames2["StrictNameAndAddressValidationV4"] = "StrictNameAndAddressValidationV4";
+  ExperimentNames2["EnableLemApiVersionV4"] = "EnableLemApiVersionV4";
   ExperimentNames2["EnablePhoneFieldScenario"] = "EnablePhoneFieldScenario";
   return ExperimentNames2;
 })(ExperimentNames || {});
@@ -7972,6 +7974,13 @@ class UserEvents {
   constructor() {
     this.queue = [];
     this.subscriptions = /* @__PURE__ */ new Set();
+    this.baseTrackingPayload = {
+      category: "onboarding",
+      subCategory: "hosted onboarding",
+      countryCode: void 0,
+      capabilities: void 0,
+      legalEntityId: void 0
+    };
   }
   add(...args) {
     this.queue.push(...args);
@@ -7985,30 +7994,16 @@ class UserEvents {
   /**
    * Adds an analytics event. Optionally can include a payload.
    */
-  addEvent(key, event) {
-    this.add(["add_event", { key, ...event }]);
-    this.notifySubscribers();
-  }
-  /**
-   * Logs a page view event
-   * @param pageName - The name of the page/screen to log as viewed
-   */
-  addPageView(pageName) {
-    this.add(["track_pageview", pageName]);
+  addEvent(eventName, properties) {
+    const completeEvent = { ...this.baseTrackingPayload, ...properties };
+    this.add({ type: "add_event", name: eventName, properties: { ...completeEvent } });
     this.notifySubscribers();
   }
   /**
-   * Starts a new event which is expected to be ended with `endEvent` eventually
+   * Starts a timer for an event to measure the time it takes for an event to occur. Time is ended when `addEvent` is executed with the same key
    */
-  startEvent(key) {
-    this.add(["start_event", key]);
-    this.notifySubscribers();
-  }
-  /**
-   * Ends an event previously started with `startEvent`. Optionally can include a payload.
-   */
-  endEvent(key, event) {
-    this.add(["end_event", event ? { key, ...event } : key]);
+  startEvent(eventName) {
+    this.add({ type: "start_event", name: eventName });
     this.notifySubscribers();
   }
   /**
@@ -8029,6 +8024,10 @@ class UserEvents {
   subscribe(callback) {
     this.subscriptions.add(callback);
   }
+  /** Sets params that are sent on every event */
+  updateBaseTrackingPayload(baseTrackingPayload) {
+    this.baseTrackingPayload = { ...this.baseTrackingPayload, ...baseTrackingPayload };
+  }
   /**
    * Removes a subscribed callback
    */
@@ -8044,12 +8043,18 @@ function ContextGuidance({
   title,
   content,
   titleId,
-  contentId
+  contentId,
+  baseTrackingPayload
 }) {
   const onGuidanceToggle = (status) => {
-    const eventAction = status === "open" ? "Open" : "Close";
-    userEvents.addEvent(`${eventAction} contextual guidance information`, {
-      segmentation: { guidancePage: page, guidanceTitleId: titleId, guidanceContentId: contentId }
+    userEvents.addEvent("Clicked accordion", {
+      ...baseTrackingPayload,
+      actionType: status,
+      actionLevel: "field",
+      field: "context guidance",
+      page,
+      label: titleId,
+      content: contentId
     });
   };
   return /* @__PURE__ */ jsx(Alert, { title, type: "collapsible", variant: "info", onToggle: onGuidanceToggle, children: content });
@@ -8130,6 +8135,96 @@ const dateOfIncorporationFieldMetadata = {
     }
   ]
 };
+const DBA_NAME_FIELD = ["hasDba", "dbaName"];
+function DBANameField({
+  data,
+  valid,
+  errors,
+  labels: labels2,
+  legalCompanyName,
+  helperText,
+  readonly,
+  handleChangeFor,
+  setErrors
+}) {
+  const { i18n } = useI18nContext();
+  const { isExperimentEnabled } = useExperimentsContext();
+  const isLemApiVersionV4Enabled = isExperimentEnabled(ExperimentNames.EnableLemApiVersionV4);
+  const selection = useMemo(() => {
+    if (typeof data.hasDba === "undefined") return;
+    if (!data.hasDba) setErrors == null ? void 0 : setErrors("dbaName", null);
+    return data.hasDba ? "yes" : "no";
+  }, [data.hasDba, setErrors]);
+  const handleDbaChange = (selectedValue) => {
+    const isYes = selectedValue === "yes";
+    const isNo = selectedValue === "no";
+    handleChangeFor("hasDba")(isYes);
+    if (isLemApiVersionV4Enabled) {
+      handleChangeFor("doingBusinessAbsent")(isNo);
+      if (isNo) {
+        handleChangeFor("dbaName")(legalCompanyName);
+      }
+    }
+  };
+  return /* @__PURE__ */ jsxs(Fragment, { children: [
+    /* @__PURE__ */ jsx(
+      Field,
+      {
+        name: "hasDba",
+        label: labels2.hasDba ?? i18n.get("hasDba"),
+        helper: (helperText == null ? void 0 : helperText.hasDba) ?? i18n.get("hasDba__helperText"),
+        isValid: valid.hasDba,
+        errorMessage: errors.hasDba,
+        children: (childProps) => /* @__PURE__ */ jsx(
+          RadioGroup,
+          {
+            ...childProps,
+            name: "hasDba",
+            items: [
+              { id: "yes", name: "yes" },
+              { id: "no", name: "no" }
+            ],
+            value: selection,
+            onChange: handleDbaChange,
+            horizontal: true
+          }
+        )
+      }
+    ),
+    data.hasDba && /* @__PURE__ */ jsx(
+      Field,
+      {
+        name: "dbaName",
+        label: labels2.dbaName ?? i18n.get("dbaName"),
+        errorMessage: errors.dbaName,
+        isValid: valid.dbaName,
+        classNameModifiers: ["dbaName"],
+        children: (childProps) => /* @__PURE__ */ jsx(
+          InputText,
+          {
+            ...childProps,
+            "aria-required": true,
+            "aria-label": labels2.dbaName ?? i18n.get("dbaName"),
+            "aria-invalid": !valid.dbaName,
+            name: "dbaName",
+            value: data.dbaName,
+            readonly,
+            classNameModifiers: ["dbaName"],
+            onInput: handleChangeFor("dbaName", "input"),
+            onBlur: handleChangeFor("dbaName", "blur")
+          }
+        )
+      }
+    )
+  ] });
+}
+const hasDbaFieldMetadata = {
+  validators: [validateNotEmptyOnBlur]
+};
+const dbaNameFieldMetadata = {
+  label: "dbaName",
+  validators: [validateNotEmptyOnBlur]
+};
 const inferCompanyRegistrationNumberType = (registrationNumber, country, companyType) => {
   const optionsForCountry = companyRegistrationNumberOptions[country];
   const metadataFn = defaultFieldConfig$9[country];
@@ -9865,6 +9960,46 @@ function VatNumberField({
     )
   ] });
 }
+var TaskTypes = /* @__PURE__ */ ((TaskTypes2) => {
+  TaskTypes2["BUSINESS_TYPE_SELECTION"] = "BUSINESS_TYPE_SELECTION";
+  TaskTypes2["INTRODUCTION"] = "INTRODUCTION";
+  TaskTypes2["TASKS_OVERVIEW"] = "TASKS_OVERVIEW";
+  TaskTypes2["REVIEW"] = "REVIEW";
+  TaskTypes2["INDIVIDUAL"] = "INDIVIDUAL";
+  TaskTypes2["COMPANY"] = "COMPANY";
+  TaskTypes2["BUSINESS_DETAILS"] = "BUSINESS_DETAILS";
+  TaskTypes2["PAYOUT"] = "PAYOUT";
+  TaskTypes2["PAYIN"] = "PAYIN";
+  TaskTypes2["SERVICE_AGREEMENT"] = "SERVICE_AGREEMENT";
+  TaskTypes2["PCI_DSS"] = "PCI_DSS";
+  TaskTypes2["DECISION_MAKER"] = "DECISION_MAKER";
+  TaskTypes2["DECISION_MAKER_OVERVIEW"] = "DECISION_MAKER_OVERVIEW";
+  TaskTypes2["TRUST"] = "TRUST";
+  TaskTypes2["TRUST_MEMBER_OVERVIEW"] = "TRUST_MEMBER";
+  TaskTypes2["TRUST_MEMBER_INDIVIDUAL"] = "TRUST_MEMBER_INDIVIDUAL";
+  TaskTypes2["TRUST_MEMBER_COMPANY"] = "TRUST_MEMBER_COMPANY";
+  TaskTypes2["TRUST_MEMBER_ROLE_AND_TYPE"] = "TRUST_MEMBER_ROLE_AND_TYPE";
+  TaskTypes2["TRUST_MEMBER_COMPANY_OWNER"] = "TRUST_MEMBER_COMPANY_OWNER";
+  TaskTypes2["SOLE_PROPRIETOR_COMPANY"] = "SOLE_PROPRIETOR_COMPANY";
+  TaskTypes2["LEGAL_ENTITY_TYPE_SWITCHER"] = "LEGAL_ENTITY_TYPE_SWITCHER";
+  TaskTypes2["CAPABILITY_REJECTED"] = "CAPABILITY_REJECTED";
+  TaskTypes2["SINGPASS_SELECTION"] = "SINGPASS_SELECTION";
+  TaskTypes2["LEGAL_REPRESENTATIVE_DETAILS"] = "LEGAL_REPRESENTATIVE_DETAILS";
+  return TaskTypes2;
+})(TaskTypes || {});
+var TaskStatus = /* @__PURE__ */ ((TaskStatus2) => {
+  TaskStatus2[TaskStatus2["EMPTY"] = 0] = "EMPTY";
+  TaskStatus2[TaskStatus2["FINISHED"] = 1] = "FINISHED";
+  TaskStatus2[TaskStatus2["PROCESSING"] = 2] = "PROCESSING";
+  TaskStatus2[TaskStatus2["DETAILS_REQUIRED"] = 3] = "DETAILS_REQUIRED";
+  TaskStatus2[TaskStatus2["SIGN"] = 4] = "SIGN";
+  TaskStatus2[TaskStatus2["DOWNLOAD"] = 5] = "DOWNLOAD";
+  TaskStatus2[TaskStatus2["ERROR"] = 6] = "ERROR";
+  TaskStatus2[TaskStatus2["SIGNED"] = 7] = "SIGNED";
+  TaskStatus2[TaskStatus2["SUBMIT"] = 8] = "SUBMIT";
+  TaskStatus2[TaskStatus2["REMOVING"] = 9] = "REMOVING";
+  return TaskStatus2;
+})(TaskStatus || {});
 const FLOWS_THAT_HIDE_REGISTRATION_NUMBER = [
   { companyType: [CompanyTypesValue.SOLE_PROPRIETORSHIP], country: CountryCodes.Gibraltar },
   { companyType: [CompanyTypesValue.SOLE_PROPRIETORSHIP], country: CountryCodes.Guernsey },
@@ -9875,6 +10010,7 @@ const FLOWS_THAT_HIDE_REGISTRATION_NUMBER = [
 ];
 const companyRegistrationDetailsFields = [
   ...TRADING_NAME_FIELD,
+  ...DBA_NAME_FIELD,
   ...BUSINESS_REGISTRATION_NUMBER_FIELD,
   ...STOCK_EXCHANGE_MIC_FIELD,
   ...STOCK_ISIN_FIELD,
@@ -9889,6 +10025,7 @@ function CompanyRegistrationDetailsComponent(props) {
   const COMPANY_REGISTRATION_DETAILS = mergedProps.id ?? "companyRegistrationDetails";
   const { i18n } = useI18nContext();
   const { isExperimentEnabled } = useExperimentsContext();
+  const isLemApiVersionV4Enabled = isExperimentEnabled(ExperimentNames.EnableLemApiVersionV4);
   const { companyNameAndCountry } = useGlobalData();
   const { updateStateSlice } = useGlobalDataSlice(COMPANY_REGISTRATION_DETAILS);
   const country = (companyNameAndCountry == null ? void 0 : companyNameAndCountry.country) ?? mergedProps.country;
@@ -9923,6 +10060,16 @@ function CompanyRegistrationDetailsComponent(props) {
     tradingNameFieldMetadata,
     mergedProps
   );
+  mergedProps = mergeFieldMetadataIntoProps(
+    "hasDba",
+    hasDbaFieldMetadata,
+    mergedProps
+  );
+  mergedProps = mergeFieldMetadataIntoProps(
+    "dbaName",
+    dbaNameFieldMetadata,
+    mergedProps
+  );
   mergedProps = mergeFieldMetadataIntoProps(
     "stockExchangeMIC",
     stockExchangeMICFieldMetadata,
@@ -9983,6 +10130,9 @@ function CompanyRegistrationDetailsComponent(props) {
       if (currentData.sameNameAsLegalName) {
         fieldsToRemove.push("tradingName");
       }
+      if (!currentData.hasDba) {
+        fieldsToRemove.push("dbaName");
+      }
       if (currentData.exemptedFromVat) {
         fieldsToRemove.push("vatNumber");
       } else {
@@ -10005,7 +10155,7 @@ function CompanyRegistrationDetailsComponent(props) {
     },
     [requiredFields]
   );
-  const { schema, data, valid, errors, fieldProblems, handleChangeFor } = useForm({
+  const { schema, data, valid, errors, fieldProblems, handleChangeFor, setErrors } = useForm({
     ...mergedProps,
     schema: getFormSchema2,
     defaultData: mergedProps.data,
@@ -10040,11 +10190,12 @@ function CompanyRegistrationDetailsComponent(props) {
         title: i18n.get("whyDoINeedToFillInThisInformation"),
         content: i18n.get("reasonForFillingCompanyRegistrationDetails"),
         titleId: "whyDoINeedToFillInThisInformation",
-        contentId: "reasonForFillingCompanyRegistrationDetails"
+        contentId: "reasonForFillingCompanyRegistrationDetails",
+        baseTrackingPayload: { task: TaskTypes.COMPANY }
       }
     ),
     /* @__PURE__ */ jsxs("fieldset", { form: COMPANY_REGISTRATION_DETAILS, children: [
-      formUtils.isRequiredField("tradingName") && /* @__PURE__ */ jsx("div", { className: "adyen-kyc-field-wrapper", children: /* @__PURE__ */ jsx(
+      !isLemApiVersionV4Enabled && formUtils.isRequiredField("tradingName") && /* @__PURE__ */ jsx("div", { className: "adyen-kyc-field-wrapper", children: /* @__PURE__ */ jsx(
         TradingNameField,
         {
           data: formUtils.getFieldData(data, TRADING_NAME_FIELD),
@@ -10056,6 +10207,21 @@ function CompanyRegistrationDetailsComponent(props) {
           legalCompanyName
         }
       ) }),
+      isLemApiVersionV4Enabled && formUtils.isRequiredField("dbaName") && /* @__PURE__ */ jsx("div", { className: "adyen-kyc-field-wrapper", children: /* @__PURE__ */ jsx(
+        DBANameField,
+        {
+          data: formUtils.getFieldData(data, DBA_NAME_FIELD),
+          valid: formUtils.getFieldValid(valid, DBA_NAME_FIELD),
+          errors: formUtils.getFieldErrors(errors, fieldProblems, DBA_NAME_FIELD),
+          labels: formUtils.getFieldLabels(DBA_NAME_FIELD, {
+            hasDba: "hasDba"
+          }),
+          legalCompanyName,
+          readonly: formUtils.isReadOnly("dbaName"),
+          handleChangeFor,
+          setErrors
+        }
+      ) }),
       formUtils.isRequiredField("stockExchangeMIC") && /* @__PURE__ */ jsx("div", { className: "adyen-kyc-field-wrapper", children: /* @__PURE__ */ jsx(
         StockExchangeMICField,
         {
@@ -10212,7 +10378,9 @@ const companyBase = {
   stockExchangeMIC: { rule: "ifPubliclyTradedCompany" },
   stockISIN: { rule: "ifPubliclyTradedCompany" },
   stockTickerSymbol: { rule: "ifPubliclyTradedCompany" },
-  tradingName: { rule: "REQUIRED" },
+  tradingName: { rule: "isLemApiVersionV4Disabled" },
+  dbaName: { rule: "isLemApiVersionV4Enabled" },
+  hasDba: { rule: "isLemApiVersionV4Enabled" },
   dateOfIncorporation: { rule: "countryRequiresDateOfIncorporationForCompanies" },
   exemptedFromRegistrationNumber: { rule: "companyRegistrationNumberExemptionAllowed" },
   registrationNumber: { rule: "countryRequiresRegistrationNumberForCompanies" },
@@ -10227,6 +10395,7 @@ const businessDetailsBase = {
   hasDba: { rule: "REQUIRED" },
   dbaName: { rule: "REQUIRED" },
   registrationAddress: { rule: "REQUIRED" },
+  operationalAddressIsSame: { rule: "REQUIRED" },
   /* Base optional fields */
   operationalAddress: { rule: "OPTIONAL" },
   /* Fields with custom country specific rules */
@@ -13066,9 +13235,13 @@ function AddressComponent({
     shouldValidate
   });
   useEffect(
-    () => verifiedAddress ? entriesOf(verifiedAddress).forEach(([key, value]) => {
-      if (formData[key] !== value) handleChangeFor(key, "input")(value);
-    }) : formSchema.forEach((field) => handleChangeFor(field, "input")((data == null ? void 0 : data[field]) ?? " ")),
+    () => {
+      if (verifiedAddress) {
+        entriesOf(verifiedAddress).forEach(([key, value]) => {
+          if (formData[key] !== value) handleChangeFor(key, "input")(value);
+        });
+      }
+    },
     // eslint-disable-next-line react-hooks/exhaustive-deps
     [verifiedAddress]
   );
@@ -13128,9 +13301,9 @@ function AddressComponent({
       fieldName
     );
   };
-  if (condensed && (data == null ? void 0 : data.country)) {
-    const condensedFields = CONDENSED_ADDRESS_FIELDS[data.country] ?? [];
-    switch (data == null ? void 0 : data.country) {
+  if (condensed && (formData == null ? void 0 : formData.country)) {
+    const condensedFields = CONDENSED_ADDRESS_FIELDS[formData.country] ?? [];
+    switch (formData == null ? void 0 : formData.country) {
       case "US":
         return /* @__PURE__ */ jsxs("fieldset", { className: "adyen-kyc-address", children: [
           formSchema.filter((field) => !condensedFields.includes(field)).map((filteredField) => createFieldComponent(filteredField)),
@@ -13198,7 +13371,8 @@ function RegistrationAddressComponent(props) {
     handleFindAddress,
     country,
     data,
-    validators: validators2
+    validators: validators2,
+    baseTrackingPayload
   } = props;
   const {
     requiredFields: registrationAddressRequiredFields,
@@ -13288,7 +13462,8 @@ function RegistrationAddressComponent(props) {
         titleId: "whyDoINeedToFillInThisInformation",
         contentId: "reasonForFillingCompanyAddressDetails",
         title: i18n.get("whyDoINeedToFillInThisInformation"),
-        content: i18n.get("reasonForFillingCompanyAddressDetails")
+        content: i18n.get("reasonForFillingCompanyAddressDetails"),
+        baseTrackingPayload
       }
     ),
     /* @__PURE__ */ jsx(
@@ -13714,7 +13889,8 @@ function CompanyComponent(props) {
             country: props.country,
             problems: props.problems,
             handleAddressSearch: props.handleAddressSearch,
-            handleFindAddress: props.handleFindAddress
+            handleFindAddress: props.handleFindAddress,
+            baseTrackingPayload: { task: TaskTypes.COMPANY }
           }
         )
       }
@@ -13946,46 +14122,6 @@ const fileToBase64 = (file) => new Promise((resolve, reject) => {
   reader.onerror = (error) => reject(error);
 });
 const getFileExtention = (fileName) => fileName.split(".").pop();
-var TaskTypes = /* @__PURE__ */ ((TaskTypes2) => {
-  TaskTypes2["BUSINESS_TYPE_SELECTION"] = "BUSINESS_TYPE_SELECTION";
-  TaskTypes2["INTRODUCTION"] = "INTRODUCTION";
-  TaskTypes2["TASKS_OVERVIEW"] = "TASKS_OVERVIEW";
-  TaskTypes2["REVIEW"] = "REVIEW";
-  TaskTypes2["INDIVIDUAL"] = "INDIVIDUAL";
-  TaskTypes2["COMPANY"] = "COMPANY";
-  TaskTypes2["BUSINESS_DETAILS"] = "BUSINESS_DETAILS";
-  TaskTypes2["PAYOUT"] = "PAYOUT";
-  TaskTypes2["PAYIN"] = "PAYIN";
-  TaskTypes2["SERVICE_AGREEMENT"] = "SERVICE_AGREEMENT";
-  TaskTypes2["PCI_DSS"] = "PCI_DSS";
-  TaskTypes2["DECISION_MAKER"] = "DECISION_MAKER";
-  TaskTypes2["DECISION_MAKER_OVERVIEW"] = "DECISION_MAKER_OVERVIEW";
-  TaskTypes2["TRUST"] = "TRUST";
-  TaskTypes2["TRUST_MEMBER_OVERVIEW"] = "TRUST_MEMBER";
-  TaskTypes2["TRUST_MEMBER_INDIVIDUAL"] = "TRUST_MEMBER_INDIVIDUAL";
-  TaskTypes2["TRUST_MEMBER_COMPANY"] = "TRUST_MEMBER_COMPANY";
-  TaskTypes2["TRUST_MEMBER_ROLE_AND_TYPE"] = "TRUST_MEMBER_ROLE_AND_TYPE";
-  TaskTypes2["TRUST_MEMBER_COMPANY_OWNER"] = "TRUST_MEMBER_COMPANY_OWNER";
-  TaskTypes2["SOLE_PROPRIETOR_COMPANY"] = "SOLE_PROPRIETOR_COMPANY";
-  TaskTypes2["LEGAL_ENTITY_TYPE_SWITCHER"] = "LEGAL_ENTITY_TYPE_SWITCHER";
-  TaskTypes2["CAPABILITY_REJECTED"] = "CAPABILITY_REJECTED";
-  TaskTypes2["SINGPASS_SELECTION"] = "SINGPASS_SELECTION";
-  TaskTypes2["LEGAL_REPRESENTATIVE_DETAILS"] = "LEGAL_REPRESENTATIVE_DETAILS";
-  return TaskTypes2;
-})(TaskTypes || {});
-var TaskStatus = /* @__PURE__ */ ((TaskStatus2) => {
-  TaskStatus2[TaskStatus2["EMPTY"] = 0] = "EMPTY";
-  TaskStatus2[TaskStatus2["FINISHED"] = 1] = "FINISHED";
-  TaskStatus2[TaskStatus2["PROCESSING"] = 2] = "PROCESSING";
-  TaskStatus2[TaskStatus2["DETAILS_REQUIRED"] = 3] = "DETAILS_REQUIRED";
-  TaskStatus2[TaskStatus2["SIGN"] = 4] = "SIGN";
-  TaskStatus2[TaskStatus2["DOWNLOAD"] = 5] = "DOWNLOAD";
-  TaskStatus2[TaskStatus2["ERROR"] = 6] = "ERROR";
-  TaskStatus2[TaskStatus2["SIGNED"] = 7] = "SIGNED";
-  TaskStatus2[TaskStatus2["SUBMIT"] = 8] = "SUBMIT";
-  TaskStatus2[TaskStatus2["REMOVING"] = 9] = "REMOVING";
-  return TaskStatus2;
-})(TaskStatus || {});
 const COUNTRIES_THAT_DONT_REQUIRE_SOLE_PROP_REGISTRATION = [
   CountryCodes.Australia,
   CountryCodes.Gibraltar,
@@ -14183,6 +14319,16 @@ const rules$3 = ({
     if (isExperimentEnabled("EnableFinancialInformationComponentV4") && COUNTRIES_REQUIRING_FINANCIAL_INFORMATION.includes(country)) {
       return "REQUIRED";
     }
+  },
+  isLemApiVersionV4Enabled: () => {
+    if (isExperimentEnabled("EnableLemApiVersionV4")) {
+      return "REQUIRED";
+    }
+  },
+  isLemApiVersionV4Disabled: () => {
+    if (!isExperimentEnabled("EnableLemApiVersionV4")) {
+      return "REQUIRED";
+    }
   }
 });
 var LegalEntityType = /* @__PURE__ */ ((LegalEntityType2) => {
@@ -14294,6 +14440,7 @@ const businessDetailsBaseMapping = {
   "additionalInformation.legalCompanyName": "organization.legalName",
   "additionalInformation.legalFormDescription": "organization.legalFormDescription",
   "additionalInformation.dbaName": "organization.doingBusinessAs",
+  "additionalInformation.doingBusinessAbsent": "organization.doingBusinessAbsent",
   "additionalInformation.registrationNumber": "organization.registrationNumber",
   "additionalInformation.taxInformation": "organization.taxInformation",
   "additionalInformation.vatNumber": "organization.vatNumber",
@@ -14321,6 +14468,8 @@ const companyBaseMapping = {
   "companyNameAndCountry.countryOfGoverningLaw": "organization.countryOfGoverningLaw",
   "companyType.entityType": "organization.type",
   "companyRegistrationDetails.tradingName": "organization.doingBusinessAs",
+  "companyRegistrationDetails.dbaName": "organization.doingBusinessAs",
+  "companyRegistrationDetails.doingBusinessAbsent": "organization.doingBusinessAbsent",
   "companyRegistrationDetails.registrationNumber": "organization.registrationNumber",
   "companyRegistrationDetails.taxInformation": "organization.taxInformation",
   "companyRegistrationDetails.vatNumber": "organization.vatNumber",
@@ -14345,6 +14494,8 @@ const companyBaseMapping = {
 const trustBaseMapping = {
   "trustRegistrationDetails.trustType": "trust.type",
   "trustRegistrationDetails.legalName": "trust.name",
+  "trustRegistrationDetails.dbaName": "trust.doingBusinessAs",
+  "trustRegistrationDetails.doingBusinessAbsent": "trust.doingBusinessAbsent",
   "trustRegistrationDetails.country": "trust.countryOfGoverningLaw",
   "trustRegistrationDetails.registrationNumber": "trust.registrationNumber",
   "trustRegistrationAddress.registrationAddress.city": "trust.registeredAddress.city",
@@ -14364,6 +14515,8 @@ const solePropBaseMapping = {
   "solePropNameAndCountry.country": "soleProprietorship.countryOfGoverningLaw",
   "solePropNameAndCountry.legalCompanyName": "soleProprietorship.name",
   "solePropRegistrationDetails.tradingName": "soleProprietorship.doingBusinessAs",
+  "solePropRegistrationDetails.dbaName": "soleProprietorship.doingBusinessAs",
+  "solePropRegistrationDetails.doingBusinessAbsent": "soleProprietorship.doingBusinessAbsent",
   "solePropRegistrationDetails.vatNumber": "soleProprietorship.vatNumber",
   "solePropRegistrationDetails.vatAbsenceReason": "soleProprietorship.vatAbsenceReason",
   "solePropRegistrationDetails.exemptedFromTax": "soleProprietorship.taxAbsent",
@@ -15680,7 +15833,8 @@ function IdVerificationMethodComponent(props) {
             /* @__PURE__ */ jsx(Link, { href: "https://www.adyen.com/policies-and-disclaimer/privacy-policy", external: true, children: i18n.get("learnMore") })
           ] }),
           titleId: "howVerificationWithOnfidoWork",
-          contentId: "howVerificationWithOnfidoWorkContent"
+          contentId: "howVerificationWithOnfidoWorkContent",
+          baseTrackingPayload: { task: TaskTypes.INDIVIDUAL }
         }
       ),
       (countryOfResidence === CountryCodes.PuertoRico || countryOfResidence === CountryCodes.UnitedStates) && data.idVerificationMethod === "instantVerification" && /* @__PURE__ */ jsx(
@@ -15701,6 +15855,47 @@ var TrustedFieldsProvider = /* @__PURE__ */ ((TrustedFieldsProvider2) => {
   TrustedFieldsProvider2["KOMPANY"] = "kompany";
   return TrustedFieldsProvider2;
 })(TrustedFieldsProvider || {});
+function getBaseTrackingPayload({
+  trackingConfig = {
+    topLevelLegalEntity: {}
+  },
+  parentLegalEntity,
+  legalEntity,
+  task
+}) {
+  const { topLevelLegalEntity } = trackingConfig;
+  const baseTrackingPayload = {
+    task,
+    entityType: topLevelLegalEntity == null ? void 0 : topLevelLegalEntity.type,
+    topLevelLegalEntityId: topLevelLegalEntity == null ? void 0 : topLevelLegalEntity.id,
+    topLevelLegalEntityType: topLevelLegalEntity == null ? void 0 : topLevelLegalEntity.type
+  };
+  if (parentLegalEntity) {
+    baseTrackingPayload.parentLegalEntityId = parentLegalEntity.id;
+    baseTrackingPayload.parentLegalEntityType = parentLegalEntity.type;
+  }
+  if (legalEntity) {
+    baseTrackingPayload.legalEntityId = legalEntity.id;
+    baseTrackingPayload.entityType = legalEntity.type;
+  }
+  return baseTrackingPayload;
+}
+const removeOldDataBySchema = (dataSubmitted, savedLegalEntityData) => {
+  Object.keys(savedLegalEntityData).forEach((formId) => {
+    if (savedLegalEntityData[formId]) {
+      Object.keys(savedLegalEntityData[formId]).forEach((key) => {
+        if (dataSubmitted[formId][key] === void 0) {
+          if (Array.isArray(savedLegalEntityData[formId][key])) {
+            dataSubmitted[formId][key] = [];
+          } else {
+            dataSubmitted[formId][key] = "";
+          }
+        }
+      });
+    }
+  });
+  return dataSubmitted;
+};
 const getLegalEntityCountry = (legalEntityResponse) => legalEntityResponse.type === LegalEntityType.INDIVIDUAL ? legalEntityResponse.individual.residentialAddress.country : legalEntityResponse.organization.registeredAddress.country;
 const getAgeToday = (birthdate) => {
   const today = /* @__PURE__ */ new Date();
@@ -16742,6 +16937,8 @@ const trustBase = {
   legalName: {
     rule: "REQUIRED"
   },
+  dbaName: { rule: "isLemApiVersionV4Enabled" },
+  hasDba: { rule: "isLemApiVersionV4Enabled" },
   country: {
     rule: "REQUIRED"
   },
@@ -17282,7 +17479,8 @@ const DriversLicense$1 = ({
   formUtils,
   isValid,
   errorMessages,
-  shouldValidate
+  shouldValidate,
+  baseTrackingPayload
 }) => {
   const { i18n } = useI18nContext();
   const { dataset: auStates } = useDataset(datasetIdentifier.state("AU"));
@@ -17362,7 +17560,8 @@ const DriversLicense$1 = ({
           /* @__PURE__ */ jsx(Link, { href: "https://www.usi.gov.au/about/forms-id/drivers-licence", children: i18n.get("iStillCantFindIt") })
         ] }),
         titleId: "whereCanIFindTheseNumbersOnMyDriversLicense",
-        contentId: "whereToFindNumbersOnDriversLicense"
+        contentId: "whereToFindNumbersOnDriversLicense",
+        baseTrackingPayload
       }
     )
   ] });
@@ -17498,7 +17697,8 @@ function IdentityAuComponent({
           ),
           issuerState: formUtils.getErrorMessage("issuerState", errors, fieldProblems)
         },
-        shouldValidate
+        shouldValidate,
+        baseTrackingPayload: { task: TaskTypes.INDIVIDUAL }
       }
     ) : void 0
   ] });
@@ -17615,7 +17815,8 @@ const DriversLicense = ({
   formUtils,
   isValid,
   errorMessages,
-  shouldValidate
+  shouldValidate,
+  baseTrackingPayload
 }) => {
   const { i18n } = useI18nContext();
   return /* @__PURE__ */ jsxs(Fragment, { children: [
@@ -17674,7 +17875,8 @@ const DriversLicense = ({
           /* @__PURE__ */ jsx(Link, { href: "https://www.nzta.govt.nz/driver-licences/getting-a-licence/your-driver-licence-explained/", children: i18n.get("iStillCantFindIt") })
         ] }),
         titleId: "whereCanIFindTheseNumbersOnMyDriversLicense",
-        contentId: "whereToFindNumbersOnDriversLicense"
+        contentId: "whereToFindNumbersOnDriversLicense",
+        baseTrackingPayload
       }
     )
   ] });
@@ -17838,7 +18040,8 @@ function IdentityNZComponent({
             fieldProblems
           )
         },
-        shouldValidate
+        shouldValidate,
+        baseTrackingPayload: { task: TaskTypes.INDIVIDUAL }
       }
     ) : void 0
   ] });
@@ -18061,6 +18264,12 @@ function PersonalDetailsComponent(props) {
     }
   };
   const alertProps = getAlertProps();
+  const baseTrackingPayload = getBaseTrackingPayload({
+    trackingConfig: {
+      topLevelLegalEntity: props.parentLegalEntity
+    },
+    task: props.taskType
+  });
   return /* @__PURE__ */ jsxs(LoaderWrapper, { status, formOpacityWhenLoading: 0.3, loaderSize: "large", children: [
     /* @__PURE__ */ jsx(StateContextSetter, { owner: PERSONAL_DETAILS, stateRef }),
     /* @__PURE__ */ jsx(StateContextWatcher, { owner: PERSONAL_DETAILS, onChange: handleStateChange }),
@@ -18096,7 +18305,8 @@ function PersonalDetailsComponent(props) {
           title: i18n.get("whyDoINeedToFillInThisInformation"),
           content: i18n.get("reasonForFillingIndividualPersonalDetails"),
           titleId: "whyDoINeedToFillInThisInformation",
-          contentId: "reasonForFillingIndividualPersonalDetails"
+          contentId: "reasonForFillingIndividualPersonalDetails",
+          baseTrackingPayload
         }
       ),
       isDecisionMakerTask && props.trustedFieldsProvider === TrustedFieldsProvider.SINGPASS && props.readOnlyFields && /* @__PURE__ */ jsx(Typography, { color: "secondary", variant: "caption", children: i18n.get(
@@ -18608,7 +18818,8 @@ function IndividualComponent(props) {
                 title: i18n.get("whyDoINeedToFillInThisInformation"),
                 content: i18n.get("reasonForFillingIndividualAddressDetails"),
                 titleId: "whyDoINeedToFillInThisInformation",
-                contentId: "reasonForFillingIndividualAddressDetails"
+                contentId: "reasonForFillingIndividualAddressDetails",
+                baseTrackingPayload: { task: taskType }
               }
             ),
             /* @__PURE__ */ jsx(
@@ -18616,7 +18827,10 @@ function IndividualComponent(props) {
               {
                 ...addressFormProps,
                 id: addressFormID,
-                data: { ...addressFormProps == null ? void 0 : addressFormProps.data, country: (_a2 = data == null ? void 0 : data.personalDetails) == null ? void 0 : _a2.residencyCountry },
+                data: {
+                  ...addressFormProps == null ? void 0 : addressFormProps.data,
+                  country: country ?? ((_a2 = addressFormProps == null ? void 0 : addressFormProps.data) == null ? void 0 : _a2.country)
+                },
                 requiredFields: addressSchema,
                 optionalFields: ["otherAddressInformation"],
                 trustedFields: trustedFields == null ? void 0 : trustedFields.address,
@@ -21554,6 +21768,12 @@ function PayoutVerificationMethod(props) {
   const { dataset: countries } = useDataset(datasetIdentifier.country);
   const bankCountryName = ((_b = countries.find((country2) => country2.id === data.bankCountry)) == null ? void 0 : _b.name) ?? data.bankCountry;
   const allowedBankCountries = getAllowedBankCountries(country);
+  const baseTrackingPayload = getBaseTrackingPayload({
+    trackingConfig: {
+      topLevelLegalEntity: legalEntityResponse
+    },
+    task: TaskTypes.PAYOUT
+  });
   const countryField = /* @__PURE__ */ jsx(
     CountryField,
     {
@@ -21692,7 +21912,8 @@ function PayoutVerificationMethod(props) {
           ] }),
           /* @__PURE__ */ jsx(Typography, { children: i18n.get("adyenWillOnlyGetTemporaryAccess") }),
           /* @__PURE__ */ jsx(Link, { href: "https://www.adyen.com/policies-and-disclaimer/privacy-policy", external: true, children: /* @__PURE__ */ jsx(Typography, { variant: "caption", children: i18n.get("learnMore") }) })
-        ] })
+        ] }),
+        baseTrackingPayload
       }
     ) : void 0
   ] });
@@ -22062,7 +22283,8 @@ function SolePropComponent(props) {
               country: props.country,
               problems: props == null ? void 0 : props.problems,
               handleAddressSearch: props.handleAddressSearch,
-              handleFindAddress: props.handleFindAddress
+              handleFindAddress: props.handleFindAddress,
+              baseTrackingPayload: { task: TaskTypes.SOLE_PROPRIETOR_COMPANY }
             }
           )
         }
@@ -22744,6 +22966,7 @@ const trustRegistrationDetailsValidationsV4 = {
 };
 const trustRegistrationDetailsFields = [
   "legalName",
+  ...DBA_NAME_FIELD,
   "country",
   "trustType",
   "objectOfTrust",
@@ -22758,6 +22981,7 @@ function TrustRegistrationDetailsComponent(props) {
   const isStrictNameAndAddressValidationEnabled = isExperimentEnabled(
     ExperimentNames.StrictNameAndAddressValidationV4
   );
+  const isLemApiVersionV4Enabled = isExperimentEnabled(ExperimentNames.EnableLemApiVersionV4);
   const TRUST_REGISTRATION_DETAILS = props.id || trustForms.trustRegistrationDetails.formId;
   const stateRef = useRef({ setState: null });
   const requiredFieldsByTask = trustRegistrationDetailsFields;
@@ -22767,7 +22991,7 @@ function TrustRegistrationDetailsComponent(props) {
       field
     )
   );
-  const { handleChangeFor, data, valid, errors, setData, fieldProblems } = useForm({
+  const { handleChangeFor, data, valid, errors, setData, fieldProblems, setErrors } = useForm({
     ...props,
     schema: directChildFields,
     defaultData: { ...props.data, country },
@@ -22863,6 +23087,21 @@ function TrustRegistrationDetailsComponent(props) {
           )
         }
       ),
+      isLemApiVersionV4Enabled && formUtils.isRequiredField("dbaName") && /* @__PURE__ */ jsx("div", { className: "adyen-kyc-field-wrapper", children: /* @__PURE__ */ jsx(
+        DBANameField,
+        {
+          data: formUtils.getFieldData(data, DBA_NAME_FIELD),
+          valid: formUtils.getFieldValid(valid, DBA_NAME_FIELD),
+          errors: formUtils.getFieldErrors(errors, fieldProblems, DBA_NAME_FIELD),
+          labels: formUtils.getFieldLabels(DBA_NAME_FIELD, {
+            hasDba: "hasDba"
+          }),
+          legalCompanyName: data.legalName,
+          readonly: formUtils.isReadOnly("dbaName"),
+          handleChangeFor,
+          setErrors
+        }
+      ) }),
       formUtils.isRequiredField("trustType") && /* @__PURE__ */ jsx(
         Field,
         {
@@ -22992,7 +23231,8 @@ function TrustComponent(props) {
             problems: props == null ? void 0 : props.problems,
             labels: { operationalAddressIsSame: "isTrustOperationAddressSame" },
             handleAddressSearch: props.handleAddressSearch,
-            handleFindAddress: props.handleFindAddress
+            handleFindAddress: props.handleFindAddress,
+            baseTrackingPayload: { task: TaskTypes.TRUST }
           }
         )
       }
@@ -23601,8 +23841,8 @@ function Summary({
         icon: "edit",
         onClick: () => {
           trackNavigation2({
-            fromForm: { formName: "summary", formId: "summary" },
-            toForm: { formId, formName },
+            fromForm: "summary",
+            toForm: formName,
             component: "Pencil icon"
           });
           editForm(formId);
@@ -23687,15 +23927,13 @@ const trackNavigation = ({
   baseTrackingPayload,
   i18n
 }) => {
-  userEvents.addEvent("Navigated form", {
-    segmentation: {
-      ...baseTrackingPayload,
-      component,
-      from: fromForm.formId,
-      fromLabel: i18n.get(fromForm.formName),
-      to: toForm.formId,
-      toLabel: i18n.get(toForm.formName)
-    }
+  userEvents.addEvent("Clicked button", {
+    ...baseTrackingPayload,
+    actionLevel: "page",
+    actionType: "navigate",
+    page: i18n.get(fromForm),
+    label: component,
+    toPage: i18n.get(toForm)
   });
 };
 const useHideButton = (condition, setHideState) => {
@@ -23758,12 +23996,12 @@ const useFormComposer = ({
       setActiveForm(openingStep);
     }
   }, [activeForm, forms, problems == null ? void 0 : problems.remediationActions, hasAlreadyNavigatedForm]);
-  const trackSectionCompletion = (form) => {
-    userEvents.addEvent("Completed form section", {
-      segmentation: {
-        ...baseTrackingPayload,
-        sectionName: form.formId
-      }
+  const trackSectionCompletion = (formName) => {
+    userEvents.addEvent("Success", {
+      ...baseTrackingPayload,
+      actionLevel: "page",
+      actionType: "next",
+      page: i18n.get(formName)
     });
   };
   const gotoFormByFormIndex = (nextFormIndex) => {
@@ -23802,15 +24040,14 @@ const useFormComposer = ({
     setShouldValidate(false);
     const toFormIndex = forms.findIndex((form) => form.formId === activeForm.formId) + 1;
     gotoFormByFormIndex(toFormIndex);
-    const toForm = forms[toFormIndex];
     trackNavigation({
-      fromForm: activeForm,
-      toForm,
+      fromForm: activeForm.formName,
+      toForm: forms[toFormIndex].formName,
       component: "ActionBar",
       baseTrackingPayload,
       i18n
     });
-    trackSectionCompletion(activeForm);
+    trackSectionCompletion(activeForm.formName);
   };
   const handleBackClick = () => {
     const currentFormIndex = forms.findIndex((form) => form.formId === activeForm.formId);
@@ -23819,7 +24056,13 @@ const useFormComposer = ({
       const toForm = forms[currentFormIndex - 1];
       setActiveForm(toForm);
       setHasAlreadyNavigatedForm(true);
-      trackNavigation({ fromForm, toForm, component: "ActionBar", baseTrackingPayload, i18n });
+      trackNavigation({
+        fromForm: fromForm.formName,
+        toForm: toForm.formName,
+        component: "ActionBar",
+        baseTrackingPayload,
+        i18n
+      });
     }
   };
   const nextButtonLabel = isFinalStep ? i18n.get(submitButtonLabel ?? "submit") : i18n.get("next");
@@ -24146,7 +24389,9 @@ const solePropBase = {
   stockExchangeMIC: { rule: "ifPubliclyTradedCompany" },
   stockISIN: { rule: "ifPubliclyTradedCompany" },
   stockTickerSymbol: { rule: "ifPubliclyTradedCompany" },
-  tradingName: { rule: "REQUIRED" },
+  tradingName: { rule: "isLemApiVersionV4Disabled" },
+  dbaName: { rule: "isLemApiVersionV4Enabled" },
+  hasDba: { rule: "isLemApiVersionV4Enabled" },
   dateOfIncorporation: { rule: "countryRequiresDateOfIncorporationForCompanies" },
   exemptedFromRegistrationNumber: { rule: "countryHasRegistrationExemptionsForSomeSoleProps" },
   registrationNumber: { rule: "countryRequiresRegistrationNumberForSoleProps" },
@@ -24339,16 +24584,10 @@ function getPropsFromConfigurations(scenarioConfiguration, forms, remediationAct
         }
         case TrustedFieldsProvider.SINGPASS: {
           if (legalEntityType === "organization") {
-            const orgFields = trusted.fields.filter(
-              (field) => (field == null ? void 0 : field.split(".")[0]) === "organization"
-            );
-            return [...acc, ...orgFields.map((tf) => businessDetailsApiKeyMapping[tf])];
+            return [...acc, ...trusted.fields.map((tf) => businessDetailsApiKeyMapping[tf])];
           }
           if (legalEntityType === "individual") {
-            const individualFields = trusted.fields.filter(
-              (field) => (field == null ? void 0 : field.split(".")[0]) === "individual"
-            );
-            return [...acc, ...individualFields.map((tf) => individualApiKeyMapping[tf])];
+            return [...acc, ...trusted.fields.map((tf) => individualApiKeyMapping[tf])];
           }
           return acc;
         }
@@ -24477,47 +24716,6 @@ const isFieldRequiredToRemediateDataMissingError = (formId, field, dataMissingEr
 const getFormTrustedFields = (formId, trustedFields) => trustedFields.filter((field) => field.split(".")[0] === formId).map(
   (field) => field.split(".").filter((item) => formId !== item).join(".")
 );
-function getBaseTrackingPayload({
-  trackingConfig = {
-    topLevelLegalEntity: {}
-  },
-  parentLegalEntity,
-  legalEntity,
-  task
-}) {
-  const { topLevelLegalEntity } = trackingConfig;
-  const baseTrackingPayload = {
-    task,
-    flow: topLevelLegalEntity == null ? void 0 : topLevelLegalEntity.type,
-    topLevelLegalEntityId: topLevelLegalEntity.id,
-    topLevelLegalEntityType: topLevelLegalEntity.type
-  };
-  if (parentLegalEntity) {
-    baseTrackingPayload.parentLegalEntityId = parentLegalEntity.id;
-    baseTrackingPayload.parentLegalEntityType = parentLegalEntity.type;
-  }
-  if (legalEntity) {
-    baseTrackingPayload.legalEntityId = legalEntity.id;
-    baseTrackingPayload.legalEntityType = legalEntity.type;
-  }
-  return baseTrackingPayload;
-}
-const removeOldDataBySchema = (dataSubmitted, savedLegalEntityData) => {
-  Object.keys(savedLegalEntityData).forEach((formId) => {
-    if (savedLegalEntityData[formId]) {
-      Object.keys(savedLegalEntityData[formId]).forEach((key) => {
-        if (dataSubmitted[formId][key] === void 0) {
-          if (Array.isArray(savedLegalEntityData[formId][key])) {
-            dataSubmitted[formId][key] = [];
-          } else {
-            dataSubmitted[formId][key] = "";
-          }
-        }
-      });
-    }
-  });
-  return dataSubmitted;
-};
 const getRequiredForms = (forms, requiredFields, optionalFields) => {
   const requiredForms = Object.values(forms).filter(({ formId }) => {
     if (requiredFields || optionalFields) {
@@ -24585,82 +24783,6 @@ const getFieldsWithExistingData = (legalEntity, isExperimentEnabled) => {
   }
   return nonDocumentFields;
 };
-const DBA_NAME_FIELD = ["hasDba", "dbaName"];
-function DBANameField({
-  data,
-  valid,
-  errors,
-  labels: labels2,
-  helperText,
-  readonly,
-  handleChangeFor,
-  setErrors
-}) {
-  const { i18n } = useI18nContext();
-  const selection = useMemo(() => {
-    if (typeof data.hasDba === "undefined") return;
-    if (!data.hasDba) setErrors == null ? void 0 : setErrors("dbaName", null);
-    return data.hasDba ? "yes" : "no";
-  }, [data.hasDba, setErrors]);
-  return /* @__PURE__ */ jsxs(Fragment, { children: [
-    /* @__PURE__ */ jsx(
-      Field,
-      {
-        name: "hasDba",
-        label: labels2.hasDba ?? i18n.get("hasDba"),
-        helper: (helperText == null ? void 0 : helperText.hasDba) ?? i18n.get("hasDba__helperText"),
-        isValid: valid.hasDba,
-        errorMessage: errors.hasDba,
-        children: (childProps) => /* @__PURE__ */ jsx(
-          RadioGroup,
-          {
-            ...childProps,
-            name: "hasDba",
-            items: [
-              { id: "yes", name: "yes" },
-              { id: "no", name: "no" }
-            ],
-            value: selection,
-            onChange: (newValue) => handleChangeFor("hasDba")(newValue === "yes"),
-            horizontal: true
-          }
-        )
-      }
-    ),
-    data.hasDba && /* @__PURE__ */ jsx(
-      Field,
-      {
-        name: "dbaName",
-        label: labels2.dbaName ?? i18n.get("dbaName"),
-        errorMessage: errors.dbaName,
-        isValid: valid.dbaName,
-        classNameModifiers: ["dbaName"],
-        children: (childProps) => /* @__PURE__ */ jsx(
-          InputText,
-          {
-            ...childProps,
-            "aria-required": true,
-            "aria-label": labels2.dbaName ?? i18n.get("dbaName"),
-            "aria-invalid": !valid.dbaName,
-            name: "dbaName",
-            value: data.dbaName,
-            readonly,
-            classNameModifiers: ["dbaName"],
-            onInput: handleChangeFor("dbaName", "input"),
-            onBlur: handleChangeFor("dbaName", "blur")
-          }
-        )
-      }
-    )
-  ] });
-}
-const hasDbaFieldMetadata = {
-  validators: [validateNotEmptyOnBlur]
-};
-const dbaNameFieldMetadata = {
-  label: "dbaName",
-  validators: [validateNotEmptyOnBlur]
-};
 const getNestedTrustedFields = (field, data, trustedFields) => {
   if (trustedFields && (data == null ? void 0 : data[field]) && typeof data[field] === "object") {
     return trustedFields.reduce((fields, trustedField) => {
@@ -24819,7 +24941,7 @@ function AdditionalInformationComponent({
   handleAddressSearch,
   handleFindAddress
 }) {
-  var _a, _b, _c, _d, _e;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i;
   const { basicInformation } = useGlobalData();
   const { updateStateSlice } = useGlobalDataSlice(ADDITIONAL_INFORMATION_FORM_ID);
   const { i18n } = useI18nContext();
@@ -25016,7 +25138,6 @@ function AdditionalInformationComponent({
     fieldProblems: formFieldProblems,
     handleChangeFor,
     resetToDefaultData,
-    setData,
     setErrors,
     setValid
   } = useForm({
@@ -25084,7 +25205,6 @@ function AdditionalInformationComponent({
         operationalAddressIsSameIds.OPERATIONAL_ADDRESS_IS_SAME
       );
       setValid("operationalAddress", true);
-      setData("operationalAddress", mergedDefaultData == null ? void 0 : mergedDefaultData.operationalAddress);
     } else {
       handleChangeFor("operationalAddressIsSame")(
         operationalAddressIsSameIds.OPERATIONAL_ADDRESS_IS_NOT_SAME
@@ -25328,9 +25448,11 @@ function AdditionalInformationComponent({
         {
           id: ADDITIONAL_INFORMATION_FORM_ID,
           addressType: "registrationAddress",
-          data: { ...mergedDefaultData == null ? void 0 : mergedDefaultData.registrationAddress, country },
-          labels: getAddressSchemaLabelsByCountry(country),
-          countryCode: country,
+          data: {
+            ...mergedDefaultData == null ? void 0 : mergedDefaultData.registrationAddress,
+            country: country ?? ((_f = mergedDefaultData == null ? void 0 : mergedDefaultData.registrationAddress) == null ? void 0 : _f.country)
+          },
+          labels: getAddressSchemaLabelsByCountry(((_g = data == null ? void 0 : data.registrationAddress) == null ? void 0 : _g.country) ?? country),
           requiredFields: addressSchema,
           shouldValidate,
           hideCountry: true,
@@ -25378,9 +25500,11 @@ function AdditionalInformationComponent({
         {
           id: ADDITIONAL_INFORMATION_FORM_ID,
           addressType: "operationalAddress",
-          data: { ...mergedDefaultData == null ? void 0 : mergedDefaultData.operationalAddress, country },
-          labels: getAddressSchemaLabelsByCountry(country),
-          countryCode: country,
+          data: {
+            ...mergedDefaultData == null ? void 0 : mergedDefaultData.operationalAddress,
+            country: ((_h = mergedDefaultData == null ? void 0 : mergedDefaultData.operationalAddress) == null ? void 0 : _h.country) ?? country
+          },
+          labels: getAddressSchemaLabelsByCountry(((_i = data == null ? void 0 : data.operationalAddress) == null ? void 0 : _i.country) ?? country),
           requiredFields: addressSchema,
           shouldValidate,
           hideCountry: true,
@@ -26324,11 +26448,14 @@ const mapBasicInformation = (data) => {
   }, {});
 };
 const mapAdditionalInformation = (data, legalEntity) => {
-  var _a, _b, _c, _d, _e;
+  var _a, _b, _c, _d, _e, _f, _g;
   if (!data) return;
   const dbaName = ((_a = legalEntity.organization) == null ? void 0 : _a.doingBusinessAs) ? ((_b = legalEntity.organization) == null ? void 0 : _b.doingBusinessAs) !== ((_c = legalEntity.organization) == null ? void 0 : _c.legalName) ? { hasDba: true } : { hasDba: false } : {};
   const currentCountry = (_d = legalEntity.organization) == null ? void 0 : _d.registeredAddress.country;
-  const operationalAddressIsSame = ((_e = legalEntity.organization) == null ? void 0 : _e.principalPlaceOfBusiness) ? operationalAddressIsSameIds.OPERATIONAL_ADDRESS_IS_NOT_SAME : operationalAddressIsSameIds.OPERATIONAL_ADDRESS_IS_SAME;
+  const operationalAddressIsSame = ((_e = legalEntity.organization) == null ? void 0 : _e.principalPlaceOfBusiness) && !objectsDeepEqual(
+    (_f = legalEntity.organization) == null ? void 0 : _f.principalPlaceOfBusiness,
+    (_g = legalEntity.organization) == null ? void 0 : _g.registeredAddress
+  ) ? operationalAddressIsSameIds.OPERATIONAL_ADDRESS_IS_NOT_SAME : operationalAddressIsSameIds.OPERATIONAL_ADDRESS_IS_SAME;
   return entriesOf(data).reduce(
     (acc, [field]) => {
       if (!COUNTRIES_USING_COMPANY_SEARCH.includes(currentCountry)) {
@@ -27408,7 +27535,11 @@ function FormNavigation({
   const goToForm = (form) => () => {
     if (form.formId === activeForm.formId) return;
     gotoForm(getFormIndex(form));
-    trackNavigation2({ fromForm: form, toForm: activeForm, component: "FormNavigation" });
+    trackNavigation2({
+      fromForm: form.formName,
+      toForm: activeForm.formName,
+      component: "FormNavigation"
+    });
   };
   const getNavigateHandler = (form, activeForm2) => {
     const priorForms = forms.slice(0, getFormIndex(form));
@@ -27608,20 +27739,6 @@ const FormWrapper = ({
     }
   );
 };
-var BusinessDetailsEvents = /* @__PURE__ */ ((BusinessDetailsEvents2) => {
-  BusinessDetailsEvents2["TASK_START"] = "BusinessDetails_TaskStarted";
-  BusinessDetailsEvents2["TASK_SUBMIT"] = "BusinessDetails_TaskSubmitted";
-  BusinessDetailsEvents2["TASK_SAVED"] = "BusinessDetails_TaskSaved";
-  BusinessDetailsEvents2["TASK_ERROR"] = "BusinessDetails_TaskError";
-  BusinessDetailsEvents2["DOCUMENTS_SAVED"] = "BusinessDetails_DocumentsSaved";
-  BusinessDetailsEvents2["DOCUMENTS_ERROR"] = "BusinessDetails_DocumentsError";
-  BusinessDetailsEvents2["NO_SEARCH_RESULTS"] = "BusinessDetails_NoSearchResults";
-  BusinessDetailsEvents2["TIN_MATCH"] = "BusinessDetails_TinMatch";
-  BusinessDetailsEvents2["TIN_NO_MATCH"] = "BusinessDetails_TinNoMatch";
-  BusinessDetailsEvents2["SELECTION_RESET"] = "BusinessDetails_CompanySelectionReset";
-  BusinessDetailsEvents2["SELECTION_ERROR"] = "BusinessDetails_CompanySelectionError";
-  return BusinessDetailsEvents2;
-})(BusinessDetailsEvents || {});
 const isMaintenanceModeError = (error) => error && "messageCode" in error && error.messageCode === "maintenanceMode";
 const API_VALIDATION_ERROR_CODE = "30_102";
 const ID_DOCUMENT_UPLOAD_ERROR_CODE = "30_105";
@@ -27684,7 +27801,7 @@ const mapBusinessDetailsDocumentToApiDocument = async (data, entityId) => {
   return documents.filter(Boolean);
 };
 const mapBusinessDetailsSchemaToLegalEntity = (data) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p;
   const requestObj = {
     ...formatObject(data, businessDetailsApiKeyMapping)
   };
@@ -27709,9 +27826,12 @@ const mapBusinessDetailsSchemaToLegalEntity = (data) => {
     if (dbaName) {
       requestObj.organization.doingBusinessAs = dbaName;
     }
+    if (((_o = data.additionalInformation) == null ? void 0 : _o.operationalAddressIsSame) === operationalAddressIsSameIds.OPERATIONAL_ADDRESS_IS_SAME && requestObj.organization.principalPlaceOfBusiness) {
+      requestObj.organization.principalPlaceOfBusiness = requestObj.organization.registeredAddress;
+    }
   }
   requestObj.type = LegalEntityType.ORGANIZATION;
-  if (((_o = requestObj.organization) == null ? void 0 : _o.registeredAddress.country) === "US") {
+  if (((_p = requestObj.organization) == null ? void 0 : _p.registeredAddress.country) === "US") {
     delete requestObj.organization.registrationNumber;
   }
   return requestObj;
@@ -27754,7 +27874,7 @@ const formatBasicInformation = (data, labels2, datasetUtils, companyType) => {
     [registrationNumberLabel]: data.registrationNumber
   };
 };
-const formatAdditionalInformation = (data, labels2, country, companyType) => {
+const formatAdditionalInformation = (data, labels2, country, companyType, i18n) => {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
   const registrationNumberLabel = resolveFieldMetadata(
     defaultFieldConfig$9[country],
@@ -27779,7 +27899,7 @@ const formatAdditionalInformation = (data, labels2, country, companyType) => {
     [registrationNumberLabel]: data.registrationNumber,
     [taxIdLabel]: (_e = (_d = data.taxInformation) == null ? void 0 : _d.find((taxId) => country === taxId.country)) == null ? void 0 : _e.number,
     [((_f = labels2 == null ? void 0 : labels2.additionalInformation) == null ? void 0 : _f.vatNumber) ?? "vatNumber"]: data.vatNumber,
-    [((_g = labels2 == null ? void 0 : labels2.additionalInformation) == null ? void 0 : _g.vatAbsenceReason) ?? "vatAbsenceReason"]: data.vatAbsenceReason,
+    [((_g = labels2 == null ? void 0 : labels2.additionalInformation) == null ? void 0 : _g.vatAbsenceReason) ?? "vatAbsenceReason"]: data.vatAbsenceReason ? i18n.get(data.vatAbsenceReason) : void 0,
     [((_h = labels2 == null ? void 0 : labels2.additionalInformation) == null ? void 0 : _h.dateOfIncorporation) ?? "dateOfIncorporation"]: data.dateOfIncorporation,
     [((_i = labels2 == null ? void 0 : labels2.additionalInformation) == null ? void 0 : _i.stockExchangeMIC) ?? "stockExchangeMIC"]: data.stockExchangeMIC,
     [((_j = labels2 == null ? void 0 : labels2.additionalInformation) == null ? void 0 : _j.stockISIN) ?? "stockISIN"]: data.stockISIN,
@@ -27823,13 +27943,11 @@ const formatDataForSummary = (data, forms, labels2, i18n) => {
               data[form],
               labels2,
               (_c = data.basicInformation) == null ? void 0 : _c.country,
-              (_d = data.companyStructure) == null ? void 0 : _d.entityType
+              (_d = data.companyStructure) == null ? void 0 : _d.entityType,
+              i18n
             ),
-            registrationAddress: mapAddressLabels(
-              data[form].registrationAddress,
-              datasetUtils
-            ),
-            operationalAddress: data[form].operationalAddress ? mapAddressLabels(data[form].operationalAddress, datasetUtils) : void 0
+            registrationAddress: mapAddressLabels(data[form].registrationAddress, datasetUtils),
+            operationalAddress: data[form].operationalAddressIsSame === operationalAddressIsSameIds.OPERATIONAL_ADDRESS_IS_NOT_SAME ? mapAddressLabels(data[form].operationalAddress, datasetUtils) : void 0
           }
         };
       case "companyRegistrationDocument":
@@ -27872,24 +27990,23 @@ async function submitDocuments({
       await documentUtils.uploadDocuments(formattedDocument, legalEntity.id);
       formattedDocument.forEach((doc) => {
         var _a;
-        userEvents.addEvent(BusinessDetailsEvents.DOCUMENTS_SAVED, {
-          segmentation: {
-            ...baseTrackingPayload,
-            documentType: doc.type,
-            fileExtention: ((_a = doc.attachments) == null ? void 0 : _a.map((item) => getFileExtention(item.pageName))) ?? []
-          }
+        userEvents.addEvent("Success", {
+          ...baseTrackingPayload,
+          actionLevel: "task",
+          actionType: "upload",
+          documentType: doc.type,
+          fileExtention: ((_a = doc.attachments) == null ? void 0 : _a.map((item) => getFileExtention(item.pageName))) ?? []
         });
       });
     }
   } catch (err) {
     logger2.error(err);
-    userEvents.addEvent(BusinessDetailsEvents.DOCUMENTS_ERROR, {
-      segmentation: {
-        ...baseTrackingPayload,
-        errorCode: err.errorCode,
-        errorMessage: err.title ?? err.message,
-        errorType: "BE"
-      }
+    userEvents.addEvent("Encountered error", {
+      ...baseTrackingPayload,
+      actionLevel: "task",
+      actionType: "upload",
+      returnType: err.errorCode,
+      returnValue: err.title ?? err.message
     });
   }
 }
@@ -27913,6 +28030,9 @@ async function submit({
   const logger2 = createLogger("submitBusinessDetails");
   setLoadingStatus("loading");
   const trackingPayload = {
+    ...baseTrackingPayload,
+    actionLevel: "task",
+    actionType: "submit",
     companyStructure: ((_a = data.companyStructure) == null ? void 0 : _a.entityType) ?? null,
     countryOfRegistration: ((_b = data.basicInformation) == null ? void 0 : _b.country) ?? null,
     legalEntityName: ((_c = data.additionalInformation) == null ? void 0 : _c.legalCompanyName) ?? null,
@@ -27929,12 +28049,7 @@ async function submit({
     )
   };
   try {
-    userEvents.addEvent(BusinessDetailsEvents.TASK_SUBMIT, {
-      segmentation: {
-        ...baseTrackingPayload,
-        ...trackingPayload
-      }
-    });
+    userEvents.addEvent("Clicked button", trackingPayload);
     await Promise.all([
       handleUpdateLegalEntity(drop("type").from(legalEntity), legalEntityResponse.id),
       submitDocuments({
@@ -27949,14 +28064,7 @@ async function submit({
         forms
       })
     ]);
-    userEvents.addEvent(BusinessDetailsEvents.TASK_SAVED, {
-      segmentation: {
-        ...baseTrackingPayload,
-        legalEntityId: legalEntity.id,
-        legalEntityType: legalEntity.type,
-        ...trackingPayload
-      }
-    });
+    userEvents.addEvent("Success", trackingPayload);
     clearToasts();
     onExternalSubmit == null ? void 0 : onExternalSubmit(data);
   } catch (err) {
@@ -27978,13 +28086,10 @@ async function submit({
       showToast({ label: i18n.get("failedToUpdateDetails"), type: "error" });
     }
     logger2.error(err);
-    userEvents.addEvent(BusinessDetailsEvents.TASK_ERROR, {
-      segmentation: {
-        ...baseTrackingPayload,
-        errorCode: err.errorCode,
-        errorMessage: err.title,
-        errorType: "BE"
-      }
+    userEvents.addEvent("Encountered error", {
+      ...trackingPayload,
+      returnType: err == null ? void 0 : err.errorCode,
+      returnValue: (err == null ? void 0 : err.title) || "backend"
     });
   } finally {
     setLoadingStatus("success");
@@ -28026,14 +28131,15 @@ function BusinessDetailsDropinComponent({
     onChange == null ? void 0 : onChange(currentState);
   }, [currentState, onChange]);
   useEffect(() => {
-    userEvents.addPageView("Business details dropin");
-    userEvents.addEvent(BusinessDetailsEvents.TASK_START, {
-      segmentation: getBaseTrackingPayload({
+    userEvents.addEvent("Landed on page", {
+      ...getBaseTrackingPayload({
         trackingConfig,
         parentLegalEntity,
         legalEntity: legalEntityResponse,
         task: taskType
-      })
+      }),
+      actionLevel: "task",
+      actionType: "start"
     });
   }, []);
   const formRef = useRef(null);
@@ -28588,9 +28694,10 @@ function CompanyDropinComponent({
     task: taskType
   });
   useEffect(() => {
-    userEvents.addPageView("Company dropin");
-    userEvents.addEvent("Started company task", {
-      segmentation: baseTrackingPayload
+    userEvents.addEvent("Landed on page", {
+      ...baseTrackingPayload,
+      actionLevel: "task",
+      actionType: "start"
     });
   }, []);
   const getConfigurationData = useCallback(
@@ -28672,12 +28779,12 @@ function CompanyDropinComponent({
     if (formattedDocument) {
       await documentUtils.uploadDocuments(formattedDocument, legalEntity.id);
       formattedDocument.forEach((doc) => {
-        userEvents.addEvent("Saved document", {
-          segmentation: {
-            ...baseTrackingPayload,
-            documentType: doc.type,
-            fileExtention: doc.attachments.map((item) => getFileExtention(item.pageName))
-          }
+        userEvents.addEvent("Success", {
+          ...baseTrackingPayload,
+          actionLevel: "task",
+          actionType: "save",
+          documentType: doc.type,
+          fileExtention: doc.attachments.map((item) => getFileExtention(item.pageName))
         });
       });
     }
@@ -28710,9 +28817,11 @@ function CompanyDropinComponent({
     let legalEntity = mapCompanyToLegalEntity(filteredData);
     setLoadingStatus("loading");
     const companyTrackingPayload = {
+      actionLevel: "task",
+      actionType: "submit",
       companyStructure: dataSubmitted.companyType.entityType,
       countryOfRegistration: dataSubmitted.companyNameAndCountry.country,
-      legalEntityName: dataSubmitted.companyNameAndCountry.legalCompanyName,
+      entityName: dataSubmitted.companyNameAndCountry.legalCompanyName,
       usedAdditionalAddress: dataSubmitted.companyRegistrationAddress.operationalAddressIsSame === operationalAddressIsSameIds.OPERATIONAL_ADDRESS_IS_NOT_SAME
     };
     legalEntity.entityAssociations = filterOutUnwantedAssociationsIfRootLE(
@@ -28724,11 +28833,9 @@ function CompanyDropinComponent({
       delete legalEntity.organization.countryOfGoverningLaw;
     }
     try {
-      userEvents.addEvent("Provided company details", {
-        segmentation: {
-          ...baseTrackingPayload,
-          ...companyTrackingPayload
-        }
+      userEvents.addEvent("Clicked button", {
+        ...baseTrackingPayload,
+        ...companyTrackingPayload
       });
       if (!(legalEntityResponse == null ? void 0 : legalEntityResponse.id)) {
         legalEntity = await handleCreateLegalEntity(legalEntity);
@@ -28739,13 +28846,11 @@ function CompanyDropinComponent({
         );
       }
       setAccountHolder(accountHolder);
-      userEvents.addEvent("Saved company details", {
-        segmentation: {
-          ...baseTrackingPayload,
-          legalEntityId: legalEntity.id,
-          legalEntityType: legalEntity.type,
-          ...companyTrackingPayload
-        }
+      userEvents.addEvent("Success", {
+        ...baseTrackingPayload,
+        ...companyTrackingPayload,
+        legalEntityId: legalEntity.id,
+        entityType: legalEntity.type
       });
       await submitDocuments2({ forms, legalEntity, dataSubmitted });
       await attachAssociationToParentLegalEntity({ legalEntity });
@@ -28767,13 +28872,12 @@ function CompanyDropinComponent({
         showToast({ label: i18n.get("failedToUpdateDetails"), type: "error" });
       }
       setLoadingStatus("success");
-      userEvents.addEvent("Encountered error company details", {
-        segmentation: {
-          ...baseTrackingPayload,
-          errorCode: e.errorCode,
-          errorMessage: e.title,
-          errorType: "BE"
-        }
+      userEvents.addEvent("Encountered error", {
+        ...baseTrackingPayload,
+        actionLevel: "task",
+        actionType: "submit",
+        returnType: e.errorCode,
+        returnValue: e.title
       });
     }
   };
@@ -29461,7 +29565,12 @@ const getTrustMembers = (trustLE, rootLegalEntity, exemptSettlorLE) => {
   ];
 };
 const combineRootLegalEntityWithEntityAssociations = (rootLegalEntity, entityAssociations) => {
-  const roles = entityAssociations.map((entityAssociation) => entityAssociation.type).filter((role) => role === TrustMemberTypes.SETTLOR || role === TrustMemberTypes.PROTECTOR);
+  const allowedRolesForRootLegalEntity = [
+    TrustMemberTypes.SETTLOR,
+    TrustMemberTypes.PROTECTOR,
+    TrustMemberTypes.DEFINED_BENEFICIARY
+  ];
+  const roles = entityAssociations.map((entityAssociation) => entityAssociation.type).filter((role) => allowedRolesForRootLegalEntity.includes(role));
   return {
     trustMemberType: "rootTrustee",
     roles: [...roles, TrustMemberTypes.TRUSTEE],
@@ -29761,8 +29870,7 @@ const BusinessTypeSelection = ({
   accountHolder,
   onComplete,
   onBack,
-  handleUpdateLegalEntity,
-  baseTrackingPayload
+  handleUpdateLegalEntity
 }) => {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
   const { i18n } = useI18nContext();
@@ -29825,25 +29933,16 @@ const BusinessTypeSelection = ({
       )
     );
   }, [data.businessType, data.legalArrangement, currentStep]);
+  const baseTrackingPayload = getBaseTrackingPayload({
+    legalEntity: legalEntityResponse,
+    task: TaskTypes.BUSINESS_TYPE_SELECTION
+  });
   useEffect(() => {
-    userEvents.addPageView("Entity Selection");
-    const startDropOffTrackingEvent = () => {
-      userEvents.addEvent("Started legal entity selection", {
-        segmentation: baseTrackingPayload
-      });
-    };
-    const stopDropOffTrackingEvent = () => {
-      userEvents.addEvent("Drop off at legal entity selection", {
-        segmentation: baseTrackingPayload
-      });
-    };
-    startDropOffTrackingEvent();
-    window.addEventListener("focus", startDropOffTrackingEvent);
-    window.addEventListener("blur", stopDropOffTrackingEvent);
-    return () => {
-      window.removeEventListener("focus", startDropOffTrackingEvent);
-      window.removeEventListener("blur", stopDropOffTrackingEvent);
-    };
+    userEvents.addEvent("Landed on page", {
+      ...baseTrackingPayload,
+      actionLevel: "task",
+      actionType: "start"
+    });
   }, []);
   const handleNextClick = async () => {
     var _a2;
@@ -29875,21 +29974,20 @@ const BusinessTypeSelection = ({
           return;
         }
         await updateLegalEntityAndSelectAccountHolder();
-        userEvents.addEvent("Saved legal entity selection", {
-          segmentation: baseTrackingPayload
-        });
       } else {
         onComplete(newAccountHolder);
       }
       if (isLegalArrangementChanging) {
         await updateLegalEntityAndSelectAccountHolder();
-        userEvents.addEvent("Saved legal entity selection", {
-          segmentation: baseTrackingPayload
-        });
       }
     }
   };
   const updateLegalEntityAndSelectAccountHolder = async () => {
+    const trackingPayload = {
+      ...baseTrackingPayload,
+      actionLevel: "task",
+      actionType: "submit"
+    };
     try {
       if (isLegalEntityTypeChanging) {
         setLoadingStatus("loading");
@@ -29897,8 +29995,17 @@ const BusinessTypeSelection = ({
           type: targetLegalEntityType
         };
         await (handleUpdateLegalEntity == null ? void 0 : handleUpdateLegalEntity(updateLegalEntityPayload, legalEntityResponse == null ? void 0 : legalEntityResponse.id));
+        userEvents.addEvent("Success", trackingPayload);
       }
       if (targetLegalEntityType === LegalEntityType.INDIVIDUAL) {
+        if (hasSolePropInLegalEntity(legalEntityResponse)) {
+          setLoadingStatus("loading");
+          const updateLegalEntityPayload = {
+            entityAssociations: []
+          };
+          await (handleUpdateLegalEntity == null ? void 0 : handleUpdateLegalEntity(updateLegalEntityPayload, legalEntityResponse == null ? void 0 : legalEntityResponse.id));
+          userEvents.addEvent("Success", trackingPayload);
+        }
         return;
       }
       const targetOrganizationType = determineOrganizationTypeToUpdate(
@@ -29915,6 +30022,7 @@ const BusinessTypeSelection = ({
           },
           legalEntityResponse == null ? void 0 : legalEntityResponse.id
         ));
+        userEvents.addEvent("Success", trackingPayload);
       }
     } catch (e) {
       showToast({ label: i18n.get("failedToUpdateDetails"), type: "error" });
@@ -30509,6 +30617,7 @@ const DecisionMakersComponent = ({
   const decisionMakers = getOwnDecisionMakers(legalEntityResponse);
   const registeredCountry = (_b = (_a = legalEntityResponse == null ? void 0 : legalEntityResponse.organization) == null ? void 0 : _a.registeredAddress) == null ? void 0 : _b.country;
   const availableDecisionMakers = getAvailableDecisionMakerRoleTypes(registeredCountry);
+  const homeButtonLabel = i18n.get("saveAndGoToOverview");
   const { remediationMessages } = useDataMissingRemediations({
     legalEntityId: legalEntityResponse.id,
     problems: capabilityProblems
@@ -30549,13 +30658,13 @@ const DecisionMakersComponent = ({
   };
   const editDecisionMaker = (decisionMaker) => {
     onNavigateToIndividual(decisionMaker.reference);
-    userEvents.addEvent("Edited decision maker", {
-      segmentation: {
-        ...baseTrackingPayload,
-        legalEntityId: decisionMaker.reference,
-        legalEntityType: decisionMaker.legalEntityType,
-        roles: decisionMaker.types
-      }
+    userEvents.addEvent("Clicked button", {
+      ...baseTrackingPayload,
+      actionLevel: "task",
+      actionType: "edit",
+      legalEntityId: decisionMaker.reference,
+      entityType: decisionMaker.legalEntityType,
+      roles: decisionMaker.types
     });
   };
   const deleteDecisionMaker = async (decisionMaker) => {
@@ -30570,14 +30679,14 @@ const DecisionMakersComponent = ({
       const remainingDecisionMakers = decisionMakers.filter(
         (curr) => curr.legalEntityId !== decisionMaker.reference
       );
-      userEvents.addEvent("Removed decision maker", {
-        segmentation: {
-          ...baseTrackingPayload,
-          legalEntityId: decisionMaker.reference,
-          legalEntityType: decisionMaker.legalEntityType,
-          roles: decisionMaker.types,
-          remainingDecisionMakers
-        }
+      userEvents.addEvent("Clicked button", {
+        ...baseTrackingPayload,
+        actionLevel: "task",
+        actionType: "remove",
+        legalEntityId: decisionMaker.reference,
+        entityType: decisionMaker.legalEntityType,
+        roles: decisionMaker.types,
+        remainingDecisionMakers
       });
       showToast({ type: "success", label: i18n.get("successFullyRemovedDecisionMaker") });
     } catch (e) {
@@ -30624,7 +30733,8 @@ const DecisionMakersComponent = ({
               roleType
             )) }),
             titleId: "whatIsTheDifferenceBetweenTheseRoles",
-            contentId: "differenceBetweenAnOwnerControllingPersonAndSignatory"
+            contentId: "differenceBetweenAnOwnerControllingPersonAndSignatory",
+            baseTrackingPayload
           }
         ),
         showWarning && /* @__PURE__ */ jsx(
@@ -30668,15 +30778,16 @@ const DecisionMakersComponent = ({
           ActionBar,
           {
             onHome: () => {
-              userEvents.addEvent("Saved decision makers list", {
-                segmentation: {
-                  ...baseTrackingPayload,
-                  noOfDecisionMakers: decisionMakers.length
-                }
+              userEvents.addEvent("Clicked button", {
+                ...baseTrackingPayload,
+                actionLevel: "task",
+                actionType: "back",
+                label: homeButtonLabel,
+                noOfDecisionMakers: decisionMakers.length
               });
               navigateBackToTaskList();
             },
-            homeButtonLabel: i18n.get("saveAndGoToOverview")
+            homeButtonLabel
           }
         )
       ] })
@@ -30735,22 +30846,6 @@ const introductionScreensByLegalEntityType = {
     IntroductionScreens.EPILOGUE
   ]
 };
-var IntroductionScreenEvent = /* @__PURE__ */ ((IntroductionScreenEvent2) => {
-  IntroductionScreenEvent2["EMPTY"] = "Introduction_Empty";
-  IntroductionScreenEvent2["START_FLOW"] = "Introduction_StartFlow";
-  IntroductionScreenEvent2["START_SCREEN"] = "Introduction_StartScreen";
-  IntroductionScreenEvent2["STOP_SCREEN"] = "Introduction_StopScreen";
-  IntroductionScreenEvent2["STOP_FLOW"] = "Introduction_StopFlow";
-  IntroductionScreenEvent2["NEXT"] = "Introduction_Next";
-  IntroductionScreenEvent2["BACK"] = "Introduction_Back";
-  IntroductionScreenEvent2["SKIP"] = "Introduction_Skip";
-  return IntroductionScreenEvent2;
-})(IntroductionScreenEvent || {});
-var IntroductionScreenTiming = /* @__PURE__ */ ((IntroductionScreenTiming2) => {
-  IntroductionScreenTiming2["VIEW_FLOW"] = "Introduction_ViewFlow";
-  IntroductionScreenTiming2["VIEW_SCREEN"] = "Introduction_ViewScreen";
-  return IntroductionScreenTiming2;
-})(IntroductionScreenTiming || {});
 const useLegalEntityType = ({
   legalEntity
 }) => {
@@ -30863,28 +30958,33 @@ const Introduction = ({
   const { i18n } = useI18nContext();
   const introductionScreens = useIntroductionScreens({ legalEntity, tasks });
   const [activeIndex, setActiveIndex] = useState(0);
-  const eventSegmentationDefaults = getBaseTrackingPayload({
+  const baseTrackingPayload = getBaseTrackingPayload({
     trackingConfig: { topLevelLegalEntity: legalEntity },
     legalEntity,
     task: TaskTypes.INTRODUCTION
   });
-  const eventDetails = {
-    segmentation: {
-      ...eventSegmentationDefaults,
-      page: (introductionScreens == null ? void 0 : introductionScreens.length) ? introductionScreens[activeIndex] : null
-    }
+  const pageEventDetails = {
+    ...baseTrackingPayload,
+    actionLevel: "page",
+    page: (introductionScreens == null ? void 0 : introductionScreens.length) ? introductionScreens[activeIndex] : void 0
   };
   useEffect(() => {
-    if (!(introductionScreens == null ? void 0 : introductionScreens.length)) {
-      userEvents.addEvent(IntroductionScreenEvent.EMPTY, {
-        segmentation: eventSegmentationDefaults
+    if (introductionScreens == null ? void 0 : introductionScreens.length) {
+      userEvents.addEvent("Landed on page", {
+        ...baseTrackingPayload,
+        actionLevel: "task",
+        actionType: "start"
       });
-      onExitIntroduction();
     } else {
-      userEvents.startEvent(IntroductionScreenTiming.VIEW_FLOW);
-      userEvents.addEvent(IntroductionScreenEvent.START_FLOW, eventDetails);
+      onExitIntroduction();
     }
   }, [introductionScreens]);
+  const buttonLabels = {
+    skip: i18n.get("goToOverviewFromIntroduction"),
+    back: i18n.get("back"),
+    next: i18n.get("next"),
+    start: i18n.get("start")
+  };
   return (introductionScreens == null ? void 0 : introductionScreens.length) ? /* @__PURE__ */ jsxs("div", { className: "adyen-kyc-introduction", children: [
     /* @__PURE__ */ jsx(
       StepProgressIndicator,
@@ -30896,9 +30996,13 @@ const Introduction = ({
     /* @__PURE__ */ jsx("div", { className: "adyen-kyc-introduction__skip", children: /* @__PURE__ */ jsx(
       Button,
       {
-        label: i18n.get("goToOverviewFromIntroduction"),
+        label: buttonLabels.skip,
         onClick: () => {
-          userEvents.addEvent(IntroductionScreenEvent.SKIP, eventDetails);
+          userEvents.addEvent("Clicked button", {
+            ...pageEventDetails,
+            actionType: "skip",
+            label: buttonLabels.skip
+          });
           onExitIntroduction();
         },
         showAsLink: true,
@@ -30919,14 +31023,14 @@ const Introduction = ({
         Button,
         {
           disabled: activeIndex === 0,
-          label: "Back",
+          label: buttonLabels.back,
           onClick: () => {
-            userEvents.addEvent(IntroductionScreenEvent.BACK, eventDetails);
-            userEvents.addEvent(IntroductionScreenEvent.STOP_SCREEN, eventDetails);
-            userEvents.endEvent(IntroductionScreenTiming.VIEW_SCREEN, eventDetails);
+            userEvents.addEvent("Clicked button", {
+              ...pageEventDetails,
+              actionType: "back",
+              label: buttonLabels.back
+            });
             setActiveIndex((currentValue) => currentValue - 1);
-            userEvents.startEvent(IntroductionScreenTiming.VIEW_SCREEN);
-            userEvents.addEvent(IntroductionScreenEvent.START_SCREEN, eventDetails);
           },
           secondary: true,
           type: "button"
@@ -30935,12 +31039,14 @@ const Introduction = ({
       activeIndex + 1 === introductionScreens.length ? /* @__PURE__ */ jsx(
         Button,
         {
-          label: "Start",
+          label: buttonLabels.start,
           onClick: () => {
-            userEvents.addEvent(IntroductionScreenEvent.STOP_SCREEN, eventDetails);
-            userEvents.addEvent(IntroductionScreenEvent.STOP_FLOW, eventDetails);
-            userEvents.endEvent(IntroductionScreenTiming.VIEW_SCREEN, eventDetails);
-            userEvents.endEvent(IntroductionScreenTiming.VIEW_FLOW, eventDetails);
+            userEvents.addEvent("Success", {
+              ...baseTrackingPayload,
+              actionLevel: "task",
+              actionType: "start",
+              label: buttonLabels.start
+            });
             onExitIntroduction();
           },
           type: "button"
@@ -30948,14 +31054,14 @@ const Introduction = ({
       ) : /* @__PURE__ */ jsx(
         Button,
         {
-          label: "Next",
+          label: buttonLabels.next,
           onClick: () => {
-            userEvents.addEvent(IntroductionScreenEvent.NEXT, eventDetails);
-            userEvents.addEvent(IntroductionScreenEvent.STOP_SCREEN, eventDetails);
-            userEvents.endEvent(IntroductionScreenTiming.VIEW_SCREEN, eventDetails);
+            userEvents.addEvent("Clicked button", {
+              ...pageEventDetails,
+              actionType: "next",
+              label: buttonLabels.next
+            });
             setActiveIndex((currentValue) => currentValue + 1);
-            userEvents.startEvent(IntroductionScreenTiming.VIEW_SCREEN);
-            userEvents.addEvent(IntroductionScreenEvent.START_SCREEN, eventDetails);
           },
           type: "button"
         }
@@ -31565,13 +31671,14 @@ function TaskListComponent({
   const companyTaskDescriptionKey = isReview ? "businessAccountDetailsDescriptionReview" : "businessAccountDetailsDescription";
   const payoutTaskDescriptionKey = isReview ? "payoutAccountsDescriptionReview" : "payoutAccountsDescription";
   const onEditBusinessSetupClick = () => {
-    const baseTrackingPayload = getBaseTrackingPayload({
-      trackingConfig,
-      legalEntity: legalEntityResponse,
-      task: tasks[tasks.length - 1]
-    });
-    userEvents.addEvent("Clicked back to legal entity selection", {
-      segmentation: baseTrackingPayload
+    userEvents.addEvent("Clicked button", {
+      ...getBaseTrackingPayload({
+        trackingConfig,
+        legalEntity: legalEntityResponse,
+        task: TaskTypes.TASKS_OVERVIEW
+      }),
+      actionLevel: "task",
+      actionType: "edit"
     });
     onNavigateToTask(TaskTypes.BUSINESS_TYPE_SELECTION);
   };
@@ -32089,7 +32196,8 @@ const TrustMembersOverview = ({
               label
             )) }),
             titleId: "whatIsTheDifferenceBetweenTheseRoles",
-            contentId: "differenceBetweenTrustMemberRoles"
+            contentId: "differenceBetweenTrustMemberRoles",
+            baseTrackingPayload: { task: TaskTypes.TRUST_MEMBER_OVERVIEW }
           }
         ),
         /* @__PURE__ */ jsx(CardGroup, { children: trustMembers.map((trustMember) => {
@@ -32345,9 +32453,10 @@ function IndividualDropinComponent({
     task: taskType
   });
   useEffect(() => {
-    userEvents.addPageView("Individual dropin");
-    userEvents.addEvent("Started individual task", {
-      segmentation: { ...baseTrackingPayload }
+    userEvents.addEvent("Landed on page", {
+      ...baseTrackingPayload,
+      actionLevel: "task",
+      actionType: "start"
     });
   }, []);
   const getConfigurationData = useCallback(
@@ -32477,27 +32586,27 @@ function IndividualDropinComponent({
         throw new Error("Provide handler to create legalEntity");
       }
       updatedLegalEntity = await handleCreateLegalEntity(legalEntity);
-      userEvents.addEvent("Added decision maker", {
-        segmentation: {
-          ...baseTrackingPayload,
-          legalEntityId: updatedLegalEntity.id,
-          legalEntityType: updatedLegalEntity.type,
-          countryOfRegistration: ((_a2 = dataSubmitted.personalDetails) == null ? void 0 : _a2.residencyCountry) || null,
-          roles: ((_b2 = dataSubmitted.personalDetails) == null ? void 0 : _b2.role) || null
-        }
+      userEvents.addEvent("Success", {
+        ...baseTrackingPayload,
+        actionLevel: "task",
+        actionType: "submit",
+        legalEntityId: updatedLegalEntity.id,
+        entityType: updatedLegalEntity.type,
+        countryOfRegistration: ((_a2 = dataSubmitted.personalDetails) == null ? void 0 : _a2.residencyCountry) || null,
+        roles: ((_b2 = dataSubmitted.personalDetails) == null ? void 0 : _b2.role) || null
       });
     } else {
       updatedLegalEntity = await handleUpdateLegalEntity(drop("type").from(legalEntity), leId);
-    }
-    userEvents.addEvent("Saved individual details", {
-      segmentation: {
+      userEvents.addEvent("Success", {
         ...baseTrackingPayload,
+        actionLevel: "task",
+        actionType: "submit",
         legalEntityId: updatedLegalEntity.id,
-        legalEntityType: updatedLegalEntity.type,
+        entityType: updatedLegalEntity.type,
         countryOfRegistration: ((_c2 = dataSubmitted.personalDetails) == null ? void 0 : _c2.residencyCountry) || null,
         idDocumentType: idDocumentType || null
-      }
-    });
+      });
+    }
     return updatedLegalEntity;
   };
   const handleInstantIdVerificationStartCheck = async (onfidoResponse, legalEntityId) => {
@@ -32530,12 +32639,12 @@ function IndividualDropinComponent({
       );
       uploadedDocuments == null ? void 0 : uploadedDocuments.forEach((doc) => {
         var _a3;
-        userEvents.addEvent("Saved document", {
-          segmentation: {
-            ...baseTrackingPayload,
-            documentType: doc.type,
-            fileExtention: ((_a3 = doc == null ? void 0 : doc.attachments) == null ? void 0 : _a3.map((item) => getFileExtention(item.pageName))) ?? null
-          }
+        userEvents.addEvent("Success", {
+          ...baseTrackingPayload,
+          actionLevel: "task",
+          actionType: "upload",
+          documentType: doc.type,
+          fileExtention: ((_a3 = doc == null ? void 0 : doc.attachments) == null ? void 0 : _a3.map((item) => getFileExtention(item.pageName))) ?? null
         });
       });
     }
@@ -32602,12 +32711,12 @@ function IndividualDropinComponent({
           return ((_a3 = dataSubmitted == null ? void 0 : dataSubmitted.idDocument) == null ? void 0 : _a3.idDocumentType) === id;
         }
       )) == null ? void 0 : _a2.id;
-      userEvents.addEvent("Provided individual details", {
-        segmentation: {
-          ...baseTrackingPayload,
-          countryOfRegistration: ((_b2 = dataSubmitted == null ? void 0 : dataSubmitted.personalDetails) == null ? void 0 : _b2.residencyCountry) || null,
-          idDocumentType: idDocumentType || null
-        }
+      userEvents.addEvent("Clicked button", {
+        ...baseTrackingPayload,
+        actionLevel: "task",
+        actionType: "submit",
+        countryOfRegistration: ((_b2 = dataSubmitted == null ? void 0 : dataSubmitted.personalDetails) == null ? void 0 : _b2.residencyCountry) || null,
+        idDocumentType: idDocumentType || null
       });
       legalEntity.entityAssociations = filterOutUnwantedAssociationsIfRootLE(
         taskType,
@@ -32646,13 +32755,12 @@ function IndividualDropinComponent({
         showToast({ label: i18n.get("failedToUpdateDetails"), type: "error" });
       }
       setLoadingStatus("success");
-      userEvents.addEvent("Encountered error individual details", {
-        segmentation: {
-          ...baseTrackingPayload,
-          errorCode: e.errorCode,
-          errorMessage: e.title,
-          errorType: "BE"
-        }
+      userEvents.addEvent("Encountered error", {
+        ...baseTrackingPayload,
+        actionLevel: "task",
+        actionType: "submit",
+        returnType: e.errorCode,
+        returnValue: e.title
       });
     }
   };
@@ -33043,9 +33151,10 @@ function PayoutDetailsDropinComponent({
     task: taskType
   });
   useEffect(() => {
-    userEvents.addPageView("Payout dropin");
-    userEvents.addEvent("Started payout task", {
-      segmentation: { ...baseTrackingPayload }
+    userEvents.addEvent("Landed on page", {
+      ...baseTrackingPayload,
+      actionLevel: "task",
+      actionType: "start"
     });
   }, []);
   const { getConfigurationData, provider } = useBankConfigurationHandlers({
@@ -33171,12 +33280,12 @@ function PayoutDetailsDropinComponent({
           );
           documents2.forEach((document2) => {
             var _a2;
-            userEvents.addEvent("Saved document", {
-              segmentation: {
-                ...baseTrackingPayload,
-                documentType: document2.type,
-                fileExtention: ((_a2 = document2.attachments) == null ? void 0 : _a2.map((item) => getFileExtention(item.pageName))) ?? null
-              }
+            userEvents.addEvent("Success", {
+              ...baseTrackingPayload,
+              actionLevel: "task",
+              actionType: "upload",
+              documentType: document2.type,
+              fileExtention: ((_a2 = document2.attachments) == null ? void 0 : _a2.map((item) => getFileExtention(item.pageName))) ?? null
             });
           });
         } catch (e) {
@@ -33208,15 +33317,15 @@ function PayoutDetailsDropinComponent({
         existingPayoutDetails == null ? void 0 : existingPayoutDetails.payoutAccountDetails
       );
     }
-    const event = {
-      segmentation: {
-        ...baseTrackingPayload,
-        documentType: DocumentType.BANK_STATEMENT,
-        bankCountry: (payoutVerificationMethod == null ? void 0 : payoutVerificationMethod.bankCountry) ?? defaultPayoutCountry,
-        bankCurrency: (payoutAccountDetails == null ? void 0 : payoutAccountDetails.currency) ?? null
-      }
+    const baseTracking = {
+      ...baseTrackingPayload,
+      actionLevel: "task",
+      actionType: "submit",
+      documentType: DocumentType.BANK_STATEMENT,
+      bankCountry: (payoutVerificationMethod == null ? void 0 : payoutVerificationMethod.bankCountry) ?? defaultPayoutCountry,
+      bankCurrency: (payoutAccountDetails == null ? void 0 : payoutAccountDetails.currency) ?? null
     };
-    userEvents.addEvent("Provided payout details", event);
+    userEvents.addEvent("Clicked button", baseTracking);
     let transferInstrument2 = mapPayoutAccountToTransferInstrument({
       data: dataSubmitted,
       legalEntity: legalEntityResponse
@@ -33232,7 +33341,7 @@ function PayoutDetailsDropinComponent({
           transferInstrumentId
         );
       }
-      userEvents.addEvent("Saved payout details", event);
+      userEvents.addEvent("Success", baseTracking);
       try {
         await submitDocuments2({ forms, transferInstrument: transferInstrument2, dataSubmitted });
         setLoadingStatus("success");
@@ -33261,13 +33370,10 @@ function PayoutDetailsDropinComponent({
         showToast({ label: i18n.get("failedToUpdateDetails"), type: "error" });
       }
       setLoadingStatus("success");
-      userEvents.addEvent("Encountered error payout details", {
-        segmentation: {
-          ...baseTrackingPayload,
-          errorCode: e.errorCode,
-          errorMessage: e.title,
-          errorType: "BE"
-        }
+      userEvents.addEvent("Encountered error", {
+        ...baseTracking,
+        returnType: (e == null ? void 0 : e.errorCode) || "backend",
+        returnValue: (e == null ? void 0 : e.title) || (e == null ? void 0 : e.message)
       });
     }
   };
@@ -33460,6 +33566,8 @@ function PciDropinComponent({
   });
   const [loadingStatus, setLoadingStatus] = useState();
   const hasExpired = useHasExpired();
+  const signButtonLabel = i18n.get("sign");
+  const homeButtonLabel = i18n.get("goToOverview");
   const { handleChangeFor, triggerValidation, data, valid, isValid, errors } = useForm({
     schema: PciFields,
     rules: pciValidationRules
@@ -33486,7 +33594,13 @@ function PciDropinComponent({
   ];
   const handleSignClick = async () => {
     if (loadingStatus === "loading") return;
-    userEvents.addEvent("Clicked PCI signing", { segmentation: { ...baseTrackingPayload } });
+    const baseTracking = {
+      ...baseTrackingPayload,
+      actionLevel: "task",
+      actionType: "sign",
+      label: signButtonLabel
+    };
+    userEvents.addEvent("Clicked button", baseTracking);
     triggerValidation();
     if (isValid) {
       try {
@@ -33494,40 +33608,47 @@ function PciDropinComponent({
         await handleSign(legalEntityResponse.id, { signedBy: data.signer, pciTemplateReferences });
         setLoadingStatus("success");
         showToast({ label: i18n.get("pciSignedSuccessfully"), type: "success" });
-        userEvents.addEvent("Succeeded PCI signing", { segmentation: { ...baseTrackingPayload } });
+        userEvents.addEvent("Success", baseTracking);
         goHome();
-      } catch {
+      } catch (e) {
         setLoadingStatus("success");
         showToast({ label: i18n.get("pciSignFailed"), type: "error" });
-        userEvents.addEvent("Failed PCI signing", { segmentation: { ...baseTrackingPayload } });
+        userEvents.addEvent("Encountered error", {
+          ...baseTracking,
+          returnType: (e == null ? void 0 : e.errorCode) || "backend",
+          returnValue: (e == null ? void 0 : e.title) ?? (e == null ? void 0 : e.message)
+        });
       }
     } else {
-      userEvents.addEvent("Encountered PCI validation error", {
-        segmentation: {
-          ...baseTrackingPayload,
-          fields: Object.entries(valid).filter(([, value]) => !value).map(([key]) => key)
-        }
+      userEvents.addEvent("Encountered error", {
+        ...baseTracking,
+        returnType: "validation",
+        returnValue: Object.entries(valid).filter(([, value]) => !value).map(([key]) => key)
       });
     }
   };
   const goHome = () => {
-    userEvents.addEvent("Returned to task overview from PCI", {
-      segmentation: { ...baseTrackingPayload }
+    userEvents.addEvent("Clicked button", {
+      ...baseTrackingPayload,
+      actionLevel: "task",
+      actionType: "back",
+      label: homeButtonLabel
     });
     handleHomeClick();
   };
   const handleExpandSection = (title) => {
-    userEvents.addEvent("Expanded PCI section", {
-      segmentation: {
-        ...baseTrackingPayload,
-        statementExtended: title
-      }
+    userEvents.addEvent("Clicked accordion", {
+      ...baseTrackingPayload,
+      actionLevel: "task",
+      actionType: "open",
+      label: title
     });
   };
   useEffect(() => {
-    userEvents.addPageView("PCI dropin");
-    userEvents.addEvent("Started PCI task", {
-      segmentation: { ...baseTrackingPayload }
+    userEvents.addEvent("Landed on page", {
+      ...baseTrackingPayload,
+      actionLevel: "task",
+      actionType: "start"
     });
   }, []);
   const acceptPciLabel = /* @__PURE__ */ jsxs(Fragment, { children: [
@@ -33586,9 +33707,9 @@ function PciDropinComponent({
     ActionBar,
     {
       onHome: goHome,
-      homeButtonLabel: i18n.get("goToOverview"),
+      homeButtonLabel,
       onNext: handleSignClick,
-      nextButtonLabel: i18n.get("sign")
+      nextButtonLabel: signButtonLabel
     }
   );
   return /* @__PURE__ */ jsx(DropinLayout, { content, footer });
@@ -34466,6 +34587,8 @@ function ServiceAgreementDropinComponent({
   const [activeForm, setActiveForm] = useState(forms[activeFormIndex]);
   const canSign = (serviceAgreementTypes == null ? void 0 : serviceAgreementTypes.includes(activeForm == null ? void 0 : activeForm.serviceAgreementType)) && !(activeForm == null ? void 0 : activeForm.acceptanceId);
   const showSignedAlert = !!(activeForm == null ? void 0 : activeForm.acceptanceId);
+  const homeButtonLabel = i18n.get("goToOverview");
+  const nextButtonLabel = i18n.get(canSign ? "sign" : "next");
   const handleServiceAgreementIsNotAvailableInThatLanguage = useCallback(() => {
     showToast({
       label: i18n.get("failedToGetServiceAgreementInSelectedLanguageFallbackToEn"),
@@ -34506,7 +34629,12 @@ function ServiceAgreementDropinComponent({
   };
   const signers = getSigners();
   const handleSignClick = async () => {
-    userEvents.addEvent("Clicked ToS signing", { segmentation: { ...baseTrackingPayload } });
+    const baseTracking = {
+      ...baseTrackingPayload,
+      actionLevel: "task",
+      actionType: "sign"
+    };
+    userEvents.addEvent("Clicked button", { ...baseTracking, label: nextButtonLabel });
     triggerValidation();
     if (loadingStatus === "loading" || !serviceAgreement || !data.signer) return;
     if (isValid) {
@@ -34518,35 +34646,41 @@ function ServiceAgreementDropinComponent({
           label: i18n.get("serviceAgreementSignedSuccessfully"),
           type: "success"
         });
-        userEvents.addEvent("Succeeded ToS signing", { segmentation: { ...baseTrackingPayload } });
+        userEvents.addEvent("Success", baseTracking);
         data.acceptServiceAgreement = false;
         data.signer = void 0;
-      } catch {
+      } catch (e) {
         setLoadingStatus("success");
         showToast({ label: i18n.get("serviceAgreementSignFailed"), type: "error" });
-        userEvents.addEvent("Failed ToS signing", { segmentation: { ...baseTrackingPayload } });
+        userEvents.addEvent("Encountered error", {
+          ...baseTracking,
+          returnType: (e == null ? void 0 : e.errorCode) || "backend",
+          returnValue: (e == null ? void 0 : e.title) ?? (e == null ? void 0 : e.message)
+        });
       }
     } else {
-      userEvents.addEvent("Encountered ToS validation error", {
-        segmentation: {
-          ...baseTrackingPayload,
-          fields: Object.entries(valid).filter(([, value]) => !value).map(([key]) => key)
-        }
+      userEvents.addEvent("Encountered error", {
+        ...baseTracking,
+        returnType: "validation",
+        returnValue: Object.entries(valid).filter(([, value]) => !value).map(([key]) => key)
       });
     }
   };
   const goHome = () => {
-    userEvents.addEvent("Returned to task overview from ToS", {
-      segmentation: { ...baseTrackingPayload }
+    userEvents.addEvent("Clicked button", {
+      ...baseTrackingPayload,
+      actionLevel: "task",
+      actionType: "back",
+      label: homeButtonLabel
     });
     handleHomeClick();
   };
   const handleExpandSection = (title) => {
-    userEvents.addEvent("Expanded ToS section", {
-      segmentation: {
-        ...baseTrackingPayload,
-        statementExtended: title
-      }
+    userEvents.addEvent("Clicked accordion", {
+      ...baseTrackingPayload,
+      actionLevel: "task",
+      actionType: "open",
+      label: title
     });
   };
   useEffect(() => {
@@ -34554,9 +34688,10 @@ function ServiceAgreementDropinComponent({
     gotoForm(serviceAgreementAcceptanceInfos.length - 1);
   }, [serviceAgreementAcceptanceInfos]);
   useEffect(() => {
-    userEvents.addPageView("ToS dropin");
-    userEvents.addEvent("Started ToS task", {
-      segmentation: { ...baseTrackingPayload }
+    userEvents.addEvent("Landed on page", {
+      ...baseTrackingPayload,
+      actionLevel: "task",
+      actionType: "start"
     });
     const initialFormIndex = forms.length === signedForms.length ? 0 : signedForms.length;
     gotoForm(initialFormIndex);
@@ -34745,9 +34880,9 @@ function ServiceAgreementDropinComponent({
           ActionBar,
           {
             onHome: goHome,
-            homeButtonLabel: i18n.get("goToOverview"),
+            homeButtonLabel,
             onNext: canSign ? handleSignClick : () => gotoForm(activeFormIndex + 1),
-            nextButtonLabel: i18n.get(canSign ? "sign" : "next"),
+            nextButtonLabel,
             nextButtonDisabled: forms.length === 0 || !canSign && activeFormIndex === forms.length - 1,
             onBack: () => gotoForm(activeFormIndex - 1),
             hideBackButton: activeFormIndex === 0,
@@ -35106,7 +35241,11 @@ function SolePropDropinComponent({
   );
 }
 const COUNTRIES_THAT_USE_REGISTRATION_NUMBER = [CountryCodes.NewZealand];
-const rules = ({ data, country }) => ({
+const rules = ({
+  data,
+  country,
+  isExperimentEnabled = () => false
+}) => ({
   countryUsesTaxId: () => {
     if (country !== CountryCodes.NewZealand && COUNTRIES_THAT_USE_TAX_ID_INSTEAD_OF_VAT.includes(country)) {
       return "REQUIRED";
@@ -35122,6 +35261,11 @@ const rules = ({ data, country }) => ({
     if (((_a = data == null ? void 0 : data.trustRegistrationDetails) == null ? void 0 : _a.trustType) === TrustTypes.CHARITABLE_TRUST) {
       return "REQUIRED";
     }
+  },
+  isLemApiVersionV4Enabled: () => {
+    if (isExperimentEnabled("EnableLemApiVersionV4")) {
+      return "REQUIRED";
+    }
   }
 });
 const parseConfiguration$1 = ({ matchingScenario, country }) => parseTrustScenarios(matchingScenario == null ? void 0 : matchingScenario[LegalEntityType.TRUST], country);
@@ -35761,6 +35905,13 @@ function DropinComposerComponent({
   const refreshLegalEntity = useCallback(async () => {
     const legalEntity = await retrieveLegalEntity();
     updateLegalEntityAndCapabilityProblems(legalEntity);
+    if (legalEntity) {
+      userEvents.updateBaseTrackingPayload({
+        legalEntityId: legalEntity.id,
+        capabilities: Object.keys(legalEntity.capabilities),
+        countryCode: getLegalEntityCountry(legalEntity)
+      });
+    }
     return legalEntity;
   }, [retrieveLegalEntity, updateLegalEntityAndCapabilityProblems]);
   const deleteTransferInstrument = async (id) => {
@@ -36030,13 +36181,6 @@ function DropinComposerComponent({
     await componentOnSubmit(data, backSteps);
   };
   const onPciDownload = async () => {
-    const baseTrackingPayload = getBaseTrackingPayload({
-      trackingConfig: {
-        topLevelLegalEntity: legalEntityResponse
-      },
-      legalEntity: rootLegalEntity,
-      task: TaskTypes.PCI_DSS
-    });
     try {
       const response = await (args == null ? void 0 : args.handleGetPciQuestionnaires(rootLegalEntity.id));
       await Promise.all(
@@ -36051,13 +36195,30 @@ function DropinComposerComponent({
     } catch (e) {
       showToast({ label: i18n.get("failedToDownloadPci"), type: "error" });
     } finally {
-      userEvents.addEvent("Downloaded signed PCI form", {
-        segmentation: { ...baseTrackingPayload }
+      userEvents.addEvent("Clicked button", {
+        ...getBaseTrackingPayload({
+          trackingConfig: {
+            topLevelLegalEntity: legalEntityResponse
+          },
+          legalEntity: rootLegalEntity,
+          task: TaskTypes.PCI_DSS
+        }),
+        actionLevel: "task",
+        actionType: "download"
       });
     }
   };
   useEffect(() => {
-    userEvents.addPageView("Task list");
+    userEvents.addEvent("Landed on page", {
+      ...getBaseTrackingPayload({
+        trackingConfig: {
+          topLevelLegalEntity: rootLegalEntity
+        },
+        task: TaskTypes.TASKS_OVERVIEW
+      }),
+      actionLevel: "journey",
+      actionType: "start"
+    });
   }, []);
   useLayoutEffect(() => {
     const fetchConfiguration = async () => {
@@ -36148,8 +36309,7 @@ function DropinComposerComponent({
             await refreshLegalEntity();
             navigateTo("default");
           },
-          onBack: previousTask ? navigateBack : void 0,
-          trackingConfig: { topLevelLegalEntity: legalEntityResponse }
+          onBack: previousTask ? navigateBack : void 0
         }
       ) });
     case TaskTypes.SINGPASS_SELECTION:
@@ -39066,15 +39226,13 @@ const pushEvents = async (loadingContext, sessionId, event) => httpPost(
   },
   event
 );
-const convertToEmbeddedEvent = (eventQueueItem) => {
-  const [eventType, event] = eventQueueItem;
-  const isObject = typeof event === "object";
-  const eventName = isObject ? event.key : event;
-  const eventData = isObject ? event.segmentation : {};
+const convertToEmbeddedEvent = (eventQueueItem, sessionData) => {
+  const { type, name, properties } = eventQueueItem;
   return {
-    eventType,
-    eventName,
-    eventData: eventData ?? {}
+    eventName: name,
+    eventType: type,
+    eventData: properties || {},
+    ...sessionData
   };
 };
 const useAnalytics = async ({
@@ -39086,30 +39244,33 @@ const useAnalytics = async ({
   const { i18n } = useI18nContext();
   const { isEmbeddedDropin, loadingContext: base } = useAuthContext();
   const loadingContext = `${base}api/${COMPONENTS_API_VERSION}/`;
-  if (isEmbeddedDropin) {
-    try {
-      const sessionResponse = await getAnalyticsSession(loadingContext, {
-        sdkVersion,
-        componentName,
-        userAgent: navigator.userAgent,
-        legalEntityId
-      });
-      if (!(sessionResponse == null ? void 0 : sessionResponse.id)) {
-        throw Error("Analytics session Id not received");
+  (async () => {
+    if (isEmbeddedDropin) {
+      try {
+        const sessionData = {
+          sdkVersion,
+          componentName,
+          userAgent: navigator.userAgent,
+          legalEntityId
+        };
+        const sessionResponse = await getAnalyticsSession(loadingContext, sessionData);
+        if (!(sessionResponse == null ? void 0 : sessionResponse.id)) {
+          throw Error("Analytics session Id not received");
+        }
+        userEvents.subscribe((data) => {
+          const eventItem = convertToEmbeddedEvent(data, sessionData);
+          if (eventItem.eventData) {
+            eventItem.eventData.locale = i18n.locale;
+          }
+          pushEvents(loadingContext, sessionResponse.id, eventItem);
+        });
+      } catch (e) {
+        console.error("Failed to initiate analytics for component", e);
       }
-      userEvents.subscribe((data) => {
-        const eventItem = convertToEmbeddedEvent(data);
-        if (eventItem.eventData) {
-          eventItem.eventData.locale = i18n.locale;
-        }
-        pushEvents(loadingContext, sessionResponse.id, eventItem);
-      });
-    } catch (e) {
-      console.error("Failed to initiate analytics for component", e);
+    } else if (onUserEvent) {
+      userEvents.subscribe(onUserEvent);
     }
-  } else if (onUserEvent) {
-    userEvents.subscribe(onUserEvent);
-  }
+  })();
 };
 const logger$8 = createLogger("loadCountries");
 const countriesImports = /* @__PURE__ */ Object.assign({ "./de-DE.json": () => import("./de-DE-Cx8Uim1K.js"), "./el-GR.json": () => import("./el-GR-B7_JR3z5.js"), "./en-US.json": () => import("./en-US-CkdCbOCX.js"), "./es-ES.json": () => import("./es-ES-NBv3HHhn.js"), "./fr-FR.json": () => import("./fr-FR-DdSVMVsp.js"), "./it-IT.json": () => import("./it-IT-Bwdk3zuj.js"), "./ja-JP.json": () => import("./ja-JP-Bsvzm8zu.js"), "./nl-NL.json": () => import("./nl-NL-DofKaNkk.js"), "./pt-PT.json": () => import("./pt-PT-DFEvMD1M.js"), "./ru-RU.json": () => import("./ru-RU-PiM0ZI5h.js"), "./sv-SE.json": () => import("./sv-SE-C0GoLwTg.js"), "./zh-CN.json": () => import("./zh-CN-DJs6Hct-.js"), "./zh-TW.json": () => import("./zh-TW-BWhLbns8.js") });
@@ -39405,7 +39566,7 @@ const ConfigurationApiProvider = ({
 }) => {
   const authContext = useAuthContext();
   const { isEmbeddedDropin, loadingContext } = authContext;
-  const sdkVersion = "2.59.11";
+  const sdkVersion = "2.60.0";
   useAnalytics({
     onUserEvent,
     legalEntityId: rootLegalEntityId,
@@ -40078,7 +40239,7 @@ const DebugModal = ({ rootLegalEntityId, onExit, getRootLegalEntity }) => {
   };
   const copyToClipboard = async () => {
     const toCopy = {
-      sdkVersion: "2.59.11",
+      sdkVersion: "2.60.0",
       experiments: Object.fromEntries(allExperimentsWithValues),
       settings: Object.fromEntries(allSettingsWithValues)
     };
@@ -40143,7 +40304,7 @@ const DebugModal = ({ rootLegalEntityId, onExit, getRootLegalEntity }) => {
     /* @__PURE__ */ jsx("div", { className: "adyen-kyc-debug-modal__meta", children: /* @__PURE__ */ jsx("table", { children: /* @__PURE__ */ jsxs("tbody", { children: [
       /* @__PURE__ */ jsx("tr", { children: /* @__PURE__ */ jsxs("td", { children: [
         /* @__PURE__ */ jsx("span", { className: "adyen-kyc-debug-modal__table-key", children: "SDK version" }),
-        /* @__PURE__ */ jsx(Tag, { variant: "green", className: "adyen-kyc-tag--large", children: "2.59.11" })
+        /* @__PURE__ */ jsx(Tag, { variant: "green", className: "adyen-kyc-tag--large", children: "2.60.0" })
       ] }) }),
       /* @__PURE__ */ jsx("tr", { children: /* @__PURE__ */ jsxs("td", { children: [
         /* @__PURE__ */ jsx("span", { className: "adyen-kyc-debug-modal__table-key", children: "rootLegalEntityId" }),
@@ -40263,6 +40424,20 @@ const getRootLegalEntityId = (componentProps) => {
   if ("legalEntityResponse" in componentProps) return componentProps.legalEntityResponse.id;
   throw new Error("You must provide either `legalEntityId` or `legalEntityResponse`");
 };
+const getBaseTracking = (componentProps) => {
+  if ("legalEntityResponse" in componentProps) {
+    const { legalEntityResponse } = componentProps;
+    return {
+      entityType: legalEntityResponse.type,
+      legalEntityId: legalEntityResponse.id,
+      capabilities: Object.keys(legalEntityResponse.capabilities || {}),
+      countryCode: getLegalEntityCountry(legalEntityResponse)
+    };
+  }
+  return {
+    legalEntityId: componentProps.legalEntityId
+  };
+};
 class UIElement extends BaseElement {
   constructor() {
     super(...arguments);
@@ -40271,6 +40446,10 @@ class UIElement extends BaseElement {
       const rootLegalEntityId = getRootLegalEntityId(
         this.props.componentProps
       );
+      const baseTracking = getBaseTracking(
+        this.props.componentProps
+      );
+      userEvents.updateBaseTrackingPayload(baseTracking);
       return /* @__PURE__ */ jsx(SettingsProvider, { settings: this.props.settings, children: /* @__PURE__ */ jsx(
         AuthProvider,
         {