Allow purchase.payment to be undefined

Author: sirbrillig

client/lib/purchases/index.ts

@@ -512,7 +512,7 @@ export function isOneTimePurchase( purchase: Purchase ) {
 }
 
 export function isPaidWithPaypal( purchase: Purchase ) {
-	return 'paypal' === purchase.payment.type;
+	return 'paypal' === purchase.payment?.type;
 }
 
 export function isPaidWithCredits( purchase: Purchase ) {
@@ -764,15 +764,15 @@ export function isSubscription( purchase: Purchase ): boolean {
 }
 
 export function isPaidWithCreditCard( purchase: Purchase ) {
-	return 'credit_card' === purchase.payment.type && hasCreditCardData( purchase );
+	return 'credit_card' === purchase.payment?.type && hasCreditCardData( purchase );
 }
 
 export function isPaidWithPayPalDirect( purchase: Purchase ) {
-	return 'paypal_direct' === purchase.payment.type && purchase.payment.expiryDate;
+	return 'paypal_direct' === purchase.payment?.type && purchase.payment.expiryDate;
 }
 
 function hasCreditCardData( purchase: Purchase ) {
-	return Boolean( purchase.payment.creditCard?.expiryDate );
+	return Boolean( purchase.payment?.creditCard?.expiryDate );
 }
 
 export function shouldAddPaymentSourceInsteadOfRenewingNow( purchase: Purchase ) {
@@ -836,7 +836,7 @@ export function shouldRenderExpiringCreditCard( purchase: Purchase ) {
 }
 
 export function monthsUntilCardExpires( purchase: Purchase ) {
-	const creditCard = purchase.payment.creditCard;
+	const creditCard = purchase.payment?.creditCard;
 	const expiry = moment( creditCard?.expiryDate, 'MM/YY' );
 	return expiry.diff( moment(), 'months' );
 }
@@ -857,16 +857,16 @@ export function subscribedWithinPastWeek( purchase: Purchase ) {
  */
 export function paymentLogoType( purchase: Purchase ): string | null | undefined {
 	if ( isPaidWithCreditCard( purchase ) ) {
-		return purchase.payment.creditCard?.displayBrand
+		return purchase.payment?.creditCard?.displayBrand
 			? purchase.payment.creditCard?.displayBrand
-			: purchase.payment.creditCard?.type;
+			: purchase.payment?.creditCard?.type;
 	}
 
 	if ( isPaidWithPayPalDirect( purchase ) ) {
 		return 'placeholder';
 	}
 
-	return purchase.payment.type || null;
+	return purchase.payment?.type || null;
 }
 
 export function isAgencyPartnerType( partnerType: string ) {

client/me/purchases/purchases-list-in-dataviews/purchases-data-field.tsx

@@ -176,15 +176,15 @@ export function getPurchasesFieldDefinitions( {
 				operators: [ 'is' as Operator ],
 			},
 			getValue: ( { item }: { item: Purchases.Purchase } ) => {
-				return item.payment.storedDetailsId ?? '';
+				return item.payment?.storedDetailsId ?? '';
 			},
 			render: ( { item }: { item: Purchases.Purchase } ) => {
 				let isBackupMethodAvailable = false;
 
 				if ( backupPaymentMethods ) {
 					const backupPaymentMethodsWithoutCurrentPurchase = backupPaymentMethods.filter(
 						// A payment method is only a back up if it isn't already assigned to the current purchase
-						( paymentMethod ) => item.payment.storedDetailsId !== paymentMethod.stored_details_id
+						( paymentMethod ) => item.payment?.storedDetailsId !== paymentMethod.stored_details_id
 					);
 
 					isBackupMethodAvailable = backupPaymentMethodsWithoutCurrentPurchase.length >= 1;

client/me/purchases/utils.ts

@@ -27,7 +27,7 @@ export function canEditPaymentDetails( purchase: Purchase ): boolean {
 }
 
 export function getChangePaymentMethodPath( siteSlug: string, purchase: Purchase ): string {
-	if ( isPaidWithCreditCard( purchase ) && purchase.payment.creditCard ) {
+	if ( isPaidWithCreditCard( purchase ) && purchase.payment?.creditCard ) {
 		return changePaymentMethod( siteSlug, purchase.id, purchase.payment.creditCard.id );
 	}
 

packages/data-stores/src/purchases/types.ts

@@ -44,7 +44,7 @@ export interface Purchase {
 	partnerName: string | undefined;
 	partnerSlug: string | undefined;
 	partnerType: string | undefined;
-	payment: PurchasePayment | PurchasePaymentWithCreditCard | PurchasePaymentWithPayPal;
+	payment: PurchasePayment | PurchasePaymentWithCreditCard | PurchasePaymentWithPayPal | undefined;
 	pendingTransfer: boolean;
 	priceText: string;
 	priceTierList?: Array< PurchasePriceTier >;