clean up after rebase

Author: marjisound

dotcom-rendering/src/components/OnwardsUpper.importable.tsx

@@ -186,7 +186,6 @@ type Props = {
 	discussionApiUrl: string;
 	absoluteServerTimes: boolean;
 	renderingTarget: RenderingTarget;
-	shouldHaveSingleSection?: boolean;
 };
 
 /**
@@ -222,7 +221,6 @@ export const OnwardsUpper = ({
 	discussionApiUrl,
 	absoluteServerTimes,
 	renderingTarget,
-	shouldHaveSingleSection = false,
 }: Props) => {
 	const isHorizontalScrollingSupported = useIsHorizontalScrollingSupported();
 
@@ -339,40 +337,32 @@ export const OnwardsUpper = ({
 					/>
 				</Section>
 			)}
-			{!!curatedDataUrl &&
-				!isPaidContent &&
-				canHaveCuratedContent && (
-					<Section
-						fullWidth={true}
-						borderColour={palette('--article-section-border')}
-						showTopBorder={
-							format.design === ArticleDesign.Gallery
-								? false
-								: true
-						}
-						showSideBorders={
-							format.design === ArticleDesign.Gallery
-								? false
-								: true
-						}
-						padSides={
-							format.design === ArticleDesign.Gallery
-								? false
-								: true
-						}
-					>
-						<FetchOnwardsData
-							url={curatedDataUrl}
-							limit={20}
-							onwardsSource="curated-content"
-							format={format}
-							discussionApiUrl={discussionApiUrl}
-							absoluteServerTimes={absoluteServerTimes}
-							renderingTarget={renderingTarget}
-							isAdFreeUser={isAdFreeUser}
-						/>
-					</Section>
-				)}
+			{!!curatedDataUrl && !isPaidContent && canHaveCuratedContent && (
+				<Section
+					fullWidth={true}
+					borderColour={palette('--article-section-border')}
+					showTopBorder={
+						format.design === ArticleDesign.Gallery ? false : true
+					}
+					showSideBorders={
+						format.design === ArticleDesign.Gallery ? false : true
+					}
+					padSides={
+						format.design === ArticleDesign.Gallery ? false : true
+					}
+				>
+					<FetchOnwardsData
+						url={curatedDataUrl}
+						limit={20}
+						onwardsSource="curated-content"
+						format={format}
+						discussionApiUrl={discussionApiUrl}
+						absoluteServerTimes={absoluteServerTimes}
+						renderingTarget={renderingTarget}
+						isAdFreeUser={isAdFreeUser}
+					/>
+				</Section>
+			)}
 		</div>
 	);
 };

dotcom-rendering/src/layouts/GalleryLayout.tsx

@@ -443,7 +443,6 @@ export const GalleryLayout = (props: WebProps | AppProps) => {
 					discussionApiUrl={frontendData.config.discussionApiUrl}
 					absoluteServerTimes={absoluteServerTimes}
 					renderingTarget={renderingTarget}
-					shouldHaveSingleSection={true}
 				/>
 			</Island>