Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
6817cc6
Rename hook to useStoreAddressSynced.
asvinb Oct 25, 2024
26ec20d
Merge branch 'feature/2509-consolidate-google-account-cards' into upd…
asvinb Oct 28, 2024
bd6c4fe
Add E2E tests.
asvinb Oct 28, 2024
8dc6740
Fix condition.
asvinb Oct 28, 2024
55b95fb
Adjust hook to return early if there's no MC connected account.
asvinb Oct 29, 2024
e0b7df9
Use correct paramters.
asvinb Oct 29, 2024
850944e
Adjust JSDocs.
asvinb Oct 29, 2024
4ca1f95
Add compact styles for store address account card.
asvinb Oct 29, 2024
5b81e15
No need to refetch.
asvinb Oct 29, 2024
123925d
Remove store requirements step.
asvinb Oct 29, 2024
b3a9ff9
Remove unused component.
asvinb Oct 29, 2024
ac7918c
Fix JS tests.
asvinb Oct 29, 2024
fe7d565
Fix E2E tests.
asvinb Oct 30, 2024
41f5513
Merge branch 'feature/2509-consolidate-google-account-cards' into upd…
asvinb Oct 31, 2024
babf4d6
Update store address card usage
joemcgill Oct 31, 2024
1f18092
Remove unused components
joemcgill Oct 31, 2024
bfcc39b
Remove phone account card format
joemcgill Oct 31, 2024
d2b2a38
Remvove unused useCountryCallingCodeOptions
joemcgill Oct 31, 2024
a49f43f
Streamline StoreAddressCard states and display
joemcgill Nov 1, 2024
1e0ed3b
Fix linting errors.
asvinb Nov 1, 2024
f76a955
Resolve store address before showing the card
joemcgill Nov 1, 2024
a9f5530
Improve updateGoogleMCContactInformation resolution
joemcgill Nov 1, 2024
a98a698
Merge pull request #2661 from woocommerce/update/2602-sync-mc-address…
joemcgill Nov 1, 2024
7e87761
Check MC address setup when getting setup status and remove phone ver…
joemcgill Nov 1, 2024
852dfde
Fix MerchantCenterServiceTests tests
joemcgill Nov 1, 2024
ec43e8f
Always show the address card when MC is connected
joemcgill Nov 6, 2024
4905228
Revert refresh button to previous behavior
joemcgill Nov 6, 2024
c024b95
Sync MC at the completion of step 1
joemcgill Nov 6, 2024
5098fe8
Reinstate EditStoreAddress flow in settings
joemcgill Nov 6, 2024
c1d0c25
Remove showValidation prop
joemcgill Nov 6, 2024
49c26f0
Update button text in docs/tests
joemcgill Nov 6, 2024
afdb054
Move condition.
asvinb Nov 6, 2024
d772944
Update address card copy
joemcgill Nov 6, 2024
921cd2c
Merge branch 'feature/2509-consolidate-google-account-cards' into upd…
joemcgill Nov 6, 2024
30ac53a
Add loading state to the Continue button
joemcgill Nov 7, 2024
53bab84
Update E2E tests
joemcgill Nov 7, 2024
f9ea219
Merge branch 'feature/2509-consolidate-google-account-cards' into upd…
joemcgill Nov 13, 2024
8b141d1
Update E2E tests
joemcgill Nov 13, 2024
428738c
Remove phone verification actions
joemcgill Nov 13, 2024
5c129a4
Remove useGoogleMCPhoneNumber and related selector and deps
joemcgill Nov 13, 2024
d4c0daa
Tweak address card description color
joemcgill Nov 13, 2024
059fd99
Correct inline docs
joemcgill Nov 13, 2024
49f8f82
Update ContactInformationPreview and export as default
joemcgill Nov 13, 2024
1372d3e
Remove redundant div wrapper for addressContent
joemcgill Nov 13, 2024
e49ca66
Simplify StoreAddressCard description
joemcgill Nov 13, 2024
299fad7
Use isAddressFilled from useStoreAddress hook
joemcgill Nov 13, 2024
6ad177b
Add blank line
joemcgill Nov 13, 2024
c0d25ec
Update fires tags
joemcgill Nov 14, 2024
eeb596b
Rename and simplify useStoreAddressSynced hook
joemcgill Nov 14, 2024
a1360bf
Fix handleSubmitCallback error handling
joemcgill Nov 14, 2024
e55f65e
Update E2E test docs
joemcgill Nov 14, 2024
ddbb900
Improve E2E tests
joemcgill Nov 14, 2024
866e7b6
Remove phone number validation from MerchantTrait and ContactInformat…
joemcgill Nov 14, 2024
7d49d69
Update the package-lock.json file to reflect the revmoval of the `lib…
eason9487 Nov 14, 2024
6fff925
Fix typo in JSdoc
joemcgill Nov 14, 2024
c77748c
Remove unused property
joemcgill Nov 14, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions js/src/components/account-card/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';

/**
Expand All @@ -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',
};
Expand Down Expand Up @@ -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' ),
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
/**
* External dependencies
*/
import { __ } from '@wordpress/i18n';

/**
* Internal dependencies
*/
import { getEditStoreAddressUrl } from '.~/utils/urls';
import Section from '.~/wcdl/section';
import AppDocumentationLink from '.~/components/app-documentation-link';
import { StoreAddressCardPreview } from './store-address-card';

const learnMoreLinkId = 'contact-information-read-more';
const learnMoreUrl =
'https://woocommerce.com/document/google-for-woocommerce/get-started/requirements/#contact-information';

const description = (
<>
<p>
{ __(
'Your contact information is required for verification by Google.',
'google-listings-and-ads'
) }
</p>
<p>
{ __(
'It would be shared with Google Merchant Center for store verification and would not be displayed to customers.',
'google-listings-and-ads'
) }
</p>
</>
);

const settingsTitle = __( 'Contact information', 'google-listings-and-ads' );

/**
* Renders a preview of contact information section,
* or a notice if contact information is outdated.
*/
export default function ContactInformationPreview() {
return (
<Section title={ settingsTitle } description={ description }>
<StoreAddressCardPreview
editHref={ getEditStoreAddressUrl() }
learnMore={
<AppDocumentationLink
context="settings-no-store-address-notice"
linkId={ learnMoreLinkId }
href={ learnMoreUrl }
>
{ __( 'Learn more', 'google-listings-and-ads' ) }
</AppDocumentationLink>
}
/>
</Section>
);
}
132 changes: 0 additions & 132 deletions js/src/components/contact-information/index.js

This file was deleted.

This file was deleted.

This file was deleted.

Loading
Loading