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.

Sign up for GitHub

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: Temporarily remove Google Merchant Center and Google Ads account setup to facilitate the subsequent changes to the combo setup #2585

Merged
merged 2 commits into from
Sep 9, 2024
Merged

Consolidate accounts onboarding: Temporarily remove Google Merchant Center and Google Ads account setup to facilitate the subsequent changes to the combo setup #2585

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
baf38d3
Removes initial cards as part of refactoring
dsawardekar Sep 5, 2024
dd17d97
Fixes linter warnings
dsawardekar Sep 5, 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
18 changes: 7 additions & 11 deletions js/src/setup-mc/setup-stepper/setup-accounts/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ import AppDocumentationLink from '.~/components/app-documentation-link';
import VerticalGapLayout from '.~/components/vertical-gap-layout';
import WPComAccountCard from '.~/components/wpcom-account-card';
import GoogleAccountCard from '.~/components/google-account-card';
import GoogleMCAccountCard from '.~/components/google-mc-account-card';
import GoogleAdsAccountCard from '.~/components/google-ads-account-card';
import Faqs from './faqs';
import './index.scss';
import useGoogleAdsAccount from '.~/hooks/useGoogleAdsAccount';
Expand Down Expand Up @@ -160,16 +158,8 @@ const SetupAccounts = ( props ) => {
<WPComAccountCard jetpack={ jetpack } />
) }
<GoogleAccountCard disabled={ ! isJetpackActive } />
<GoogleAdsAccountCard />
</VerticalGapLayout>
</Section>
<Section
className="gla-google-mc-account-section"
description={ <GoogleMCDisclaimer /> }
disabledLeft={ ! isGMCPreconditionReady }
>
<GoogleMCAccountCard />
</Section>

<StepContentFooter>
<StepContentActions>
Expand All @@ -181,8 +171,14 @@ const SetupAccounts = ( props ) => {
{ __( 'Continue', 'google-listings-and-ads' ) }
</AppButton>
</StepContentActions>
<Faqs />
</StepContentFooter>
<Section
className="gla-google-mc-account-section"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just noting that this classname should probably be changed here and in the relevant styles here, but it's also likely that this text will end up needing to be moved somewhere else before #2509 is completed, so I don't see that as a blocker.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agree that renaming would be more appropriate.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍🏻 Added a note in the tracking ticket to remind us to come back to this.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Renamed in cc2440a.

description={ <GoogleMCDisclaimer /> }
disabledLeft={ ! isGMCPreconditionReady }
>
<Faqs />
</Section>
</StepContent>
);
};
Expand Down