From b7c2f83abf8b5ea908a7b9e8a6908c4897552d62 Mon Sep 17 00:00:00 2001
From: Charles Bochet <charlesBochet@users.noreply.github.com>
Date: Tue, 30 Apr 2024 18:48:07 +0200
Subject: [PATCH] Fix sign up (#5231)

Sign up was broken by #5199
---
 .../components/ObjectMetadataItemsLoadEffect.tsx     | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/packages/twenty-front/src/modules/object-metadata/components/ObjectMetadataItemsLoadEffect.tsx b/packages/twenty-front/src/modules/object-metadata/components/ObjectMetadataItemsLoadEffect.tsx
index 103af4b23..35844c58d 100644
--- a/packages/twenty-front/src/modules/object-metadata/components/ObjectMetadataItemsLoadEffect.tsx
+++ b/packages/twenty-front/src/modules/object-metadata/components/ObjectMetadataItemsLoadEffect.tsx
@@ -2,6 +2,7 @@ import { useEffect } from 'react';
 import { useRecoilState, useRecoilValue } from 'recoil';
 
 import { currentUserState } from '@/auth/states/currentUserState';
+import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
 import { useFindManyObjectMetadataItems } from '@/object-metadata/hooks/useFindManyObjectMetadataItems';
 import { objectMetadataItemsState } from '@/object-metadata/states/objectMetadataItemsState';
 import { getObjectMetadataItemsMock } from '@/object-metadata/utils/getObjectMetadataItemsMock';
@@ -10,6 +11,8 @@ import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull';
 
 export const ObjectMetadataItemsLoadEffect = () => {
   const currentUser = useRecoilValue(currentUserState);
+  const currentWorkspace = useRecoilValue(currentWorkspaceState);
+
   const { objectMetadataItems: newObjectMetadataItems } =
     useFindManyObjectMetadataItems({
       skip: isUndefinedOrNull(currentUser),
@@ -20,14 +23,17 @@ export const ObjectMetadataItemsLoadEffect = () => {
   );
 
   useEffect(() => {
-    const toSetObjectMetadataItems = isUndefinedOrNull(currentUser)
-      ? getObjectMetadataItemsMock()
-      : newObjectMetadataItems;
+    const toSetObjectMetadataItems =
+      isUndefinedOrNull(currentUser) ||
+      currentWorkspace?.activationStatus !== 'active'
+        ? getObjectMetadataItemsMock()
+        : newObjectMetadataItems;
     if (!isDeeplyEqual(objectMetadataItems, toSetObjectMetadataItems)) {
       setObjectMetadataItems(toSetObjectMetadataItems);
     }
   }, [
     currentUser,
+    currentWorkspace?.activationStatus,
     newObjectMetadataItems,
     objectMetadataItems,
     setObjectMetadataItems,