seperate out unique array creation into a new const to make the code …

…more readable

lowercase the product title in the cancallation confirmation page title (also means that we can remove a property from the producttype object)

client/components/mma/accountoverview/AccountOverview.tsx

@@ -108,35 +108,33 @@ const AccountOverviewPage = ({ isFromApp }: IsFromAppProps) => {
 			b.subscription.start.localeCompare(a.subscription.start),
 	);
 
-	const productCategories = [
-		...new Set(
-			[...allActiveProductDetails, ...allCancelledProductDetails].map(
-				(product: ProductDetail | CancelledProductDetail) => {
-					if (product.mmaCategory === 'recurringSupport') {
-						return 'subscriptions';
-					}
-					return product.mmaCategory;
-				},
-			),
-		),
-	];
+	const allProductCategories = [
+		...allActiveProductDetails,
+		...allCancelledProductDetails,
+	].map((product: ProductDetail | CancelledProductDetail) => {
+		if (product.mmaCategory === 'recurringSupport') {
+			return 'subscriptions';
+		}
+		return product.mmaCategory;
+	});
+	const uniqueProductCategories = [...new Set(allProductCategories)];
 	const appSubscriptions = mpapiResponse.subscriptions.filter(
 		isValidAppSubscription,
 	);
 
 	if (
 		featureSwitches.appSubscriptions &&
 		appSubscriptions.length > 0 &&
-		!productCategories.includes('subscriptions')
+		!uniqueProductCategories.includes('subscriptions')
 	) {
-		productCategories.push('subscriptions');
+		uniqueProductCategories.push('subscriptions');
 	}
 
 	if (
 		singleContributions.length > 0 &&
-		!productCategories.includes('subscriptions')
+		!uniqueProductCategories.includes('subscriptions')
 	) {
-		productCategories.push('subscriptions');
+		uniqueProductCategories.push('subscriptions');
 	}
 
 	if (
@@ -188,7 +186,7 @@ const AccountOverviewPage = ({ isFromApp }: IsFromAppProps) => {
 				productDetails={allActiveProductDetails}
 				isFromApp={isFromApp}
 			/>
-			{productCategories.map((category) => {
+			{uniqueProductCategories.map((category) => {
 				const groupedProductType = GROUPED_PRODUCT_TYPES[category];
 				const activeProductsInCategory = allActiveProductDetails.filter(
 					(activeProduct) =>

client/components/mma/cancel/CancellationSummary.tsx

@@ -36,10 +36,9 @@ const actuallyCancelled = (
 						`,
 					]}
 				>
-					{productType.cancellation?.alternateSummaryHeading ||
-						`Your ${productType.friendlyName(
-							cancelledProductDetail,
-						)} is cancelled`}
+					{`Your ${productType.friendlyName(
+						cancelledProductDetail,
+					)} is cancelled`}
 				</Heading>
 				{productType.cancellation &&
 					!productType.cancellation.shouldHideSummaryMainPara && (

cypress/tests/mocked/parallel-2/cancelSupporterPlus.cy.ts

@@ -123,7 +123,7 @@ describe('Cancel Supporter Plus', () => {
 		cy.wait('@get_cancelled_product');
 
 		cy.findByRole('heading', {
-			name: 'Your All-access digital subscription is cancelled',
+			name: 'Your all-access digital subscription is cancelled',
 		});
 
 		cy.get('@get_cancellation_date.all').should('have.length', 0);

shared/productTypes.ts

@@ -91,7 +91,6 @@ interface CancellationFlowProperties {
 	startPageOfferEffectiveDateOptions?: true;
 	hideReasonTitlePrefix?: true;
 	alternateSummaryMainPara?: string;
-	alternateSummaryHeading?: string;
 	shouldHideSummaryMainPara?: true;
 	summaryReasonSpecificPara: (
 		reasonId: OptionalCancellationReasonId,
@@ -636,8 +635,6 @@ export const PRODUCT_TYPES: { [productKey in ProductTypeKeys]: ProductType } = {
 		cancellation: {
 			alternateSummaryMainPara:
 				"This is immediate and you will not be charged again. If you've cancelled within the first 14 days, we'll send you a full refund.",
-			alternateSummaryHeading:
-				'Your All-access digital subscription is cancelled',
 			linkOnProductPage: true,
 			reasons: shuffledSupporterPlusCancellationReasons,
 			sfCaseProduct: 'Supporter Plus',