From 90d785968c2ad64fbdd8cec82c252373f6ce2eb2 Mon Sep 17 00:00:00 2001
From: Kamil Kisiela <kamil.kisiela@gmail.com>
Date: Mon, 20 May 2024 10:54:30 +0200
Subject: [PATCH] Fix missing gtag on window (#4776)

---
 packages/web/app/src/lib/gtag.ts | 11 ++++++++---
 packages/web/app/src/router.tsx  | 14 +++++++-------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/packages/web/app/src/lib/gtag.ts b/packages/web/app/src/lib/gtag.ts
index 6de6d990f..18205febe 100644
--- a/packages/web/app/src/lib/gtag.ts
+++ b/packages/web/app/src/lib/gtag.ts
@@ -4,8 +4,13 @@ export const pageview = (url: string): void => {
   if (!env.analytics.googleAnalyticsTrackingId) {
     return;
   }
+  const gtag = (window as any).gtag;
 
-  (window as any).gtag('config', env.analytics.googleAnalyticsTrackingId, {
-    page_path: url,
-  });
+  if (typeof gtag === 'function') {
+    gtag('config', env.analytics.googleAnalyticsTrackingId, {
+      page_path: url,
+    });
+  } else {
+    console.error('window.gtag function not found');
+  }
 };
diff --git a/packages/web/app/src/router.tsx b/packages/web/app/src/router.tsx
index bd4230289..920bc2b53 100644
--- a/packages/web/app/src/router.tsx
+++ b/packages/web/app/src/router.tsx
@@ -101,13 +101,7 @@ function RootComponent() {
     <HelmetProvider>
       {env.analytics.googleAnalyticsTrackingId && (
         <Helmet>
-          <script
-            key="gtag-script"
-            async
-            src={`https://www.googletagmanager.com/gtag/js?id=${env.analytics.googleAnalyticsTrackingId}`}
-            type="text/javascript"
-          />
-          <script id="gtag-init" key="gtag-init" async type="text/javascript">{`
+          <script id="gtag-init" key="gtag-init" type="text/javascript">{`
             window.dataLayer = window.dataLayer || [];
             function gtag(){dataLayer.push(arguments);}
             gtag('js', new Date());
@@ -115,6 +109,12 @@ function RootComponent() {
               page_path: window.location.pathname,
             });
           `}</script>
+          <script
+            key="gtag-script"
+            async
+            src={`https://www.googletagmanager.com/gtag/js?id=${env.analytics.googleAnalyticsTrackingId}`}
+            type="text/javascript"
+          />
         </Helmet>
       )}
       <SuperTokensWrapper>