@adyen/kyc-components 4.0.0-compact.7 → 4.0.0-compact.9

package/dist/{TaxInformationField-BxQvx1zK.js → TaxInformationField-B7AVdVgf.js}

@@ -2,35 +2,35 @@
 {
   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] = "6bf4420c-65e7-4416-93b3-654c8d08f83a", e._sentryDebugIdIdentifier = "sentry-dbid-6bf4420c-65e7-4416-93b3-654c8d08f83a");
+    n && (e._sentryDebugIds = e._sentryDebugIds || {}, e._sentryDebugIds[n] = "ff104da5-8cbc-4181-97cb-b0a646f5b595", e._sentryDebugIdIdentifier = "sentry-dbid-ff104da5-8cbc-4181-97cb-b0a646f5b595");
   } catch (e) {
   }
 }
 ;
-import { ba as getNestedPropertyKeys, a0 as CountryCodes, o as LegalEntityTypes, a6 as objectsDeepEqual, u as useTranslation, c as useLegalEntity, R as ROOT_LE, j as TaskTypes, aD as keysOf, v as useExperimentsContext, m as useAccountHolder } from "./StoreProvider-99-ewU62.js";
+import { bq as getNestedPropertyKeys, aa as CountryCodes, L as LegalEntityTypes, ah as objectsDeepEqual, u as useTranslation, aB as Header, y as TaskTypes, aS as keysOf, J as useExperimentsContext, v as useAccountHolder, ac as translateTranslatable } from "./StoreProvider-CBB99upB.js";
 import { jsxs, jsx, Fragment } from "preact/jsx-runtime";
 import { memo } from "preact/compat";
 import { useState, useRef, useEffect, useCallback, useMemo } from "preact/hooks";
-import { F as Field } from "./Field-Bs7wGDqk.js";
-import { H as Header } from "./Header-vslG1ugE.js";
-import { S as Select } from "./Select-DaCJsYNl.js";
-import { T as TextArea } from "./TextArea-BjsWgkR-.js";
-import { S as StateContextSetter } from "./validate-CtxacqMv.js";
-import { u as useForm } from "./useForm-DqUW2TbW.js";
-import { u as uppercase, D as DocumentGuidance } from "./mapExistingFile-BM9f5AeG.js";
-import { D as Dropzone } from "./Dropzone-kpihpy7N.js";
-import { E as ErrorPanel } from "./ErrorPanel-CAALFKmE.js";
-import { c as createFormUtils } from "./formUtils-C_sWWLS3.js";
-import { C as Checkbox } from "./Checkbox-5Sc5pzsh.js";
-import { C as CompanyTypesValues } from "./company-types-value-D_mKv5PT.js";
-import { m as makeMask, n as numericInputs, a as nonInputs, d as alphanumericInputs, c as customInputs, b as alphaInputs, s as spacer, M as MaskedInput } from "./MaskedInput-BSW18fxr.js";
-import { S as SettingNames } from "./TaskVerificationStatus-DZIw2ztV.js";
-import { C as COUNTRIES_WITH_STATES_DATASET } from "./utils-BasWTkqk.js";
+import { F as Field } from "./Field-CPoHG0G-.js";
+import { S as Select } from "./Select-seF9rM5K.js";
+import { T as TextArea } from "./TextArea-BbRKVKmP.js";
+import { S as StateContextSetter } from "./validate-DDCTmBf4.js";
+import { u as useForm } from "./useForm-BQDytQRR.js";
+import { u as uppercase, D as DocumentGuidance } from "./mapExistingFile-BigOdLU3.js";
+import { D as Dropzone } from "./Dropzone-B9NMiWRF.js";
+import { E as ErrorPanel } from "./ErrorPanel-D4kO8XQ8.js";
+import { c as createFormUtils } from "./formUtils-BEcbGHkz.js";
+import { C as CompanyTypesValues } from "./bafinUtils-B1LygAFl.js";
+import { C as Checkbox } from "./Checkbox-DmYVTVOD.js";
+import { m as makeMask, n as numericInputs, a as nonInputs, d as alphanumericInputs, c as customInputs, b as alphaInputs, s as spacer, M as MaskedInput } from "./MaskedInput-1f16YE1z.js";
+import { r as resolveFieldMetadata } from "./fieldConfigurations-BUT9DTUH.js";
+import { S as SettingNames } from "./types-CQ2p58-6.js";
+import { C as COUNTRIES_WITH_STATES_DATASET } from "./utils-BvFIL5qs.js";
 import { c as createFormRules } from "./form-rules-DhbF2mY4.js";
