Merge branch 'main' into pd/landing-page-abtest-benefit-reset

guardian · Jan 21, 2025 · 362cfd5 · 362cfd5
2 parents cddb4ff + 8ba7a37
commit 362cfd5
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 44 deletions.
diff --git a/support-e2e/tests/test/checkout.ts b/support-e2e/tests/test/checkout.ts
@@ -26,7 +26,6 @@ const setUserDetailsForProduct = async (
 ) => {
 	switch (product) {
 		case 'SupporterPlus':
-		case 'GuardianLight':
 		case 'GuardianAdLite':
 			await setTestUserRequiredDetails(page, email(), firstName(), lastName());
 

diff --git a/support-frontend/assets/helpers/forms/paymentIntegrations/readerRevenueApis.ts b/support-frontend/assets/helpers/forms/paymentIntegrations/readerRevenueApis.ts
@@ -69,11 +69,6 @@ export type TierThree = {
 	fulfilmentOptions: FulfilmentOptions;
 	productOptions: ProductOptions;
 };
-export type GuardianLight = {
-	productType: 'GuardianLight';
-	currency: string;
-	billingPeriod: BillingPeriod;
-};
 export type GuardianAdLite = {
 	productType: 'GuardianAdLite';
 	currency: string;
@@ -106,7 +101,6 @@ export type SubscriptionProductFields =
 	| PaperSubscription
 	| GuardianWeeklySubscription
 	| TierThree
-	| GuardianLight
 	| GuardianAdLite;
 type ProductFields = RegularContribution | SubscriptionProductFields;
 type RegularPayPalPaymentFields = {

diff --git a/support-frontend/assets/helpers/productCatalog.ts b/support-frontend/assets/helpers/productCatalog.ts
@@ -205,16 +205,6 @@ export const productCatalogDescription: Record<
 	ActiveProductKey,
 	ProductDescription
 > = {
-	GuardianLight: {
-		label: 'Guardian Ad-Lite',
-		thankyouMessage: `Your valued support powers our journalism${' '}`,
-		ratePlans: {
-			Monthly: {
-				billingPeriod: 'Monthly',
-			},
-		},
-		benefits: guardianAdLiteBenefits,
-	},
 	GuardianAdLite: {
 		label: 'Guardian Ad-Lite',
 		thankyouMessage: `Your valued support powers our journalism${' '}`,

diff --git a/support-frontend/assets/pages/[countryGroupId]/checkout/helpers/getProductFields.ts b/support-frontend/assets/pages/[countryGroupId]/checkout/helpers/getProductFields.ts
@@ -45,13 +45,6 @@ export const getProductFields = ({
 	 * We might be able to defer this to the backend.
 	 */
 	switch (productKey) {
-		case 'GuardianLight':
-			return {
-				productType: 'GuardianLight',
-				currency: currencyKey,
-				billingPeriod: ratePlanDescription.billingPeriod,
-			};
-
 		case 'GuardianAdLite':
 			return {
 				productType: 'GuardianAdLite',

diff --git a/support-frontend/assets/pages/[countryGroupId]/components/checkoutComponent.tsx b/support-frontend/assets/pages/[countryGroupId]/components/checkoutComponent.tsx
@@ -669,7 +669,7 @@ export function CheckoutComponent({
 
 	const returnParam = returnLink ? '?returnAddress=' + returnLink : '';
 	const returnToLandingPage =
-		productKey === 'GuardianLight' || productKey === 'GuardianAdLite'
+		productKey === 'GuardianAdLite'
 			? `/guardian-ad-lite${returnParam}`
 			: `/${geoId}/contribute`;
 
@@ -766,12 +766,7 @@ export function CheckoutComponent({
 						headerButton={
 							<BackButton
 								path={returnToLandingPage}
-								buttonText={
-									productKey === 'GuardianLight' ||
-									productKey === 'GuardianAdLite'
-										? 'Back'
-										: 'Change'
-								}
+								buttonText={productKey === 'GuardianAdLite' ? 'Back' : 'Change'}
 							/>
 						}
 					/>

diff --git a/support-frontend/assets/pages/[countryGroupId]/components/thankYouComponent.tsx b/support-frontend/assets/pages/[countryGroupId]/components/thankYouComponent.tsx
@@ -206,8 +206,7 @@ export function ThankYouComponent({
 		return <div>Unable to find contribution type {contributionType}</div>;
 	}
 
-	const isGuardianAdLite =
-		productKey === 'GuardianLight' || productKey === 'GuardianAdLite';
+	const isGuardianAdLite = productKey === 'GuardianAdLite';
 	const isOneOffPayPal = order.paymentMethod === 'PayPal' && isOneOff;
 	const isSupporterPlus = productKey === 'SupporterPlus';
 	const isTier3 = productKey === 'TierThree';

diff --git a/support-frontend/assets/pages/[countryGroupId]/events/events.tsx b/support-frontend/assets/pages/[countryGroupId]/events/events.tsx
@@ -104,10 +104,6 @@ export function Events({ geoId }: Props) {
 
 	const pageviewId = getPageViewId();
 
-	if (!pageviewId) {
-		logException('pageviewId not available on event listing');
-	}
-
 	const hashUrlSearchParams = new URLSearchParams({
 		'p[meta_page_view_id]': pageviewId,
 		'p[meta_region_id]': geoId,
@@ -124,6 +120,13 @@ export function Events({ geoId }: Props) {
 		hashUrlSearchParams.toString(),
 	)}`;
 
+	if (
+		!hashUrlSearchParams.has('p[meta_page_view_id]') ||
+		hashUrlSearchParams.get('p[meta_page_view_id]') !== pageviewId
+	) {
+		logException('hashUrlSearchParams pageviewId mismatch');
+	}
+
 	const embedUrl = `${ticketTailorUrl}/${eventId}/book${presetDataUrl}`;
 
 	return (

diff --git a/support-frontend/assets/pages/supporter-plus-thank-you/components/thankYouHeader/heading.tsx b/support-frontend/assets/pages/supporter-plus-thank-you/components/thankYouHeader/heading.tsx
@@ -197,8 +197,7 @@ function Heading({
 	promotion,
 }: HeadingProps): JSX.Element {
 	const isPending = paymentStatus === 'pending';
-	const isGuardianAdLite =
-		productKey === 'GuardianLight' || productKey === 'GuardianAdLite';
+	const isGuardianAdLite = productKey === 'GuardianAdLite';
 	const isTier3 = productKey === 'TierThree';
 	const maybeNameAndTrailingSpace: string =
 		name && name.length < 10 ? `${name} ` : '';

diff --git a/...t-frontend/assets/pages/supporter-plus-thank-you/components/thankYouHeader/subheading.tsx b/...t-frontend/assets/pages/supporter-plus-thank-you/components/thankYouHeader/subheading.tsx
@@ -109,8 +109,7 @@ function Subheading({
 	paymentStatus,
 }: SubheadingProps): JSX.Element {
 	const isTier3 = productKey === 'TierThree';
-	const isGuardianAdLite =
-		productKey === 'GuardianLight' || productKey === 'GuardianAdLite';
+	const isGuardianAdLite = productKey === 'GuardianAdLite';
 	const subheadingCopy = getSubHeadingCopy(
 		productKey,
 		amountIsAboveThreshold,

diff --git a/support-frontend/package.json b/support-frontend/package.json
@@ -85,7 +85,7 @@
 		"@guardian/pasteup": "1.0.0-alpha.7",
 		"@guardian/source": "8.0.0",
 		"@guardian/source-development-kitchen": "13.1.0",
-		"@guardian/support-service-lambdas": "guardian/support-service-lambdas#1cac223aa8cf278f4e70cb39dc0f7740304e4566",
+		"@guardian/support-service-lambdas": "guardian/support-service-lambdas#954a612fbce077790fa2d00c6e159b8d384f3e14",
 		"@guardian/tsconfig": "^0.2.0",
 		"@reduxjs/toolkit": "^1.9.4",
 		"@sentry/browser": "^8.33.1",

diff --git a/support-frontend/yarn.lock b/support-frontend/yarn.lock
@@ -1836,9 +1836,9 @@
   dependencies:
     mini-svg-data-uri "1.4.4"
 
-"@guardian/support-service-lambdas@guardian/support-service-lambdas#1cac223aa8cf278f4e70cb39dc0f7740304e4566":
+"@guardian/support-service-lambdas@guardian/support-service-lambdas#954a612fbce077790fa2d00c6e159b8d384f3e14":
   version "1.0.0"
-  resolved "https://codeload.github.com/guardian/support-service-lambdas/tar.gz/1cac223aa8cf278f4e70cb39dc0f7740304e4566"
+  resolved "https://codeload.github.com/guardian/support-service-lambdas/tar.gz/954a612fbce077790fa2d00c6e159b8d384f3e14"
 
 "@guardian/tsconfig@^0.2.0":
   version "0.2.0"