@adyen/kyc-components 3.19.0 → 3.19.2

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

@@ -856,7 +856,9 @@ const addresses = "Addresses";
 const loading = "Loading";
 const businessIncorporationNumber = "Business incorporation number";
 const doNotHaveBusinessIncorporationNumber = "I do not have a Business incorporation number";
+const retrieveMyInfo = "Retrieve Myinfo";
 const retrieveMyInfoBusiness = "Retrieve Myinfo business";
+const getYourVerifiedDetailsInstantly = "Get your verified details instantly and skip uploading documents.";
 const getYourBusinessVerifiedDetails = "Get your business's verified details instantly and skip uploading documents.";
 const enterTheDetailsYourself = "Enter the details yourself";
 const youAlsoHaveToUploadSomeSupportingDocuments = "You'll also have to upload some supporting documents.";
@@ -937,6 +939,7 @@ const taxInformationNumber = "Tax Identification Number";
 const taxInformationNumber__HK = "Business Registration number (BRN)";
 const stockExchangeMIC = "Market Identifier Code (MIC)";
 const stockISIN = "International Securities Identification Number (ISIN)";
+const stockTickerSymbol = "Stock ticker symbol";
 const companyLookupResultsHeader = "Let's find your company";
 const companyLookupResultsHeader__searching = "Searching for companies...";
 const companyLookupResultsHeader__verifying = "Verifying company selection...";
@@ -1324,8 +1327,9 @@ const onboardingRedirectOpenError = "Pop-up blocker prevented redirecting, pleas
 const forExample_ = "For example: %{examples}";
 const failToLaunchSingpass = "failed to launch Singpass";
 const retrieveMyinfoBusinessWith = "Retrieve Myinfo business with";
+const retrieveMyinfoWith = "Retrieve Myinfo with";
 const getSetUpInstantly = "Get set up instantly";
-const MyInfoBusinessYouCanGetVerifiedDetails = "With Myinfo business, you can get your business's verified details instantly and skip uploading documents.";
+const myInfoBusinessYouCanGetVerifiedDetails = "With Myinfo business, you can get your business's verified details instantly and skip uploading documents.";
 const addBankDetails = "Add bank details";
 const addMissingBankDetails = "We are missing your bank details in order to perform payouts, please add your bank account.";
 const bankDetails = "Bank details";
@@ -1339,6 +1343,7 @@ const missingDetailsToPerformPayouts = "We are missing some details in order to
 const completeAddingAccount = "Complete adding account";
 const removeThisBankAccount = "Remove this bank account";
 const editDetails = "Edit details";
+const myInfoYouCanGetVerifiedDetails = "With Myinfo, you can get your verified details instantly and skip uploading documents.";
 const sessionTimeout = "Session timeout";
 const thisSessionWillExpireIn = "This session will expire in %{timeUntilExpiry}. Continue working to avoid losing any unsaved data.";
 const xMinutes = "%{minutes} minutes";
