move intercom into EnforceLoginStatePageWrapper

apps/studio/src/components/AuthWrappers/EnforceLoginStatePageWrapper.tsx

@@ -1,7 +1,9 @@
 import type { PropsWithChildren } from "react"
 import { useMemo } from "react"
 import { useRouter } from "next/router"
+import Intercom from "@intercom/messenger-js-sdk"
 
+import { env } from "~/env.mjs"
 import { useLoginState } from "~/features/auth"
 import { SIGN_IN } from "~/lib/routes"
 import { callbackUrlSchema } from "~/schemas/url"
@@ -46,6 +48,13 @@ export const EnforceLoginStatePageWrapper = ({
   const { hasLoginStateFlag } = useLoginState()
 
   if (hasLoginStateFlag) {
+    // Initialize Intercom
+    if (env.NEXT_PUBLIC_INTERCOM_APP_ID) {
+      Intercom({
+        app_id: env.NEXT_PUBLIC_INTERCOM_APP_ID,
+      })
+    }
+
     return <>{children}</>
   }
 

apps/studio/src/pages/index.tsx

@@ -1,6 +1,5 @@
 import { Flex, Text } from "@chakra-ui/react"
 
-import { WithIntercomWrapper } from "~/components/Intercom"
 import { SiteList } from "~/features/dashboard/SiteList"
 import { type NextPageWithLayout } from "~/lib/types"
 import { AdminLayout } from "~/templates/layouts/AdminLayout"
@@ -18,8 +17,6 @@ const DashboardPage: NextPageWithLayout = () => {
   )
 }
 
-DashboardPage.getLayout = (page: React.ReactNode) => {
-  return <WithIntercomWrapper>{AdminLayout(page)}</WithIntercomWrapper>
-}
+DashboardPage.getLayout = AdminLayout
 
 export default DashboardPage

apps/studio/src/pages/sites/[siteId]/collections/[resourceId].tsx

@@ -13,7 +13,6 @@ import { BiData } from "react-icons/bi"
 import { z } from "zod"
 
 import { PermissionsBoundary } from "~/components/AuthWrappers"
-import { WithIntercomWrapper } from "~/components/Intercom"
 import { folderSettingsModalAtom } from "~/features/dashboard/atoms"
 import { CollectionBanner } from "~/features/dashboard/components/CollectionBanner"
 import { CollectionTable } from "~/features/dashboard/components/CollectionTable"
@@ -119,9 +118,7 @@ CollectionResourceListPage.getLayout = (page) => {
   return (
     <PermissionsBoundary
       resourceType={ResourceType.Collection}
-      page={
-        <WithIntercomWrapper>{AdminCmsSidebarLayout(page)}</WithIntercomWrapper>
-      }
+      page={AdminCmsSidebarLayout(page)}
     />
   )
 }

apps/studio/src/pages/sites/[siteId]/folders/[folderId]/index.tsx

@@ -17,7 +17,6 @@ import { z } from "zod"
 
 import type { RouterOutput } from "~/utils/trpc"
 import { PermissionsBoundary } from "~/components/AuthWrappers"
-import { WithIntercomWrapper } from "~/components/Intercom"
 import { folderSettingsModalAtom } from "~/features/dashboard/atoms"
 import { DeleteResourceModal } from "~/features/dashboard/components/DeleteResourceModal/DeleteResourceModal"
 import { FolderSettingsModal } from "~/features/dashboard/components/FolderSettingsModal"
@@ -251,9 +250,7 @@ FolderPage.getLayout = (page) => {
   return (
     <PermissionsBoundary
       resourceType={ResourceType.Folder}
-      page={
-        <WithIntercomWrapper>{AdminCmsSidebarLayout(page)}</WithIntercomWrapper>
-      }
+      page={AdminCmsSidebarLayout(page)}
     />
   )
 }

apps/studio/src/pages/sites/[siteId]/index.tsx

@@ -14,7 +14,6 @@ import { BiData, BiFileBlank, BiFolder, BiHomeAlt } from "react-icons/bi"
 import { z } from "zod"
 
 import { PermissionsBoundary } from "~/components/AuthWrappers"
-import { WithIntercomWrapper } from "~/components/Intercom"
 import { DeleteResourceModal } from "~/features/dashboard/components/DeleteResourceModal/DeleteResourceModal"
 import { FolderSettingsModal } from "~/features/dashboard/components/FolderSettingsModal"
 import { PageSettingsModal } from "~/features/dashboard/components/PageSettingsModal"
@@ -175,9 +174,7 @@ SitePage.getLayout = (page) => {
   return (
     <PermissionsBoundary
       resourceType={ResourceType.RootPage}
-      page={
-        <WithIntercomWrapper>{AdminCmsSidebarLayout(page)}</WithIntercomWrapper>
-      }
+      page={AdminCmsSidebarLayout(page)}
     />
   )
 }

apps/studio/src/pages/sites/[siteId]/links/[linkId]/index.tsx

@@ -1,7 +1,6 @@
 import { Grid, GridItem } from "@chakra-ui/react"
 import { z } from "zod"
 
-import { WithIntercomWrapper } from "~/components/Intercom"
 import { EditCollectionLinkPreview } from "~/features/editing-experience/components/EditLinkPreview"
 import { LinkEditorDrawer } from "~/features/editing-experience/components/LinkEditorDrawer"
 import { LinkEditingLayout } from "~/templates/layouts/LinkEditingLayout"
@@ -30,8 +29,6 @@ export const EditLink = () => {
   )
 }
 
