@adyen/kyc-components 4.0.0-beta.0 → 4.0.0-beta.3

package/dist/{OnboardingDropinComponent-CocnpjvA.js → OnboardingDropinComponent-DBW5N3Dr.js}

@@ -2,27 +2,25 @@
 {
   try {
     let e = "undefined" != typeof window ? window : "undefined" != typeof global ? global : "undefined" != typeof globalThis ? globalThis : "undefined" != typeof self ? self : {}, n = new e.Error().stack;
-    n && (e._sentryDebugIds = e._sentryDebugIds || {}, e._sentryDebugIds[n] = "8da9cc27-e4b8-417c-a1c7-3cffe6873d25", e._sentryDebugIdIdentifier = "sentry-dbid-8da9cc27-e4b8-417c-a1c7-3cffe6873d25");
+    n && (e._sentryDebugIds = e._sentryDebugIds || {}, e._sentryDebugIds[n] = "3746545c-b537-460f-9662-e8ce8f96724b", e._sentryDebugIdIdentifier = "sentry-dbid-3746545c-b537-460f-9662-e8ce8f96724b");
   } catch (e) {
   }
 }
 ;
 import { jsx, jsxs, Fragment } from "preact/jsx-runtime";
-import { q as useApiContext, r as useQuery, t as httpGet, v as useLocalStorage, w as getLegalRepresentative, a as useLegalEntity, x as skipToken, y as doesLegalEntityRequiresLegalRepresentative, z as LegalEntityType, b as useI18nContext, B as Skeleton, C as Alert, G as Typography, H as isPartOfTrustFromLegalEntity, J as hasSolePropInLegalEntity, K as useSettingsContext, M as SettingNames, N as hasOwnEntityAssociationOfType, O as isEmptyEntity, P as CompanyTypesValue, U as useAccountHolder, V as EntityType, W as DATA_MISSING_DECISION_MAKER_ERROR_CODE_MAPPING, X as TaskTypes, Y as TaskStatus, Z as Button, _ as IconButton, $ as useAnalyticsContext, a0 as Card, a1 as handleKeys, a2 as LoaderWrapper, a3 as Icon, a4 as noop, a5 as useExperimentsContext, a6 as isInstantVerifiedAccount, a7 as getObscuredAccountNumber, a8 as useGetTaskStatus, a9 as CardGroup, R as ROOT_LE, L as Loader, aa as useSetting, ab as useGlobalStore, ac as isPartOfUnincorporatedPartnership, ad as getOwnSignatories, ae as getOwnDecisionMakersLegalEntityIds, af as getOwnSolePropProblems, ag as getOwnTrustProblems, ah as getOwnUnincorporatedPartnershipProblems, ai as TrustMemberTypes, aj as getLegalEntityNameBasedOnType, ak as getOwnEntityAssociations, al as useAssociatedLegalEntity, am as CountryCodes, an as isEmpty, ao as mergeFieldMetadataIntoProps, ap as resolveFieldMetadata, aq as defaultFieldMetadata, ar as defaultFieldConfig, as as useForm, at as getFieldProps, au as nameFields, F as FormHeader, av as ErrorPanel, aw as createFormUtils, ax as Field, ay as MultiSelectList, az as makeSelectItemForRole, aA as RadioGroupCard, aB as TextArea, aC as Name, aD as CountryField, aE as COUNTRY_FIELD, aF as LegalCompanyNameField, aG as LEGAL_COMPANY_NAME_FIELD, aH as summaryItem, aI as getRoleName, aJ as createLogger, aK as summaryStep, aL as Summary, aM as ActionBar, g as getLegalEntityCountry, aN as UnincorporatedPartnershipMemberTypes, aO as getDecisionMakerDescriptionMap, aP as TRUST_DEFAULT_DESCRIPTIONS_MAP, aQ as getRoleTagVariant, aR as DEFAULT_TRUST_MEMBER_REQUIREMENTS, aS as ContextGuidance, aT as RadioGroup, aU as useUnincorporatedPartnershipMembers, aV as deleteUnincorporatedPartnershipMember, aW as hasAllCapabilitiesResolved, aX as hasRejectedCapabilities, aY as objectsDeepEqual, aZ as TrustedFieldsProvider } from "./StoreProvider-COHi02bX.js";
+import { p as useApiContext, q as useQuery, r as httpGet, t as useLocalStorage, v as getLegalRepresentative, b as useLegalEntity, w as skipToken, x as doesLegalEntityRequiresLegalRepresentative, y as LegalEntityType, a as useTranslation, z as Skeleton, B as Alert, C as translateStringOrObject, G as Typography, H as isPartOfTrustFromLegalEntity, J as hasSolePropInLegalEntity, K as useSettingsContext, M as SettingNames, N as hasOwnEntityAssociationOfType, O as isEmptyEntity, P as CompanyTypesValue, U as useAccountHolder, V as EntityType, W as DATA_MISSING_DECISION_MAKER_ERROR_CODE_MAPPING, X as TaskTypes, Y as createLogger, Z as TaskStatus, _ as Button, $ as IconButton, a0 as useAnalyticsContext, a1 as Card, a2 as handleKeys, a3 as LoaderWrapper, a4 as Icon, a5 as noop, a6 as useToastContext, a7 as useExperimentsContext, a8 as isInstantVerifiedAccount, a9 as getObscuredAccountNumber, aa as useGetTaskStatus, ab as CardGroup, R as ROOT_LE, ac as useCapabilityProblems, L as Loader, ad as useGlobalStore, ae as useSetting, af as isPartOfUnincorporatedPartnership, ag as getOwnSignatories, ah as getOwnDecisionMakersLegalEntityIds, ai as getOwnSolePropProblems, aj as getOwnTrustProblems, ak as getOwnUnincorporatedPartnershipProblems, al as getOwnEntityAssociations, am as TrustMemberTypes, an as getLegalEntityNameBasedOnType, ao as useAssociatedLegalEntity, ap as useI18nContext, aq as CountryCodes, ar as isEmpty, as as mergeFieldMetadataIntoProps, at as resolveFieldMetadata, au as defaultFieldMetadata, av as defaultFieldConfig, aw as useForm, ax as getFieldProps, ay as nameFields, F as FormHeader, az as ErrorPanel, aA as createFormUtils, aB as Field, aC as MultiSelectList, aD as makeSelectItemForRole, aE as RadioGroupCard, aF as TextArea, aG as Name, aH as CountryField, aI as COUNTRY_FIELD, aJ as LegalCompanyNameField, aK as LEGAL_COMPANY_NAME_FIELD, aL as summaryItem, aM as getRoleName, aN as summaryStep, aO as FormNavigation, aP as Summary, aQ as ActionBar, g as getLegalEntityCountry, aR as UnincorporatedPartnershipMemberTypes, aS as getDecisionMakerDescriptionMap, aT as TRUST_DEFAULT_DESCRIPTIONS_MAP, aU as getRoleTagVariant, aV as Trans, aW as DEFAULT_TRUST_MEMBER_REQUIREMENTS, aX as ContextGuidance, aY as RadioGroup, aZ as useUnincorporatedPartnershipMembers, a_ as deleteUnincorporatedPartnershipMember, a$ as hasAllCapabilitiesResolved, b0 as hasRejectedCapabilities, b1 as objectsDeepEqual, b2 as TrustedFieldsProvider } from "./StoreProvider-ClKLaHzy.js";
 import { lazy, Suspense } from "preact/compat";
 import { useMemo, useCallback, useEffect, useState, useRef } from "preact/hooks";
-import { P as ProviderButton, u as useCapabilityProblems, a as useSingpassMyInfoLogin } from "./ProviderButton-vD5DUJaN.js";
+import { P as ProviderButton, u as useSingpassMyInfoLogin } from "./ProviderButton-B58n0cRC.js";
 import cx from "classnames";
-import { u as useSalesChannelsSettings, a as usePciStatus } from "./useSalesChannelsSettings-BGuBY0ls.js";
-import { u as useTermsOfServiceAcceptanceInfos, a as useTermsOfServiceStatus } from "./useTermsOfServiceStatus-DGZYHVsm.js";
-import { u as useToastContext } from "./useToastContext-CF2xonft.js";
+import { u as useSalesChannelsSettings, a as usePciStatus } from "./useSalesChannelsSettings-43TfSoxc.js";
+import { u as useTermsOfServiceStatus, a as useTermsOfServiceAcceptanceInfos } from "./useTermsOfServiceStatus-CBHKWYSb.js";
 import { signal } from "@preact/signals";
 import { d as downloadFile } from "./file-CiG1D0zy.js";
