From f89debeaa31b01a373780c09b469c5e45ed7f48f Mon Sep 17 00:00:00 2001
From: Ochieng Paul <ochiengpaul442@gmail.com>
Date: Mon, 24 Feb 2025 10:42:15 +0300
Subject: [PATCH] updates

---
 website2/src/app/layout.tsx | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/website2/src/app/layout.tsx b/website2/src/app/layout.tsx
index 06c424892c..32a9726c13 100644
--- a/website2/src/app/layout.tsx
+++ b/website2/src/app/layout.tsx
@@ -1,10 +1,10 @@
 import './globals.css';
 
+import dynamic from 'next/dynamic';
 import localFont from 'next/font/local';
 import { ReactNode, Suspense } from 'react';
 
 import EngagementDialog from '@/components/dialogs/EngagementDialog';
-import GoogleAnalytics from '@/components/GoogleAnalytics';
 import Loading from '@/components/loading';
 import { ErrorBoundary } from '@/components/ui';
 import { ReduxDataProvider } from '@/context/ReduxDataProvider';
@@ -12,6 +12,11 @@ import { checkMaintenance } from '@/lib/maintenance';
 
 import MaintenancePage from './MaintenancePage';
 
+// Load the GA component dynamically, disabling SSR so that it runs only on the client.
+const GoogleAnalytics = dynamic(() => import('@/components/GoogleAnalytics'), {
+  ssr: false,
+});
+
 const interFont = localFont({
   src: [
     {
@@ -54,8 +59,10 @@ export default async function RootLayout({
           </ReduxDataProvider>
         </ErrorBoundary>
 
-        {/* Initialize & Track Google Analytics */}
-        <GoogleAnalytics measurementId={GA_MEASUREMENT_ID} />
+        {/* Initialize & Track Google Analytics only on the client */}
+        {GA_MEASUREMENT_ID && (
+          <GoogleAnalytics measurementId={GA_MEASUREMENT_ID} />
+        )}
       </body>
     </html>
   );