fix: custom attributes not being synced in intercom (#14600)

* fix: custom attributes not being synced in intercom * fix: ssrInit
calcom · Apr 16, 2024 · b61820d · b61820d
1 parent 1606272
commit b61820d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/apps/web/server/lib/ssr.ts b/apps/web/server/lib/ssr.ts
@@ -81,6 +81,7 @@ export async function ssrInit(context: GetServerSidePropsContext, options?: { no
     // Provides a better UX to the users who have already upgraded.
     ssr.viewer.teams.hasTeamPlan.prefetch(),
     ssr.viewer.public.session.prefetch(),
+    ssr.viewer.me.prefetch(),
   ]);
 
   return ssr;

diff --git a/packages/features/ee/support/lib/intercom/useIntercom.ts b/packages/features/ee/support/lib/intercom/useIntercom.ts
@@ -28,6 +28,7 @@ export const useIntercom = () => {
   const { hasTeamPlan } = useHasTeamPlan();
 
   const boot = async () => {
+    if (!data) return;
     let userHash;
 
     const req = await fetch(`/api/intercom-hash`);

diff --git a/packages/features/shell/Shell.tsx b/packages/features/shell/Shell.tsx
@@ -215,15 +215,17 @@ const useBanners = () => {
 const Layout = (props: LayoutProps) => {
   const banners = useBanners();
 
-  const showIntercom = localStorage.getItem("showIntercom");
+  const { data: user } = trpc.viewer.me.useQuery();
   const { boot } = useIntercom();
   const pageTitle = typeof props.heading === "string" && !props.title ? props.heading : props.title;
 
   useEffect(() => {
     // not using useMediaQuery as it toggles between true and false
-    if (showIntercom === "false" || window.innerWidth <= 768) return;
+    const showIntercom = localStorage.getItem("showIntercom");
+    if (showIntercom === "false" || window.innerWidth <= 768 || !user) return;
     boot();
-  }, [showIntercom]);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [user]);
 
   const bannersHeight = useMemo(() => {
     const activeBanners =