Consolidate accounts onboarding: Merge the store address setting in Step 3 into Step 1 and remove Step 3 along with the phone verification

js/src/components/account-card/index.js

@@ -3,7 +3,6 @@
  */
 import { __ } from '@wordpress/i18n';
 import classnames from 'classnames';
-import GridiconPhone from 'gridicons/dist/phone';
 import { Icon, store as storeIcon } from '@wordpress/icons';
 
 /**
@@ -29,7 +28,6 @@ export const APPEARANCE = {
 	GOOGLE: 'google',
 	GOOGLE_MERCHANT_CENTER: 'google_merchant_center',
 	GOOGLE_ADS: 'google_ads',
-	PHONE: 'phone',
 	ADDRESS: 'address',
 	FINAL_URL: 'final_url',
 };
@@ -104,10 +102,6 @@ const appearanceDict = {
 			'google-listings-and-ads'
 		),
 	},
-	[ APPEARANCE.PHONE ]: {
-		icon: <GridiconPhone size={ 32 } />,
-		title: __( 'Phone number', 'google-listings-and-ads' ),
-	},
 	[ APPEARANCE.ADDRESS ]: {
 		icon: <Icon icon={ storeIcon } size={ 32 } />,
 		title: __( 'Store address', 'google-listings-and-ads' ),

js/src/components/contact-information/index.js

@@ -6,17 +6,11 @@ import { __ } from '@wordpress/i18n';
 /**
  * Internal dependencies
  */
-import { getEditPhoneNumberUrl, getEditStoreAddressUrl } from '.~/utils/urls';
-import { useAdaptiveFormContext } from '.~/components/adaptive-form';
-import useGoogleMCPhoneNumber from '.~/hooks/useGoogleMCPhoneNumber';
+import { getEditStoreAddressUrl } from '.~/utils/urls';
 import Section from '.~/wcdl/section';
 import VerticalGapLayout from '.~/components/vertical-gap-layout';
 import AppDocumentationLink from '.~/components/app-documentation-link';
-import PhoneNumberCard, { PhoneNumberCardPreview } from './phone-number-card';
-import StoreAddressCard, {
-	StoreAddressCardPreview,
-} from './store-address-card';
-import usePhoneNumberCheckTrackEventEffect from './usePhoneNumberCheckTrackEventEffect';
+import { StoreAddressCardPreview } from './store-address-card';
 
 const learnMoreLinkId = 'contact-information-read-more';
 const learnMoreUrl =
@@ -39,29 +33,16 @@ const description = (
 	</>
 );
 
-const mcTitle = __( 'Verify contact information', 'google-listings-and-ads' );
 const settingsTitle = __( 'Contact information', 'google-listings-and-ads' );
 
 /**
  * Renders a preview of contact information section,
- * or a <NoContactInformationCard> if contact informations are not saved yet.
+ * or a <NoContactInformationCard> if contact information are not saved yet.
  */
 export function ContactInformationPreview() {
 	return (
 		<Section title={ settingsTitle } description={ description }>
 			<VerticalGapLayout size="overlap">
-				<PhoneNumberCardPreview
-					editHref={ getEditPhoneNumberUrl() }
-					learnMore={
-						<AppDocumentationLink
-							context="settings-no-phone-number-notice"
-							linkId={ learnMoreLinkId }
-							href={ learnMoreUrl }
-						>
-							{ __( 'Learn more', 'google-listings-and-ads' ) }
-						</AppDocumentationLink>
-					}
-				/>
 				<StoreAddressCardPreview
 					editHref={ getEditStoreAddressUrl() }
 					learnMore={
@@ -78,55 +59,3 @@ export function ContactInformationPreview() {
 		</Section>
 	);
 }
-
-/**
- * Renders a contact information section with specified initial state and texts.
- *
- * @param {Object} props React props.
- * @param {Function} [props.onPhoneNumberVerified] Called when the phone number is verified or has been verified.
- * @fires gla_documentation_link_click with `{ context: 'setup-mc-contact-information', link_id: 'contact-information-read-more', href: 'https://woocommerce.com/document/google-for-woocommerce/get-started/requirements/#contact-information' }`
- * @fires gla_documentation_link_click with `{ context: 'settings-no-phone-number-notice', link_id: 'contact-information-read-more', href: 'https://woocommerce.com/document/google-for-woocommerce/get-started/requirements/#contact-information' }`
- * @fires gla_documentation_link_click with `{ context: 'settings-no-store-address-notice', link_id: 'contact-information-read-more', href: 'https://woocommerce.com/document/google-for-woocommerce/get-started/requirements/#contact-information' }`
- */
-const ContactInformation = ( { onPhoneNumberVerified } ) => {
-	const { adapter } = useAdaptiveFormContext();
-	const phone = useGoogleMCPhoneNumber();
-	const title = mcTitle;
-	const trackContext = 'setup-mc-contact-information';
-
-	usePhoneNumberCheckTrackEventEffect( phone );
-
-	return (
-		<Section
-			title={ title }
-			description={
-				<div>
-					{ description }
-					<p>
-						<AppDocumentationLink
-							context={ trackContext }
-							linkId={ learnMoreLinkId }
-							href={ learnMoreUrl }
-						>
-							{ __( 'Learn more', 'google-listings-and-ads' ) }
-						</AppDocumentationLink>
-					</p>
-				</div>
-			}
-		>
-			<VerticalGapLayout size="large">
-				<PhoneNumberCard
-					view="setup-mc"
-					phoneNumber={ phone }
-					showValidation={ adapter.requestedShowValidation }
-					onPhoneNumberVerified={ onPhoneNumberVerified }
-				/>
-				<StoreAddressCard
-					showValidation={ adapter.requestedShowValidation }
-				/>
-			</VerticalGapLayout>
-		</Section>
-	);
-};
-
-export default ContactInformation;