@adyen/kyc-components 4.6.3 → 4.7.1

package/dist/{useBusinessDetailsData-CPww2HAm.js → useBusinessDetailsData-BKgf0j8T.js}

@@ -2,71 +2,70 @@
 {
   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] = "a0b994cf-7c6a-43c3-b2b2-9d1c065b7855", e._sentryDebugIdIdentifier = "sentry-dbid-a0b994cf-7c6a-43c3-b2b2-9d1c065b7855");
+    n && (e._sentryDebugIds = e._sentryDebugIds || {}, e._sentryDebugIds[n] = "c4f32db7-1380-4547-9b39-670d962ce933", e._sentryDebugIdIdentifier = "sentry-dbid-c4f32db7-1380-4547-9b39-670d962ce933");
   } catch (e) {
   }
 }
 ;
 import { jsx, jsxs, Fragment } from "preact/jsx-runtime";
-import { useMutation, useQuery, skipToken, useQueryClient } from "@tanstack/preact-query";
+import { signal, useSignal } from "@preact/signals";
+import { useMutation, queryOptions, useQuery, skipToken, useQueryClient } from "@tanstack/preact-query";
 import { useState, useMemo, useEffect, useRef, useCallback } from "preact/hooks";
-import { D as Divider, I as INDUSTRY_CODE_FIELD, i as industryCodeFieldMetadata, u as useIndustryCodes, a as IndustryCodeField, b as useCreateBusinessLine, c as useUpdateBusinessLine } from "./useUpdateBusinessLines-97t7rLep.js";
-import { u as useScenarios } from "./useScenarios-Bn3EGOHA.js";
-import { u as useCreateLegalEntity } from "./useCreateLegalEntity-D3ObXaof.js";
-import { u as useToastContext, a as useInvalidateRootLegalEntity } from "./useToastContext-Bxju6PLZ.js";
-import { u as useUpdateLegalEntity } from "./useUpdateLegalEntity-CLWcAVwj.js";
-import { u as useTranslation, bF as isISIN, V as Button, H as useToggleContext, P as useLegalEntity, R as ROOT_LE, am as datasetUtilities, aB as Header, N as Typography, U as Loader, a9 as CountryCodes, m as useSettingsContext, aN as useAllowedCountries, b as useApiContext, j as httpPost, x as useAnalyticsContext, O as StackLayout, C as Alert, ao as entriesOf, ae as createLogger, t as useAccountHolder, w as TaskTypes, L as LegalEntityTypes, ax as isEmpty, i as isUndefinedOrNull, bG as businessDetailsComponentsKeyMapping, bH as solePropBusinessDetailsKeyMapping, ah as objectsDeepEqual, aS as keysOf, bI as solePropBusinessDetailsApiKeyMapping, bk as businessDetailsApiKeyMapping, at as Scenarios, aZ as filterOutUnwantedAssociationsIfRootLE, aX as drop, ac as getOwnEntityAssociations, b2 as doArraysMatch, bJ as solePropBusinessDetailsDocumentMapping, bK as businessDetailsDocumentMapping } from "./StoreProvider-hNCKWSzB.js";
-import { u as useFormContext, F as FormContextProvider, a as FormFlow } from "./useFormContext-DKaDgcgR.js";
-import { C as CompanyTypesValues } from "./bafinUtils-Cf0EyXIO.js";
-import { c as composePerScenarioFormConfigurations, g as getPropsFromConfigurations } from "./process-field-configurations-DIs_LC2a.js";
-import { a as addValidityToForms, u as useFormComposer } from "./dropinUtils-BY7YDLvA.js";
-import { u as useMultiForm } from "./useMultiForm-BG8MF6DI.js";
-import { u as uppercase, m as mapExistingFile, g as getPageName, b as useScenarioConfiguration } from "./mapExistingFile-BqPAjtnr.js";
-import { u as useTaskLandedEvent } from "./useTaskLandedEvent-Cee5Mvme.js";
-import { C as Confirm } from "./Confirm-Bfhearjt.js";
-import { E as ErrorPanel } from "./ErrorPanel-BFnWeBCJ.js";
-import { N as NewSummary } from "./NewSummary-DKld0bET.js";
-import { u as usePageLandedEvent, s as summaryStep, a as summaryStyles } from "./Summary-NFgvajMx.js";
-import { a as getDocument, j as getDocuments, c as createDocumentRequest, k as mergeProofOfOwnershipAttachments, b as getFileExtention, d as documentApiUtils } from "./validate-BxU9EEi6.js";
-import { m as mergeFieldMetadataIntoProps, c as createFormUtils } from "./formUtils-os98XaB-.js";
-import { c as TAX_INFORMATION_FIELD, r as requestingBanking, d as requestingIssuing, t as taxInformationDefaultFieldMetadata, a as taxInformationDefaultFieldConfig, T as TaxInformationField, C as COUNTRY_OF_GOVERNING_LAW_POSSIBLE, e as getTaxInformationPlaceholderText, S as StateCodesUS, i as isUsingCompanySearch, M as MemoizedDocumentUpload, f as countryToTaxInfoTypeMap, h as isRegistrationNumberAbsentStateV4Scenario, j as getTaxIdNumberOptions, k as COUNTRIES_THAT_USE_TAX_ID_INSTEAD_OF_VAT, l as rules, g as getFieldsWithExistingData } from "./TaxInformationField-ef1_TQvO.js";
-import { D as DBA_NAME_FIELD, B as BUSINESS_REGISTRATION_NUMBER_FIELD, V as VAT_NUMBER_FIELD, r as registrationAddressFields, o as operationalAddressIsSameIds, v as vatAbsenceReasonMetadata, d as defaultFieldMetadata, a as defaultFieldConfig, b as registrationNumberDefaultFieldMetadata, c as registrationNumberDefaultFieldConfig, e as doingBusinessAsFieldMetadata, f as doingBusinessAsAbsentFieldMetadata, g as DBANameField, h as BusinessRegistrationNumberField, i as getRegistrationNumberHelperText, j as VatNumberField, M as MemoizedConstitutionalDocument, k as getDefaultRegistrationNumberType, l as getDefaultVatNumberType, m as inferCompanyRegistrationNumberType, n as getCompanyRegistrationNumberOptions, p as exemptFromRegistrationNumberDefaultFieldMetadata } from "./ConstitutionalDocument-BZcUcXNX.js";
-import { K as KEYBOARD_KEYS, M as Modal, a as ModalContent } from "./Modal-D1Yiugk1.js";
-import { g as getAddressSchemaForCountry, C as COUNTRIES_WITH_STATES_DATASET, a as getAddressSchemaLabelsByCountry, f as mapAddressLabelsNewSummary, c as getKeyForField } from "./utils-BN54hZUe.js";
+import { D as Divider, I as INDUSTRY_CODE_FIELD, i as industryCodeFieldMetadata, u as useIndustryCodes, a as IndustryCodeField, b as useCreateBusinessLine, c as useUpdateBusinessLine } from "./useUpdateBusinessLines-bS2l9wAZ.js";
+import { u as useScenarios } from "./useScenarios-ZY51ox86.js";
+import { u as useCreateLegalEntity } from "./useCreateLegalEntity-BEEy8g0o.js";
+import { u as useToastContext, a as useInvalidateRootLegalEntity } from "./useToastContext-CKEFuMZU.js";
+import { u as useUpdateLegalEntity } from "./useUpdateLegalEntity-5AD9uK8f.js";
+import { u as useTranslation, bG as isISIN, V as Button, H as useToggleContext, P as useLegalEntity, R as ROOT_LE, am as datasetUtilities, aB as Header, N as Typography, U as Loader, a9 as CountryCodes, m as useSettingsContext, aO as useAllowedCountries, b as useApiContext, j as httpPost, x as useAnalyticsContext, O as StackLayout, C as Alert, ao as entriesOf, ae as createLogger, t as useAccountHolder, w as TaskTypes, L as LegalEntityTypes, ax as isEmpty, i as isUndefinedOrNull, bH as businessDetailsComponentsKeyMapping, bI as solePropBusinessDetailsKeyMapping, ah as objectsDeepEqual, aT as keysOf, bJ as solePropBusinessDetailsApiKeyMapping, bl as businessDetailsApiKeyMapping, at as Scenarios, a$ as filterOutUnwantedAssociationsIfRootLE, aY as drop, ac as getOwnEntityAssociations, b3 as doArraysMatch, bK as solePropBusinessDetailsDocumentMapping, bL as businessDetailsDocumentMapping } from "./StoreProvider-Bt6bLVE-.js";
+import { u as useFormContext, F as FormContextProvider, a as FormFlow } from "./useFormContext-BZwb6dry.js";
+import { C as CompanyTypesValues } from "./bafinUtils-DsUdZgzH.js";
+import { c as composePerScenarioFormConfigurations, g as getPropsFromConfigurations } from "./process-field-configurations-DNb-fWox.js";
+import { a as addValidityToForms, u as useFormComposer } from "./dropinUtils-D3x5I-79.js";
+import { u as useMultiForm } from "./useMultiForm-DrspjU-_.js";
+import { u as uppercase, m as mapExistingFile, g as getPageName, b as useScenarioConfiguration } from "./mapExistingFile-DUgMBW9t.js";
+import { C as Confirm } from "./Confirm-DW7YOE1F.js";
+import { E as ErrorPanel } from "./ErrorPanel-D3OmtL80.js";
+import { N as NewSummary } from "./NewSummary-R9k7ZbPo.js";
+import { s as summaryStep, a as summaryStyles } from "./Summary-BUJLYAgF.js";
+import { a as getDocument, j as getDocuments, c as createDocumentRequest, k as mergeProofOfOwnershipAttachments, b as getFileExtention, d as documentApiUtils } from "./validate-CmVYROUS.js";
+import { m as mergeFieldMetadataIntoProps, c as createFormUtils } from "./formUtils-C1nur8r7.js";
+import { c as TAX_INFORMATION_FIELD, r as requestingBanking, d as requestingIssuing, t as taxInformationDefaultFieldMetadata, a as taxInformationDefaultFieldConfig, T as TaxInformationField, C as COUNTRY_OF_GOVERNING_LAW_POSSIBLE, e as getTaxInformationPlaceholderText, S as StateCodesUS, i as isUsingCompanySearch, M as MemoizedDocumentUpload, f as countryToTaxInfoTypeMap, h as isRegistrationNumberAbsentStateV4Scenario, j as getTaxIdNumberOptions, k as COUNTRIES_THAT_USE_TAX_ID_INSTEAD_OF_VAT, l as rules, g as getFieldsWithExistingData } from "./TaxInformationField-CknxoOIl.js";
+import { D as DBA_NAME_FIELD, B as BUSINESS_REGISTRATION_NUMBER_FIELD, V as VAT_NUMBER_FIELD, r as registrationAddressFields, o as operationalAddressIsSameIds, v as vatAbsenceReasonMetadata, d as defaultFieldMetadata, a as defaultFieldConfig, b as registrationNumberDefaultFieldMetadata, c as registrationNumberDefaultFieldConfig, e as doingBusinessAsFieldMetadata, f as doingBusinessAsAbsentFieldMetadata, g as DBANameField, h as BusinessRegistrationNumberField, i as getRegistrationNumberHelperText, j as VatNumberField, M as MemoizedConstitutionalDocument, k as getDefaultRegistrationNumberType, l as getDefaultVatNumberType, m as inferCompanyRegistrationNumberType, n as getCompanyRegistrationNumberOptions, p as exemptFromRegistrationNumberDefaultFieldMetadata } from "./ConstitutionalDocument-CK6FFFwg.js";
+import { K as KEYBOARD_KEYS, M as Modal, a as ModalContent } from "./Modal-C5mnAneL.js";
+import { g as getAddressSchemaForCountry, C as COUNTRIES_WITH_STATES_DATASET, a as getAddressSchemaLabelsByCountry, f as mapAddressLabelsNewSummary, c as getKeyForField } from "./utils-DpBs-qSJ.js";
 import { r as resolveFieldMetadata } from "./fieldConfigurations-BUT9DTUH.js";
