Remove intial fix in favour of enhancers change

Author: emma-imber

dotcom-rendering/src/components/ProductElement.tsx

@@ -98,12 +98,12 @@ const Content = ({
 		? subheadingHtml.textContent.trim().length > 0
 		: false;
 	return (
-		<div data-spacefinder-role="nested">
+		<div>
 			{isSubheading &&
 				Array.from(subheadingHtml.childNodes).map(
 					buildElementTree(format),
 				)}
-			<div css={contentContainer}>
+			<div css={contentContainer} data-spacefinder-role="nested">
 				{showLeftCol && (
 					<LeftColProductCardContainer>
 						<ProductCardLeftCol
@@ -124,7 +124,6 @@ const Content = ({
 						key={index}
 						index={index}
 						format={format}
-						isProduct={true}
 						isMainMedia={false}
 					/>
 				))}

dotcom-rendering/src/lib/renderElement.tsx

@@ -93,7 +93,6 @@ type Props = {
 	editionId: EditionId;
 	forceDropCap?: 'on' | 'off';
 	isTimeline?: boolean;
-	isProduct?: boolean;
 	totalElements?: number;
 	isListElement?: boolean;
 	isSectionedMiniProfilesArticle?: boolean;
@@ -165,7 +164,6 @@ export const renderElement = ({
 	editionId,
 	forceDropCap,
 	isTimeline = false,
-	isProduct = false,
 	totalElements = 0,
 	isListElement = false,
 	isSectionedMiniProfilesArticle = false,
@@ -555,7 +553,7 @@ export const renderElement = ({
 				successDescription: element.newsletter.successDescription,
 				theme: element.newsletter.theme,
 			};
-			if (isListElement || isTimeline || isProduct) return null;
+			if (isListElement || isTimeline) return null;
 			return <EmailSignUpWrapper {...emailSignUpProps} />;
 		case 'model.dotcomrendering.pageElements.AdPlaceholderBlockElement':
 			return renderAds && <AdPlaceholder />;
@@ -987,7 +985,6 @@ export const RenderArticleElement = ({
 	editionId,
 	forceDropCap,
 	isTimeline,
-	isProduct,
 	totalElements,
 	isListElement,
 	isSectionedMiniProfilesArticle,
@@ -1016,7 +1013,6 @@ export const RenderArticleElement = ({
 		editionId,
 		forceDropCap,
 		isTimeline,
-		isProduct,
 		totalElements,
 		isListElement,
 		isSectionedMiniProfilesArticle,
@@ -1057,7 +1053,6 @@ type ElementLevelPropNames =
 	| 'hideCaption'
 	| 'format'
 	| 'isTimeline'
-	| 'isProduct'
 	| 'isListElement'
 	| 'isMainMedia';
 type ArticleLevelProps = Omit<Props, ElementLevelPropNames>;