Merge branch 'develop' into feat/sw-386-current-header-fixes

components/Current/Header/index.tsx

@@ -22,14 +22,14 @@ export default async function Header() {
     serverClient().contentstack.myPages.navigation.get(),
   ])
 
-  if (!navigation || !languages || !data) {
+  if (!navigation || !languages || !data?.header) {
     return null
   }
 
   const homeHref = homeHrefs[env.NODE_ENV][getLang()]
-  const { frontpage_link_text, logo, menu, top_menu } = data
+  const { frontpageLinkText, logo, menu, topMenu } = data.header
 
-  const topMenuMobileLinks = top_menu.links
+  const topMenuMobileLinks = topMenu.links
     .filter((link) => link.show_on_mobile)
     .sort((a, b) => (a.sort_order_mobile < b.sort_order_mobile ? 1 : -1))
 
@@ -37,13 +37,13 @@ export default async function Header() {
     <header className={styles.header} role="banner">
       <OfflineBanner />
       <TopMenu
-        frontpageLinkText={frontpage_link_text}
+        frontpageLinkText={frontpageLinkText}
         homeHref={homeHref}
-        links={top_menu.links}
+        links={topMenu.links}
         languageSwitcher={<LanguageSwitcher urls={languages.urls} />}
       />
       <MainMenu
-        frontpageLinkText={frontpage_link_text}
+        frontpageLinkText={frontpageLinkText}
         homeHref={homeHref}
         links={menu.links}
         logo={logo}