Merged in refactor/tracking-rendering (pull request #377)

Refactor/tracking rendering

Approved-by: Simon.Emanuelsson

app/[lang]/(live)/(protected)/my-pages/[...path]/page.tsx

@@ -20,7 +20,9 @@ export default async function MyPages({
   }
 
   const { tracking, accountPage } = accountPageRes
+
   return (
+    <>
       <main className={styles.blocks}>
         <Title>{accountPage.heading}</Title>
         {accountPage.content.length ? (
@@ -28,7 +30,9 @@ export default async function MyPages({
         ) : (
           <p>{formatMessage({ id: "No content published" })}</p>
         )}
-      <TrackingSDK pageData={tracking} />
       </main>
+
+      <TrackingSDK pageData={tracking} />
+    </>
   )
 }

components/ContentType/LoyaltyPage/LoyaltyPage.tsx

@@ -20,6 +20,7 @@ export default async function LoyaltyPage({ lang }: LangParams) {
   const { tracking, loyaltyPage } = loyaltyPageRes
 
   return (
+    <>
       <section className={styles.content}>
         {loyaltyPage.sidebar.length ? (
           <Sidebar blocks={loyaltyPage.sidebar} lang={lang} />
@@ -31,7 +32,9 @@ export default async function LoyaltyPage({ lang }: LangParams) {
             <Blocks blocks={loyaltyPage.blocks} lang={lang} />
           ) : null}
         </MaxWidth>
-      <TrackingSDK pageData={tracking} />
       </section>
+
+      <TrackingSDK pageData={tracking} />
+    </>
   )
 }

components/ContentType/Webviews/AccountPage.tsx

@@ -25,10 +25,13 @@ export default async function MyPages({ lang }: LangParams) {
   const linkToOverview = `/${lang}/webview${accountPage.url}` !== overview[lang]
 
   return (
+    <>
       <MaxWidth className={styles.blocks} tag="main">
         {linkToOverview ? <LinkToOverview lang={lang} /> : null}
         <Content lang={lang} content={accountPage.content} />
-      <TrackingSDK pageData={tracking} />
       </MaxWidth>
+
+      <TrackingSDK pageData={tracking} />
+    </>
   )
 }

components/ContentType/Webviews/LoyaltyPage.tsx

@@ -19,13 +19,16 @@ export default async function AboutScandicFriends({ lang }: LangParams) {
 
   const { tracking, loyaltyPage } = loyaltyPageRes
   return (
+    <>
       <section className={styles.content}>
         <LinkToOverview lang={lang} />
         <MaxWidth tag="main" className={styles.blocks}>
           <Title>{loyaltyPage.heading}</Title>
           <Blocks blocks={loyaltyPage.blocks} lang={lang} />
         </MaxWidth>
-      <TrackingSDK pageData={tracking} />
       </section>
+
+      <TrackingSDK pageData={tracking} />
+    </>
   )
 }

types/window.d.ts

@@ -1,6 +1,8 @@
 interface Window {
   datalayer: { [key: string]: any }
-  adobeDataLayer: any[]
+  adobeDataLayer: {
+    push: (...args: unknown) => void
+  }
   _satellite: { cookie: { get: (s: string) => string } }
   adobe: {
     OptInCategories: { ANALYTICS: string }