-import { V as VerificationErrorAlert, u as useDeleteTransferInstrument } from "./VerificationErrorAlert-BkImnGA-.js";
-import { A as Avatar } from "./Avatar-C8aZB2wq.js";
-import { T as TaskItemStatus } from "./TaskItemStatus-Bi1L8gea.js";
-import { u as useCreateLegalEntity, a as useUpdateLegalEntity } from "./useUpdateLegalEntity-By6uwPUg.js";
-import { F as FormNavigation } from "./FormNavigation-B6RspX9C.js";
+import { V as VerificationErrorAlert, u as useDeleteTransferInstrument } from "./VerificationErrorAlert-BBdJmGJu.js";
+import { A as Avatar } from "./Avatar-vCjWXfC7.js";
+import { T as TaskItemStatus } from "./TaskItemStatus-DrTIwCTx.js";
+import { u as useCreateLegalEntity, a as useUpdateLegalEntity } from "./useUpdateLegalEntity-D8dw9Oc3.js";
 import { T as Tag } from "./Tag-DdkVScyr.js";
 const getTaskTypes = async (id, baseUrl) => {
   return httpGet({
@@ -62,7 +60,7 @@ const useAssociatedLegalRepresentative = (legalEntity) => {
     return getLegalRepresentative(legalEntity);
   }, [legalEntity]);
   const { data } = useLegalEntity(
-    doesLegalEntityRequiresLegalRepresentative(legalEntity) && (matchingAssociation == null ? void 0 : matchingAssociation.legalEntityId) ? matchingAssociation.legalEntityId : skipToken
+    doesLegalEntityRequiresLegalRepresentative(legalEntity) && matchingAssociation?.legalEntityId ? matchingAssociation.legalEntityId : skipToken
   );
   return data;
 };
@@ -99,6 +97,7 @@ const SingpassBanner = ({
   onMessage,
   legalEntityType
 }) => {
+  const { t } = useTranslation();
   const { baseUrl } = useApiContext();
   const singpassEventListener = useCallback(
     (event) => {
@@ -116,7 +115,6 @@ const SingpassBanner = ({
     channel.onmessage = onMessage;
     return () => channel.close();
   }, [channel, onMessage]);
-  const { i18n } = useI18nContext();
   if (isLoading) {
     return /* @__PURE__ */ jsx(Skeleton, {});
   }
@@ -127,18 +125,26 @@ const SingpassBanner = ({
       Alert,
       {
         variant: "success",
-        title: successTitleText && i18n.get(successTitleText),
+        title: successTitleText && t(($) => $[successTitleText]),
         onClose: onAlertClose,
-        children: successContentText && i18n.get(successContentText)
+        children: successContentText && t(($) => $[successContentText])
       }
     );
   }
   const providerName = legalEntityTypeToProviderButtonKey[legalEntityType];
   if (errorMessage) {
-    return /* @__PURE__ */ jsx(Alert, { variant: "warning", title: i18n.get(errorMessage), onClose: onAlertClose, children: /* @__PURE__ */ jsxs(Typography, { variant: "body", children: [
-      i18n.get("tryAgainOrContinueEnteringTheDetailsYourself"),
-      providerName && /* @__PURE__ */ jsx(ProviderButton, { provider: providerName, onClick, fullWidth: true })
-    ] }) });
+    return /* @__PURE__ */ jsx(
+      Alert,
+      {
+        variant: "warning",
+        title: translateStringOrObject(t, errorMessage),
+        onClose: onAlertClose,
+        children: /* @__PURE__ */ jsxs(Typography, { variant: "body", children: [
+          t(($) => $["tryAgainOrContinueEnteringTheDetailsYourself"]),
+          providerName && /* @__PURE__ */ jsx(ProviderButton, { provider: providerName, onClick, fullWidth: true })
+        ] })
+      }
+    );
   }
   const subtitleTranslationKey = legalEntityTypeToSubtitleTranslationKey[legalEntityType];
   return /* @__PURE__ */ jsxs(
@@ -146,9 +152,9 @@ const SingpassBanner = ({
     {
       className: cx("adyen-task-list-singpass-banner"),
       icon: false,
-      title: i18n.get("getSetUpInstantly"),
+      title: t(($) => $["getSetUpInstantly"]),
       children: [
-        subtitleTranslationKey && /* @__PURE__ */ jsx("div", { className: cx("adyen-task-list-singpass-banner__subtitle"), children: i18n.get(subtitleTranslationKey) }),
+        subtitleTranslationKey && /* @__PURE__ */ jsx("div", { className: cx("adyen-task-list-singpass-banner__subtitle"), children: t(($) => $[subtitleTranslationKey]) }),
         providerName && /* @__PURE__ */ jsx(ProviderButton, { provider: providerName, onClick, fullWidth: true })
       ]
     }
@@ -246,7 +252,7 @@ const getDefaultAccountHolderType = (legalEntityResponse, isTypeChanging = false
   if (accountHolder) {
     return accountHolder;
   }
-  if (!(legalEntityResponse == null ? void 0 : legalEntityResponse.type)) return void 0;
+  if (!legalEntityResponse?.type) return void 0;
   if (hasOwnEntityAssociationOfType(
     LegalEntityType.SOLE_PROPRIETORSHIP,
     legalEntityResponse.entityAssociations,
@@ -272,7 +278,7 @@ const getDefaultAccountHolderType = (legalEntityResponse, isTypeChanging = false
     return entityTypeToCorrespondingAccountHolderOption[legalEntityResponse.type];
   }
 };
-const allowIndividualWithoutSoleProp = (capabilities) => !(capabilities == null ? void 0 : capabilities.map((c) => c.replace("Commercial", "").replace("Consumer", "")).some((c) => capabilitiesToPreventTypeChange.includes(c)));
+const allowIndividualWithoutSoleProp = (capabilities) => !capabilities?.map((c) => c.replace("Commercial", "").replace("Consumer", "")).some((c) => capabilitiesToPreventTypeChange.includes(c));
 const businessTypeMapping = {
   myName: {
     [LegalEntityType.INDIVIDUAL]: "individual"
@@ -309,44 +315,42 @@ const companyTypesMapping = {
   /* SOLE_PROPRIETORSHIP */
 };
 const useBusinessSetup = (legalEntityResponse) => {
-  var _a, _b;
   const { accountHolder } = useAccountHolder();
   const accountHolderType = accountHolder || getDefaultAccountHolderType(legalEntityResponse);
-  const organizationType = (_a = legalEntityResponse == null ? void 0 : legalEntityResponse.organization) == null ? void 0 : _a.type;
-  const businessSetup = accountHolderType === "theCompanyIWorkFor" && organizationType ? companyTypesMapping[organizationType] : (_b = businessTypeMapping[accountHolderType]) == null ? void 0 : _b[legalEntityResponse == null ? void 0 : legalEntityResponse.type];
+  const organizationType = legalEntityResponse?.organization?.type;
+  const businessSetup = accountHolderType === "theCompanyIWorkFor" && organizationType ? companyTypesMapping[organizationType] : businessTypeMapping[accountHolderType]?.[legalEntityResponse?.type];
   return businessSetup;
 };
 function useDataMissingRemediations({
   legalEntityId,
   problems
 }) {
-  const { i18n } = useI18nContext();
+  const { t } = useTranslation();
   const decisionMakersRemediationMessage = useMemo(() => {
-    var _a, _b, _c;
-    const remediationCodes = (_c = (_b = (_a = problems[EntityType.LEGAL_ENTITY]) == null ? void 0 : _a[legalEntityId]) == null ? void 0 : _b.missingData) == null ? void 0 : _c.reduce((remediations, error) => {
+    const remediationCodes = problems[EntityType.LEGAL_ENTITY]?.[legalEntityId]?.missingData?.reduce((remediations, error) => {
       const remediation = DATA_MISSING_DECISION_MAKER_ERROR_CODE_MAPPING[error.code];
       return remediation ? [...remediations, remediation] : remediations;
     }, []);
     const uniqueRemediations = [...new Set(remediationCodes)];
-    switch (uniqueRemediations == null ? void 0 : uniqueRemediations.length) {
+    switch (uniqueRemediations?.length) {
       case void 0:
       case 0:
         return void 0;
       case 1:
-        return uniqueRemediations[0] ? i18n.get(`remediationMessage_${uniqueRemediations[0]}`) : i18n.get("missingMultipleDecisionMakers");
+        return uniqueRemediations[0] ? t(($) => $[`remediationMessage_${uniqueRemediations[0]}`]) : t(($) => $["missingMultipleDecisionMakers"]);
       default:
-        return i18n.get("missingMultipleDecisionMakers");
+        return t(($) => $["missingMultipleDecisionMakers"]);
     }
-  }, [problems, i18n, legalEntityId]);
+  }, [problems, t, legalEntityId]);
   return {
     remediationMessages: {
       [TaskTypes.DECISION_MAKER]: decisionMakersRemediationMessage
     }
   };
 }
+const logger$2 = createLogger();
 const normalizeTaskStatuses = (taskStatuses) => {
-  var _a;
-  return (_a = taskStatuses == null ? void 0 : taskStatuses.statuses) == null ? void 0 : _a.reduce((acc, currentTask) => {
+  return taskStatuses?.statuses?.reduce((acc, currentTask) => {
     const status = TaskStatus[currentTask.status];
     const statusEntries = currentTask.taskStatusEntries;
     acc[currentTask.type] = {
@@ -359,11 +363,11 @@ const normalizeTaskStatuses = (taskStatuses) => {
 const TASK_STATUS_POLLING_INTERVAL_MS = 3e3;
 const TASK_STATUS_COMPLETED_POLLING_INTERVAL_MS = 6e3;
 const getAccountTaskStatus = (accountId, payinPayoutTaskStatus) => {
-  const taskStatusEntries = payinPayoutTaskStatus == null ? void 0 : payinPayoutTaskStatus.taskStatusEntries;
-  const taskStatusEntry = taskStatusEntries == null ? void 0 : taskStatusEntries.find((entry) => entry.id.includes(accountId));
+  const taskStatusEntries = payinPayoutTaskStatus?.taskStatusEntries;
+  const taskStatusEntry = taskStatusEntries?.find((entry) => entry.id.includes(accountId));
   if (!taskStatusEntry) {
-    console.warn(`No task status for this account: ${accountId}`);
-    return (payinPayoutTaskStatus == null ? void 0 : payinPayoutTaskStatus.status) ?? TaskStatus.PROCESSING;
+    logger$2.warn(`No task status for this account: ${accountId}`);
+    return payinPayoutTaskStatus?.status ?? TaskStatus.PROCESSING;
   }
   return TaskStatus[taskStatusEntry.status];
 };
@@ -378,7 +382,7 @@ const Remove = ({
   handleIsRemoveDisabled,
   label
 }) => {
-  const { i18n } = useI18nContext();
+  const { t } = useTranslation();
   const [undoTimer, setUndoTimer] = useState(5);
   const [isRemoving, setIsRemoving] = useState(false);
   useEffect(() => {
@@ -397,13 +401,13 @@ const Remove = ({
     event.preventDefault();
     if (!isRemoving) {
       setIsRemoving(true);
-      onRemoveStatusChange == null ? void 0 : onRemoveStatusChange(true);
-      handleIsRemoveDisabled == null ? void 0 : handleIsRemoveDisabled(true);
+      onRemoveStatusChange?.(true);
+      handleIsRemoveDisabled?.(true);
     } else {
       setUndoTimer(5);
       setIsRemoving(false);
-      onRemoveStatusChange == null ? void 0 : onRemoveStatusChange(false);
-      handleIsRemoveDisabled == null ? void 0 : handleIsRemoveDisabled(false);
+      onRemoveStatusChange?.(false);
+      handleIsRemoveDisabled?.(false);
     }
   };
   useEffect(() => {
@@ -411,15 +415,15 @@ const Remove = ({
       (async () => {
         setIsRemoving(false);
         await onRemove();
-        onRemoveStatusChange == null ? void 0 : onRemoveStatusChange(false);
-        handleIsRemoveDisabled == null ? void 0 : handleIsRemoveDisabled(false);
+        onRemoveStatusChange?.(false);
+        handleIsRemoveDisabled?.(false);
       })();
     }
   }, [undoTimer, isRemoving, onRemoveStatusChange, handleIsRemoveDisabled, onRemove]);
-  return isRemoving ? /* @__PURE__ */ jsx(Button, { variant: "tertiary", onClick: onClickHandler, children: i18n.get("undoWithTimer", { values: { secondsLeft: undoTimer } }) }) : /* @__PURE__ */ jsx(
+  return isRemoving ? /* @__PURE__ */ jsx(Button, { variant: "tertiary", onClick: onClickHandler, children: t(($) => $["undoWithTimer"], { secondsLeft: undoTimer }) }) : /* @__PURE__ */ jsx(
     IconButton,
     {
-      ariaLabel: i18n.get(label),
+      ariaLabel: label && t(($) => $[label]),
       icon: "bin",
       variant: "tertiary",
       onClick: onClickHandler,
@@ -447,7 +451,7 @@ const TaskListItem = ({
   testId,
   enableTracking = true
 }) => {
-  const { i18n } = useI18nContext();
+  const { t } = useTranslation();
   const userEvents = useAnalyticsContext();
   const shouldShowErrorAlert = showErrorAlerts === "always" || showErrorAlerts === "onErrorStatus" && status === TaskStatus.ERROR;
   const [isStatusRemoving, setIsStatusRemoving] = useState(false);
@@ -459,7 +463,7 @@ const TaskListItem = ({
         label: titleKey
       });
     }
-    onNavigateToTask == null ? void 0 : onNavigateToTask();
+    onNavigateToTask?.();
   };
   const avatarVariant = disabled ? "disabled" : "primary";
   return /* @__PURE__ */ jsx(
@@ -482,7 +486,7 @@ const TaskListItem = ({
               /* @__PURE__ */ jsxs("div", { className: "adyen-task-item__header", children: [
                 /* @__PURE__ */ jsxs("div", { className: "adyen-task-item__heading", children: [
                   /* @__PURE__ */ jsx(Avatar, { variant: avatarVariant, iconName: icon }),
-                  /* @__PURE__ */ jsx("div", { className: "adyen-task-item__body", children: /* @__PURE__ */ jsx("span", { className: "adyen-task-item__title", children: title || i18n.get(titleKey) }) })
+                  /* @__PURE__ */ jsx("div", { className: "adyen-task-item__body", children: /* @__PURE__ */ jsx("span", { className: "adyen-task-item__title", children: title || t(($) => $[titleKey]) }) })
                 ] }),
                 info && /* @__PURE__ */ jsxs("div", { className: "adyen-task-item__info", children: [
                   /* @__PURE__ */ jsx(Icon, { name: "info-circle" }),
@@ -522,8 +526,7 @@ const PayoutAccountTaskListItem = ({
   onNavigateToTask,
   payinPayoutTaskStatus
 }) => {
-  var _a;
-  const { i18n } = useI18nContext();
+  const { t } = useTranslation();
   const { showToast } = useToastContext();
   const { isExperimentEnabled } = useExperimentsContext();
   const { mutateAsync: deleteTransferInstrument } = useDeleteTransferInstrument();
@@ -536,9 +539,9 @@ const PayoutAccountTaskListItem = ({
   const handleDeleteTransferInstrument = async () => {
     try {
       await deleteTransferInstrument(account.id);
-      showToast({ label: i18n.get("transferInstrumentDeleted"), variant: "success" });
+      showToast({ label: t(($) => $["transferInstrumentDeleted"]), variant: "success" });
     } catch {
-      showToast({ label: i18n.get("failedToDeletePayoutAccount"), variant: "error" });
+      showToast({ label: t(($) => $["failedToDeletePayoutAccount"]), variant: "error" });
     }
   };
   return /* @__PURE__ */ jsx(
@@ -550,7 +553,7 @@ const PayoutAccountTaskListItem = ({
       titleKey: "accountNumber",
       title: obscuredAccountNumber,
       status,
-      problems: (_a = capabilityProblems == null ? void 0 : capabilityProblems.BankAccount) == null ? void 0 : _a[account.id],
+      problems: capabilityProblems?.BankAccount?.[account.id],
       loading: isDeletingTransferInstrument,
       removeEntity: () => {
         setIsDeletingTransferInstrument(true);
@@ -593,64 +596,100 @@ function TaskListInner({
   capabilityProblems,
   singpassComponent
 }) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o;
-  const isReview = Boolean(
-    (_b = (_a = capabilityProblems == null ? void 0 : capabilityProblems.LegalEntity) == null ? void 0 : _a[legalEntityResponse.id]) == null ? void 0 : _b.isReviewRequired
-  );
-  const { accountHolder } = useAccountHolder();
-  const { i18n } = useI18nContext();
   const userEvents = useAnalyticsContext();
-  const { isExperimentEnabled } = useExperimentsContext();
+  const { t } = useTranslation();
   const { showToast } = useToastContext();
-  const transferInstrumentLimit = useSetting("transferInstrumentLimit");
+  const { rootLegalEntityId, baseUrl } = useApiContext();
   const { isSettingEnabled } = useSettingsContext();
-  const canChangeEntityType = isSettingEnabled(SettingNames.AllowLegalEntityTypeChange);
+  const { isExperimentEnabled } = useExperimentsContext();
+  const { accountHolder } = useAccountHolder();
+  const tasks = useGlobalStore().tasks.value;
+  const getTaskStatus2 = useGetTaskStatus();
+  const businessSetup = useBusinessSetup(legalEntityResponse);
   const canSeeIntroduction = useCanSeeIntroduction({ legalEntity: legalEntityResponse });
+  const additionalSalesChannels = useSalesChannelsSettings();
   const { remediationMessages } = useDataMissingRemediations({
     legalEntityId: legalEntityResponse.id,
     problems: capabilityProblems
   });
-  const businessSetup = useBusinessSetup(legalEntityResponse);
-  const tasks = useGlobalStore().tasks.value;
-  const getTaskStatus2 = useGetTaskStatus();
-  const additionalSalesChannels = useSalesChannelsSettings();
   const { data: pciStatus } = usePciStatus(
     { additionalSalesChannels },
     { enabled: tasks.includes(TaskTypes.PCI_DSS) }
   );
   const { data: pciQuestionnaireList } = usePciQuestionnaireList();
-  const pciDocuments = ((_c = pciQuestionnaireList == null ? void 0 : pciQuestionnaireList.data) == null ? void 0 : _c.length) ?? 0;
-  const pciHasDocuments = pciDocuments > 0;
-  const hasTaskOfGroupAccountDetails = tasks.some((task) => LEGAL_ENTITY_BASE_TASKS.includes(task));
-  const hasTrust = accountHolder === "aTrust" || isPartOfTrustFromLegalEntity(legalEntityResponse);
-  const hasUnincorporatedPartnership = accountHolder === "anUnincorporatedPartnership" || isPartOfUnincorporatedPartnership(legalEntityResponse);
-  const hasContractTasks = tasks.some((task) => CONTRACT_TASKS.includes(task));
-  const hasSoleProprietorship = accountHolder === "mySoleProprietorName" || hasSolePropInLegalEntity(legalEntityResponse);
+  const { data: termsOfServiceStatus } = useTermsOfServiceStatus();
+  const { data: termsOfServiceStatusAcceptanceInfos } = useTermsOfServiceAcceptanceInfos();
+  const { data: taskStatuses } = useTaskStatus({
+    refetchInterval: (query) => {
+      const { data: response } = query.state || {};
+      const statuses = response?.statuses;
+      const areAllTasksFinishedOrEmpty = statuses?.length === 0 || statuses?.every((task) => task.status === TaskStatus[TaskStatus.FINISHED]);
+      return areAllTasksFinishedOrEmpty ? TASK_STATUS_COMPLETED_POLLING_INTERVAL_MS : TASK_STATUS_POLLING_INTERVAL_MS;
+    }
+  });
+  const canChangeEntityType = isSettingEnabled(SettingNames.AllowLegalEntityTypeChange);
   const hidePayoutAccountTaskExperiment = isExperimentEnabled("HidePayoutAccountTask");
   const hidePciTaskExperiment = isExperimentEnabled("HidePciTask");
-  const { data: termsOfServiceStatusAcceptanceInfos } = useTermsOfServiceAcceptanceInfos();
-  const { data: termsOfServiceStatus } = useTermsOfServiceStatus();
-  const serviceAgreementTypes = (termsOfServiceStatus == null ? void 0 : termsOfServiceStatus.termsOfServiceTypes) ?? [];
-  const serviceAgreementAcceptanceInfos = (termsOfServiceStatusAcceptanceInfos == null ? void 0 : termsOfServiceStatusAcceptanceInfos.data) ?? [];
   const showCustomerSupportV4 = isExperimentEnabled("ShowCustomerSupportV4");
+  const EnableSignPCIBeforeTOS = isExperimentEnabled("EnableSignPCIBeforeTOS");
+  const transferInstrumentLimit = useSetting("transferInstrumentLimit");
+  const normalizedTasks = normalizeTaskStatuses(taskStatuses);
+  setNormalizedTaskStatusStore(normalizedTasks);
+  const payinPayoutTaskStatus = normalizedTasks?.PAYOUT ?? normalizedTasks?.PAYIN;
+  const businessDetailsTaskStatus = isExperimentEnabled("EnableBusinessDetailsTaskStatusService") ? normalizedTasks?.BUSINESS_DETAILS?.status ?? TaskStatus.DETAILS_REQUIRED : getTaskStatus2(TaskTypes.BUSINESS_DETAILS);
+  const isReview = Boolean(
+    capabilityProblems?.LegalEntity?.[legalEntityResponse.id]?.isReviewRequired
+  );
+  const hasTrust = accountHolder === "aTrust" || isPartOfTrustFromLegalEntity(legalEntityResponse);
+  const hasUnincorporatedPartnership = accountHolder === "anUnincorporatedPartnership" || isPartOfUnincorporatedPartnership(legalEntityResponse);
+  const hasSoleProprietorship = accountHolder === "mySoleProprietorName" || hasSolePropInLegalEntity(legalEntityResponse);
   const isLegalRepresentativeRequired = isExperimentEnabled("EnableAgeVerification") && doesLegalEntityRequiresLegalRepresentative(legalEntityResponse);
   const legalRepresentative = isLegalRepresentativeRequired && getLegalRepresentative(legalEntityResponse);
-  const transferInstruments = (legalEntityResponse == null ? void 0 : legalEntityResponse.transferInstruments) || [];
-  const canAddPayoutAccount = ((_d = legalEntityResponse == null ? void 0 : legalEntityResponse.organization) == null ? void 0 : _d.legalName) || ((_e = legalEntityResponse == null ? void 0 : legalEntityResponse.individual) == null ? void 0 : _e.name);
+  const transferInstruments = legalEntityResponse?.transferInstruments || [];
+  const canAddPayoutAccount = legalEntityResponse?.organization?.legalName || legalEntityResponse?.individual?.name;
   const hasPayinTaskNotPayout = tasks.includes(TaskTypes.PAYIN) && !tasks.includes(TaskTypes.PAYOUT);
-  const hasPciSigners = legalEntityResponse.type === LegalEntityType.ORGANIZATION && !!((_f = legalEntityResponse == null ? void 0 : legalEntityResponse.entityAssociations) == null ? void 0 : _f.length) || legalEntityResponse.type === LegalEntityType.INDIVIDUAL && !!((_g = legalEntityResponse == null ? void 0 : legalEntityResponse.entityAssociations) == null ? void 0 : _g.length);
-  const canSignPci = hasPciSigners && tasks.includes(TaskTypes.PCI_DSS);
-  const canDownloadPci = !(pciStatus == null ? void 0 : pciStatus.signingRequired) && pciHasDocuments;
-  const isPciTaskDisabled = !canSignPci || !(pciStatus == null ? void 0 : pciStatus.signingRequired) && !pciHasDocuments || canDownloadPci;
-  const showPciTask = (canDownloadPci || (pciStatus == null ? void 0 : pciStatus.signingRequired)) && !hidePciTaskExperiment;
+  const payoutTaskDescriptionKey = isReview ? "payoutAccountsDescriptionReview" : "payoutAccountsDescription";
+  const pciHasDocuments = !!pciQuestionnaireList?.data?.length;
+  const canSignPci = (
+    // PCI requires decision makers to be added
+    legalEntityResponse.type === LegalEntityType.ORGANIZATION && !!legalEntityResponse?.entityAssociations?.length || legalEntityResponse.type === LegalEntityType.INDIVIDUAL && !!legalEntityResponse?.entityAssociations?.length
+  );
+  const canDownloadPci = !pciStatus?.signingRequired && pciHasDocuments;
+  const hasSignedPci = !pciStatus?.signingRequired && canSignPci;
+  const serviceAgreementTypes = termsOfServiceStatus?.termsOfServiceTypes ?? [];
+  const serviceAgreementAcceptanceInfos = termsOfServiceStatusAcceptanceInfos?.data ?? [];
+  const hasServiceAgreementSigners = legalEntityResponse.type === LegalEntityType.ORGANIZATION && getOwnSignatories(legalEntityResponse).length || Boolean(legalRepresentative) || legalEntityResponse.type === LegalEntityType.INDIVIDUAL && !!legalEntityResponse?.individual;
+  const hasTaskOfGroupAccountDetails = tasks.some((task) => LEGAL_ENTITY_BASE_TASKS.includes(task));
+  const hasContractTasks = tasks.some((task) => CONTRACT_TASKS.includes(task));
+  const hasFinancingTasks = tasks.includes(TaskTypes.BUSINESS_FINANCING) || tasks.includes(TaskTypes.SOURCE_OF_FUNDS);
   const showServiceAgreementTask = tasks.includes(TaskTypes.SERVICE_AGREEMENT) && (serviceAgreementTypes.length > 0 || serviceAgreementAcceptanceInfos.length > 0);
-  const hasServiceAgreementSigners = legalEntityResponse.type === LegalEntityType.ORGANIZATION && getOwnSignatories(legalEntityResponse).length || Boolean(legalRepresentative) || legalEntityResponse.type === LegalEntityType.INDIVIDUAL && !!(legalEntityResponse == null ? void 0 : legalEntityResponse.individual);
-  const areServiceAgreementTasksDisabled = !hasServiceAgreementSigners;
+  const showPciTask = tasks.includes(TaskTypes.PCI_DSS) && (canDownloadPci || pciStatus?.signingRequired) && !hidePciTaskExperiment;
   const showContractTasks = hasContractTasks && (showPciTask || showServiceAgreementTask);
-  const showDecisionMakersWarning = Boolean(
-    getOwnDecisionMakersLegalEntityIds(legalEntityResponse).length && remediationMessages.DECISION_MAKER
-  );
-  const { rootLegalEntityId, baseUrl } = useApiContext();
+  const shouldSignPciFirst = showServiceAgreementTask && showPciTask && !hasSignedPci;
+  const areServiceAgreementTasksDisabled = EnableSignPCIBeforeTOS ? !hasServiceAgreementSigners || shouldSignPciFirst : !hasServiceAgreementSigners;
+  const isPciTaskDisabled = !pciStatus?.signingRequired || !canSignPci;
+  const getBusinessTaskListTitleKey = () => {
+    if (hasUnincorporatedPartnership) {
+      return "tellUsMoreAboutPrimaryPartner";
+    } else if (tasks.includes(TaskTypes.BUSINESS_DETAILS)) {
+      return isReview ? "businessAccountDetailsDescriptionReview" : "businessAccountDetailsDescription";
+    } else if (canChangeEntityType) {
+      return "provideFewDetailsAboutYourself";
+    } else {
+      return "accountDetailsDescription";
+    }
+  };
+  const getEmptyBankAccountProblems = () => {
+    const transferInstrumentId = legalEntityResponse?.transferInstruments?.[0]?.id;
+    return transferInstrumentId ? capabilityProblems?.BankAccount?.[transferInstrumentId] : void 0;
+  };
+  const onEditBusinessSetupClick = () => {
+    userEvents.addTaskEvent("Clicked button", {
+      task: TaskTypes.TASKS_OVERVIEW,
+      actionType: "edit"
+    });
+    onNavigateToTask(TaskTypes.BUSINESS_TYPE_SELECTION);
+  };
   const onPciDownload = async () => {
     try {
       const response = await getPciQuestionnaireList(rootLegalEntityId.value, baseUrl.value);
@@ -666,7 +705,7 @@ function TaskListInner({
         })
       );
     } catch {
-      showToast({ label: i18n.get("failedToDownloadPci"), variant: "error" });
+      showToast({ label: t(($) => $["failedToDownloadPci"]), variant: "error" });
     } finally {
       userEvents.addTaskEvent("Clicked button", {
         task: TaskTypes.PCI_DSS,
@@ -689,31 +728,9 @@ function TaskListInner({
   const handleOnNavigateToSourceOfFunds = () => onNavigateToTask(TaskTypes.SOURCE_OF_FUNDS);
   const handleOnNavigateToBusinessFinancing = () => onNavigateToTask(TaskTypes.BUSINESS_FINANCING);
   const handleOnNavigateToTaxReporting = () => onNavigateToTask(TaskTypes.TAX_REPORTING);
-  const hasFinancingTasks = tasks.includes(TaskTypes.BUSINESS_FINANCING) || tasks.includes(TaskTypes.SOURCE_OF_FUNDS);
-  const payoutTaskDescriptionKey = isReview ? "payoutAccountsDescriptionReview" : "payoutAccountsDescription";
-  const onEditBusinessSetupClick = () => {
-    userEvents.addTaskEvent("Clicked button", {
-      task: TaskTypes.TASKS_OVERVIEW,
-      actionType: "edit"
-    });
-    onNavigateToTask(TaskTypes.BUSINESS_TYPE_SELECTION);
-  };
-  const getBusinessTaskListTitleKey = () => {
-    if (hasUnincorporatedPartnership) {
-      return "tellUsMoreAboutPrimaryPartner";
-    } else if (tasks.includes(TaskTypes.BUSINESS_DETAILS)) {
-      return isReview ? "businessAccountDetailsDescriptionReview" : "businessAccountDetailsDescription";
-    } else if (canChangeEntityType) {
-      return "provideFewDetailsAboutYourself";
-    } else {
-      return "accountDetailsDescription";
-    }
-  };
-  const getEmptyBankAccountProblems = () => {
-    var _a2, _b2, _c2;
-    const transferInstrumentId = (_b2 = (_a2 = legalEntityResponse == null ? void 0 : legalEntityResponse.transferInstruments) == null ? void 0 : _a2[0]) == null ? void 0 : _b2.id;
-    return transferInstrumentId ? (_c2 = capabilityProblems == null ? void 0 : capabilityProblems.BankAccount) == null ? void 0 : _c2[transferInstrumentId] : void 0;
-  };
+  const showDecisionMakersWarning = Boolean(
+    getOwnDecisionMakersLegalEntityIds(legalEntityResponse).length && remediationMessages.DECISION_MAKER
+  );
   useEffect(() => {
     if (showDecisionMakersWarning) {
       userEvents.addTaskEvent("Encountered error", {
@@ -723,32 +740,18 @@ function TaskListInner({
       });
     }
   }, [showDecisionMakersWarning, userEvents]);
-  const { data: taskStatuses } = useTaskStatus({
-    refetchInterval: (query) => {
-      const { data: response } = query.state || {};
-      const statuses = response == null ? void 0 : response.statuses;
-      const areAllTasksFinishedOrEmpty = (statuses == null ? void 0 : statuses.length) === 0 || (statuses == null ? void 0 : statuses.every((task) => task.status === TaskStatus[TaskStatus.FINISHED]));
-      return areAllTasksFinishedOrEmpty ? TASK_STATUS_COMPLETED_POLLING_INTERVAL_MS : TASK_STATUS_POLLING_INTERVAL_MS;
-    }
-  });
-  const normalizedTasks = normalizeTaskStatuses(taskStatuses);
-  setNormalizedTaskStatusStore(normalizedTasks);
-  const payinPayoutTaskStatus = (normalizedTasks == null ? void 0 : normalizedTasks.PAYOUT) ?? (normalizedTasks == null ? void 0 : normalizedTasks.PAYIN);
-  const businessDetailsTaskStatus = isExperimentEnabled("EnableBusinessDetailsTaskStatusService") ? ((_h = normalizedTasks == null ? void 0 : normalizedTasks.BUSINESS_DETAILS) == null ? void 0 : _h.status) ?? TaskStatus.DETAILS_REQUIRED : getTaskStatus2(TaskTypes.BUSINESS_DETAILS);
   return /* @__PURE__ */ jsxs("div", { className: "adyen-task-list__container", children: [
-    canSeeIntroduction && /* @__PURE__ */ jsx("div", { className: "adyen-task-list__nav", children: /* @__PURE__ */ jsx(Button, { variant: "link", onClick: () => onNavigateToTask(TaskTypes.INTRODUCTION), children: i18n.get("goToIntroduction") }) }),
+    canSeeIntroduction && /* @__PURE__ */ jsx("div", { className: "adyen-task-list__nav", children: /* @__PURE__ */ jsx(Button, { variant: "link", onClick: () => onNavigateToTask(TaskTypes.INTRODUCTION), children: t(($) => $["goToIntroduction"]) }) }),
     canChangeEntityType && /* @__PURE__ */ jsxs("header", { className: "adyen-task-list__heading", children: [
-      /* @__PURE__ */ jsx(Typography, { el: "h1", variant: "title-l", children: i18n.get("setUpYourAccount") }),
+      /* @__PURE__ */ jsx(Typography, { el: "h1", variant: "title-l", children: t(($) => $["setUpYourAccount"]) }),
       /* @__PURE__ */ jsxs(Typography, { el: "p", variant: "title", className: "adyen-task-list__description", children: [
-        /* @__PURE__ */ jsx(Typography, { el: "span", variant: "body-strongest", children: i18n.get("yourBusinessSetup", {
-          values: {
-            businessSetup: businessSetup ? i18n.get(businessSetup) : i18n.get("unknown")
-          }
+        /* @__PURE__ */ jsx(Typography, { el: "span", variant: "body-strongest", children: t(($) => $["yourBusinessSetup"], {
+          businessSetup: businessSetup ? t(($) => $[businessSetup]) : t(($) => $["unknown"])
         }) }),
         /* @__PURE__ */ jsx(
           IconButton,
           {
-            ariaLabel: i18n.get("editBusinessSetup"),
+            ariaLabel: t(($) => $["editBusinessSetup"]),
             icon: "edit",
             variant: "tertiary",
             onClick: onEditBusinessSetupClick
@@ -758,7 +761,7 @@ function TaskListInner({
     ] }),
     singpassComponent,
     /* @__PURE__ */ jsxs("div", { children: [
-      hasTaskOfGroupAccountDetails && /* @__PURE__ */ jsxs(TaskListGroup, { title: i18n.get(getBusinessTaskListTitleKey()), children: [
+      hasTaskOfGroupAccountDetails && /* @__PURE__ */ jsxs(TaskListGroup, { title: t(($) => $[getBusinessTaskListTitleKey()]), children: [
         tasks.includes(TaskTypes.INDIVIDUAL) && /* @__PURE__ */ jsx(
           TaskListItem,
           {
@@ -766,7 +769,7 @@ function TaskListInner({
             icon: "decision-maker",
             titleKey: hasTrust ? "trusteePersonalDetails" : hasUnincorporatedPartnership ? "primaryPartnerDetails" : "personalDetails",
             status: getTaskStatus2(TaskTypes.INDIVIDUAL),
-            problems: (_i = capabilityProblems == null ? void 0 : capabilityProblems.LegalEntity) == null ? void 0 : _i[legalEntityResponse.id]
+            problems: capabilityProblems?.LegalEntity?.[legalEntityResponse.id]
           }
         ),
         tasks.includes(TaskTypes.BUSINESS_DETAILS) && /* @__PURE__ */ jsx(
@@ -777,7 +780,7 @@ function TaskListInner({
             icon: "company",
             titleKey: hasTrust ? "businessTrusteeDetails" : hasUnincorporatedPartnership ? "primaryPartnerDetails" : "businessDetails",
             status: businessDetailsTaskStatus,
-            problems: (_j = capabilityProblems == null ? void 0 : capabilityProblems.LegalEntity) == null ? void 0 : _j[legalEntityResponse.id]
+            problems: capabilityProblems?.LegalEntity?.[legalEntityResponse.id]
           }
         ),
         hasSoleProprietorship && /* @__PURE__ */ jsx(
@@ -806,7 +809,7 @@ function TaskListInner({
             icon: "decision-maker",
             titleKey: hasUnincorporatedPartnership ? "entityDecisionMakers" : "decisionMakers",
             status: getTaskStatus2(TaskTypes.DECISION_MAKER_OVERVIEW),
-            warningMessage: remediationMessages[TaskTypes.DECISION_MAKER]
+            warningMessage: showDecisionMakersWarning ? remediationMessages[TaskTypes.DECISION_MAKER] : void 0
           }
         ),
         showCustomerSupportV4 && tasks.includes(TaskTypes.CUSTOMER_SUPPORT) && /* @__PURE__ */ jsx(
@@ -815,11 +818,11 @@ function TaskListInner({
             onNavigateToTask: handleOnNavigateToTaskCustomerSupport,
             icon: "webinar",
             titleKey: "customerSupport",
-            status: ((_k = normalizedTasks == null ? void 0 : normalizedTasks.CUSTOMER_SUPPORT) == null ? void 0 : _k.status) ?? TaskStatus.DETAILS_REQUIRED
+            status: normalizedTasks?.CUSTOMER_SUPPORT?.status ?? TaskStatus.DETAILS_REQUIRED
           }
         )
       ] }),
-      hasTrust && /* @__PURE__ */ jsxs(TaskListGroup, { title: i18n.get("trustDetailsDescription"), children: [
+      hasTrust && /* @__PURE__ */ jsxs(TaskListGroup, { title: t(($) => $["trustDetailsDescription"]), children: [
         /* @__PURE__ */ jsx(
           TaskListItem,
           {
@@ -840,7 +843,7 @@ function TaskListInner({
           }
         )
       ] }),
-      hasUnincorporatedPartnership && /* @__PURE__ */ jsxs(TaskListGroup, { title: i18n.get("partnershipUnincorporated"), children: [
+      hasUnincorporatedPartnership && /* @__PURE__ */ jsxs(TaskListGroup, { title: t(($) => $["partnershipUnincorporated"]), children: [
         /* @__PURE__ */ jsx(
           TaskListItem,
           {
@@ -877,7 +880,7 @@ function TaskListInner({
             onNavigateToTask: handleOnNavigateToSourceOfFunds,
             icon: "cash-stack",
             titleKey: "fundingSources",
-            status: ((_l = normalizedTasks == null ? void 0 : normalizedTasks.SOURCE_OF_FUNDS) == null ? void 0 : _l.status) ?? TaskStatus.DETAILS_REQUIRED
+            status: normalizedTasks?.SOURCE_OF_FUNDS?.status ?? TaskStatus.DETAILS_REQUIRED
           }
         ),
         tasks.includes(TaskTypes.BUSINESS_FINANCING) && /* @__PURE__ */ jsx(
@@ -886,7 +889,7 @@ function TaskListInner({
             onNavigateToTask: handleOnNavigateToBusinessFinancing,
             icon: "capital",
             titleKey: "businessFinancing",
-            status: ((_m = normalizedTasks == null ? void 0 : normalizedTasks.BUSINESS_FINANCING) == null ? void 0 : _m.status) ?? TaskStatus.DETAILS_REQUIRED
+            status: normalizedTasks?.BUSINESS_FINANCING?.status ?? TaskStatus.DETAILS_REQUIRED
           }
         )
       ] }),
@@ -896,14 +899,14 @@ function TaskListInner({
           onNavigateToTask: handleOnNavigateToTaxReporting,
           icon: "reporting",
           titleKey: "taxReporting",
-          status: ((_n = normalizedTasks == null ? void 0 : normalizedTasks.TAX_REPORTING) == null ? void 0 : _n.status) ?? TaskStatus.DETAILS_REQUIRED
+          status: normalizedTasks?.TAX_REPORTING?.status ?? TaskStatus.DETAILS_REQUIRED
         }
       ) }),
       (tasks.includes(TaskTypes.PAYOUT) || tasks.includes(TaskTypes.PAYIN)) && !hidePayoutAccountTaskExperiment && /* @__PURE__ */ jsx(
         TaskListGroup,
         {
-          title: canChangeEntityType ? i18n.get("payoutBankAccounts") : i18n.get(
-            hasPayinTaskNotPayout ? "payinAccountsDescription" : payoutTaskDescriptionKey
+          title: canChangeEntityType ? t(($) => $["payoutBankAccounts"]) : t(
+            ($) => $[hasPayinTaskNotPayout ? "payinAccountsDescription" : payoutTaskDescriptionKey]
           ),
           children: transferInstruments.length > 0 ? /* @__PURE__ */ jsxs(Fragment, { children: [
             transferInstruments.map((transferInstrument) => /* @__PURE__ */ jsx(
@@ -925,8 +928,8 @@ function TaskListInner({
                 disabled: !canAddPayoutAccount,
                 children: [
                   /* @__PURE__ */ jsx(Icon, { name: "plus", className: "adyen-task-list__card-icon " }),
-                  /* @__PURE__ */ jsx("span", { children: canChangeEntityType ? i18n.get("addExtraBankAccount") : i18n.get(
-                    hasPayinTaskNotPayout ? "addExtraPayinAccount" : "addExtraPayoutAccount"
+                  /* @__PURE__ */ jsx("span", { children: canChangeEntityType ? t(($) => $["addExtraBankAccount"]) : t(
+                    ($) => $[hasPayinTaskNotPayout ? "addExtraPayinAccount" : "addExtraPayoutAccount"]
                   ) })
                 ]
               }
@@ -944,18 +947,7 @@ function TaskListInner({
           )
         }
       ),
-      showContractTasks && /* @__PURE__ */ jsxs(TaskListGroup, { title: i18n.get("reviewAndSignLegalDisclosures"), children: [
-        showServiceAgreementTask && /* @__PURE__ */ jsx(
-          TaskListItem,
-          {
-            onNavigateToTask: handleOnNavigateToServiceAgreement,
-            icon: "contract",
-            titleKey: "signServiceAgreement",
-            disabled: areServiceAgreementTasksDisabled,
-            status: serviceAgreementTypes.length ? TaskStatus.SIGN : TaskStatus.SIGNED,
-            info: areServiceAgreementTasksDisabled ? i18n.get("requiresSignatory") : void 0
-          }
-        ),
+      showContractTasks && /* @__PURE__ */ jsxs(TaskListGroup, { title: t(($) => $["reviewAndSignLegalDisclosures"]), children: [
         showPciTask && /* @__PURE__ */ jsx(
           TaskListItem,
           {
@@ -963,21 +955,32 @@ function TaskListInner({
             icon: "pci",
             titleKey: "pciDssQuestionnaire",
             status: canDownloadPci ? TaskStatus.DOWNLOAD : TaskStatus.SIGN,
-            statusLabel: canDownloadPci ? i18n.get("downloadACopy") : void 0,
+            statusLabel: canDownloadPci ? t(($) => $["downloadACopy"]) : void 0,
             downloadHandler: onPciDownload,
             disabled: isPciTaskDisabled,
-            info: isPciTaskDisabled && !canDownloadPci ? i18n.get("requiresDecisionMakers") : void 0
+            info: isPciTaskDisabled && !canDownloadPci ? t(($) => $["requiresDecisionMakers"]) : void 0
+          }
+        ),
+        showServiceAgreementTask && /* @__PURE__ */ jsx(
+          TaskListItem,
+          {
+            onNavigateToTask: handleOnNavigateToServiceAgreement,
+            icon: "contract",
+            titleKey: "signServiceAgreement",
+            disabled: areServiceAgreementTasksDisabled,
+            status: serviceAgreementTypes.length ? TaskStatus.SIGN : TaskStatus.SIGNED,
+            info: EnableSignPCIBeforeTOS && shouldSignPciFirst ? t(($) => $["signPciFirst"]) : !hasServiceAgreementSigners ? t(($) => $["requiresSignatory"]) : void 0
           }
         )
       ] }),
-      isReview && /* @__PURE__ */ jsx(TaskListGroup, { title: i18n.get("pleaseEnsureTheFollowing"), children: /* @__PURE__ */ jsx(
+      isReview && /* @__PURE__ */ jsx(TaskListGroup, { title: t(($) => $["pleaseEnsureTheFollowing"]), children: /* @__PURE__ */ jsx(
         TaskListItem,
         {
           onNavigateToTask: handleOnNavigateToTaskReview,
           icon: "review",
           titleKey: "submitReviewOfYourData",
           status: TaskStatus.SUBMIT,
-          problems: (_o = capabilityProblems == null ? void 0 : capabilityProblems.LegalEntity) == null ? void 0 : _o[legalEntityResponse.id],
+          problems: capabilityProblems?.LegalEntity?.[legalEntityResponse.id],
           showErrorAlerts: "always"
         }
       ) })
@@ -985,15 +988,24 @@ function TaskListInner({
   ] });
 }
 const isNewEntity = Symbol("isNewEntity");
+const useExemptSettlor = ({
+  trust
+}) => {
+  const matchingAssociation = useMemo(() => {
+    if (!trust) return void 0;
+    return getOwnEntityAssociations(trust).find(
+      (association) => association.type === TrustMemberTypes.SETTLOR && Boolean(association.settlorExemptionReason)
+    );
+  }, [trust]);
+  const { data } = useLegalEntity(matchingAssociation?.legalEntityId ?? skipToken);
+  return data;
+};
 const splitAtFirstOccurrence = (str, separator) => {
   const firstOccurrence = str.indexOf(separator);
   if (firstOccurrence === -1) return [str];
   return [str.slice(0, firstOccurrence), str.slice(firstOccurrence + 1)];
 };
-const getTrustMemberOwnerId = (trustMemberId, entityAssociations) => {
-  var _a;
-  return (_a = entityAssociations.find((association) => association.associatorId === trustMemberId)) == null ? void 0 : _a.legalEntityId;
-};
+const getTrustMemberOwnerId = (trustMemberId, entityAssociations) => entityAssociations.find((association) => association.associatorId === trustMemberId)?.legalEntityId;
 const getFallbackName = (exemptSettlorAssociation) => {
   const [firstName, lastName] = splitAtFirstOccurrence(exemptSettlorAssociation.name ?? "", " ");
   return {
@@ -1002,7 +1014,6 @@ const getFallbackName = (exemptSettlorAssociation) => {
   };
 };
 const convertEntityAssociationIntoTrustMember = (association, associations, exemptSettlorLE) => {
-  var _a;
   if (association.settlorExemptionReason) {
     return {
       trustMemberType: "exemptSettlor",
@@ -1010,7 +1021,7 @@ const convertEntityAssociationIntoTrustMember = (association, associations, exem
       legalEntityType: association.entityType,
       legalEntityId: association.legalEntityId,
       settlorExemptionReason: association.settlorExemptionReason,
-      exemptSettlorName: association.entityType === LegalEntityType.INDIVIDUAL ? ((_a = exemptSettlorLE == null ? void 0 : exemptSettlorLE.individual) == null ? void 0 : _a.name) ?? getFallbackName(association) : void 0,
+      exemptSettlorName: association.entityType === LegalEntityType.INDIVIDUAL ? exemptSettlorLE?.individual?.name ?? getFallbackName(association) : void 0,
       name: association.name
     };
   }
@@ -1068,18 +1079,15 @@ const mapUndefinedBeneficiaryInfoToTrustMembers = (undefinedBeneficiaryInfo) =>
   reference,
   description
 }));
-const getTrustMembers = (trustLE, rootLegalEntity, exemptSettlorLE) => {
-  var _a;
-  return [
-    mapRootLegalEntityToTrustMember(rootLegalEntity),
-    ...mapEntityAssociationsToTrustMembers(
-      trustLE.id,
-      trustLE.entityAssociations ?? [],
-      exemptSettlorLE
-    ),
-    ...mapUndefinedBeneficiaryInfoToTrustMembers(((_a = trustLE.trust) == null ? void 0 : _a.undefinedBeneficiaryInfo) ?? [])
-  ];
-};
+const getTrustMembers = (trustLE, rootLegalEntity, exemptSettlorLE) => [
+  mapRootLegalEntityToTrustMember(rootLegalEntity),
+  ...mapEntityAssociationsToTrustMembers(
+    trustLE.id,
+    trustLE.entityAssociations ?? [],
+    exemptSettlorLE
+  ),
+  ...mapUndefinedBeneficiaryInfoToTrustMembers(trustLE.trust?.undefinedBeneficiaryInfo ?? [])
+];
 const combineRootLegalEntityWithEntityAssociations = (rootLegalEntity, entityAssociations) => {
   const allowedRolesForRootLegalEntity = [
     TrustMemberTypes.SETTLOR,
@@ -1096,7 +1104,6 @@ const combineRootLegalEntityWithEntityAssociations = (rootLegalEntity, entityAss
   };
 };
 const getRootTrusteeTrustMembers = (trustLE, rootLegalEntity, exemptSettlorLE) => {
-  var _a;
   const entityAssociations = trustLE.entityAssociations ?? [];
   const rootLegalEntityAssociations = entityAssociations.filter(
     (a) => a.legalEntityId === rootLegalEntity.id
@@ -1111,21 +1118,9 @@ const getRootTrusteeTrustMembers = (trustLE, rootLegalEntity, exemptSettlorLE) =
       nonRootLegalEntityAssociations ?? [],
       exemptSettlorLE
     ),
-    ...mapUndefinedBeneficiaryInfoToTrustMembers(((_a = trustLE.trust) == null ? void 0 : _a.undefinedBeneficiaryInfo) ?? [])
+    ...mapUndefinedBeneficiaryInfoToTrustMembers(trustLE.trust?.undefinedBeneficiaryInfo ?? [])
   ];
 };
-const useExemptSettlor = ({
-  trust
-}) => {
-  const matchingAssociation = useMemo(() => {
-    if (!trust) return void 0;
-    return getOwnEntityAssociations(trust).find(
-      (association) => association.type === TrustMemberTypes.SETTLOR && Boolean(association.settlorExemptionReason)
-    );
-  }, [trust]);
-  const { data } = useLegalEntity((matchingAssociation == null ? void 0 : matchingAssociation.legalEntityId) ?? skipToken);
-  return data;
-};
 function useTrustMembers() {
   const { data: rootLegalEntity } = useLegalEntity(ROOT_LE);
   const { data: trust } = useAssociatedLegalEntity(rootLegalEntity, LegalEntityType.TRUST);
@@ -1135,7 +1130,7 @@ function useTrustMembers() {
   });
   const allowMoreRolesForMainRootTrustee = isExperimentEnabled("AllowMoreRolesForMainRootTrustee");
   return useMemo(() => {
-    if (!rootLegalEntity || !(trust == null ? void 0 : trust.trust)) return [];
+    if (!rootLegalEntity || !trust?.trust) return [];
     return allowMoreRolesForMainRootTrustee ? getRootTrusteeTrustMembers(trust, rootLegalEntity, exemptSettlor) : getTrustMembers(trust, rootLegalEntity, exemptSettlor);
   }, [rootLegalEntity, trust, exemptSettlor, allowMoreRolesForMainRootTrustee]);
 }
@@ -1198,7 +1193,6 @@ const convertExistingSettlorExemptionReasons = (existingReasons) => {
   return existingReasons;
 };
 const convertExistingTrustMember = (trustMember) => {
-  var _a, _b;
   switch (trustMember.trustMemberType) {
     case "undefinedBeneficiary":
       return {
@@ -1229,8 +1223,8 @@ const convertExistingTrustMember = (trustMember) => {
         settlorExemptionReason: convertExistingSettlorExemptionReasons(
           trustMember.settlorExemptionReason
         ),
-        firstName: (_a = trustMember.exemptSettlorName) == null ? void 0 : _a.firstName,
-        lastName: (_b = trustMember.exemptSettlorName) == null ? void 0 : _b.lastName,
+        firstName: trustMember.exemptSettlorName?.firstName,
+        lastName: trustMember.exemptSettlorName?.lastName,
         legalCompanyName: trustMember.name,
         country: trustMember.country
       };
@@ -1289,7 +1283,7 @@ const availablesRolesByTrustMemberTypeAndLegalEntityType = {
   }
 };
 const getAvailableRolesByTrustMemberTypeAndLegalEntityType = (currentRoles, trustMember) => {
-  if (!(currentRoles == null ? void 0 : currentRoles.length)) {
+  if (!currentRoles?.length) {
     const { trustMemberType, legalEntityType } = trustMember;
     const availableRolesByTrustMemberType = availablesRolesByTrustMemberTypeAndLegalEntityType[trustMemberType];
     if (!availableRolesByTrustMemberType) {
@@ -1308,7 +1302,7 @@ const getAvailableRolesByTrustMemberTypeAndLegalEntityType = (currentRoles, trus
   return roles.filter((r) => r !== "secondaryTrustee");
 };
 const getAvailableRoles = (currentRoles) => {
-  if (!(currentRoles == null ? void 0 : currentRoles.length)) return Object.values(TrustMemberTypes);
+  if (!currentRoles?.length) return Object.values(TrustMemberTypes);
   return currentRoles.map((role) => [role, ...allowedCrossoverRolesMatrix[role]]).reduce(
     (existingAllowed, allowedForRole) => existingAllowed.filter((role) => allowedForRole.includes(role))
   );
@@ -1328,14 +1322,8 @@ const settlorExemptionReasonWithNoneOfTheAbove = [
   "noneOfTheAbove"
 ];
 const couldBeExemptSettlor = (data, country) => data.entityType === LegalEntityType.INDIVIDUAL && data.role !== void 0 && data.role.includes("settlor") && !data.role.some((role) => role !== "settlor") && (!country || !countriesWhereSettlorExemptionReasonNotApplicable.includes(country));
-const isExemptSettlor = (data) => {
-  var _a;
-  return ((_a = data.settlorExemptionReason) == null ? void 0 : _a.some((reason) => reason !== "noneOfTheAbove")) ?? false;
-};
-const isOrganizationAndSettlor = (data) => {
-  var _a;
-  return data.entityType === LegalEntityType.ORGANIZATION && ((_a = data.role) == null ? void 0 : _a.length) === 1 && data.role[0] === "settlor";
-};
+const isExemptSettlor = (data) => data.settlorExemptionReason?.some((reason) => reason !== "noneOfTheAbove") ?? false;
+const isOrganizationAndSettlor = (data) => data.entityType === LegalEntityType.ORGANIZATION && data.role?.length === 1 && data.role[0] === "settlor";
 const roleAndTypeValidationRules = {
   entityType: {
     modes: ["blur"],
@@ -1344,7 +1332,7 @@ const roleAndTypeValidationRules = {
   },
   role: {
     modes: ["blur"],
-    validate: (role) => !!(role == null ? void 0 : role.length),
+    validate: (role) => !!role?.length,
     errorMessage: "fieldIsRequired"
   },
   descriptionUndefinedBeneficiary: {
@@ -1354,7 +1342,7 @@ const roleAndTypeValidationRules = {
   },
   settlorExemptionReason: {
     modes: ["blur"],
-    validate: (reasons) => Boolean(reasons == null ? void 0 : reasons.length),
+    validate: (reasons) => Boolean(reasons?.length),
     errorMessage: "fieldIsRequired"
   },
   country: {
@@ -1391,6 +1379,7 @@ const convertExistingTrustMemberToDefaultData = (trustMember, allowMoreRolesForM
   return convertExistingTrustMember(trustMember);
 };
 const TrustRoleAndEntityType = (props) => {
+  const { t } = useTranslation();
   const { i18n } = useI18nContext();
   const { existingTrustMember, isOrganizationSettlorWithExemptionEnabled, onChange, id, country } = props;
   const trustRoleAndEntityTypeCountry = country;
@@ -1414,11 +1403,10 @@ const TrustRoleAndEntityType = (props) => {
   );
   const formUtils = createFormUtils(mergedProps, i18n);
   const decideFields = (data2) => {
-    var _a, _b;
-    if ((_a = data2.role) == null ? void 0 : _a.includes("undefinedBeneficiary")) {
+    if (data2.role?.includes("undefinedBeneficiary")) {
       return ["role", "descriptionUndefinedBeneficiary"];
     }
-    if ((_b = data2.role) == null ? void 0 : _b.length) {
+    if (data2.role?.length) {
       if (isOrganizationSettlorWithExemptionEnabled && isOrganizationAndSettlor(data2)) {
         return ["role", "entityType", "settlorExemptionReason", "country", "legalCompanyName"];
       }
@@ -1434,9 +1422,9 @@ const TrustRoleAndEntityType = (props) => {
     schema: decideFields,
     rules: roleAndTypeValidationRules,
     defaultData,
-    fieldProblems: props == null ? void 0 : props.fieldValidationErrors
+    fieldProblems: props?.fieldValidationErrors
   });
-  const availableRoles = allowMoreRolesForMainRootTrusteeEnabled && (existingTrustMember == null ? void 0 : existingTrustMember.trustMemberType) === "rootTrustee" ? getAvailableRolesByTrustMemberTypeAndLegalEntityType(data.role, existingTrustMember) : getAvailableRoles(data.role);
+  const availableRoles = allowMoreRolesForMainRootTrusteeEnabled && existingTrustMember?.trustMemberType === "rootTrustee" ? getAvailableRolesByTrustMemberTypeAndLegalEntityType(data.role, existingTrustMember) : getAvailableRoles(data.role);
   const { data: exemptSettlorLe } = useLegalEntity(
     isOrganizationSettlorWithExemptionEnabled && existingTrustMember && existingTrustMember.trustMemberType === "exemptSettlor" && existingTrustMember.legalEntityId !== isNewEntity && existingTrustMember.roles !== void 0 && existingTrustMember.roles.length === 1 && existingTrustMember.roles[0] === "settlor" ? existingTrustMember.legalEntityId : skipToken
   );
@@ -1446,7 +1434,7 @@ const TrustRoleAndEntityType = (props) => {
     }
   }, [exemptSettlorLe]);
   useEffect(() => {
-    onChange == null ? void 0 : onChange({
+    onChange?.({
       schema,
       data,
       errors,
@@ -1469,10 +1457,9 @@ const TrustRoleAndEntityType = (props) => {
     }
   };
   const changeSettlorExemptionReasons = (exemptionReasons) => {
-    var _a;
     if (exemptionReasons.includes("noneOfTheAbove")) {
       handleChangeFor("settlorExemptionReason")(
-        ((_a = data.settlorExemptionReason) == null ? void 0 : _a.includes("noneOfTheAbove")) ? exemptionReasons.filter((reason) => reason !== "noneOfTheAbove") : ["noneOfTheAbove"]
+        data.settlorExemptionReason?.includes("noneOfTheAbove") ? exemptionReasons.filter((reason) => reason !== "noneOfTheAbove") : ["noneOfTheAbove"]
       );
       return;
     }
@@ -1480,8 +1467,7 @@ const TrustRoleAndEntityType = (props) => {
   };
   const nameProps = getFieldProps(props, nameFields);
   const onEntityTypeChange = (value) => {
-    var _a;
-    if (isOrganizationSettlorWithExemptionEnabled && value === LegalEntityType.ORGANIZATION && ((_a = data.role) == null ? void 0 : _a.length) === 1 && data.role[0] === "settlor") {
+    if (isOrganizationSettlorWithExemptionEnabled && value === LegalEntityType.ORGANIZATION && data.role?.length === 1 && data.role[0] === "settlor") {
       changeSettlorExemptionReasons(["professionalServiceProvider"]);
     }
     handleChangeFor("entityType")(value);
@@ -1491,8 +1477,8 @@ const TrustRoleAndEntityType = (props) => {
     /* @__PURE__ */ jsx(
       ErrorPanel,
       {
-        verificationErrors: props == null ? void 0 : props.formVerificationErrors,
-        validationErrors: props == null ? void 0 : props.fieldValidationErrors,
+        verificationErrors: props?.formVerificationErrors,
+        validationErrors: props?.fieldValidationErrors,
         formUtils,
         id: "ariaErrorField"
       }
@@ -1503,7 +1489,6 @@ const TrustRoleAndEntityType = (props) => {
         el: "fieldset",
         name: "role",
         label: formUtils.getLabel("role", "selectTheApplicableRoles"),
-        classNameModifiers: ["role"],
         errorMessage: formUtils.getErrorMessage("role", errors, fieldProblems),
         isValid: valid.role,
         disabled: availableRoles.length === 0,
@@ -1516,14 +1501,14 @@ const TrustRoleAndEntityType = (props) => {
             selected: data.role ?? [],
             onSelect: changeRoles,
             mapToSelectItem: (role) => ({
-              ...makeSelectItemForRole(role, i18n),
+              ...makeSelectItemForRole(role, t),
               disabled: !availableRoles.includes(role)
             })
           }
         )
       }
     ),
-    (schema == null ? void 0 : schema.includes("entityType")) && /* @__PURE__ */ jsx(
+    schema?.includes("entityType") && /* @__PURE__ */ jsx(
       Field,
       {
         el: "fieldset",
@@ -1549,7 +1534,7 @@ const TrustRoleAndEntityType = (props) => {
         )
       }
     ),
-    (schema == null ? void 0 : schema.includes("descriptionUndefinedBeneficiary")) && /* @__PURE__ */ jsx(
+    schema?.includes("descriptionUndefinedBeneficiary") && /* @__PURE__ */ jsx(
       Field,
       {
         name: "descriptionUndefinedBeneficiary",
@@ -1575,7 +1560,7 @@ const TrustRoleAndEntityType = (props) => {
         )
       }
     ),
-    (schema == null ? void 0 : schema.includes("settlorExemptionReason")) && !isOrganizationAndSettlor(data) && /* @__PURE__ */ jsx(
+    schema?.includes("settlorExemptionReason") && !isOrganizationAndSettlor(data) && /* @__PURE__ */ jsx(
       Field,
       {
         el: "fieldset",
@@ -1623,7 +1608,7 @@ const TrustRoleAndEntityType = (props) => {
         dataStoreId: id
       }
     ) : void 0,
-    isOrganizationSettlorWithExemptionEnabled && (schema == null ? void 0 : schema.includes("country")) && (schema == null ? void 0 : schema.includes("legalCompanyName")) ? /* @__PURE__ */ jsxs(Fragment, { children: [
+    isOrganizationSettlorWithExemptionEnabled && schema?.includes("country") && schema?.includes("legalCompanyName") ? /* @__PURE__ */ jsxs(Fragment, { children: [
       /* @__PURE__ */ jsx(
         CountryField,
         {
@@ -1632,7 +1617,6 @@ const TrustRoleAndEntityType = (props) => {
           errors: formUtils.getFieldErrors(errors, fieldProblems, COUNTRY_FIELD),
           labels: formUtils.getFieldLabels(COUNTRY_FIELD),
           readonly: false,
-          classNameModifiers: COUNTRY_FIELD,
           allowedCountries: void 0,
           handleChangeFor
         }
@@ -1655,7 +1639,6 @@ const TrustRoleAndEntityType = (props) => {
   ] });
 };
 const mapTrustMemberToEntityAssociations = (trustMember) => {
-  var _a, _b;
   if (trustMember.legalEntityId === isNewEntity) {
     throw Error("Cannot map a new trust member, you must create it first");
   }
@@ -1666,7 +1649,7 @@ const mapTrustMemberToEntityAssociations = (trustMember) => {
         entityType: trustMember.legalEntityType,
         type: TrustMemberTypes.SETTLOR,
         settlorExemptionReason: trustMember.settlorExemptionReason,
-        name: trustMember.legalEntityType === LegalEntityType.INDIVIDUAL ? `${(_a = trustMember.exemptSettlorName) == null ? void 0 : _a.firstName} ${(_b = trustMember.exemptSettlorName) == null ? void 0 : _b.lastName}` : trustMember.name ?? ""
+        name: trustMember.legalEntityType === LegalEntityType.INDIVIDUAL ? `${trustMember.exemptSettlorName?.firstName} ${trustMember.exemptSettlorName?.lastName}` : trustMember.name ?? ""
       }
     ];
   return trustMember.roles.map((role) => ({
@@ -1711,10 +1694,9 @@ const addOrUpdateUndefinedBeneficiary = async ({
   trust,
   updateLegalEntity
 }) => {
-  var _a, _b;
-  const otherUndefinedBeneficiaries = ((_b = (_a = trust.trust) == null ? void 0 : _a.undefinedBeneficiaryInfo) == null ? void 0 : _b.filter(
+  const otherUndefinedBeneficiaries = trust.trust?.undefinedBeneficiaryInfo?.filter(
     (ub) => ub.reference !== newOrUpdated.reference
-  )) ?? [];
+  ) ?? [];
   const patchLE = {
     trust: {
       undefinedBeneficiaryInfo: [
@@ -1735,13 +1717,12 @@ const createExemptSettlor = async ({
   trust,
   handleCreateLegalEntity
 }) => {
-  var _a, _b;
   const exemptSettlorLE = {
     type: LegalEntityType.INDIVIDUAL,
     individual: {
       name: {
-        firstName: ((_a = exemptSettlor.exemptSettlorName) == null ? void 0 : _a.firstName) ?? "",
-        lastName: ((_b = exemptSettlor.exemptSettlorName) == null ? void 0 : _b.lastName) ?? ""
+        firstName: exemptSettlor.exemptSettlorName?.firstName ?? "",
+        lastName: exemptSettlor.exemptSettlorName?.lastName ?? ""
       },
       residentialAddress: {
         country: trust.trust.registeredAddress.country
@@ -1770,12 +1751,11 @@ const updateExemptSettlorName = async ({
   exemptSettlor,
   updateLegalEntity
 }) => {
-  var _a, _b;
   const exemptSettlorPatch = {
     individual: {
       name: {
-        firstName: (_a = exemptSettlor.exemptSettlorName) == null ? void 0 : _a.firstName,
-        lastName: (_b = exemptSettlor.exemptSettlorName) == null ? void 0 : _b.lastName
+        firstName: exemptSettlor.exemptSettlorName?.firstName,
+        lastName: exemptSettlor.exemptSettlorName?.lastName
       }
     }
   };
@@ -1808,7 +1788,6 @@ const styles$3 = {
 const formatRolesForSummary = (roles, i18n) => roles.map((role) => i18n.get(getRoleName(role))).join(", ");
 const formatSettlorExemptionReasonsForSummary = (reasons, i18n) => /* @__PURE__ */ jsx("ul", { className: styles$3.settlorExemptionReasonsList, children: reasons.map((reason) => /* @__PURE__ */ jsx("li", { children: i18n.get(reason) }, reason)) });
 const formatRoleAndEntityTypeSummary = (data, i18n, isOrganizationSettlorWithExemptionEnabled) => {
-  var _a, _b;
   const { trustMemberType, roles } = data;
   const role = formatRolesForSummary(roles, i18n);
   switch (trustMemberType) {
@@ -1821,8 +1800,8 @@ const formatRoleAndEntityTypeSummary = (data, i18n, isOrganizationSettlorWithExe
       return {
         role,
         entityType: i18n.get(data.legalEntityType),
-        firstName: (_a = data.exemptSettlorName) == null ? void 0 : _a.firstName,
-        lastName: (_b = data.exemptSettlorName) == null ? void 0 : _b.lastName,
+        firstName: data.exemptSettlorName?.firstName,
+        lastName: data.exemptSettlorName?.lastName,
         country: isOrganizationSettlorWithExemptionEnabled ? data.country : void 0,
         legalCompanyName: isOrganizationSettlorWithExemptionEnabled ? data.name : void 0,
         settlorExemptionReason: summaryItem(
@@ -1883,7 +1862,6 @@ const decideForms = (trustMember) => {
   }
 };
 const convertDataToTrustMember = (data, existingTrustMember, isOrganizationSettlorWithExemptionReasonEnabled = false) => {
-  var _a;
   const existingId = existingTrustMember ? existingTrustMember.trustMemberType === "undefinedBeneficiary" ? existingTrustMember.reference : existingTrustMember.legalEntityId : void 0;
   if (data.trustMemberType === "rootTrustee") {
     return {
@@ -1894,7 +1872,7 @@ const convertDataToTrustMember = (data, existingTrustMember, isOrganizationSettl
       name: data.firstName ?? ""
     };
   }
-  if ((_a = data.role) == null ? void 0 : _a.length) {
+  if (data.role?.length) {
     if (isExemptSettlor(data)) {
       if (isOrganizationSettlorWithExemptionReasonEnabled && data.entityType === LegalEntityType.ORGANIZATION) {
         return {
@@ -1958,7 +1936,6 @@ function RoleAndTypeDropin({
   navigateBack,
   country
 }) {
-  var _a;
   const { i18n } = useI18nContext();
   const { isExperimentEnabled } = useExperimentsContext();
   const allowMoreRolesForMainRootTrustee = isExperimentEnabled("AllowMoreRolesForMainRootTrustee");
@@ -1969,7 +1946,7 @@ function RoleAndTypeDropin({
   const { showToast } = useToastContext();
   const isOrganizationSettlorWithExemptionReasonEnabled = (country2) => country2 === CountryCodes.Australia;
   const isOrganizationSettlorWithExemptionEnabled = isOrganizationSettlorWithExemptionReasonEnabled(
-    (_a = trust == null ? void 0 : trust.trust) == null ? void 0 : _a.countryOfGoverningLaw
+    trust?.trust?.countryOfGoverningLaw
   );
   const formList = decideForms(trustMember);
   const forms = Object.values(formList);
@@ -2068,7 +2045,7 @@ function RoleAndTypeDropin({
   };
   const saveRolesAndNavigate = async () => {
     if (trustMember === "incomplete") return;
-    if (hasRolesChanged(trustMember.roles, existingTrustMember == null ? void 0 : existingTrustMember.roles)) {
+    if (hasRolesChanged(trustMember.roles, existingTrustMember?.roles)) {
       addOrUpdateTrustMember(trustMember);
     }
     navigateBack();
@@ -2231,7 +2208,7 @@ const EntityGuidanceStatus = ({
   entityLabel,
   status
 }) => {
-  const { i18n } = useI18nContext();
+  const { t } = useTranslation();
   return /* @__PURE__ */ jsxs("div", { className: "adyen-kyc-entity-status__container", children: [
     /* @__PURE__ */ jsx(EntityStatusIcon, { status }),
     /* @__PURE__ */ jsx(
@@ -2239,7 +2216,7 @@ const EntityGuidanceStatus = ({
       {
         className: "adyen-kyc-entity-status__tag",
         variant: getRoleTagVariant(entityLabel),
-        children: i18n.get(getRoleName(entityLabel))
+        children: t(($) => $[getRoleName(entityLabel)])
       },
       entityLabel
     ),
@@ -2248,9 +2225,13 @@ const EntityGuidanceStatus = ({
       {
         className: "adyen-kyc-entity-status--text",
         "data-testid": `${entityLabel}-rule--description`,
-        dangerouslySetInnerHTML: {
-          __html: i18n.get(getEntityStatusRuleDescription(country, currentTask, entityLabel))
-        }
+        children: /* @__PURE__ */ jsx(
+          Trans,
+          {
+            t,
+            i18nKey: ($) => $[getEntityStatusRuleDescription(country, currentTask, entityLabel)]
+          }
+        )
       }
     )
   ] });
@@ -2273,8 +2254,7 @@ const deleteUndefinedBeneficiary = async ({
   trust,
   asyncMutation
 }) => {
-  var _a;
-  const existingUndefinedBeneficiaries = ((_a = trust.trust) == null ? void 0 : _a.undefinedBeneficiaryInfo) ?? [];
+  const existingUndefinedBeneficiaries = trust.trust?.undefinedBeneficiaryInfo ?? [];
   const updatedTrust = {
     trust: {
       undefinedBeneficiaryInfo: existingUndefinedBeneficiaries.filter(
@@ -2338,7 +2318,7 @@ const EntityAssociation = ({
   isRemoveDisabled = false,
   handleIsRemoveDisabled
 }) => {
-  const { i18n } = useI18nContext();
+  const { t } = useTranslation();
   const [showingActions, setShowingActions] = useState(false);
   const [isStatusRemoving, setIsStatusRemoving] = useState(false);
   return /* @__PURE__ */ jsxs(
@@ -2363,7 +2343,7 @@ const EntityAssociation = ({
                     event.stopPropagation();
                     setShowingActions(!showingActions);
                   },
-                  ariaLabel: i18n.get("toggleAssociationMenu", { values: { name } })
+                  ariaLabel: t(($) => $["toggleAssociationMenu"], { name })
                 }
               ),
               /* @__PURE__ */ jsx(ActionsMenu, { options: actions, open: showingActions, setOpen: setShowingActions })
@@ -2384,7 +2364,7 @@ const EntityAssociation = ({
           {
             className: "adyen-kyc-entity-association__tag",
             variant: getRoleTagVariant(type),
-            children: i18n.get(getRoleName(type))
+            children: t(($) => $[getRoleName(type)])
           },
           type
         )) }),
@@ -2464,9 +2444,8 @@ const ExemptSettlorTaskItem = ({
   onEdit,
   onDelete
 }) => {
-  var _a, _b;
   const { i18n } = useI18nContext();
-  const settlorName = exemptSettlor.legalEntityType === LegalEntityType.INDIVIDUAL ? `${(_a = exemptSettlor.exemptSettlorName) == null ? void 0 : _a.firstName} ${(_b = exemptSettlor.exemptSettlorName) == null ? void 0 : _b.lastName}` : exemptSettlor.name ?? "";
+  const settlorName = exemptSettlor.legalEntityType === LegalEntityType.INDIVIDUAL ? `${exemptSettlor.exemptSettlorName?.firstName} ${exemptSettlor.exemptSettlorName?.lastName}` : exemptSettlor.name ?? "";
   const actions = [
     {
       icon: "edit",
@@ -2647,6 +2626,7 @@ const TrustMembersOverviewInner = ({
   navigateToEditTrustMemberOwner
 }) => {
   const { i18n } = useI18nContext();
+  const { t } = useTranslation("common");
   const trustMemberRequirements = DEFAULT_TRUST_MEMBER_REQUIREMENTS;
   const trustMembersWithOneOfGivenRoles = (roleTypes) => trustMembers.filter(
     ({ roles }) => roleTypes.some((label) => roles.includes(label))
@@ -2679,15 +2659,7 @@ const TrustMembersOverviewInner = ({
           ContextGuidance,
           {
             title: i18n.get("whatIsTheDifferenceBetweenTheseRoles"),
-            content: /* @__PURE__ */ jsx("ul", { className: "adyen-kyc-guidance-list", children: trustMemberRequirements.map(({ label }) => /* @__PURE__ */ jsx(
-              "li",
-              {
-                dangerouslySetInnerHTML: {
-                  __html: i18n.get(`${label}GuideDescription`)
-                }
-              },
-              label
-            )) }),
+            content: /* @__PURE__ */ jsx("ul", { className: "adyen-kyc-guidance-list", children: trustMemberRequirements.map(({ label }) => /* @__PURE__ */ jsx("li", { children: /* @__PURE__ */ jsx(Trans, { t, ns: "common", i18nKey: ($) => $[`${label}GuideDescription`] }) }, label)) }),
             titleId: "whatIsTheDifferenceBetweenTheseRoles",
             contentId: "differenceBetweenTrustMemberRoles"
           }
@@ -2791,13 +2763,13 @@ const TrustMembersOverviewInner = ({
   );
 };
 const createDefaultMember = (selectedMember, selectedEntityType, selectedRoles) => {
-  const firstRole = selectedRoles == null ? void 0 : selectedRoles[0];
+  const firstRole = selectedRoles?.[0];
   return {
-    memberType: (selectedMember == null ? void 0 : selectedMember.memberType) || firstRole,
-    roles: selectedRoles || (selectedMember == null ? void 0 : selectedMember.roles) || [UnincorporatedPartnershipMemberTypes.SECONDARY_PARTNER],
+    memberType: selectedMember?.memberType || firstRole,
+    roles: selectedRoles || selectedMember?.roles || [UnincorporatedPartnershipMemberTypes.SECONDARY_PARTNER],
     legalEntityType: selectedEntityType,
-    legalEntityId: (selectedMember == null ? void 0 : selectedMember.legalEntityId) || "",
-    name: (selectedMember == null ? void 0 : selectedMember.name) || ""
+    legalEntityId: selectedMember?.legalEntityId || "",
+    name: selectedMember?.name || ""
   };
 };
 const useUnincorporatedPartnershipNavigation = ({ navigateTo }) => {
@@ -2811,7 +2783,7 @@ const useUnincorporatedPartnershipNavigation = ({ navigateTo }) => {
   }) => {
     const createdMember = createDefaultMember(selectedMember, selectedEntityType, selectedRoles);
     setActiveMember(createdMember);
-    if (rootLegalEntityId.value === (createdMember == null ? void 0 : createdMember.legalEntityId)) {
+    if (rootLegalEntityId.value === createdMember?.legalEntityId) {
       navigateTo(
         createdMember.legalEntityType === LegalEntityType.INDIVIDUAL ? TaskTypes.INDIVIDUAL : TaskTypes.BUSINESS_DETAILS
       );
@@ -2822,7 +2794,7 @@ const useUnincorporatedPartnershipNavigation = ({ navigateTo }) => {
       return;
     }
     navigateTo(
-      (createdMember == null ? void 0 : createdMember.legalEntityType) === LegalEntityType.ORGANIZATION ? TaskTypes.UNINCORPORATED_PARTNERSHIP_MEMBER_COMPANY : TaskTypes.UNINCORPORATED_PARTNERSHIP_MEMBER_INDIVIDUAL
+      createdMember?.legalEntityType === LegalEntityType.ORGANIZATION ? TaskTypes.UNINCORPORATED_PARTNERSHIP_MEMBER_COMPANY : TaskTypes.UNINCORPORATED_PARTNERSHIP_MEMBER_INDIVIDUAL
     );
   };
   return {
@@ -2919,7 +2891,7 @@ function getUboStatus(roles, roleType, existingMember) {
   if (!existingMember) {
     return void 0;
   }
-  return (roles == null ? void 0 : roles.includes(roleType)) ? "yes" : "no";
+  return roles?.includes(roleType) ? "yes" : "no";
 }
 function UnincorporatedPartnershipRoleAndTypeDropin({
   onNavigateToMember,
@@ -2937,16 +2909,16 @@ function UnincorporatedPartnershipRoleAndTypeDropin({
     formName: form.formName,
     isValid: false
   }));
-  const existingMember = activeMember == null ? void 0 : activeMember.legalEntityId;
+  const existingMember = activeMember?.legalEntityId;
   const defaultData = {
-    entityType: activeMember == null ? void 0 : activeMember.legalEntityType,
+    entityType: activeMember?.legalEntityType,
     uboThroughControl: getUboStatus(
-      activeMember == null ? void 0 : activeMember.roles,
+      activeMember?.roles,
       UnincorporatedPartnershipMemberTypes.CONTROLLING_PERSON,
       existingMember
     ),
     uboThroughOwnership: getUboStatus(
-      activeMember == null ? void 0 : activeMember.roles,
+      activeMember?.roles,
       UnincorporatedPartnershipMemberTypes.OWNER,
       existingMember
     )
@@ -2988,7 +2960,7 @@ function UnincorporatedPartnershipRoleAndTypeDropin({
       FormNavigation,
       {
         forms: formsWithValidity,
-        activeForm: formsWithValidity.find((form) => form.formId === activeForm.formId) || (formsWithValidity == null ? void 0 : formsWithValidity[0]),
+        activeForm: formsWithValidity.find((form) => form.formId === activeForm.formId) || formsWithValidity?.[0],
         taskName: "unincorporatedPartnershipMembers",
         gotoForm: () => {
         }
@@ -3020,7 +2992,7 @@ function UnincorporatedPartnershipRoleAndTypeDropin({
                     ...childProps,
                     name: "entityType",
                     options: trustMemberLegalEntityTypes,
-                    selected: data == null ? void 0 : data.entityType,
+                    selected: data?.entityType,
                     onSelect: (option) => handleChangeFor("entityType")(option),
                     optionId: (option) => leTypeCardDetails[option].id,
                     optionName: (option) => leTypeCardDetails[option].name,
@@ -3040,7 +3012,7 @@ function UnincorporatedPartnershipRoleAndTypeDropin({
                   errors,
                   fieldProblems
                 ),
-                value: data == null ? void 0 : data.uboThroughOwnership
+                value: data?.uboThroughOwnership
               }
             ),
             schema.includes("uboThroughControl") && /* @__PURE__ */ jsx(
@@ -3053,7 +3025,7 @@ function UnincorporatedPartnershipRoleAndTypeDropin({
                   errors,
                   fieldProblems
                 ),
-                value: data == null ? void 0 : data.uboThroughControl
+                value: data?.uboThroughControl
               }
             )
           ] })
@@ -3087,10 +3059,7 @@ const alertHeader = "adyen-kyc-alert-header";
 const styles = {
   alertHeader
 };
-const isPrimaryPartner = (member) => {
-  var _a;
-  return (_a = member == null ? void 0 : member.roles) == null ? void 0 : _a.includes("primaryPartner");
-};
+const isPrimaryPartner = (member) => member?.roles?.includes("primaryPartner");
 const isMemberMissingOwner = (member) => {
   return !isPrimaryPartner(member) && member.legalEntityType === LegalEntityType.ORGANIZATION && !member.ownerId;
 };
@@ -3142,7 +3111,7 @@ const UnincorporatedPartnershipMembersOverview = ({
       const missingOwner = isMemberMissingOwner(member);
       baseActions.push({
         icon: missingOwner ? "plus" : "edit",
-        onSelect: () => navigateToEditMemberOwner(member == null ? void 0 : member.ownerId, member == null ? void 0 : member.legalEntityId),
+        onSelect: () => navigateToEditMemberOwner(member?.ownerId, member?.legalEntityId),
         label: i18n.get(missingOwner ? "addOwnerToTrustMember" : "editOwnerOfTrustMember", {
           values: { trustMember: member.name }
         })
@@ -3172,7 +3141,7 @@ const UnincorporatedPartnershipMembersOverview = ({
             onClick: (e) => {
               e.preventDefault();
               e.stopPropagation();
-              navigateToEditMemberOwner(member == null ? void 0 : member.ownerId, member == null ? void 0 : member.legalEntityId);
+              navigateToEditMemberOwner(member?.ownerId, member?.legalEntityId);
             },
             variant: "link",
             children: i18n.get("providePersonalDetailsOfOwner")
@@ -3261,7 +3230,7 @@ const useNavigation = ({ legalEntity, onNavigate }) => {
   const handleNavigation = useCallback(
     (task) => {
       userEvents.updateBaseTrackingPayload({ task });
-      onNavigate == null ? void 0 : onNavigate(task);
+      onNavigate?.(task);
     },
     [onNavigate]
   );
@@ -3286,11 +3255,11 @@ const useNavigation = ({ legalEntity, onNavigate }) => {
       }
       if (prevTask === TaskTypes.TASKS_OVERVIEW) {
         setTaskHistory([TaskTypes.TASKS_OVERVIEW]);
-        handleNavigation == null ? void 0 : handleNavigation(TaskTypes.TASKS_OVERVIEW);
+        handleNavigation?.(TaskTypes.TASKS_OVERVIEW);
         return;
       }
       setTaskHistory(taskHistory.slice(0, -1 * stepCount));
-      handleNavigation == null ? void 0 : handleNavigation(prevTask);
+      handleNavigation?.(prevTask);
       userEvents.updateBaseTrackingPayload({ task: prevTask });
     },
     [taskHistory, handleNavigation]
@@ -3360,79 +3329,78 @@ const getDefaultTask = ({
   return TaskTypes.TASKS_OVERVIEW;
 };
 const hasProgressedBeyondEntitySelection = (legalEntity) => {
-  var _a, _b;
-  const hasOwnEntityAssocation = (_a = legalEntity.entityAssociations) == null ? void 0 : _a.some(
+  const hasOwnEntityAssocation = legalEntity.entityAssociations?.some(
     (ea) => ea.associatorId === legalEntity.id
   );
-  const hasOrganizationType = (_b = legalEntity.organization) == null ? void 0 : _b.type;
+  const hasOrganizationType = legalEntity.organization?.type;
   return hasOwnEntityAssocation || !!hasOrganizationType;
 };
 const Introduction = lazy(
-  async () => (await import("./Introduction-DW2IQ57R.js")).Introduction
+  async () => (await import("./Introduction-erRXgreE.js")).Introduction
 );
 const BusinessTypeSelectionPage = lazy(
-  async () => (await import("./BusinessTypeSelectionPage-sfGqHnp6.js")).BusinessTypeSelectionPage
+  async () => (await import("./BusinessTypeSelectionPage-Cdp8joPJ.js")).BusinessTypeSelectionPage
 );
 const SingpassSelection = lazy(
-  async () => (await import("./SingpassSelection-D2Xe1wGv.js")).SingpassSelection
+  async () => (await import("./SingpassSelection-BWEJ3Yi-.js")).SingpassSelection
 );
 const AccountSetupRejected = lazy(
-  async () => (await import("./AccountSetupRejected-PdYyKwbS.js")).AccountSetupRejected
+  async () => (await import("./AccountSetupRejected-DHph9lFl.js")).AccountSetupRejected
 );
 const DecisionMakers = lazy(
-  async () => (await import("./DecisionMakers-D2TjKnOc.js")).DecisionMakers
+  async () => (await import("./DecisionMakers-CZ5-IRtU.js")).DecisionMakers
 );
 const CustomerSupport = lazy(
-  async () => (await import("./CustomerSupport-BER6nSK2.js")).CustomerSupport
+  async () => (await import("./CustomerSupport-NGBoBg3N.js")).CustomerSupport
 );
-const Review = lazy(async () => (await import("./Review-BFgzcIDj.js")).Review);
+const Review = lazy(async () => (await import("./Review-O6Al47Cu.js")).Review);
 const SignPCIComponent = lazy(
-  async () => (await import("./SignPCIComponent-D35913wJ.js")).SignPCIComponent
+  async () => (await import("./SignPCIComponent-cqRNhGdl.js")).SignPCIComponent
 );
 const AcceptTermsOfService = lazy(
-  async () => (await import("./AcceptTermsOfServiceComponent-Dh7RSJoE.js")).AcceptTermsOfServiceComponent
+  async () => (await import("./AcceptTermsOfServiceComponent-i222mdxX.js")).AcceptTermsOfServiceComponent
 );
 const TaxReportingDropin = lazy(
-  async () => (await import("./TaxReportingDropin-BLXgRbuR.js")).TaxReportingDropin
+  async () => (await import("./TaxReportingDropin-DFZ2ehfk.js")).TaxReportingDropin
 );
 const PayoutDetailsPage = lazy(
-  async () => (await import("./PayoutDetailsPage-BHNHaMbR.js")).PayoutDetailsPage
+  async () => (await import("./StoreProvider-ClKLaHzy.js").then((n) => n.eI)).PayoutDetailsPage
 );
 const RootBusinessDetailsPage = lazy(
-  async () => (await import("./RootBusinessDetailsPage-C6lHQShI.js")).RootBusinessDetailsPage
+  async () => (await import("./RootBusinessDetailsPage-q_6wAcer.js")).RootBusinessDetailsPage
 );
 const SoleProprietorshipPage = lazy(
-  async () => (await import("./SoleProprietorshipPage-D2F8Ghmo.js")).SoleProprietorshipPage
+  async () => (await import("./SoleProprietorshipPage-CRcJSpn9.js")).SoleProprietorshipPage
 );
 const TrustMemberCompanyPage = lazy(
-  async () => (await import("./TrustMemberCompanyPage-D0wTEhuh.js")).TrustMemberCompanyPage
+  async () => (await import("./TrustMemberCompanyPage-oLNhg0hg.js")).TrustMemberCompanyPage
 );
 const UnincorporatedPartnershipMemberCompanyPage = lazy(
-  async () => (await import("./UnincorporatedPartnershipMemberCompanyPage-CgujXwfX.js")).UnincorporatedPartnershipMemberCompanyPage
+  async () => (await import("./UnincorporatedPartnershipMemberCompanyPage-HUnc9g0g.js")).UnincorporatedPartnershipMemberCompanyPage
 );
 const BusinessFinancingPage = lazy(
-  async () => (await import("./BusinessFinancingPage-L1APYvzn.js")).BusinessFinancingPage
+  async () => (await import("./BusinessFinancingPage-BPD2cSDR.js")).BusinessFinancingPage
 );
 const TrustDetailsPage = lazy(
-  async () => (await import("./TrustDetailsPage-DVvGJ_Ta.js")).TrustDetailsPage
+  async () => (await import("./TrustDetailsPage-CGiiTbfR.js")).TrustDetailsPage
 );
 const SourceOfFundsPage = lazy(
-  async () => (await import("./SourceOfFundsPage-RjAcZ3Bo.js")).SourceOfFundsPage
+  async () => (await import("./SourceOfFundsPage-BxLGXTHb.js")).SourceOfFundsPage
 );
 const RootIndividualDetailsPage = lazy(
-  async () => (await import("./RootIndividualDetailsPage-DfpqHdAS.js")).RootIndividualDetailsPage
+  async () => (await import("./RootIndividualDetailsPage-CiXgSJsV.js")).RootIndividualDetailsPage
 );
 const LegalRepresentativeDetailsPage = lazy(
-  async () => (await import("./LegalRepresentativeDetailsPage-BfIDXqv1.js")).LegalRepresentativeDetailsPage
+  async () => (await import("./LegalRepresentativeDetailsPage-rS5K4657.js")).LegalRepresentativeDetailsPage
 );
 const TrustMemberIndividualPage = lazy(
-  async () => (await import("./TrustMemberIndividualPage-BLuaBi3j.js")).TrustMemberIndividualPage
+  async () => (await import("./TrustMemberIndividualPage-Bgsis586.js")).TrustMemberIndividualPage
 );
 const UnincorporatedPartnershipIndividualPage = lazy(
-  async () => (await import("./UnincorporatedPartnershipIndividualPage-BhIihH2v.js")).UnincorporatedPartnershipIndividualPage
+  async () => (await import("./UnincorporatedPartnershipIndividualPage-DPE3grqL.js")).UnincorporatedPartnershipIndividualPage
 );
 const DecisionMakerDetailsPage = lazy(
-  async () => (await import("./DecisionMakerDetailsPage-DgjlfKyP.js")).DecisionMakerDetailsPage
+  async () => (await import("./DecisionMakerDetailsPage-BN-H1sJF.js")).DecisionMakerDetailsPage
 );
 const PAGES_WITH_POLLING = [TaskTypes.DECISION_MAKER_OVERVIEW, TaskTypes.TASKS_OVERVIEW];
 const logger = createLogger();
@@ -3442,7 +3410,6 @@ function DropinComposer({
   onNavigate = noop,
   openBankingPartnerConfigId
 }) {
-  var _a;
   const { accountHolder, setAccountHolder } = useAccountHolder();
   const { setCanSeeEntitySelection } = useCanSeeEntitySelection(legalEntityResponse.id);
   const userEvents = useAnalyticsContext();
@@ -3470,10 +3437,7 @@ function DropinComposer({
   const taskTypes = taskTypesSignal.value;
   const { data: rawTaskTypes, isLoading: isLoadingConfiguration } = useTaskTypes();
   useEffect(() => {
-    const taskListWithoutCompany = rawTaskTypes == null ? void 0 : rawTaskTypes.map(
-      (item) => item === "COMPANY" ? TaskTypes.BUSINESS_DETAILS : item
-    );
-    if (rawTaskTypes) setTaskTypes(taskListWithoutCompany);
+    if (rawTaskTypes) setTaskTypes(rawTaskTypes);
   }, [rawTaskTypes, setTaskTypes]);
   const { data: legalEntityData, refetch: refetchLegalEntity } = useLegalEntity(
     legalEntityResponse.id,
@@ -3539,7 +3503,6 @@ function DropinComposer({
     navigateTo
   });
   const handleSingpassSelectionNextClick = async (method) => {
-    var _a2;
     if (method === "singpass") {
       try {
         const authUrl = await handleInitiateSingpassMyInfoLogin();
@@ -3548,7 +3511,7 @@ function DropinComposer({
         }
         setHasSeenSingpassSelection(true);
         singpassTabRef.current = window.open(authUrl, "_blank");
-        (_a2 = singpassTabRef.current) == null ? void 0 : _a2.focus();
+        singpassTabRef.current?.focus();
       } catch (e) {
         logger.error(e);
         if (typeof e === "string") handleSingpassMyInfoLoginFailure(e);
@@ -3601,7 +3564,7 @@ function DropinComposer({
     }
   };
   const handleOnSubmit = async (data, backStepCount) => {
-    onSubmit == null ? void 0 : onSubmit(data);
+    onSubmit?.(data);
     await refetchLegalEntity();
     navigateBack(backStepCount);
   };
@@ -3639,29 +3602,27 @@ function DropinComposer({
         handleSingpassMyInfoLoginReset();
       },
       onClick: async () => {
-        var _a2;
         try {
           const authUrl = await handleInitiateSingpassMyInfoLogin();
           singpassTabRef.current = window.open(authUrl);
-          (_a2 = singpassTabRef.current) == null ? void 0 : _a2.focus();
+          singpassTabRef.current?.focus();
         } catch (e) {
           logger.error(e);
           if (typeof e === "string") handleSingpassMyInfoLoginFailure(e);
         }
       },
       onMessage: async ({ data: { isSuccessful } }) => {
-        var _a2;
         if (isSuccessful) {
           handleSingpassMyInfoLoginSuccess();
           await refetchLegalEntity();
-          (_a2 = singpassTabRef.current) == null ? void 0 : _a2.close();
+          singpassTabRef.current?.close();
         } else {
           handleSingpassMyInfoLoginFailure(
             legalEntityResponse.type === LegalEntityType.INDIVIDUAL ? "weCouldntConnectToMyinfo" : "weCouldntConnectToMyinfoBusiness"
           );
         }
       },
-      legalEntityType: legalEntityResponse == null ? void 0 : legalEntityResponse.type
+      legalEntityType: legalEntityResponse?.type
     }
   ) : void 0;
   if (isLoadingConfiguration) {
@@ -3669,7 +3630,7 @@ function DropinComposer({
   }
   switch (currentTask) {
     case TaskTypes.BUSINESS_TYPE_SELECTION:
-      return /* @__PURE__ */ jsx("div", { className: "adyen-kyc-u-display-flex adyen-kyc-u-justify-content-center antonio", children: /* @__PURE__ */ jsx(Suspense, { fallback: /* @__PURE__ */ jsx(Loader, {}), children: /* @__PURE__ */ jsx(
+      return /* @__PURE__ */ jsx("div", { className: "adyen-kyc-u-display-flex adyen-kyc-u-justify-content-center", children: /* @__PURE__ */ jsx(Suspense, { fallback: /* @__PURE__ */ jsx(Loader, {}), children: /* @__PURE__ */ jsx(
         BusinessTypeSelectionPage,
         {
           onComplete: async (newAccountHolder) => {
@@ -3722,7 +3683,7 @@ function DropinComposer({
         RootIndividualDetailsPage,
         {
           onSubmit: async (data) => {
-            onSubmit == null ? void 0 : onSubmit(data);
+            onSubmit?.(data);
             await refetchLegalEntity();
             navigateTo(TaskTypes.TASKS_OVERVIEW);
             setTargetLegalEntityType(void 0);
@@ -3747,13 +3708,13 @@ function DropinComposer({
       return /* @__PURE__ */ jsx(Suspense, { fallback: /* @__PURE__ */ jsx(Loader, {}), children: /* @__PURE__ */ jsx(
         DecisionMakerDetailsPage,
         {
-          decisionMakerId: currentDecisionMaker == null ? void 0 : currentDecisionMaker.id,
+          decisionMakerId: currentDecisionMaker?.id,
           parentCompanyId: parentId,
           onSubmit: handleOnSubmit,
           handleHomeClick: navigateBack,
           trustedFields: singpassTrustedFields,
           trustedFieldsProvider: isEligibleForSingpass ? TrustedFieldsProvider.SINGPASS : void 0,
-          trustedRoles: ((_a = trustedEntityAssociations.find((ea) => ea.reference === (currentDecisionMaker == null ? void 0 : currentDecisionMaker.id))) == null ? void 0 : _a.types) || []
+          trustedRoles: trustedEntityAssociations.find((ea) => ea.reference === currentDecisionMaker?.id)?.types || []
         }
       ) });
     case TaskTypes.TRUST_MEMBER_COMPANY_OWNER:
@@ -3774,9 +3735,9 @@ function DropinComposer({
       return /* @__PURE__ */ jsx(Suspense, { fallback: /* @__PURE__ */ jsx(Loader, {}), children: /* @__PURE__ */ jsx(
         TrustMemberIndividualPage,
         {
-          memberId: currentTrustMemberLe == null ? void 0 : currentTrustMemberLe.id,
+          memberId: currentTrustMemberLe?.id,
           trustId: trust.id,
-          newMember: (trustMember == null ? void 0 : trustMember.legalEntityId) === isNewEntity ? trustMember : void 0,
+          newMember: trustMember?.legalEntityId === isNewEntity ? trustMember : void 0,
           onSubmit: (data) => handleOnSubmit(data, 2),
           handleBackClick: navigateBack,
           handleHomeClick: () => navigateTo(TaskTypes.TRUST_MEMBER_OVERVIEW)
@@ -3787,7 +3748,7 @@ function DropinComposer({
         RootBusinessDetailsPage,
         {
           onSubmit: async (data) => {
-            onSubmit == null ? void 0 : onSubmit(data);
+            onSubmit?.(data);
             await refetchLegalEntity();
             navigateTo(TaskTypes.TASKS_OVERVIEW);
             setTargetLegalEntityType(void 0);
@@ -3801,8 +3762,8 @@ function DropinComposer({
         TrustMemberCompanyPage,
         {
           trustId: trust.id,
-          trustMemberCompanyId: currentTrustMemberLe == null ? void 0 : currentTrustMemberLe.id,
-          newMember: (trustMember == null ? void 0 : trustMember.legalEntityId) === isNewEntity ? trustMember : void 0,
+          trustMemberCompanyId: currentTrustMemberLe?.id,
+          newMember: trustMember?.legalEntityId === isNewEntity ? trustMember : void 0,
           onSubmit: (data) => handleOnSubmit(data, 2),
           handleHomeClick: navigateBack,
           isTargetLegalEntityType: targetLegalEntityType === LegalEntityType.ORGANIZATION
@@ -3826,7 +3787,7 @@ function DropinComposer({
         TrustDetailsPage,
         {
           taskType: TaskTypes.TRUST,
-          trustId: trust == null ? void 0 : trust.id,
+          trustId: trust?.id,
           onSubmit: (data) => handleOnSubmit(data, 1),
           handleHomeClick: navigateBack
         }
@@ -3849,7 +3810,7 @@ function DropinComposer({
         TrustMemberRoleAndTypePage,
         {
           trustId: trust.id,
-          memberId: currentTrustMemberLe == null ? void 0 : currentTrustMemberLe.id,
+          memberId: currentTrustMemberLe?.id,
           navigateToFullDropinFor: onNavigateToTrustMemberEditDetails,
           navigateBack: async () => {
             await refetchTrust();
@@ -3862,7 +3823,7 @@ function DropinComposer({
         TrustDetailsPage,
         {
           taskType: TaskTypes.UNINCORPORATED_PARTNERSHIP,
-          trustId: unincorporatedPartnership == null ? void 0 : unincorporatedPartnership.id,
+          trustId: unincorporatedPartnership?.id,
           onSubmit: (data) => handleOnSubmit(data, 1),
           handleHomeClick: navigateBack
         }
@@ -3874,8 +3835,8 @@ function DropinComposer({
           navigateBackToTaskList: navigateBack,
           navigateToEditMember: (member) => onNavigateToMember({
             selectedMember: member,
-            selectedEntityType: member == null ? void 0 : member.legalEntityType,
-            selectedRoles: member == null ? void 0 : member.roles,
+            selectedEntityType: member?.legalEntityType,
+            selectedRoles: member?.roles,
             roleAndType: true
           }),
           navigateToEditMemberOwner: (memberOwnerId, memberId) => {
@@ -3893,10 +3854,10 @@ function DropinComposer({
         UnincorporatedPartnershipMemberCompanyPage,
         {
           partnershipId: unincorporatedPartnership.id,
-          partnershipMemberCompanyId: unincorporatedPartnershipMember == null ? void 0 : unincorporatedPartnershipMember.legalEntityId,
+          partnershipMemberCompanyId: unincorporatedPartnershipMember?.legalEntityId,
           newMember: (
             // empty string for legalEntityId means it's a new member
-            (unincorporatedPartnershipMember == null ? void 0 : unincorporatedPartnershipMember.legalEntityId) === "" ? unincorporatedPartnershipMember : void 0
+            unincorporatedPartnershipMember?.legalEntityId === "" ? unincorporatedPartnershipMember : void 0
           ),
           onSubmit: (data) => handleOnSubmit(data, 2),
           handleHomeClick: navigateBack,
@@ -3908,7 +3869,7 @@ function DropinComposer({
         DecisionMakerDetailsPage,
         {
           taskType: TaskTypes.UNINCORPORATED_PARTNERSHIP_MEMBER_COMPANY_OWNER,
-          parentCompanyId: unincorporatedPartnershipMember == null ? void 0 : unincorporatedPartnershipMember.legalEntityId,
+          parentCompanyId: unincorporatedPartnershipMember?.legalEntityId,
           decisionMakerId: currentDecisionMakerId,
           onSubmit: async (data) => {
             await handleOnSubmit(data);
@@ -3921,7 +3882,7 @@ function DropinComposer({
       return /* @__PURE__ */ jsx(Suspense, { fallback: /* @__PURE__ */ jsx(Loader, {}), children: /* @__PURE__ */ jsx(
         UnincorporatedPartnershipIndividualPage,
         {
-          memberId: unincorporatedPartnershipMember == null ? void 0 : unincorporatedPartnershipMember.legalEntityId,
+          memberId: unincorporatedPartnershipMember?.legalEntityId,
           partnershipId: unincorporatedPartnership.id,
           member: unincorporatedPartnershipMember,
           onSubmit: (data) => {
@@ -3936,7 +3897,7 @@ function DropinComposer({
       return /* @__PURE__ */ jsx(
         UnincorporatedPartnershipMemberRoleAndTypePage,
         {
-          memberId: unincorporatedPartnershipMember == null ? void 0 : unincorporatedPartnershipMember.legalEntityId,
+          memberId: unincorporatedPartnershipMember?.legalEntityId,
           onNavigateToMember,
           navigateBack: async () => {
             await refetchUnincorporatedPartnership();
@@ -3950,7 +3911,7 @@ function DropinComposer({
       return /* @__PURE__ */ jsx(Suspense, { fallback: /* @__PURE__ */ jsx(Loader, {}), children: /* @__PURE__ */ jsx(
         SoleProprietorshipPage,
         {
-          solePropId: soleProp == null ? void 0 : soleProp.id,
+          solePropId: soleProp?.id,
           onSubmit: (data) => handleOnSubmit(data, 1),
           handleHomeClick: navigateBack,
           isTargetLegalEntityType: targetLegalEntityType === LegalEntityType.ORGANIZATION
@@ -3972,7 +3933,7 @@ function DropinComposer({
       return /* @__PURE__ */ jsx(Suspense, { fallback: /* @__PURE__ */ jsx(Loader, {}), children: /* @__PURE__ */ jsx(
         LegalRepresentativeDetailsPage,
         {
-          legalRepresentativeId: associatedLegalRepresentative == null ? void 0 : associatedLegalRepresentative.id,
+          legalRepresentativeId: associatedLegalRepresentative?.id,
           onSubmit: handleOnSubmit,
           handleHomeClick: navigateBack
         }
@@ -3990,7 +3951,7 @@ function DropinComposer({
         BusinessFinancingPage,
         {
           onSubmit: async (data) => {
-            onSubmit == null ? void 0 : onSubmit(data);
+            onSubmit?.(data);
             await refetchLegalEntity();
             navigateTo(TaskTypes.TASKS_OVERVIEW);
           },
@@ -4024,9 +3985,9 @@ export {
   EntityGuidanceStatus as E,
   OnboardingDropinComponent as O,
   useLegalEntityType as a,
-  useDataMissingRemediations as b,
-  EntityAssociation as c,
-  allowIndividualWithoutSoleProp as d,
+  allowIndividualWithoutSoleProp as b,
+  useDataMissingRemediations as c,
+  EntityAssociation as d,
   useTrustMembers as e,
   iconStatus as i,
   normalizedTaskStatusStore as n,