@automattic/data-stores 3.1.0-rc.6 → 3.1.1

package/src/plans/hooks/use-pricing-meta-for-grid-plans.ts

@@ -6,10 +6,10 @@ import {
 } from '@automattic/calypso-products';
 import { useSelect } from '@wordpress/data';
 import * as Plans from '../';
+import * as AddOns from '../../add-ons';
 import * as Purchases from '../../purchases';
 import * as WpcomPlansUI from '../../wpcom-plans-ui';
 import { COST_OVERRIDE_REASONS } from '../constants';
-import type { AddOnMeta } from '../../add-ons/types';
 
 export type UseCheckPlanAvailabilityForPurchase = ( {
 	planSlugs,
@@ -45,17 +45,19 @@ interface Props {
 	 */
 	useCheckPlanAvailabilityForPurchase: UseCheckPlanAvailabilityForPurchase;
 
-	/**
-	 * `storageAddOmns` TODO: should become a required prop.
-	 */
-	storageAddOns: ( AddOnMeta | null )[] | null;
-
 	/**
 	 * Whether to include discounts from plan proration.
 	 * This is applicable only if a siteId is passed to this hook.
 	 * If true, the pricing includes discounts from upgrade credits.
 	 */
 	withProratedDiscounts?: boolean;
+
+	/**
+	 * Storage add-on products ( e.g. increase site storage by 50GB ) can be purchased alongside plans. If true,
+	 * storage add-on selections will be included in final plan price calculations. Otherwise, omit the add-ons
+	 * from the final price.
+	 */
+	reflectStorageSelectionInPlanPrices?: boolean;
 }
 
 function getTotalPrice( planPrice: number | null | undefined, addOnPrice = 0 ): number | null {
@@ -77,13 +79,14 @@ const usePricingMetaForGridPlans = ( {
 	siteId,
 	coupon,
 	useCheckPlanAvailabilityForPurchase,
-	storageAddOns,
 	withProratedDiscounts,
+	reflectStorageSelectionInPlanPrices = false,
 }: Props ): { [ planSlug: string ]: Plans.PricingMetaForGridPlan } | null => {
 	// plans - should have a definition for all plans, being the main source of API data
 	const plans = Plans.usePlans( { coupon } );
 	// sitePlans - unclear if all plans are included
-	const sitePlans = Plans.useSitePlans( { siteId } );
+	const sitePlans = Plans.useSitePlans( { coupon, siteId } );
+	const storageAddOns = AddOns.useStorageAddOns( { siteId } );
 	const currentPlan = Plans.useCurrentPlan( { siteId } );
 	const introOffers = Plans.useIntroOffers( { siteId, coupon } );
 	const purchasedPlan = Purchases.useSitePurchaseById( {
@@ -92,8 +95,9 @@ const usePricingMetaForGridPlans = ( {
 	} );
 	const selectedStorageOptions = useSelect(
 		( select ) => select( WpcomPlansUI.store ).getSelectedStorageOptions( siteId ),
-		[]
+		[ siteId ]
 	);
+
 	const planAvailabilityForPurchase = useCheckPlanAvailabilityForPurchase( {
 		planSlugs,
 		siteId,
@@ -112,6 +116,7 @@ const usePricingMetaForGridPlans = ( {
 					originalPrice: Plans.PlanPricing[ 'originalPrice' ];
 					discountedPrice: Plans.PlanPricing[ 'discountedPrice' ];
 					currencyCode: Plans.PlanPricing[ 'currencyCode' ];
+					introOffer: Plans.PlanPricing[ 'introOffer' ];
 				};
 		  }
 		| null = null;
@@ -129,14 +134,26 @@ const usePricingMetaForGridPlans = ( {
 				const plan = plans.data?.[ planSlug ];
 				const sitePlan = sitePlans.data?.[ planSlug ];
 				const selectedStorageOption = selectedStorageOptions?.[ planSlug ];
-				const selectedStorageAddOn = selectedStorageOption
-					? storageAddOns?.find( ( addOn ) => {
-							return addOn?.addOnSlug === selectedStorageOption;
-					  } )
-					: null;
+				const selectedStorageAddOn =
+					selectedStorageOption && reflectStorageSelectionInPlanPrices
+						? storageAddOns?.find( ( addOn ) => {
+								return addOn?.addOnSlug === selectedStorageOption;
+						  } )
+						: null;
 				const storageAddOnPriceMonthly = selectedStorageAddOn?.prices?.monthlyPrice || 0;
 				const storageAddOnPriceYearly = selectedStorageAddOn?.prices?.yearlyPrice || 0;
 
+				const introOffer = introOffers?.[ planSlug ];
+
+				const introOfferPrice = introOffer
+					? ( {
+							monthly: introOffer.rawPrice.monthly + storageAddOnPriceMonthly,
+							full:
+								introOffer.rawPrice.full +
+								( 'year' === introOffer.intervalUnit ? storageAddOnPriceYearly : 0 ),
+					  } as const )
+					: undefined;
+
 				/**
 				 * 0. No plan or sitePlan (when selected site exists): planSlug is for a priceless plan.
 				 * TODO clk: the condition on `.pricing` here needs investigation. There should be a pricing object for all returned API plans.
@@ -213,11 +230,21 @@ const usePricingMetaForGridPlans = ( {
 						full: getTotalPrice( sitePlan?.pricing.originalPrice.full, storageAddOnPriceYearly ),
 					};
 
-					// Do not return discounted prices if discount is due to plan proration
+					// Do not return discounted prices if discount is due to plan or domain proration.
+					// If there is, however, a sale coupon, show the discounted price
+					// without proration. This isn't ideal, but is intentional. Because of
+					// this, the price will differ between the plans grid and checkout screen.
+					const costOverrideCode = sitePlan?.pricing?.costOverrides?.[ 0 ]?.overrideCode;
+					const hasProratedCostOverride =
+						costOverrideCode &&
+						[
+							COST_OVERRIDE_REASONS.RECENT_PLAN_PRORATION,
+							COST_OVERRIDE_REASONS.RECENT_DOMAIN_PRORATION,
+						].includes( costOverrideCode );
 					if (
+						! sitePlan?.pricing?.hasSaleCoupon &&
 						! withProratedDiscounts &&
-						sitePlan?.pricing?.costOverrides?.[ 0 ]?.overrideCode ===
-							COST_OVERRIDE_REASONS.RECENT_PLAN_PRORATION
+						hasProratedCostOverride
 					) {
 						return [
 							planSlug,
@@ -228,6 +255,12 @@ const usePricingMetaForGridPlans = ( {
 									full: null,
 								},
 								currencyCode: sitePlan?.pricing?.currencyCode,
+								...( sitePlan?.pricing.introOffer && {
+									introOffer: {
+										...sitePlan?.pricing.introOffer,
+										rawPrice: introOfferPrice,
+									},
+								} ),
 							},
 						];
 					}
@@ -246,6 +279,12 @@ const usePricingMetaForGridPlans = ( {
 							originalPrice,
 							discountedPrice,
 							currencyCode: sitePlan?.pricing?.currencyCode,
+							...( sitePlan?.pricing.introOffer && {
+								introOffer: {
+									...sitePlan?.pricing.introOffer,
+									rawPrice: introOfferPrice,
+								},
+							} ),
 						},
 					];
 				}
@@ -272,6 +311,12 @@ const usePricingMetaForGridPlans = ( {
 							originalPrice,
 							discountedPrice,
 							currencyCode: plan?.pricing?.currencyCode,
+							...( plan?.pricing.introOffer && {
+								introOffer: {
+									...plan?.pricing.introOffer,
+									rawPrice: introOfferPrice,
+								},
+							} ),
 						},
 					];
 				}
@@ -294,6 +339,12 @@ const usePricingMetaForGridPlans = ( {
 							full: null,
 						},
 						currencyCode: plan?.pricing?.currencyCode,
+						...( plan?.pricing.introOffer && {
+							introOffer: {
+								...plan?.pricing.introOffer,
+								rawPrice: introOfferPrice,
+							},
+						} ),
 					},
 				];
 			} )
@@ -314,7 +365,7 @@ const usePricingMetaForGridPlans = ( {
 					// TODO clk: the condition on `.pricing` here needs investigation. There should be a pricing object for all returned API plans.
 					currencyCode: planPrices?.[ planSlug ]?.currencyCode,
 					expiry: sitePlans.data?.[ planSlug ]?.expiry,
-					introOffer: introOffers?.[ planSlug ],
+					introOffer: planPrices?.[ planSlug ]?.introOffer,
 				},
 			} ),
 			{} as { [ planSlug in PlanSlug ]?: Plans.PricingMetaForGridPlan }

package/src/plans/mock/next/store/plans.ts

@@ -28,9 +28,12 @@ export const NEXT_STORE_SITE_PLAN_BUSINESS: SitePlan = {
 	productId: 2,
 	pricing: {
 		introOffer: {
-			formattedPrice: '$15.00',
-			rawPrice: 15,
-			intervalUnit: 'month',
+			formattedPrice: '$150.00',
+			rawPrice: {
+				monthly: 1250,
+				full: 15000,
+			},
+			intervalUnit: 'year',
 			intervalCount: 1,
 			isOfferComplete: false,
 		},
@@ -84,9 +87,12 @@ export const NEXT_STORE_PLAN_BUSINESS: PlanNext = {
 		billPeriod: 365,
 		currencyCode: 'USD',
 		introOffer: {
-			formattedPrice: '$25.00',
-			rawPrice: 25,
-			intervalUnit: 'month',
+			formattedPrice: '$300.00',
+			rawPrice: {
+				monthly: 2500,
+				full: 30000,
+			},
+			intervalUnit: 'year',
 			intervalCount: 1,
 			isOfferComplete: false,
 		},

package/src/plans/queries/lib/unpack-intro-offer.ts

@@ -6,8 +6,11 @@ import type { PlanIntroductoryOffer, PricedAPIPlan, PricedAPISitePlan } from '..
 const unpackIntroOffer = (
 	plan: PricedAPISitePlan | PricedAPIPlan
 ): PlanIntroductoryOffer | null => {
-	// these aren't grouped or separated. so no introductory offer if no cost or interval
-	if ( ! plan.introductory_offer_interval_unit && ! plan.introductory_offer_interval_count ) {
+	// these aren't grouped or separated. so no introductory offer if missing or malformed raw_price
+	if (
+		typeof plan.introductory_offer_raw_price_integer !== 'number' ||
+		! plan.introductory_offer_interval_count
+	) {
 		return null;
 	}
 
@@ -30,9 +33,25 @@ const unpackIntroOffer = (
 
 	return {
 		formattedPrice: plan.introductory_offer_formatted_price as string,
-		rawPrice: plan.introductory_offer_raw_price as number,
+		rawPrice: {
+			monthly:
+				/**
+				 * IMPORTANT:
+				 * we make the raw assumption that the interval unit is either "year" or "month"
+				 * to compute monthly/full price
+				 */
+				'year' === plan.introductory_offer_interval_unit
+					? parseFloat(
+							(
+								plan.introductory_offer_raw_price_integer /
+								( plan.introductory_offer_interval_count * 12 )
+							).toFixed( 2 )
+					  )
+					: plan.introductory_offer_raw_price_integer,
+			full: plan.introductory_offer_raw_price_integer,
+		},
 		intervalUnit: plan.introductory_offer_interval_unit as string,
-		intervalCount: plan.introductory_offer_interval_count as number,
+		intervalCount: plan.introductory_offer_interval_count,
 		isOfferComplete,
 	};
 };

package/src/plans/queries/lib/use-query-keys-factory.ts

@@ -1,5 +1,9 @@
 const useQueryKeysFactory = () => ( {
-	sitePlans: ( siteId?: string | number | null ) => [ 'site-plans', siteId ],
+	sitePlans: ( coupon?: string, siteId?: string | number | null ) => [
+		'site-plans',
+		siteId,
+		coupon,
+	],
 	plans: ( coupon?: string ) => [ 'plans', coupon ],
 } );
 

package/src/plans/queries/use-plans.ts

@@ -31,7 +31,7 @@ function usePlans( {
 		queryKey: queryKeys.plans( coupon ),
 		queryFn: async (): Promise< PlansIndex > => {
 			const data: PricedAPIPlan[] = await wpcomRequest( {
-				path: `/plans`,
+				path: '/plans',
 				apiVersion: '1.5',
 				query: params.toString(),
 			} );

package/src/plans/queries/use-site-plans.ts

@@ -14,6 +14,11 @@ interface PricedAPISitePlansIndex {
 }
 
 interface Props {
+	/**
+	 * To match the use-plans hook, `coupon` is required on purpose to mitigate risk of not passing
+	 * something through when we should
+	 */
+	coupon: string | undefined;
 	siteId: string | number | null | undefined;
 }
 
@@ -22,15 +27,18 @@ interface Props {
  * - Plans from `/sites/[siteId]/plans`, unlike `/plans`, are returned indexed by product_id, and do not include that in the plan's payload.
  * - UI works with product/plan slugs everywhere, so returned index is transformed to be keyed by product_slug
  */
-function useSitePlans( { siteId }: Props ): UseQueryResult< SitePlansIndex > {
+function useSitePlans( { coupon, siteId }: Props ): UseQueryResult< SitePlansIndex > {
 	const queryKeys = useQueryKeysFactory();
+	const params = new URLSearchParams();
+	coupon && params.append( 'coupon_code', coupon );
 
 	return useQuery( {
-		queryKey: queryKeys.sitePlans( siteId ),
+		queryKey: queryKeys.sitePlans( coupon, siteId ),
 		queryFn: async (): Promise< SitePlansIndex > => {
 			const data: PricedAPISitePlansIndex = await wpcomRequest( {
 				path: `/sites/${ encodeURIComponent( siteId as string ) }/plans`,
 				apiVersion: '1.3',
+				query: params.toString(),
 			} );
 
 			return Object.fromEntries(
@@ -52,6 +60,7 @@ function useSitePlans( { siteId }: Props ): UseQueryResult< SitePlansIndex > {
 							hasRedeemedDomainCredit: plan?.has_redeemed_domain_credit,
 							purchaseId: plan.id ? Number( plan.id ) : undefined,
 							pricing: {
+								hasSaleCoupon: plan.has_sale_coupon,
 								currencyCode: plan.currency_code,
 								introOffer: unpackIntroOffer( plan ),
 								costOverrides: unpackCostOverrides( plan ),

package/src/plans/resolvers.ts

@@ -1,4 +1,4 @@
-import formatCurrency from '@automattic/format-currency';
+import { formatCurrency } from 'i18n-calypso';
 import { stringify } from 'qs';
 import { fetchAndParse, wpcomRequest } from '../wpcom-request-controls';
 import { setFeatures, setFeaturesByType, setPlanProducts, setPlans } from './actions';

package/src/plans/types.ts

@@ -67,8 +67,19 @@ export interface PlanProduct {
 }
 
 export interface PlanIntroductoryOffer {
+	/**
+	 * @deprecated use `formatCurrency` call instead on the respective price (monthly/full)
+	 */
 	formattedPrice: string;
-	rawPrice: number;
+	rawPrice: {
+		monthly: number;
+		full: number;
+	};
+	/**
+	 * IMPORTANT:
+	 * we make the raw assumption that the interval unit is either "year" or "month"
+	 * to compute monthly/full price
+	 */
 	intervalUnit: string;
 	intervalCount: number;
 	isOfferComplete: boolean;
@@ -109,6 +120,7 @@ export interface PlanPricing {
 }
 
 export interface SitePlanPricing extends Omit< PlanPricing, 'billPeriod' > {
+	hasSaleCoupon?: boolean;
 	costOverrides?: CostOverride[];
 }
 
@@ -173,8 +185,17 @@ export interface PlanNext {
 }
 
 export interface PricedAPIPlanIntroductoryOffer {
+	/**
+	 * @deprecated use `formatCurrency` call instead on the respective price (monthly/full)
+	 * - no need to pass this from the API at all
+	 */
 	introductory_offer_formatted_price?: string;
-	introductory_offer_raw_price?: number;
+	introductory_offer_raw_price_integer?: number;
+	/**
+	 * IMPORTANT:
+	 * we make the raw assumption that the interval unit is either "year" or "month"
+	 * to compute monthly/full price
+	 */
 	introductory_offer_interval_unit?: string;
 	introductory_offer_interval_count?: number;
 	introductory_offer_end_date?: string;
@@ -249,6 +270,7 @@ export interface PricedAPIPlan extends PricedAPIPlanPricing, PricedAPIPlanIntrod
 export interface PricedAPISitePlan
 	extends PricedAPISitePlanPricing,
 		PricedAPIPlanIntroductoryOffer {
+	has_sale_coupon?: boolean;
 	/* product_id: number; // not included in the plan's payload */
 	product_slug: StorePlanSlug;
 	current_plan?: boolean;

package/src/products-list/queries/use-products.ts

@@ -25,7 +25,7 @@ function useProducts(
 		queryKey: [ ...queryKeys.products(), product_slugs, locale ],
 		queryFn: async (): Promise< ProductsIndex > => {
 			const apiProducts: RawAPIProductsList = await wpcomRequest( {
-				path: `/products`,
+				path: '/products',
 				apiVersion: '1.1',
 				...( product_slugs
 					? { query: new URLSearchParams( { product_slugs, locale } ).toString() }

package/src/products-list/types.ts

@@ -44,6 +44,7 @@ export interface RawAPIProduct {
 	available: boolean;
 	combined_cost_display: string;
 	cost: number;
+	cost_per_month_display?: string;
 	cost_smallest_unit: number;
 	currency_code: string;
 	description: string;

package/src/purchases/lib/assembler.ts

@@ -12,6 +12,7 @@ export function createPurchaseObject( purchase: RawPurchase | RawPurchaseCreditC
 		billPeriodDays: Number( purchase.bill_period_days ),
 		billPeriodLabel: purchase.bill_period_label,
 		mostRecentRenewDate: purchase.most_recent_renew_date,
+		asyncPendingPaymentBlockIsSet: purchase.async_pending_payment_block_is_set,
 		canDisableAutoRenew: Boolean( purchase.can_disable_auto_renew ),
 		canReenableAutoRenewal: Boolean( purchase.can_reenable_auto_renewal ),
 		canExplicitRenew: Boolean( purchase.can_explicit_renew ),
@@ -58,6 +59,7 @@ export function createPurchaseObject( purchase: RawPurchase | RawPurchaseCreditC
 		isCancelable: Boolean( purchase.is_cancelable ),
 		isDomain: Boolean( purchase.is_domain ),
 		isDomainRegistration: Boolean( purchase.is_domain_registration ),
+		isHundredYearDomain: Boolean( purchase.is_hundred_year_domain ),
 		isLocked: Boolean( purchase.is_locked ),
 		isInAppPurchase: Boolean( purchase.is_iap_purchase ),
 		isRechargeable: Boolean( purchase.is_rechargable ),

package/src/purchases/types.ts

@@ -8,6 +8,7 @@ export interface Purchase {
 	billPeriodLabel: string;
 	blogCreatedDate: string;
 	canDisableAutoRenew: boolean;
+	asyncPendingPaymentBlockIsSet: boolean;
 	canExplicitRenew: boolean;
 	canReenableAutoRenewal: boolean;
 	costToUnbundle: number;
@@ -29,6 +30,7 @@ export interface Purchase {
 	isCancelable: boolean;
 	isDomain?: boolean;
 	isDomainRegistration?: boolean;
+	isHundredYearDomain?: boolean;
 	isInAppPurchase: boolean;
 	isLocked: boolean;
 	isRechargeable: boolean;
@@ -183,6 +185,7 @@ export interface RawPurchase {
 	most_recent_renew_date: string;
 	can_disable_auto_renew: boolean;
 	can_reenable_auto_renewal: boolean;
+	async_pending_payment_block_is_set: boolean;
 	can_explicit_renew: boolean;
 	cost_to_unbundle: undefined | number | string;
 	cost_to_unbundle_display: undefined | string;
@@ -203,6 +206,7 @@ export interface RawPurchase {
 	is_cancelable: boolean;
 	is_domain: boolean;
 	is_domain_registration: boolean;
+	is_hundred_year_domain: boolean;
 	is_locked: boolean;
 	is_iap_purchase: boolean;
 	is_rechargable: boolean;
@@ -316,6 +320,7 @@ export interface PurchasePayment {
 	storedDetailsId: string | number | undefined | null;
 	expiryDate?: string;
 	creditCard?: PurchasePaymentCreditCard;
+	paymentPartner?: string;
 }
 
 /**

package/src/queries/use-all-domains-query.ts

@@ -17,11 +17,13 @@ export type PartialDomainData = Pick<
 	| 'google_apps_subscription'
 	| 'has_registration'
 	| 'is_wpcom_staging_domain'
+	| 'is_hundred_year_domain'
 	| 'registration_date'
 	| 'titan_mail_subscription'
 	| 'tld_maintenance_end_time'
 	| 'type'
 	| 'wpcom_domain'
+	| 'domain_status'
 >;
 
 export interface AllDomainsQueryFnData {
@@ -30,6 +32,7 @@ export interface AllDomainsQueryFnData {
 
 export interface AllDomainsQueryArgs {
 	no_wpcom?: boolean;
+	resolve_status?: boolean;
 }
 
 export const getAllDomainsQueryKey = ( queryArgs: AllDomainsQueryArgs = {} ) => [

package/src/queries/use-bulk-domain-update-status-query.ts

@@ -24,6 +24,11 @@ export interface JobStatus {
 	failed: string[];
 	pending: string[];
 	complete: boolean;
+	params: {
+		auto_renew?: boolean;
+		whois?: unknown;
+		transfer_lock?: boolean;
+	};
 }
 
 interface DomainUpdateRemoteStatus {
@@ -64,17 +69,16 @@ export function useBulkDomainUpdateStatusQuery< TError = unknown >(
 			wpcomRequest< BulkDomainUpdateStatusQueryFnData >( {
 				path: '/domains/bulk-actions',
 				apiNamespace: 'wpcom/v2',
-				apiVersion: '2',
 			} ),
 		select: ( data ): BulkDomainUpdateStatusResult => {
 			// get top-level info about recent jobs
 			const allJobs: JobStatus[] = Object.keys( data ).map( ( jobId ) => {
-				const job = data[ jobId ];
+				const { action, created_at, results, ...rest } = data[ jobId ];
 				const success: string[] = [];
 				const failed: string[] = [];
 				const pending: string[] = [];
 
-				Object.entries( job.results ).forEach( ( entry ) => {
+				Object.entries( results ).forEach( ( entry ) => {
 					if ( entry[ 1 ] === 'success' ) {
 						success.push( entry[ 0 ] );
 					} else if ( entry[ 1 ] === 'failed' ) {
@@ -86,12 +90,13 @@ export function useBulkDomainUpdateStatusQuery< TError = unknown >(
 
 				return {
 					id: jobId,
-					action: job.action,
-					created_at: job.created_at,
+					action: action,
+					created_at: created_at,
 					success,
 					failed,
 					pending,
 					complete: pending.length === 0,
+					params: rest,
 				};
 			} );
 

package/src/queries/use-launchpad.ts

@@ -1,4 +1,5 @@
 import { recordTracksEvent } from '@automattic/calypso-analytics';
+import * as oauthToken from '@automattic/oauth-token';
 import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
 import apiFetch from '@wordpress/api-fetch';
 import { addQueryArgs } from '@wordpress/url';
@@ -70,21 +71,21 @@ export const fetchLaunchpad = (
 	const checklistSlugEncoded = checklistSlug ? encodeURIComponent( checklistSlug ) : null;
 	const launchpadContextEncoded = launchpadContext ? encodeURIComponent( launchpadContext ) : null;
 	const queryArgs = {
-		_locale: 'uesr',
+		_locale: 'user',
 		...( checklistSlug && { checklist_slug: checklistSlugEncoded } ),
 		...( launchpadContext && { launchpad_context: launchpadContextEncoded } ),
 	};
-
+	const token = oauthToken.getToken();
 	return canAccessWpcomApis()
 		? wpcomRequest( {
 				path: addQueryArgs( `/sites/${ slug }/launchpad`, queryArgs ),
 				apiNamespace: 'wpcom/v2',
-				apiVersion: '2',
 				method: 'GET',
+				token: typeof token === 'string' ? token : undefined,
 		  } )
 		: apiFetch( {
 				global: true,
-				path: addQueryArgs( `/wpcom/v2/launchpad`, queryArgs ),
+				path: addQueryArgs( '/wpcom/v2/launchpad', queryArgs ),
 		  } as APIFetchOptions );
 };
 
@@ -138,6 +139,7 @@ export const useLaunchpad = (
 			is_dismissible: false,
 			title: null,
 		},
+		enabled: Boolean( siteSlug ),
 	} );
 };
 
@@ -158,17 +160,18 @@ export const updateLaunchpadSettings = (
 	settings: LaunchpadUpdateSettings = {}
 ) => {
 	const slug = siteSlug ? encodeURIComponent( siteSlug ) : null;
-
+	const token = oauthToken.getToken();
 	return canAccessWpcomApis()
 		? wpcomRequest( {
 				path: `/sites/${ slug }/launchpad`,
 				apiNamespace: 'wpcom/v2',
 				method: 'PUT',
 				body: settings,
+				token: typeof token === 'string' ? token : undefined,
 		  } )
 		: apiFetch( {
 				global: true,
-				path: `/wpcom/v2/launchpad`,
+				path: '/wpcom/v2/launchpad',
 				method: 'PUT',
 				data: settings,
 		  } as APIFetchOptions );
@@ -203,7 +206,11 @@ const getDismissParams = ( settings: DismissSettings ) => {
 	}
 };
 
-export const useLaunchpadDismisser = ( siteSlug: SiteSlug, checklistSlug: string ) => {
+export const useLaunchpadDismisser = (
+	siteSlug: SiteSlug,
+	checklistSlug: string,
+	launchpadContext: string
+) => {
 	const queryClient = useQueryClient();
 	const key = getKey( siteSlug, checklistSlug );
 
@@ -230,7 +237,7 @@ export const useLaunchpadDismisser = ( siteSlug: SiteSlug, checklistSlug: string
 		onSuccess: () => {
 			recordTracksEvent( 'calypso_launchpad_dismiss_guide', {
 				checklist_slug: checklistSlug,
-				context: 'customer-home',
+				context: launchpadContext,
 			} );
 		},
 		onError: ( _, _2, context ) => {

package/src/queries/use-site-domains-query.ts

@@ -40,7 +40,6 @@ export interface DomainData {
 	expired: boolean;
 	auto_renewing: boolean;
 	pending_registration: boolean;
-	pending_registration_time: string;
 	has_registration: boolean;
 	has_email_forward_dns_records: unknown;
 	points_to_wpcom: boolean;
@@ -53,6 +52,8 @@ export interface DomainData {
 	is_dnssec_enabled: boolean;
 	is_dnssec_supported: boolean;
 	is_gravatar_domain: boolean;
+	is_gravatar_restricted_domain: boolean;
+	is_hundred_year_domain: boolean;
 	is_renewable: boolean;
 	is_redeemable: boolean;
 	is_subdomain: boolean;
@@ -128,6 +129,11 @@ export interface DomainData {
 	pending_registration_at_registry_url: string;
 	registered_via_trustee: boolean;
 	registered_via_trustee_url: string;
+	domain_status?: {
+		status: string;
+		status_type: string;
+		status_weight: number;
+	};
 }
 
 export interface SiteDomainsQueryFnData {