-EditLink.getLayout = (page: React.ReactNode) => {
-  return <WithIntercomWrapper>{LinkEditingLayout(page)}</WithIntercomWrapper>
-}
+EditLink.getLayout = LinkEditingLayout
 
 export default EditLink

apps/studio/src/pages/sites/[siteId]/pages/[pageId]/index.tsx

@@ -3,7 +3,6 @@ import { ResourceType } from "~prisma/generated/generatedEnums"
 
 import type { NextPageWithLayout } from "~/lib/types"
 import { PermissionsBoundary } from "~/components/AuthWrappers"
-import { WithIntercomWrapper } from "~/components/Intercom"
 import { EditorDrawerProvider } from "~/contexts/EditorDrawerContext"
 import EditPageDrawer from "~/features/editing-experience/components/EditPageDrawer"
 import { EditPagePreview } from "~/features/editing-experience/components/EditPagePreview"
@@ -64,9 +63,7 @@ EditPage.getLayout = (page) => {
   return (
     <PermissionsBoundary
       resourceType={ResourceType.Page}
-      page={
-        <WithIntercomWrapper>{PageEditingLayout(page)}</WithIntercomWrapper>
-      }
+      page={PageEditingLayout(page)}
     />
   )
 }

apps/studio/src/pages/sites/[siteId]/pages/[pageId]/settings.tsx

@@ -9,7 +9,6 @@ import { z } from "zod"
 
 import type { NextPageWithLayout } from "~/lib/types"
 import { PermissionsBoundary } from "~/components/AuthWrappers"
-import { WithIntercomWrapper } from "~/components/Intercom"
 import { ErrorProvider } from "~/features/editing-experience/components/form-builder/ErrorProvider"
 import FormBuilder from "~/features/editing-experience/components/form-builder/FormBuilder"
 import { editPageSchema } from "~/features/editing-experience/schema"
@@ -138,9 +137,7 @@ PageSettings.getLayout = (page) => {
   return (
     <PermissionsBoundary
       resourceType={ResourceType.Page}
-      page={
-        <WithIntercomWrapper>{PageEditingLayout(page)}</WithIntercomWrapper>
-      }
+      page={PageEditingLayout(page)}
     />
   )
 }

apps/studio/src/pages/sites/[siteId]/settings.tsx

@@ -20,7 +20,6 @@ import { ResourceType } from "~prisma/generated/generatedEnums"
 import { z } from "zod"
 
 import { PermissionsBoundary } from "~/components/AuthWrappers"
-import { WithIntercomWrapper } from "~/components/Intercom"
 import { UnsavedSettingModal } from "~/features/editing-experience/components/UnsavedSettingModal"
 import { useQueryParse } from "~/hooks/useQueryParse"
 import { useZodForm } from "~/lib/form"
@@ -225,11 +224,7 @@ SiteSettingsPage.getLayout = (page) => {
   return (
     <PermissionsBoundary
       resourceType={ResourceType.RootPage}
-      page={
-        <WithIntercomWrapper>
-          {AdminSidebarOnlyLayout(page)}
-        </WithIntercomWrapper>
-      }
+      page={AdminSidebarOnlyLayout(page)}
     />
   )
 }