From d38b1ec4391c3a1e3e0a81ad4788e3d611545b66 Mon Sep 17 00:00:00 2001 From: Joe McGill Date: Mon, 11 Nov 2024 17:40:35 -0600 Subject: [PATCH 1/9] Remove 'Paid' from ads creation --- .../paid-ads/add-paid-campaign-button.js | 6 ++--- .../paid-ads/ads-campaign/ads-campaign.js | 2 +- .../paid-ads/asset-group/asset-group.js | 5 +---- .../campaign-creation-success-guide/index.js | 2 +- js/src/dashboard/index.test.js | 2 +- .../pages/create-paid-ads-campaign/index.js | 8 +++---- js/src/pages/edit-paid-ads-campaign/index.js | 4 ++-- .../submission-success-guide/index.js | 2 +- js/src/setup-ads/ads-stepper/index.js | 2 +- .../ads-stepper/setup-accounts/index.js | 2 +- .../setup-ads/ads-stepper/setup-paid-ads.js | 4 ++-- js/src/setup-ads/top-bar/index.js | 2 +- src/Tracking/README.md | 4 ++-- .../add-paid-campaigns.test.js | 22 +++++++++---------- tests/e2e/utils/pages/dashboard.js | 2 +- .../e2e/utils/pages/setup-ads/setup-budget.js | 8 +++---- 16 files changed, 37 insertions(+), 40 deletions(-) diff --git a/js/src/components/paid-ads/add-paid-campaign-button.js b/js/src/components/paid-ads/add-paid-campaign-button.js index 7cb591f9a3..6af8534393 100644 --- a/js/src/components/paid-ads/add-paid-campaign-button.js +++ b/js/src/components/paid-ads/add-paid-campaign-button.js @@ -13,7 +13,7 @@ import { getCreateCampaignUrl } from '.~/utils/urls'; import { recordGlaEvent } from '.~/utils/tracks'; /** - * "Add paid campaign" button is clicked. + * "Add campaign" button is clicked. * * @event gla_add_paid_campaign_clicked * @property {string} context Indicate the place where the button is located. @@ -21,7 +21,7 @@ import { recordGlaEvent } from '.~/utils/tracks'; */ /** - * Renders an AppButton with the text "Add Paid Campaign". + * Renders an AppButton with the text "Add campaign". * Clicking on the button will call `recordGlaEvent` and * redirect to Setup MC or Create New Campaign depending on * whether the users have completed ads setup or not. @@ -68,7 +68,7 @@ const AddPaidCampaignButton = ( props ) => { return ( - { children || __( 'Add paid campaign', 'google-listings-and-ads' ) } + { children || __( 'Add campaign', 'google-listings-and-ads' ) } ); }; diff --git a/js/src/components/paid-ads/ads-campaign/ads-campaign.js b/js/src/components/paid-ads/ads-campaign/ads-campaign.js index 34324fd40c..d0c08151b3 100644 --- a/js/src/components/paid-ads/ads-campaign/ads-campaign.js +++ b/js/src/components/paid-ads/ads-campaign/ads-campaign.js @@ -62,7 +62,7 @@ export default function AdsCampaign( { let description = createInterpolateElement( __( - 'Paid Performance Max campaigns are automatically optimized for you by Google. See what your ads will look like.', + 'Performance Max campaigns are automatically optimized for you by Google. See what your ads will look like.', 'google-listings-and-ads' ), { diff --git a/js/src/components/paid-ads/asset-group/asset-group.js b/js/src/components/paid-ads/asset-group/asset-group.js index 205f79cd29..ccc05ea5a1 100644 --- a/js/src/components/paid-ads/asset-group/asset-group.js +++ b/js/src/components/paid-ads/asset-group/asset-group.js @@ -163,10 +163,7 @@ export default function AssetGroup( { campaign } ) { onClick={ handleLaunchClick } > { isCreation - ? __( - 'Launch paid campaign', - 'google-listings-and-ads' - ) + ? __( 'Create campaign', 'google-listings-and-ads' ) : __( 'Save changes', 'google-listings-and-ads' ) } diff --git a/js/src/dashboard/campaign-creation-success-guide/index.js b/js/src/dashboard/campaign-creation-success-guide/index.js index b015b60304..3bd00205c2 100644 --- a/js/src/dashboard/campaign-creation-success-guide/index.js +++ b/js/src/dashboard/campaign-creation-success-guide/index.js @@ -88,7 +88,7 @@ export default function CampaignCreationSuccessGuide( { diff --git a/js/src/dashboard/index.test.js b/js/src/dashboard/index.test.js index 8c44142042..b07409c6c3 100644 --- a/js/src/dashboard/index.test.js +++ b/js/src/dashboard/index.test.js @@ -46,7 +46,7 @@ jest.mock( '@woocommerce/navigation', () => { jest.mock( '.~/utils/isWCTracksEnabled', () => jest.fn() ); const CAMPAIGN_CREATION_SUCCESS_GUIDE_TEXT = - "You've set up a paid Performance Max Campaign!"; + "You've set up a Performance Max Campaign!"; const CES_PROMPT_TEXT = 'How easy was it to create a Google Ad campaign?'; jest.mock( '.~/components/customer-effort-score-prompt', () => () => ( diff --git a/js/src/pages/create-paid-ads-campaign/index.js b/js/src/pages/create-paid-ads-campaign/index.js index da0656a0d1..cbcb4e3096 100644 --- a/js/src/pages/create-paid-ads-campaign/index.js +++ b/js/src/pages/create-paid-ads-campaign/index.js @@ -104,7 +104,7 @@ const CreatePaidAdsCampaign = () => { createNotice( 'success', __( - 'You’ve successfully created a paid campaign!', + 'You’ve successfully created a campaign!', 'google-listings-and-ads' ) ); @@ -125,7 +125,7 @@ const CreatePaidAdsCampaign = () => { <> } @@ -144,13 +144,13 @@ const CreatePaidAdsCampaign = () => { { key: STEP.CAMPAIGN, label: __( - 'Create paid campaign', + 'Create campaign', 'google-listings-and-ads' ), content: ( { { key: STEP.CAMPAIGN, label: __( - 'Edit paid campaign', + 'Edit campaign', 'google-listings-and-ads' ), content: ( @@ -205,7 +205,7 @@ const EditPaidAdsCampaign = () => { campaign={ campaign } context={ eventContext } headerTitle={ __( - 'Edit your paid campaign', + 'Edit your campaign', 'google-listings-and-ads' ) } continueButton={ ( formContext ) => ( diff --git a/js/src/product-feed/submission-success-guide/index.js b/js/src/product-feed/submission-success-guide/index.js index 968124ecec..041085b822 100644 --- a/js/src/product-feed/submission-success-guide/index.js +++ b/js/src/product-feed/submission-success-guide/index.js @@ -203,7 +203,7 @@ const SubmissionSuccessGuide = () => { action: 'create-paid-campaign', } } > - { __( 'Create paid campaign', 'google-listings-and-ads' ) } + { __( 'Create campaign', 'google-listings-and-ads' ) } ); diff --git a/js/src/setup-ads/ads-stepper/index.js b/js/src/setup-ads/ads-stepper/index.js index 614132033f..f6534f79f9 100644 --- a/js/src/setup-ads/ads-stepper/index.js +++ b/js/src/setup-ads/ads-stepper/index.js @@ -96,7 +96,7 @@ const AdsStepper = () => { }, { key: '2', - label: __( 'Create your paid campaign', 'google-listings-and-ads' ), + label: __( 'Create your campaign', 'google-listings-and-ads' ), content: , onClick: handleStepClick, }, diff --git a/js/src/setup-ads/ads-stepper/setup-accounts/index.js b/js/src/setup-ads/ads-stepper/setup-accounts/index.js index 021303dc92..3564cb72a4 100644 --- a/js/src/setup-ads/ads-stepper/setup-accounts/index.js +++ b/js/src/setup-ads/ads-stepper/setup-accounts/index.js @@ -49,7 +49,7 @@ const SetupAccounts = ( props ) => { 'google-listings-and-ads' ) } description={ __( - 'Connect your Google account and your Google Ads account to set up a paid Performance Max campaign.', + 'Connect your Google account and your Google Ads account to set up a Performance Max campaign.', 'google-listings-and-ads' ) } /> diff --git a/js/src/setup-ads/ads-stepper/setup-paid-ads.js b/js/src/setup-ads/ads-stepper/setup-paid-ads.js index c19d4ef139..18f219e9eb 100644 --- a/js/src/setup-ads/ads-stepper/setup-paid-ads.js +++ b/js/src/setup-ads/ads-stepper/setup-paid-ads.js @@ -94,7 +94,7 @@ const SetupPaidAds = () => { > { { return ( } backHref={ getNewPath( {}, '/google/dashboard' ) } onBackButtonClick={ handleBackButtonClick } diff --git a/src/Tracking/README.md b/src/Tracking/README.md index 126bd02c16..2d25e128cd 100644 --- a/src/Tracking/README.md +++ b/src/Tracking/README.md @@ -136,7 +136,7 @@ Do not edit it manually! --> ### [`gla_add_paid_campaign_clicked`](../../js/src/components/paid-ads/add-paid-campaign-button.js#L15) -"Add paid campaign" button is clicked. +"Add campaign" button is clicked. #### Properties | name | type | description | | ---- | ---- | ----------- | @@ -546,7 +546,7 @@ Clicking on the "Scan for assets" button. - [`exports`](../../js/src/components/paid-ads/asset-group/assets-loader.js#L96) ### [`gla_launch_paid_campaign_button_click`](../../js/src/utils/tracks.js#L167) -Triggered when the "Launch paid campaign" button is clicked to add a new paid campaign in the Google Ads setup flow. +Triggered when the "Create campaign" button is clicked to add a new paid campaign in the Google Ads setup flow. #### Properties | name | type | description | | ---- | ---- | ----------- | diff --git a/tests/e2e/specs/add-paid-campaigns/add-paid-campaigns.test.js b/tests/e2e/specs/add-paid-campaigns/add-paid-campaigns.test.js index c2600613ac..fb48e58a72 100644 --- a/tests/e2e/specs/add-paid-campaigns/add-paid-campaigns.test.js +++ b/tests/e2e/specs/add-paid-campaigns/add-paid-campaigns.test.js @@ -84,7 +84,7 @@ test.describe( 'Set up Ads account', () => { await page.close(); } ); - test( 'Dashboard page contains Add Paid campaign buttons', async () => { + test( 'Dashboard page contains Add campaign buttons', async () => { //Add page campaign in the programs section. await expect( dashboardPage.addPaidCampaignButton ).toBeEnabled(); } ); @@ -102,7 +102,7 @@ test.describe( 'Set up Ads account', () => { ).toBeVisible(); await expect( page.getByText( - 'Connect your Google account and your Google Ads account to set up a paid Performance Max campaign.' + 'Connect your Google account and your Google Ads account to set up a Performance Max campaign.' ) ).toBeVisible(); } ); @@ -120,7 +120,7 @@ test.describe( 'Set up Ads account', () => { } ); } ); - test.describe( 'Add paid campaigns with no Ads account', async () => { + test.describe( 'Add campaigns with no Ads account', async () => { test( 'Create an account should be visible', async () => { const createAccountButton = page.getByRole( 'button', { name: 'Create account', @@ -230,7 +230,7 @@ test.describe( 'Set up Ads account', () => { } ); } ); - test.describe( 'Add paid campaigns with existing Ads accounts', () => { + test.describe( 'Add campaigns with existing Ads accounts', () => { test.beforeAll( async () => { await setupAdsAccounts.mockAdsAccountsResponse( ADS_ACCOUNTS ); //Disconnect the account from the previous test @@ -280,13 +280,13 @@ test.describe( 'Set up Ads account', () => { } ); } ); - test.describe( 'Create your paid campaign', () => { + test.describe( 'Create your campaign', () => { test( 'Continue to create paid ad campaign', async () => { await setupAdsAccounts.clickContinue(); await page.waitForLoadState( LOAD_STATE.DOM_CONTENT_LOADED ); await expect( page.getByRole( 'heading', { - name: 'Create your paid campaign', + name: 'Create your campaign', } ) ).toBeVisible(); @@ -351,7 +351,7 @@ test.describe( 'Set up Ads account', () => { await setupBudgetPage.fillBudget( budget ); await expect( - setupBudgetPage.getLaunchPaidCampaignButton() + setupBudgetPage.getCreateCampaignButton() ).toBeDisabled(); } ); @@ -360,7 +360,7 @@ test.describe( 'Set up Ads account', () => { await setupBudgetPage.fillBudget( budget ); await expect( - setupBudgetPage.getLaunchPaidCampaignButton() + setupBudgetPage.getCreateCampaignButton() ).toBeDisabled(); } ); @@ -381,7 +381,7 @@ test.describe( 'Set up Ads account', () => { await setupBudgetPage.fillBudget( budget ); await expect( - setupBudgetPage.getLaunchPaidCampaignButton() + setupBudgetPage.getCreateCampaignButton() ).toBeEnabled(); } ); @@ -400,7 +400,7 @@ test.describe( 'Set up Ads account', () => { [ 'US' ] ); - await setupBudgetPage.getLaunchPaidCampaignButton().click(); + await setupBudgetPage.getCreateCampaignButton().click(); await campaignCreation; @@ -415,7 +415,7 @@ test.describe( 'Set up Ads account', () => { await expect( page.getByRole( 'heading', { - name: "You've set up a paid Performance Max Campaign!", + name: "You've set up a Performance Max Campaign!", } ) ).toBeVisible(); diff --git a/tests/e2e/utils/pages/dashboard.js b/tests/e2e/utils/pages/dashboard.js index b53bd867cc..d671fbaed9 100644 --- a/tests/e2e/utils/pages/dashboard.js +++ b/tests/e2e/utils/pages/dashboard.js @@ -31,7 +31,7 @@ export default class DashboardPage extends MockRequests { this.addPaidCampaignButton = this.page.locator( '.gla-all-programs-table-card button', { - hasText: 'Add paid campaign', + hasText: 'Add campaign', } ); } diff --git a/tests/e2e/utils/pages/setup-ads/setup-budget.js b/tests/e2e/utils/pages/setup-ads/setup-budget.js index 86eeab1af5..4246be6b3e 100644 --- a/tests/e2e/utils/pages/setup-ads/setup-budget.js +++ b/tests/e2e/utils/pages/setup-ads/setup-budget.js @@ -96,13 +96,13 @@ export default class SetupBudget extends MockRequests { } /** - * Get the Launch paid campaign button. + * Get the Create campaign button. * - * @return {import('@playwright/test').Locator} Launch paid campaign button. + * @return {import('@playwright/test').Locator} Create campaign button. */ - getLaunchPaidCampaignButton() { + getCreateCampaignButton() { return this.page.getByRole( 'button', { - name: 'Launch paid campaign', + name: 'Create campaign', exact: true, } ); } From 4ac7c89d8f116341f00a98067e14bd330ca2db47 Mon Sep 17 00:00:00 2001 From: Joe McGill Date: Tue, 12 Nov 2024 11:42:33 -0600 Subject: [PATCH 2/9] Update E2E test description --- tests/e2e/specs/add-paid-campaigns/add-paid-campaigns.test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/e2e/specs/add-paid-campaigns/add-paid-campaigns.test.js b/tests/e2e/specs/add-paid-campaigns/add-paid-campaigns.test.js index fb48e58a72..78871193bd 100644 --- a/tests/e2e/specs/add-paid-campaigns/add-paid-campaigns.test.js +++ b/tests/e2e/specs/add-paid-campaigns/add-paid-campaigns.test.js @@ -281,7 +281,7 @@ test.describe( 'Set up Ads account', () => { } ); test.describe( 'Create your campaign', () => { - test( 'Continue to create paid ad campaign', async () => { + test( 'Continue to create your campaign', async () => { await setupAdsAccounts.clickContinue(); await page.waitForLoadState( LOAD_STATE.DOM_CONTENT_LOADED ); await expect( From 3a36464fde5fdc403eab3c9333e75f6f29b19499 Mon Sep 17 00:00:00 2001 From: Joe McGill <801097+joemcgill@users.noreply.github.com> Date: Tue, 12 Nov 2024 11:43:29 -0600 Subject: [PATCH 3/9] Update src/Tracking/README.md Co-authored-by: Mik --- src/Tracking/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Tracking/README.md b/src/Tracking/README.md index 2d25e128cd..c7667f19c5 100644 --- a/src/Tracking/README.md +++ b/src/Tracking/README.md @@ -546,7 +546,7 @@ Clicking on the "Scan for assets" button. - [`exports`](../../js/src/components/paid-ads/asset-group/assets-loader.js#L96) ### [`gla_launch_paid_campaign_button_click`](../../js/src/utils/tracks.js#L167) -Triggered when the "Create campaign" button is clicked to add a new paid campaign in the Google Ads setup flow. +Triggered when the "Create campaign" button is clicked to add a new campaign in the Google Ads setup flow. #### Properties | name | type | description | | ---- | ---- | ----------- | From fa1f5ed6b18ea5a87207664a2a6e33dcd72bad5b Mon Sep 17 00:00:00 2001 From: Joe McGill Date: Thu, 14 Nov 2024 12:49:39 -0600 Subject: [PATCH 4/9] Remove additional instances of the word 'paid' with Ads --- .../edit-program-button/edit-program-prompt-modal/index.js | 2 +- .../program-toggle/pause-program-modal/index.js | 4 ++-- .../remove-program-button/remove-program-modal/index.js | 2 +- js/src/get-started-page/faqs/index.js | 2 +- js/src/get-started-page/features-card/index.js | 2 +- js/src/pages/edit-paid-ads-campaign/index.js | 2 +- js/src/reports/index.js | 2 +- js/src/reports/metric-number.js | 2 +- js/src/reports/products/filter-config.js | 2 +- js/src/settings/disconnect-modal/confirm-modal.js | 4 ++-- src/Notes/CompleteSetup.php | 2 +- src/Notes/SetupCampaignTwoWeeks.php | 2 +- 12 files changed, 14 insertions(+), 14 deletions(-) diff --git a/js/src/dashboard/all-programs-table-card/edit-program-button/edit-program-prompt-modal/index.js b/js/src/dashboard/all-programs-table-card/edit-program-button/edit-program-prompt-modal/index.js index dd3bb6ecc4..76f3517444 100644 --- a/js/src/dashboard/all-programs-table-card/edit-program-button/edit-program-prompt-modal/index.js +++ b/js/src/dashboard/all-programs-table-card/edit-program-button/edit-program-prompt-modal/index.js @@ -68,7 +68,7 @@ const EditProgramPromptModal = ( { programId, onRequestClose } ) => { >

{ __( - 'Results typically improve with time with Google’s Free Listing and paid ad campaigns.', + 'Results typically improve with time with Google’s Free Listing and Google Ads campaigns.', 'google-listings-and-ads' ) }

diff --git a/js/src/dashboard/all-programs-table-card/program-toggle/pause-program-modal/index.js b/js/src/dashboard/all-programs-table-card/program-toggle/pause-program-modal/index.js index e5d15231c3..46ab6ad3c8 100644 --- a/js/src/dashboard/all-programs-table-card/program-toggle/pause-program-modal/index.js +++ b/js/src/dashboard/all-programs-table-card/program-toggle/pause-program-modal/index.js @@ -52,13 +52,13 @@ const PauseProgramModal = ( props ) => { >

{ __( - 'Results typically improve with time with Google’s paid ad campaigns. If you pause, your products won’t be shown to people looking for what you offer.', + 'Results typically improve with time with Google Ads campaigns. If you pause, your products won’t be shown to people looking for what you offer.', 'google-listings-and-ads' ) }

{ __( - 'Pausing a paid ad campaign will result in the loss of any optimisations learned from those campaigns.', + 'Pausing a campaign will result in the loss of any optimisations learned from those campaigns.', 'google-listings-and-ads' ) }

diff --git a/js/src/dashboard/all-programs-table-card/remove-program-button/remove-program-modal/index.js b/js/src/dashboard/all-programs-table-card/remove-program-button/remove-program-modal/index.js index 0f6a5c227d..cdda3d71e4 100644 --- a/js/src/dashboard/all-programs-table-card/remove-program-button/remove-program-modal/index.js +++ b/js/src/dashboard/all-programs-table-card/remove-program-button/remove-program-modal/index.js @@ -67,7 +67,7 @@ const RemoveProgramModal = ( props ) => { >

{ __( - 'Results typically improve with time with Google’s paid ad campaigns. Removing a paid ad campaign will result in the loss of any optimisations learned from those campaigns.', + 'Results typically improve with time with Google Ads campaigns. Removing a campaign will result in the loss of any optimisations learned from those campaigns.', 'google-listings-and-ads' ) }

diff --git a/js/src/get-started-page/faqs/index.js b/js/src/get-started-page/faqs/index.js index dd4a41cbb6..03774ac981 100644 --- a/js/src/get-started-page/faqs/index.js +++ b/js/src/get-started-page/faqs/index.js @@ -231,7 +231,7 @@ const faqItems = [

{ createInterpolateElement( __( - 'Yes, you can run both at the same time, and we recommend you do! Once you sync your store it’s automatically listed on Google, so you can choose to run a paid Performance Max campaign as soon as you’d like. In the US, advertisers who sync their products to Google and run Google Ads Performance Max campaigns have seen an average of over 50% increase in clicks and over 100% increase in impressions in both their product listings and their ads on the Shopping tab. ', + 'Yes, you can run both at the same time, and we recommend you do! Once you sync your store it’s automatically listed on Google, so you can choose to run a Performance Max campaign as soon as you’d like. In the US, advertisers who sync their products to Google and run Google Ads Performance Max campaigns have seen an average of over 50% increase in clicks and over 100% increase in impressions in both their product listings and their ads on the Shopping tab. ', 'google-listings-and-ads' ), { diff --git a/js/src/get-started-page/features-card/index.js b/js/src/get-started-page/features-card/index.js index 003f457c05..532c7e10f2 100644 --- a/js/src/get-started-page/features-card/index.js +++ b/js/src/get-started-page/features-card/index.js @@ -114,7 +114,7 @@ const FeaturesCard = () => { variant="label" > { __( - 'Promote products and drive more sales with paid ads', + 'Promote products and drive more sales with ads', 'google-listings-and-ads' ) } diff --git a/js/src/pages/edit-paid-ads-campaign/index.js b/js/src/pages/edit-paid-ads-campaign/index.js index eb043af9c7..c3ec3e746c 100644 --- a/js/src/pages/edit-paid-ads-campaign/index.js +++ b/js/src/pages/edit-paid-ads-campaign/index.js @@ -113,7 +113,7 @@ const EditPaidAdsCampaign = () => { />

{ __( - 'Error in loading your paid ads campaign. Please try again later.', + 'Error in loading your ads campaign. Please try again later.', 'google-listings-and-ads' ) }
diff --git a/js/src/reports/index.js b/js/src/reports/index.js index 9b8f924395..c7f39be9f7 100644 --- a/js/src/reports/index.js +++ b/js/src/reports/index.js @@ -39,7 +39,7 @@ export { default as ProductsReport } from './products'; /** * @typedef {Object} ProgramsReportData * @property {Array} freeListings Free listings data - * @property {Array} campaigns Paid campaigns data. + * @property {Array} campaigns Ad campaigns data. * @property {Array | null} intervals Intervals data. * @property {PerformanceData} totals Performance data. */ diff --git a/js/src/reports/metric-number.js b/js/src/reports/metric-number.js index 5589627c03..82701c5fba 100644 --- a/js/src/reports/metric-number.js +++ b/js/src/reports/metric-number.js @@ -61,7 +61,7 @@ const MetricNumber = ( { // And Free Listings API may not respond with data. if ( missingFreeListingsData !== MISSING_FREE_LISTINGS_DATA.NONE ) { const text = __( - 'This data is currently available for paid campaigns only.', + 'This data is currently available for Google Ads campaigns only.', 'google-listings-and-ads' ); infos.push( text ); diff --git a/js/src/reports/products/filter-config.js b/js/src/reports/products/filter-config.js index 105f7667c8..a719522124 100644 --- a/js/src/reports/products/filter-config.js +++ b/js/src/reports/products/filter-config.js @@ -191,7 +191,7 @@ const reportSourceConfig = { filters: [ { value: REPORT_SOURCE_PAID, - label: __( 'Paid campaigns', 'google-listings-and-ads' ), + label: __( 'Ad campaigns', 'google-listings-and-ads' ), }, { value: REPORT_SOURCE_FREE, diff --git a/js/src/settings/disconnect-modal/confirm-modal.js b/js/src/settings/disconnect-modal/confirm-modal.js index 2f64511db3..18685ecdfd 100644 --- a/js/src/settings/disconnect-modal/confirm-modal.js +++ b/js/src/settings/disconnect-modal/confirm-modal.js @@ -35,7 +35,7 @@ const textDict = { 'google-listings-and-ads' ), __( - 'Any ongoing paid campaigns will continue to run. They can be managed, edited, or deleted manually from Google Ads (ads.google.com).', + 'Any ongoing campaigns will continue to run. They can be managed, edited, or deleted manually from Google Ads (ads.google.com).', 'google-listings-and-ads' ), ], @@ -57,7 +57,7 @@ const textDict = { 'google-listings-and-ads' ), __( - 'Any ongoing paid campaigns will continue to run. They can be managed, edited, or deleted manually from Google Ads (ads.google.com).', + 'Any ongoing campaigns will continue to run. They can be managed, edited, or deleted manually from Google Ads (ads.google.com).', 'google-listings-and-ads' ), __( diff --git a/src/Notes/CompleteSetup.php b/src/Notes/CompleteSetup.php index 2579ec04b9..4838044b55 100644 --- a/src/Notes/CompleteSetup.php +++ b/src/Notes/CompleteSetup.php @@ -38,7 +38,7 @@ public function get_name(): string { public function get_entry(): NoteEntry { $note = new NoteEntry(); $note->set_title( __( 'Reach more shoppers with free listings on Google', 'google-listings-and-ads' ) ); - $note->set_content( __( 'Finish setting up Google for WooCommerce to list your products on Google for free and promote them with paid ads.', 'google-listings-and-ads' ) ); + $note->set_content( __( 'Finish setting up Google for WooCommerce to list your products on Google for free and promote them with ads.', 'google-listings-and-ads' ) ); $note->set_content_data( new stdClass() ); $note->set_type( NoteEntry::E_WC_ADMIN_NOTE_INFORMATIONAL ); $note->set_layout( 'plain' ); diff --git a/src/Notes/SetupCampaignTwoWeeks.php b/src/Notes/SetupCampaignTwoWeeks.php index 860e2697ac..6e17836db3 100644 --- a/src/Notes/SetupCampaignTwoWeeks.php +++ b/src/Notes/SetupCampaignTwoWeeks.php @@ -48,7 +48,7 @@ protected function set_title_and_content( NoteEntry $note ): void { $note->set_title( __( 'Reach more shoppers with paid listings on Google', 'google-listings-and-ads' ) ); $note->set_content( __( - 'Your products are ready for Google Ads! Connect with the right shoppers at the right moment when they’re searching for products like yours. Connect your Google Ads account to create your first paid ad campaign.', + 'Your products are ready for Google Ads! Connect with the right shoppers at the right moment when they’re searching for products like yours. Connect your Google Ads account to create your first campaign.', 'google-listings-and-ads' ) ); From cef1b839d7dc55f3cd52f63835cb789d6e937ae6 Mon Sep 17 00:00:00 2001 From: Joe McGill Date: Thu, 14 Nov 2024 12:55:58 -0600 Subject: [PATCH 5/9] Copy tweak --- js/src/get-started-page/features-card/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/src/get-started-page/features-card/index.js b/js/src/get-started-page/features-card/index.js index 532c7e10f2..c79e3d0e90 100644 --- a/js/src/get-started-page/features-card/index.js +++ b/js/src/get-started-page/features-card/index.js @@ -114,7 +114,7 @@ const FeaturesCard = () => { variant="label" > { __( - 'Promote products and drive more sales with ads', + 'Promote products and drive more sales with Google Ads', 'google-listings-and-ads' ) } From 9b71ea6f9b31e88d43cff892a686e369162c304e Mon Sep 17 00:00:00 2001 From: Joe McGill Date: Sun, 17 Nov 2024 15:36:32 -0600 Subject: [PATCH 6/9] Results typically improve with time --- .../edit-program-button/edit-program-prompt-modal/index.js | 2 +- .../program-toggle/pause-program-modal/index.js | 2 +- .../remove-program-button/remove-program-modal/index.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/js/src/dashboard/all-programs-table-card/edit-program-button/edit-program-prompt-modal/index.js b/js/src/dashboard/all-programs-table-card/edit-program-button/edit-program-prompt-modal/index.js index 76f3517444..9c237818ad 100644 --- a/js/src/dashboard/all-programs-table-card/edit-program-button/edit-program-prompt-modal/index.js +++ b/js/src/dashboard/all-programs-table-card/edit-program-button/edit-program-prompt-modal/index.js @@ -68,7 +68,7 @@ const EditProgramPromptModal = ( { programId, onRequestClose } ) => { >

{ __( - 'Results typically improve with time with Google’s Free Listing and Google Ads campaigns.', + 'Results typically improve with time.', 'google-listings-and-ads' ) }

diff --git a/js/src/dashboard/all-programs-table-card/program-toggle/pause-program-modal/index.js b/js/src/dashboard/all-programs-table-card/program-toggle/pause-program-modal/index.js index 46ab6ad3c8..143c88676c 100644 --- a/js/src/dashboard/all-programs-table-card/program-toggle/pause-program-modal/index.js +++ b/js/src/dashboard/all-programs-table-card/program-toggle/pause-program-modal/index.js @@ -52,7 +52,7 @@ const PauseProgramModal = ( props ) => { >

{ __( - 'Results typically improve with time with Google Ads campaigns. If you pause, your products won’t be shown to people looking for what you offer.', + 'Results typically improve with time. If you pause, your products won’t be shown to people looking for what you offer.', 'google-listings-and-ads' ) }

diff --git a/js/src/dashboard/all-programs-table-card/remove-program-button/remove-program-modal/index.js b/js/src/dashboard/all-programs-table-card/remove-program-button/remove-program-modal/index.js index cdda3d71e4..3bec6d37ca 100644 --- a/js/src/dashboard/all-programs-table-card/remove-program-button/remove-program-modal/index.js +++ b/js/src/dashboard/all-programs-table-card/remove-program-button/remove-program-modal/index.js @@ -67,7 +67,7 @@ const RemoveProgramModal = ( props ) => { >

{ __( - 'Results typically improve with time with Google Ads campaigns. Removing a campaign will result in the loss of any optimisations learned from those campaigns.', + 'Results typically improve with time. Removing a campaign will result in the loss of any optimisations learned from those campaigns.', 'google-listings-and-ads' ) }

From 933e5b417ab3f15939f9320c103f7a6deed50a0a Mon Sep 17 00:00:00 2001 From: Joe McGill Date: Sun, 17 Nov 2024 15:38:06 -0600 Subject: [PATCH 7/9] Skip ads creation --- js/src/setup-mc/setup-stepper/skip-button.js | 5 +---- tests/e2e/specs/setup-mc/step-4-complete-campaign.test.js | 4 ++-- tests/e2e/utils/pages/setup-mc/step-4-complete-campaign.js | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/js/src/setup-mc/setup-stepper/skip-button.js b/js/src/setup-mc/setup-stepper/skip-button.js index c5a62f2d54..89f8440b66 100644 --- a/js/src/setup-mc/setup-stepper/skip-button.js +++ b/js/src/setup-mc/setup-stepper/skip-button.js @@ -64,10 +64,7 @@ export default function SkipButton( { <> { await expect( completeSetupButton ).toBeDisabled(); } ); - test( 'should see "Skip paid ads creation" button is enabled', async () => { + test( 'should see "Skip ads creation" button is enabled', async () => { const skipPaidAdsCreationButton = completeCampaign.getSkipPaidAdsCreationButton(); await expect( skipPaidAdsCreationButton ).toBeVisible(); @@ -199,7 +199,7 @@ test.describe( 'Complete your campaign', () => { await expect( budgetSection ).toBeVisible(); } ); - test( 'should see "Skip paid ads creation" is enabled and "Complete setup" button is disabled', async () => { + test( 'should see "Skip ads creation" is enabled and "Complete setup" button is disabled', async () => { const completeButton = completeCampaign.getCompleteSetupButton(); await expect( completeButton ).toBeVisible(); diff --git a/tests/e2e/utils/pages/setup-mc/step-4-complete-campaign.js b/tests/e2e/utils/pages/setup-mc/step-4-complete-campaign.js index 909f1ea8cd..d494586dba 100644 --- a/tests/e2e/utils/pages/setup-mc/step-4-complete-campaign.js +++ b/tests/e2e/utils/pages/setup-mc/step-4-complete-campaign.js @@ -74,7 +74,7 @@ export default class CompleteCampaign extends MockRequests { */ getSkipPaidAdsCreationButton() { return this.page.getByRole( 'button', { - name: 'Skip paid ads creation', + name: 'Skip ads creation', exact: true, } ); } From a70da30caa0a0578961d1d1742b8e67b1a73315c Mon Sep 17 00:00:00 2001 From: Eason Su Date: Mon, 11 Nov 2024 16:39:36 +0800 Subject: [PATCH 8/9] Fix the issue that E2E test can't log in to wp-admin. --- tests/e2e/global-setup.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/e2e/global-setup.js b/tests/e2e/global-setup.js index 26870e5aaa..6cf36e5a4a 100644 --- a/tests/e2e/global-setup.js +++ b/tests/e2e/global-setup.js @@ -55,7 +55,7 @@ module.exports = async ( config ) => { await adminPage .locator( 'input[name="pwd"]' ) .fill( admin.password ); - await adminPage.locator( 'text=Log In' ).click(); + await adminPage.getByRole( 'button', { name: 'Log In' } ).click(); await adminPage.waitForLoadState( LOAD_STATE.DOM_CONTENT_LOADED ); await adminPage.goto( `/wp-admin` ); await adminPage.waitForLoadState( LOAD_STATE.DOM_CONTENT_LOADED ); From 10dc1c944909f4b42e2e7e0a3fa3818710ebddd0 Mon Sep 17 00:00:00 2001 From: Joe McGill Date: Sun, 17 Nov 2024 16:13:59 -0600 Subject: [PATCH 9/9] Reach more shoppers with Google Ads --- src/Notes/SetupCampaignTwoWeeks.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Notes/SetupCampaignTwoWeeks.php b/src/Notes/SetupCampaignTwoWeeks.php index 6e17836db3..6b22d9c7e8 100644 --- a/src/Notes/SetupCampaignTwoWeeks.php +++ b/src/Notes/SetupCampaignTwoWeeks.php @@ -45,7 +45,7 @@ protected function get_gla_setup_days(): int { */ protected function set_title_and_content( NoteEntry $note ): void { if ( ! $this->ads_service->is_setup_started() ) { - $note->set_title( __( 'Reach more shoppers with paid listings on Google', 'google-listings-and-ads' ) ); + $note->set_title( __( 'Reach more shoppers with Google Ads', 'google-listings-and-ads' ) ); $note->set_content( __( 'Your products are ready for Google Ads! Connect with the right shoppers at the right moment when they’re searching for products like yours. Connect your Google Ads account to create your first campaign.',