refactor

Author: domlander

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

@@ -225,7 +225,6 @@ export const OnwardsUpper = ({
 	webURL,
 }: Props) => {
 	const isHorizontalScrollingSupported = useIsHorizontalScrollingSupported();
-
 	if (!isHorizontalScrollingSupported) return null;
 
 	// Related content can be a collection of articles based on
@@ -234,7 +233,7 @@ export const OnwardsUpper = ({
 
 	// In this context, Blog tags are treated the same as Series tags
 	const seriesTag = tags.find(
-		(tag) => tag.type === 'Series' || tag.type === 'Blog',
+		({ type }) => type === 'Series' || type === 'Blog',
 	);
 
 	let url: string | undefined;
@@ -317,21 +316,17 @@ export const OnwardsUpper = ({
 	const showCuratedContainer =
 		!!curatedDataUrl && !isPaidContent && canHaveCuratedContent;
 
+	const isGalleryArticle = format.design === ArticleDesign.Gallery;
+
 	return (
 		<div css={onwardsWrapper}>
 			{!!url && (
 				<Section
 					fullWidth={true}
 					borderColour={palette('--article-section-border')}
-					padSides={
-						format.design === ArticleDesign.Gallery ? false : true
-					}
-					showTopBorder={
-						format.design === ArticleDesign.Gallery ? false : true
-					}
-					showSideBorders={
-						format.design === ArticleDesign.Gallery ? false : true
-					}
+					padSides={!isGalleryArticle}
+					showTopBorder={!isGalleryArticle}
+					showSideBorders={!isGalleryArticle}
 				>
 					<FetchOnwardsData
 						url={url}
@@ -342,7 +337,7 @@ export const OnwardsUpper = ({
 						serverTime={serverTime}
 						renderingTarget={renderingTarget}
 						isAdFreeUser={isAdFreeUser}
-						containerPosition={'first'}
+						containerPosition="first"
 						webURL={webURL}
 					/>
 				</Section>
@@ -351,15 +346,9 @@ export const OnwardsUpper = ({
 				<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
-					}
+					showTopBorder={!isGalleryArticle}
+					showSideBorders={!isGalleryArticle}
+					padSides={!isGalleryArticle}
 				>
 					<FetchOnwardsData
 						url={curatedDataUrl}