@automattic/data-stores 3.1.1 → 3.2.0

package/src/onboard/actions.ts

@@ -6,8 +6,8 @@ import { Visibility, GlobalStyles } from '../site/types';
 import { SiteGoal, STORE_KEY } from './constants';
 import { ProfilerData, ReadymadeTemplate } from './types';
 import type { DomainTransferData, State } from '.';
-import type { DomainSuggestion } from '../domain-suggestions';
 import type { FeatureId } from '../shared-types';
+import type { DomainSuggestion } from '@automattic/api-core';
 // somewhat hacky, but resolves the circular dependency issue
 import type { Design, StyleVariation } from '@automattic/design-picker/src/types';
 import type { MinimalRequestCartProduct } from '@automattic/shopping-cart';
@@ -34,19 +34,6 @@ export const setSiteUrl = ( siteUrl: string ) => ( {
 	siteUrl,
 } );
 
-export interface CreateSiteBaseActionParameters {
-	username: string;
-	languageSlug: string;
-	visibility: number;
-}
-
-export interface CreateSiteActionParameters extends CreateSiteBaseActionParameters {
-	bearerToken?: string;
-	anchorFmPodcastId: string | null;
-	anchorFmEpisodeId: string | null;
-	anchorFmSpotifyUrl: string | null;
-}
-
 export function* createSenseiSite( {
 	username = '',
 	languageSlug = '',
@@ -356,11 +343,6 @@ export const setHidePlansFeatureComparison = ( hidePlansFeatureComparison: boole
 	hidePlansFeatureComparison,
 } );
 
-export const setIsMigrateFromWp = ( isMigrateFromWp: boolean ) => ( {
-	type: 'SET_IS_MIGRATE_FROM_WP' as const,
-	isMigrateFromWp,
-} );
-
 export const setPluginsToVerify = ( pluginSlugs: string[] ) => ( {
 	type: 'SET_PLUGIN_SLUGS_TO_VERIFY' as const,
 	pluginSlugs,
@@ -381,9 +363,14 @@ export const setPartnerBundle = ( partnerBundle: string | null ) => ( {
 	partnerBundle,
 } );
 
-export const setCreateWithBigSky = ( createWithBigSky: boolean ) => ( {
-	type: 'SET_CREATE_WITH_BIG_SKY' as const,
-	createWithBigSky,
+export const setGardenName = ( gardenName: string | null ) => ( {
+	type: 'SET_GARDEN_NAME' as const,
+	gardenName,
+} );
+
+export const setGardenPartnerName = ( gardenPartnerName: string | null ) => ( {
+	type: 'SET_GARDEN_PARTNER_NAME' as const,
+	gardenPartnerName,
 } );
 
 export type OnboardAction = ReturnType<
@@ -442,9 +429,9 @@ export type OnboardAction = ReturnType<
 	| typeof setHidePlansFeatureComparison
 	| typeof setProductCartItems
 	| typeof setPlanCartItem
-	| typeof setIsMigrateFromWp
 	| typeof setPaidSubscribers
 	| typeof setPartnerBundle
 	| typeof setSignupDomainOrigin
-	| typeof setCreateWithBigSky
+	| typeof setGardenName
+	| typeof setGardenPartnerName
 >;

package/src/onboard/index.ts

@@ -62,7 +62,6 @@ export function register(): typeof STORE_KEY {
 			'domainCartItem',
 			'planCartItem',
 			'productCartItems',
-			'createWithBigSky',
 			'partnerBundle',
 		],
 	} );

package/src/onboard/reducer.ts

@@ -8,9 +8,9 @@ import type {
 	DomainTransferAuthCodes,
 	ReadymadeTemplate,
 } from './types';
-import type { DomainSuggestion } from '../domain-suggestions';
 import type { FeatureId } from '../shared-types';
 import type { GlobalStyles } from '../site';
+import type { DomainSuggestion } from '@automattic/api-core';
 // somewhat hacky, but resolves the circular dependency issue
 import type { Design, StyleVariation } from '@automattic/design-picker/src/types';
 import type { MinimalRequestCartProduct } from '@automattic/shopping-cart';
@@ -489,16 +489,6 @@ const domainCartItems: Reducer< MinimalRequestCartProduct[] | undefined, Onboard
 	return state;
 };
 
-const isMigrateFromWp: Reducer< boolean, OnboardAction > = ( state = false, action ) => {
-	if ( action.type === 'SET_IS_MIGRATE_FROM_WP' ) {
-		return action.isMigrateFromWp;
-	}
-	if ( action.type === 'RESET_ONBOARD_STORE' ) {
-		return false;
-	}
-	return state;
-};
-
 const pluginsToVerify: Reducer< string[] | undefined, OnboardAction > = ( state, action ) => {
 	if ( action.type === 'SET_PLUGIN_SLUGS_TO_VERIFY' ) {
 		return action.pluginSlugs;
@@ -622,17 +612,26 @@ const signupDomainOrigin: Reducer< string | undefined, OnboardAction > = (
 	return state;
 };
 
-const createWithBigSky: Reducer< boolean | undefined, OnboardAction > = (
-	state = undefined,
+export const gardenName: Reducer< string | null, OnboardAction > = ( state = null, action ) => {
+	if ( action.type === 'SET_GARDEN_NAME' ) {
+		return action.gardenName;
+	}
+	if ( action.type === 'RESET_ONBOARD_STORE' ) {
+		return null;
+	}
+	return state;
+};
+
+export const gardenPartnerName: Reducer< string | null, OnboardAction > = (
+	state = null,
 	action
 ) => {
-	if ( action.type === 'SET_CREATE_WITH_BIG_SKY' ) {
-		return action.createWithBigSky;
+	if ( action.type === 'SET_GARDEN_PARTNER_NAME' ) {
+		return action.gardenPartnerName;
 	}
 	if ( action.type === 'RESET_ONBOARD_STORE' ) {
-		return undefined;
+		return null;
 	}
-
 	return state;
 };
 
@@ -678,14 +677,14 @@ const reducer = combineReducers( {
 	storageAddonSlug,
 	planCartItem,
 	productCartItems,
-	isMigrateFromWp,
 	domainCartItems,
 	pluginsToVerify,
 	profilerData,
 	paidSubscribers,
 	partnerBundle,
 	signupDomainOrigin,
-	createWithBigSky,
+	gardenName,
+	gardenPartnerName,
 } );
 
 export type State = ReturnType< typeof reducer >;

package/src/onboard/selectors.ts

@@ -77,9 +77,9 @@ export const getSignupDomainOrigin = ( state: State ) => state.signupDomainOrigi
 export const getSiteUrl = ( state: State ) => state.siteUrl;
 export const getHideFreePlan = ( state: State ) => state.hideFreePlan;
 export const getHidePlansFeatureComparison = ( state: State ) => state.hidePlansFeatureComparison;
-export const getIsMigrateFromWp = ( state: State ) => state.isMigrateFromWp;
 export const getPluginsToVerify = ( state: State ) => state.pluginsToVerify;
 export const getProfilerData = ( state: State ) => state.profilerData;
 export const getPaidSubscribers = ( state: State ) => state.paidSubscribers;
 export const getPartnerBundle = ( state: State ) => state.partnerBundle;
-export const getCreateWithBigSky = ( state: State ) => state.createWithBigSky;
+export const getGardenName = ( state: State ) => state.gardenName;
+export const getGardenPartnerName = ( state: State ) => state.gardenPartnerName;

package/src/onboard/types.ts

@@ -1,5 +1,5 @@
 import { GlobalStyles } from '../site';
-import type { DomainSuggestion } from '../domain-suggestions';
+import type { DomainSuggestion } from '@automattic/api-core';
 
 export type DomainForm = {
 	lastQuery?: string;

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

@@ -1,3 +1,4 @@
+import { isEnabled } from '@automattic/calypso-config';
 import { calculateMonthlyPriceForPlan } from '@automattic/calypso-products';
 import { useLocale } from '@automattic/i18n-utils';
 import { useQuery, type UseQueryResult } from '@tanstack/react-query';
@@ -10,6 +11,28 @@ interface PlansIndex {
 	[ planSlug: string ]: PlanNext;
 }
 
+type RequestFunction = ( params: {
+	path: string;
+	apiVersion: string;
+	query: string;
+} ) => Promise< PricedAPIPlan[] >;
+
+/**
+ * Request function for Jetpack that bypasses proxy and goes directly to WordPress.com
+ */
+const jetpackRequestFunction: RequestFunction = async ( params ) => {
+	const queryParams = params.query ? `?${ params.query }` : '';
+	const url = `https://public-api.wordpress.com/rest/v${ params.apiVersion }${ params.path }${ queryParams }`;
+	const response = await fetch( url, {
+		method: 'GET',
+		credentials: 'omit', // Don't send cookies to avoid CORS issues
+	} );
+	if ( ! response.ok ) {
+		throw new Error( `API request failed: ${ response.status }` );
+	}
+	return response.json();
+};
+
 /**
  * Plans from `/plans` endpoint, transformed into a map of planSlug => PlanNext
  */
@@ -27,10 +50,15 @@ function usePlans( {
 	coupon && params.append( 'coupon_code', coupon );
 	params.append( 'locale', locale );
 
+	// Auto-detect Jetpack context and use appropriate request function
+	const isJetpack = isEnabled( 'is_running_in_jetpack_site' );
+
+	const requestFn = isJetpack ? jetpackRequestFunction : wpcomRequest;
+
 	return useQuery( {
 		queryKey: queryKeys.plans( coupon ),
 		queryFn: async (): Promise< PlansIndex > => {
-			const data: PricedAPIPlan[] = await wpcomRequest( {
+			const data: PricedAPIPlan[] = await requestFn( {
 				path: '/plans',
 				apiVersion: '1.5',
 				query: params.toString(),

package/src/plans/resolvers.ts

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

package/src/purchases/lib/assembler.ts

@@ -1,10 +1,9 @@
 import { snakeToCamelCase } from '@automattic/js-utils';
-import type { PurchasePriceTier, Purchase, RawPurchase, RawPurchaseCreditCard } from '../types';
+import type { PurchasePriceTier, Purchase, RawPurchase } from '../types';
 
-export function createPurchaseObject( purchase: RawPurchase | RawPurchaseCreditCard ): Purchase {
+export function createPurchaseObject( purchase: RawPurchase ): Purchase {
 	const object: Purchase = {
 		id: Number( purchase.ID ),
-		active: Boolean( purchase.active ),
 		amount: Number( purchase.amount ),
 		attachedToPurchaseId: Number( purchase.attached_to_purchase_id ),
 		autoRenewCouponCode: purchase.auto_renew_coupon_code,
@@ -16,9 +15,6 @@ export function createPurchaseObject( purchase: RawPurchase | RawPurchaseCreditC
 		canDisableAutoRenew: Boolean( purchase.can_disable_auto_renew ),
 		canReenableAutoRenewal: Boolean( purchase.can_reenable_auto_renewal ),
 		canExplicitRenew: Boolean( purchase.can_explicit_renew ),
-		costToUnbundle: purchase.cost_to_unbundle
-			? Number( purchase.cost_to_unbundle )
-			: Number( purchase.amount ),
 		costToUnbundleText: purchase.cost_to_unbundle_display
 			? purchase.cost_to_unbundle_display
 			: purchase.price_text,
@@ -27,7 +23,6 @@ export function createPurchaseObject( purchase: RawPurchase | RawPurchaseCreditC
 		description: purchase.description,
 		domain: purchase.domain,
 		domainRegistrationAgreementUrl: purchase.domain_registration_agreement_url || null,
-		error: null,
 		blogCreatedDate: purchase.blog_created_date,
 		expiryDate: purchase.expiry_date,
 		expiryStatus: snakeToCamelCase( purchase.expiry_status ),
@@ -114,24 +109,23 @@ export function createPurchaseObject( purchase: RawPurchase | RawPurchaseCreditC
 		saleAmountInteger: purchase.sale_amount_integer,
 		siteId: Number( purchase.blog_id ),
 		siteName: purchase.blogname,
+		siteSlug: purchase.site_slug,
 		subscribedDate: purchase.subscribed_date,
 		subscriptionStatus: purchase.subscription_status,
-		tagLine: purchase.tag_line,
-		taxAmount: purchase.tax_amount,
-		taxText: purchase.tax_text,
 		purchaseRenewalQuantity: purchase.renewal_price_tier_usage_quantity || null,
 		userId: Number( purchase.user_id ),
-		isAutoRenewEnabled: parseInt( purchase.auto_renew ?? '' ) === 1,
+		isAutoRenewEnabled: purchase.is_auto_renew_enabled,
+		isJetpackPlanOrProduct: purchase.is_jetpack_plan_or_product,
 	};
 
 	if ( isCreditCardPurchase( purchase ) ) {
 		object.payment.creditCard = {
 			id: Number( purchase.payment_card_id ),
-			type: purchase.payment_card_type,
+			type: purchase.payment_card_type ?? '',
 			displayBrand: purchase.payment_card_display_brand,
-			processor: purchase.payment_card_processor,
-			number: purchase.payment_details,
-			expiryDate: purchase.payment_expiry,
+			processor: purchase.payment_card_processor ?? '',
+			number: purchase.payment_details ?? '',
+			expiryDate: purchase.payment_expiry ?? '',
 		};
 	}
 
@@ -142,15 +136,11 @@ export function createPurchaseObject( purchase: RawPurchase | RawPurchaseCreditC
 	return object;
 }
 
-function isCreditCardPurchase(
-	purchase: RawPurchase | RawPurchaseCreditCard
-): purchase is RawPurchaseCreditCard {
+function isCreditCardPurchase( purchase: RawPurchase ): boolean {
 	return purchase.payment_type === 'credit_card';
 }
 
-export function createPurchasesArray(
-	dataTransferObject: undefined | ( RawPurchase | RawPurchaseCreditCard )[]
-): Purchase[] {
+export function createPurchasesArray( dataTransferObject: undefined | RawPurchase[] ): Purchase[] {
 	if ( ! Array.isArray( dataTransferObject ) ) {
 		return [];
 	}

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

@@ -1,5 +1,6 @@
 const useQueryKeysFactory = () => ( {
 	sitePurchases: ( siteId?: string | number | null ) => [ 'site-purchases', siteId ],
+	transferredPurchases: ( userId?: string | number | null ) => [ 'transferred-purchases', userId ],
 } );
 
 export default useQueryKeysFactory;

package/src/purchases/queries/use-get-jetpack-transferred-license-purchases.tsx

@@ -0,0 +1,43 @@
+import { useQuery } from '@tanstack/react-query';
+import wpcomRequest from 'wpcom-proxy-request';
+import { createPurchaseObject } from '../lib/assembler';
+import useQueryKeysFactory from './lib/use-query-keys-factory';
+import type { RawPurchase, Purchase } from '../types';
+
+interface Props {
+	userId?: string | number;
+}
+
+export function getUseTransferredPurchasesOptions(
+	{ userId }: Props,
+	queryKey: ( string | number | null | undefined )[]
+) {
+	return {
+		queryKey,
+		queryFn: async (): Promise< Purchase[] > => {
+			const purchases: RawPurchase[] = await wpcomRequest( {
+				path: '/me/purchases/transferred',
+				apiVersion: '1.1',
+			} );
+
+			return purchases.map( ( rawPurchase ) => createPurchaseObject( rawPurchase ) );
+		},
+		enabled: !! userId,
+	};
+}
+
+/**
+ * Fetches all purchases for a given site, transformed into a map of purchaseId => Purchase
+ * @param {Object} props - The properties for the function
+ * @param props.userId Site ID
+ * @returns Query result
+ */
+function useGetJetpackTransferredLicensePurchases( { userId }: Props ) {
+	const queryKeys = useQueryKeysFactory();
+
+	return useQuery< Purchase[] >(
+		getUseTransferredPurchasesOptions( { userId }, queryKeys.transferredPurchases( userId ) )
+	);
+}
+
+export default useGetJetpackTransferredLicensePurchases;

package/src/purchases/types.ts

@@ -1,7 +1,6 @@
 import { PriceTierEntry } from '@automattic/calypso-products';
 
 export interface Purchase {
-	active?: boolean;
 	amount: number;
 	attachedToPurchaseId: number;
 	billPeriodDays: number;
@@ -11,14 +10,23 @@ export interface Purchase {
 	asyncPendingPaymentBlockIsSet: boolean;
 	canExplicitRenew: boolean;
 	canReenableAutoRenewal: boolean;
-	costToUnbundle: number;
 	costToUnbundleText: string;
 	currencyCode: string;
 	currencySymbol: string;
 	description: string;
+
+	/**
+	 * The domain name of the site associated with the purchase.
+	 *
+	 * IMPORTANT: this is not necessarily the primary domain of the site. This
+	 * can cause issues for Atomic sites if you try to use it for things that
+	 * expect the primary domain, like routing.
+	 *
+	 * To get the primary domain instead, use `siteSlug`.
+	 */
 	domain: string;
+
 	domainRegistrationAgreementUrl: string | null;
-	error: null;
 	expiryDate: string;
 	expiryStatus: string;
 	iapPurchaseManagementLink: string | null;
@@ -80,7 +88,7 @@ export interface Purchase {
 	 */
 	refundInteger: number;
 
-	refundOptions: RefundOptions | null;
+	refundOptions: RefundOptions[] | null;
 	refundPeriodInDays: number;
 
 	/**
@@ -106,6 +114,12 @@ export interface Purchase {
 	saleAmountInteger?: number;
 	siteId: number;
 	siteName: string;
+
+	/**
+	 * The primary domain for the site that owns this purchase.
+	 */
+	siteSlug?: string;
+
 	subscribedDate: string;
 	subscriptionStatus: 'active' | 'inactive';
 
@@ -144,9 +158,6 @@ export interface Purchase {
 	userId: number;
 	userIsOwner?: boolean;
 	partnerKeyId: number | undefined;
-	tagLine: string;
-	taxAmount: number | string | undefined;
-	taxText: string | undefined;
 
 	/**
 	 * The coupon code that will automatically apply on the next renewal.
@@ -157,6 +168,8 @@ export interface Purchase {
 	 * Example: If the discount is 10%, this will have the value `10`.
 	 */
 	autoRenewCouponDiscountPercentage: number | null;
+
+	isJetpackPlanOrProduct: boolean;
 }
 
 export interface PurchasePriceTier {
@@ -173,112 +186,7 @@ export interface RawPurchasePriceTierEntry extends PriceTierEntry {
 	maximum_price_monthly_display: never;
 }
 
-export interface RawPurchase {
-	ID: number | string;
-	active: boolean;
-	amount: number | string;
-	attached_to_purchase_id: number | string;
-	auto_renew_coupon_code: string | null;
-	auto_renew_coupon_discount_percentage: number | null;
-	bill_period_days: number | string;
-	bill_period_label: string;
-	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;
-	price_text: string;
-	price_tier_list?: Array< RawPurchasePriceTierEntry >;
-	currency_code: string;
-	currency_symbol: string;
-	description: string;
-	domain: string;
-	domain_registration_agreement_url: string | undefined;
-	blog_created_date: string;
-	expiry_date: string;
-	expiry_status: string;
-	iap_purchase_management_link: string | null;
-	included_domain: string;
-	included_domain_purchase_amount: number;
-	introductory_offer: RawPurchaseIntroductoryOffer | null;
-	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;
-	is_refundable: boolean;
-	is_renewable: boolean;
-	is_renewal: boolean;
-	is_woo_express_trial: boolean;
-	meta: string | undefined;
-	ownership_id: number | undefined;
-	partner_name: string | undefined;
-	partner_slug: string | undefined;
-	partner_type: string | undefined;
-	partner_key_id: number | undefined;
-	payment_name: string;
-	payment_type:
-		| 'credit_card'
-		| 'paypal_direct'
-		| 'paypal'
-		| 'emergent-paywall'
-		| 'brazil-tef'
-		| string;
-	payment_card_display_brand: string | null;
-	payment_country_name: string;
-	payment_country_code: string | null;
-	stored_details_id: string | null;
-	pending_transfer: boolean;
-	product_id: number | string;
-	product_name: string;
-	product_slug: string;
-	product_type: string;
-	product_display_price: string;
-	price_integer: number;
-	total_refund_amount: number | undefined;
-	total_refund_currency: string;
-	total_refund_integer: number;
-	total_refund_text: string;
-	refund_amount: number;
-	refund_integer: number;
-	refund_text: string;
-	refund_currency_symbol: string;
-	refund_options: RefundOptions | null;
-	refund_period_in_days: number;
-	regular_price_text: string;
-	regular_price_integer: number;
-	renew_date: string;
-	sale_amount: number | undefined;
-	sale_amount_integer: number | undefined;
-	blog_id: number | string;
-	blogname: string;
-	subscribed_date: string;
-	subscription_status: 'active' | 'inactive';
-	tag_line: string;
-	tax_amount: number | string | undefined;
-	tax_text: string | undefined;
-	renewal_price_tier_usage_quantity: number | undefined | null;
-	user_id: number | string;
-	auto_renew: '1' | '0' | null;
-	payment_card_id: number | string | undefined;
-	payment_card_type: string | undefined;
-	payment_card_processor: string | undefined;
-	payment_details: string | undefined;
-	payment_expiry: string | undefined;
-}
-
-export type RawPurchaseCreditCard = RawPurchase & {
-	payment_type: 'credit_card';
-	payment_card_type: string;
-	payment_card_display_brand: string | null;
-	payment_card_processor: string;
-	payment_details: string | number;
-	payment_expiry: string;
-};
+export type { RawPurchase } from '@automattic/api-core';
 
 export interface RefundOptions {
 	to_product_id: number;

package/src/queries/use-launchpad.ts

@@ -106,12 +106,12 @@ export function sortLaunchpadTasksByCompletionStatus( response: LaunchpadRespons
 	return response;
 }
 
-const defaultSuccessCallback = ( response: LaunchpadResponse ) => {
+export function defaultSuccessCallback( response: LaunchpadResponse ) {
 	const tasks = response.checklist || [];
 	response.checklist = tasks.map( addOrderToTask );
 
 	return response;
-};
+}
 
 type SiteSlug = string | number | null;
 

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

@@ -106,6 +106,7 @@ export interface DomainData {
 	has_private_registration: boolean;
 	is_pending_icann_verification: boolean;
 	is_icann_verification_suspended: boolean;
+	is_root_domain_registered_with_automattic: boolean;
 	manual_transfer_required: boolean;
 	registrar: string;
 	domain_locking_available: boolean;

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

@@ -1,9 +1,10 @@
 import { useQuery } from '@tanstack/react-query';
 import wpcomRequest from 'wpcom-proxy-request';
+import { SiteIntent } from '../onboard';
 
 export function useSiteIntent( siteId: string | number | undefined ) {
 	return useQuery< {
-		site_intent: '';
+		site_intent: SiteIntent;
 	} >( {
 		queryKey: [ 'site-intent', siteId ],
 		queryFn: async () =>

package/src/reader/mutations/use-site-subscribe-mutation.ts

@@ -10,7 +10,7 @@ type SubscribeParams = {
 	url?: string;
 	doNotInvalidateSiteSubscriptions?: boolean;
 	onSuccess?: () => void;
-	onError?: () => void;
+	onError?: ( e: Error ) => void;
 	subscriptionId?: number;
 	resubscribed?: boolean;
 };
@@ -144,7 +144,7 @@ const useSiteSubscribeMutation = () => {
 				);
 			}
 
-			params.onError?.();
+			params.onError?.( _error );
 		},
 		onSettled: ( _data, _error, params: SubscribeParams ) => {
 			if ( params.doNotInvalidateSiteSubscriptions !== true ) {

package/src/reader/mutations/use-site-unsubscribe-mutation.ts

@@ -13,6 +13,8 @@ type UnsubscribeParams = {
 	blog_id?: number | string;
 	doNotInvalidateSiteSubscriptions?: boolean;
 	emailId?: string;
+	onSuccess?: () => void;
+	onError?: ( e: Error ) => void;
 };
 
 type UnsubscribeResponse = {
@@ -201,6 +203,8 @@ const useSiteUnsubscribeMutation = () => {
 					context.previousSiteSubscriptionDetailsByBlogId
 				);
 			}
+
+			params.onError?.( _error );
 		},
 		onSettled: ( _data, _error, params ) => {
 			if ( params.doNotInvalidateSiteSubscriptions !== true ) {
@@ -227,6 +231,9 @@ const useSiteUnsubscribeMutation = () => {
 				queryKey: buildSiteSubscriptionDetailsQueryKey( params.subscriptionId, isLoggedIn, userId ),
 			} );
 		},
+		onSuccess: ( data, params ) => {
+			params.onSuccess?.();
+		},
 	} );
 };
 

package/src/reader/queries/test/use-read-feed-search-query.tsx

@@ -11,7 +11,7 @@ jest.mock( 'wpcom-proxy-request', () => jest.fn() );
 
 describe( 'useReadFeedSearchQuery', () => {
 	beforeEach( () => {
-		( wpcomRequest as jest.MockedFunction< typeof wpcomRequest > ).mockResolvedValue( {
+		jest.mocked( wpcomRequest ).mockResolvedValue( {
 			algorithm: 'example_algorithm',
 			feeds: [],
 			next_page: 'example_next_page',

package/src/site/actions.ts

@@ -1,7 +1,7 @@
-import { DEFAULT_GLOBAL_STYLES_VARIATION_SLUG } from '@automattic/global-styles/src/constants';
 import { __ } from '@wordpress/i18n';
 import { SiteGoal } from '../onboard';
 import { wpcomRequest } from '../wpcom-request-controls';
+import { DEFAULT_GLOBAL_STYLES_VARIATION_SLUG } from './constants';
 import {
 	SiteLaunchError,
 	AtomicTransferError,

package/src/site/constants.ts

@@ -1,2 +1,3 @@
 export const STORE_KEY = 'automattic/site';
 export const getPlaceholderSiteID = () => '226011606'; // assemblerdemo
+export const DEFAULT_GLOBAL_STYLES_VARIATION_SLUG = 'default';

package/src/site/test/selectors.ts

@@ -382,7 +382,6 @@ describe( 'getSiteOptions', () => {
 			delete_users: true,
 			remove_users: true,
 			own_site: true,
-			view_hosting: true,
 			view_stats: true,
 			activate_plugins: true,
 		},