@automattic/data-stores 3.1.2 → 3.2.0

package/src/help-center/actions.ts

@@ -12,15 +12,46 @@ import type {
 	HelpCenterSelect,
 	HelpCenterShowOptions,
 } from './types';
-import type { SupportInteraction } from '@automattic/odie-client/src/types';
 import type { Location } from 'history';
 
-export function setCurrentSupportInteraction( supportInteraction: SupportInteraction ) {
-	return {
-		type: 'HELP_CENTER_SET_CURRENT_SUPPORT_INTERACTION',
-		supportInteraction,
-	} as const;
-}
+/**
+ * Save the open state of the help center to the remote user preferences.
+ * @param isShown - Whether the help center is shown.
+ * @param isMinimized - Whether the help center is minimized.
+ */
+export const saveOpenState = ( isShown: boolean | undefined, isMinimized: boolean | undefined ) => {
+	const saveState: Record< string, boolean | null > = {};
+
+	if ( typeof isShown === 'boolean' ) {
+		saveState.help_center_open = isShown;
+		if ( ! isShown ) {
+			// Delete the remote version of the navigation history when closing the help center
+			saveState.help_center_router_history = null;
+		}
+	}
+
+	if ( typeof isMinimized === 'boolean' ) {
+		saveState.help_center_minimized = isMinimized;
+	}
+
+	if ( canAccessWpcomApis() ) {
+		// Use the promise version to do that action without waiting for the result.
+		wpcomRequestPromise( {
+			path: '/me/preferences',
+			apiNamespace: 'wpcom/v2',
+			method: 'PUT',
+			body: { calypso_preferences: saveState },
+		} ).catch( () => {} );
+	} else {
+		// Use the promise version to do that action without waiting for the result.
+		apiFetchPromise( {
+			global: true,
+			path: '/help-center/open-state',
+			method: 'PUT',
+			data: saveState,
+		} as APIFetchOptions ).catch( () => {} );
+	}
+};
 
 export function setHelpCenterRouterHistory(
 	history: { entries: Location[]; index: number } | undefined
@@ -55,11 +86,13 @@ export const setOdieBotNameSlug = ( odieBotNameSlug: string ) =>
 		odieBotNameSlug,
 	} ) as const;
 
-export const setIsMinimized = ( minimized: boolean ) =>
-	( {
+export const setIsMinimized = function* ( minimized: boolean ) {
+	yield saveOpenState( undefined, minimized );
+	return {
 		type: 'HELP_CENTER_SET_MINIMIZED',
 		minimized,
-	} ) as const;
+	} as const;
+};
 
 export const setIsChatLoaded = ( isChatLoaded: boolean ) =>
 	( {
@@ -79,6 +112,21 @@ export const setZendeskClientId = ( zendeskClientId: string ) =>
 		zendeskClientId,
 	} ) as const;
 
+export const setZendeskConnectionStatus = (
+	connectionStatus: 'disconnected' | 'reconnecting' | 'connected'
+) =>
+	( {
+		type: 'HELP_CENTER_SET_ZENDESK_CONNECTION_STATUS',
+		connectionStatus,
+	} ) as const;
+
+export const setSupportTypingStatus = ( conversationId: string, isTyping: false ) =>
+	( {
+		type: 'HELP_CENTER_SET_TYPING_STATUS',
+		conversationId,
+		isTyping,
+	} ) as const;
+
 export const setShowMessagingLauncher = ( show: boolean ) =>
 	( {
 		type: 'HELP_CENTER_SET_SHOW_MESSAGING_LAUNCHER',
@@ -103,9 +151,9 @@ export const setContextTerm = ( contextTerm: string ) =>
 		contextTerm,
 	} ) as const;
 
-export const setAllowPremiumSupport = ( allow: boolean ) =>
+export const setHasPremiumSupport = ( allow: boolean ) =>
 	( {
-		type: 'HELP_CENTER_SET_ALLOW_PREMIUM_SUPPORT',
+		type: 'HELP_CENTER_SET_HAS_PREMIUM_SUPPORT',
 		allow,
 	} ) as const;
 