-import { f as formatCurrency, A as ALLOWED_SOF_SERVICES } from "./utils-C1FWQvf0.js";
-import { b as useAddressCleanse, f as formatAddressForCleanse, m as mapAddressData, A as Address, g as getNestedTrustedFields, S as STATE_FIELD, d as defaultFieldMetadata$1, c as defaultFieldConfig$1, e as StateField, i as isDateOlderThanAYear } from "./Address-CVPObm6B.js";
+import { f as formatCurrency, A as ALLOWED_SOF_SERVICES } from "./utils-BzAU2BN1.js";
+import { b as useAddressCleanse, f as formatAddressForCleanse, m as mapAddressData, A as Address, g as getNestedTrustedFields, S as STATE_FIELD, d as defaultFieldMetadata$1, c as defaultFieldConfig$1, e as StateField, i as isDateOlderThanAYear } from "./Address-Czpdu7Iv.js";
 import { S as SettingNames } from "./types-Dv0COrvY.js";
-import { o as organizationTypesToSkipCompanyStructureForm } from "./utils-DPRgxXmU.js";
-import { i as isValidationError, p as processValidationErrors, a as isMaintenanceModeError } from "./validationError-sIV2dUoW.js";
-import { t as toFullWidth, m as mapJpAddressSchemaToAddressLocalizations } from "./mapJpAddressSchemaToAddressLocalizations-WxoGOrHr.js";
-import { i as isEmpty$1 } from "./isEmpty-ze-XxTHy.js";
+import { o as organizationTypesToSkipCompanyStructureForm } from "./utils-CqJ09Ne0.js";
+import { i as isValidationError, p as processValidationErrors, a as isMaintenanceModeError } from "./validationError-CSob70hx.js";
+import { t as toFullWidth, m as mapJpAddressSchemaToAddressLocalizations } from "./mapJpAddressSchemaToAddressLocalizations-BXIw8J3t.js";
+import { i as isEmpty$1 } from "./isEmpty-CpSE7NAw.js";
 import { f as formatObject } from "./utils-DNSfZiio.js";
 import { b as mapAddressLocalizationToJpAddressSchema, a as mapApiScriptLocalizationToSchemaFields, m as mapSchemaFieldsToApiScriptLocalization } from "./mapAddressLocalizationToJpAddressSchema-vJWbpAyq.js";
-import { L as LegalFormField, I as InputNumber, c as InputCurrency, b as CURRENCY_FIELD, C as Currency, m as mapFinancialReportsToFinancialInformation, a as mapFinancialInformationToFinancialReport } from "./Currency-BsVi8QRc.js";
-import { L as LandingLayout } from "./LandingLayout-Co0T9hoE.js";
-import { g as getLegalCompanyNameGuidanceText, L as LEGAL_COMPANY_NAME_FIELD, d as defaultFieldMetadataV4, a as defaultFieldMetadata$2, b as defaultFieldConfigV4, c as defaultFieldConfig$2 } from "./LegalCompanyNameField-EsmoOYWn.js";
-import { h as useBusinessLines } from "./OnboardingDropinComponent-DsvTtn8J.js";
+import { L as LegalFormField, I as InputNumber, c as InputCurrency, b as CURRENCY_FIELD, C as Currency, m as mapFinancialReportsToFinancialInformation, a as mapFinancialInformationToFinancialReport } from "./Currency-DUnZGkXH.js";
+import { L as LandingLayout } from "./LandingLayout-B_Cw3o3Q.js";
+import { g as getLegalCompanyNameGuidanceText, L as LEGAL_COMPANY_NAME_FIELD, d as defaultFieldMetadataV4, a as defaultFieldMetadata$2, b as defaultFieldConfigV4, c as defaultFieldConfig$2 } from "./LegalCompanyNameField-BRzGJ-Ov.js";
+import { h as useBusinessLines } from "./OnboardingDropinComponent-45YclRJI.js";
 import { Suspense, lazy } from "preact/compat";
