@adyen/kyc-components 2.62.1 → 2.63.0

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

@@ -45,6 +45,15 @@ class UserEvents {
     this.add({ type: "add_event", name: eventName, properties: { ...completeEvent } });
     this.notifySubscribers();
   }
+  /**
+   * Adds an event with context specific to task-related events
+   */
+  addTaskEvent(eventName, properties) {
+    this.addEvent(eventName, {
+      actionLevel: "task",
+      ...properties
+    });
+  }
   /**
    * Adds an event with context specific to page-related events
    */
@@ -105,11 +114,9 @@ class UserEvents {
 }
 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
@@ -1083,7 +1090,7 @@ const defaultTrans = {
   objectOfCharitableTrust: "Object of charitable trust",
   objectOfTrust: "Object of trust",
   obligatory: "Obligatory",
-  officialEmailOrALetterFromYourBank: "Official email or a letter from your bank",
+  aLetterFromYourBank: "A letter from your bank",
   oib: "OIB",
   onOnlineBankingEnvironment: "Or web version of online banking environment",
   onboardingRedirectAwaitingCtaButton: "Continue",
@@ -5664,7 +5671,7 @@ const businessRegistrationNumberMasks = {
   },
   [CountryCodes.Luxembourg]: {
     default: {
-      mask: makeMask(...alphaInputs(1), ...numericInputs(9, true)),
+      mask: makeMask(...alphaInputs(1), ...numericInputs(5), ...numericInputs(2, true)),
       transformOnType: uppercase
     }
   },
@@ -6448,7 +6455,7 @@ const businessRegistrationNumberPatterns = {
   [CountryCodes.Latvia]: { default: /^\d{11}$/ },
   [CountryCodes.Liechtenstein]: { default: /FL-[0-9]{4}[.][0-9]{3}[.][0-9]{3}-[0-9]$/ },
   [CountryCodes.Lithuania]: { default: /^\d{6,9}$/ },
-  [CountryCodes.Luxembourg]: { default: /^[a-zA-Z]\d{1,9}$/ },
+  [CountryCodes.Luxembourg]: { default: /^[a-zA-Z]\d{5,7}$/ },
   [CountryCodes.Malaysia]: { default: /^[A-Za-z0-9]{7,8}$|^[A-Za-z0-9]{12}$/ },
   [CountryCodes.Malta]: { default: /^C\s?\d{4,6}$/ },
   [CountryCodes.Monaco]: {
@@ -6994,8 +7001,10 @@ const defaultFieldConfig$9 = {
       businessRegistrationNumberPatterns[CountryCodes.Luxembourg].default
     ),
     guidanceText: {
-      key: "enter1LetterAndThenNDigitsForExample",
+      key: "enter1LetterAndThenXToYDigitsForExample",
       values: {
+        minDigits: "5",
+        maxDigits: "7",
         example: "C127766"
       }
     }
@@ -8161,22 +8170,19 @@ function BusinessRegistrationNumberField({
   ] });
 }
 function ContextGuidance({
-  page,
   title,
   content,
   titleId,
   contentId,
-  baseTrackingPayload
+  trackingParams
 }) {
   const onGuidanceToggle = (status) => {
-    userEvents.addEvent("Clicked accordion", {
-      ...baseTrackingPayload,
+    userEvents.addFieldEvent("Clicked accordion", {
       actionType: status,
-      actionLevel: "field",
       field: "context guidance",
-      page,
       label: titleId,
-      content: contentId
+      content: contentId,
+      ...trackingParams
     });
   };
   return /* @__PURE__ */ jsx(Alert, { title, type: "collapsible", variant: "info", onToggle: onGuidanceToggle, children: content });
@@ -10082,46 +10088,6 @@ 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 },
@@ -10308,12 +10274,10 @@ function CompanyRegistrationDetailsComponent(props) {
     /* @__PURE__ */ jsx(
       ContextGuidance,
       {
-        page: "Company registration details",
         title: i18n.get("whyDoINeedToFillInThisInformation"),
         content: i18n.get("reasonForFillingCompanyRegistrationDetails"),
         titleId: "whyDoINeedToFillInThisInformation",
-        contentId: "reasonForFillingCompanyRegistrationDetails",
-        baseTrackingPayload: { task: TaskTypes.COMPANY }
+        contentId: "reasonForFillingCompanyRegistrationDetails"
       }
     ),
     /* @__PURE__ */ jsxs("fieldset", { form: COMPANY_REGISTRATION_DETAILS, children: [
@@ -13529,8 +13493,7 @@ function RegistrationAddressComponent(props) {
     handleFindAddress,
     country,
     data,
-    validators: validators2,
-    baseTrackingPayload
+    validators: validators2
   } = props;
   const {
     requiredFields: registrationAddressRequiredFields,
@@ -13616,12 +13579,10 @@ function RegistrationAddressComponent(props) {
     /* @__PURE__ */ jsx(
       ContextGuidance,
       {
-        page: "Company registered address",
         titleId: "whyDoINeedToFillInThisInformation",
         contentId: "reasonForFillingCompanyAddressDetails",
         title: i18n.get("whyDoINeedToFillInThisInformation"),
-        content: i18n.get("reasonForFillingCompanyAddressDetails"),
-        baseTrackingPayload
+        content: i18n.get("reasonForFillingCompanyAddressDetails")
       }
     ),
     /* @__PURE__ */ jsx(
@@ -14047,8 +14008,7 @@ function CompanyComponent(props) {
             country: props.country,
             problems: props.problems,
             handleAddressSearch: props.handleAddressSearch,
-            handleFindAddress: props.handleFindAddress,
-            baseTrackingPayload: { task: TaskTypes.COMPANY }
+            handleFindAddress: props.handleFindAddress
           }
         )
       }
@@ -14280,6 +14240,46 @@ 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,
@@ -15991,7 +15991,6 @@ function IdVerificationMethodComponent(props) {
       /* @__PURE__ */ jsx(
         ContextGuidance,
         {
-          page: "Instant verification with Onfido",
           title: i18n.get("howVerificationWithOnfidoWork"),
           content: /* @__PURE__ */ jsxs(Fragment, { children: [
             /* @__PURE__ */ jsx(Typography, { className: "adyen-kyc-u-margin-bottom-8", children: i18n.get("onfidoIsOurTrustedPartner") }),
@@ -16004,8 +16003,7 @@ 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",
-          baseTrackingPayload: { task: TaskTypes.INDIVIDUAL }
+          contentId: "howVerificationWithOnfidoWorkContent"
         }
       ),
       (countryOfResidence === CountryCodes.PuertoRico || countryOfResidence === CountryCodes.UnitedStates) && data.idVerificationMethod === "instantVerification" && /* @__PURE__ */ jsx(
@@ -17609,8 +17607,7 @@ const DriversLicense$1 = ({
   formUtils,
   isValid,
   errorMessages,
-  shouldValidate,
-  baseTrackingPayload
+  shouldValidate
 }) => {
   const { i18n } = useI18nContext();
   const { dataset: auStates } = useDataset(datasetIdentifier.state("AU"));
@@ -17682,7 +17679,6 @@ const DriversLicense$1 = ({
     /* @__PURE__ */ jsx(
       ContextGuidance,
       {
-        page: "Personal details",
         title: i18n.get("whereCanIFindTheseNumbersOnMyDriversLicense"),
         content: /* @__PURE__ */ jsxs(Fragment, { children: [
           i18n.get("whereToFindNumbersOnDriversLicense"),
@@ -17690,8 +17686,7 @@ 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",
-        baseTrackingPayload
+        contentId: "whereToFindNumbersOnDriversLicense"
       }
     )
   ] });
@@ -17827,8 +17822,7 @@ function IdentityAuComponent({
           ),
           issuerState: formUtils.getErrorMessage("issuerState", errors, fieldProblems)
         },
-        shouldValidate,
-        baseTrackingPayload: { task: TaskTypes.INDIVIDUAL }
+        shouldValidate
       }
     ) : void 0
   ] });
@@ -17945,8 +17939,7 @@ const DriversLicense = ({
   formUtils,
   isValid,
   errorMessages,
-  shouldValidate,
-  baseTrackingPayload
+  shouldValidate
 }) => {
   const { i18n } = useI18nContext();
   return /* @__PURE__ */ jsxs(Fragment, { children: [
@@ -17997,7 +17990,6 @@ const DriversLicense = ({
     /* @__PURE__ */ jsx(
       ContextGuidance,
       {
-        page: "Personal details",
         title: i18n.get("whereCanIFindTheseNumbersOnMyDriversLicense"),
         content: /* @__PURE__ */ jsxs(Fragment, { children: [
           i18n.get("whereToFindNumbersOnDriversLicense__NZ"),
@@ -18005,8 +17997,7 @@ 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",
-        baseTrackingPayload
+        contentId: "whereToFindNumbersOnDriversLicense"
       }
     )
   ] });
@@ -18170,8 +18161,7 @@ function IdentityNZComponent({
             fieldProblems
           )
         },
-        shouldValidate,
-        baseTrackingPayload: { task: TaskTypes.INDIVIDUAL }
+        shouldValidate
       }
     ) : void 0
   ] });
@@ -18394,10 +18384,6 @@ 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 }),
@@ -18429,12 +18415,10 @@ function PersonalDetailsComponent(props) {
       /* @__PURE__ */ jsx(
         ContextGuidance,
         {
-          page: "Personal details",
           title: i18n.get("whyDoINeedToFillInThisInformation"),
           content: i18n.get("reasonForFillingIndividualPersonalDetails"),
           titleId: "whyDoINeedToFillInThisInformation",
-          contentId: "reasonForFillingIndividualPersonalDetails",
-          baseTrackingPayload
+          contentId: "reasonForFillingIndividualPersonalDetails"
         }
       ),
       isDecisionMakerTask && props.trustedFieldsProvider === TrustedFieldsProvider.SINGPASS && props.readOnlyFields && /* @__PURE__ */ jsx(Typography, { color: "secondary", variant: "caption", children: i18n.get(
@@ -18942,12 +18926,10 @@ function IndividualComponent(props) {
             /* @__PURE__ */ jsx(
               ContextGuidance,
               {
-                page: "Personal address",
                 title: i18n.get("whyDoINeedToFillInThisInformation"),
                 content: i18n.get("reasonForFillingIndividualAddressDetails"),
                 titleId: "whyDoINeedToFillInThisInformation",
-                contentId: "reasonForFillingIndividualAddressDetails",
-                baseTrackingPayload: { task: taskType }
+                contentId: "reasonForFillingIndividualAddressDetails"
               }
             ),
             /* @__PURE__ */ jsx(
@@ -19257,7 +19239,7 @@ var BankDocumentTypes = /* @__PURE__ */ ((BankDocumentTypes2) => {
   BankDocumentTypes2["BANK_STATEMENT"] = "bankStatement";
   BankDocumentTypes2["DEPOSIT_SLIP"] = "depositSlip";
   BankDocumentTypes2["SCREENSHOT_OF_BANK"] = "screenshotOfOnlineBankingEnviroment";
-  BankDocumentTypes2["OFFICIAL_EMAIL"] = "officialEmailOrALetterFromYourBank";
+  BankDocumentTypes2["A_LETTER_FROM_YOUR_BANK"] = "aLetterFromYourBank";
   BankDocumentTypes2["CHECK"] = "check";
   return BankDocumentTypes2;
 })(BankDocumentTypes || {});
@@ -19265,7 +19247,7 @@ const bankDocumentOptions = [
   { id: "bankStatement", name: "bankStatementDocument" },
   { id: "depositSlip", name: "depositSlip" },
   { id: "screenshotOfOnlineBankingEnviroment", name: "screenshotOfOnlineBankingEnviroment" },
-  { id: "officialEmailOrALetterFromYourBank", name: "officialEmailOrALetterFromYourBank" },
+  { id: "aLetterFromYourBank", name: "aLetterFromYourBank" },
   { id: "check", name: "check" }
 ];
 var BankDocumentRequirement = /* @__PURE__ */ ((BankDocumentRequirement2) => {
@@ -19379,7 +19361,7 @@ const getBankDocumentRequirements = (country, documentType, documentModifiers) =
     { key: BankDocumentRequirement.ROUTING_NUMBER }
   ] : [{ key: BankDocumentRequirement.ACCOUNT_NUMBER_OR_IBAN }];
   const requireLast12Months = documentType !== BankDocumentTypes.SCREENSHOT_OF_BANK;
-  const requireStampOrSignature = documentType === BankDocumentTypes.DEPOSIT_SLIP || documentType === BankDocumentTypes.OFFICIAL_EMAIL;
+  const requireStampOrSignature = documentType === BankDocumentTypes.DEPOSIT_SLIP || documentType === BankDocumentTypes.A_LETTER_FROM_YOUR_BANK;
   const requirements = [
     applyNamedModifiers(country, documentModifiers),
     ...accountNumberRequirement,
@@ -22026,7 +22008,6 @@ function PayoutVerificationMethod(props) {
     !enablePreferInstantVerificationMethodFlow && providerName && bankVendorsLoadingStatus === "success" ? /* @__PURE__ */ jsx(
       ContextGuidance,
       {
-        page: "Instant verification with partner",
         titleId: "howDoesVerificationWithOurPartnerWorks",
         contentId: "bankVerificationWithPartnerSteps",
         title: i18n.get("howDoesVerificationWithOurPartnerWorks", {
@@ -22043,8 +22024,7 @@ 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
   ] });
@@ -22414,8 +22394,7 @@ function SolePropComponent(props) {
               country: props.country,
               problems: props == null ? void 0 : props.problems,
               handleAddressSearch: props.handleAddressSearch,
-              handleFindAddress: props.handleFindAddress,
-              baseTrackingPayload: { task: TaskTypes.SOLE_PROPRIETOR_COMPANY }
+              handleFindAddress: props.handleFindAddress
             }
           )
         }
@@ -23362,8 +23341,7 @@ function TrustComponent(props) {
             problems: props == null ? void 0 : props.problems,
             labels: { operationalAddressIsSame: "isTrustOperationAddressSame" },
             handleAddressSearch: props.handleAddressSearch,
-            handleFindAddress: props.handleFindAddress,
-            baseTrackingPayload: { task: TaskTypes.TRUST }
+            handleFindAddress: props.handleFindAddress
           }
         )
       }
@@ -24056,14 +24034,14 @@ const trackNavigation = ({
   toForm,
   label,
   returnValue,
-  baseTrackingPayload
+  additionalTrackingParams
 }) => {
   userEvents.addPageEvent("Clicked button", {
     actionType,
     toPage: toForm,
     label,
     returnValue,
-    ...baseTrackingPayload
+    ...additionalTrackingParams
   });
 };
 const useHideButton = (condition, setHideState) => {
@@ -24091,7 +24069,7 @@ const getOpeningStep = (forms, remediationActions) => {
 };
 const useFormComposer = ({
   problems,
-  baseTrackingPayload,
+  navigationTrackingParams,
   forms,
   formRef,
   submitButtonLabel,
@@ -24121,7 +24099,7 @@ const useFormComposer = ({
   }, [forms]);
   useEffect(() => {
     userEvents.updateSharedEventProperties({ page: activeForm.formName });
-  }, [activeForm]);
+  }, [activeForm.formName]);
   useEffect(() => {
     if (hasAlreadyNavigatedForm) return;
     const openingStep = getOpeningStep(forms, problems == null ? void 0 : problems.remediationActions);
@@ -24145,8 +24123,16 @@ const useFormComposer = ({
   const validateCurrentForm = () => {
     setShouldValidate(true);
   };
+  const trackSubmitClick = () => {
+    trackNavigation({
+      actionType: "submit",
+      label: "submit",
+      additionalTrackingParams: navigationTrackingParams
+    });
+  };
   const handleNextClick = () => {
     if (isFormSummaryStep(activeForm)) {
+      trackSubmitClick();
       if (skipSubmit) {
         onSkipSubmit == null ? void 0 : onSkipSubmit();
       } else {
@@ -24160,11 +24146,12 @@ const useFormComposer = ({
         actionType: "next",
         label: "next",
         returnValue: "validation error",
-        baseTrackingPayload
+        additionalTrackingParams: navigationTrackingParams
       });
       return;
     }
     if (isFinalStep) {
+      trackSubmitClick();
       onSubmit();
       return;
     }
@@ -24176,7 +24163,7 @@ const useFormComposer = ({
       toForm: forms[toFormIndex].formName,
       label: "next",
       returnValue: "success",
-      baseTrackingPayload
+      additionalTrackingParams: navigationTrackingParams
     });
   };
   const handleBackClick = () => {
@@ -24188,7 +24175,7 @@ const useFormComposer = ({
         actionType: "back",
         toForm: toForm.formName,
         label: "back",
-        baseTrackingPayload
+        additionalTrackingParams: navigationTrackingParams
       });
     }
   };
@@ -26655,7 +26642,6 @@ function BusinessDetailsComponent(props) {
     country,
     isTopLevelEntity,
     activeForm,
-    baseTrackingPayload,
     showCompanyStructure,
     showBusinessSelection,
     setShowBusinessSelection,
@@ -26688,7 +26674,6 @@ function BusinessDetailsComponent(props) {
         id: forms.basicInformation.formId,
         heading: i18n.get((activeForm == null ? void 0 : activeForm.formHeading) || forms.basicInformation.formHeading),
         description: (activeForm == null ? void 0 : activeForm.formDescription) ? i18n.get(activeForm == null ? void 0 : activeForm.formDescription) : void 0,
-        baseTrackingPayload,
         country,
         companyType: companyStructure == null ? void 0 : companyStructure.entityType,
         isTopLevelEntity,
@@ -27725,7 +27710,7 @@ const FormWrapper = ({
   activeForm,
   handleGetIdVerificationToken,
   validateForm,
-  baseTrackingPayload,
+  navigationTrackingParams,
   hideDropinLayout,
   hideFooter,
   hideHomeButton,
@@ -27745,7 +27730,14 @@ const FormWrapper = ({
   const { data: summaryData, omittedForms, omittedKeys, labels: labels2 } = summary2 || {};
   const [isOpen, setIsOpen] = useState(true);
   const [finishLaterLoading, setFinishLaterLoading] = useState(false);
+  const translationKeys = {
+    saveAndGoToOverview: "saveAndGoToOverview"
+  };
   const onHomeClick = () => {
+    userEvents.addPageEvent("Clicked button", {
+      actionType: "save",
+      label: translationKeys.saveAndGoToOverview
+    });
     if (canSubmit2) {
       onSubmit();
     } else {
@@ -27764,10 +27756,10 @@ const FormWrapper = ({
     (props) => {
       trackNavigation({
         ...props,
-        baseTrackingPayload
+        additionalTrackingParams: navigationTrackingParams
       });
     },
-    [baseTrackingPayload]
+    [navigationTrackingParams]
   );
   const summaryContent = /* @__PURE__ */ jsx("div", { className: "adyen-kyc-form-wrapper", children: /* @__PURE__ */ jsx(
     Summary,
@@ -27785,6 +27777,10 @@ const FormWrapper = ({
     }
   ) });
   const handleFinishLater = () => {
+    userEvents.addPageEvent("Clicked button", {
+      actionType: "save",
+      label: translationKeys.saveAndGoToOverview
+    });
     setFinishLaterLoading(true);
     onSubmit().then(() => {
       setIsOpen(false);
@@ -28141,7 +28137,7 @@ async function submitDocuments({
   legalEntity,
   forms,
   documentUtils,
-  baseTrackingPayload
+  additionalTrackingParams
 }) {
   if (!isDocumentsRequired$2(forms)) return;
   const logger2 = createLogger("submitDocuments");
@@ -28152,7 +28148,7 @@ async function submitDocuments({
       formattedDocument.forEach((doc) => {
         var _a;
         userEvents.addEvent("Success", {
-          ...baseTrackingPayload,
+          ...additionalTrackingParams,
           actionLevel: "task",
           actionType: "upload",
           documentType: doc.type,
@@ -28163,7 +28159,7 @@ async function submitDocuments({
   } catch (err) {
     logger2.error(err);
     userEvents.addEvent("Encountered error", {
-      ...baseTrackingPayload,
+      ...additionalTrackingParams,
       actionLevel: "task",
       actionType: "upload",
       returnType: err.errorCode,
@@ -28174,7 +28170,7 @@ async function submitDocuments({
 async function submit({
   data,
   legalEntityResponse,
-  baseTrackingPayload,
+  additionalTrackingParams,
   forms,
   problems,
   documentUtils,
@@ -28191,7 +28187,7 @@ async function submit({
   const logger2 = createLogger("submitBusinessDetails");
   setLoadingStatus("loading");
   const trackingPayload = {
-    ...baseTrackingPayload,
+    ...additionalTrackingParams,
     actionLevel: "task",
     actionType: "submit",
     companyStructure: ((_a = data.companyStructure) == null ? void 0 : _a.entityType) ?? null,
@@ -28210,7 +28206,6 @@ async function submit({
     )
   };
   try {
-    userEvents.addEvent("Clicked button", trackingPayload);
     await Promise.all([
       handleUpdateLegalEntity(drop("type").from(legalEntity), legalEntityResponse.id),
       submitDocuments({
@@ -28220,7 +28215,7 @@ async function submit({
           id: legalEntityResponse.id,
           type: LegalEntityType.ORGANIZATION
         },
-        baseTrackingPayload,
+        additionalTrackingParams,
         documentUtils,
         forms
       })
@@ -28287,12 +28282,11 @@ function BusinessDetailsDropinComponent({
   const {
     state: { currentState }
   } = useStateContext();
-  const baseTrackingPayload = useMemo(
+  const associatedLeTrackingParams = useMemo(
     () => getAssociatedLeAnalyticsPayload({
-      task: taskType,
       associatedLegalEntity: parentLegalEntity
     }),
-    [parentLegalEntity, taskType]
+    [parentLegalEntity]
   );
   useEffect(() => {
     onChange == null ? void 0 : onChange(currentState);
@@ -28300,9 +28294,9 @@ function BusinessDetailsDropinComponent({
   useEffect(() => {
     userEvents.updateBaseTrackingPayload({ task: taskType });
     userEvents.addEvent("Landed on page", {
-      ...baseTrackingPayload,
       actionLevel: "task",
-      actionType: "start"
+      actionType: "start",
+      ...associatedLeTrackingParams
     });
   }, []);
   const formRef = useRef(null);
@@ -28446,7 +28440,7 @@ function BusinessDetailsDropinComponent({
       data: currentState.data,
       legalEntityResponse,
       isTargetLegalEntityType: Boolean(isTargetLegalEntityType),
-      baseTrackingPayload,
+      additionalTrackingParams: associatedLeTrackingParams,
       problems: currentProblems,
       forms,
       documentUtils,
@@ -28464,7 +28458,7 @@ function BusinessDetailsDropinComponent({
     currentState.data,
     legalEntityResponse,
     isTargetLegalEntityType,
-    baseTrackingPayload,
+    associatedLeTrackingParams,
     currentProblems,
     forms,
     documentUtils,
@@ -28486,7 +28480,7 @@ function BusinessDetailsDropinComponent({
     nextButtonLabel
   } = useFormComposer({
     problems: currentProblems,
-    baseTrackingPayload,
+    navigationTrackingParams: associatedLeTrackingParams,
     forms,
     formRef,
     onSubmit: submitTask
@@ -28740,7 +28734,7 @@ function BusinessDetailsDropinComponent({
       forms,
       activeForm,
       validateForm: () => setShouldValidate(true),
-      baseTrackingPayload,
+      navigationTrackingParams: associatedLeTrackingParams,
       onSubmit: submitTask,
       problems: currentProblems,
       canSubmit: canSubmitForm,
@@ -28762,7 +28756,6 @@ function BusinessDetailsDropinComponent({
           activeForm,
           shouldValidate,
           isTopLevelEntity: taskType === TaskTypes.BUSINESS_DETAILS,
-          baseTrackingPayload,
           showBusinessSelection,
           setShowBusinessSelection,
           showCompanyStructure,
@@ -28862,17 +28855,14 @@ function CompanyDropinComponent({
   );
   const [loadingStatus, setLoadingStatus] = useState("success");
   const formRef = useRef(null);
-  const baseTrackingPayload = getAssociatedLeAnalyticsPayload({
-    task: taskType,
-    ...isTrustMemberCompany ? {
-      associatedLegalEntity: legalEntityResponse,
-      associatedLegalEntityOrg: parentLegalEntity
-    } : {}
-  });
+  const associatedLeTrackingParams = isTrustMemberCompany ? getAssociatedLeAnalyticsPayload({
+    associatedLegalEntity: legalEntityResponse,
+    associatedLegalEntityOrg: parentLegalEntity
+  }) : {};
   useEffect(() => {
     userEvents.updateBaseTrackingPayload({ task: taskType });
     userEvents.addEvent("Landed on page", {
-      ...baseTrackingPayload,
+      ...associatedLeTrackingParams,
       actionLevel: "task",
       actionType: "start"
     });
@@ -28957,7 +28947,7 @@ function CompanyDropinComponent({
       await documentUtils.uploadDocuments(formattedDocument, legalEntity.id);
       formattedDocument.forEach((doc) => {
         userEvents.addEvent("Success", {
-          ...baseTrackingPayload,
+          ...associatedLeTrackingParams,
           actionLevel: "task",
           actionType: "save",
           documentType: doc.type,
@@ -29010,10 +29000,6 @@ function CompanyDropinComponent({
       delete legalEntity.organization.countryOfGoverningLaw;
     }
     try {
-      userEvents.addEvent("Clicked button", {
-        ...baseTrackingPayload,
-        ...companyTrackingPayload
-      });
       if (!(legalEntityResponse == null ? void 0 : legalEntityResponse.id)) {
         legalEntity = await handleCreateLegalEntity(legalEntity);
       } else {
@@ -29024,7 +29010,7 @@ function CompanyDropinComponent({
       }
       setAccountHolder(accountHolder);
       userEvents.addEvent("Success", {
-        ...baseTrackingPayload,
+        ...associatedLeTrackingParams,
         ...companyTrackingPayload,
         legalEntityId: legalEntity.id,
         entityType: legalEntity.type
@@ -29050,7 +29036,7 @@ function CompanyDropinComponent({
       }
       setLoadingStatus("success");
       userEvents.addEvent("Encountered error", {
-        ...baseTrackingPayload,
+        ...associatedLeTrackingParams,
         actionLevel: "task",
         actionType: "submit",
         returnType: e.errorCode,
@@ -29181,7 +29167,7 @@ function CompanyDropinComponent({
     nextButtonLabel
   } = useFormComposer({
     problems,
-    baseTrackingPayload,
+    navigationTrackingParams: associatedLeTrackingParams,
     forms,
     formRef,
     onSubmit
@@ -29203,7 +29189,7 @@ function CompanyDropinComponent({
       forms,
       activeForm,
       validateForm: () => setShouldValidate(true),
-      baseTrackingPayload,
+      navigationTrackingParams: associatedLeTrackingParams,
       onSubmit,
       problems,
       canSubmit: canSubmit$1(data) && hasDataChanged(dataFromResponse, data),
@@ -30121,8 +30107,7 @@ const BusinessTypeSelection = ({
     if (loadingStatus === "loading") return;
     triggerValidation();
     if (isValid) {
-      userEvents.addEvent("Clicked button", {
-        actionLevel: "task",
+      userEvents.addPageEvent("Clicked button", {
         actionType: "next"
       });
       if (((_a2 = data.businessType) == null ? void 0 : _a2.id) === "legalArrangement") {
@@ -30903,7 +30888,6 @@ const DecisionMakersComponent = ({
         /* @__PURE__ */ jsx(
           ContextGuidance,
           {
-            page: "Decision makers",
             title: i18n.get("whatIsTheDifferenceBetweenTheseRoles"),
             content: /* @__PURE__ */ jsx("ul", { className: "adyen-kyc-guidance-list", children: availableDecisionMakers.map(({ roleType }) => /* @__PURE__ */ jsx(
               "li",
@@ -30918,8 +30902,7 @@ const DecisionMakersComponent = ({
               roleType
             )) }),
             titleId: "whatIsTheDifferenceBetweenTheseRoles",
-            contentId: "differenceBetweenAnOwnerControllingPersonAndSignatory",
-            baseTrackingPayload: { task: TaskTypes.DECISION_MAKER_OVERVIEW }
+            contentId: "differenceBetweenAnOwnerControllingPersonAndSignatory"
           }
         ),
         showWarning && /* @__PURE__ */ jsx(
@@ -32380,7 +32363,6 @@ const TrustMembersOverview = ({
         /* @__PURE__ */ jsx(
           ContextGuidance,
           {
-            page: "Trust members",
             title: i18n.get("whatIsTheDifferenceBetweenTheseRoles"),
             content: /* @__PURE__ */ jsx("ul", { className: "adyen-kyc-guidance-list", children: trustMemberRequirements.map(({ label }) => /* @__PURE__ */ jsx(
               "li",
@@ -32392,8 +32374,7 @@ const TrustMembersOverview = ({
               label
             )) }),
             titleId: "whatIsTheDifferenceBetweenTheseRoles",
-            contentId: "differenceBetweenTrustMemberRoles",
-            baseTrackingPayload: { task: TaskTypes.TRUST_MEMBER_OVERVIEW }
+            contentId: "differenceBetweenTrustMemberRoles"
           }
         ),
         /* @__PURE__ */ jsx(CardGroup, { children: trustMembers.map((trustMember) => {
@@ -32641,20 +32622,14 @@ function IndividualDropinComponent({
     accountHolder,
     handleOpenSingpassAuthorizationLink
   });
-  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
-    }
+  const associatedLeTrackingParams = taskType === TaskTypes.INDIVIDUAL ? {} : getAssociatedLeAnalyticsPayload({
+    associatedLegalEntity: legalEntityResponse,
+    associatedLegalEntityOrg: taskType === TaskTypes.TRUST_MEMBER_COMPANY_OWNER ? parentLegalEntity : void 0
   });
   useEffect(() => {
     userEvents.updateBaseTrackingPayload({ task: taskType });
     userEvents.addEvent("Landed on page", {
-      ...baseTrackingPayload,
+      ...associatedLeTrackingParams,
       actionLevel: "task",
       actionType: "start"
     });
@@ -32787,7 +32762,7 @@ function IndividualDropinComponent({
       }
       updatedLegalEntity = await handleCreateLegalEntity(legalEntity);
       userEvents.addEvent("Success", {
-        ...baseTrackingPayload,
+        ...associatedLeTrackingParams,
         actionLevel: "task",
         actionType: "submit",
         legalEntityId: updatedLegalEntity.id,
@@ -32798,7 +32773,7 @@ function IndividualDropinComponent({
     } else {
       updatedLegalEntity = await handleUpdateLegalEntity(drop("type").from(legalEntity), leId);
       userEvents.addEvent("Success", {
-        ...baseTrackingPayload,
+        ...associatedLeTrackingParams,
         actionLevel: "task",
         actionType: "submit",
         legalEntityId: updatedLegalEntity.id,
@@ -32840,7 +32815,7 @@ function IndividualDropinComponent({
       uploadedDocuments == null ? void 0 : uploadedDocuments.forEach((doc) => {
         var _a3;
         userEvents.addEvent("Success", {
-          ...baseTrackingPayload,
+          ...associatedLeTrackingParams,
           actionLevel: "task",
           actionType: "upload",
           documentType: doc.type,
@@ -32893,7 +32868,7 @@ function IndividualDropinComponent({
     }
   };
   const onSubmit = async () => {
-    var _a2, _b2;
+    var _a2;
     setLoadingStatus("loading");
     const dataSubmitted = omitObscuredFieldsIfUnchanged(
       individualObscuredFields,
@@ -32911,13 +32886,6 @@ function IndividualDropinComponent({
           return ((_a3 = dataSubmitted == null ? void 0 : dataSubmitted.idDocument) == null ? void 0 : _a3.idDocumentType) === id;
         }
       )) == null ? void 0 : _a2.id;
-      userEvents.addEvent("Clicked button", {
-        ...baseTrackingPayload,
-        actionLevel: "task",
-        actionType: "submit",
-        countryOfRegistration: ((_b2 = dataSubmitted == null ? void 0 : dataSubmitted.personalDetails) == null ? void 0 : _b2.residencyCountry) || null,
-        documentType: idDocumentType || null
-      });
       legalEntity.entityAssociations = filterOutUnwantedAssociationsIfRootLE(
         taskType,
         legalEntityResponse,
@@ -32956,7 +32924,7 @@ function IndividualDropinComponent({
       }
       setLoadingStatus("success");
       userEvents.addEvent("Encountered error", {
-        ...baseTrackingPayload,
+        ...associatedLeTrackingParams,
         actionLevel: "task",
         actionType: "submit",
         returnType: e.errorCode,
@@ -33067,7 +33035,7 @@ function IndividualDropinComponent({
     totalSteps
   } = useFormComposer({
     problems,
-    baseTrackingPayload,
+    navigationTrackingParams: associatedLeTrackingParams,
     externalBackClick,
     forms,
     formRef,
@@ -33092,7 +33060,7 @@ function IndividualDropinComponent({
       loadingStatus,
       forms,
       onSubmit,
-      baseTrackingPayload,
+      navigationTrackingParams: associatedLeTrackingParams,
       handleGetIdVerificationToken,
       gotoFormByFormIndex,
       nextButtonLabel,
@@ -33518,7 +33486,6 @@ function PayoutDetailsDropinComponent({
       bankCountry: (payoutVerificationMethod == null ? void 0 : payoutVerificationMethod.bankCountry) ?? defaultPayoutCountry,
       bankCurrency: (payoutAccountDetails == null ? void 0 : payoutAccountDetails.currency) ?? null
     };
-    userEvents.addEvent("Clicked button", baseTracking);
     let transferInstrument2 = mapPayoutAccountToTransferInstrument({
       data: dataSubmitted,
       legalEntity: legalEntityResponse
@@ -33627,7 +33594,6 @@ function PayoutDetailsDropinComponent({
     nextButtonLabel
   } = useFormComposer({
     problems,
-    baseTrackingPayload: {},
     forms,
     submitButtonLabel,
     externalBackClick,
@@ -33672,7 +33638,6 @@ function PayoutDetailsDropinComponent({
       loadingStatus,
       forms,
       onSubmit,
-      baseTrackingPayload: {},
       gotoFormByFormIndex,
       nextButtonLabel,
       homeButtonLabel,
@@ -33792,7 +33757,6 @@ function PciDropinComponent({
       actionType: "sign",
       label: translationKeys.sign
     };
-    userEvents.addEvent("Clicked button", baseTracking);
     triggerValidation();
     if (isValid) {
       try {
@@ -33820,18 +33784,16 @@ function PciDropinComponent({
     }
   };
   const goHome = () => {
-    userEvents.addEvent("Clicked button", {
-      actionLevel: "task",
+    userEvents.addPageEvent("Clicked button", {
       actionType: "back",
       label: translationKeys.home
     });
     handleHomeClick();
   };
   const handleExpandSection = (title) => {
-    userEvents.addEvent("Clicked accordion", {
-      actionLevel: "task",
+    userEvents.addFieldEvent("Clicked accordion", {
       actionType: "open",
-      label: title
+      field: title
     });
   };
   useEffect(() => {
@@ -34818,7 +34780,6 @@ function ServiceAgreementDropinComponent({
       actionLevel: "task",
       actionType: "sign"
     };
-    userEvents.addEvent("Clicked button", { ...baseTracking, label: translationKeys.next });
     triggerValidation();
     if (loadingStatus === "loading" || !serviceAgreement || !data.signer) return;
     if (isValid) {
@@ -34851,8 +34812,7 @@ function ServiceAgreementDropinComponent({
     }
   };
   const goHome = () => {
-    userEvents.addEvent("Clicked button", {
-      actionLevel: "task",
+    userEvents.addPageEvent("Clicked button", {
       actionType: "back",
       label: translationKeys.home
     });
@@ -35172,8 +35132,7 @@ 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 = getAssociatedLeAnalyticsPayload({
-    task: taskType,
+  const associatedLeTrackingParams = getAssociatedLeAnalyticsPayload({
     associatedLegalEntity: legalEntityResponse
   });
   const getConfigurationData = useCallback(
@@ -35371,7 +35330,7 @@ function SolePropDropinComponent({
     nextButtonLabel
   } = useFormComposer({
     problems,
-    baseTrackingPayload,
+    navigationTrackingParams: associatedLeTrackingParams,
     forms,
     formRef,
     onSubmit: handleOnSubmit
@@ -35395,7 +35354,7 @@ function SolePropDropinComponent({
       onSubmit: handleOnSubmit,
       validateForm: () => setShouldValidate(true),
       canSubmit: canSubmit(data) && hasDataChanged(dataFromResponse, data),
-      baseTrackingPayload,
+      navigationTrackingParams: associatedLeTrackingParams,
       problems,
       summary: {
         data: formatDataForSummary2(data, forms),
@@ -35680,8 +35639,7 @@ function TrustDropinComponent({
     const value = getProp(data2, detail);
     return !isEmpty$1(value);
   });
-  const baseTrackingPayload = getAssociatedLeAnalyticsPayload({
-    task: taskType,
+  const associatedLeTrackingParams = getAssociatedLeAnalyticsPayload({
     associatedLegalEntity: legalEntityResponse
   });
   const {
@@ -35694,7 +35652,7 @@ function TrustDropinComponent({
     nextButtonLabel
   } = useFormComposer({
     problems,
-    baseTrackingPayload,
+    navigationTrackingParams: associatedLeTrackingParams,
     forms,
     formRef,
     onSubmit
@@ -35710,7 +35668,7 @@ function TrustDropinComponent({
       loadingStatus,
       forms,
       activeForm,
-      baseTrackingPayload,
+      navigationTrackingParams: associatedLeTrackingParams,
       onSubmit,
       hideDropinLayout,
       handleHomeClick,
@@ -39082,7 +39040,7 @@ function UpdateLegalEntityForHighExposure({
     const value = getProp(data2, detail);
     return !isEmpty$1(value);
   });
-  const baseTrackingPayload = getAssociatedLeAnalyticsPayload({
+  const associatedLeTrackingParams = getAssociatedLeAnalyticsPayload({
     associatedLegalEntity: parentLegalEntity
   });
   const {
@@ -39095,7 +39053,6 @@ function UpdateLegalEntityForHighExposure({
     nextButtonLabel
   } = useFormComposer({
     problems,
-    baseTrackingPayload,
     forms,
     formRef,
     onSubmit
@@ -39111,7 +39068,7 @@ function UpdateLegalEntityForHighExposure({
       loadingStatus,
       forms,
       activeForm,
-      baseTrackingPayload,
+      navigationTrackingParams: associatedLeTrackingParams,
       onSubmit,
       hideDropinLayout,
       handleHomeClick,
@@ -39409,7 +39366,7 @@ const useAnalytics = async ({
         userEvents.subscribe((data) => {
           onUserEvent({
             ...data,
-            properties: { ...data.properties || {}, ...sessionData }
+            properties: { ...sessionData, ...data.properties || {} }
           });
         });
       }
@@ -39710,7 +39667,7 @@ const ConfigurationApiProvider = ({
 }) => {
   const authContext = useAuthContext();
   const { isEmbeddedDropin, loadingContext } = authContext;
-  const sdkVersion = "2.62.1";
+  const sdkVersion = "2.63.0";
   useAnalytics({
     onUserEvent,
     legalEntityId: rootLegalEntityId,
@@ -39875,6 +39832,9 @@ const I18nProvider = ({
     }),
     [loadedLocale, translations, customTranslations, allowedLocales]
   );
+  useEffect(() => {
+    userEvents.updateBaseTrackingPayload({ locale });
+  }, [locale]);
   const contextValue = useMemo(
     () => ({
       i18n,
@@ -40383,7 +40343,7 @@ const DebugModal = ({ rootLegalEntityId, onExit, getRootLegalEntity }) => {
   };
   const copyToClipboard = async () => {
     const toCopy = {
-      sdkVersion: "2.62.1",
+      sdkVersion: "2.63.0",
       experiments: Object.fromEntries(allExperimentsWithValues),
       settings: Object.fromEntries(allSettingsWithValues)
     };
@@ -40448,7 +40408,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.62.1" })
+        /* @__PURE__ */ jsx(Tag, { variant: "green", className: "adyen-kyc-tag--large", children: "2.63.0" })
       ] }) }),
       /* @__PURE__ */ jsx("tr", { children: /* @__PURE__ */ jsxs("td", { children: [
         /* @__PURE__ */ jsx("span", { className: "adyen-kyc-debug-modal__table-key", children: "rootLegalEntityId" }),