From dcfae3821c6429cd6c9660bec39e7cd2009f5729 Mon Sep 17 00:00:00 2001
From: Charles Bochet <charlesBochet@users.noreply.github.com>
Date: Thu, 2 Oct 2025 23:46:47 +0200
Subject: [PATCH] Fix race condition user and views (#14861)

---
 .../components/UserAndViewsProviderEffect.tsx | 28 +++++++++++++++----
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/packages/twenty-front/src/modules/users/components/UserAndViewsProviderEffect.tsx b/packages/twenty-front/src/modules/users/components/UserAndViewsProviderEffect.tsx
index dcbf753d6f..803486d42f 100644
--- a/packages/twenty-front/src/modules/users/components/UserAndViewsProviderEffect.tsx
+++ b/packages/twenty-front/src/modules/users/components/UserAndViewsProviderEffect.tsx
@@ -15,7 +15,7 @@ import { coreViewsState } from '@/views/states/coreViewState';
 import { type CoreViewWithRelations } from '@/views/types/CoreViewWithRelations';
 import { type ColorScheme } from '@/workspace-member/types/WorkspaceMember';
 import { enUS } from 'date-fns/locale';
-import { useEffect } from 'react';
+import { useEffect, useState } from 'react';
 import { useLocation } from 'react-router-dom';
 import { type APP_LOCALES, SOURCE_LOCALE } from 'twenty-shared/translations';
 import { AppPath, type ObjectPermissions } from 'twenty-shared/types';
@@ -36,6 +36,11 @@ export const UserAndViewsProviderEffect = () => {
   const [isCurrentUserLoaded, setIsCurrentUserLoaded] = useRecoilState(
     isCurrentUserLoadedState,
   );
+
+  const [localIsCurrentUserLoaded, setLocalIsCurrentUserLoaded] =
+    useState(false);
+  const [localAreViewsLoaded, setLocalAreViewsLoaded] = useState(false);
+
   const setCurrentUser = useSetRecoilState(currentUserState);
   const setCurrentWorkspace = useSetRecoilState(currentWorkspaceState);
   const setCurrentUserWorkspace = useSetRecoilState(currentUserWorkspaceState);
@@ -94,13 +99,14 @@ export const UserAndViewsProviderEffect = () => {
       skip: shouldSkip,
     });
 
-  const { data: queryDataCoreViews } = useFindAllCoreViewsQuery({
-    skip: shouldSkip,
-  });
+  const { data: queryDataCoreViews, loading: queryLoadingCoreViews } =
+    useFindAllCoreViewsQuery({
+      skip: shouldSkip,
+    });
 
   useEffect(() => {
     if (!userQueryLoading) {
-      setIsCurrentUserLoaded(true);
+      setLocalIsCurrentUserLoaded(true);
     }
 
     if (!isDefined(userQueryData?.currentUser)) return;
@@ -189,10 +195,20 @@ export const UserAndViewsProviderEffect = () => {
   ]);
 
   useEffect(() => {
+    if (!queryLoadingCoreViews) {
+      setLocalAreViewsLoaded(true);
+    }
+
     if (!isDefined(queryDataCoreViews?.getCoreViews)) return;
 
     setCoreViews(queryDataCoreViews.getCoreViews);
-  }, [queryDataCoreViews?.getCoreViews, setCoreViews]);
+  }, [queryDataCoreViews?.getCoreViews, setCoreViews, queryLoadingCoreViews]);
+
+  useEffect(() => {
+    if (localIsCurrentUserLoaded && localAreViewsLoaded) {
+      setIsCurrentUserLoaded(true);
+    }
+  }, [localIsCurrentUserLoaded, localAreViewsLoaded, setIsCurrentUserLoaded]);
 
   return null;
 };