-import { C as Checkbox } from "./Checkbox-CZ-K3Ygt.js";
-import { F as Field } from "./Field-B8NADHt-.js";
-import { I as InputDate, f as formatDateObj } from "./InputDate-BvgrweAT.js";
-import { a as validateNotEmptyOnBlur, v as validatePatternOnBlur, b as validateJaKanaLegalCompanyName, c as validateJaHaniLegalCompanyName } from "./patternValidators-Dx583C-1.js";
-import { M as MaskedInput, m as makeMask, d as alphanumericInputs, b as alphaInputs, n as numericInputs } from "./MaskedInput-Cj3Be_WU.js";
-import { i as isJapanLocalizationEnabled } from "./japanSupportUtils-DYEPbhFP.js";
+import { C as Checkbox } from "./Checkbox-BbVX_nZi.js";
+import { F as Field } from "./Field-ClKiPVDa.js";
+import { I as InputDate, f as formatDateObj } from "./InputDate-BajoDzsK.js";
+import { a as validateNotEmptyOnBlur, v as validatePatternOnBlur, b as validateJaKanaLegalCompanyName, c as validateJaHaniLegalCompanyName } from "./patternValidators-0N8_moed.js";
+import { M as MaskedInput, m as makeMask, d as alphanumericInputs, b as alphaInputs, n as numericInputs } from "./MaskedInput-ApBB9ewS.js";
+import { i as isJapanLocalizationEnabled } from "./japanSupportUtils-CprkdtHL.js";
 import { u as useDebouncedCallback } from "./debouncedInputEvent-Cv2S512Y.js";
-import { signal } from "@preact/signals";
 import cx from "classnames";
-import { L as Link } from "./Link-QFSK0XUO.js";
+import { L as Link } from "./Link-DS54L_TE.js";
 import { S as StructuredList } from "./StructuredList-CNha20ka.js";
-import { I as InputText } from "./InputText-D6VoNS-R.js";
-import { C as CountryField, a as COUNTRY_FIELD } from "./CountryField-BJAayKID.js";
-import { L as LoaderWrapper } from "./LoaderWrapper-DlhbbEYS.js";
+import { I as InputText } from "./InputText-C8kj07ZB.js";
+import { C as CountryField, a as COUNTRY_FIELD } from "./CountryField-CAgo6wFJ.js";
+import { L as LoaderWrapper } from "./LoaderWrapper-DvyhRweQ.js";
 import { C as Card } from "./Card-OQuFzmxm.js";
-import { L as ListItem } from "./ListItem-rRlEZCTu.js";
-import { T as TileGroup } from "./TileGroup-DTnywnyF.js";
-import { c as currencyByCountry } from "./types-lbafosQE.js";
-import { R as RadioGroup } from "./RadioGroup-DwACEtfi.js";
+import { L as ListItem } from "./ListItem-CFcOIT6E.js";
+import { T as TileGroup } from "./TileGroup-UvRO_GGK.js";
+import { c as currencyByCountry } from "./types-CJnNafzu.js";
+import { R as RadioGroup } from "./RadioGroup-CbeNPI_8.js";
 const DATE_OF_INCORPORATION_FIELD = [
   "dateOfIncorporation"
 ];
