Merge branch 'main' of github.com:guardian/dotcom-rendering into use-…

…product-for-selected-tier
guardian · Sep 19, 2024 · efab82a · efab82a
2 parents 6d2311c + f53da77
commit efab82a
Show file tree

Hide file tree

Showing 5 changed files with 536 additions and 139 deletions.
diff --git a/dotcom-rendering/package.json b/dotcom-rendering/package.json
@@ -41,7 +41,7 @@
 		"@guardian/bridget": "7.0.0",
 		"@guardian/browserslist-config": "6.1.0",
 		"@guardian/cdk": "50.13.0",
-		"@guardian/commercial": "19.12.0",
+		"@guardian/commercial": "21.0.3",
 		"@guardian/core-web-vitals": "7.0.0",
 		"@guardian/eslint-config": "7.0.1",
 		"@guardian/eslint-config-typescript": "9.0.1",

diff --git a/dotcom-rendering/src/layouts/InteractiveLayout.tsx b/dotcom-rendering/src/layouts/InteractiveLayout.tsx
@@ -300,14 +300,9 @@ export const InteractiveLayout = (props: WebProps | AppsProps) => {
 						</Stuck>
 					)}
 
-					{renderAds &&
-						article.config.switches.surveys &&
-						hasSurveyAd && (
-							<AdSlot
-								position="survey"
-								display={format.display}
-							/>
-						)}
+					{renderAds && hasSurveyAd && (
+						<AdSlot position="survey" display={format.display} />
+					)}
 				</>
 			)}
 			<main data-layout="InteractiveLayout">

diff --git a/dotcom-rendering/src/layouts/NewsletterSignupLayout.tsx b/dotcom-rendering/src/layouts/NewsletterSignupLayout.tsx
@@ -249,7 +249,7 @@ export const NewsletterSignupLayout = ({ article, NAV, format }: Props) => {
 				/>
 			</div>
 
-			{renderAds && !!article.config.switches.surveys && hasSurveyAd && (
+			{renderAds && hasSurveyAd && (
 				<AdSlot position="survey" display={format.display} />
 			)}
 

diff --git a/dotcom-rendering/src/layouts/StandardLayout.tsx b/dotcom-rendering/src/layouts/StandardLayout.tsx
@@ -461,7 +461,7 @@ export const StandardLayout = (props: WebProps | AppProps) => {
 				</Stuck>
 			)}
 
-			{renderAds && article.config.switches.surveys && hasSurveyAd && (
+			{renderAds && hasSurveyAd && (
 				<AdSlot position="survey" display={format.display} />
 			)}