From 9a8cf709baeb19d3197b51f01ac4a2f009728169 Mon Sep 17 00:00:00 2001
From: Nite Knite <nkCoding@gmail.com>
Date: Wed, 22 Oct 2025 11:05:27 +0800
Subject: [PATCH] chore: adjust the route scope for loading Zendesk scripts
 (#27244)

Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
---
 web/app/(commonLayout)/layout.tsx | 2 ++
 web/app/layout.tsx                | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/app/(commonLayout)/layout.tsx b/web/app/(commonLayout)/layout.tsx
index ed1c995e25..be9c4fe49a 100644
--- a/web/app/(commonLayout)/layout.tsx
+++ b/web/app/(commonLayout)/layout.tsx
@@ -9,6 +9,7 @@ import { EventEmitterContextProvider } from '@/context/event-emitter'
 import { ProviderContextProvider } from '@/context/provider-context'
 import { ModalContextProvider } from '@/context/modal-context'
 import GotoAnything from '@/app/components/goto-anything'
+import Zendesk from '@/app/components/base/zendesk'
 
 const Layout = ({ children }: { children: ReactNode }) => {
   return (
@@ -28,6 +29,7 @@ const Layout = ({ children }: { children: ReactNode }) => {
             </ProviderContextProvider>
           </EventEmitterContextProvider>
         </AppContextProvider>
+        <Zendesk />
       </SwrInitializer>
     </>
   )
diff --git a/web/app/layout.tsx b/web/app/layout.tsx
index fde265cd22..1be802460b 100644
--- a/web/app/layout.tsx
+++ b/web/app/layout.tsx
@@ -3,7 +3,6 @@ import type { Viewport } from 'next'
 import I18nServer from './components/i18n-server'
 import BrowserInitializer from './components/browser-initializer'
 import SentryInitializer from './components/sentry-initializer'
-import Zendesk from './components/base/zendesk'
 import { getLocaleOnServer } from '@/i18n-config/server'
 import { TanstackQueryInitializer } from '@/context/query-client'
 import { ThemeProvider } from 'next-themes'
@@ -105,7 +104,6 @@ const LocaleLayout = async ({
           </BrowserInitializer>
         </ThemeProvider>
         <RoutePrefixHandle />
-        <Zendesk />
       </body>
     </html>
   )