@@ -74,16 +73,16 @@ function DateOfIncorporationField({
   data,
   valid,
   errors,
-  labels,
   placeholder,
   readonly,
   handleChangeFor
 }) {
+  const { t } = useTranslation("common");
   return /* @__PURE__ */ jsx(
     Field,
     {
       name: "dateOfIncorporation",
-      label: labels.dateOfIncorporation,
+      label: t(($) => $["dateOfIncorporation"]),
       errorMessage: errors.dateOfIncorporation,
       isValid: valid.dateOfIncorporation,
       children: (childProps) => /* @__PURE__ */ jsx(
@@ -113,7 +112,6 @@ const validateDateOfIncorporation = (dateOfIncorporation) => {
   return date < /* @__PURE__ */ new Date() && date > new Date(1900, 0, 1);
 };
 const dateOfIncorporationFieldMetadata = {
-  label: "dateOfIncorporation",
   validators: [
     validateNotEmptyOnBlur,
     {
@@ -185,7 +183,6 @@ const eInvoicingCodeFieldMetadata = {
   }
 };
 const stockExchangeMICFieldMetadata = {
-  label: "stockExchangeMIC",
   validators: [validateNotEmptyOnBlur, validatePatternOnBlur(/^[a-zA-Z0-9]{4}$/)],
   mask: {
     mask: makeMask(...alphanumericInputs(4)),
@@ -199,7 +196,6 @@ function StockExchangeMICField({
   data,
   valid,
   errors,
-  labels,
   readonly,
   mask,
   shouldValidate,
@@ -211,7 +207,7 @@ function StockExchangeMICField({
     {
       name: "stockExchangeMIC",
       type: "text",
-      label: labels.stockExchangeMIC ?? "",
+      label: t(($) => $["stockExchangeMIC"]),
       formatGuidance: t(($) => $["enterNCharactersForExample"], { numChars: "4", example: "XNAS" }),
       ...mask,
       errorMessage: errors.stockExchangeMIC,
@@ -227,7 +223,6 @@ function StockExchangeMICField({
   );
 }
 const stockISINFieldMetadata = {
-  label: "stockISIN",
   validators: [
     validateNotEmptyOnBlur,
     {
@@ -245,7 +240,6 @@ function StockISINField({
   data,
   valid,
   errors,
-  labels,
   readonly,
   mask,
   shouldValidate,
@@ -257,7 +251,7 @@ function StockISINField({
     {
       name: "stockISIN",
       type: "text",
-      label: labels.stockISIN ?? "",
+      label: t(($) => $["stockISIN"]),
       formatGuidance: t(($) => $["validationPleaseEnterAValidStockISIN"], {
         example: "NL0012969182"
       }),
@@ -275,7 +269,6 @@ function StockISINField({
   );
 }
 const stockTickerSymbolFieldMetadata = {
-  label: "stockTickerSymbol",
   validators: [validateNotEmptyOnBlur, validatePatternOnBlur(/^[A-Z\d]{1,5}$/)],
   mask: {
     mask: makeMask(...alphanumericInputs(1), ...alphanumericInputs(4)),
@@ -289,7 +282,6 @@ function StockTickerSymbolField({
   data,
   valid,
   errors,
-  labels,
   readonly,
   mask,
   shouldValidate,
@@ -301,7 +293,7 @@ function StockTickerSymbolField({
     {
       name: "stockTickerSymbol",
       type: "text",
-      label: labels.stockTickerSymbol ?? "",
+      label: t(($) => $["stockTickerSymbol"]),
       formatGuidance: t(($) => $["enterAMaximumOfNCharactersForExample"], {
         maxChars: "5",
         example: "ADYEN"
@@ -333,7 +325,6 @@ const isBankAccountRequestedForOrganization = signal(void 0);
 const tinMatched = signal(void 0);
 const businessMismatchModalOpen = signal(false);
 const verifiedBusiness = signal(void 0);
-const isVerifiedSingleCompanySearchResult = signal(false);
 const additionalInformationContent = "adyen-kyc-additional-information-content";
 const additionalInformationSectionHeading = "adyen-kyc-additional-information-section-heading";
 const styles$4 = {
@@ -407,7 +398,7 @@ function VerifiedBusinessCard({
   ] });
 }
 const LazyJpAddress = lazy(
-  async () => (await import("./JpAddress-aZ8F40cK.js")).JpAddress
+  async () => (await import("./JpAddress-BpaKGrVA.js")).JpAddress
 );
 const ADDITIONAL_INFORMATION_FORM_ID = "additionalInformation";
 const ADDITIONAL_INFORMATION_FIELDS = [
@@ -454,7 +445,6 @@ function AdditionalInformation({
   if (requestingIssuing(rootLegalEntity)) {
     businessLineTypes.push("issuing");
   }
-  usePageLandedEvent();
   const [addressToCheck, setAddressToCheck] = useDebouncedState(500);
   const { data: cleansedRegistrationAddress } = useAddressCleanse(
     {
@@ -748,9 +738,6 @@ function AdditionalInformation({
                 validationErrors,
                 DBA_NAME_FIELD
               ),
-              labels: formUtils.getFieldLabels(DBA_NAME_FIELD, {
-                hasDoingBusinessAs: "hasDba"
-              }),
               readonly: formUtils.isReadOnly("doingBusinessAs"),
               handleChangeFor
             }
@@ -880,11 +867,6 @@ function AdditionalInformation({
                 validationErrors,
                 INDUSTRY_CODE_FIELD
               ),
-              labels: {
-                industryCodes: t(($) => $["industry"], {
-                  ns: "business"
-                })
-              },
               guidanceText: t(($) => $["primaryIndustryCodeGuidance"], { ns: "business" }),
               readonly: formUtils.isReadOnly("industryCodes"),
               handleChangeFor,
@@ -909,7 +891,6 @@ function AdditionalInformation({
                 validationErrors,
                 DATE_OF_INCORPORATION_FIELD
               ),
-              labels: formUtils.getFieldLabels(DATE_OF_INCORPORATION_FIELD),
               placeholder: t(($) => $["datePlaceholder"]),
               readonly: formUtils.isReadOnly("dateOfIncorporation"),
               handleChangeFor
@@ -936,7 +917,6 @@ function AdditionalInformation({
                 validationErrors,
                 STOCK_EXCHANGE_MIC_FIELD
               ),
-              labels: formUtils.getFieldLabels(STOCK_EXCHANGE_MIC_FIELD),
               mask: formUtils.getMask("stockExchangeMIC"),
               readonly: formUtils.isReadOnly("stockExchangeMIC"),
               shouldValidate,
@@ -959,7 +939,6 @@ function AdditionalInformation({
                 validationErrors,
                 STOCK_ISIN_FIELD
               ),
-              labels: formUtils.getFieldLabels(STOCK_ISIN_FIELD),
               mask: formUtils.getMask("stockISIN"),
               readonly: formUtils.isReadOnly("stockISIN"),
               shouldValidate,
@@ -982,7 +961,6 @@ function AdditionalInformation({
                 validationErrors,
                 STOCK_TICKER_SYMBOL_FIELD
               ),
-              labels: formUtils.getFieldLabels(STOCK_TICKER_SYMBOL_FIELD),
               mask: formUtils.getMask("stockTickerSymbol"),
               readonly: formUtils.isReadOnly("stockTickerSymbol"),
               shouldValidate,
@@ -1261,7 +1239,6 @@ function BasicInformation({
   const currentCountryTaxInformation = form.data.basicInformation?.taxInformation?.find(
     (tax) => tax.country === country
   );
-  usePageLandedEvent();
   const handleChangeFor = useCallback(
     (fieldName, mode) => form.handleChangeFor(fieldName, "basicInformation", mode),
     [form]
@@ -1618,16 +1595,27 @@ const KNOWN_DISALLOWED_INDEX_DATASET_STATES = [
   StateCodesUS.Texas
 ];
 const KOMPANY_SEARCH_FAILURE = "Kompany index and deep search both failed to complete";
-const useCompanySearch = (data, options) => {
-  const { rootLegalEntityId, baseUrl } = useApiContext();
-  const { isAgnosticEndpointEnabled } = useCompanySearchFeature();
-  return useQuery({
+const companySearchQueryOptions = (rootLegalEntityId, baseUrl, data, isAgnosticEndpointEnabled, options) => {
+  return queryOptions({
     queryKey: ["companySearch", data],
-    queryFn: () => handleCompanySearch(rootLegalEntityId.value, baseUrl.value, data, isAgnosticEndpointEnabled),
+    queryFn: () => handleCompanySearch(rootLegalEntityId, baseUrl, data, isAgnosticEndpointEnabled),
     retry: 0,
     ...options
   });
 };
+const useCompanySearch = (data, options) => {
+  const { rootLegalEntityId, baseUrl } = useApiContext();
+  const { isAgnosticEndpointEnabled } = useCompanySearchFeature();
+  return useQuery(
+    companySearchQueryOptions(
+      rootLegalEntityId.value,
+      baseUrl.value,
+      data,
+      isAgnosticEndpointEnabled,
+      options
+    )
+  );
+};
 const handleCompanySearch = async (rootLegalEntityId, baseUrl, data, isAgnosticEndpointEnabled) => {
   if (isAgnosticEndpointEnabled) {
     const _data2 = {
@@ -1726,12 +1714,37 @@ const handleCompanyDataset = async (rootLegalEntityId, baseUrl, data, isAgnostic
   const isDataCompliant = _data.company.lastUpdate ? Date.parse(date) - Date.parse(_data.company.lastUpdate) < LOW_RISK_COMPANY_DATA_COMPLIANCE_WINDOW : false;
   return isDataCompliant && !KNOWN_DISALLOWED_INDEX_DATASET_STATES.includes(_data.state) ? await getCompanyDataset() : await refreshCompanyDataset();
 };
-const useVerifyTin = (data, options) => {
-  const { rootLegalEntityId, baseUrl } = useApiContext();
-  return useQuery({
+const verifyTinQueryOptions = (rootLegalEntityId, baseUrl, data, userEvents, options) => {
+  return queryOptions({
     queryKey: ["verifyTin", data],
-    queryFn: data ? () => verifyTin(rootLegalEntityId.value, baseUrl.value, data) : skipToken,
+    queryFn: data ? () => verifyTin(rootLegalEntityId, baseUrl, data) : skipToken,
     retry: 0,
+    meta: {
+      onSuccess: (data2) => {
+        if (data2.matched === true) {
+          tinMatched.value = true;
+          userEvents.addPageEvent("Success", {
+            actionType: "verify",
+            returnValue: "verifyTin",
+            returnType: "validation"
+          });
+        } else {
+          tinMatched.value = false;
+          userEvents.addPageEvent("Encountered error", {
+            actionType: "verify",
+            returnValue: "verifyTin",
+            returnType: "validation"
+          });
+        }
+      },
+      onError: () => {
+        userEvents.addPageEvent("Encountered error", {
+          actionType: "verify",
+          returnValue: "verifyTin",
+          returnType: "backend"
+        });
+      }
+    },
     ...options
   });
 };
@@ -1744,72 +1757,44 @@ const verifyTin = async (legalEntityId, baseUrl, data) => {
     data
   );
 };
-const startTiming = (key, timings = /* @__PURE__ */ new Map()) => {
-  const startTime = Date.now();
-  timings.set(key, { startTime });
-  return startTime;
-};
-const endTiming = (key, timings) => {
-  const timing = timings.get(key);
-  if (!timing || timing.endTime) {
-    return void 0;
-  }
-  const endTime = Date.now();
-  const duration = endTime - timing.startTime;
-  const updatedTiming = { ...timing, endTime, duration };
-  timings.set(key, updatedTiming);
-  return duration;
-};
-const withTiming = async (key, fn, analytics, timings = /* @__PURE__ */ new Map()) => {
-  startTiming(key, timings);
-  try {
-    const result = await fn();
-    const duration = endTiming(key, timings) || 0;
-    analytics.addEvent("Performance", {
-      actionType: "resolve",
-      actionLevel: "page",
-      label: key,
-      additionalData: {
-        duration
-      }
-    });
-    return { result, duration };
-  } catch (error) {
-    const duration = endTiming(key, timings) || 0;
-    analytics.addEvent("Performance", {
-      actionType: "reject",
-      actionLevel: "page",
-      label: key,
-      additionalData: {
-        duration
-      }
-    });
-    throw error;
-  }
-};
-const trackPerformance = (key, fn, analytics) => {
-  return withTiming(key, fn, analytics);
-};
-const useCompanySelection = (data, options) => {
+const useCompanySelection = (options) => {
   const { rootLegalEntityId, baseUrl } = useApiContext();
   const { isAgnosticEndpointEnabled } = useCompanySearchFeature();
   const userEvents = useAnalyticsContext();
-  return useQuery({
-    queryKey: ["companySelection", data],
-    queryFn: data ? async () => {
-      const { result } = await trackPerformance(
-        "companySelectionNetworkTime",
-        () => handleCompanySelection(
-          rootLegalEntityId.value,
-          baseUrl.value,
-          data,
-          isAgnosticEndpointEnabled
-        ),
-        userEvents
-      );
-      return result;
-    } : skipToken,
-    retry: 0,
+  return useMutation({
+    mutationFn: async (data) => handleCompanySelection(
+      rootLegalEntityId.value,
+      baseUrl.value,
+      data,
+      isAgnosticEndpointEnabled
+    ),
+    onMutate: () => {
+      verifiedBusiness.value = void 0;
+    },
+    onSuccess: (data) => {
+      if (data.tinMatched === true) {
+        tinMatched.value = true;
+        userEvents.addPageEvent("Success", {
+          actionType: "select",
+          returnValue: "companySelection",
+          returnType: "validation"
+        });
+      } else {
+        tinMatched.value = false;
+        userEvents.addPageEvent("Encountered error", {
+          actionType: "select",
+          returnValue: "companySelection",
+          returnType: "validation"
+        });
+      }
+    },
+    onError: () => {
+      userEvents.addPageEvent("Encountered error", {
+        actionType: "select",
+        returnValue: "companySelection",
+        returnType: "backend"
+      });
+    },
     ...options
   });
 };
@@ -1973,7 +1958,7 @@ function BusinessInformationCard({
   invalidTin,
   setIsBusinessSelection,
   handleSelectBusiness,
-  refetchCompanySelection,
+  retryCompanySelection,
   handleConfirmSelection,
   handleBackClick
 }) {
@@ -1999,7 +1984,7 @@ function BusinessInformationCard({
     }
   };
   const handleCardClick = () => {
-    handleSelectBusiness(result);
+    handleSelectBusiness();
   };
   return /* @__PURE__ */ jsx(Card, { selected: isSelected, onClick: isSelected ? void 0 : handleCardClick, children: /* @__PURE__ */ jsxs(StackLayout, { children: [
     /* @__PURE__ */ jsx(
@@ -2028,15 +2013,7 @@ function BusinessInformationCard({
           variant: "info",
           type: "callToAction",
           title: t(($) => $["businessSelection__failedToLoad"], { ns: "business" }),
-          actions: /* @__PURE__ */ jsx(
-            Button,
-            {
-              testId: "reloadBusiness",
-              onClick: () => refetchCompanySelection(),
-              variant: "link",
-              children: t(($) => $["tryAgain"], { ns: "common" })
-            }
-          ),
+          actions: /* @__PURE__ */ jsx(Button, { testId: "reloadBusiness", onClick: retryCompanySelection, variant: "link", children: t(($) => $["tryAgain"], { ns: "common" }) }),
           testId: "failedToLoad"
         }
       ),
@@ -2088,13 +2065,12 @@ function BusinessSelection({
   setLoadingStatus
 }) {
   const { t } = useTranslation(["common", "business"]);
+  const { baseUrl, rootLegalEntityId } = useApiContext();
   const { form } = useFormContext();
   const queryClient = useQueryClient();
   const userEvents = useAnalyticsContext();
   const { isFeatureEnabled } = useToggleContext();
   const [selectedBusinessId, setSelectedBusinessId] = useState();
-  const [fetchParams, setFetchParams] = useState();
-  usePageLandedEvent();
   const providerAgnosticEndpointsEnabled = isFeatureEnabled(
     "EnableProviderAgnosticCompanySearchAndSelect"
   );
@@ -2105,38 +2081,36 @@ function BusinessSelection({
     registrationNumber: form.data.basicInformation?.registrationNumber
   });
   const {
-    data: businessData,
-    isError: fetchingError,
-    isLoading: fetching,
-    refetch: refetchCompanySelection
-  } = useCompanySelection(fetchParams);
+    data: selectData,
+    isError: selectError,
+    isPending: selectPending,
+    mutate: selectCompany,
+    reset: resetCompanySelection
+  } = useCompanySelection();
+  const { mutateAsync: clearCompanyData2 } = useClearCompanyData();
   const currentTin = form.data.basicInformation?.taxInformation?.find(
     (taxId) => taxId.country === country
   )?.number;
-  const [prevBusinessData, setPrevBusinessData] = useState(businessData);
-  if (prevBusinessData !== businessData) {
-    if (businessData?.tinMatched === true) {
-      tinMatched.value = true;
-      userEvents.addPageEvent("Success", {
-        actionType: "select",
-        returnValue: "companySelection"
-      });
-    } else {
-      userEvents.addPageEvent("Encountered error", {
-        actionType: "select",
-        returnValue: "companySelection"
-      });
-    }
-    setPrevBusinessData(businessData);
-  }
-  if (fetching) {
-    verifiedBusiness.value = void 0;
-  }
-  const { mutateAsync: clearCompanyData2 } = useClearCompanyData();
+  const fetchCompanyData = (business) => {
+    resetCompanySelection();
+    selectCompany(business);
+  };
   const handleChange = useCallback(
     (fieldName, mode) => form.handleChangeFor(fieldName, "businessSelection", mode),
     [form]
   );
+  const buildCompanySelectionParams = (result) => {
+    return providerAgnosticEndpointsEnabled ? {
+      id: result.resultId,
+      name: result.name,
+      tin: currentTin ?? ""
+    } : {
+      company: result,
+      state: form.data.basicInformation?.stateOrProvince,
+      name: result.name,
+      tin: currentTin ?? ""
+    };
+  };
   const handleSelectBusiness = (result) => {
     const resultId = providerAgnosticEndpointsEnabled ? result.resultId : result.id;
     if ((!selectedBusinessId || selectedBusinessId !== resultId) && currentTin) {
@@ -2150,23 +2124,13 @@ function BusinessSelection({
         }
       });
       setSelectedBusinessId(resultId);
-      setFetchParams(
-        providerAgnosticEndpointsEnabled ? {
-          id: result.resultId,
-          name: result.name,
-          tin: currentTin
-        } : {
-          company: result,
-          state: form.data.basicInformation?.stateOrProvince,
-          name: result.name,
-          tin: currentTin
-        }
-      );
+      const companySelectionParams = buildCompanySelectionParams(result);
+      fetchCompanyData(companySelectionParams);
     }
   };
   const handleConfirmSelection = () => {
-    verifiedBusiness.value = businessData;
-    applyVerifiedBusinessData(form, country, businessData, providerAgnosticEndpointsEnabled);
+    verifiedBusiness.value = selectData;
+    applyVerifiedBusinessData(form, country, selectData, providerAgnosticEndpointsEnabled);
     handleChange("hasSelectedBusiness", "blur")(true);
     handleNextClick();
   };
@@ -2177,20 +2141,24 @@ function BusinessSelection({
       "input"
     )(form.defaultData?.companyStructure?.entityType);
   };
-  const tinVerificationParams = {
-    name: form.data.basicInformation?.legalCompanyName ?? "",
-    tin: form.data.basicInformation?.taxInformation?.[0]?.number ?? ""
-  };
-  useVerifyTin(tinVerificationParams, { enabled: false });
   const proceedToManualDataEntry = async () => {
     clearCompanyData2();
     restoreDefaultState();
     verifiedBusiness.value = void 0;
     try {
       setLoadingStatus("loading");
-      const { matched } = await queryClient.fetchQuery({
-        queryKey: ["verifyTin", tinVerificationParams]
-      });
+      const tinVerificationParams = {
+        name: form.data.basicInformation?.legalCompanyName ?? "",
+        tin: form.data.basicInformation?.taxInformation?.[0]?.number ?? ""
+      };
+      const { matched } = await queryClient.fetchQuery(
+        verifyTinQueryOptions(
+          rootLegalEntityId.peek(),
+          baseUrl.peek(),
+          tinVerificationParams,
+          userEvents
+        )
+      );
       tinMatched.value = matched;
       if (matched === false) {
         businessMismatchModalOpen.value = true;
@@ -2248,13 +2216,16 @@ function BusinessSelection({
       {
         result,
         selectedBusinessId,
-        currentBusinessSelection: businessData,
-        fetching,
-        fetchingError,
-        invalidTin: businessData?.tinMatched === false,
-        handleSelectBusiness,
+        currentBusinessSelection: selectData,
+        fetching: selectPending,
+        fetchingError: selectError,
+        invalidTin: selectData?.tinMatched === false,
+        handleSelectBusiness: () => handleSelectBusiness(result),
         handleConfirmSelection,
-        refetchCompanySelection,
+        retryCompanySelection: () => {
+          const companySelectionParams = buildCompanySelectionParams(result);
+          fetchCompanyData(companySelectionParams);
+        },
         handleBackClick
       },
       providerAgnosticEndpointsEnabled ? result.resultId : result.id
@@ -2327,7 +2298,6 @@ function CompanyStructure({
   const { accountHolder } = useAccountHolder();
   const { isSettingEnabled } = useSettingsContext();
   const canChangeEntityType = isSettingEnabled(SettingNames.AllowLegalEntityTypeChange);
-  usePageLandedEvent();
   const formUtils = createFormUtils(
     { requiredFields: form.requiredFields?.companyStructure ?? [] },
     t
@@ -2604,7 +2574,6 @@ function FinancialInformation({
 }) {
   const { t } = useTranslation("common");
   const { form } = useFormContext();
-  usePageLandedEvent();
   const defaultCurrency = currencyByCountry[country]?.[0] ?? "EUR";
   const handleChangeFor = useCallback(
     (fieldName, mode) => form.handleChangeFor(fieldName, "companyFinancialInformation", mode),
@@ -2812,6 +2781,52 @@ const documentFormsIds = [
 const stripWhitespace = (str) => str.replace(/\s/g, "");
 const toNormalizedString = (s) => stripWhitespace(s.toLowerCase());
 const isNormalizedStringMatch = (s1, s2) => toNormalizedString(s1) === toNormalizedString(s2);
+const startTiming = (key, timings = /* @__PURE__ */ new Map()) => {
+  const startTime = Date.now();
+  timings.set(key, { startTime });
+  return startTime;
+};
+const endTiming = (key, timings) => {
+  const timing = timings.get(key);
+  if (!timing || timing.endTime) {
+    return void 0;
+  }
+  const endTime = Date.now();
+  const duration = endTime - timing.startTime;
+  const updatedTiming = { ...timing, endTime, duration };
+  timings.set(key, updatedTiming);
+  return duration;
+};
+const withTiming = async (key, fn, analytics, timings = /* @__PURE__ */ new Map()) => {
+  startTiming(key, timings);
+  try {
+    const result = await fn();
+    const duration = endTiming(key, timings) || 0;
+    analytics.addEvent("Performance", {
+      actionType: "resolve",
+      actionLevel: "page",
+      label: key,
+      additionalData: {
+        duration
+      }
+    });
+    return { result, duration };
+  } catch (error) {
+    const duration = endTiming(key, timings) || 0;
+    analytics.addEvent("Performance", {
+      actionType: "reject",
+      actionLevel: "page",
+      label: key,
+      additionalData: {
+        duration
+      }
+    });
+    throw error;
+  }
+};
+const trackPerformance = (key, fn, analytics) => {
+  return withTiming(key, fn, analytics);
+};
 const documentTypes$2 = [
   { id: "Internal company document", name: "internalCompanyDocument" },
   { id: "Business registry statement", name: "businessRegistryStatement" }
@@ -2829,7 +2844,6 @@ const GuidanceContent$4 = ({ t }) => {
 function ProofOfDirectorDocument({ id, country, ...props }) {
   const { t } = useTranslation(["common", "business"]);
   const [selectedDocumentName, setSelectedDocumentName] = useState(documentTypes$2[0].id);
-  usePageLandedEvent();
   return /* @__PURE__ */ jsx(
     MemoizedDocumentUpload,
     {
@@ -2940,7 +2954,6 @@ function ProofOfOwnershipDocument({ id, country, ...props }) {
   const { t } = useTranslation(["common", "business"]);
   const [selectedDocumentName, setSelectedDocumentName] = useState(documentTypes$1[0].id);
   const supportsMultiple = selectedDocumentName === DOC_TYPE_FOR_MULTI_UPLOAD;
-  usePageLandedEvent();
   useEffect(() => {
     if (props.data?.proofOfOwnership?.length === 2) {
       setSelectedDocumentName(DOC_TYPE_FOR_MULTI_UPLOAD);
@@ -2987,7 +3000,6 @@ const GuidanceContent$2 = ({ t }) => {
 function ProofOfSignatoryDocument({ id, country, ...props }) {
   const { t } = useTranslation(["common", "business"]);
   const [selectedDocumentName, setSelectedDocumentName] = useState(documentTypes[0].id);
-  usePageLandedEvent();
   return /* @__PURE__ */ jsx(
     MemoizedDocumentUpload,
     {
@@ -3104,7 +3116,6 @@ function RegistrationDocument({
   ...props
 }) {
   const { t } = useTranslation(["common", "business"]);
-  usePageLandedEvent();
   return /* @__PURE__ */ jsx(
     MemoizedDocumentUpload,
     {
@@ -3202,7 +3213,6 @@ function TaxDocument({
   ...props
 }) {
   const { t } = useTranslation("business");
-  usePageLandedEvent();
   return /* @__PURE__ */ jsx(
     MemoizedDocumentUpload,
     {
@@ -3220,7 +3230,6 @@ function TaxDocument({
   );
 }
 const VatDocument = ({ children }) => {
-  usePageLandedEvent();
   return children;
 };
 function BusinessDetailsMultiform({
@@ -3811,7 +3820,7 @@ function buildRequiredForms({
   ) && accountHolder !== "aTrust" && accountHolder !== "anUnincorporatedPartnership";
   const filteredForms = Object.values(forms).filter(({ formId }) => {
     if (formId === "businessSelection") {
-      if (options?.hasNoSearchResults || isVerifiedSingleCompanySearchResult.value) return false;
+      if (options?.skipBusinessSelection) return false;
     }
     if (formId === "companyStructure") {
       if (skipCompanyStructure) return false;
@@ -4058,14 +4067,23 @@ const BUSINESS_BANK_ACCOUNT_TAX_ID_COUNTRIES = [
   CountryCodes.Estonia,
   CountryCodes.Finland,
   CountryCodes.France,
+  CountryCodes.Italy,
   CountryCodes.Latvia,
   CountryCodes.Lithuania,
   CountryCodes.Portugal,
   CountryCodes.Spain
 ];
+const IT_REGISTRATION_TYPES_WITHOUT_TAX_ID_REUSE = ["CCIAA"];
 const isBusinessBankAccountTaxIdCountry = (country) => {
   return country ? BUSINESS_BANK_ACCOUNT_TAX_ID_COUNTRIES.includes(country) : false;
 };
+const shouldReuseRegistrationNumberAsTaxId = (country, registrationNumberType) => {
+  if (!isBusinessBankAccountTaxIdCountry(country)) return false;
+  if (country === CountryCodes.Italy && registrationNumberType) {
+    return !IT_REGISTRATION_TYPES_WITHOUT_TAX_ID_REUSE.includes(registrationNumberType);
+  }
+  return true;
+};
 const mapBusinessDetailsDocumentToApiDocument = async (data, entityId) => {
   const {
     companyRegistrationDocument,
@@ -4157,7 +4175,10 @@ const mapBusinessDetailsSchemaToLegalEntity = (data, accountHolder, isFeatureEna
       entityObject.taxInformation = taxData;
     }
     if (rootLegalEntity?.type === "organization" && // SOE-5931 - TODO: investigate L scenario returned to show this on the backend
-    keysOf(rootLegalEntity.capabilities ?? {}).includes("issueBankAccount") && matchingScenario?.includes(Scenarios.L) && registrationNumber && data.basicInformation?.country && isBusinessBankAccountTaxIdCountry(data.basicInformation?.country)) {
+    keysOf(rootLegalEntity.capabilities ?? {}).includes("issueBankAccount") && matchingScenario?.includes(Scenarios.L) && registrationNumber && data.basicInformation?.country && shouldReuseRegistrationNumberAsTaxId(
+      data.basicInformation?.country,
+      data.additionalInformation?.registrationNumberType
+    )) {
       const taxCountry = data.basicInformation.country;
       const privateCompanyTaxOptions = getTaxIdNumberOptions(
         taxCountry,
@@ -4383,13 +4404,11 @@ async function submit({
     await submitBusinessLines({
       data,
       legalEntity,
-      trackingPayload,
       efpBusinessLines,
       createBusinessLine,
       updateBusinessLine,
       t,
-      showToast,
-      userEvents
+      showToast
     });
     userEvents.addTaskEvent("Success", trackingPayload);
     showToast({
@@ -4486,8 +4505,6 @@ async function submitBusinessLines({
   efpBusinessLines,
   createBusinessLine,
   updateBusinessLine,
-  trackingPayload,
-  userEvents,
   t,
   showToast
 }) {
@@ -4546,18 +4563,7 @@ async function submitBusinessLines({
     );
     hadRejection = true;
   });
-  const eventPayload = {
-    actionType: trackingPayload.actionType,
-    legalEntityName: trackingPayload.legalEntityName
-  };
-  if (!hadRejection) {
-    userEvents.addTaskEvent("Success", eventPayload);
-  } else {
-    userEvents.addTaskEvent("Encountered error", {
-      ...eventPayload,
-      returnType: "businessLines",
-      returnValue: "couldNotCreateOrUpdateBusinessLine"
-    });
+  if (hadRejection) {
     showToast({
       label: t(($) => $["failedToUpdateEfpBusinessLines"], { ns: "business" }),
       variant: "error"
@@ -4819,7 +4825,6 @@ function BusinessDetailsDropin({
   const { mutateAsync: updateLegalEntity } = useUpdateLegalEntity();
   const invalidateRootLegalEntity = useInvalidateRootLegalEntity();
   const logger2 = createLogger();
-  useTaskLandedEvent(taskType);
   const isAssociationTaskType = taskType !== TaskTypes.BUSINESS_DETAILS;
   const legalEntityType = taskType === TaskTypes.SOLE_PROPRIETOR_COMPANY ? LegalEntityTypes.SOLE_PROPRIETORSHIP : LegalEntityTypes.ORGANIZATION;
   const subjectEntity = !isAssociationTaskType ? legalEntityResponse : taskType === TaskTypes.SOLE_PROPRIETOR_COMPANY ? associatedLegalArrangement : nestedLegalEntity;
@@ -4981,28 +4986,9 @@ function BusinessDetailsDropin({
     tinMatched.value = void 0;
     businessMismatchModalOpen.value = false;
   }
-  const [forms, setForms] = useState(
-    buildRequiredForms({
-      config: {
-        forms: defaultForms,
-        requiredFields: derivedProps?.requiredFields,
-        optionalFields: derivedProps?.optionalFields,
-        isValid: multiForm.isValid ?? {},
-        problems,
-        isSettingEnabled,
-        accountHolder,
-        legalEntityResponse
-      },
-      options: {
-        hasNoSearchResults: false
-      }
-    })
-  );
-  const updateForms = useCallback(
-    ({
-      searchResults
-    }) => {
-      const updatedForms = buildRequiredForms({
+  const getRequiredForms = useCallback(
+    (options) => {
+      return buildRequiredForms({
         config: {
           forms: defaultForms,
           requiredFields: derivedProps?.requiredFields,
@@ -5013,24 +4999,25 @@ function BusinessDetailsDropin({
           accountHolder,
           legalEntityResponse
         },
-        options: {
-          hasNoSearchResults: searchResults && !searchResults.length
-        }
+        options
       });
-      setForms(updatedForms);
-      return updatedForms;
     },
     [
+      accountHolder,
       defaultForms,
       derivedProps?.optionalFields,
       derivedProps?.requiredFields,
-      multiForm.isValid,
-      problems,
       isSettingEnabled,
-      accountHolder,
-      legalEntityResponse
+      legalEntityResponse,
+      multiForm.isValid,
+      problems
     ]
   );
+  const skipBusinessSelection = useSignal(true);
+  const forms = useMemo(
+    () => getRequiredForms({ skipBusinessSelection: skipBusinessSelection.value }),
+    [getRequiredForms, skipBusinessSelection.value]
+  );
   const { mutateAsync: createBusinessLine } = useCreateBusinessLine();
   const { mutateAsync: updateBusinessLine } = useUpdateBusinessLine();
   const submitTask = useCallback(() => {
@@ -5103,115 +5090,131 @@ function BusinessDetailsDropin({
   const handleBusinessMismatchContinue = () => {
     setTrustedFields([]);
     businessMismatchModalOpen.value = false;
-    handleNextClick();
+    skipBusinessSelection.value = activeForm.formId !== "businessSelection";
+    const currentForms = getRequiredForms({ skipBusinessSelection: skipBusinessSelection.value });
+    handleNextClick(currentForms);
   };
   const handleBusinessMismatchCancel = () => {
     handleBackClick?.();
     businessMismatchModalOpen.value = false;
     tinMatched.value = false;
   };
-  const companySearchQueryInput = {
-    name: multiForm.data.basicInformation?.legalCompanyName ?? "",
-    country: multiForm.data.basicInformation?.country,
-    state: multiForm.data.basicInformation?.stateOrProvince,
-    registrationNumber: multiForm.data.basicInformation?.registrationNumber
-  };
-  const verifyTinQueryInput = {
-    name: multiForm.data.basicInformation?.legalCompanyName ?? "",
-    tin: multiForm.data.basicInformation?.taxInformation?.find((taxId) => taxId.country === country)?.number ?? ""
-  };
-  const {
-    data: companySearchResponse,
-    isLoading: searchingCompanies,
-    isError: searchingError
-  } = useCompanySearch(companySearchQueryInput, {
-    enabled: false
-  });
-  useEffect(() => {
-    if (!searchingCompanies && companySearchResponse?.results) {
+  const { mutateAsync: selectCompany } = useCompanySelection();
+  const { mutateAsync: clearCompanyData2 } = useClearCompanyData();
+  const attemptBusinessSearch = async () => {
+    const formsWithoutSearchResults = getRequiredForms({ skipBusinessSelection: true });
+    if (!multiForm.data.basicInformation?.legalCompanyName) return formsWithoutSearchResults;
+    setLoadingStatus("loading");
+    tinMatched.value = void 0;
+    verifiedBusiness.value = void 0;
+    let searchResponse = {
+      results: []
+    };
+    try {
+      const companySearchInput = {
+        name: multiForm.data.basicInformation?.legalCompanyName,
+        country: multiForm.data.basicInformation?.country,
+        state: multiForm.data.basicInformation?.stateOrProvince,
+        registrationNumber: multiForm.data.basicInformation?.registrationNumber
+      };
+      searchResponse = (await trackPerformance(
+        "companySearch",
+        () => queryClient.fetchQuery(
+          companySearchQueryOptions(
+            rootLegalEntityId.peek(),
+            baseUrl.peek(),
+            companySearchInput,
+            isAgnosticEndpointEnabled
+          )
+        ),
+        userEvents
+      )).result;
       userEvents.addPageEvent("Success", {
         actionType: "resolve",
         returnValue: "companySearch",
         additionalData: {
-          numberOfResults: companySearchResponse.results.length
+          numberOfResults: searchResponse.results.length
         }
       });
+    } catch (e) {
+      logger2.error(e);
+      setLoadingStatus("error");
+      return formsWithoutSearchResults;
     }
-  }, [searchingCompanies, userEvents, subjectEntity, companySearchResponse?.results]);
-  const companySelectionInput = {
-    company: companySearchResponse?.results[0],
-    state: multiForm.data.basicInformation?.stateOrProvince,
-    name: multiForm.data.basicInformation?.legalCompanyName ?? "",
-    tin: multiForm.data.basicInformation?.taxInformation?.find((taxId) => taxId.country === country)?.number ?? ""
-  };
-  useVerifyTin(verifyTinQueryInput, { enabled: false });
-  const attemptBusinessSearch = async () => {
-    try {
-      setLoadingStatus("loading");
-      tinMatched.value = void 0;
-      verifiedBusiness.value = void 0;
-      isVerifiedSingleCompanySearchResult.value = false;
-      const { result: searchResponse } = await trackPerformance(
-        "companySearch",
-        () => queryClient.fetchQuery({
-          queryKey: ["companySearch", companySearchQueryInput]
-        }),
-        userEvents
-      );
-      let currentForms = updateForms({ searchResults: searchResponse.results });
-      const handleTinResponse = (matched) => {
-        if (matched) {
-          tinMatched.value = true;
-        } else {
-          businessMismatchModalOpen.value = true;
-          tinMatched.value = false;
+    const tin = multiForm.data.basicInformation?.taxInformation?.find((taxId) => taxId.country === country)?.number ?? "";
+    skipBusinessSelection.value = searchResponse.results.length === 0;
+    const currentForms = getRequiredForms({ skipBusinessSelection: skipBusinessSelection.peek() });
+    switch (searchResponse.results.length) {
+      case 0: {
+        try {
+          const verifyTinQueryInput = {
+            name: multiForm.data.basicInformation?.legalCompanyName,
+            tin
+          };
+          const tinVerificationResponse = await queryClient.fetchQuery(
+            verifyTinQueryOptions(
+              rootLegalEntityId.peek(),
+              baseUrl.peek(),
+              verifyTinQueryInput,
+              userEvents
+            )
+          );
+          setLoadingStatus("success");
+          const tinMatched2 = !!tinVerificationResponse.matched;
+          handleTinMismatchModal(tinMatched2);
+          return tinMatched2 ? currentForms : null;
+        } catch (e) {
+          logger2.error(e);
+          setLoadingStatus("error");
+          return currentForms;
         }
-        return tinMatched.value;
-      };
-      if (searchResponse.results.length === 1 && isNormalizedStringMatch(
-        multiForm.data.basicInformation?.legalCompanyName ?? "",
-        searchResponse.results[0].name
-      )) {
-        const companySelectionResponse = await handleCompanySelection(
-          rootLegalEntityId.peek(),
-          baseUrl.peek(),
-          {
-            ...companySelectionInput,
+      }
+      case 1: {
+        if (!isNormalizedStringMatch(
+          multiForm.data.basicInformation?.legalCompanyName,
+          searchResponse.results[0].name
+        )) {
+          setLoadingStatus("success");
+          return currentForms;
+        }
+        try {
+          const companySelectionInput = {
+            state: multiForm.data.basicInformation?.stateOrProvince,
+            name: multiForm.data.basicInformation?.legalCompanyName,
+            tin,
             ...isAgnosticEndpointEnabled ? {
               id: searchResponse.results[0].resultId
             } : { company: searchResponse.results[0] }
-          },
-          isAgnosticEndpointEnabled
-        );
-        if (handleTinResponse(!!companySelectionResponse.tinMatched)) {
-          verifiedBusiness.value = companySelectionResponse;
-          isVerifiedSingleCompanySearchResult.value = true;
-          applyVerifiedBusinessData(
-            multiForm,
-            country,
-            verifiedBusiness.peek(),
-            isAgnosticEndpointEnabled
-          );
-          currentForms = updateForms({ searchResults: searchResponse.results });
-        } else {
-          return setLoadingStatus("success");
+          };
+          const companySelectionResponse = await selectCompany(companySelectionInput);
+          setLoadingStatus("success");
+          const tinMatched2 = !!companySelectionResponse.tinMatched;
+          handleTinMismatchModal(tinMatched2);
+          if (tinMatched2) {
+            verifiedBusiness.value = companySelectionResponse;
+            skipBusinessSelection.value = true;
+            applyVerifiedBusinessData(
+              multiForm,
+              country,
+              verifiedBusiness.peek(),
+              isAgnosticEndpointEnabled
+            );
+            return getRequiredForms({ skipBusinessSelection: skipBusinessSelection.peek() });
+          } else {
+            clearCompanyData2().then();
+            return null;
+          }
+        } catch (e) {
+          logger2.error(e);
+          setLoadingStatus("error");
+          clearCompanyData2().then();
+          return formsWithoutSearchResults;
         }
       }
-      if (!searchResponse.results.length) {
-        const tinVerificationResponse = await queryClient.fetchQuery({
-          queryKey: ["verifyTin", verifyTinQueryInput]
-        });
-        if (!handleTinResponse(!!tinVerificationResponse.matched)) {
-          return setLoadingStatus("success");
-        }
+      default: {
+        setLoadingStatus("success");
+        return currentForms;
       }
-      setLoadingStatus("success");
-      return handleNextClick(currentForms);
-    } catch (e) {
-      logger2.error(e);
-      setLoadingStatus("error");
-      const currentForms = updateForms({ searchResults: [] });
-      return handleNextClick(currentForms);
     }
   };
   const overrideNextClick = async () => {
@@ -5221,12 +5224,12 @@ function BusinessDetailsDropin({
     }
     switch (activeForm.formId) {
       case "basicInformation": {
-        return await attemptBusinessSearch();
+        const currentForms = await attemptBusinessSearch();
+        if (currentForms === null) return;
+        return handleNextClick(currentForms);
       }
       case "businessSelection": {
-        const currentForms = updateForms({
-          searchResults: companySearchResponse?.results
-        });
+        const currentForms = getRequiredForms({});
         return handleNextClick(currentForms);
       }
       default:
@@ -5236,11 +5239,6 @@ function BusinessDetailsDropin({
   const handleCancelClick = () => {
     setIsAddingBusinessDetails(false);
   };
-  useEffect(() => {
-    updateForms({
-      searchResults: searchingError ? [] : companySearchResponse?.results
-    });
-  }, [updateForms, companySearchResponse?.results, searchingError]);
   const summarySections = useMemo(() => {
     if (activeForm.formId !== "summary") return [];
     return formatDataForSummary(multiForm.data, forms, t, i18n.language, isFeatureEnabled);
@@ -5343,6 +5341,14 @@ function BusinessDetailsDropin({
     ) })
   ] });
 }
+const handleTinMismatchModal = (matched) => {
+  if (matched) {
+    tinMatched.value = true;
+  } else {
+    businessMismatchModalOpen.value = true;
+    tinMatched.value = false;
+  }
+};
 const useDocuments = (documentDetails, entityId, options) => {
   const { rootLegalEntityId, baseUrl } = useApiContext();
   const documentUtils = documentApiUtils({