@@ -116,13 +164,24 @@ export const setHelpCenterOptions = ( options: HelpCenterOptions ) => ( {
 
 export const setShowHelpCenter = function* (
 	show: boolean,
-	allowPremiumSupport = false,
-	options: HelpCenterShowOptions = { hideBackButton: false, contextTerm: '' }
+	options: HelpCenterShowOptions = {
+		hasPremiumSupport: false,
+		hideBackButton: false,
+		contextTerm: '',
+	},
+	/**
+	 * When the Help Center is minimized and someone clicks the (?) toggle button, we should maximize it.
+	 * But this means ignoring the `show=false` value the button will send. The problem is we'll also ignore the `show=false` when the close (x) buttons is clicked too.
+	 * `forceClose` listens to the show value always. Which the (x) button sets to true.
+	 */
+	forceClose = false
 ): Generator< unknown, { type: 'HELP_CENTER_SET_SHOW'; show: boolean }, unknown > {
-	const isMinimized = ( select( STORE_KEY ) as HelpCenterSelect ).getIsMinimized();
+	let isMinimized = ( select( STORE_KEY ) as HelpCenterSelect ).getIsMinimized();
 
-	if ( ! show && isMinimized ) {
+	// Opening or closing the Help Center should reset the minimized state.
+	if ( ! show && ! forceClose && isMinimized ) {
 		yield setIsMinimized( false );
+		isMinimized = false;
 
 		return {
 			type: 'HELP_CENTER_SET_SHOW',
@@ -131,37 +190,12 @@ export const setShowHelpCenter = function* (
 	}
 
 	if ( ! isE2ETest() ) {
-		if ( canAccessWpcomApis() ) {
-			// Use the promise version to do that action without waiting for the result.
-			wpcomRequestPromise( {
-				path: '/me/preferences',
-				apiNamespace: 'wpcom/v2',
-				method: 'PUT',
-				body: {
-					calypso_preferences: {
-						help_center_open: show,
-						// Delete the remote version of the navigation history when closing the help center
-						...( ! show ? { help_center_router_history: null } : {} ),
-					},
-				},
-			} ).catch( () => {} );
-		} else {
-			// Use the promise version to do that action without waiting for the result.
-			apiFetchPromise( {
-				global: true,
-				path: '/help-center/open-state',
-				method: 'PUT',
-				data: {
-					help_center_open: show, // Delete the remote version of the navigation history when closing the help center
-					...( ! show ? { help_center_router_history: null } : {} ),
-				},
-			} as APIFetchOptions ).catch( () => {} );
-		}
+		saveOpenState( show, isMinimized );
 	}
 
 	if ( ! show ) {
 		yield setNavigateToRoute( undefined );
-		// Reset the local navigation history when closing the help center
+		// Reset the local navigation history when closing the help center.
 		yield setHelpCenterRouterHistory( undefined );
 	} else {
 		yield setShowMessagingWidget( false );
@@ -170,11 +204,11 @@ export const setShowHelpCenter = function* (
 	yield setContextTerm( options?.contextTerm || '' );
 	yield setIsMinimized( false );
 
-	if ( allowPremiumSupport ) {
-		yield setAllowPremiumSupport( true );
+	if ( options?.hasPremiumSupport ) {
+		yield setHasPremiumSupport( true );
 	}
 
-	if ( options?.hideBackButton ) {
+	if ( options ) {
 		yield setHelpCenterOptions( options );
 	}
 
@@ -260,16 +294,17 @@ export type HelpCenterAction =
 			| typeof setUserDeclaredSite
 			| typeof setUserDeclaredSiteUrl
 			| typeof setUnreadCount
-			| typeof setIsMinimized
 			| typeof setHelpCenterRouterHistory
 			| typeof setIsChatLoaded
 			| typeof setAreSoundNotificationsEnabled
 			| typeof setZendeskClientId
+			| typeof setSupportTypingStatus
+			| typeof setZendeskConnectionStatus
 			| typeof setNavigateToRoute
 			| typeof setOdieInitialPromptText
 			| typeof setOdieBotNameSlug
-			| typeof setCurrentSupportInteraction
-			| typeof setAllowPremiumSupport
+			| typeof setHasPremiumSupport
 			| typeof setHelpCenterOptions
 	  >
-	| GeneratorReturnType< typeof setShowHelpCenter >;
+	| GeneratorReturnType< typeof setShowHelpCenter >
+	| GeneratorReturnType< typeof setIsMinimized >;

package/src/help-center/reducer.ts

@@ -2,7 +2,6 @@ import { combineReducers } from '@wordpress/data';
 import { SiteDetails } from '../site';
 import type { HelpCenterAction } from './actions';
 import type { HelpCenterOptions } from './types';
-import type { SupportInteraction } from '@automattic/odie-client/src/types';
 import type { Location } from 'history';
 import type { Reducer } from 'redux';
 
@@ -14,6 +13,28 @@ const showHelpCenter: Reducer< boolean | undefined, HelpCenterAction > = ( state
 	return state;
 };
 
+const typingConversationStatus: Reducer<
+	Record< string, boolean > | undefined,
+	HelpCenterAction
+> = ( state = undefined, action ) => {
+	switch ( action.type ) {
+		case 'HELP_CENTER_SET_TYPING_STATUS':
+			return { ...state, [ action.conversationId ]: action.isTyping };
+	}
+	return state;
+};
+
+const zendeskConnectionStatus: Reducer<
+	'disconnected' | 'reconnecting' | 'connected' | undefined,
+	HelpCenterAction
+> = ( state = undefined, action ) => {
+	switch ( action.type ) {
+		case 'HELP_CENTER_SET_ZENDESK_CONNECTION_STATUS':
+			return action.connectionStatus;
+	}
+	return state;
+};
+
 const showMessagingLauncher: Reducer< boolean | undefined, HelpCenterAction > = (
 	state,
 	action
@@ -44,16 +65,6 @@ const showMessagingWidget: Reducer< boolean | undefined, HelpCenterAction > = (
 	return state;
 };
 
-const currentSupportInteraction: Reducer< SupportInteraction | undefined, HelpCenterAction > = (
-	state,
-	action
-) => {
-	if ( action.type === 'HELP_CENTER_SET_CURRENT_SUPPORT_INTERACTION' ) {
-		return action.supportInteraction;
-	}
-	return state;
-};
-
 const isMinimized: Reducer< boolean, HelpCenterAction > = ( state = false, action ) => {
 	switch ( action.type ) {
 		case 'HELP_CENTER_SET_MINIMIZED':
@@ -161,9 +172,9 @@ const odieBotNameSlug: Reducer< string | undefined, HelpCenterAction > = ( state
 	return state;
 };
 
-const allowPremiumSupport: Reducer< boolean, HelpCenterAction > = ( state = false, action ) => {
+const hasPremiumSupport: Reducer< boolean, HelpCenterAction > = ( state = false, action ) => {
 	switch ( action.type ) {
-		case 'HELP_CENTER_SET_ALLOW_PREMIUM_SUPPORT':
+		case 'HELP_CENTER_SET_HAS_PREMIUM_SUPPORT':
 			return action.allow;
 	}
 	return state;
@@ -187,16 +198,17 @@ const helpCenterOptions: Reducer< HelpCenterOptions, HelpCenterAction > = (
 };
 
 const reducer = combineReducers( {
-	currentSupportInteraction,
 	showHelpCenter,
 	showMessagingLauncher,
 	showMessagingWidget,
+	zendeskConnectionStatus,
 	subject,
 	message,
 	userDeclaredSite,
 	userDeclaredSiteUrl,
 	isMinimized,
 	isChatLoaded,
+	typingConversationStatus,
 	areSoundNotificationsEnabled,
 	zendeskClientId,
 	unreadCount,
@@ -204,7 +216,7 @@ const reducer = combineReducers( {
 	odieInitialPromptText,
 	odieBotNameSlug,
 	helpCenterRouterHistory,
-	allowPremiumSupport,
+	hasPremiumSupport,
 	contextTerm,
 	helpCenterOptions,
 } );

package/src/help-center/resolvers.ts

@@ -1,19 +1,24 @@
 import { apiFetch } from '@wordpress/data-controls';
 import { canAccessWpcomApis } from 'wpcom-proxy-request';
 import { wpcomRequest } from '../wpcom-request-controls';
-import { setHelpCenterRouterHistory } from './actions';
+import { setHelpCenterRouterHistory, setIsMinimized } from './actions';
 import type { APIFetchOptions } from './types';
 import type { Location } from 'history';
 
+type Preferences = {
+	calypso_preferences: {
+		help_center_open: boolean;
+		help_center_minimized: boolean;
+		help_center_router_history: {
+			entries: Location[];
+			index: number;
+		};
+	};
+};
+
 export function* isHelpCenterShown() {
 	try {
-		const preferences: {
-			help_center_open: boolean;
-			help_center_router_history: {
-				entries: Location[];
-				index: number;
-			};
-		} = canAccessWpcomApis()
+		const { calypso_preferences: preferences }: Preferences = canAccessWpcomApis()
 			? yield wpcomRequest( {
 					path: '/me/preferences',
 					apiNamespace: 'wpcom/v2',
@@ -27,6 +32,8 @@ export function* isHelpCenterShown() {
 			yield setHelpCenterRouterHistory( preferences.help_center_router_history );
 		}
 
+		yield setIsMinimized( preferences.help_center_minimized );
+
 		// We only want to auto-open, we don't want to auto-close (and potentially overrule the user's action).
 		if ( preferences.help_center_open ) {
 			return {

package/src/help-center/selectors.ts

@@ -8,6 +8,7 @@ export const getMessage = ( state: State ) => state.message;
 export const getUserDeclaredSiteUrl = ( state: State ) => state.userDeclaredSiteUrl;
 export const getUserDeclaredSite = ( state: State ) => state.userDeclaredSite;
 export const getUnreadCount = ( state: State ) => state.unreadCount;
+export const getZendeskConnectionStatus = ( state: State ) => state.zendeskConnectionStatus;
 export const getIsMinimized = ( state: State ) => state.isMinimized;
 export const getIsChatLoaded = ( state: State ) => state.isChatLoaded;
 export const getAreSoundNotificationsEnabled = ( state: State ) =>
@@ -17,7 +18,8 @@ export const getHelpCenterRouterHistory = ( state: State ) => state.helpCenterRo
 export const getNavigateToRoute = ( state: State ) => state.navigateToRoute;
 export const getOdieInitialPromptText = ( state: State ) => state.odieInitialPromptText;
 export const getOdieBotNameSlug = ( state: State ) => state.odieBotNameSlug;
-export const getCurrentSupportInteraction = ( state: State ) => state.currentSupportInteraction;
-export const getAllowPremiumSupport = ( state: State ) => state.allowPremiumSupport;
+export const getHasPremiumSupport = ( state: State ) => state.hasPremiumSupport;
 export const getHelpCenterOptions = ( state: State ) => state.helpCenterOptions;
 export const getContextTerm = ( state: State ) => state.contextTerm;
+export const getSupportTypingStatus = ( state: State, conversationId: string ) =>
+	state.typingConversationStatus?.[ conversationId ];

package/src/help-center/types.ts

@@ -10,6 +10,7 @@ export type Location = {
 	key?: string;
 };
 export interface HelpCenterShowOptions {
+	hasPremiumSupport: boolean;
 	hideBackButton: boolean;
 	contextTerm: string;
 }

package/src/index.ts

@@ -1,5 +1,4 @@
 import * as AddOns from './add-ons';
-import * as DomainSuggestions from './domain-suggestions';
 import * as HelpCenter from './help-center';
 import * as Onboard from './onboard';
 import * as Plans from './plans';
@@ -19,7 +18,6 @@ export * from './starter-designs-queries';
 export * from './site/types';
 export * from './templates';
 export * from './onboard/types';
-export * from './domain-suggestions/types';
 export * from './plans/types';
 export * from './theme';
 export * from './user/types';
@@ -38,7 +36,6 @@ const { SubscriptionManager } = Reader;
 export {
 	AddOns,
 	User,
-	DomainSuggestions,
 	HelpCenter,
 	Site,
 	Plans,

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';
@@ -363,6 +363,16 @@ export const setPartnerBundle = ( partnerBundle: string | null ) => ( {
 	partnerBundle,
 } );
 
+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<
 	| typeof addFeature
 	| typeof removeFeature
@@ -422,4 +432,6 @@ export type OnboardAction = ReturnType<
 	| typeof setPaidSubscribers
 	| typeof setPartnerBundle
 	| typeof setSignupDomainOrigin
+	| typeof setGardenName
+	| typeof setGardenPartnerName
 >;

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';
@@ -612,6 +612,29 @@ const signupDomainOrigin: Reducer< string | undefined, OnboardAction > = (
 	return state;
 };
 
+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_GARDEN_PARTNER_NAME' ) {
+		return action.gardenPartnerName;
+	}
+	if ( action.type === 'RESET_ONBOARD_STORE' ) {
+		return null;
+	}
+	return state;
+};
+
 const reducer = combineReducers( {
 	domain,
 	domainCartItem,
@@ -660,6 +683,8 @@ const reducer = combineReducers( {
 	paidSubscribers,
 	partnerBundle,
 	signupDomainOrigin,
+	gardenName,
+	gardenPartnerName,
 } );
 
 export type State = ReturnType< typeof reducer >;

package/src/onboard/selectors.ts

@@ -81,3 +81,5 @@ 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 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/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 ),
@@ -117,26 +112,20 @@ export function createPurchaseObject( purchase: RawPurchase | RawPurchaseCreditC
 		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 ( purchase.purchaser_id ) {
-		object.purchaserId = Number( purchase.purchaser_id );
-	}
-
 	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 ?? '',
 		};
 	}
 
@@ -147,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 [];
 	}