@adyen/kyc-components 2.59.11 → 2.61.0

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

@@ -1,16 +1,120 @@
 import { jsx, jsxs, Fragment } from "preact/jsx-runtime";
 import { useContext, useState, useCallback, useEffect, useMemo, useReducer, useId, useRef, useLayoutEffect } from "preact/hooks";
+import { debounce as debounce$1 } from "lodash-es";
 import { createContext, isValidElement, createElement, render } from "preact";
 import DOMPurify from "isomorphic-dompurify";
 import cx from "classnames";
 import { lazy, Suspense, forwardRef, memo, useMemo as useMemo$1 } from "preact/compat";
-import debounce$1 from "lodash-es/debounce";
+import debounce$2 from "lodash-es/debounce";
 import isISIN from "validator/es/lib/isISIN.js";
 import { Onfido } from "onfido-sdk-ui";
 import OpenBankingSDK from "@adyen/openbankingsdk";
 import { jsxs as jsxs$1, jsx as jsx$1 } from "preact/compat/jsx-runtime";
 import "@adyen/adyen-document-viewer/dist/adyen-document-viewer.min.css";
 import AdyenDocumentViewer from "@adyen/adyen-document-viewer";
+class UserEvents {
+  constructor() {
+    this.queue = [];
+    this.subscriptions = /* @__PURE__ */ new Set();
+    this.updateSharedEventProperties = (props) => {
+      this.sharedEventProperties = { ...this.sharedEventProperties, ...props };
+    };
+    this.baseTrackingPayload = {
+      category: "onboarding",
+      subCategory: "hosted onboarding",
+      countryCode: void 0,
+      capabilities: void 0,
+      legalEntityId: void 0,
+      task: void 0
+    };
+    this.sharedEventProperties = {};
+  }
+  add(...args) {
+    this.queue.push(...args);
+  }
+  notifySubscribers() {
+    while (this.queue.length > 0) {
+      const lastEvent = this.queue.pop();
+      this.subscriptions.forEach((callback) => callback(lastEvent));
+    }
+  }
+  /**
+   * Adds an analytics event.
+   */
+  addEvent(eventName, properties) {
+    const completeEvent = { ...this.baseTrackingPayload, ...properties };
+    this.add({ type: "add_event", name: eventName, properties: { ...completeEvent } });
+    console.log("addevent", "name", eventName, completeEvent);
+    this.notifySubscribers();
+  }
+  /**
+   * 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(eventName) {
+    this.add({ type: "start_event", name: eventName });
+    this.notifySubscribers();
+  }
+  /**
+   * Adds an event with context specific to field-related events
+   */
+  addFieldEvent(eventName, properties) {
+    this.addEvent(eventName, {
+      actionLevel: "field",
+      page: this.sharedEventProperties.page,
+      ...properties
+    });
+  }
+  /**
+   * Subscribes a callback to analytics events. It gets called every time
+   * one of the above public methods get called, and the event data is passed back as an array.
+   * The callback must have a single argument which is an array of [eventName, eventPayload?].
+   * @example
+   * ```js
+   * const callback = ([eventName, eventPayload]) => console.log(eventName, eventPayload);
+   * this.subscribe(callback);
+   *
+   * const exampleEventPayload = { count: 1, segmentation: { foo: 'bar' } };
+   * this.addEvent('exampleEventDidOccur', exampleEventPayload);
+   *
+   * // `callback` will get called with `['exampleEventDidOccur', exampleEventPayload]`
+   * ```
+   */
+  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
+   */
+  unsubscribe(callback) {
+    if (this.subscriptions.has(callback)) {
+      this.subscriptions.delete(callback);
+    }
+  }
+}
+const userEvents = new UserEvents();
+const getAssociatedLeAnalyticsPayload = ({
+  task,
+  associatedLegalEntity,
+  associatedLegalEntityOrg
+}) => ({
+  task,
+  ...associatedLegalEntity ? {
+    associatedLegalEntityId: associatedLegalEntity == null ? void 0 : associatedLegalEntity.id,
+    associatedLegalEntityType: associatedLegalEntity == null ? void 0 : associatedLegalEntity.type
+  } : {},
+  ...associatedLegalEntityOrg ? {
+    associatedLegalEntityOrgId: associatedLegalEntityOrg == null ? void 0 : associatedLegalEntityOrg.id,
+    associatedLegalEntityOrgType: associatedLegalEntityOrg == null ? void 0 : associatedLegalEntityOrg.type
+  } : {}
+});
+const debouncedInputEvent$1 = debounce$1(
+  (properties) => userEvents.addFieldEvent("Interacted with form field", properties),
+  500
+);
 const ConfigurationApiContext = createContext(void 0);
 const useConfigurationApi = () => {
   const configurationApi = useContext(ConfigurationApiContext);
@@ -1257,6 +1361,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 +2958,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 || {});
@@ -3637,6 +3743,16 @@ const Field = ({
     passedValue: focused,
     skipUpdate: focused === void 0
   });
