@adyen/kyc-components 3.15.1 → 3.15.2

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

@@ -10257,7 +10257,10 @@ const entityTypeToCorrespondingAccountHolderOption = {
   [LegalEntityType.SOLE_PROPRIETORSHIP]: "mySoleProprietorName",
   [LegalEntityType.TRUST]: "aTrust"
 };
-const getDefaultAccountHolderType = (legalEntityResponse, isTypeChanging = false) => {
+const getDefaultAccountHolderType = (legalEntityResponse, isTypeChanging = false, accountHolder2) => {
+  if (accountHolder2) {
+    return accountHolder2;
+  }
   if (!(legalEntityResponse == null ? void 0 : legalEntityResponse.type))
     return void 0;
   if (hasOwnEntityAssociationOfType(LegalEntityType.SOLE_PROPRIETORSHIP, legalEntityResponse.entityAssociations, legalEntityResponse.id)) {
@@ -10510,6 +10513,7 @@ const companyTypeValidationRules = {
 };
 const companyTypeFields = ["entityType", ...accountHolderFields];
 function CompanyTypeComponent(props) {
+  var _a;
   const {
     i18n
   } = useI18nContext();
@@ -10540,8 +10544,8 @@ function CompanyTypeComponent(props) {
   const formUtils = formUtilities(props, i18n);
   const accountHolderProps = getFieldProps(props, accountHolderFields);
   useEffect(() => {
-    var _a, _b;
-    (_b = (_a = stateRef.current) == null ? void 0 : _a.setState) == null ? void 0 : _b.call(_a, {
+    var _a2, _b;
+    (_b = (_a2 = stateRef.current) == null ? void 0 : _a2.setState) == null ? void 0 : _b.call(_a2, {
       type: "addToState",
       value: {
         data,
@@ -10554,7 +10558,7 @@ function CompanyTypeComponent(props) {
       }
     });
   }, [data, valid, errors, isValid]);
-  const companyTypeOptions = isNewEntryFlowEnabled ? companyTypes.filter((companyType2) => companyType2.id !== CompanyTypesValue.INCORPORATED_PARTNERSHIP && companyType2.id !== CompanyTypesValue.INCORPORATED_ASSOCIATION) : companyTypes;
+  const companyTypeOptions = isNewEntryFlowEnabled && ((_a = props.data) == null ? void 0 : _a.accountHolder) !== "aTrust" ? companyTypes.filter((companyType2) => companyType2.id !== CompanyTypesValue.INCORPORATED_PARTNERSHIP && companyType2.id !== CompanyTypesValue.INCORPORATED_ASSOCIATION) : companyTypes;
   const companyTypeExamples2 = useCompanyTypeExamples(country2);
   return jsxs(Fragment, {
     children: [jsx(StateContextSetter, {
@@ -13593,7 +13597,7 @@ const mapIndividualToLegalEntity = (data) => {
   }
   return requestObj;
 };
-const mapLegalEntityToCompany = (legalEntity, isChangingType) => {
+const mapLegalEntityToCompany = (legalEntity, isChangingType, accountHolder2) => {
   var _a, _b, _c, _d;
   let companyCompData;
   if (legalEntity == null ? void 0 : legalEntity.organization) {
@@ -13638,7 +13642,7 @@ const mapLegalEntityToCompany = (legalEntity, isChangingType) => {
     ...companyCompData,
     companyType: {
       ...companyCompData == null ? void 0 : companyCompData.companyType,
-      accountHolder: getDefaultAccountHolderType(legalEntity, isChangingType)
+      accountHolder: getDefaultAccountHolderType(legalEntity, isChangingType, accountHolder2)
     }
   };
   return companyCompData;
@@ -22878,23 +22882,35 @@ const mapLegalArrangementOptionToCompanyTypesValue = (legalArrangement) => {
     case "associationIncorporated":
       return CompanyTypesValue.INCORPORATED_ASSOCIATION;
     default:
+      return void 0;
+  }
+};
+const determineOrganizationTypeToUpdate = (defaultLegalArrangement, targetLegalArrangement, currentCompanyTypeValue) => {
+  if (targetLegalArrangement === "aTrust") {
+    return;
+  }
+  if (!targetLegalArrangement) {
+    const isUnavailableTypesInCompany = currentCompanyTypeValue === CompanyTypesValue.INCORPORATED_ASSOCIATION || currentCompanyTypeValue === CompanyTypesValue.INCORPORATED_PARTNERSHIP;
+    if (isUnavailableTypesInCompany) {
       return "";
+    }
   }
+  return mapLegalArrangementOptionToCompanyTypesValue(targetLegalArrangement);
 };
 const getDefaultLegalArrangementOrSuborganizationType = (legalEntityResponse, accountHolder2) => {
   var _a;
   const entityAssociations = legalEntityResponse == null ? void 0 : legalEntityResponse.entityAssociations;
   const suborganizationType = (_a = legalEntityResponse == null ? void 0 : legalEntityResponse.organization) == null ? void 0 : _a.type;
+  const hasTrust = hasOwnEntityAssociationOfType(LegalEntityType.TRUST, entityAssociations, legalEntityResponse == null ? void 0 : legalEntityResponse.id);
+  if (hasTrust || accountHolder2 === "aTrust") {
+    return "aTrust";
+  }
   if (suborganizationType === CompanyTypesValue.INCORPORATED_PARTNERSHIP) {
     return "partnershipIncorporated";
   }
   if (suborganizationType === CompanyTypesValue.INCORPORATED_ASSOCIATION) {
     return "associationIncorporated";
   }
-  const hasTrust = hasOwnEntityAssociationOfType(LegalEntityType.TRUST, entityAssociations, legalEntityResponse == null ? void 0 : legalEntityResponse.id);
-  if (hasTrust || accountHolder2 === "aTrust") {
-    return "aTrust";
-  }
   return void 0;
 };
 const getTargetLegalEntityType = (businessType, legalArrangement, trusteeType, currentLegalEntityType) => {
@@ -22904,11 +22920,12 @@ const getTargetLegalEntityType = (businessType, legalArrangement, trusteeType, c
   if (businessType === "legalArrangement" && legalArrangement === "aTrust" && trusteeType === "individual" || businessType === "individual" || businessType === "soleProprietorship") {
     return LegalEntityType.INDIVIDUAL;
   }
-  if (legalArrangement === "partnershipIncorporated") {
+  if (legalArrangement && isLegalArrangementOrganizationSubtype(legalArrangement)) {
     return LegalEntityType.ORGANIZATION;
   }
   return currentLegalEntityType;
 };
+const isLegalArrangementOrganizationSubtype = (legalArrangementOption) => legalArrangementOption === "partnershipIncorporated" || legalArrangementOption === "associationIncorporated";
 var ToastType = /* @__PURE__ */ ((ToastType2) => {
   ToastType2["LOADING"] = "loading";
   ToastType2["SUCCESS"] = "success";
@@ -23218,7 +23235,8 @@ function CompanyDropinComponent({
   handleUpdateLegalEntity,
   handleHomeClick,
   onTypeSwitch,
-  onChange
+  onChange,
+  accountHolder: accountHolder2
 }) {
   var _a, _b;
   const {
@@ -23235,7 +23253,8 @@ function CompanyDropinComponent({
     i18n,
     setLocale
   } = useI18nContext();
-  const dataFromResponse = mapLegalEntityToCompany(legalEntityResponse, isTargetLegalEntityType);
+  const isNewEntryFlowEnabled = useEnableNewEntryFlow();
+  const dataFromResponse = mapLegalEntityToCompany(legalEntityResponse, isTargetLegalEntityType, isNewEntryFlowEnabled ? accountHolder2 : void 0);
   const {
     getConfiguration: getConfiguration2
   } = useConfigurationApi();
@@ -23291,7 +23310,7 @@ function CompanyDropinComponent({
     });
     onChange == null ? void 0 : onChange(currentState);
   }, [currentState]);
-  const isSkippingCompanyStructure = useEnableNewEntryFlow() && organizationTypesToSkipCompanyStructureForm.includes((_b = legalEntityResponse == null ? void 0 : legalEntityResponse.organization) == null ? void 0 : _b.type);
+  const isSkippingCompanyStructure = useEnableNewEntryFlow() && organizationTypesToSkipCompanyStructureForm.includes((_b = legalEntityResponse == null ? void 0 : legalEntityResponse.organization) == null ? void 0 : _b.type) && accountHolder2 !== "aTrust";
   const forms2 = useMemo(() => {
     const requiredForms = getRequiredForms(companyForms, derivedProps == null ? void 0 : derivedProps.requiredFields, derivedProps == null ? void 0 : derivedProps.optionalFields);
     const validityAddedForms = addValidityToForms(requiredForms, formValidity, problems);
@@ -26743,18 +26762,15 @@ const BusinessTypeSelection = ({
           type: targetLegalEntityType
         };
         await (handleUpdateLegalEntity == null ? void 0 : handleUpdateLegalEntity(updateLegalEntityPayload, legalEntityResponse == null ? void 0 : legalEntityResponse.id));
-        if (targetLegalEntityType === LegalEntityType.ORGANIZATION && targetLegalEntityType) {
-          await (handleUpdateLegalEntity == null ? void 0 : handleUpdateLegalEntity({
-            organization: {
-              type: mapLegalArrangementOptionToCompanyTypesValue(targetLegalArrangement)
-            }
-          }, legalEntityResponse == null ? void 0 : legalEntityResponse.id));
-        }
       }
-      if (isLegalArrangementChanging && targetLegalArrangement) {
+      if (targetLegalEntityType === LegalEntityType.INDIVIDUAL) {
+        return;
+      }
+      const targetOrganizationType = determineOrganizationTypeToUpdate(defaultLegalArrangementType == null ? void 0 : defaultLegalArrangementType.id, targetLegalArrangement, currentCompanyTypesValue);
+      if (targetOrganizationType !== void 0) {
         await (handleUpdateLegalEntity == null ? void 0 : handleUpdateLegalEntity({
           organization: {
-            type: mapLegalArrangementOptionToCompanyTypesValue(targetLegalArrangement)
+            type: targetOrganizationType
           }
         }, legalEntityResponse == null ? void 0 : legalEntityResponse.id));
       }
@@ -31966,11 +31982,8 @@ const getDefaultTask = ({
   showIntroduction,
   shouldShowSingpassSelection
 }) => {
-  var _a, _b;
-  const hasOwnEntityAssocation = (_a = legalEntity.entityAssociations) == null ? void 0 : _a.some((ea) => ea.associatorId === legalEntity.id);
-  const hasOrganizationType = (_b = legalEntity.organization) == null ? void 0 : _b.type;
-  const hasProgressedBeyondEntitySelection = hasOwnEntityAssocation || !!hasOrganizationType;
-  if (isNewEntryFlowEnabled && !accountHolder2 && !hasProgressedBeyondEntitySelection)
+  const hasLegalEntityProgressedBeyondEntitySelection = hasProgressedBeyondEntitySelection(legalEntity);
+  if (isNewEntryFlowEnabled && !accountHolder2 && !hasLegalEntityProgressedBeyondEntitySelection)
     return TaskTypes.BUSINESS_TYPE_SELECTION;
   if (showIntroduction)
     return TaskTypes.INTRODUCTION;
@@ -31978,6 +31991,12 @@ const getDefaultTask = ({
     return TaskTypes.SINGPASS_SELECTION;
   return TaskTypes.TASKS_OVERVIEW;
 };
+const hasProgressedBeyondEntitySelection = (legalEntity) => {
+  var _a, _b;
+  const hasOwnEntityAssocation = (_a = legalEntity.entityAssociations) == null ? void 0 : _a.some((ea) => ea.associatorId === legalEntity.id);
+  const hasOrganizationType = (_b = legalEntity.organization) == null ? void 0 : _b.type;
+  return hasOwnEntityAssocation || !!hasOrganizationType;
+};
 const PAGES_WITH_POLLING = [TaskTypes.DECISION_MAKER_OVERVIEW, TaskTypes.TASKS_OVERVIEW];
 const POLLING_INTERVAL = 3e3;
 const logger$b = createLogger("DropinComposerComponent");
@@ -32786,7 +32805,8 @@ function DropinComposerComponent({
         handleAddressSearch: args == null ? void 0 : args.handleAddressSearch,
         handleFindAddress: args == null ? void 0 : args.handleFindAddress,
         onTypeSwitch: navigateToTypeSwitcher,
-        isTargetLegalEntityType: legalEntityType === LegalEntityType.ORGANIZATION
+        isTargetLegalEntityType: legalEntityType === LegalEntityType.ORGANIZATION,
+        accountHolder: accountHolder2
       });
     case TaskTypes.COMPANY_SEARCH:
       return jsx(CompanySearchDropinComponent, {
@@ -32843,7 +32863,8 @@ function DropinComposerComponent({
         homeButtonLabel: i18n.get("saveAndGoToOverview"),
         associationDetail: trustMember,
         handleAddressSearch: args == null ? void 0 : args.handleAddressSearch,
-        handleFindAddress: args == null ? void 0 : args.handleFindAddress
+        handleFindAddress: args == null ? void 0 : args.handleFindAddress,
+        accountHolder: accountHolder2
       });
     case TaskTypes.PAYOUT:
     case TaskTypes.PAYIN:
@@ -34798,7 +34819,7 @@ const ConfigurationApiProvider = ({
     isEmbeddedDropin,
     loadingContext
   } = authContext;
-  const sdkVersion = "3.15.1";
+  const sdkVersion = "3.15.2";
   useAnalytics({
     onUserEvent,
     legalEntityId: rootLegalEntityId,

package/dist/types/components/BusinessTypeSelection/utils.d.ts

@@ -30,6 +30,7 @@ export declare const useSelectionOptions: (legalEntityResponse: ExistingLegalEnt
 /**
  *
  */
-export declare const mapLegalArrangementOptionToCompanyTypesValue: (legalArrangement: LegalArrangementOption | undefined) => CompanyTypesValue | '';
+export declare const mapLegalArrangementOptionToCompanyTypesValue: (legalArrangement: LegalArrangementOption | undefined) => CompanyTypesValue | undefined;
+export declare const determineOrganizationTypeToUpdate: (defaultLegalArrangement?: LegalArrangementOption, targetLegalArrangement?: LegalArrangementOption, currentCompanyTypeValue?: CompanyTypesValue) => CompanyTypesValue | '' | undefined;
 export declare const getDefaultLegalArrangementOrSuborganizationType: (legalEntityResponse: ExistingLegalEntity | undefined, accountHolder: AccountHolderOption | null) => LegalArrangementOption | undefined;
 export declare const getTargetLegalEntityType: (businessType: BusinessType | undefined, legalArrangement: LegalArrangementOption | undefined, trusteeType: TrusteeType | undefined, currentLegalEntityType: LegalEntityType | undefined) => LegalEntityType;

package/dist/types/components/Dropins/CompanyDropin/components/CompanyDropinComponent.d.ts

@@ -1,2 +1,2 @@
 import type { CompanyDropinProps } from '../types';
-export declare function CompanyDropinComponent({ country: parentCountry, problems: propProblems, hideDropinLayout, taskName, capabilities, homeButtonLabel, taskType, trackingConfig, associationDetail, parentLegalEntity, legalEntityResponse, isTargetLegalEntityType, eventEmitter, onSubmit: onExternalSubmit, handleCreateDocument, handleGetDocument, handleUpdateDocument, handleAddressSearch, handleFindAddress, handleCreateLegalEntity, handleUpdateLegalEntity, handleHomeClick, onTypeSwitch, onChange, }: CompanyDropinProps): import("preact").JSX.Element;
+export declare function CompanyDropinComponent({ country: parentCountry, problems: propProblems, hideDropinLayout, taskName, capabilities, homeButtonLabel, taskType, trackingConfig, associationDetail, parentLegalEntity, legalEntityResponse, isTargetLegalEntityType, eventEmitter, onSubmit: onExternalSubmit, handleCreateDocument, handleGetDocument, handleUpdateDocument, handleAddressSearch, handleFindAddress, handleCreateLegalEntity, handleUpdateLegalEntity, handleHomeClick, onTypeSwitch, onChange, accountHolder, }: CompanyDropinProps): import("preact").JSX.Element;

package/dist/types/components/Dropins/CompanyDropin/types.d.ts

@@ -1,5 +1,6 @@
 import type { ExistingLegalEntity } from '../../../core/models/api/legal-entity';
 import type { CompanyProps, CompanySchema } from '../../Company/types';
+import type { AccountHolderOption } from '../../internal/AccountHolder/types';
 import type { TrustMember } from '../../TrustMembers/types';
 import type { DropinAPIHandlers, DropinProps } from '../types';
 export interface CompanyDropinProps extends Omit<CompanyProps, 'isTopLevelEntity'>, DropinAPIHandlers, DropinProps {
@@ -7,4 +8,5 @@ export interface CompanyDropinProps extends Omit<CompanyProps, 'isTopLevelEntity
     associationDetail?: TrustMember;
     isTargetLegalEntityType?: boolean;
     onSubmit?: (company: CompanySchema) => void;
+    accountHolder?: AccountHolderOption;
 }

package/dist/types/components/internal/AccountHolder/types.d.ts

@@ -2,7 +2,7 @@ import type { BaseInnerFormProps } from '../../../core/hooks/useForm';
 import type { LegalEntityType } from '../../../core/models/api/legal-entity-type';
 import type { CountryCode } from '../../../core/models/country-code';
 export type LegalArrangementOption = 'aTrust' | 'partnershipIncorporated' | 'partnershipUnincorporated' | 'associationIncorporated';
-export type AccountHolderOption = 'myName' | 'mySoleProprietorName' | 'theCompanyIWorkFor' | LegalArrangementOption;
+export type AccountHolderOption = 'myName' | 'mySoleProprietorName' | 'theCompanyIWorkFor' | 'aTrust';
 export interface AccountHolderSchema {
     accountHolder?: AccountHolderOption;
 }

package/dist/types/utils/accountHolderUtils.d.ts

@@ -7,5 +7,5 @@ export declare const entityTypeToCorrespondingAccountHolderOption: Record<LegalE
  ** Account holder option is not stored in backend as it does not effect any check evaluations.
  ** The value is computed in the front end based on the associations and current flow of the legalEntity
  * */
-export declare const getDefaultAccountHolderType: (legalEntityResponse: ExistingLegalEntity | undefined, isTypeChanging?: boolean) => AccountHolderOption | undefined;
+export declare const getDefaultAccountHolderType: (legalEntityResponse: ExistingLegalEntity | undefined, isTypeChanging?: boolean, accountHolder?: AccountHolderOption) => AccountHolderOption | undefined;
 export declare const allowIndividualWithoutSoleProp: (capabilities: CapabilityName[]) => boolean;

package/dist/types/utils/mapping/mapping.d.ts

@@ -1,6 +1,7 @@
 import type { BankDocumentSchema } from '../../components/BankDocument/types';
 import type { CompanySchema } from '../../components/Company/types';
 import type { IndividualSchema } from '../../components/Individual/types';
+import type { AccountHolderOption } from '../../components/internal/AccountHolder/types';
 import type { PayoutDetailsSchema } from '../../components/PayoutDetails/types';
 import type { PersonalDetailsSchema } from '../../components/PersonalDetails/types';
 import type { SolePropSchema } from '../../components/SoleProp/types';
@@ -29,7 +30,7 @@ export declare const mapPayoutDetailsToTransferInstrument: ({ data, legalEntity,
 }) => TransferInstrument;
 export declare const mapLegalEntityToIndividual: (legalEntity: ExistingLegalEntity | undefined, isChangingType?: boolean) => IndividualSchema;
 export declare const mapIndividualToLegalEntity: (data: IndividualSchema) => LegalEntity;
-export declare const mapLegalEntityToCompany: (legalEntity: ExistingLegalEntity, isChangingType: boolean) => CompanySchema;
+export declare const mapLegalEntityToCompany: (legalEntity: ExistingLegalEntity, isChangingType: boolean, accountHolder?: AccountHolderOption) => CompanySchema;
 export declare const mapCompanyToLegalEntity: (data: CompanySchema) => LegalEntity;
 export declare const mapLegalEntityToTrust: (legalEntity: LegalEntity) => TrustSchema;
 export declare const mapTrustToLegalEntity: (data: TrustSchema) => LegalEntity;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adyen/kyc-components",
-  "version": "3.15.1",
+  "version": "3.15.2",
   "description": "",
   "license": "MIT",
   "files": [