@@ -2183,7 +2188,9 @@ const defaultTrans = {
   loading,
   businessIncorporationNumber,
   doNotHaveBusinessIncorporationNumber,
+  retrieveMyInfo,
   retrieveMyInfoBusiness,
+  getYourVerifiedDetailsInstantly,
   getYourBusinessVerifiedDetails,
   enterTheDetailsYourself,
   youAlsoHaveToUploadSomeSupportingDocuments,
@@ -2264,6 +2271,7 @@ const defaultTrans = {
   taxInformationNumber__HK,
   stockExchangeMIC,
   stockISIN,
+  stockTickerSymbol,
   companyLookupResultsHeader,
   companyLookupResultsHeader__searching,
   companyLookupResultsHeader__verifying,
@@ -2651,8 +2659,9 @@ const defaultTrans = {
   forExample_,
   failToLaunchSingpass,
   retrieveMyinfoBusinessWith,
+  retrieveMyinfoWith,
   getSetUpInstantly,
-  MyInfoBusinessYouCanGetVerifiedDetails,
+  myInfoBusinessYouCanGetVerifiedDetails,
   addBankDetails,
   addMissingBankDetails,
   bankDetails,
@@ -2666,6 +2675,7 @@ const defaultTrans = {
   completeAddingAccount,
   removeThisBankAccount,
   editDetails,
+  myInfoYouCanGetVerifiedDetails,
   sessionTimeout,
   thisSessionWillExpireIn,
   xMinutes,
@@ -3538,6 +3548,49 @@ function getFormProps(props, innerFormId) {
     shouldValidate: (activeFormId ? activeFormId === innerFormId : true) && props.shouldValidate
   };
 }
+function removeFormLayer(obj, formId) {
+  if (!obj) {
+    return obj;
+  }
+  const formIdWithDelimiter = `${formId}.`;
+  return Object.entries(obj).reduce((acc, [key, value]) => {
+    const newKey = key.startsWith(formIdWithDelimiter) ? key.substring(formIdWithDelimiter.length, key.length) : key;
+    return {
+      ...acc,
+      [newKey]: value
+    };
+  }, {});
+}
+function getNestedOuterFormPropsFromOuterFormProps(props, innerFormId) {
+  const newProps = getFormProps(props, innerFormId);
+  if (newProps === null) {
+    return null;
+  }
+  const {
+    placeholders,
+    labels: labels2,
+    data,
+    helperText,
+    masks
+  } = newProps;
+  return {
+    placeholders,
+    labels: labels2,
+    data,
+    helperText,
+    masks,
+    // maintain the structure of the special fields
+    readOnlyFields: removeFormLayer(props.readOnlyFields, innerFormId),
+    requiredFields: removeFormLayer(props.requiredFields, innerFormId),
+    optionalFields: removeFormLayer(props.optionalFields, innerFormId),
+    obscuredFields: removeFormLayer(props.obscuredFields, innerFormId),
+    verifyFields: removeFormLayer(props.verifyFields, innerFormId),
+    // the rest we just pass along for now, as they will be eventually be processed by getFormProps
+    problems: props.problems,
+    validators: props.validators,
+    shouldValidate: props.shouldValidate
+  };
+}
 function getFieldProps(props, innerFormFields) {
   if (innerFormFields) {
     const nestedFormProps = {
@@ -7823,20 +7876,21 @@ const Accordion = ({
   };
   return jsxs("details", {
     onToggle: handleToggle,
-    className,
+    className: cx(className, "adyen-kyc-accordion__details"),
     children: [jsxs("summary", {
+      className: "adyen-kyc-accordion__summary",
       role: "button",
       children: [expandOnLeft && jsx("img", {
-        className: "arrow",
+        className: "adyen-kyc-accordion__arrow",
         src: ChevronDownIcon,
         alt: ""
       }), icon, title, !expandOnLeft && jsx("img", {
-        className: "arrow arrow-right",
+        className: "adyen-kyc-accordion__arrow adyen-kyc-accordion__arrow--right",
         src: ChevronDownIcon,
         alt: ""
       })]
     }), jsx("section", {
-      className: "content",
+      className: "adyen-kyc-accordion__content",
       children
     })]
   });
@@ -8001,6 +8055,54 @@ const stockISINFieldMetadata = {
     }
   }
 };
+const STOCK_TICKER_SYMBOL_FIELD = ["stockTickerSymbol"];
+function StockTickerSymbolField({
+  data,
+  valid,
+  errors,
+  labels: labels2,
+  placeholders,
+  readonly,
+  mask,
+  guidanceText,
+  handleChangeFor
+}) {
+  return jsx(MaskedInputText, {
+    name: "stockTickerSymbol",
+    label: labels2.stockTickerSymbol ?? "",
+    formatGuidance: guidanceText == null ? void 0 : guidanceText.stockTickerSymbol,
+    placeholder: placeholders == null ? void 0 : placeholders.stockTickerSymbol,
+    ...mask,
+    classNameModifiers: {
+      field: ["stockTickerSymbol"],
+      input: ["stockTickerSymbol"]
+    },
+    errorMessage: errors.stockTickerSymbol,
+    isValid: valid.stockTickerSymbol ?? false,
+    value: data.stockTickerSymbol ?? "",
+    readonly,
+    onInput: handleChangeFor("stockTickerSymbol", "input"),
+    onBlur: handleChangeFor("stockTickerSymbol", "blur"),
+    "aria-required": true,
+    "aria-label": labels2.stockTickerSymbol,
+    "aria-invalid": !valid.stockTickerSymbol
+  });
+}
+const stockTickerSymbolFieldMetadata = {
+  label: "stockTickerSymbol",
+  validators: [validatePatternOnBlur(/^[A-Z\d]{1,5}$/)],
+  mask: {
+    mask: makeMask(...alphanumericInputs(1), ...alphanumericInputs(4)),
+    transformOnType: uppercase
+  },
+  guidanceText: {
+    key: "enterAMaximumOfNCharactersForExample",
+    values: {
+      maxChars: "5",
+      example: "ADYEN"
+    }
+  }
+};
 const defaultFieldMetadata$7 = {
   label: "taxId"
 };
@@ -9103,6 +9205,7 @@ var ExperimentNames = /* @__PURE__ */ ((ExperimentNames2) => {
   ExperimentNames2["AllowMoreRolesForMainRootTrustee"] = "AllowMoreRolesForMainRootTrustee";
   ExperimentNames2["ShowUnsupportedEntityType"] = "ShowUnsupportedEntityType";
   ExperimentNames2["ShowSingPassButtonForCompanies"] = "ShowSingPassButtonForCompanies";
+  ExperimentNames2["ShowSingPassButtonForIndividuals"] = "ShowSingPassButtonForIndividuals";
   ExperimentNames2["ShowExtraTaxExemptionReasons"] = "ShowExtraTaxExemptionReasons";
   ExperimentNames2["EnableCountryOfGoverningLawForUKCompanies"] = "EnableCountryOfGoverningLawForUKCompanies";
   ExperimentNames2["HidePayoutAccountTask"] = "HidePayoutAccountTask";
@@ -9299,7 +9402,7 @@ const FLOWS_THAT_HIDE_REGISTRATION_NUMBER = [{
   companyType: [CompanyTypesValue.SOLE_PROPRIETORSHIP],
   country: CountryCodes.PuertoRico
 }];
-const companyRegistrationDetailsFields = ["tradingName", "sameNameAsLegalName", ...businessRegistrationNumberFields, "stockExchangeMIC", "stockISIN", ...vatNumberFields, ...taxIdFields, "dateOfIncorporation"];
+const companyRegistrationDetailsFields = ["tradingName", "sameNameAsLegalName", ...businessRegistrationNumberFields, "stockExchangeMIC", "stockISIN", "stockTickerSymbol", ...vatNumberFields, ...taxIdFields, "dateOfIncorporation"];
 function CompanyRegistrationDetailsComponent(props) {
   var _a, _b;
   const {
@@ -9308,13 +9411,14 @@ function CompanyRegistrationDetailsComponent(props) {
   let mergedProps = props;
   mergedProps = mergeFieldMetadataIntoProps("stockExchangeMIC", stockExchangeMICFieldMetadata, mergedProps);
   mergedProps = mergeFieldMetadataIntoProps("stockISIN", stockISINFieldMetadata, mergedProps);
+  mergedProps = mergeFieldMetadataIntoProps("stockTickerSymbol", stockTickerSymbolFieldMetadata, mergedProps);
   const hideOptionalRegistrationNumberField = FLOWS_THAT_HIDE_REGISTRATION_NUMBER.some((f) => f.country === mergedProps.country && f.companyType.includes(mergedProps.companyType));
   const stateRef = useRef({
     setState: null
   });
   const COMPANY_REGISTRATION_DETAILS = mergedProps.id;
   const requiredFields = mergedProps.requiredFields || companyRegistrationDetailsFields;
-  const directChildFields = requiredFields.filter((field) => ["tradingName", "sameNameAsLegalName", "stockExchangeMIC", "stockISIN", "dateOfIncorporation"].includes(field));
+  const directChildFields = requiredFields.filter((field) => ["tradingName", "sameNameAsLegalName", "stockExchangeMIC", "stockISIN", "stockTickerSymbol", "dateOfIncorporation"].includes(field));
   const {
     getData
   } = useStateContext();
@@ -9484,6 +9588,16 @@ function CompanyRegistrationDetailsComponent(props) {
         guidanceText: formUtils.getFieldGuidanceText(STOCK_ISIN_FIELD),
         readonly: formUtils.isReadOnly("stockISIN"),
         handleChangeFor
+      }), formUtils.isRequiredField("stockTickerSymbol") && jsx(StockTickerSymbolField, {
+        data: formUtils.getFieldData(data, STOCK_TICKER_SYMBOL_FIELD),
+        valid: formUtils.getFieldValid(valid, STOCK_TICKER_SYMBOL_FIELD),
+        errors: formUtils.getFieldErrors(errors, fieldProblems, STOCK_TICKER_SYMBOL_FIELD),
+        labels: formUtils.getFieldLabels(STOCK_TICKER_SYMBOL_FIELD),
+        placeholders: formUtils.getFieldPlaceholders(STOCK_TICKER_SYMBOL_FIELD),
+        mask: formUtils.getMask("stockTickerSymbol"),
+        guidanceText: formUtils.getFieldGuidanceText(STOCK_TICKER_SYMBOL_FIELD),
+        readonly: formUtils.isReadOnly("stockTickerSymbol"),
+        handleChangeFor
       }), formUtils.isRequiredField("registrationNumber", !hideOptionalRegistrationNumberField) && jsx(BusinessRegistrationNumber, {
         ...registrationNumberProps,
         companyType: mergedProps.companyType,
@@ -9553,10 +9667,13 @@ const companyBase = {
     rule: "REQUIRED"
   },
   stockExchangeMIC: {
-    rule: "stockExchangeMICIfTypePublic"
+    rule: "ifPubliclyTradedCompany"
   },
   stockISIN: {
-    rule: "stockISINIfTypePublic"
+    rule: "ifPubliclyTradedCompany"
+  },
+  stockTickerSymbol: {
+    rule: "ifPubliclyTradedCompany"
   },
   tradingName: {
     rule: "REQUIRED"
@@ -9606,10 +9723,13 @@ const companySearchBase = {
     rule: "countryRequiresStateOrProvince"
   },
   stockExchangeMIC: {
-    rule: "stockExchangeMICIfTypePublic"
+    rule: "ifPubliclyTradedCompany"
   },
   stockISIN: {
-    rule: "stockISINIfTypePublic"
+    rule: "ifPubliclyTradedCompany"
+  },
+  stockTickerSymbol: {
+    rule: "ifPubliclyTradedCompany"
   },
   dateOfIncorporation: {
     rule: "countryRequiresDateOfIncorporationForCompanies"
@@ -9653,10 +9773,13 @@ const businessDetailsBase = {
     rule: "countryRequiresStateOrProvince"
   },
   stockExchangeMIC: {
-    rule: "stockExchangeMICIfTypePublic"
+    rule: "ifPubliclyTradedCompany"
   },
   stockISIN: {
-    rule: "stockISINIfTypePublic"
+    rule: "ifPubliclyTradedCompany"
+  },
+  stockTickerSymbol: {
+    rule: "ifPubliclyTradedCompany"
   },
   dateOfIncorporation: {
     rule: "countryRequiresDateOfIncorporationForCompanies"
@@ -10250,12 +10373,6 @@ const EntityTypeSelectionRadioCardBody = ({
     })]
   });
 };
-const CoreContext = createContext(void 0);
-const useCoreContext = () => {
-  const context = useContext(CoreContext);
-  if (!context) throw Error("You need a <CoreProvider> to use core context");
-  return context;
-};
 var TrustMemberTypes = /* @__PURE__ */ ((TrustMemberTypes2) => {
   TrustMemberTypes2["DEFINED_BENEFICIARY"] = "definedBeneficiary";
   TrustMemberTypes2["UNDEFINED_BENEFICIARY"] = "undefinedBeneficiary";
@@ -10681,9 +10798,6 @@ function AccountHolder(props) {
     dataStoreId,
     capabilities
   } = props;
-  const {
-    setAccountHolder
-  } = useCoreContext();
   const {
     isSettingEnabled
   } = useSettingsContext();
@@ -10732,9 +10846,6 @@ function AccountHolder(props) {
         dataStoreId
       }
     });
-    if (data == null ? void 0 : data.accountHolder) {
-      setAccountHolder(data.accountHolder);
-    }
   }, [data, errors, valid, dataStoreId]);
   const formUtils = formUtilities(props, i18n);
   const questionLabel = i18n.get("nameOfBankAccountHolder");
@@ -12359,6 +12470,7 @@ function Address(props) {
       maxlength: getMaxLengthByFieldAndCountry(countrySpecificFormatters, fieldName, data.country),
       hideField,
       "aria-label": formUtils.getLabel(fieldName, fieldName),
+      readOnly: formUtils.isReadOnly(fieldName),
       trimOnBlur: true
     }, fieldName);
   };
@@ -12486,16 +12598,22 @@ function RegistrationAddressComponent(props) {
   } = useI18nContext();
   const {
     id: id2,
-    data,
-    country: country2,
-    validators,
     heading,
     description: description2,
     handleAddressSearch,
     handleFindAddress,
-    optionalFields,
+    country: country2,
+    data,
+    validators,
     kompanyAddress
   } = props;
+  const {
+    requiredFields: registrationAddressRequiredFields,
+    optionalFields: registrationAddressOptionalFields,
+    readOnlyFields: registrationAddressReadOnlyFields,
+    obscuredFields: registrationAddressObscuredFields,
+    verifyFields: registrationAddressVerifyFields
+  } = getFormProps(props, props.id);
   const {
     data: formData,
     valid: formValid,
@@ -12508,9 +12626,17 @@ function RegistrationAddressComponent(props) {
     defaultData: data,
     rules: validators || registrationAddressValidationRules,
     obscuredFields: [],
-    optionalFields
+    optionalFields: registrationAddressOptionalFields
   });
-  const formUtils = formUtilities(props, i18n);
+  const mergedProps = {
+    ...props,
+    requiredFields: registrationAddressRequiredFields,
+    optionalFields: registrationAddressOptionalFields,
+    readOnlyFields: registrationAddressReadOnlyFields,
+    obscuredFields: registrationAddressObscuredFields,
+    verifyFields: registrationAddressVerifyFields
+  };
+  const formUtils = formUtilities(mergedProps, i18n);
   const stateRef = useRef({
     setState: null
   });
@@ -12540,8 +12666,8 @@ function RegistrationAddressComponent(props) {
       heading,
       description: description2
     }), jsx(ErrorPanel, {
-      verificationErrors: id2 ? (_b = (_a = props == null ? void 0 : props.problems) == null ? void 0 : _a.verificationErrors) == null ? void 0 : _b[id2] : void 0,
-      validationErrors: id2 ? (_d = (_c = props == null ? void 0 : props.problems) == null ? void 0 : _c.validationErrors) == null ? void 0 : _d[id2] : void 0,
+      verificationErrors: id2 ? (_b = (_a = props.problems) == null ? void 0 : _a.verificationErrors) == null ? void 0 : _b[id2] : void 0,
+      validationErrors: id2 ? (_d = (_c = props.problems) == null ? void 0 : _c.validationErrors) == null ? void 0 : _d[id2] : void 0,
       formUtils,
       id: "ariaErrorField"
     }), jsx(ContextGuidance, {
@@ -12916,7 +13042,7 @@ function CompanyComponent(props) {
   const companyNameAndCountryFormProps = getFormProps(props, CompanyNameAndCountryFormID);
   const companyTypeFormProps = getFormProps(props, CompanyTypeFormID);
   const companyRegistrationDetailsFormProps = getFormProps(props, CompanyRegistrationDetailsFormID);
-  const companyRegistrationAddressFormProps = getFormProps(props, CompanyRegistrationAddressFormID);
+  const companyRegistrationAddressFormProps = getNestedOuterFormPropsFromOuterFormProps(props, CompanyRegistrationAddressFormID);
   const companyRegistrationDocumentFormProps = getFormProps(props, CompanyRegistrationDocumentFormID);
   const companyTaxDocumentFormProps = getFormProps(props, CompanyTaxDocumentFormID);
   const handleStateChange = ({
@@ -13220,16 +13346,7 @@ const rules$2 = ({
       return "REQUIRED";
     }
   },
-  stockExchangeMICIfTypePublic: () => {
-    var _a, _b;
-    if ("companyType" in data && ((_a = data.companyType) == null ? void 0 : _a.entityType) === CompanyTypesValue.PUBLIC_COMPANY) {
-      return "REQUIRED";
-    }
-    if ("companyStructure" in data && ((_b = data.companyStructure) == null ? void 0 : _b.entityType) === CompanyTypesValue.PUBLIC_COMPANY) {
-      return "REQUIRED";
-    }
-  },
-  stockISINIfTypePublic: () => {
+  ifPubliclyTradedCompany: () => {
     var _a, _b;
     if ("companyType" in data && ((_a = data.companyType) == null ? void 0 : _a.entityType) === CompanyTypesValue.PUBLIC_COMPANY) {
       return "REQUIRED";
@@ -13556,6 +13673,7 @@ const businessDetailsBaseMapping = {
   "additionalInformation.isUen": "organization.isUen",
   "additionalInformation.stockExchangeMIC": "organization.stockData.marketIdentifier",
   "additionalInformation.stockISIN": "organization.stockData.stockNumber",
+  "additionalInformation.stockTickerSymbol": "organization.stockData.tickerSymbol",
   "companyRegistrationAddress.registrationAddress.city": "organization.registeredAddress.city",
   "companyRegistrationAddress.registrationAddress.country": "organization.registeredAddress.country",
   "companyRegistrationAddress.registrationAddress.postalCode": "organization.registeredAddress.postalCode",
@@ -13582,6 +13700,7 @@ const companyBaseMapping = {
   "companyRegistrationDetails.isUen": "organization.isUen",
   "companyRegistrationDetails.stockExchangeMIC": "organization.stockData.marketIdentifier",
   "companyRegistrationDetails.stockISIN": "organization.stockData.stockNumber",
+  "companyRegistrationDetails.stockTickerSymbol": "organization.stockData.tickerSymbol",
   "companyRegistrationAddress.registrationAddress.city": "organization.registeredAddress.city",
   "companyRegistrationAddress.registrationAddress.country": "organization.registeredAddress.country",
   "companyRegistrationAddress.registrationAddress.postalCode": "organization.registeredAddress.postalCode",
@@ -13621,7 +13740,8 @@ const companySearchBaseMapping = {
   "companyOtherDetails.dateOfIncorporation": "organization.dateOfIncorporation",
   "companyOtherDetails.isUen": "organization.isUen",
   "companyOtherDetails.stockExchangeMIC": "organization.stockData.marketIdentifier",
-  "companyOtherDetails.stockISIN": "organization.stockData.stockNumber"
+  "companyOtherDetails.stockISIN": "organization.stockData.stockNumber",
+  "companyOtherDetails.stockTickerSymbol": "organization.stockData.tickerSymbol"
 };
 const trustBaseMapping = {
   "trustRegistrationDetails.trustType": "trust.type",
@@ -15107,54 +15227,83 @@ function IdVerificationMethodComponent(props) {
     })]
   });
 }
-const FIELD = "idNumber";
-const verifyIdNumberHelper = (idRtnData) => {
-  if ((idRtnData == null ? void 0 : idRtnData.status) === 422 || (idRtnData == null ? void 0 : idRtnData.verified) === "false") {
-    return {
-      status: "error",
-      data: idRtnData,
-      fieldName: FIELD,
-      translationKey: "unableToVerifyTheIdNumber"
-    };
-  }
-  if ((idRtnData == null ? void 0 : idRtnData.status) === 500) {
-    return {
-      status: "verified",
-      data: idRtnData,
-      fieldName: FIELD
-    };
-  }
-  if ((idRtnData == null ? void 0 : idRtnData.verified) === "true") {
-    return {
-      status: "verified",
-      data: idRtnData,
-      fieldName: FIELD
-    };
+const COUNTRY_ID_NUMBER_MASKS = {
+  [CountryCodes.PuertoRico]: {
+    length: 4
+  },
+  [CountryCodes.UnitedStates]: {
+    length: 4
   }
 };
+const FIELD = "idNumber";
+const handleVerifyIdNumber = async (formData, country2, verifyFn) => {
+  var _a, _b;
+  const verified2 = {
+    field: "idNumber",
+    isVerified: true
+  };
+  if (formData.idNumberExempt) return verified2;
+  const isCountryWithMaskedIdNumber = Object.keys(COUNTRY_ID_NUMBER_MASKS).includes(country2);
+  const isValueMasked = ((_a = formData.idNumber) == null ? void 0 : _a.length) === ((_b = COUNTRY_ID_NUMBER_MASKS[country2]) == null ? void 0 : _b.length);
+  if (isCountryWithMaskedIdNumber && isValueMasked) return verified2;
+  const response = await verifyFn({
+    name: {
+      firstName: formData.firstName || "",
+      lastName: formData.lastName || ""
+    },
+    countryCode: country2,
+    idNumber: formData.idNumber || ""
+  });
+  const isNotVerified = (response == null ? void 0 : response.status) === 422 || (response == null ? void 0 : response.verified) === "false";
+  if (isNotVerified) return {
+    field: FIELD,
+    isVerified: false,
+    messageKey: "unableToVerifyTheIdNumber"
+  };
+  return {
+    field: FIELD,
+    isVerified: true
+  };
+};
+const FIELDS_WITH_EXTERNAL_VERIFICATION = ["idNumber"];
 function useVerification(fieldsToVerify, country2) {
   const {
     verifyIdNumber: verifyIdNumber2
   } = useConfigurationApi();
   const hasFieldsToVerify = !!(fieldsToVerify == null ? void 0 : fieldsToVerify.length);
   const verifyFields = useCallback(async (formState, savedData) => {
-    const verificationPromises = [];
-    fieldsToVerify.forEach((field) => {
-      if (field === "idNumber" && formState.data[field]) {
-        if (formState.data[field] === savedData[field] || country2 === "US" && formState.data[field].length === 4) return;
-        const request = {
-          name: {
-            firstName: formState.data.firstName,
-            lastName: formState.data.lastName
-          },
-          countryCode: country2,
-          idNumber: formState.data.idNumber
-        };
-        const verifyIdPromise = verifyIdNumber2(request).then((response) => verifyIdNumberHelper(response));
-        verificationPromises.push(verifyIdPromise);
+    const isVerifications = fieldsToVerify.some((field) => FIELDS_WITH_EXTERNAL_VERIFICATION.includes(field));
+    if (!isVerifications) return [];
+    const verifications = fieldsToVerify.filter((f) => {
+      const field = f;
+      const isValue = formState.data[field];
+      if (!isValue) return false;
+      const isDirty = isValue && formState.data[field] !== savedData[field];
+      if (!isDirty) return false;
+      if (typeof field !== "string") return false;
+      const hasVerification = FIELDS_WITH_EXTERNAL_VERIFICATION.includes(field);
+      if (hasVerification) return true;
+      return false;
+    }).map(async (field) => {
+      switch (field) {
+        case "idNumber":
+          return handleVerifyIdNumber(
+            // made this hook more agnostic in general
+            // and removed the ts-strict-ignore
+            //
+            // need to coerce the schema here to make the check happy
+            formState.data,
+            country2,
+            verifyIdNumber2
+          );
+        default:
+          return {
+            field,
+            isVerified: true
+          };
       }
     });
-    return Promise.all(verificationPromises);
+    return Promise.all(verifications);
   }, [fieldsToVerify, country2]);
   return {
     hasFieldsToVerify,
@@ -17076,7 +17225,7 @@ function PersonalDetailsComponent(props) {
       verifyFields({
         data: personalDetailsData
       }, props.data).then((verifiedArr) => {
-        const isVerified = verifiedArr.every((item) => item.status === "verified");
+        const isVerified = verifiedArr.every((item) => (item == null ? void 0 : item.isVerified) === true);
         const t1 = performance.now();
         const elapsedTime = Math.floor(t1 - t0);
         if (elapsedTime < minTime) {
@@ -17093,10 +17242,10 @@ function PersonalDetailsComponent(props) {
             ...externalErrors
           };
           verifiedArr.forEach((error) => {
-            if (error.status === "error") {
-              errorObj[error.fieldName] = {
+            if (error.isVerified === false) {
+              errorObj[error.field] = {
                 isValid: false,
-                errorMessage: error.translationKey
+                errorMessage: error.messageKey
               };
             }
           });
@@ -18995,6 +19144,12 @@ function BankVerification(props) {
   });
 }
 const BankVerification$1 = memo(BankVerification);
+const CoreContext = createContext(void 0);
+const useCoreContext = () => {
+  const context = useContext(CoreContext);
+  if (!context) throw Error("You need a <CoreProvider> to use core context");
+  return context;
+};
 const countriesWithMultipleCurrencies = /* @__PURE__ */ new Set([CountryCodes.Bulgaria, CountryCodes.Canada, CountryCodes.Croatia, CountryCodes.CzechRepublic, CountryCodes.Hungary, CountryCodes.Romania, CountryCodes.Switzerland]);
 const countriesWithLocalFormat = /* @__PURE__ */ new Set([CountryCodes.Denmark, CountryCodes.Norway, CountryCodes.Poland, CountryCodes.Sweden, CountryCodes.UnitedKingdom]);
 const payoutCurrencySupport = {
@@ -20696,7 +20851,7 @@ function SolePropComponent(props) {
   const [tradingName2, setTradingName] = useState();
   const solePropNameAndCountryFormProps = getFormProps(props, solePropNameAndCountryFormId);
   const solePropsRegistrationDetailsFormProps = getFormProps(props, solePropRegistrationDetailsFormId);
-  const solePropRegistrationAddressFormProps = getFormProps(props, solePropRegistrationAddressFormId);
+  const solePropRegistrationAddressFormProps = getNestedOuterFormPropsFromOuterFormProps(props, solePropRegistrationAddressFormId);
   const solePropDocumentsFormProps = getFormProps(props, solePropDocumentFormId);
   const handleStateChange = ({
     currentState
@@ -21293,7 +21448,7 @@ function TrustComponent(props) {
     i18n
   } = useI18nContext();
   const trustRegistrationDetailsFormProps = getFormProps(props, trustRegistrationDetailsFormId);
-  const trustRegistrationAddressFormProps = getFormProps(props, trustRegistrationAddressFormId);
+  const trustRegistrationAddressFormProps = getNestedOuterFormPropsFromOuterFormProps(props, trustRegistrationAddressFormId);
   const trustDocumentFormProps = getFormProps(props, trustConstitutionalDocumentFormId);
   const handleStateChange = () => {
   };
@@ -22656,10 +22811,13 @@ const solePropBase = {
     rule: "REQUIRED"
   },
   stockExchangeMIC: {
-    rule: "stockExchangeMICIfTypePublic"
+    rule: "ifPubliclyTradedCompany"
   },
   stockISIN: {
-    rule: "stockISINIfTypePublic"
+    rule: "ifPubliclyTradedCompany"
+  },
+  stockTickerSymbol: {
+    rule: "ifPubliclyTradedCompany"
   },
   tradingName: {
     rule: "REQUIRED"
@@ -23589,7 +23747,7 @@ function VatNumberField({
 }
 const BUSINESS_NAME_FIELD = ["businessName"];
 const basicInformationFields = [...COUNTRY_FIELD, ...BUSINESS_NAME_FIELD, ...STATE_FIELD, ...TAX_INFORMATION_FIELD, ...BUSINESS_REGISTRATION_NUMBER_FIELD];
-const additionalInformationFields = [...LEGAL_COMPANY_NAME_FIELD, ...TRADING_NAME_FIELD, ...STOCK_EXCHANGE_MIC_FIELD, ...STOCK_ISIN_FIELD, ...DATE_OF_INCORPORATION_FIELD, ...BUSINESS_REGISTRATION_NUMBER_FIELD, ...TAX_INFORMATION_FIELD, ...VAT_NUMBER_FIELD];
+const additionalInformationFields = [...LEGAL_COMPANY_NAME_FIELD, ...TRADING_NAME_FIELD, ...STOCK_EXCHANGE_MIC_FIELD, ...STOCK_ISIN_FIELD, ...STOCK_TICKER_SYMBOL_FIELD, ...DATE_OF_INCORPORATION_FIELD, ...BUSINESS_REGISTRATION_NUMBER_FIELD, ...TAX_INFORMATION_FIELD, ...VAT_NUMBER_FIELD];
 const FIELDS_NEEDED_FOR_COMPANY_SEARCH = [...BUSINESS_NAME_FIELD, ...TAX_INFORMATION_FIELD, ...BUSINESS_REGISTRATION_NUMBER_FIELD];
 const getForms = (country2) => ({
   basicInformation: {
@@ -24305,7 +24463,7 @@ const FormWrapper = ({
     isExperimentEnabled
   } = useExperimentsContext();
   const showExtraTaxExemptionReasons = isExperimentEnabled(ExperimentNames.ShowExtraTaxExemptionReasons);
-  const showTaxExemptedLegalCaption = showExtraTaxExemptionReasons && ((_a = summaryData.companyRegistrationDetails) == null ? void 0 : _a.vatAbsenceReason);
+  const showTaxExemptedLegalCaption = showExtraTaxExemptionReasons && ((_a = summaryData.companyRegistrationDetails) == null ? void 0 : _a.vatAbsenceReason) && ["companyDetails"].includes(taskName);
   const summaryContent = jsx("div", {
     className: "adyen-kyc-form-wrapper",
     children: jsx(Summary, {
@@ -25061,10 +25219,13 @@ function CompanyDropinComponent({
   handleUpdateLegalEntity,
   handleHomeClick,
   onTypeSwitch,
-  onChange,
-  accountHolder: accountHolder2
+  onChange
 }) {
   var _a, _b;
+  const {
+    accountHolder: accountHolder2,
+    setAccountHolder
+  } = useCoreContext();
   const {
     showToast,
     clearToasts
@@ -25196,7 +25357,8 @@ function CompanyDropinComponent({
       legalEntityName: dataSubmitted.companyNameAndCountry.legalCompanyName,
       usedAdditionalAddress: dataSubmitted.companyRegistrationAddress.operationalAddressIsSame === operationalAddressIsSameIds.OPERATIONAL_ADDRESS_IS_NOT_SAME
     };
-    legalEntity.entityAssociations = filterOutUnwantedAssociationsIfRootLE(taskType, legalEntityResponse, dataSubmitted.companyType.accountHolder);
+    const newAccountHolder = dataSubmitted.companyType.accountHolder ?? accountHolder2;
+    legalEntity.entityAssociations = filterOutUnwantedAssociationsIfRootLE(taskType, legalEntityResponse, newAccountHolder);
     if (!isCountryOfGoverningLawEnabled && ((_a2 = legalEntity.organization) == null ? void 0 : _a2.countryOfGoverningLaw)) {
       delete legalEntity.organization.countryOfGoverningLaw;
     }
@@ -25212,6 +25374,7 @@ function CompanyDropinComponent({
       } else {
         legalEntity = await handleUpdateLegalEntity(drop("type").from(legalEntity), legalEntityResponse.id);
       }
+      setAccountHolder(newAccountHolder);
       userEvents.addEvent("Saved company details", {
         segmentation: {
           ...baseTrackingPayload,
@@ -26277,7 +26440,7 @@ const TradingNameFieldValidation = () => ({
   }]
 });
 const COMPANY_OTHER_DETAILS_FORM_ID = "companyOtherDetails";
-const companyOtherDetailsFields = [...TRADING_NAME_FIELD, ...STOCK_EXCHANGE_MIC_FIELD, ...STOCK_ISIN_FIELD, ...DATE_OF_INCORPORATION_FIELD, ...BUSINESS_REGISTRATION_NUMBER_FIELD, ...TAX_INFORMATION_FIELD, ...VAT_NUMBER_FIELD];
+const companyOtherDetailsFields = [...TRADING_NAME_FIELD, ...STOCK_EXCHANGE_MIC_FIELD, ...STOCK_ISIN_FIELD, ...STOCK_TICKER_SYMBOL_FIELD, ...DATE_OF_INCORPORATION_FIELD, ...BUSINESS_REGISTRATION_NUMBER_FIELD, ...TAX_INFORMATION_FIELD, ...VAT_NUMBER_FIELD];
 function CompanyOtherDetails({
   data,
   labels: labels2,
@@ -26313,7 +26476,7 @@ function CompanyOtherDetails({
   const existingTaxId = (_c = (_b = data == null ? void 0 : data.taxInformation) == null ? void 0 : _b.find((taxId2) => taxId2.country === country2)) == null ? void 0 : _c.number;
   const defaultTaxIdNumberType = existingTaxId ? inferTaxIdNumberType(existingTaxId, country2, companyType2) : (_d = getTaxIdNumberOptions(country2, companyType2)) == null ? void 0 : _d[0].id;
   const [taxIdNumberType, setTaxIdNumberType] = useState$1(defaultTaxIdNumberType);
-  const directChildFields = companyOtherDetailsFields.filter((field) => ["tradingName", "sameNameAsLegalName", "stockExchangeMIC", "stockISIN", "dateOfIncorporation"].includes(field));
+  const directChildFields = companyOtherDetailsFields.filter((field) => ["tradingName", "sameNameAsLegalName", "stockExchangeMIC", "stockISIN", "stockTickerSymbol", "dateOfIncorporation"].includes(field));
   const initialFormUtilsProps = useMemo$1(() => ({
     allFields,
     labels: labels2,
@@ -26350,6 +26513,8 @@ function CompanyOtherDetails({
           return mergeFieldMetadataIntoProps("stockExchangeMIC", stockExchangeMICFieldMetadata, acc);
         case "stockISIN":
           return mergeFieldMetadataIntoProps("stockISIN", stockISINFieldMetadata, acc);
+        case "stockTickerSymbol":
+          return mergeFieldMetadataIntoProps("stockTickerSymbol", stockTickerSymbolFieldMetadata, acc);
         case "registrationNumber":
           return mergeFieldMetadataIntoProps(field, resolveFieldMetadata(defaultFieldConfig$8[country2], {
             companyType: companyType2,
@@ -26524,6 +26689,19 @@ function CompanyOtherDetails({
           readonly: formUtils.isReadOnly("stockISIN"),
           handleChangeFor
         })
+      }), formUtils.isRequiredField("stockTickerSymbol") && jsx("div", {
+        className: "adyen-kyc-field-wrapper",
+        children: jsx(StockTickerSymbolField, {
+          data: formUtils.getFieldData(formData, STOCK_TICKER_SYMBOL_FIELD),
+          valid: formUtils.getFieldValid(formValid, STOCK_TICKER_SYMBOL_FIELD),
+          errors: formUtils.getFieldErrors(formErrors, formFieldProblems, STOCK_TICKER_SYMBOL_FIELD),
+          labels: formUtils.getFieldLabels(STOCK_TICKER_SYMBOL_FIELD),
+          placeholders: formUtils.getFieldPlaceholders(STOCK_TICKER_SYMBOL_FIELD),
+          mask: formUtils.getMask("stockTickerSymbol"),
+          guidanceText: formUtils.getFieldGuidanceText(STOCK_TICKER_SYMBOL_FIELD),
+          readonly: formUtils.isReadOnly("stockTickerSymbol"),
+          handleChangeFor
+        })
       })]
     })]
   });
@@ -26971,7 +27149,7 @@ function CompanySearchComponent(props) {
     }), jsx("div", {
       className: formWrapperClasses(forms.companyRegistrationAddress.formId),
       children: jsx(RegistrationAddressComponent, {
-        ...getFormProps(props, forms.companyRegistrationAddress.formId),
+        ...getNestedOuterFormPropsFromOuterFormProps(props, forms.companyRegistrationAddress.formId),
         id: forms.companyRegistrationAddress.formId,
         heading: i18n.get(forms.companyRegistrationAddress.formName),
         description: i18n.get(forms.companyRegistrationAddress.formDescription, {
@@ -27359,13 +27537,26 @@ const useIsEligibleForSingpass = ({
   const {
     isExperimentEnabled
   } = useExperimentsContext();
-  if (!isExperimentEnabled("ShowSingPassButtonForCompanies")) return false;
-  const isSingpassEnabled = Boolean(handleOpenSingpassAuthorizationLink) && getLegalEntityCountry(legalEntity) === CountryCodes.Singapore;
+  if (!legalEntity) {
+    return false;
+  }
+  if (getLegalEntityCountry(legalEntity) !== CountryCodes.Singapore) {
+    return false;
+  }
+  const isSingpassForCompaniesEnabled = isExperimentEnabled("ShowSingPassButtonForCompanies");
+  const isSingpassForIndividualsEnabled = isExperimentEnabled("ShowSingPassButtonForIndividuals");
+  if (!isSingpassForCompaniesEnabled && !isSingpassForIndividualsEnabled) return false;
+  const isSingpassEnabled = Boolean(handleOpenSingpassAuthorizationLink);
   if (!isSingpassEnabled) return false;
   if (accountHolder2) {
-    return accountHolder2 === "theCompanyIWorkFor";
+    return accountHolder2 === "theCompanyIWorkFor" && isSingpassForCompaniesEnabled || accountHolder2 === "myName" && isSingpassForIndividualsEnabled;
   }
-  return legalEntity.type === LegalEntityType.ORGANIZATION;
+  const legalEntityType = legalEntity.type;
+  const isPartOfTrust = isPartOfTrustFromLegalEntity(legalEntity);
+  const isVanillaOrganization = legalEntityType === LegalEntityType.ORGANIZATION && !isPartOfTrust;
+  const hasSoleProprietor = hasSolePropInLegalEntity(legalEntity);
+  const isVanillaIndividual = legalEntityType === LegalEntityType.INDIVIDUAL && !hasSoleProprietor;
+  return isVanillaOrganization && isSingpassForCompaniesEnabled || isVanillaIndividual && isSingpassForIndividualsEnabled;
 };
 const logger$f = createLogger("useAssociatedLegalArrangement");
 function useAssociatedLegalArrangement({
@@ -27392,6 +27583,14 @@ function useAssociatedLegalArrangement({
     refreshAssociatedLegalArrangement
   };
 }
+const getCanSeeEntitySelectionStorageKey = (legalEntityId) => `ENTITY_SELECTION_SEEN-${legalEntityId}`;
+const useCanSeeEntitySelection = (legalEntityId) => {
+  const [canSeeEntitySelectionFromLocalStorage, setCanSeeEntitySelectionIntoLocalStorage] = useLocalStorage(getCanSeeEntitySelectionStorageKey(legalEntityId), true);
+  return {
+    canSeeEntitySelection: canSeeEntitySelectionFromLocalStorage,
+    setCanSeeEntitySelection: setCanSeeEntitySelectionIntoLocalStorage
+  };
+};
 const logger$e = createLogger("useExemptSettlor");
 const useExemptSettlor = ({
   trust: trust2,
@@ -29349,33 +29548,57 @@ const SvgSingpassLogo = (props) => /* @__PURE__ */ jsxs$1("svg", { xmlns: "http:
 ] });
 const setupAccountMethods = ["singpass", "manual"];
 const setupAccountMethodFields = ["setupAccountMethod"];
-const getSetupAccountMethodMetadata = () => ({
-  singpass: {
-    name: "retrieveMyInfoBusiness",
-    description: "getYourBusinessVerifiedDetails",
-    icon: jsx("span", {
-      className: "adyen-kyc-setup-singpass-container",
-      children: jsx(SvgSetupSingpass, {})
-    }),
-    provider: {
-      name: "singpass",
+const getSingpassSelectionDisabled = (legalEntityType) => {
+  switch (legalEntityType) {
+    case LegalEntityType.INDIVIDUAL:
+    case LegalEntityType.ORGANIZATION:
+      return false;
+    default:
+      return true;
+  }
+};
+const legalEntityTypeToSelectionTranslationKeyMap = {
+  [LegalEntityType.INDIVIDUAL]: "retrieveMyInfo",
+  [LegalEntityType.ORGANIZATION]: "retrieveMyInfoBusiness"
+};
+const legalEntityTypeToSelectionDescriptionTranslationKeyMap = {
+  [LegalEntityType.INDIVIDUAL]: "getYourVerifiedDetailsInstantly",
+  [LegalEntityType.ORGANIZATION]: "getYourBusinessVerifiedDetails"
+};
+const getSetupAccountMethodMetadata = (legalEntityType) => {
+  const translationSingpassNameKey = legalEntityTypeToSelectionTranslationKeyMap[legalEntityType] ?? "retrieveMyInfoBusiness";
+  const translationSingpassDescriptionKey = legalEntityTypeToSelectionDescriptionTranslationKeyMap[legalEntityType] ?? "getYourBusinessVerifiedDetails";
+  const isSingpassSelectionDisabled = getSingpassSelectionDisabled(legalEntityType);
+  return {
+    singpass: {
+      name: translationSingpassNameKey,
+      description: translationSingpassDescriptionKey,
       icon: jsx("span", {
-        className: "adyen-kyc-singpass-logo-container",
-        children: jsx(SvgSingpassLogo, {})
+        className: "adyen-kyc-setup-singpass-container",
+        children: jsx(SvgSetupSingpass, {})
+      }),
+      provider: {
+        name: "singpass",
+        icon: jsx("span", {
+          className: "adyen-kyc-singpass-logo-container",
+          children: jsx(SvgSingpassLogo, {})
+        })
+      },
+      isOptionDisabled: isSingpassSelectionDisabled
+    },
+    manual: {
+      name: "enterTheDetailsYourself",
+      description: "youAlsoHaveToUploadSomeSupportingDocuments",
+      icon: jsx("span", {
+        className: "adyen-kyc-setup-manual-container",
+        children: jsx(SvgSetupManual, {})
       })
     }
-  },
-  manual: {
-    name: "enterTheDetailsYourself",
-    description: "youAlsoHaveToUploadSomeSupportingDocuments",
-    icon: jsx("span", {
-      className: "adyen-kyc-setup-manual-container",
-      children: jsx(SvgSetupManual, {})
-    })
-  }
-});
+  };
+};
 const SingpassSelection = (props) => {
   const {
+    legalEntityType,
     handleNextClick
   } = props;
   const {
@@ -29394,7 +29617,7 @@ const SingpassSelection = (props) => {
     schema: setupAccountMethodFields,
     defaultData: {}
   });
-  const methodsMetadata = getSetupAccountMethodMetadata();
+  const methodsMetadata = getSetupAccountMethodMetadata(legalEntityType);
   return jsx("div", {
     children: jsxs("div", {
       className: "adyen-kyc-singpass-selection",
@@ -29486,10 +29709,21 @@ const hasPayoutAccount = (legalEntityResponse) => {
   var _a;
   return Boolean((_a = legalEntityResponse.transferInstruments) == null ? void 0 : _a.length);
 };
+const legalEntityTypeToSubtitleTranslationKey = {
+  [LegalEntityType.INDIVIDUAL]: "myInfoYouCanGetVerifiedDetails",
+  [LegalEntityType.ORGANIZATION]: "myInfoBusinessYouCanGetVerifiedDetails"
+};
+const legalEntityTypeToButtonTextTranslationKeyMap = {
+  [LegalEntityType.INDIVIDUAL]: "retrieveMyinfoWith",
+  [LegalEntityType.ORGANIZATION]: "retrieveMyinfoBusinessWith"
+};
 const SingpassBanner = (props) => {
   const {
+    legalEntityType,
     onClick
   } = props;
+  const subtitleTranslationKey = legalEntityTypeToSubtitleTranslationKey[legalEntityType];
+  const buttonTextTranslationKey = legalEntityTypeToButtonTextTranslationKeyMap[legalEntityType];
   const {
     i18n
   } = useI18nContext();
@@ -29498,14 +29732,14 @@ const SingpassBanner = (props) => {
     hasCloseButton: false,
     icon: false,
     title: i18n.get("getSetUpInstantly"),
-    children: [jsx("div", {
+    children: [subtitleTranslationKey && jsx("div", {
       className: cx("adyen-task-list-singpass-banner__subtitle"),
-      children: i18n.get("MyInfoBusinessYouCanGetVerifiedDetails")
+      children: i18n.get(subtitleTranslationKey)
     }), jsxs("button", {
       type: "button",
       className: cx("adyen-kyc-button adyen-task-list-singpass-banner__button"),
       onClick,
-      children: [i18n.get("retrieveMyinfoBusinessWith"), jsx(SvgSingpassLogo, {})]
+      children: [buttonTextTranslationKey && i18n.get(buttonTextTranslationKey), jsx(SvgSingpassLogo, {})]
     })]
   });
 };
@@ -29788,7 +30022,8 @@ function TaskListComponent({
         })]
       })]
     }), onRetrieveMyinfoBusinessWithSingpass && jsx(SingpassBanner, {
-      onClick: onRetrieveMyinfoBusinessWithSingpass
+      onClick: onRetrieveMyinfoBusinessWithSingpass,
+      legalEntityType: legalEntityResponse.type
     }), hasExpired && jsx(ExpiredBanner, {}), jsxs("div", {
       children: [hasTaskOfGroupAccountDetails && jsxs(TaskListGroup, {
         title: isCompany ? i18n.get(companyTaskDescriptionKey) : i18n.get(isEnableNewEntryFlowEnabled ? "provideFewDetailsAboutYourself" : "accountDetailsDescription"),
@@ -30279,6 +30514,10 @@ function IndividualDropinComponent({
   handleBackClick: externalBackClick
 }) {
   var _a, _b, _c, _d;
+  const {
+    accountHolder: accountHolder2,
+    setAccountHolder
+  } = useCoreContext();
   const {
     i18n
   } = useI18nContext();
@@ -30514,12 +30753,14 @@ function IndividualDropinComponent({
           idDocumentType: idDocumentType || null
         }
       });
-      legalEntity.entityAssociations = filterOutUnwantedAssociationsIfRootLE(taskType, legalEntityResponse, (_c2 = dataSubmitted.personalDetails) == null ? void 0 : _c2.accountHolder);
+      const accountHolderToEvaluated = ((_c2 = dataSubmitted.personalDetails) == null ? void 0 : _c2.accountHolder) ?? accountHolder2;
+      legalEntity.entityAssociations = filterOutUnwantedAssociationsIfRootLE(taskType, legalEntityResponse, accountHolderToEvaluated ?? void 0);
       const createdLegalEntity = await submitLegalEntity({
         dataSubmitted,
         legalEntity,
         idDocumentType
       });
+      setAccountHolder(accountHolderToEvaluated);
       await submitDocuments2({
         forms: forms2,
         legalEntity: createdLegalEntity,
@@ -30711,7 +30952,8 @@ function IndividualDropinComponent({
       handleFindAddress,
       onTypeSwitch,
       onCountryChange: setCountry,
-      shouldValidate
+      shouldValidate,
+      accountHolder: accountHolder2
     })
   });
 }
@@ -33133,6 +33375,9 @@ const useNavigation = ({
   const {
     accountHolder: accountHolder2
   } = useCoreContext();
+  const {
+    canSeeEntitySelection
+  } = useCanSeeEntitySelection(legalEntity.id);
   const eligibleForSingpass = useIsEligibleForSingpass({
     legalEntity,
     accountHolder: accountHolder2,
@@ -33169,7 +33414,7 @@ const useNavigation = ({
     if (pushedTask === "default") {
       const defaultTask = getDefaultTask({
         legalEntity,
-        accountHolder: accountHolder2,
+        canSeeEntitySelection,
         showIntroduction,
         isNewEntryFlowEnabled,
         shouldShowSingpassSelection
@@ -33186,13 +33431,13 @@ const useNavigation = ({
 };
 const getDefaultTask = ({
   legalEntity,
-  accountHolder: accountHolder2,
+  canSeeEntitySelection,
   isNewEntryFlowEnabled,
   showIntroduction,
   shouldShowSingpassSelection
 }) => {
   const hasLegalEntityProgressedBeyondEntitySelection = hasProgressedBeyondEntitySelection(legalEntity);
-  if (isNewEntryFlowEnabled && !accountHolder2 && !hasLegalEntityProgressedBeyondEntitySelection) return TaskTypes.BUSINESS_TYPE_SELECTION;
+  if (isNewEntryFlowEnabled && canSeeEntitySelection && !hasLegalEntityProgressedBeyondEntitySelection) return TaskTypes.BUSINESS_TYPE_SELECTION;
   if (showIntroduction) return TaskTypes.INTRODUCTION;
   if (shouldShowSingpassSelection) return TaskTypes.SINGPASS_SELECTION;
   return TaskTypes.TASKS_OVERVIEW;
@@ -33222,6 +33467,9 @@ function DropinComposerComponent({
     accountHolder: accountHolder2,
     setAccountHolder
   } = useCoreContext();
+  const {
+    setCanSeeEntitySelection
+  } = useCanSeeEntitySelection(legalEntityResponse.id);
   const {
     i18n
   } = useI18nContext();
@@ -33248,13 +33496,13 @@ function DropinComposerComponent({
   } = useHasSeenIntroduction({
     legalEntityId: legalEntityResponse.id
   });
+  const [tasks, setTasks] = useState([]);
+  const [rootLegalEntity, setRootLegalEntity] = useState(legalEntityResponse);
   const eligibleForSingpass = useIsEligibleForSingpass({
-    legalEntity: legalEntityResponse,
+    legalEntity: rootLegalEntity,
     accountHolder: accountHolder2,
     handleOpenSingpassAuthorizationLink
   });
-  const [tasks, setTasks] = useState([]);
-  const [rootLegalEntity, setRootLegalEntity] = useState(legalEntityResponse);
   const rootLegalEntityCountry = getLegalEntityCountry(rootLegalEntity);
   const [associatedLegalEntity, setAssociatedLegalEntity] = useState(null);
   const {
@@ -33794,6 +34042,10 @@ function DropinComposerComponent({
       clearInterval(timeoutId);
     };
   }, [refreshLegalEntity, rootLegalEntity]);
+  useEffect(() => {
+    const newAccountHolder = getDefaultAccountHolderType(rootLegalEntity, false, accountHolder2);
+    if (newAccountHolder !== accountHolder2) setAccountHolder(newAccountHolder);
+  }, [accountHolder2, rootLegalEntity]);
   if (isLoadingConfiguration) {
     return jsx(Shimmer, {});
   }
@@ -33807,6 +34059,7 @@ function DropinComposerComponent({
           accountHolder: accountHolder2,
           onComplete: async (newAccountHolder) => {
             setAccountHolder(newAccountHolder);
+            setCanSeeEntitySelection(false);
             await refreshLegalEntity();
             navigateTo("default");
           },
@@ -33818,7 +34071,9 @@ function DropinComposerComponent({
       });
     case TaskTypes.SINGPASS_SELECTION:
       return jsx(SingpassSelection, {
-        handleNextClick: handleSingpassSelectionNextClick
+        handleNextClick: handleSingpassSelectionNextClick,
+        accountHolder: accountHolder2,
+        legalEntityType: rootLegalEntity.type
       });
     case TaskTypes.INTRODUCTION:
       return jsx(Introduction, {
@@ -34000,8 +34255,7 @@ function DropinComposerComponent({
         handleAddressSearch: args == null ? void 0 : args.handleAddressSearch,
         handleFindAddress: args == null ? void 0 : args.handleFindAddress,
         onTypeSwitch: navigateToTypeSwitcher,
-        isTargetLegalEntityType: legalEntityType === LegalEntityType.ORGANIZATION,
-        accountHolder: accountHolder2
+        isTargetLegalEntityType: legalEntityType === LegalEntityType.ORGANIZATION
       });
     case TaskTypes.COMPANY_SEARCH:
       return jsx(CompanySearchDropinComponent, {
@@ -34094,8 +34348,7 @@ function DropinComposerComponent({
         homeButtonLabel: i18n.get("saveAndGoToOverview"),
         associationDetail: trustMember,
         handleAddressSearch: args == null ? void 0 : args.handleAddressSearch,
-        handleFindAddress: args == null ? void 0 : args.handleFindAddress,
-        accountHolder: accountHolder2
+        handleFindAddress: args == null ? void 0 : args.handleFindAddress
       });
     case TaskTypes.PAYOUT:
     case TaskTypes.PAYIN:
@@ -36460,7 +36713,7 @@ const ConfigurationApiProvider = ({
     isEmbeddedDropin,
     loadingContext
   } = authContext;
-  const sdkVersion = "3.19.0";
+  const sdkVersion = "3.19.2";
   useAnalytics({
     onUserEvent,
     legalEntityId: rootLegalEntityId,