Update tax ID validation error messages to use terminology not specific to VAT/EU

client/vat/form-modal/test/index.tsx → client/documents/form-modal/test/index.tsx

@@ -11,13 +11,13 @@ import React from 'react';
  * Internal dependencies
  */
 import VatFormModal from '..';
-import VatForm from '../../form';
+import TaxDetailsForm from '../../form';
 
 jest.mock( '../../form', () => jest.fn() );
 
 describe( 'Tax details modal', () => {
 	beforeEach( () => {
-		jest.mocked( VatForm ).mockReturnValue( <p>VAT Form</p> );
+		jest.mocked( TaxDetailsForm ).mockReturnValue( <p>VAT Form</p> );
 	} );
 
 	it( 'should render when isModalOpen is true', () => {

client/vat/form/tasks/company-data-task.tsx → client/documents/form/tasks/company-data-task.tsx

@@ -19,12 +19,7 @@ import apiFetch from '@wordpress/api-fetch';
 import CollapsibleBody from 'wcpay/additional-methods-setup/wizard/collapsible-body';
 import WizardTaskItem from 'wcpay/additional-methods-setup/wizard/task-item';
 import WizardTaskContext from 'wcpay/additional-methods-setup/wizard/task/context';
-import {
-	VatError,
-	VatFormOnCompleted,
-	VatSaveDetails,
-	VatSaveDetailsResult,
-} from '../../types';
+import { VatError, VatFormOnCompleted } from '../../types';
 
 export const CompanyDataTask = ( {
 	onCompleted,
@@ -60,16 +55,17 @@ export const CompanyDataTask = ( {
 		try {
 			setLoading( true );
 
-			const details: VatSaveDetails = {
+			const details = {
 				name: companyName,
 				address: companyAddress,
+				vat_number: vatNumber ?? undefined,
 			};
 
-			if ( vatNumber !== null ) {
-				details.vat_number = vatNumber;
-			}
-
-			const savedDetails = await apiFetch< VatSaveDetailsResult >( {
+			const savedDetails = await apiFetch< {
+				vat_number: string | null;
+				name: string;
+				address: string;
+			} >( {
 				path: '/wc/v3/payments/vat',
 				method: 'POST',
 				data: details,

client/vat/form/tasks/vat-number-task.tsx → client/documents/form/tasks/vat-number-task.tsx

@@ -19,7 +19,7 @@ import apiFetch from '@wordpress/api-fetch';
 import CollapsibleBody from 'wcpay/additional-methods-setup/wizard/collapsible-body';
 import WizardTaskItem from 'wcpay/additional-methods-setup/wizard/task-item';
 import WizardTaskContext from 'wcpay/additional-methods-setup/wizard/task/context';
-import { VatError, VatFormOnCompleted, VatValidationResult } from '../../types';
+import { VatError, VatFormOnCompleted } from '../../types';
 import '../style.scss';
 
 /**
@@ -123,13 +123,17 @@ export const VatNumberTask = ( {
 			if ( null !== normalizedVatNumber ) {
 				setLoading( true );
 
-				const validationResult = await apiFetch< VatValidationResult >(
-					{
-						path: `/wc/v3/payments/vat/${ encodeURI(
-							normalizedVatNumber
-						) }`,
-					}
-				);
+				const validationResult = await apiFetch< {
+					address: string | null;
+					country_code: string;
+					name: string | null;
+					valid: boolean;
+					vat_number: string;
+				} >( {
+					path: `/wc/v3/payments/vat/${ encodeURI(
+						normalizedVatNumber
+					) }`,
+				} );
 
 				setLoading( false );
 

client/vat/form/test/index.tsx → client/documents/form/test/index.tsx

@@ -11,7 +11,7 @@ import apiFetch from '@wordpress/api-fetch';
 /**
  * Internal dependencies
  */
-import VatForm from '..';
+import TaxDetailsForm from '..';
 
 jest.mock( '@wordpress/api-fetch', () => jest.fn() );
 
@@ -67,7 +67,7 @@ describe( 'VAT form', () => {
 				accountStatus: { country: country },
 			};
 
-			render( <VatForm onCompleted={ mockOnCompleted } /> );
+			render( <TaxDetailsForm onCompleted={ mockOnCompleted } /> );
 
 			user.click(
 				screen.getByLabelText(
@@ -99,7 +99,7 @@ describe( 'VAT form', () => {
 			accountStatus: { country: 'GB' },
 		};
 
-		render( <VatForm onCompleted={ mockOnCompleted } /> );
+		render( <TaxDetailsForm onCompleted={ mockOnCompleted } /> );
 	} );
 
 	afterEach( () => {

client/documents/list/index.tsx

@@ -18,7 +18,7 @@ import './style.scss';
 import DocumentsFilters from '../filters';
 import Page from '../../components/page';
 import { getDocumentUrl } from 'wcpay/utils';
-import VatFormModal from 'wcpay/vat/form-modal';
+import VatFormModal from '../form-modal';
 import { formatDateTimeFromString } from 'wcpay/utils/date-time';
 import { usePersistedColumnVisibility } from 'wcpay/hooks/use-persisted-table-column-visibility';
 

client/documents/list/test/index.tsx

@@ -15,14 +15,14 @@ import { useUserPreferences } from '@woocommerce/data';
 import { DocumentsList } from '../';
 import { useDocuments, useDocumentsSummary } from 'data/index';
 import type { Document } from 'data/documents/hooks';
-import VatForm from 'wcpay/vat/form';
+import TaxDetailsForm from 'wcpay/documents/form';
 
 jest.mock( 'data/index', () => ( {
 	useDocuments: jest.fn(),
 	useDocumentsSummary: jest.fn(),
 } ) );
 
-jest.mock( 'wcpay/vat/form', () => jest.fn() );
+jest.mock( 'wcpay/documents/vat/form', () => jest.fn() );
 
 jest.mock( '@woocommerce/data', () => {
 	const actualModule = jest.requireActual( '@woocommerce/data' );
@@ -207,7 +207,9 @@ describe( 'Document download button', () => {
 				documentsError: undefined,
 			} );
 
-			jest.mocked( VatForm ).mockImplementation( ( { onCompleted } ) => (
+			jest.mocked(
+				TaxDetailsForm
+			).mockImplementation( ( { onCompleted } ) => (
 				<button
 					onClick={ () =>
 						onCompleted(

client/documents/types.d.ts

@@ -0,0 +1,10 @@
+export type VatFormOnCompleted = (
+	vatNumber: string | null,
+	companyName: string,
+	companyAddress: string
+) => void;
+
+export interface VatError {
+	code: string;
+	message: string;
+}