+  useEffect(() => {
+    if (!errorMessage) return;
+    const returnValue = typeof errorMessage === "string" && errorMessage || "invalid";
+    userEvents.addFieldEvent("Encountered error", {
+      actionType: "input",
+      field: label,
+      returnType: "validation",
+      returnValue
+    });
+  }, [label, errorMessage]);
   return /* @__PURE__ */ jsx(
     "div",
     {
@@ -3764,6 +3880,7 @@ function SelectButtonElement({
   return /* @__PURE__ */ jsx("button", { ...props, ref: toggleButtonRef, type: "button" });
 }
 function SelectButton({
+  name,
   active,
   readonly,
   showList,
@@ -3781,14 +3898,25 @@ function SelectButton({
   isMulti,
   id,
   isSearch,
-  hideSearchIcon = false,
   loading,
-  textFilter
+  hideSearchIcon = false,
+  textFilter,
+  enableTracking = false
 }) {
-  const title = (active == null ? void 0 : active.length) ? active.map(({ name }) => name).join(",") : placeholder;
+  const title = (active == null ? void 0 : active.length) ? active.map(({ name: name2 }) => name2).join(",") : placeholder;
+  const handleSelect = (e, callback) => {
+    if (enableTracking) {
+      userEvents.addFieldEvent("Interacted with form field", {
+        actionType: "focus",
+        field: name
+      });
+    }
+    callback(e);
+  };
   return /* @__PURE__ */ jsx(
     SelectButtonElement,
     {
+      name,
       "aria-disabled": readonly,
       "aria-expanded": showList,
       "aria-haspopup": "listbox",
@@ -3801,8 +3929,8 @@ function SelectButton({
         "adyen-kyc-dropdown-button-search": isSearch
       }),
       filterable,
-      onClick: !readonly ? toggleList : void 0,
-      onKeyDown: !readonly ? onButtonKeyDown : void 0,
+      onClick: !readonly ? (e) => handleSelect(e, toggleList) : void 0,
+      onKeyDown: !readonly ? (e) => handleSelect(e, onButtonKeyDown) : void 0,
       role: filterable || isMulti ? "button" : void 0,
       tabIndex: 0,
       title,
@@ -3905,8 +4033,20 @@ function Checkbox({
   helper,
   checked,
   disabled,
+  enableTracking = false,
   ...props
 }) {
+  const field = typeof label === "string" ? label : props.name;
+  const handleChange = (newValue) => {
+    if (enableTracking) {
+      userEvents.addFieldEvent("Interacted with form field", {
+        actionType: "input",
+        field,
+        returnValue: String(newValue)
+      });
+    }
+    onChange(newValue);
+  };
   return /* @__PURE__ */ jsxs("label", { className: "adyen-kyc-checkbox", children: [
     /* @__PURE__ */ jsx(
       "input",
@@ -3923,7 +4063,7 @@ function Checkbox({
         type: "checkbox",
         onClick: (event) => {
           event.stopPropagation();
-          onChange(!checked);
+          handleChange(!checked);
         }
       }
     ),
@@ -4135,7 +4275,8 @@ const Select = ({
   getSearchItem,
   searchText,
   onSearchTextChange,
-  showSearchList
+  showSearchList,
+  enableTracking = false
 }) => {
   const filterInputRef = useRef(null);
   const selectContainerRef = useRef(null);
@@ -4147,7 +4288,7 @@ const Select = ({
   const active = items.filter((i) => !isMulti ? i.id === selected : selected == null ? void 0 : selected.includes(i.id)) || [];
   const [isShowListAbove, setIsShowListAbove] = useState(false);
   const [scrollParent, setScrollParent] = useState(null);
-  const debouncedOnSearch = useCallback(debounce$1(onSearch, 500), [onSearch]);
+  const debouncedOnSearch = useCallback(debounce$2(onSearch, 500), [onSearch]);
   const closeList = () => {
     if (!onSearchTextChange) setTextFilter(null);
     setIsShowList(false);
@@ -4173,17 +4314,28 @@ const Select = ({
   const hideList = () => {
     setIsShowList(false);
   };
-  const handleSelect = (selectedItem) => {
-    if (readonly) return;
-    if (isMulti) {
-      const isAlreadySelected = active.find((item) => item.id === selectedItem.id);
-      const newActiveItems = isAlreadySelected ? [...active.filter((i) => i.id !== selectedItem.id).map((i) => i.id)] : [...active.map((i) => i.id), selectedItem.id];
-      onChange({ target: { value: newActiveItems, name } });
-    } else {
-      closeList();
-      onChange({ target: { value: selectedItem.id, name } });
-    }
-  };
+  const handleSelect = useCallback(
+    (selectedItem) => {
+      if (readonly) return;
+      if (isMulti) {
+        const isAlreadySelected = active.find((item) => item.id === selectedItem.id);
+        const newActiveItems = isAlreadySelected ? [...active.filter((i) => i.id !== selectedItem.id).map((i) => i.id)] : [...active.map((i) => i.id), selectedItem.id];
+        onChange({ target: { value: newActiveItems, name } });
+      } else {
+        const handleOnChange = onChange;
+        closeList();
+        handleOnChange({ target: { value: selectedItem.id, name } });
+      }
+      if (enableTracking) {
+        userEvents.addFieldEvent("Interacted with form field", {
+          actionType: "select",
+          field: name
+        });
+      }
+      if (showSearchList) setIsShowList(showSearchList);
+    },
+    [active, closeList, isMulti, name, onChange, readonly, showSearchList, enableTracking]
+  );
   const handleButtonKeyDown = (e) => {
     var _a;
     if (e.key === KEYBOARD_KEYS.enter && filterable && isShowList && textFilter) {
@@ -4244,18 +4396,24 @@ const Select = ({
         break;
     }
   };
-  const handleTextFilter = (e) => {
-    const { value } = e.target;
-    if (isSearch && value.length > 2) {
-      debouncedOnSearch(value);
-    }
-    if (onSearchTextChange) {
-      onSearchTextChange == null ? void 0 : onSearchTextChange(value);
-      setTextFilter(value);
-    } else {
-      setTextFilter(value.toLowerCase());
-    }
-  };
+  const handleTextFilter = useCallback(
+    (e) => {
+      const { value } = e.target;
+      if (enableTracking) {
+        debouncedInputEvent$1({ actionType: "input", field: name });
+      }
+      if (isSearch && value.length > 2) {
+        debouncedOnSearch(value);
+      }
+      if (onSearchTextChange) {
+        onSearchTextChange == null ? void 0 : onSearchTextChange(value);
+        setTextFilter(value);
+      } else {
+        setTextFilter(value.toLowerCase());
+      }
+    },
+    [debouncedOnSearch, isSearch, onSearchTextChange, enableTracking, name]
+  );
   const toggleList = (e) => {
     e.preventDefault();
     if (isShowList) {
@@ -4307,6 +4465,7 @@ const Select = ({
           SelectButton,
           {
             id: uniqueId ?? null,
+            name,
             active,
             filterInputRef,
             filterable,
@@ -4326,7 +4485,8 @@ const Select = ({
             isSearch,
             hideSearchIcon: !!onSearchTextChange,
             loading,
-            textFilter
+            textFilter,
+            enableTracking
           }
         ),
         /* @__PURE__ */ jsx(
@@ -4851,15 +5011,24 @@ const useForwardedRef = (forwardedRef) => {
 };
 const convertFullToHalf = (str) => str.replace(/[！-～]/g, (r) => String.fromCharCode(r.charCodeAt(0) - 65248));
 const InputBase = forwardRef((props, ref) => {
-  const { classNameModifiers = [], uniqueId, ...passedProps } = props;
-  const { isInvalid, isValid, type = "text", disabled } = props;
+  const { classNameModifiers = [], uniqueId, enableTracking = false, ...passedProps } = props;
+  const { isInvalid, isValid, type = "text", disabled, name } = props;
   const handleInput = (e) => {
     var _a;
+    if (enableTracking) {
+      debouncedInputEvent$1({ actionType: "input", field: name });
+    }
     e.target.value = convertFullToHalf(e.target.value);
     (_a = props.onInput) == null ? void 0 : _a.call(props, e);
   };
   const handleBlur = (e) => {
     var _a, _b;
+    if (enableTracking) {
+      userEvents.addFieldEvent("Interacted with form field", {
+        actionType: "blur",
+        field: name
+      });
+    }
     (_a = props.onBlurHandler) == null ? void 0 : _a.call(props, e);
     if (props.trimOnBlur) {
       e.target.value = e.target.value.trim();
@@ -4868,6 +5037,12 @@ const InputBase = forwardRef((props, ref) => {
   };
   const handleFocus = (e) => {
     var _a;
+    if (enableTracking) {
+      userEvents.addFieldEvent("Interacted with form field", {
+        actionType: "focus",
+        field: name
+      });
+    }
     (_a = props.onFocusHandler) == null ? void 0 : _a.call(props, e);
   };
   const inputClassNames = cx(
@@ -4885,6 +5060,7 @@ const InputBase = forwardRef((props, ref) => {
     "input",
     {
       ...passedProps,
+      name,
       "aria-disabled": disabled,
       "aria-invalid": !isValid,
       "aria-required": passedProps.required,
@@ -7592,9 +7768,20 @@ function RadioGroup({
   disabled = false,
   horizontal = false,
   showContentOnlyOnSelected = false,
-  className
+  className,
+  enableTracking = false
 }) {
   const { i18n } = useI18nContext();
+  const handleChange = (id) => {
+    if (enableTracking) {
+      userEvents.addFieldEvent("Interacted with form field", {
+        actionType: "input",
+        field: name,
+        returnValue: value
+      });
+    }
+    onChange(id);
+  };
   return /* @__PURE__ */ jsx(
     "div",
     {
@@ -7615,7 +7802,7 @@ function RadioGroup({
             groupName: name,
             checked: isSelected,
             disabled,
-            onClick: () => onChange(item.id)
+            onClick: () => handleChange(item.id)
           },
           item.id
         );
@@ -7968,88 +8155,23 @@ function BusinessRegistrationNumberField({
     )
   ] });
 }
-class UserEvents {
-  constructor() {
-    this.queue = [];
-    this.subscriptions = /* @__PURE__ */ new Set();
-  }
-  add(...args) {
-    this.queue.push(...args);
-  }
-  notifySubscribers() {
-    while (this.queue.length > 0) {
-      const lastEvent = this.queue.pop();
-      this.subscriptions.forEach((callback) => callback(lastEvent));
-    }
-  }
-  /**
-   * 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]);
-    this.notifySubscribers();
-  }
-  /**
-   * Starts a new event which is expected to be ended with `endEvent` eventually
-   */
-  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]);
-    this.notifySubscribers();
-  }
-  /**
-   * Subscribes a callback to analytics events. It gets called every time
-   * one of the above public methods get called, and the event data is passed back as an array.
-   * The callback must have a single argument which is an array of [eventName, eventPayload?].
-   * @example
-   * ```js
-   * const callback = ([eventName, eventPayload]) => console.log(eventName, eventPayload);
-   * this.subscribe(callback);
-   *
-   * const exampleEventPayload = { count: 1, segmentation: { foo: 'bar' } };
-   * this.addEvent('exampleEventDidOccur', exampleEventPayload);
-   *
-   * // `callback` will get called with `['exampleEventDidOccur', exampleEventPayload]`
-   * ```
-   */
-  subscribe(callback) {
-    this.subscriptions.add(callback);
-  }
-  /**
-   * Removes a subscribed callback
-   */
-  unsubscribe(callback) {
-    if (this.subscriptions.has(callback)) {
-      this.subscriptions.delete(callback);
-    }
-  }
-}
-const userEvents = new UserEvents();
 function ContextGuidance({
   page,
   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 +8252,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 +10077,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 +10127,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 +10142,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 +10177,16 @@ function CompanyRegistrationDetailsComponent(props) {
     tradingNameFieldMetadata,
     mergedProps
   );
+  mergedProps = mergeFieldMetadataIntoProps(
+    "hasDba",
+    hasDbaFieldMetadata,
+    mergedProps
+  );
+  mergedProps = mergeFieldMetadataIntoProps(
+    "dbaName",
+    dbaNameFieldMetadata,
+    mergedProps
+  );
   mergedProps = mergeFieldMetadataIntoProps(
     "stockExchangeMIC",
     stockExchangeMICFieldMetadata,
@@ -9983,6 +10247,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 +10272,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 +10307,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 +10324,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 +10495,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 +10512,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 */
@@ -10726,7 +11012,7 @@ const isExistingFile = (file) => "existing" in file && file.existing;
 const isNewlyUploadedFile = (file) => !isExistingFile(file);
 function DropzoneFile(props) {
   var _a;
-  const { file, errorMessage, onDelete } = props;
+  const { label, file, errorMessage, onDelete } = props;
   const { i18n } = useI18nContext();
   let documentIcon;
   const formatSize = (bytes) => {
@@ -10743,6 +11029,15 @@ function DropzoneFile(props) {
     default:
       documentIcon = "document";
   }
+  useEffect(() => {
+    if (!errorMessage) return;
+    userEvents.addFieldEvent("Encountered error", {
+      actionType: "change",
+      field: label || "dropzone",
+      returnType: "validation",
+      returnValue: errorMessage
+    });
+  }, [label, errorMessage]);
   return /* @__PURE__ */ jsxs(
     "div",
     {
@@ -10855,7 +11150,8 @@ function Dropzone(props) {
     isOptional,
     maxNumberOfFiles = defaultFileValidationOptions.maxNumberOfFiles,
     maxSize = defaultFileValidationOptions.maxSize,
-    allowedFileTypes = defaultFileValidationOptions.allowedFileTypes
+    allowedFileTypes = defaultFileValidationOptions.allowedFileTypes,
+    enableTracking = false
   } = props;
   const { i18n } = useI18nContext();
   const fileInput = useRef(null);
@@ -10930,6 +11226,12 @@ function Dropzone(props) {
   };
   const handleFileChange = (e) => updateFiles(e.target);
   const updateFiles = ({ files }) => {
+    if (enableTracking) {
+      userEvents.addFieldEvent("Interacted with form field", {
+        actionType: "change",
+        field: label || "file picker"
+      });
+    }
     const currentFiles = (data == null ? void 0 : data[name]) || [];
     handleChangeFor(name, "input")([...currentFiles, ...files]);
   };
@@ -10965,6 +11267,7 @@ function Dropzone(props) {
       return /* @__PURE__ */ jsx(
         DropzoneFile,
         {
+          label,
           file,
           onDelete: () => handleFileDelete(file),
           errorMessage: (_a2 = errors == null ? void 0 : errors[name]) == null ? void 0 : _a2.errorMessage
@@ -11014,6 +11317,10 @@ function Dropzone(props) {
   ] });
 }
 const logger$z = createLogger("TextArea");
+const debouncedInputEvent = debounce$2(
+  (properties) => userEvents.addFieldEvent("Interacted with form field", properties),
+  500
+);
 function TextArea(props) {
   const { classNameModifiers, uniqueId, ...passedProps } = props;
   const {
@@ -11023,7 +11330,9 @@ function TextArea(props) {
     readonly = null,
     spellCheck,
     disabled,
-    maxLength
+    maxLength,
+    enableTracking = false,
+    name
   } = props;
   const { i18n } = useI18nContext();
   const [value, setValue] = useState("");
@@ -11032,12 +11341,24 @@ function TextArea(props) {
   }
   const handleInput = (e) => {
     var _a;
+    if (enableTracking) {
+      debouncedInputEvent({
+        actionType: "input",
+        field: name
+      });
+    }
     e.target.value = convertFullToHalf(e.target.value);
     setValue(e.target.value);
     (_a = props == null ? void 0 : props.onInput) == null ? void 0 : _a.call(props, e);
   };
   const handleBlur = (e) => {
     var _a, _b;
+    if (enableTracking) {
+      userEvents.addFieldEvent("Interacted with form field", {
+        actionType: "blur",
+        field: name
+      });
+    }
     (_a = props == null ? void 0 : props.onBlurHandler) == null ? void 0 : _a.call(props, e);
     if (props.trimOnBlur) {
       e.target.value = e.target.value.trim();
@@ -11046,6 +11367,12 @@ function TextArea(props) {
   };
   const handleFocus = (e) => {
     var _a;
+    if (enableTracking) {
+      userEvents.addFieldEvent("Interacted with form field", {
+        actionType: "focus",
+        field: name
+      });
+    }
     (_a = props == null ? void 0 : props.onFocusHandler) == null ? void 0 : _a.call(props, e);
   };
   const inputClassNames = cx(
@@ -13066,9 +13393,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 +13459,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 +13529,8 @@ function RegistrationAddressComponent(props) {
     handleFindAddress,
     country,
     data,
-    validators: validators2
+    validators: validators2,
+    baseTrackingPayload
   } = props;
   const {
     requiredFields: registrationAddressRequiredFields,
@@ -13288,7 +13620,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 +14047,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 +14280,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 +14477,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 +14598,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 +14626,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 +14652,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 +14673,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",
@@ -15522,27 +15833,40 @@ const RadioCardSelect = ({
   renderOptionBody,
   renderOptionFooter,
   isOptionDisabled,
-  floatingRadio
-}) => /* @__PURE__ */ jsx("div", { className: className ?? "adyen-kyc-radio-group-card", children: options.map((option) => /* @__PURE__ */ jsx(
-  RadioCard,
-  {
-    optionId: optionId(option),
-    optionName: optionName(option),
-    optionDescription: optionDescription == null ? void 0 : optionDescription(option),
-    optionSubtitle: optionSubtitle == null ? void 0 : optionSubtitle(option),
-    isInvalid,
-    isSelected: selected === option,
-    onSelect: () => onSelect(option),
-    name,
-    classNames: optionClassNames == null ? void 0 : optionClassNames(option),
-    icon: renderOptionIcon == null ? void 0 : renderOptionIcon(option),
-    body: renderOptionBody == null ? void 0 : renderOptionBody(option),
-    footer: renderOptionFooter == null ? void 0 : renderOptionFooter(option),
-    disabled: isOptionDisabled == null ? void 0 : isOptionDisabled(option),
-    floatingRadio
-  },
-  optionId(option)
-)) });
+  floatingRadio,
+  enableTracking = false
+}) => {
+  const handleSelect = (option) => {
+    if (enableTracking) {
+      userEvents.addFieldEvent("Interacted with form field", {
+        actionType: "input",
+        field: name,
+        returnValue: typeof option === "string" ? option : void 0
+      });
+    }
+    onSelect(option);
+  };
+  return /* @__PURE__ */ jsx("div", { className: className ?? "adyen-kyc-radio-group-card", children: options.map((option) => /* @__PURE__ */ jsx(
+    RadioCard,
+    {
+      optionId: optionId(option),
+      optionName: optionName(option),
+      optionDescription: optionDescription == null ? void 0 : optionDescription(option),
+      optionSubtitle: optionSubtitle == null ? void 0 : optionSubtitle(option),
+      isInvalid,
+      isSelected: selected === option,
+      onSelect: () => handleSelect(option),
+      name,
+      classNames: optionClassNames == null ? void 0 : optionClassNames(option),
+      icon: renderOptionIcon == null ? void 0 : renderOptionIcon(option),
+      body: renderOptionBody == null ? void 0 : renderOptionBody(option),
+      footer: renderOptionFooter == null ? void 0 : renderOptionFooter(option),
+      disabled: isOptionDisabled == null ? void 0 : isOptionDisabled(option),
+      floatingRadio
+    },
+    optionId(option)
+  )) });
+};
 const idVerificationMethodsMetadata = {
   instantVerification: {
     name: "instantVerification",
@@ -15680,7 +16004,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(
@@ -16742,6 +17067,8 @@ const trustBase = {
   legalName: {
     rule: "REQUIRED"
   },
+  dbaName: { rule: "isLemApiVersionV4Enabled" },
+  hasDba: { rule: "isLemApiVersionV4Enabled" },
   country: {
     rule: "REQUIRED"
   },
@@ -17282,7 +17609,8 @@ const DriversLicense$1 = ({
   formUtils,
   isValid,
   errorMessages,
-  shouldValidate
+  shouldValidate,
+  baseTrackingPayload
 }) => {
   const { i18n } = useI18nContext();
   const { dataset: auStates } = useDataset(datasetIdentifier.state("AU"));
@@ -17362,7 +17690,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 +17827,8 @@ function IdentityAuComponent({
           ),
           issuerState: formUtils.getErrorMessage("issuerState", errors, fieldProblems)
         },
-        shouldValidate
+        shouldValidate,
+        baseTrackingPayload: { task: TaskTypes.INDIVIDUAL }
       }
     ) : void 0
   ] });
@@ -17615,7 +17945,8 @@ const DriversLicense = ({
   formUtils,
   isValid,
   errorMessages,
-  shouldValidate
+  shouldValidate,
+  baseTrackingPayload
 }) => {
   const { i18n } = useI18nContext();
   return /* @__PURE__ */ jsxs(Fragment, { children: [
@@ -17674,7 +18005,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 +18170,8 @@ function IdentityNZComponent({
             fieldProblems
           )
         },
-        shouldValidate
+        shouldValidate,
+        baseTrackingPayload: { task: TaskTypes.INDIVIDUAL }
       }
     ) : void 0
   ] });
@@ -18061,6 +18394,10 @@ function PersonalDetailsComponent(props) {
     }
   };
   const alertProps = getAlertProps();
+  const baseTrackingPayload = getAssociatedLeAnalyticsPayload({
+    task: props.taskType,
+    ...isDecisionMakerTask ? { associatedLegalEntity: props.parentLegalEntity } : {}
+  });
   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 +18433,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 +18946,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 +18955,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,
@@ -18798,6 +19140,7 @@ function FilePicker({
   multiple = false,
   label,
   iconPrefix = "generic-document",
+  enableTracking = false,
   // file validation options
   allowedFileTypes,
   maxSize,
@@ -18839,6 +19182,12 @@ function FilePicker({
     if (fileInput2.files) addFiles(fileInput2.files);
   };
   const addFiles = (newFiles) => {
+    if (enableTracking) {
+      userEvents.addFieldEvent("Interacted with form field", {
+        actionType: "change",
+        field: label || "dropzone"
+      });
+    }
     setFiles([...newFiles, ...files]);
   };
   const allowedFileTypesString = allowedFileTypes.join(", ");
@@ -18855,6 +19204,7 @@ function FilePicker({
     files.map((file) => /* @__PURE__ */ jsx(
       DropzoneFile,
       {
+        label,
         file,
         onDelete: () => handleFileDelete(file),
         errorMessage,
@@ -21692,7 +22042,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: { task: TaskTypes.PAYOUT }
       }
     ) : void 0
   ] });
@@ -22062,7 +22413,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 +23096,7 @@ const trustRegistrationDetailsValidationsV4 = {
 };
 const trustRegistrationDetailsFields = [
   "legalName",
+  ...DBA_NAME_FIELD,
   "country",
   "trustType",
   "objectOfTrust",
@@ -22758,6 +23111,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 +23121,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 +23217,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 +23361,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 +23971,8 @@ function Summary({
         icon: "edit",
         onClick: () => {
           trackNavigation2({
-            fromForm: { formName: "summary", formId: "summary" },
-            toForm: { formId, formName },
+            fromForm: "summary",
+            toForm: formName,
             component: "Pencil icon"
           });
           editForm(formId);
@@ -23684,18 +24054,15 @@ const trackNavigation = ({
   fromForm,
   toForm,
   component,
-  baseTrackingPayload,
-  i18n
+  baseTrackingPayload
 }) => {
-  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: fromForm,
+    label: component,
+    toPage: toForm
   });
 };
 const useHideButton = (condition, setHideState) => {
@@ -23751,6 +24118,9 @@ const useFormComposer = ({
       (activeForm2) => forms.find(({ formId }) => formId === activeForm2.formId) ?? activeForm2
     );
   }, [forms]);
+  useEffect(() => {
+    userEvents.updateSharedEventProperties({ page: activeForm.formHeading || activeForm.formId });
+  }, [activeForm]);
   useEffect(() => {
     if (hasAlreadyNavigatedForm) return;
     const openingStep = getOpeningStep(forms, problems == null ? void 0 : problems.remediationActions);
@@ -23758,12 +24128,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 +24172,13 @@ 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
+      baseTrackingPayload
     });
-    trackSectionCompletion(activeForm);
+    trackSectionCompletion(activeForm.formName);
   };
   const handleBackClick = () => {
     const currentFormIndex = forms.findIndex((form) => form.formId === activeForm.formId);
@@ -23819,7 +24187,12 @@ 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
+      });
     }
   };
   const nextButtonLabel = isFinalStep ? i18n.get(submitButtonLabel ?? "submit") : i18n.get("next");
@@ -24146,7 +24519,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 +24714,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 +24846,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 +24913,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 +25071,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 +25268,6 @@ function AdditionalInformationComponent({
     fieldProblems: formFieldProblems,
     handleChangeFor,
     resetToDefaultData,
-    setData,
     setErrors,
     setValid
   } = useForm({
@@ -25084,7 +25335,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 +25578,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 +25630,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 +26578,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 +27665,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));
@@ -27493,10 +27754,25 @@ const FormWrapper = ({
     ExperimentNames.ShowExtraTaxExemptionReasons
   );
   const showTaxExemptedLegalCaption = showExtraTaxExemptionReasons && ((_a = summaryData.companyRegistrationDetails) == null ? void 0 : _a.vatAbsenceReason) && ["companyDetails", "businessDetails"].includes(taskName);
+  const handleTrackNavigation = useCallback(
+    ({
+      fromForm,
+      toForm,
+      component
+    }) => {
+      trackNavigation({
+        fromForm,
+        toForm,
+        component,
+        baseTrackingPayload
+      });
+    },
+    [baseTrackingPayload]
+  );
   const summaryContent = /* @__PURE__ */ jsx("div", { className: "adyen-kyc-form-wrapper", children: /* @__PURE__ */ jsx(
     Summary,
     {
-      trackNavigation: (payload) => trackNavigation({ ...payload, i18n, baseTrackingPayload }),
+      trackNavigation: handleTrackNavigation,
       data: summaryData,
       omittedKeys,
       omittedForms,
@@ -27586,7 +27862,7 @@ const FormWrapper = ({
           gotoForm: gotoFormByFormIndex,
           validateForm,
           taskName,
-          trackNavigation: ({ fromForm, toForm, component }) => trackNavigation({ fromForm, toForm, component, baseTrackingPayload, i18n }),
+          trackNavigation: handleTrackNavigation,
           verificationErrors: problems == null ? void 0 : problems.verificationErrors
         }
       )
@@ -27608,20 +27884,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";
@@ -27630,6 +27892,22 @@ const validateErrorCode = (error, errorCode) => error && "errorCode" in error &&
 const isValidationError = (error) => validateErrorCode(error, API_VALIDATION_ERROR_CODE);
 const isIdDocumentUploadError = (error) => validateErrorCode(error, ID_DOCUMENT_UPLOAD_ERROR_CODE);
 const isBankStatementUploadError = (error) => validateErrorCode(error, BANK_STATEMENT_UPLOAD_ERROR_CODE);
+const 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 processValidationErrors = (validationError, dropinTask, keyMappings) => {
   if ((validationError == null ? void 0 : validationError.invalidFields) && (validationError == null ? void 0 : validationError.invalidFields.length) > 0) {
     return validationError == null ? void 0 : validationError.invalidFields.reduce((acc, invalidField) => {
@@ -27684,7 +27962,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 +27987,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 +28035,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 +28060,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 +28104,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 +28151,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 +28191,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 +28210,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 +28225,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 +28247,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");
@@ -27996,7 +28262,6 @@ function BusinessDetailsDropinComponent({
   legalEntityResponse,
   isTargetLegalEntityType,
   parentLegalEntity,
-  trackingConfig,
   capabilities,
   taskName,
   hideDropinLayout,
@@ -28022,18 +28287,22 @@ function BusinessDetailsDropinComponent({
   const {
     state: { currentState }
   } = useStateContext();
+  const baseTrackingPayload = useMemo(
+    () => getAssociatedLeAnalyticsPayload({
+      task: taskType,
+      associatedLegalEntity: parentLegalEntity
+    }),
+    [parentLegalEntity, taskType]
+  );
   useEffect(() => {
     onChange == null ? void 0 : onChange(currentState);
   }, [currentState, onChange]);
   useEffect(() => {
-    userEvents.addPageView("Business details dropin");
-    userEvents.addEvent(BusinessDetailsEvents.TASK_START, {
-      segmentation: getBaseTrackingPayload({
-        trackingConfig,
-        parentLegalEntity,
-        legalEntity: legalEntityResponse,
-        task: taskType
-      })
+    userEvents.updateBaseTrackingPayload({ task: taskType });
+    userEvents.addEvent("Landed on page", {
+      ...baseTrackingPayload,
+      actionLevel: "task",
+      actionType: "start"
     });
   }, []);
   const formRef = useRef(null);
@@ -28077,15 +28346,6 @@ function BusinessDetailsDropinComponent({
   );
   const [showCompanyStructure, setShowCompanyStructure] = useState(currentCountry !== "US");
   const [showBusinessSelection, setShowBusinessSelection] = useState(false);
-  const baseTrackingPayload = useMemo(
-    () => getBaseTrackingPayload({
-      trackingConfig,
-      parentLegalEntity,
-      legalEntity: legalEntityResponse,
-      task: taskType
-    }),
-    [legalEntityResponse, parentLegalEntity, taskType, trackingConfig]
-  );
   const getConfigurationData = useCallback(
     () => getConfiguration2({
       legalEntityType: LegalEntityType.ORGANIZATION,
@@ -28366,11 +28626,17 @@ function BusinessDetailsDropinComponent({
     ]
   );
   const nextClick = useCallback(() => {
-    var _a2;
+    var _a2, _b2;
     if (!COUNTRIES_USING_COMPANY_SEARCH.includes(currentCountry)) return handleNextClick();
+    const toFormName = (_a2 = forms[forms.findIndex((form) => form.formId === activeForm.formId) + 1]) == null ? void 0 : _a2.formName;
     switch (activeForm.formId) {
       case "basicInformation":
-        if (((_a2 = currentState.validityByForm) == null ? void 0 : _a2.basicInformation) && !isBusinessSelection && !verifiedBusiness) {
+        if (((_b2 = currentState.validityByForm) == null ? void 0 : _b2.basicInformation) && !isBusinessSelection && !verifiedBusiness) {
+          trackNavigation({
+            fromForm: activeForm.formName,
+            toForm: toFormName || "home",
+            component: "next"
+          });
           findBusiness(currentState.data.basicInformation);
           setShowBusinessSelection(true);
           break;
@@ -28382,17 +28648,24 @@ function BusinessDetailsDropinComponent({
   }, [
     currentCountry,
     handleNextClick,
+    forms,
     activeForm.formId,
-    verifiedBusiness,
+    activeForm.formName,
     (_e = currentState.validityByForm) == null ? void 0 : _e.basicInformation,
     currentState.data.basicInformation,
     isBusinessSelection,
+    verifiedBusiness,
     findBusiness
   ]);
   const backClick = useCallback(() => {
     if (!COUNTRIES_USING_COMPANY_SEARCH.includes(country)) return handleBackClick == null ? void 0 : handleBackClick();
     switch (activeForm.formId) {
       case "basicInformation": {
+        trackNavigation({
+          fromForm: activeForm.formName,
+          toForm: "basicDetails",
+          component: "back"
+        });
         return showBusinessSelection ? setShowBusinessSelection(false) : void 0;
       }
       case "companyStructure": {
@@ -28417,6 +28690,8 @@ function BusinessDetailsDropinComponent({
     }
   }, [
     activeForm.formId,
+    activeForm.formName,
+    i18n,
     country,
     handleBackClick,
     searching,
@@ -28424,6 +28699,14 @@ function BusinessDetailsDropinComponent({
     showBusinessSelection,
     verifiedBusiness
   ]);
+  const homeClick = () => {
+    trackNavigation({
+      fromForm: activeForm.formName,
+      toForm: "home",
+      component: "home"
+    });
+    handleHomeClick == null ? void 0 : handleHomeClick();
+  };
   const proceedToManualDataEntry = useCallback(async () => {
     await clearTrustedBusinessData().then(() => setShowCompanyStructure(true));
   }, [clearTrustedBusinessData]);
@@ -28469,7 +28752,7 @@ function BusinessDetailsDropinComponent({
       backButtonLabel: i18n.get("goBack"),
       handleNextClick: nextClick,
       handleBackClick: backClick,
-      handleHomeClick,
+      handleHomeClick: homeClick,
       children: /* @__PURE__ */ jsx(
         BusinessDetailsComponent,
         {
@@ -28548,7 +28831,6 @@ function CompanyDropinComponent({
   capabilities,
   homeButtonLabel,
   taskType = TaskTypes.COMPANY,
-  trackingConfig,
   associationDetail,
   parentLegalEntity,
   legalEntityResponse,
@@ -28573,6 +28855,7 @@ function CompanyDropinComponent({
   const { i18n } = useI18nContext();
   const canChangeEntityType = isSettingEnabled(SettingNames.AllowLegalEntityTypeChange);
   const dataFromResponse = mapLegalEntityToCompany(legalEntityResponse);
+  const isTrustMemberCompany = taskType === TaskTypes.TRUST_MEMBER_COMPANY;
   const { getConfiguration: getConfiguration2 } = useConfigurationApi();
   const [data, setData] = useState(dataFromResponse);
   const [problems, setProblems] = useState(propProblems);
@@ -28581,16 +28864,19 @@ function CompanyDropinComponent({
   );
   const [loadingStatus, setLoadingStatus] = useState("success");
   const formRef = useRef(null);
-  const baseTrackingPayload = getBaseTrackingPayload({
-    trackingConfig,
-    parentLegalEntity,
-    legalEntity: legalEntityResponse,
-    task: taskType
+  const baseTrackingPayload = getAssociatedLeAnalyticsPayload({
+    task: taskType,
+    ...isTrustMemberCompany ? {
+      associatedLegalEntity: legalEntityResponse,
+      associatedLegalEntityOrg: parentLegalEntity
+    } : {}
   });
   useEffect(() => {
-    userEvents.addPageView("Company dropin");
-    userEvents.addEvent("Started company task", {
-      segmentation: baseTrackingPayload
+    userEvents.updateBaseTrackingPayload({ task: taskType });
+    userEvents.addEvent("Landed on page", {
+      ...baseTrackingPayload,
+      actionLevel: "task",
+      actionType: "start"
     });
   }, []);
   const getConfigurationData = useCallback(
@@ -28672,19 +28958,19 @@ 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))
         });
       });
     }
   };
   const attachAssociationToParentLegalEntity = async ({ legalEntity }) => {
     var _a2;
-    if (taskType === TaskTypes.TRUST_MEMBER_COMPANY) {
+    if (isTrustMemberCompany) {
       const existingEntityAssociations = getOwnEntityAssociations(parentLegalEntity);
       const existingRoles = (_a2 = existingEntityAssociations == null ? void 0 : existingEntityAssociations.filter((ea) => ea.legalEntityId === parentLegalEntity.id)) == null ? void 0 : _a2.map(({ type }) => type);
       const newRoles = associationDetail == null ? void 0 : associationDetail.roles;
@@ -28710,9 +28996,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 +29012,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 +29025,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 +29051,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 +29744,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 +30049,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();
@@ -29826,24 +30113,10 @@ const BusinessTypeSelection = ({
     );
   }, [data.businessType, data.legalArrangement, currentStep]);
   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", {
+      actionLevel: "task",
+      actionType: "start"
+    });
   }, []);
   const handleNextClick = async () => {
     var _a2;
@@ -29875,21 +30148,19 @@ 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 = {
+      actionLevel: "task",
+      actionType: "submit"
+    };
     try {
       if (isLegalEntityTypeChanging) {
         setLoadingStatus("loading");
@@ -29897,8 +30168,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 +30195,7 @@ const BusinessTypeSelection = ({
           },
           legalEntityResponse == null ? void 0 : legalEntityResponse.id
         ));
+        userEvents.addEvent("Success", trackingPayload);
       }
     } catch (e) {
       showToast({ label: i18n.get("failedToUpdateDetails"), type: "error" });
@@ -30491,8 +30772,6 @@ const EntityGuidanceStatus = ({
   ] });
 };
 const DecisionMakersComponent = ({
-  trackingConfig,
-  parentLegalEntity,
   legalEntityResponse,
   capabilityProblems,
   onNavigateToIndividual,
@@ -30509,6 +30788,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
@@ -30531,17 +30811,27 @@ const DecisionMakersComponent = ({
   }, {});
   const uniqueDecisionMakers = mappedDecisionMakers ? Object.values(mappedDecisionMakers) : [];
   const showWarning = Boolean(remediationMessages.DECISION_MAKER && uniqueDecisionMakers.length);
+  useEffect(() => {
+    if (showWarning) {
+      userEvents.addEvent("Encountered error", {
+        task: TaskTypes.DECISION_MAKER_OVERVIEW,
+        actionLevel: "task",
+        actionType: "alert",
+        label: remediationMessages.DECISION_MAKER
+      });
+    }
+  }, [showWarning]);
   const uniqueDecisionMakersPerType = (roleType) => uniqueDecisionMakers.filter(({ types }) => types.includes(roleType)).length;
   const allowedDecisionMakerTypes = getAllowedDecisionMakerRoles(
     legalEntityResponse,
     TaskTypes.DECISION_MAKER
   );
   const haveMaxDecisionMakers = allowedDecisionMakerTypes.length === 0;
-  const baseTrackingPayload = getBaseTrackingPayload({
-    trackingConfig,
-    parentLegalEntity,
-    legalEntity: legalEntityResponse,
-    task: TaskTypes.DECISION_MAKER_OVERVIEW
+  const getDecisionMakerTrackingParams = (decisionMaker) => ({
+    task: TaskTypes.DECISION_MAKER_OVERVIEW,
+    associatedLegalEntityId: decisionMaker.reference,
+    associatedLegalEntityType: decisionMaker.legalEntityType,
+    roles: decisionMaker.types
   });
   const addDecisionMakerOnClick = (e) => {
     e.stopPropagation();
@@ -30549,13 +30839,10 @@ 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", {
+      ...getDecisionMakerTrackingParams(decisionMaker),
+      actionLevel: "task",
+      actionType: "edit"
     });
   };
   const deleteDecisionMaker = async (decisionMaker) => {
@@ -30570,14 +30857,11 @@ 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", {
+        ...getDecisionMakerTrackingParams(decisionMaker),
+        actionLevel: "task",
+        actionType: "remove",
+        remainingDecisionMakers
       });
       showToast({ type: "success", label: i18n.get("successFullyRemovedDecisionMaker") });
     } catch (e) {
@@ -30624,7 +30908,8 @@ const DecisionMakersComponent = ({
               roleType
             )) }),
             titleId: "whatIsTheDifferenceBetweenTheseRoles",
-            contentId: "differenceBetweenAnOwnerControllingPersonAndSignatory"
+            contentId: "differenceBetweenAnOwnerControllingPersonAndSignatory",
+            baseTrackingPayload: { task: TaskTypes.DECISION_MAKER_OVERVIEW }
           }
         ),
         showWarning && /* @__PURE__ */ jsx(
@@ -30668,15 +30953,16 @@ const DecisionMakersComponent = ({
           ActionBar,
           {
             onHome: () => {
-              userEvents.addEvent("Saved decision makers list", {
-                segmentation: {
-                  ...baseTrackingPayload,
-                  noOfDecisionMakers: decisionMakers.length
-                }
+              userEvents.addEvent("Clicked button", {
+                task: TaskTypes.DECISION_MAKER_OVERVIEW,
+                actionLevel: "task",
+                actionType: "back",
+                label: homeButtonLabel,
+                noOfDecisionMakers: decisionMakers.length
               });
               navigateBackToTaskList();
             },
-            homeButtonLabel: i18n.get("saveAndGoToOverview")
+            homeButtonLabel
           }
         )
       ] })
@@ -30735,22 +31021,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 +31133,26 @@ const Introduction = ({
   const { i18n } = useI18nContext();
   const introductionScreens = useIntroductionScreens({ legalEntity, tasks });
   const [activeIndex, setActiveIndex] = useState(0);
-  const eventSegmentationDefaults = getBaseTrackingPayload({
-    trackingConfig: { topLevelLegalEntity: legalEntity },
-    legalEntity,
-    task: TaskTypes.INTRODUCTION
-  });
-  const eventDetails = {
-    segmentation: {
-      ...eventSegmentationDefaults,
-      page: (introductionScreens == null ? void 0 : introductionScreens.length) ? introductionScreens[activeIndex] : null
-    }
+  const pageEventDetails = {
+    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", {
+        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 +31164,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 +31191,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 +31207,13 @@ 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", {
+              actionLevel: "task",
+              actionType: "start",
+              label: buttonLabels.start
+            });
             onExitIntroduction();
           },
           type: "button"
@@ -30948,14 +31221,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"
         }
@@ -31491,7 +31764,6 @@ const LEGAL_ENTITY_BASE_TASKS = [
 const CONTRACT_TASKS = [TaskTypes.SERVICE_AGREEMENT, TaskTypes.PCI_DSS];
 function TaskListComponent({
   tasks,
-  trackingConfig,
   onNavigateToTask,
   legalEntityResponse,
   capabilityProblems,
@@ -31565,16 +31837,23 @@ 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", {
+      task: TaskTypes.TASKS_OVERVIEW,
+      actionLevel: "task",
+      actionType: "edit"
     });
     onNavigateToTask(TaskTypes.BUSINESS_TYPE_SELECTION);
   };
+  useEffect(() => {
+    if (showDecisionMakersWarning) {
+      userEvents.addEvent("Encountered error", {
+        task: TaskTypes.TASKS_OVERVIEW,
+        actionLevel: "task",
+        actionType: "alert",
+        label: remediationMessages.DECISION_MAKER
+      });
+    }
+  }, [showDecisionMakersWarning]);
   return /* @__PURE__ */ jsxs("div", { className: "adyen-task-list__container", children: [
     canSeeIntroduction && /* @__PURE__ */ jsx("div", { className: "adyen-task-list__nav", children: /* @__PURE__ */ jsx(
       Button,
@@ -32089,7 +32368,8 @@ const TrustMembersOverview = ({
               label
             )) }),
             titleId: "whatIsTheDifferenceBetweenTheseRoles",
-            contentId: "differenceBetweenTrustMemberRoles"
+            contentId: "differenceBetweenTrustMemberRoles",
+            baseTrackingPayload: { task: TaskTypes.TRUST_MEMBER_OVERVIEW }
           }
         ),
         /* @__PURE__ */ jsx(CardGroup, { children: trustMembers.map((trustMember) => {
@@ -32280,7 +32560,6 @@ function IndividualDropinComponent({
   handleGetIdVerificationStartCheck,
   handleOpenSingpassAuthorizationLink,
   taskType = TaskTypes.INDIVIDUAL,
-  trackingConfig,
   parentLegalEntity,
   legalEntityResponse,
   taskName,
@@ -32338,16 +32617,22 @@ function IndividualDropinComponent({
     accountHolder,
     handleOpenSingpassAuthorizationLink
   });
-  const baseTrackingPayload = getBaseTrackingPayload({
-    trackingConfig,
-    parentLegalEntity,
-    legalEntity: legalEntityResponse,
-    task: taskType
+  const baseTrackingPayload = getAssociatedLeAnalyticsPayload({
+    task: taskType,
+    ...taskType === TaskTypes.INDIVIDUAL ? {} : taskType === TaskTypes.TRUST_MEMBER_COMPANY_OWNER ? {
+      associatedLegalEntity: legalEntityResponse,
+      associatedLegalEntityOrg: parentLegalEntity
+    } : {
+      // i.e. legal arrangement, decision maker, or trust member individual
+      associatedLegalEntity: legalEntityResponse
+    }
   });
   useEffect(() => {
-    userEvents.addPageView("Individual dropin");
-    userEvents.addEvent("Started individual task", {
-      segmentation: { ...baseTrackingPayload }
+    userEvents.updateBaseTrackingPayload({ task: taskType });
+    userEvents.addEvent("Landed on page", {
+      ...baseTrackingPayload,
+      actionLevel: "task",
+      actionType: "start"
     });
   }, []);
   const getConfigurationData = useCallback(
@@ -32477,27 +32762,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 +32815,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 +32887,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 +32931,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
       });
     }
   };
@@ -32966,7 +33250,6 @@ function PayoutDetailsDropinComponent({
   handleGetBankVerificationVendors,
   legalEntityResponse,
   associatedLegalArrangement,
-  trackingConfig,
   accountHolder,
   problems: propProblems,
   onSubmit: externalOnSubmit,
@@ -33038,14 +33321,11 @@ function PayoutDetailsDropinComponent({
     propProblems || ((transferInstrument == null ? void 0 : transferInstrument.id) ? (_c = (_b = getCapabilityProblems(legalEntityResponse, bankAccountCountry)) == null ? void 0 : _b.BankAccount) == null ? void 0 : _c[transferInstrument.id] : void 0)
   );
   const existingBankAccountFormat = transferInstrument ? ((_d = existingPayoutDetails == null ? void 0 : existingPayoutDetails.payoutAccountDetails) == null ? void 0 : _d.iban) ? "iban" : "local" : void 0;
-  const baseTrackingPayload = getBaseTrackingPayload({
-    trackingConfig,
-    task: taskType
-  });
   useEffect(() => {
-    userEvents.addPageView("Payout dropin");
-    userEvents.addEvent("Started payout task", {
-      segmentation: { ...baseTrackingPayload }
+    userEvents.updateBaseTrackingPayload({ task: taskType });
+    userEvents.addEvent("Landed on page", {
+      actionLevel: "task",
+      actionType: "start"
     });
   }, []);
   const { getConfigurationData, provider } = useBankConfigurationHandlers({
@@ -33171,12 +33451,11 @@ 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", {
+              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 +33487,14 @@ 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 = {
+      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 +33510,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 +33539,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)
       });
     }
   };
@@ -33328,7 +33603,7 @@ function PayoutDetailsDropinComponent({
     nextButtonLabel
   } = useFormComposer({
     problems,
-    baseTrackingPayload,
+    baseTrackingPayload: {},
     forms,
     submitButtonLabel,
     externalBackClick,
@@ -33369,7 +33644,7 @@ function PayoutDetailsDropinComponent({
       loadingStatus,
       forms,
       onSubmit,
-      baseTrackingPayload,
+      baseTrackingPayload: {},
       gotoFormByFormIndex,
       nextButtonLabel,
       homeButtonLabel,
@@ -33447,19 +33722,15 @@ function PciDropinComponent({
   pciTemplateResponse,
   handleHomeClick,
   handleSign,
-  taskType = TaskTypes.PCI_DSS,
-  trackingConfig
+  taskType = TaskTypes.PCI_DSS
 }) {
   var _a, _b, _c, _d;
   const { i18n } = useI18nContext();
   const { showToast } = useToastContext();
-  const baseTrackingPayload = getBaseTrackingPayload({
-    trackingConfig,
-    legalEntity: legalEntityResponse,
-    task: taskType
-  });
   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 +33757,12 @@ function PciDropinComponent({
   ];
   const handleSignClick = async () => {
     if (loadingStatus === "loading") return;
-    userEvents.addEvent("Clicked PCI signing", { segmentation: { ...baseTrackingPayload } });
+    const baseTracking = {
+      actionLevel: "task",
+      actionType: "sign",
+      label: signButtonLabel
+    };
+    userEvents.addEvent("Clicked button", baseTracking);
     triggerValidation();
     if (isValid) {
       try {
@@ -33494,40 +33770,45 @@ 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", {
+      actionLevel: "task",
+      actionType: "back",
+      label: homeButtonLabel
     });
     handleHomeClick();
   };
   const handleExpandSection = (title) => {
-    userEvents.addEvent("Expanded PCI section", {
-      segmentation: {
-        ...baseTrackingPayload,
-        statementExtended: title
-      }
+    userEvents.addEvent("Clicked accordion", {
+      actionLevel: "task",
+      actionType: "open",
+      label: title
     });
   };
   useEffect(() => {
-    userEvents.addPageView("PCI dropin");
-    userEvents.addEvent("Started PCI task", {
-      segmentation: { ...baseTrackingPayload }
+    userEvents.updateBaseTrackingPayload({ task: taskType });
+    userEvents.addEvent("Landed on page", {
+      actionLevel: "task",
+      actionType: "start"
     });
   }, []);
   const acceptPciLabel = /* @__PURE__ */ jsxs(Fragment, { children: [
@@ -33586,9 +33867,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 });
@@ -34430,21 +34711,14 @@ function ServiceAgreementDropinComponent({
   handleHomeClick,
   handleAddSigner,
   handleSign,
-  taskType,
   serviceAgreementTypes,
-  serviceAgreementAcceptanceInfos,
-  trackingConfig
+  serviceAgreementAcceptanceInfos
 }) {
   var _a, _b;
   const { i18n } = useI18nContext();
   const { showToast } = useToastContext();
   const { isExperimentEnabled } = useExperimentsContext();
   const isAgeVerificationEnabled = isExperimentEnabled("EnableAgeVerification");
-  const baseTrackingPayload = getBaseTrackingPayload({
-    trackingConfig,
-    legalEntity: legalEntityResponse,
-    task: taskType
-  });
   const [loadingStatus, setLoadingStatus] = useState();
   const signedForms = serviceAgreementAcceptanceInfos.map((serviceAgreementAcceptanceInfo) => ({
     formId: serviceAgreementAcceptanceInfo.id,
@@ -34466,6 +34740,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 +34782,11 @@ function ServiceAgreementDropinComponent({
   };
   const signers = getSigners();
   const handleSignClick = async () => {
-    userEvents.addEvent("Clicked ToS signing", { segmentation: { ...baseTrackingPayload } });
+    const baseTracking = {
+      actionLevel: "task",
+      actionType: "sign"
+    };
+    userEvents.addEvent("Clicked button", { ...baseTracking, label: nextButtonLabel });
     triggerValidation();
     if (loadingStatus === "loading" || !serviceAgreement || !data.signer) return;
     if (isValid) {
@@ -34518,35 +34798,39 @@ 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", {
+      actionLevel: "task",
+      actionType: "back",
+      label: homeButtonLabel
     });
     handleHomeClick();
   };
   const handleExpandSection = (title) => {
-    userEvents.addEvent("Expanded ToS section", {
-      segmentation: {
-        ...baseTrackingPayload,
-        statementExtended: title
-      }
+    userEvents.addEvent("Clicked accordion", {
+      actionLevel: "task",
+      actionType: "open",
+      label: title
     });
   };
   useEffect(() => {
@@ -34554,9 +34838,9 @@ function ServiceAgreementDropinComponent({
     gotoForm(serviceAgreementAcceptanceInfos.length - 1);
   }, [serviceAgreementAcceptanceInfos]);
   useEffect(() => {
-    userEvents.addPageView("ToS dropin");
-    userEvents.addEvent("Started ToS task", {
-      segmentation: { ...baseTrackingPayload }
+    userEvents.addEvent("Landed on page", {
+      actionLevel: "task",
+      actionType: "start"
     });
     const initialFormIndex = forms.length === signedForms.length ? 0 : signedForms.length;
     gotoForm(initialFormIndex);
@@ -34745,9 +35029,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,
@@ -34823,7 +35107,6 @@ function SolePropDropinComponent({
   onSubmit: onExternalSubmit,
   onChange,
   taskType,
-  trackingConfig,
   handleHomeClick,
   handleCreateDocument,
   handleGetDocument,
@@ -34857,11 +35140,9 @@ function SolePropDropinComponent({
   const dataFromResponse = getDataWithDefaultAddress(legalEntityResponse, parentLegalEntity);
   const [data, setData] = useState(dataFromResponse);
   const country = ((_b = (_a = currentState.data) == null ? void 0 : _a.solePropNameAndCountry) == null ? void 0 : _b.country) || ((_c = dataFromResponse == null ? void 0 : dataFromResponse.solePropRegistrationAddress) == null ? void 0 : _c.registrationAddress.country) || externalCountry;
-  const baseTrackingPayload = getBaseTrackingPayload({
-    trackingConfig,
-    parentLegalEntity,
-    legalEntity: legalEntityResponse,
-    task: taskType
+  const baseTrackingPayload = getAssociatedLeAnalyticsPayload({
+    task: taskType,
+    associatedLegalEntity: legalEntityResponse
   });
   const getConfigurationData = useCallback(
     () => getConfiguration2({
@@ -34940,6 +35221,7 @@ function SolePropDropinComponent({
   };
   useEffect(() => {
     var _a2;
+    userEvents.updateBaseTrackingPayload({ task: taskType });
     const documentIds = ((_a2 = legalEntityResponse == null ? void 0 : legalEntityResponse.documentDetails) == null ? void 0 : _a2.map((documentReference) => documentReference.id)) || [];
     try {
       if (documentIds.length) {
@@ -35106,7 +35388,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 +35408,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);
@@ -35137,7 +35428,6 @@ function TrustDropinComponent({
   handleUpdateDocument,
   handleAddressSearch,
   handleFindAddress,
-  trackingConfig,
   taskType,
   problems: problemsProp,
   onSubmit: externalOnSubmit,
@@ -35216,6 +35506,7 @@ function TrustDropinComponent({
   }, [derivedProps, formValidity, problems]);
   useEffect(() => {
     var _a2;
+    userEvents.updateBaseTrackingPayload({ task: taskType });
     const documentIds = ((_a2 = legalEntityResponse == null ? void 0 : legalEntityResponse.documentDetails) == null ? void 0 : _a2.map((documentReference) => documentReference.id)) || [];
     try {
       if (documentIds.length) {
@@ -35357,11 +35648,9 @@ function TrustDropinComponent({
     const value = getProp(data2, detail);
     return !isEmpty$1(value);
   });
-  const baseTrackingPayload = getBaseTrackingPayload({
-    trackingConfig,
-    parentLegalEntity,
-    legalEntity: legalEntityResponse,
-    task: taskType
+  const baseTrackingPayload = getAssociatedLeAnalyticsPayload({
+    task: taskType,
+    associatedLegalEntity: legalEntityResponse
   });
   const {
     handleNextClick,
@@ -35448,6 +35737,13 @@ const useNavigation = ({
   const shouldShowSingpassSelection = isEligibleForSingpass && !hasSeenSingpassSelection;
   const [taskHistory, setTaskHistory] = useState(["default"]);
   const actualTasks = taskHistory.filter((task) => task !== "default");
+  const handleNavigation = useCallback(
+    (task) => {
+      userEvents.updateBaseTrackingPayload({ task });
+      onNavigate == null ? void 0 : onNavigate(task);
+    },
+    [onNavigate]
+  );
   const navigateTo = useCallback(
     (task, deletePreviousHistory = false) => {
       const pushNewTask = () => setTaskHistory((taskHistory2) => deletePreviousHistory ? [task] : [...taskHistory2, task]);
@@ -35455,10 +35751,10 @@ const useNavigation = ({
         setTimeout(pushNewTask);
       } else {
         pushNewTask();
-        onNavigate == null ? void 0 : onNavigate(task);
+        handleNavigation(task);
       }
     },
-    [onNavigate]
+    [handleNavigation]
   );
   const navigateBack = useCallback(
     (stepCount = 1) => {
@@ -35469,13 +35765,14 @@ const useNavigation = ({
       }
       if (prevTask === TaskTypes.TASKS_OVERVIEW) {
         setTaskHistory([TaskTypes.TASKS_OVERVIEW]);
-        onNavigate == null ? void 0 : onNavigate(TaskTypes.TASKS_OVERVIEW);
+        handleNavigation == null ? void 0 : handleNavigation(TaskTypes.TASKS_OVERVIEW);
         return;
       }
       setTaskHistory(taskHistory.slice(0, -1 * stepCount));
-      onNavigate == null ? void 0 : onNavigate(prevTask);
+      handleNavigation == null ? void 0 : handleNavigation(prevTask);
+      userEvents.updateBaseTrackingPayload({ task: prevTask });
     },
-    [taskHistory, onNavigate]
+    [taskHistory, handleNavigation]
   );
   useEffect(() => {
     if (!window.history.state) window.history.pushState({}, "");
@@ -35761,6 +36058,14 @@ function DropinComposerComponent({
   const refreshLegalEntity = useCallback(async () => {
     const legalEntity = await retrieveLegalEntity();
     updateLegalEntityAndCapabilityProblems(legalEntity);
+    if (legalEntity) {
+      userEvents.updateBaseTrackingPayload({
+        legalEntityId: legalEntity.id,
+        entityType: legalEntity.type,
+        capabilities: Object.keys(legalEntity.capabilities),
+        countryCode: getLegalEntityCountry(legalEntity)
+      });
+    }
     return legalEntity;
   }, [retrieveLegalEntity, updateLegalEntityAndCapabilityProblems]);
   const deleteTransferInstrument = async (id) => {
@@ -36030,13 +36335,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 +36349,18 @@ function DropinComposerComponent({
     } catch (e) {
       showToast({ label: i18n.get("failedToDownloadPci"), type: "error" });
     } finally {
-      userEvents.addEvent("Downloaded signed PCI form", {
-        segmentation: { ...baseTrackingPayload }
+      userEvents.addEvent("Clicked button", {
+        task: TaskTypes.PCI_DSS,
+        actionLevel: "task",
+        actionType: "download"
       });
     }
   };
   useEffect(() => {
-    userEvents.addPageView("Task list");
+    userEvents.addEvent("Landed on page", {
+      actionLevel: "journey",
+      actionType: "start"
+    });
   }, []);
   useLayoutEffect(() => {
     const fetchConfiguration = async () => {
@@ -36148,8 +36451,7 @@ function DropinComposerComponent({
             await refreshLegalEntity();
             navigateTo("default");
           },
-          onBack: previousTask ? navigateBack : void 0,
-          trackingConfig: { topLevelLegalEntity: legalEntityResponse }
+          onBack: previousTask ? navigateBack : void 0
         }
       ) });
     case TaskTypes.SINGPASS_SELECTION:
@@ -36179,7 +36481,6 @@ function DropinComposerComponent({
       return /* @__PURE__ */ jsx(
         TaskListComponent,
         {
-          trackingConfig: { topLevelLegalEntity: legalEntityResponse },
           onNavigateToTask,
           tasks,
           legalEntityResponse: rootLegalEntity,
@@ -36198,9 +36499,6 @@ function DropinComposerComponent({
       return /* @__PURE__ */ jsx(
         DecisionMakersComponent,
         {
-          trackingConfig: {
-            topLevelLegalEntity: legalEntityResponse
-          },
           parentLegalEntity: associatedLegalEntityParent,
           legalEntityResponse: rootLegalEntity,
           onNavigateToIndividual: (legalEntityId) => onNavigateToDecisionMakerIndividual(TaskTypes.DECISION_MAKER, legalEntityId),
@@ -36215,9 +36513,6 @@ function DropinComposerComponent({
       return /* @__PURE__ */ jsx(
         IndividualDropinComponent,
         {
-          trackingConfig: {
-            topLevelLegalEntity: legalEntityResponse
-          },
           taskType: TaskTypes.INDIVIDUAL,
           taskName: hasTrust ? "individualTrusteeDetails" : "individualDetails",
           parentLegalEntity: null,
@@ -36262,9 +36557,6 @@ function DropinComposerComponent({
       return /* @__PURE__ */ jsx(
         IndividualDropinComponent,
         {
-          trackingConfig: {
-            topLevelLegalEntity: legalEntityResponse
-          },
           taskType: TaskTypes.DECISION_MAKER,
           parentLegalEntity: associatedLegalEntityParent,
           legalEntityResponse: associatedLegalEntity,
@@ -36294,9 +36586,6 @@ function DropinComposerComponent({
       return /* @__PURE__ */ jsx(
         IndividualDropinComponent,
         {
-          trackingConfig: {
-            topLevelLegalEntity: legalEntityResponse
-          },
           taskType: TaskTypes.TRUST_MEMBER_COMPANY_OWNER,
           parentLegalEntity: associatedLegalEntityParent,
           legalEntityResponse: associatedLegalEntity,
@@ -36325,9 +36614,6 @@ function DropinComposerComponent({
       return /* @__PURE__ */ jsx(
         IndividualDropinComponent,
         {
-          trackingConfig: {
-            topLevelLegalEntity: legalEntityResponse
-          },
           taskType: TaskTypes.TRUST_MEMBER_INDIVIDUAL,
           parentLegalEntity: associatedLegalArrangement,
           legalEntityResponse: associatedLegalEntity,
@@ -36356,9 +36642,6 @@ function DropinComposerComponent({
         CompanyDropinComponent,
         {
           ...args,
-          trackingConfig: {
-            topLevelLegalEntity: legalEntityResponse
-          },
           taskType: TaskTypes.COMPANY,
           taskName: hasTrust ? "companyTrusteeDetails" : "companyDetails",
           legalEntityResponse: rootLegalEntity,
@@ -36385,9 +36668,6 @@ function DropinComposerComponent({
         BusinessDetailsDropinComponent,
         {
           ...args,
-          trackingConfig: {
-            topLevelLegalEntity: legalEntityResponse
-          },
           taskType: TaskTypes.BUSINESS_DETAILS,
           taskName: hasTrust ? "businessTrusteeDetails" : "businessDetails",
           legalEntityResponse: rootLegalEntity,
@@ -36423,9 +36703,6 @@ function DropinComposerComponent({
         CompanyDropinComponent,
         {
           ...args,
-          trackingConfig: {
-            topLevelLegalEntity: legalEntityResponse
-          },
           taskType: TaskTypes.TRUST_MEMBER_COMPANY,
           parentLegalEntity: associatedLegalArrangement,
           legalEntityResponse: associatedLegalEntity,
@@ -36446,7 +36723,6 @@ function DropinComposerComponent({
       return /* @__PURE__ */ jsx(
         PayoutDetailsDropinComponent,
         {
-          trackingConfig: { topLevelLegalEntity: legalEntityResponse },
           taskType: currentTask,
           taskName: currentTask === TaskTypes.PAYIN ? "payinDetails" : "payoutDetails",
           problems: (_f = capabilityProblems == null ? void 0 : capabilityProblems.BankAccount) == null ? void 0 : _f[transferInstrument == null ? void 0 : transferInstrument.id],
@@ -36475,9 +36751,6 @@ function DropinComposerComponent({
         TrustDropinComponent,
         {
           ...args,
-          trackingConfig: {
-            topLevelLegalEntity: legalEntityResponse
-          },
           taskType: TaskTypes.TRUST,
           problems: (_g = capabilityProblems == null ? void 0 : capabilityProblems.LegalEntity) == null ? void 0 : _g[associatedLegalArrangement == null ? void 0 : associatedLegalArrangement.id],
           parentLegalEntity: rootLegalEntity,
@@ -36540,7 +36813,6 @@ function DropinComposerComponent({
         {
           legalEntityResponse: rootLegalEntity,
           pciTemplateResponse,
-          trackingConfig: { topLevelLegalEntity: legalEntityResponse },
           taskType: TaskTypes.PCI_DSS,
           handleHomeClick: navigateBack,
           handleSign: async (...params) => {
@@ -36573,7 +36845,6 @@ function DropinComposerComponent({
         ServiceAgreementDropinComponent,
         {
           legalEntityResponse: rootLegalEntity,
-          trackingConfig: { topLevelLegalEntity: legalEntityResponse },
           taskType: TaskTypes.SERVICE_AGREEMENT,
           serviceAgreementTypes,
           serviceAgreementAcceptanceInfos: serviceAgreementAcceptanceInfosWithNames,
@@ -36611,9 +36882,6 @@ function DropinComposerComponent({
       return /* @__PURE__ */ jsx(
         IndividualDropinComponent,
         {
-          trackingConfig: {
-            topLevelLegalEntity: legalEntityResponse
-          },
           taskName: "legalRepresentative",
           taskType: TaskTypes.LEGAL_REPRESENTATIVE_DETAILS,
           parentLegalEntity: rootLegalEntity,
@@ -38647,7 +38915,6 @@ function UpdateLegalEntityForHighExposure({
   parentLegalEntity,
   capabilities,
   country,
-  trackingConfig,
   problems: problemsProp,
   onSubmit: externalOnSubmit,
   onChange,
@@ -38781,10 +39048,8 @@ function UpdateLegalEntityForHighExposure({
     const value = getProp(data2, detail);
     return !isEmpty$1(value);
   });
-  const baseTrackingPayload = getBaseTrackingPayload({
-    trackingConfig,
-    parentLegalEntity,
-    legalEntity
+  const baseTrackingPayload = getAssociatedLeAnalyticsPayload({
+    associatedLegalEntity: parentLegalEntity
   });
   const {
     handleNextClick,
@@ -39066,15 +39331,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 +39349,38 @@ 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, {
+  useEffect(() => {
+    (async () => {
+      const sessionData = {
         sdkVersion,
         componentName,
         userAgent: navigator.userAgent,
-        legalEntityId
-      });
-      if (!(sessionResponse == null ? void 0 : sessionResponse.id)) {
-        throw Error("Analytics session Id not received");
-      }
-      userEvents.subscribe((data) => {
-        const eventItem = convertToEmbeddedEvent(data);
-        if (eventItem.eventData) {
-          eventItem.eventData.locale = i18n.locale;
+        legalEntityId,
+        locale: i18n.locale
+      };
+      if (isEmbeddedDropin) {
+        try {
+          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);
+            pushEvents(loadingContext, sessionResponse.id, eventItem);
+          });
+        } catch (e) {
+          console.error("Failed to initiate analytics for component", e);
         }
-        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((data) => {
+          onUserEvent({
+            ...data,
+            properties: { ...data.properties || {}, ...sessionData }
+          });
+        });
+      }
+    })();
+  }, []);
 };
 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 +39676,7 @@ const ConfigurationApiProvider = ({
 }) => {
   const authContext = useAuthContext();
   const { isEmbeddedDropin, loadingContext } = authContext;
-  const sdkVersion = "2.59.11";
+  const sdkVersion = "2.61.0";
   useAnalytics({
     onUserEvent,
     legalEntityId: rootLegalEntityId,
@@ -40078,7 +40349,7 @@ const DebugModal = ({ rootLegalEntityId, onExit, getRootLegalEntity }) => {
   };
   const copyToClipboard = async () => {
     const toCopy = {
-      sdkVersion: "2.59.11",
+      sdkVersion: "2.61.0",
       experiments: Object.fromEntries(allExperimentsWithValues),
       settings: Object.fromEntries(allSettingsWithValues)
     };
@@ -40143,7 +40414,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.61.0" })
       ] }) }),
       /* @__PURE__ */ jsx("tr", { children: /* @__PURE__ */ jsxs("td", { children: [
         /* @__PURE__ */ jsx("span", { className: "adyen-kyc-debug-modal__table-key", children: "rootLegalEntityId" }),
@@ -40263,6 +40534,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 +40556,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,
         {