renaming

guardian · Jun 28, 2024 · 75ebced · 75ebced
1 parent 92f17d1
commit 75ebced
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 16 deletions.
diff --git a/dotcom-rendering/src/components/EditionSwitcherBanner.importable.tsx b/dotcom-rendering/src/components/EditionSwitcherBanner.importable.tsx
@@ -82,9 +82,10 @@ type Props = {
  * Provides a link to switch to the homepage of the user's preferred edition.
  */
 export const EditionSwitcherBanner = ({ pageId, edition }: Props) => {
-	const [shouldShowBanner] = useEditionSwitcherBanner(pageId, edition);
+	const [showBanner] = useEditionSwitcherBanner(pageId, edition);
 
 	const { data } = useSWR(key, () => apiPromise);
+	const isBannerClosed = !!data?.hidden;
 	const suggestedPageId = getEditionFromId(edition).pageId;
 	const suggestedEdition = getEditionFromId(edition).title.replace(
 		' edition',
@@ -93,10 +94,7 @@ export const EditionSwitcherBanner = ({ pageId, edition }: Props) => {
 	const defaultEdition = getEditionFromPageId(pageId);
 	const defaultEditionName = defaultEdition?.title.replace(' edition', '');
 
-	if (
-		data?.hidden ??
-		(!shouldShowBanner || !defaultEditionName || !suggestedPageId)
-	) {
+	if (isBannerClosed || !showBanner || !defaultEditionName) {
 		return null;
 	}
 

diff --git a/dotcom-rendering/src/components/HeaderTopBar.importable.tsx b/dotcom-rendering/src/components/HeaderTopBar.importable.tsx
@@ -76,7 +76,7 @@ export const HeaderTopBar = ({
 	pageId = '',
 }: HeaderTopBarProps) => {
 	const authStatus = useAuthStatus();
-	const [shouldShowBanner] = useEditionSwitcherBanner(pageId, editionId);
+	const [showBanner] = useEditionSwitcherBanner(pageId, editionId);
 
 	return (
 		<div
@@ -112,7 +112,7 @@ export const HeaderTopBar = ({
 					<HeaderTopBarEditionDropdown
 						editionId={editionId}
 						dataLinkName={dataLinkName}
-						showActiveEdition={!shouldShowBanner}
+						showActiveEdition={!showBanner}
 					/>
 				</Hide>
 			</div>

diff --git a/dotcom-rendering/src/lib/useUserPreferredEdition.ts b/dotcom-rendering/src/lib/useUserPreferredEdition.ts
@@ -48,24 +48,21 @@ export const useEditionSwitcherBanner = (
 	userEdition: Edition,
 ): [boolean] => {
 	const pageEdition = getEditionFromPageId(pageId)?.editionId;
-	const isOnDifferentFrontToEdition =
+	const isOnWrongNetworkFront =
 		isNetworkFront(pageId) && pageEdition !== userEdition;
-
-	const [shouldShowBanner, setShouldShowBanner] = useState(
-		isOnDifferentFrontToEdition,
-	);
+	const [showBanner, setShowBanner] = useState(isOnWrongNetworkFront);
 
 	useEffect(() => {
-		setShouldShowBanner(
-			isOnDifferentFrontToEdition && !hideBannerThroughUserOverride(),
+		setShowBanner(
+			isOnWrongNetworkFront && !hideBannerThroughUserOverride(),
 		);
-	}, [isOnDifferentFrontToEdition]);
+	}, [isOnWrongNetworkFront]);
 
 	useEffect(() => {
 		addOrRemoveCookie();
 	}, []);
 
-	return [shouldShowBanner];
+	return [showBanner];
 };
 
 const key = 'edition-switcher-banner';