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 a5732eeafd..33ffe06101 100644 --- a/js/src/components/paid-ads/ads-campaign/ads-campaign.js +++ b/js/src/components/paid-ads/ads-campaign/ads-campaign.js @@ -151,6 +151,7 @@ export default function AdsCampaign( { onStatesReceived={ handleOnStatesReceived } campaign={ campaign } countryCodes={ countryCodes } + loadCampaignFromClientSession={ isOnboardingFlow } showCampaignPreviewCard={ trackingContext === 'setup-ads' || trackingContext === 'create-ads' diff --git a/js/src/components/paid-ads/ads-campaign/paid-ads-setup-sections.js b/js/src/components/paid-ads/ads-campaign/paid-ads-setup-sections.js index 3da4634bc3..c7a967ada1 100644 --- a/js/src/components/paid-ads/ads-campaign/paid-ads-setup-sections.js +++ b/js/src/components/paid-ads/ads-campaign/paid-ads-setup-sections.js @@ -63,11 +63,13 @@ function resolveInitialPaidAds( paidAds ) { * @param {Array|undefined} props.countryCodes Country codes for the campaign. * @param {Campaign} [props.campaign] Campaign data to be edited. If not provided, this component will show campaign creation UI. * @param {boolean} [props.showCampaignPreviewCard=false] Whether to show the campaign preview card. + * @param {boolean} [props.loadCampaignFromClientSession=false] Whether to load the campaign data from the client session. */ export default function PaidAdsSetupSections( { onStatesReceived, countryCodes, campaign, + loadCampaignFromClientSession, showCampaignPreviewCard = false, } ) { const isCreation = ! campaign; @@ -78,10 +80,16 @@ export default function PaidAdsSetupSections( { const [ paidAds, setPaidAds ] = useState( () => { // Resolve the starting paid ads data with the campaign data stored in the client session. - const startingPaidAds = { + let startingPaidAds = { ...defaultPaidAds, - ...clientSession.getCampaign(), }; + + if ( loadCampaignFromClientSession ) { + startingPaidAds = { + ...startingPaidAds, + ...clientSession.getCampaign(), + }; + } return resolveInitialPaidAds( startingPaidAds ); } );