-import { i as isJapanLocalizationEnabled } from "./japanSupportUtils-CGWcXGP2.js";
-import { i as isDateOlderThanAYear } from "./Address-Bj7zJ6yZ.js";
-import { v as validatePatternOnBlur, a as validateNotEmptyOnBlur } from "./patternValidators-vYKnE5-t.js";
-import { R as RadioGroup } from "./RadioGroup-CxcIXYzs.js";
+import { i as isJapanLocalizationEnabled } from "./japanSupportUtils-CaeglTl1.js";
+import { i as isDateOlderThanAYear } from "./Address-DaePmCRZ.js";
+import { v as validatePatternOnBlur, a as validateNotEmptyOnBlur } from "./patternValidators-BkY5yvNa.js";
+import { R as RadioGroup } from "./RadioGroup-BuAX_NLA.js";
 const getFieldsWithExistingData = (legalEntity, keyMapping, documentMapping, knownProblematicFields = []) => {
   const apiFieldsWithExistingData = getNestedPropertyKeys(legalEntity);
   const nonDocumentFields = apiFieldsWithExistingData.map((field) => keyMapping[field]).filter(Boolean).filter((field) => !knownProblematicFields.includes(field));
@@ -1978,7 +1978,7 @@ const taxInformationDefaultFieldConfig = {
               guidanceText: {
                 key: "validationPleaseEnterAValidIdNumberWithExample",
                 values: {
-                  example: "6669863459",
+                  example: "7172510005",
                   idType: "UTR"
                 }
               }
@@ -1995,7 +1995,7 @@ const taxInformationDefaultFieldConfig = {
           guidanceText: {
             key: "validationPleaseEnterAValidIdNumberWithExample",
             values: {
-              example: "6669863459",
+              example: "7172510005",
               idType: "UTR"
             }
           }
@@ -2029,7 +2029,14 @@ const taxInformationDefaultFieldConfig = {
   },
   [CountryCodes.Japan]: {
     label: "taxInformationNumber__JP",
-    validators: mapValidators([validatePatternOnBlur(/^\d{13}$/)], CountryCodes.Japan)
+    validators: mapValidators([validatePatternOnBlur(/^\d{13}$/)], CountryCodes.Japan),
+    guidanceText: {
+      key: "enterNDigitsForExample",
+      values: {
+        numDigits: "13",
+        example: "2169151989941"
+      }
+    }
   },
   [CountryCodes.Philippines]: {
     validators: mapValidators([validatePatternOnBlur(/^\d{12}$/)], CountryCodes.Philippines)
@@ -2136,7 +2143,7 @@ const getTaxInformationPlaceholderText = ({
           return "12345678";
       }
     case CountryCodes.UnitedKingdom:
-      return "1234567890";
+      return "7172510005";
     case CountryCodes.Spain:
       return "99999999L";
     case CountryCodes.PuertoRico:
@@ -2306,10 +2313,6 @@ const MemoizedDocumentUpload = memo(
   DocumentUpload,
   (prevProps, nextProps) => prevProps.shouldValidate === nextProps.shouldValidate && objectsDeepEqual(prevProps.requiredFields, nextProps.requiredFields) && objectsDeepEqual(prevProps.errors, nextProps.errors) && objectsDeepEqual(prevProps.optionalFields, nextProps.optionalFields) && objectsDeepEqual(prevProps.data, nextProps.data) && objectsDeepEqual(prevProps.formVerificationErrors, nextProps.formVerificationErrors) && objectsDeepEqual(prevProps.fieldValidationErrors, nextProps.fieldValidationErrors) && objectsDeepEqual(prevProps.documentTypeSelect, nextProps.documentTypeSelect) && prevProps.documentField === nextProps.documentField && prevProps.name === nextProps.name && prevProps.country === nextProps.country && prevProps.companyType === nextProps.companyType
 );
-const useCapabilities = () => {
-  const { data: rootLegalEntity } = useLegalEntity(ROOT_LE);
-  return rootLegalEntity?.capabilities;
-};
 const companyRegistrationNumberOptions = {
   [CountryCodes.Australia]: [
     {
@@ -2522,435 +2525,105 @@ const additionallIdNumberOptions = {
     }
   ]
 };
-const taxIdNumberOptions = {
-  [CountryCodes.Australia]: [
-    {
-      id: "ABN",
-      name: "australianBusinessNumberAbn"
-    }
-  ],
-  [CountryCodes.Austria]: [
-    {
-      id: "STEUERNUMMER",
-      name: "taxInformationNumber__AT"
-    }
-  ],
-  [CountryCodes.Belgium]: [
+const vatNumberOptions = {
+  [CountryCodes.Austria]: [{ id: "UST-ID", name: "UST-ID" }],
+  [CountryCodes.Belgium]: [{ id: "euVatNumber", name: "euVatNumber" }],
+  [CountryCodes.Bulgaria]: [{ id: "identifikacionenNomerDDS", name: "identifikacionenNomerDDS" }],
+  [CountryCodes.Croatia]: [{ id: "PDVIdBrojOIB", name: "PDVIdBrojOIB" }],
+  [CountryCodes.Cyprus]: [{ id: "arithmosEngraphes", name: "arithmosEngraphes" }],
+  [CountryCodes.CzechRepublic]: [{ id: "DIC", name: "DIC" }],
+  [CountryCodes.Denmark]: [
     {
-      id: "BUSINESS_NUMMER",
-      name: "businessNumber",
-      applicableOnlyFor: [
-        CompanyTypesValues.SOLE_PROPRIETORSHIP,
-        CompanyTypesValues.PRIVATE_COMPANY,
-        CompanyTypesValues.GOVERNMENTAL_ORGANIZATION,
-        CompanyTypesValues.INCORPORATED_ASSOCIATION,
-        CompanyTypesValues.INCORPORATED_PARTNERSHIP,
-        CompanyTypesValues.NON_PROFIT_OR_CHARITABLE,
-        CompanyTypesValues.UNINCORPORATED_PARTNERSHIP,
-        CompanyTypesValues.UNLISTED_PUBLIC_COMPANY
-      ]
+      id: "momsregistreringsnummerCVR",
+      name: "momsregistreringsnummerCVR"
     },
     {
-      id: "NUMERO_NATIONAL",
-      name: "taxInformationNumber__BE_Individual",
-      applicableOnlyFor: [LegalEntityTypes.INDIVIDUAL]
-    }
-  ],
-  [CountryCodes.Brazil]: [{ id: "CNPJ", name: "CNPJ" }],
-  [CountryCodes.Canada]: [{ id: "BUSINESS_NUMBER", name: "businessNumber" }],
-  [CountryCodes.Croatia]: [
-    {
-      id: "OIB",
-      name: "taxInformationNumber__HR"
-    }
-  ],
-  [CountryCodes.Cyprus]: [
-    {
-      id: "TIC",
-      name: "taxInformationNumber__CY"
+      id: "stamregister",
+      name: "stamregister"
     }
   ],
   [CountryCodes.Estonia]: [
-    {
-      id: "ISIKUKOOD",
-      name: "taxInformationNumber__ET_Individual",
-      applicableOnlyFor: [LegalEntityTypes.INDIVIDUAL]
-    },
-    {
-      id: "registrikood",
-      name: "registrikood",
-      applicableOnlyFor: [CompanyTypesValues.PRIVATE_COMPANY]
-    }
+    { id: "kaibemaksukohustuslaseNumber", name: "kaibemaksukohustuslaseNumber" }
   ],
   [CountryCodes.Finland]: [
     {
-      id: "HENKILOTUNNUS",
-      name: "taxInformationNumber__FI",
-      applicableOnlyFor: [LegalEntityTypes.INDIVIDUAL]
-    },
-    {
-      id: "YTUNNUS",
-      name: "YTunnus",
-      applicableOnlyFor: [CompanyTypesValues.PRIVATE_COMPANY]
+      id: "arvonlisaveronumeroMervardesskattenummer",
+      name: "arvonlisaveronumeroMervardesskattenummer"
     }
   ],
   [CountryCodes.France]: [
     {
-      id: "SIRET",
-      name: "siret",
-      applicableOnlyFor: [CompanyTypesValues.PRIVATE_COMPANY]
-    }
-  ],
-  [CountryCodes.Germany]: [
-    {
-      id: "STEUERNUMMER",
-      name: "taxInformationNumber__DE",
-      applicableOnlyFor: [
-        CompanyTypesValues.SOLE_PROPRIETORSHIP,
-        CompanyTypesValues.PRIVATE_COMPANY,
-        CompanyTypesValues.GOVERNMENTAL_ORGANIZATION,
-        CompanyTypesValues.INCORPORATED_ASSOCIATION,
-        CompanyTypesValues.INCORPORATED_PARTNERSHIP,
-        CompanyTypesValues.NON_PROFIT_OR_CHARITABLE,
-        CompanyTypesValues.UNINCORPORATED_PARTNERSHIP,
-        CompanyTypesValues.UNLISTED_PUBLIC_COMPANY
-      ]
+      id: "numeroDIdentificationALATaxe",
+      name: "numeroDIdentificationALATaxe"
     },
     {
-      id: "IDNR",
-      name: "taxInformationNumber__DE_Individual",
-      applicableOnlyFor: [LegalEntityTypes.INDIVIDUAL]
-    }
-  ],
-  [CountryCodes.Gibraltar]: [
-    { id: "GI_TAXPAYER_REFERENCE_NUMBER", name: "taxpayerReferenceNumber" }
-  ],
-  [CountryCodes.Greece]: [
-    {
-      id: "AFM",
-      name: "taxInformationNumber__GR"
-    }
-  ],
-  [CountryCodes.Guernsey]: [
-    { id: "GG_REGISTRATION_NUMBER", name: "taxInformationNumber" },
-    {
-      id: "TIN_GG",
-      name: "nationalInsuranceNumber",
-      applicableOnlyFor: [CompanyTypesValues.SOLE_PROPRIETORSHIP]
-    }
-  ],
-  [CountryCodes.HongKong]: [
-    {
-      id: "BRN",
-      name: "taxInformationNumber__HK"
+      id: "NumeroDeTVA",
+      name: "NumeroDeTVA"
     }
   ],
-  [CountryCodes.Ireland]: [
-    {
-      id: "TRN",
-      name: "trnNumber",
-      applicableOnlyFor: [
-        CompanyTypesValues.PRIVATE_COMPANY,
-        CompanyTypesValues.UNINCORPORATED_PARTNERSHIP
-      ]
-    },
-    {
-      id: "PPSN",
-      name: "taxInformationNumber__IE_Individual",
-      applicableOnlyFor: [LegalEntityTypes.INDIVIDUAL]
-    }
+  [CountryCodes.Germany]: [{ id: "USt-IdNr", name: "USt-IdNr" }],
+  [CountryCodes.Greece]: [{ id: "grTaxId", name: "grTaxId" }],
+  [CountryCodes.Hungary]: [{ id: "huTaxId", name: "huTaxId" }],
+  [CountryCodes.Ireland]: [{ id: "vatNumber", name: "vatNumber" }],
+  [CountryCodes.Italy]: [{ id: "partitaIVA", name: "partitaIVA" }],
+  [CountryCodes.Latvia]: [{ id: "lvTaxId", name: "lvTaxId" }],
+  [CountryCodes.Liechtenstein]: [{ id: "vatRegistrationNumber", name: "vatRegistrationNumber" }],
+  [CountryCodes.Lithuania]: [{ id: "PVMmoketojoKodas", name: "PVMmoketojoKodas" }],
+  [CountryCodes.Luxembourg]: [
+    { id: "numeroDIdentificationALATaxe", name: "numeroDIdentificationALATaxe" }
   ],
-  [CountryCodes.IsleOfMan]: [{ id: "IM_TAX_REFERENCE_NUMBER", name: "taxReferenceNumber" }],
-  [CountryCodes.Italy]: [
-    {
-      id: "CODICE_FISCALE",
-      name: "taxInformationNumber__IT"
-    }
+  [CountryCodes.Malaysia]: [{ id: "SST", name: "SST" }],
+  [CountryCodes.Malta]: [{ id: "vatNumber", name: "vatNumber" }],
+  [CountryCodes.Monaco]: [
+    { id: "numeroDIdentificationALATaxe", name: "numeroDIdentificationALATaxe" }
   ],
-  [CountryCodes.Japan]: [{ id: "CORPORATE_NUMBER", name: "taxInformationNumber" }],
-  [CountryCodes.Jersey]: [
-    {
-      id: "TIN_JE",
-      name: "taxIdentificationNumber"
-    },
-    {
-      id: "SSN",
-      name: "socialSecurityNumber",
-      applicableOnlyFor: [CompanyTypesValues.SOLE_PROPRIETORSHIP]
-    }
+  [CountryCodes.Netherlands]: [{ id: "btwNummer", name: "btwNummer" }],
+  [CountryCodes.Norway]: [{ id: "mvanummer", name: "mvanummer" }],
+  [CountryCodes.Poland]: [{ id: "NIP", name: "NIP" }],
+  [CountryCodes.Portugal]: [{ id: "numerodeIVA", name: "numerodeIVA" }],
+  [CountryCodes.Romania]: [
+    { id: "codulDeIdentificareFiscala", name: "codulDeIdentificareFiscala" }
   ],
-  [CountryCodes.Latvia]: [
-    {
-      id: "PERSONAS_KODS",
-      name: "taxInformationNumber__LV",
-      applicableOnlyFor: [LegalEntityTypes.INDIVIDUAL]
-    },
+  [CountryCodes.Slovakia]: [{ id: "skTaxId", name: "skTaxId" }],
+  [CountryCodes.Slovenia]: [{ id: "siTaxId", name: "siTaxId" }],
+  [CountryCodes.Spain]: [{ id: "NIFdeIVA", name: "NIFdeIVA" }],
+  [CountryCodes.Sweden]: [
     {
-      id: "REGISTRACIJAS_NUMURS",
-      name: "lvRegistrationNumber",
-      applicableOnlyFor: [CompanyTypesValues.PRIVATE_COMPANY]
+      id: "vatNummerMomsregistreringsnummerOrMomsnummer",
+      name: "vatNummerMomsregistreringsnummerOrMomsnummer"
     }
   ],
-  [CountryCodes.Lithuania]: [
-    {
-      id: "ASMENSKODAS",
-      name: "taxInformationNumber__LT",
-      applicableOnlyFor: [LegalEntityTypes.INDIVIDUAL]
-    },
-    {
-      id: "ASMENS_KODAS",
-      name: "ltRegistrationNumber",
-      applicableOnlyFor: [CompanyTypesValues.PRIVATE_COMPANY]
-    }
+  [CountryCodes.Switzerland]: [{ id: "Mehrwertsteuernummer", name: "Mehrwertsteuernummer" }],
+  [CountryCodes.UnitedArabEmirates]: [
+    { id: "vatRegistrationNumber", name: "vatRegistrationNumber" }
   ],
-  [CountryCodes.Luxembourg]: [
-    {
-      id: "NATIONAL_IDENTIFICATION_NUMBER",
-      name: "taxInformationNumber__LU_Individual",
-      applicableOnlyFor: [LegalEntityTypes.INDIVIDUAL]
-    },
-    {
-      id: "NATIONAL_IDENTIFICATION_NUMBER",
-      name: "taxInformationNumber__LU_Org",
-      applicableOnlyFor: [CompanyTypesValues.PRIVATE_COMPANY]
-    }
-  ],
-  [CountryCodes.Malta]: [
-    {
-      id: "NRU",
-      name: "taxInformationNumber__MT_NRU_Individual",
-      applicableOnlyFor: [LegalEntityTypes.INDIVIDUAL]
-    },
-    {
-      id: "IDENTITY_CARD_NUMBER",
-      name: "taxInformationNumber__MT_Individual",
-      applicableOnlyFor: [LegalEntityTypes.INDIVIDUAL]
-    },
-    {
-      id: "INCOME_TAX_REGISTRATION_NUMBER",
-      name: "taxInformationNumber__MT_Org",
-      applicableOnlyFor: [CompanyTypesValues.PRIVATE_COMPANY]
-    }
-  ],
-  [CountryCodes.Netherlands]: [
-    {
-      id: "RSIN",
-      name: "rsinNumber",
-      applicableOnlyFor: [
-        CompanyTypesValues.PRIVATE_COMPANY,
-        CompanyTypesValues.GOVERNMENTAL_ORGANIZATION,
-        CompanyTypesValues.INCORPORATED_ASSOCIATION,
-        CompanyTypesValues.INCORPORATED_PARTNERSHIP,
-        CompanyTypesValues.NON_PROFIT_OR_CHARITABLE,
-        CompanyTypesValues.UNINCORPORATED_PARTNERSHIP,
-        CompanyTypesValues.UNLISTED_PUBLIC_COMPANY
-      ]
-    },
-    {
-      id: "BSN",
-      name: "bsnNumber",
-      applicableOnlyFor: [LegalEntityTypes.INDIVIDUAL]
-    }
-  ],
-  [CountryCodes.NewZealand]: [
-    {
-      id: "IRD",
-      name: "irdNumber"
-    }
-  ],
-  [CountryCodes.Portugal]: [
-    {
-      id: "NUMERO_ID_CIVIL",
-      name: "taxInformationNumber__PT",
-      applicableOnlyFor: [LegalEntityTypes.INDIVIDUAL]
-    },
-    {
-      id: "NIPC",
-      name: "NIPC",
-      applicableOnlyFor: [CompanyTypesValues.PRIVATE_COMPANY]
-    }
-  ],
-  [CountryCodes.PuertoRico]: [
-    {
-      id: "EIN",
-      name: "ein"
-    }
-  ],
-  [CountryCodes.Singapore]: [
-    {
-      id: "GST",
-      name: "gst"
-    },
-    {
-      id: "UEN",
-      name: "uen"
-    }
-  ],
-  [CountryCodes.Slovakia]: [
-    {
-      id: "RODNE_CISLO",
-      name: "taxInformationNumber__SK_Individual",
-      applicableOnlyFor: [LegalEntityTypes.INDIVIDUAL]
-    },
-    {
-      id: "NATIONAL_IDENTIFICATION_NUMBER",
-      name: "taxInformationNumber__SK_Org",
-      applicableOnlyFor: [CompanyTypesValues.PRIVATE_COMPANY]
-    }
-  ],
-  [CountryCodes.Slovenia]: [
-    {
-      id: "SI_TAX_NUMBER",
-      name: "taxInformationNumber__SI_Individual",
-      applicableOnlyFor: [LegalEntityTypes.INDIVIDUAL]
-    },
-    {
-      id: "NATIONAL_IDENTIFICATION_NUMBER",
-      name: "taxInformationNumber__SI_Org",
-      applicableOnlyFor: [CompanyTypesValues.PRIVATE_COMPANY]
-    }
-  ],
-  [CountryCodes.Spain]: [
-    {
-      id: "dni",
-      name: "dni",
-      applicableOnlyFor: [LegalEntityTypes.INDIVIDUAL]
-    },
-    {
-      id: "nie",
-      name: "nie",
-      applicableOnlyFor: [LegalEntityTypes.INDIVIDUAL]
-    },
-    {
-      id: "NIF",
-      name: "NIF",
-      applicableOnlyFor: [CompanyTypesValues.PRIVATE_COMPANY]
-    }
-  ],
-  [CountryCodes.UnitedKingdom]: [
-    {
-      id: "UTR",
-      name: "utr"
-    },
-    {
-      id: "NINO",
-      name: "nationalInsuranceNumber",
-      applicableOnlyFor: [LegalEntityTypes.INDIVIDUAL]
-    }
-  ],
-  [CountryCodes.UnitedStates]: [
-    {
-      id: "EIN",
-      name: "ein"
-    }
-  ]
-};
-const vatNumberOptions = {
-  [CountryCodes.Austria]: [{ id: "UST-ID", name: "UST-ID" }],
-  [CountryCodes.Belgium]: [{ id: "euVatNumber", name: "euVatNumber" }],
-  [CountryCodes.Bulgaria]: [{ id: "identifikacionenNomerDDS", name: "identifikacionenNomerDDS" }],
-  [CountryCodes.Croatia]: [{ id: "PDVIdBrojOIB", name: "PDVIdBrojOIB" }],
-  [CountryCodes.Cyprus]: [{ id: "arithmosEngraphes", name: "arithmosEngraphes" }],
-  [CountryCodes.CzechRepublic]: [{ id: "DIC", name: "DIC" }],
-  [CountryCodes.Denmark]: [
-    {
-      id: "momsregistreringsnummerCVR",
-      name: "momsregistreringsnummerCVR"
-    },
-    {
-      id: "stamregister",
-      name: "stamregister"
-    }
-  ],
-  [CountryCodes.Estonia]: [
-    { id: "kaibemaksukohustuslaseNumber", name: "kaibemaksukohustuslaseNumber" }
-  ],
-  [CountryCodes.Finland]: [
-    {
-      id: "arvonlisaveronumeroMervardesskattenummer",
-      name: "arvonlisaveronumeroMervardesskattenummer"
-    }
-  ],
-  [CountryCodes.France]: [
-    {
-      id: "numeroDIdentificationALATaxe",
-      name: "numeroDIdentificationALATaxe"
-    },
-    {
-      id: "NumeroDeTVA",
-      name: "NumeroDeTVA"
-    }
-  ],
-  [CountryCodes.Germany]: [{ id: "USt-IdNr", name: "USt-IdNr" }],
-  [CountryCodes.Greece]: [{ id: "grTaxId", name: "grTaxId" }],
-  [CountryCodes.Hungary]: [{ id: "huTaxId", name: "huTaxId" }],
-  [CountryCodes.Ireland]: [{ id: "vatNumber", name: "vatNumber" }],
-  [CountryCodes.Italy]: [{ id: "partitaIVA", name: "partitaIVA" }],
-  [CountryCodes.Latvia]: [{ id: "lvTaxId", name: "lvTaxId" }],
-  [CountryCodes.Liechtenstein]: [{ id: "vatRegistrationNumber", name: "vatRegistrationNumber" }],
-  [CountryCodes.Lithuania]: [{ id: "PVMmoketojoKodas", name: "PVMmoketojoKodas" }],
-  [CountryCodes.Luxembourg]: [
-    { id: "numeroDIdentificationALATaxe", name: "numeroDIdentificationALATaxe" }
-  ],
-  [CountryCodes.Malaysia]: [{ id: "SST", name: "SST" }],
-  [CountryCodes.Malta]: [{ id: "vatNumber", name: "vatNumber" }],
-  [CountryCodes.Monaco]: [
-    { id: "numeroDIdentificationALATaxe", name: "numeroDIdentificationALATaxe" }
-  ],
-  [CountryCodes.Netherlands]: [{ id: "btwNummer", name: "btwNummer" }],
-  [CountryCodes.Norway]: [{ id: "mvanummer", name: "mvanummer" }],
-  [CountryCodes.Poland]: [{ id: "NIP", name: "NIP" }],
-  [CountryCodes.Portugal]: [{ id: "numerodeIVA", name: "numerodeIVA" }],
-  [CountryCodes.Romania]: [
-    { id: "codulDeIdentificareFiscala", name: "codulDeIdentificareFiscala" }
-  ],
-  [CountryCodes.Slovakia]: [{ id: "skTaxId", name: "skTaxId" }],
-  [CountryCodes.Slovenia]: [{ id: "siTaxId", name: "siTaxId" }],
-  [CountryCodes.Spain]: [{ id: "NIFdeIVA", name: "NIFdeIVA" }],
-  [CountryCodes.Sweden]: [
-    {
-      id: "vatNummerMomsregistreringsnummerOrMomsnummer",
-      name: "vatNummerMomsregistreringsnummerOrMomsnummer"
-    }
-  ],
-  [CountryCodes.Switzerland]: [{ id: "Mehrwertsteuernummer", name: "Mehrwertsteuernummer" }],
-  [CountryCodes.UnitedArabEmirates]: [
-    { id: "vatRegistrationNumber", name: "vatRegistrationNumber" }
-  ],
-  [CountryCodes.UnitedKingdom]: [{ id: "vatRegistrationNumber", name: "vatRegistrationNumber" }]
-};
-const getTaxIdNumberOptions = (country, companyType) => {
-  const optionsForCountry = taxIdNumberOptions[country];
-  if (!companyType || !optionsForCountry) return optionsForCountry;
-  return optionsForCountry.filter(
-    (option) => option.applicableOnlyFor?.includes(companyType) ?? true
-  );
-};
-const getVatNumberOptions = (country, companyType) => {
-  const optionsForCountry = vatNumberOptions[country];
-  if (!companyType || !optionsForCountry) return optionsForCountry;
-  return optionsForCountry.filter(
-    (option) => option.applicableOnlyFor?.includes(companyType) ?? true
-  );
-};
-const countryToTaxInfoTypeMap = {
-  US: "EIN",
-  AU: "ABN",
-  NZ: "IRD",
-  HK: "BRN",
-  SG: "GST"
-};
-const isFinancialInformationRequired = (isFinancialInformationExperimentEnabled, taskType, country, capabilities, legalEntityType) => {
-  const isOrganization = legalEntityType === LegalEntityTypes.ORGANIZATION;
-  if (!isFinancialInformationExperimentEnabled || !COUNTRIES_REQUIRING_FINANCIAL_INFORMATION.includes(country)) {
-    return void 0;
-  }
-  if (country === CountryCodes.UnitedKingdom && (taskType === TaskTypes.SOLE_PROPRIETOR_COMPANY || taskType === TaskTypes.BUSINESS_DETAILS)) {
-    return "REQUIRED";
-  }
-  if (taskType === TaskTypes.BUSINESS_DETAILS && isOrganization) {
-    if (keysOf(capabilities ?? {}).some((capability) => capability === "issueBankAccount")) {
-      return "REQUIRED";
+  [CountryCodes.UnitedKingdom]: [{ id: "vatRegistrationNumber", name: "vatRegistrationNumber" }]
+};
+const getVatNumberOptions = (country, companyType) => {
+  const optionsForCountry = vatNumberOptions[country];
+  if (!companyType || !optionsForCountry) return optionsForCountry;
+  return optionsForCountry.filter(
+    (option) => option.applicableOnlyFor?.includes(companyType) ?? true
+  );
+};
+const countryToTaxInfoTypeMap = {
+  US: "EIN",
+  AU: "ABN",
+  NZ: "IRD",
+  HK: "BRN",
+  SG: "GST"
+};
+const isFinancialInformationRequired = (isFinancialInformationExperimentEnabled, taskType, country, capabilities, legalEntityType) => {
+  const isOrganization = legalEntityType === LegalEntityTypes.ORGANIZATION;
+  if (!isFinancialInformationExperimentEnabled || !COUNTRIES_REQUIRING_FINANCIAL_INFORMATION.includes(country)) {
+    return void 0;
+  }
+  if (country === CountryCodes.UnitedKingdom && (taskType === TaskTypes.SOLE_PROPRIETOR_COMPANY || taskType === TaskTypes.BUSINESS_DETAILS)) {
+    return "REQUIRED";
+  }
+  if (taskType === TaskTypes.BUSINESS_DETAILS && isOrganization) {
+    if (keysOf(capabilities ?? {}).some((capability) => capability === "issueBankAccount")) {
+      return "REQUIRED";
     }
   }
   return void 0;
@@ -2982,7 +2655,9 @@ const COUNTRIES_THAT_DONT_REQUIRE_COMPANY_REGISTRATION = [
   CountryCodes.PuertoRico,
   CountryCodes.UnitedStates
 ];
-const COUNTRIES_WITH_POSSIBLE_REGISTRATION_EXEMPTIONS_FOR_ORGANIZATIONS = [];
+const COUNTRIES_WITH_POSSIBLE_REGISTRATION_EXEMPTIONS_FOR_ORGANIZATIONS = [
+  CountryCodes.HongKong
+];
 const COUNTRIES_WITH_POSSIBLE_REGISTRATION_EXEMPTIONS_FOR_SOLE_PROPS = [
   CountryCodes.Austria,
   CountryCodes.Canada,
@@ -3043,12 +2718,27 @@ const COUNTRY_OF_GOVERNING_LAW_POSSIBLE = [
   CountryCodes.UnitedKingdom
 ];
 const COUNTRIES_REQUIRING_FINANCIAL_INFORMATION = [
-  CountryCodes.UnitedKingdom,
-  CountryCodes.Netherlands,
+  CountryCodes.Austria,
+  CountryCodes.Belgium,
+  CountryCodes.Croatia,
+  CountryCodes.Cyprus,
+  CountryCodes.Estonia,
+  CountryCodes.Finland,
   CountryCodes.France,
   CountryCodes.Germany,
+  CountryCodes.Greece,
+  CountryCodes.Ireland,
+  CountryCodes.Italy,
+  CountryCodes.Latvia,
+  CountryCodes.Lithuania,
+  CountryCodes.Luxembourg,
+  CountryCodes.Malta,
+  CountryCodes.Netherlands,
+  CountryCodes.Portugal,
+  CountryCodes.Slovakia,
+  CountryCodes.Slovenia,
   CountryCodes.Spain,
-  CountryCodes.Belgium
+  CountryCodes.UnitedKingdom
 ];
 const COUNTRIES_REQUIRING_E_INVOICING_CODE = [
   /**
@@ -3094,6 +2784,7 @@ const isRegistrationNumberAbsentStateV4Scenario = (country, entityType) => {
 };
 const rules = ({
   data,
+  defaultData,
   country,
   taskType,
   isExperimentEnabled = () => false,
@@ -3190,6 +2881,13 @@ const rules = ({
               }
               return;
             }
+            // We're no longer collecting registration numbers for new HK entities, but for existing,
+            // we want to offer the exemption if they have a registration number attached. See OXP-7075
+            case CountryCodes.HongKong: {
+              if (country === CountryCodes.HongKong && !defaultData?.additionalInformation?.registrationNumber)
+                return;
+              return isExemptFromRegistrationNumber ? "REQUIRED" : "OPTIONAL";
+            }
             default: {
               if (!COUNTRIES_WITH_POSSIBLE_REGISTRATION_EXEMPTIONS_FOR_ORGANIZATIONS.includes(country))
                 return;
@@ -3220,6 +2918,10 @@ const rules = ({
           if (COUNTRIES_WITH_OPTIONAL_REGISTRATION_NUMBER.includes(country)) {
             return "OPTIONAL";
           }
+          if (country === CountryCodes.HongKong) {
+            if (!defaultData?.additionalInformation?.registrationNumber) return;
+            return isExemptFromRegistrationNumber ? "OPTIONAL" : "REQUIRED";
+          }
           if (!COUNTRIES_THAT_DONT_REQUIRE_COMPANY_REGISTRATION.includes(country)) {
             return isExemptFromRegistrationNumber ? "OPTIONAL" : "REQUIRED";
           }
@@ -3275,16 +2977,10 @@ const rules = ({
     },
     countryRequiresFinancialInformation,
     isDateOfIncorporationRequired: () => {
-      if (isExperimentEnabled("EnableIncorporationDateBasedFinancialValidationForHO")) {
-        return countryRequiresDateOfIncorporationForCompanies() || countryRequiresFinancialInformation();
-      }
-      return countryRequiresDateOfIncorporationForCompanies();
+      return countryRequiresDateOfIncorporationForCompanies() || countryRequiresFinancialInformation();
     },
     isFinancialReportingFieldsRequired: () => {
-      if (isExperimentEnabled("EnableIncorporationDateBasedFinancialValidationForHO")) {
-        return countryRequiresFinancialInformation() === "REQUIRED" && isDateOlderThanAYear(data.additionalInformation?.dateOfIncorporation) ? "REQUIRED" : void 0;
-      }
-      return countryRequiresFinancialInformation();
+      return countryRequiresFinancialInformation() === "REQUIRED" && isDateOlderThanAYear(data.additionalInformation?.dateOfIncorporation) ? "REQUIRED" : void 0;
     },
     isIndustryCodeRequired: () => {
       const needsBusinessLine = requestingIssuing(rootLegalEntity) || requestingBanking(rootLegalEntity);
@@ -3297,11 +2993,6 @@ const rules = ({
         return "REQUIRED";
       }
     },
-    netAssetsRequired: () => {
-      if (data.companyFinancialInformation?.reportedValueOption === "netAssets") {
-        return "REQUIRED";
-      }
-    },
     balanceSheetTotalRequired: () => {
       if (data.companyFinancialInformation?.reportedValueOption === "balanceSheetTotal") {
         return "REQUIRED";
@@ -3332,8 +3023,332 @@ const rules = ({
     }
   });
 };
-const inferTaxIdNumberType = (taxInformation, country, companyType) => {
-  if (!taxInformation) return void 0;
+const taxIdNumberOptions = {
+  [CountryCodes.Australia]: [
+    {
+      id: "ABN",
+      name: "australianBusinessNumberAbn"
+    }
+  ],
+  [CountryCodes.Austria]: [
+    {
+      id: "STEUERNUMMER",
+      name: "taxInformationNumber__AT"
+    }
+  ],
+  [CountryCodes.Belgium]: [
+    {
+      id: "BUSINESS_NUMMER",
+      name: "businessNumber",
+      applicableOnlyFor: [
+        CompanyTypesValues.SOLE_PROPRIETORSHIP,
+        CompanyTypesValues.PRIVATE_COMPANY,
+        CompanyTypesValues.GOVERNMENTAL_ORGANIZATION,
+        CompanyTypesValues.INCORPORATED_ASSOCIATION,
+        CompanyTypesValues.INCORPORATED_PARTNERSHIP,
+        CompanyTypesValues.NON_PROFIT_OR_CHARITABLE,
+        CompanyTypesValues.UNINCORPORATED_PARTNERSHIP,
+        CompanyTypesValues.UNLISTED_PUBLIC_COMPANY
+      ]
+    },
+    {
+      id: "NUMERO_NATIONAL",
+      name: "taxInformationNumber__BE_Individual",
+      applicableOnlyFor: [LegalEntityTypes.INDIVIDUAL]
+    }
+  ],
+  [CountryCodes.Brazil]: [{ id: "CNPJ", name: "CNPJ" }],
+  [CountryCodes.Canada]: [{ id: "BUSINESS_NUMBER", name: "businessNumber" }],
+  [CountryCodes.Croatia]: [
+    {
+      id: "OIB",
+      name: "taxInformationNumber__HR"
+    }
+  ],
+  [CountryCodes.Cyprus]: [
+    {
+      id: "TIC",
+      name: "taxInformationNumber__CY"
+    }
+  ],
+  [CountryCodes.Estonia]: [
+    {
+      id: "ISIKUKOOD",
+      name: "taxInformationNumber__ET_Individual",
+      applicableOnlyFor: [LegalEntityTypes.INDIVIDUAL]
+    },
+    {
+      id: "registrikood",
+      name: "registrikood",
+      applicableOnlyFor: [CompanyTypesValues.PRIVATE_COMPANY]
+    }
+  ],
+  [CountryCodes.Finland]: [
+    {
+      id: "HENKILOTUNNUS",
+      name: "taxInformationNumber__FI",
+      applicableOnlyFor: [LegalEntityTypes.INDIVIDUAL]
+    },
+    {
+      id: "YTUNNUS",
+      name: "YTunnus",
+      applicableOnlyFor: [CompanyTypesValues.PRIVATE_COMPANY]
+    }
+  ],
+  [CountryCodes.France]: [
+    {
+      id: "SIRET",
+      name: "siret",
+      applicableOnlyFor: [CompanyTypesValues.PRIVATE_COMPANY]
+    }
+  ],
+  [CountryCodes.Germany]: [
+    {
+      id: "STEUERNUMMER",
+      name: "taxInformationNumber__DE",
+      applicableOnlyFor: [
+        CompanyTypesValues.SOLE_PROPRIETORSHIP,
+        CompanyTypesValues.PRIVATE_COMPANY,
+        CompanyTypesValues.GOVERNMENTAL_ORGANIZATION,
+        CompanyTypesValues.INCORPORATED_ASSOCIATION,
+        CompanyTypesValues.INCORPORATED_PARTNERSHIP,
+        CompanyTypesValues.NON_PROFIT_OR_CHARITABLE,
+        CompanyTypesValues.UNINCORPORATED_PARTNERSHIP,
+        CompanyTypesValues.UNLISTED_PUBLIC_COMPANY
+      ]
+    },
+    {
+      id: "IDNR",
+      name: "taxInformationNumber__DE_Individual",
+      applicableOnlyFor: [LegalEntityTypes.INDIVIDUAL]
+    }
+  ],
+  [CountryCodes.Gibraltar]: [
+    { id: "GI_TAXPAYER_REFERENCE_NUMBER", name: "taxpayerReferenceNumber" }
+  ],
+  [CountryCodes.Greece]: [
+    {
+      id: "AFM",
+      name: "taxInformationNumber__GR"
+    }
+  ],
+  [CountryCodes.Guernsey]: [
+    { id: "GG_REGISTRATION_NUMBER", name: "taxInformationNumber" },
+    {
+      id: "TIN_GG",
+      name: "nationalInsuranceNumber",
+      applicableOnlyFor: [CompanyTypesValues.SOLE_PROPRIETORSHIP]
+    }
+  ],
+  [CountryCodes.HongKong]: [
+    {
+      id: "BRN",
+      name: "taxInformationNumber__HK"
+    }
+  ],
+  [CountryCodes.Ireland]: [
+    {
+      id: "TRN",
+      name: "trnNumber",
+      applicableOnlyFor: [
+        CompanyTypesValues.PRIVATE_COMPANY,
+        CompanyTypesValues.UNINCORPORATED_PARTNERSHIP
+      ]
+    },
+    {
+      id: "PERSONAL_PUBLIC_SERVICE_NUMBER",
+      name: "taxInformationNumber__IE_Individual",
+      applicableOnlyFor: [LegalEntityTypes.INDIVIDUAL]
+    }
+  ],
+  [CountryCodes.IsleOfMan]: [{ id: "IM_TAX_REFERENCE_NUMBER", name: "taxReferenceNumber" }],
+  [CountryCodes.Italy]: [
+    {
+      id: "CODICE_FISCALE",
+      name: "taxInformationNumber__IT"
+    }
+  ],
+  [CountryCodes.Japan]: [{ id: "CORPORATE_NUMBER", name: "taxInformationNumber" }],
+  [CountryCodes.Jersey]: [
+    {
+      id: "TIN_JE",
+      name: "taxIdentificationNumber"
+    },
+    {
+      id: "SSN",
+      name: "socialSecurityNumber",
+      applicableOnlyFor: [CompanyTypesValues.SOLE_PROPRIETORSHIP]
+    }
+  ],
+  [CountryCodes.Latvia]: [
+    {
+      id: "PERSONAS_KODS",
+      name: "taxInformationNumber__LV",
+      applicableOnlyFor: [LegalEntityTypes.INDIVIDUAL]
+    },
+    {
+      id: "REGISTRACIJAS_NUMURS",
+      name: "lvRegistrationNumber",
+      applicableOnlyFor: [CompanyTypesValues.PRIVATE_COMPANY]
+    }
+  ],
+  [CountryCodes.Lithuania]: [
+    {
+      id: "ASMENS_KODAS",
+      name: "taxInformationNumber__LT"
+    }
+  ],
+  [CountryCodes.Luxembourg]: [
+    {
+      id: "NATIONAL_IDENTIFICATION_NUMBER",
+      name: "taxInformationNumber__LU_Individual",
+      applicableOnlyFor: [LegalEntityTypes.INDIVIDUAL]
+    },
+    {
+      id: "NATIONAL_IDENTIFICATION_NUMBER",
+      name: "taxInformationNumber__LU_Org",
+      applicableOnlyFor: [CompanyTypesValues.PRIVATE_COMPANY]
+    }
+  ],
+  [CountryCodes.Malta]: [
+    {
+      id: "NRU",
+      name: "taxInformationNumber__MT_NRU_Individual",
+      applicableOnlyFor: [LegalEntityTypes.INDIVIDUAL]
+    },
+    {
+      id: "IDENTITY_CARD_NUMBER",
+      name: "taxInformationNumber__MT_Individual",
+      applicableOnlyFor: [LegalEntityTypes.INDIVIDUAL]
+    },
+    {
+      id: "INCOME_TAX_REGISTRATION_NUMBER",
+      name: "taxInformationNumber__MT_Org",
+      applicableOnlyFor: [CompanyTypesValues.PRIVATE_COMPANY]
+    }
+  ],
+  [CountryCodes.Netherlands]: [
+    {
+      id: "RSIN",
+      name: "rsinNumber",
+      applicableOnlyFor: [
+        CompanyTypesValues.PRIVATE_COMPANY,
+        CompanyTypesValues.GOVERNMENTAL_ORGANIZATION,
+        CompanyTypesValues.INCORPORATED_ASSOCIATION,
+        CompanyTypesValues.INCORPORATED_PARTNERSHIP,
+        CompanyTypesValues.NON_PROFIT_OR_CHARITABLE,
+        CompanyTypesValues.UNINCORPORATED_PARTNERSHIP,
+        CompanyTypesValues.UNLISTED_PUBLIC_COMPANY
+      ]
+    },
+    {
+      id: "BSN",
+      name: "bsnNumber",
+      applicableOnlyFor: [LegalEntityTypes.INDIVIDUAL]
+    }
+  ],
+  [CountryCodes.NewZealand]: [
+    {
+      id: "IRD",
+      name: "irdNumber"
+    }
+  ],
+  [CountryCodes.Portugal]: [
+    {
+      id: "NUMERO_ID_CIVIL",
+      name: "taxInformationNumber__PT",
+      applicableOnlyFor: [LegalEntityTypes.INDIVIDUAL]
+    },
+    {
+      id: "NIPC",
+      name: "NIPC",
+      applicableOnlyFor: [CompanyTypesValues.PRIVATE_COMPANY]
+    }
+  ],
+  [CountryCodes.PuertoRico]: [
+    {
+      id: "EIN",
+      name: "ein"
+    }
+  ],
+  [CountryCodes.Singapore]: [
+    {
+      id: "GST",
+      name: "gst"
+    },
+    {
+      id: "UEN",
+      name: "uen"
+    }
+  ],
+  [CountryCodes.Slovakia]: [
+    {
+      id: "RODNE_CISLO",
+      name: "taxInformationNumber__SK_Individual",
+      applicableOnlyFor: [LegalEntityTypes.INDIVIDUAL]
+    },
+    {
+      id: "NATIONAL_IDENTIFICATION_NUMBER",
+      name: "taxInformationNumber__SK_Org",
+      applicableOnlyFor: [CompanyTypesValues.PRIVATE_COMPANY]
+    }
+  ],
+  [CountryCodes.Slovenia]: [
+    {
+      id: "SI_TAX_NUMBER",
+      name: "taxInformationNumber__SI_Individual",
+      applicableOnlyFor: [LegalEntityTypes.INDIVIDUAL]
+    },
+    {
+      id: "NATIONAL_IDENTIFICATION_NUMBER",
+      name: "taxInformationNumber__SI_Org",
+      applicableOnlyFor: [CompanyTypesValues.PRIVATE_COMPANY]
+    }
+  ],
+  [CountryCodes.Spain]: [
+    {
+      id: "dni",
+      name: "dni",
+      applicableOnlyFor: [LegalEntityTypes.INDIVIDUAL]
+    },
+    {
+      id: "nie",
+      name: "nie",
+      applicableOnlyFor: [LegalEntityTypes.INDIVIDUAL]
+    },
+    {
+      id: "NIF",
+      name: "NIF",
+      applicableOnlyFor: [CompanyTypesValues.PRIVATE_COMPANY]
+    }
+  ],
+  [CountryCodes.UnitedKingdom]: [
+    {
+      id: "UTR",
+      name: "utr"
+    },
+    {
+      id: "NINO",
+      name: "nationalInsuranceNumber",
+      applicableOnlyFor: [LegalEntityTypes.INDIVIDUAL]
+    }
+  ],
+  [CountryCodes.UnitedStates]: [
+    {
+      id: "EIN",
+      name: "ein"
+    }
+  ]
+};
+const getTaxIdNumberOptions = (country, companyType) => {
+  const optionsForCountry = taxIdNumberOptions[country];
+  if (!companyType || !optionsForCountry) return optionsForCountry;
+  return optionsForCountry.filter(
+    (option) => option.applicableOnlyFor?.includes(companyType) ?? true
+  );
+};
+const inferTaxIdNumberType = (taxInformation, country, companyType) => {
+  if (!taxInformation) return void 0;
   const optionsForCountry = getTaxIdNumberOptions(country, companyType);
   const metadataFn = taxInformationDefaultFieldConfig[country];
   if (!optionsForCountry || !metadataFn) return void 0;
@@ -3381,7 +3396,7 @@ function TaxIdNumberTypeSelector({
   companyType,
   selected,
   setSelected,
-  exemptedOption,
+  exemptedOptionLabel,
   isUsSoleProp,
   errorMessage
 }) {
@@ -3390,26 +3405,26 @@ function TaxIdNumberTypeSelector({
     (selectedStr) => {
       const newSelected = selectedStr;
       if (newSelected === "exempted") {
-        if (exemptedOption) {
+        if (exemptedOptionLabel) {
           setSelected(newSelected);
         }
         return;
       }
       setSelected(newSelected);
     },
-    [exemptedOption, setSelected]
+    [exemptedOptionLabel, setSelected]
   );
   const options = useMemo(() => {
     const availableOptions = getTaxIdNumberOptions(country, companyType) ?? [];
-    if (availableOptions.length === 0 || !exemptedOption) return availableOptions;
+    if (availableOptions.length === 0 || !exemptedOptionLabel) return availableOptions;
     return [
       ...availableOptions,
       {
         id: "exempted",
-        name: exemptedOption
+        name: exemptedOptionLabel
       }
     ];
-  }, [country, companyType, exemptedOption]);
+  }, [country, companyType, exemptedOptionLabel]);
   useEffect(() => {
     if (!isUsSoleProp && !selected && options.length > 0) {
       handleSelect(options[0].id);
@@ -3436,6 +3451,15 @@ function TaxIdNumberTypeSelector({
     }
   );
 }
+function upsertTaxInfoForCountry(taxInformation, country, newEntry) {
+  if (!taxInformation) return [newEntry];
+  const hasExisting = taxInformation.some((t) => t.country === country);
+  const base = hasExisting ? taxInformation : [...taxInformation, newEntry];
+  return base.map((t) => t.country === country ? newEntry : t);
+}
+function removeTaxInfoForCountry(taxInformation, country) {
+  return taxInformation?.filter((t) => t.country !== country);
+}
 const TAX_INFORMATION_FIELD = [
   "taxInformation",
   "exemptedFromTax",
@@ -3447,7 +3471,6 @@ function TaxInformationField({
   errors,
   labels,
   mask,
-  guidanceText,
   placeholder,
   readonly,
   optional,
@@ -3467,16 +3490,16 @@ function TaxInformationField({
     [data?.taxInformation, data.exemptedFromTax, defaultData, country]
   );
   const isUsSoleProp = country === "US" && entityType === CompanyTypesValues.SOLE_PROPRIETORSHIP;
-  const exemptionLabel = isUsSoleProp ? t(($) => $["socialSecurityNumber"]) : labels.exemptedFromTax;
-  const shouldRenderInput = isUsSoleProp ? currentCountryTaxInformation?.type === "EIN" : !data.isUen;
   const options = getTaxIdNumberOptions(country, entityType);
   const showTaxIdExemptedOptions = canExempt && (options?.length ?? 0) > 1 || isUsSoleProp;
   const canSaveAbsentState = isExperimentEnabled("EnableRegistrationAndTaxAbsentStatesV4") && COUNTRIES_WITH_POSSIBLE_TRUSTEE_TAXID_ABSENT_V4.includes(country) && accountHolder === "aTrust";
+  const exemptionLabel = isUsSoleProp ? t(($) => $["socialSecurityNumber"]) : labels.exemptedFromTax;
+  const shouldRenderInput = isUsSoleProp ? currentCountryTaxInformation?.type === "EIN" : !data.isUen;
   const taxIdNumberType = useMemo(() => {
-    if (isUsSoleProp) {
-      return data.exemptedFromTax ? "exempted" : currentCountryTaxInformation?.type ? currentCountryTaxInformation?.type : void 0;
-    }
-    return data.exemptedFromTax ? "exempted" : currentCountryTaxInformation?.type ? currentCountryTaxInformation?.type : getDefaultTaxIdNumberType(data.taxInformation, country, entityType);
+    if (data.exemptedFromTax) return "exempted";
+    if (currentCountryTaxInformation?.type) return currentCountryTaxInformation.type;
+    if (isUsSoleProp) return void 0;
+    return getDefaultTaxIdNumberType(data.taxInformation, country, entityType);
   }, [
     country,
     currentCountryTaxInformation?.type,
@@ -3485,110 +3508,126 @@ function TaxInformationField({
     entityType,
     isUsSoleProp
   ]);
-  const handleTaxInformationChange = (e, key, mode, resetToDefault) => {
-    const value = e ? typeof e === "string" ? e : e.currentTarget.value : void 0;
-    if (resetToDefault) {
-      if (defaultData !== void 0) {
-        return handleChangeFor("taxInformation", mode)(defaultData);
-      }
-      return;
-    }
-    switch (key) {
-      case "number": {
-        const newTaxInformation = canSaveAbsentState ? {
-          country,
-          number: value,
-          type: currentCountryTaxInformation?.type ?? taxIdNumberType,
-          numberAbsent: false
-        } : {
-          country,
-          number: value,
-          type: currentCountryTaxInformation?.type ?? taxIdNumberType
-        };
-        if (!data.taxInformation) {
-          return handleChangeFor("taxInformation", mode)([newTaxInformation]);
-        }
-        const taxInformation = currentCountryTaxInformation ? data.taxInformation : [...data.taxInformation, newTaxInformation];
-        const updatedTaxInformation = taxInformation.map((taxInfo) => {
-          if (taxInfo.country !== country) return taxInfo;
-          return newTaxInformation;
-        });
-        return handleChangeFor("taxInformation", mode)(updatedTaxInformation);
-      }
-      case "type": {
-        const newTaxInformation = canSaveAbsentState ? {
-          country,
-          number: currentCountryTaxInformation?.number,
-          type: value,
-          numberAbsent: false
-        } : {
-          country,
-          number: currentCountryTaxInformation?.number,
-          type: value
-        };
-        if (!data.taxInformation) {
-          return handleChangeFor("taxInformation", mode)([newTaxInformation]);
+  const fieldMetadata = resolveFieldMetadata(
+    taxInformationDefaultFieldConfig[country],
+    {
+      taxIdNumberType: currentCountryTaxInformation?.type,
+      companyType: entityType
+    },
+    taxInformationDefaultFieldMetadata
+  );
+  const updateTaxInfo = useCallback(
+    (mode, newEntry) => {
+      const entry = canSaveAbsentState ? { ...newEntry, numberAbsent: newEntry.numberAbsent ?? false } : newEntry;
+      handleChangeFor(
+        "taxInformation",
+        mode
+      )(upsertTaxInfoForCountry(data.taxInformation, country, entry));
+    },
+    [canSaveAbsentState, country, data.taxInformation, handleChangeFor]
+  );
+  const updateTaxType = useCallback(
+    (type, mode) => {
+      updateTaxInfo(mode, {
+        country,
+        number: currentCountryTaxInformation?.number,
+        type
+      });
+    },
+    [country, currentCountryTaxInformation?.number, updateTaxInfo]
+  );
+  const resetToDefaultData = useCallback(() => {
+    if (defaultData !== void 0) {
+      handleChangeFor("taxInformation", "input")(defaultData);
+    }
+  }, [defaultData, handleChangeFor]);
+  const removeCountryTaxInfo = useCallback(() => {
+    handleChangeFor(
+      "taxInformation",
+      "input"
+    )(removeTaxInfoForCountry(data.taxInformation, country));
+  }, [country, data.taxInformation, handleChangeFor]);
+  const setUenAsTaxId = useCallback(
+    (uen) => {
+      updateTaxInfo("blur", { country, number: uen ?? "", type: "UEN" });
+    },
+    [country, updateTaxInfo]
+  );
+  const addTaxAbsentStatus = useCallback(
+    (exempted) => {
+      handleChangeFor(
+        "taxInformation",
+        "input"
+      )(upsertTaxInfoForCountry(data.taxInformation, country, { country, numberAbsent: exempted }));
+    },
+    [country, data.taxInformation, handleChangeFor]
+  );
+  const handleTaxNumberChange = useCallback(
+    (e, mode) => {
+      const value = e ? typeof e === "string" ? e : e.currentTarget.value : void 0;
+      const resolvedType = currentCountryTaxInformation?.type ?? (taxIdNumberType !== "exempted" ? taxIdNumberType : void 0);
+      updateTaxInfo(mode, {
+        country,
+        number: value,
+        type: resolvedType
+      });
+    },
+    [country, currentCountryTaxInformation?.type, taxIdNumberType, updateTaxInfo]
+  );
+  const handleTaxIdNumberTypeChange = useCallback(
+    (taxIdType) => {
+      if (!canExempt && taxIdType === "exempted") {
+        throw Error(`${country} does not allow tax exemptions`);
+      }
+      if (taxIdType === "exempted") {
+        handleChangeFor("exemptedFromTax")(true);
+        updateTaxType(void 0, "input");
+        return canSaveAbsentState ? addTaxAbsentStatus(true) : removeCountryTaxInfo();
+      }
+      handleChangeFor("exemptedFromTax")(false);
+      if (country === "SG") {
+        if (taxIdType === "UEN") {
+          handleChangeFor("isUen")(true);
+          setUenAsTaxId(registrationNumber);
+        } else {
+          handleChangeFor("isUen")(false);
+          removeCountryTaxInfo();
         }
-        const taxInformation = currentCountryTaxInformation ? data.taxInformation : [...data.taxInformation, newTaxInformation];
-        const updatedTaxInformation = taxInformation.map((taxInfo) => {
-          if (taxInfo.country !== country) return taxInfo;
-          return newTaxInformation;
-        });
-        return handleChangeFor("taxInformation", mode)(updatedTaxInformation);
       }
-    }
-  };
+      updateTaxType(taxIdType, "input");
+    },
+    [
+      addTaxAbsentStatus,
+      canExempt,
+      canSaveAbsentState,
+      country,
+      handleChangeFor,
+      updateTaxType,
+      registrationNumber,
+      removeCountryTaxInfo,
+      setUenAsTaxId
+    ]
+  );
+  const handleExemptedFromTaxChange = useCallback(
+    (exempted) => {
+      handleChangeFor("exemptedFromTax")(exempted);
+      if (canSaveAbsentState) {
+        addTaxAbsentStatus(exempted);
+      } else {
+        removeCountryTaxInfo();
+      }
+    },
+    [addTaxAbsentStatus, canSaveAbsentState, handleChangeFor, removeCountryTaxInfo]
+  );
+  const prevCountryRef = useRef(country);
   useEffect(() => {
-    if (!country) return;
+    if (!country || prevCountryRef.current === country) return;
+    prevCountryRef.current = country;
     const hasSavedTaxId = defaultData?.find((taxId) => taxId.country === country);
-    if (currentCountryTaxInformation?.country === country) return;
     if (currentCountryTaxInformation && !hasSavedTaxId) return;
     if (entityType === CompanyTypesValues.SOLE_PROPRIETORSHIP) return;
-    if (defaultData !== void 0) {
-      handleChangeFor("taxInformation", "input")(defaultData);
-    }
-    const newCountryOptions = getTaxIdNumberOptions(country, entityType);
-    if (newCountryOptions && newCountryOptions.length > 0) {
-      handleTaxInformationChange(newCountryOptions[0].id, "type", "input", true);
-    } else {
-      handleTaxInformationChange(void 0, "type", "input", true);
-    }
+    resetToDefaultData();
   }, [country]);
-  const removeCurrentCountryTaxInformation = () => {
-    const filterdTaxInformation = data.taxInformation?.filter((taxId) => taxId.country !== country);
-    handleChangeFor("taxInformation", "input")(filterdTaxInformation);
-  };
-  const setUenAsTaxId = (uen) => {
-    if (!data.taxInformation) {
-      return handleChangeFor(
-        "taxInformation",
-        "blur"
-      )([
-        {
-          country,
-          number: uen ?? "",
-          type: "UEN"
-        }
-      ]);
-    }
-    const taxInformation = currentCountryTaxInformation ? data.taxInformation : [
-      ...data.taxInformation,
-      {
-        country,
-        number: uen ?? "",
-        type: "UEN"
-      }
-    ];
-    const updatedTaxInformation = taxInformation.map((taxInfo) => {
-      if (taxInfo.country !== country) return taxInfo;
-      return {
-        country,
-        number: uen ?? "",
-        type: "UEN"
-      };
-    });
-    return handleChangeFor("taxInformation", "blur")(updatedTaxInformation);
-  };
   useEffect(() => {
     if (country === "SG" && data.isUen && registrationNumber && registrationNumber !== currentCountryTaxInformation?.number) {
       setUenAsTaxId(registrationNumber);
@@ -3600,64 +3639,6 @@ function TaxInformationField({
     country,
     setUenAsTaxId
   ]);
-  const addTaxAbsentStatus = (exempted) => {
-    if (!data.taxInformation) {
-      const updatedTaxInformation2 = [
-        {
-          country,
-          numberAbsent: exempted
-        }
-      ];
-      return handleChangeFor("taxInformation", "input")(updatedTaxInformation2);
-    }
-    const taxInformation = currentCountryTaxInformation ? data.taxInformation : [
-      ...data.taxInformation,
-      {
-        country,
-        numberAbsent: exempted
-      }
-    ];
-    const updatedTaxInformation = taxInformation.map((taxInfo) => {
-      if (taxInfo.country !== country) return taxInfo;
-      return {
-        country,
-        numberAbsent: exempted
-      };
-    });
-    return handleChangeFor("taxInformation", "input")(updatedTaxInformation);
-  };
-  const handleTaxIdNumberTypeChange = (taxIdType) => {
-    if (!canExempt && taxIdType === "exempted") {
-      throw Error(`${country} does not allow tax exemptions`);
-    }
-    switch (taxIdType) {
-      case "exempted":
-        handleChangeFor("exemptedFromTax")(true);
-        handleTaxInformationChange(void 0, "type", "input");
-        return canSaveAbsentState ? addTaxAbsentStatus(true) : removeCurrentCountryTaxInformation();
-      default:
-        handleChangeFor("exemptedFromTax")(false);
-    }
-    if (country === "SG") {
-      if (taxIdType === "UEN") {
-        handleChangeFor("isUen")(true);
-        setUenAsTaxId(registrationNumber);
-      } else {
-        handleChangeFor("isUen")(false);
-        removeCurrentCountryTaxInformation();
-      }
-    }
-    handleTaxInformationChange(taxIdType, "type", "input");
-  };
-  const handleExemptedFromTaxChange = (exempted) => {
-    if (canSaveAbsentState) {
-      addTaxAbsentStatus(exempted);
-      handleChangeFor("exemptedFromTax")(exempted);
-    } else {
-      handleChangeFor("exemptedFromTax")(exempted);
-      removeCurrentCountryTaxInformation();
-    }
-  };
   return /* @__PURE__ */ jsxs("div", { className: "adyen-kyc-field__tax-information", children: [
     /* @__PURE__ */ jsx(
       TaxIdNumberTypeSelector,
@@ -3666,7 +3647,7 @@ function TaxInformationField({
         companyType: entityType,
         setSelected: handleTaxIdNumberTypeChange,
         selected: taxIdNumberType,
-        exemptedOption: showTaxIdExemptedOptions ? exemptionLabel : false,
+        exemptedOptionLabel: showTaxIdExemptedOptions ? exemptionLabel : void 0,
         isUsSoleProp,
         errorMessage: isUsSoleProp ? errors.taxInformation : false
       }
@@ -3679,13 +3660,13 @@ function TaxInformationField({
         "aria-invalid": !valid.taxInformation,
         name: "taxInformation",
         label: labels.taxInformation ?? "",
-        formatGuidance: guidanceText?.taxInformation ?? "",
+        formatGuidance: translateTranslatable(t, fieldMetadata.guidanceText),
         value: currentCountryTaxInformation?.number ?? "",
         errorMessage: errors.taxInformation,
         placeholder,
         isValid: Boolean(valid.taxInformation) && !!currentCountryTaxInformation,
-        onInput: (e) => handleTaxInformationChange(e, "number", "input"),
-        onBlur: (e) => handleTaxInformationChange(e, "number", "blur"),
+        onInput: (e) => handleTaxNumberChange(e, "input"),
+        onBlur: (e) => handleTaxNumberChange(e, "blur"),
         disabled: data.exemptedFromTax || data.isUen,
         readonly,
         optional,
@@ -3722,20 +3703,19 @@ export {
   getFieldsWithExistingData as g,
   isUsingCompanySearch as h,
   individualIdNumberOptions as i,
-  isRegistrationNumberAbsentStateV4Scenario as j,
-  getTaxIdNumberOptions as k,
-  COUNTRIES_THAT_USE_TAX_ID_INSTEAD_OF_VAT as l,
-  getCompanyRegistrationNumberOptions as m,
-  countryToTaxInfoTypeMap as n,
+  countryToTaxInfoTypeMap as j,
+  getCompanyRegistrationNumberOptions as k,
+  isRegistrationNumberAbsentStateV4Scenario as l,
+  getTaxIdNumberOptions as m,
+  COUNTRIES_THAT_USE_TAX_ID_INSTEAD_OF_VAT as n,
   rules as o,
   businessRegistrationNumberMasks as p,
   businessRegistrationNumberPatterns as q,
   requestingBanking as r,
   stateFormatGuidanceText as s,
   taxInformationDefaultFieldMetadata as t,
-  useCapabilities as u,
+  getVatNumberOptions as u,
   vatNumberOptions as v,
-  getVatNumberOptions as w,
-  exemptedFromTaxDefaultFieldMetadata as x,
-  exemptedFromTaxDefaultFieldConfig as y
+  exemptedFromTaxDefaultFieldMetadata as w,
+  exemptedFromTaxDefaultFieldConfig as x
 };