�fix twentyhq#3554

vikki9121 · Jan 19, 2024 · 13c1b72 · 13c1b72
1 parent e6f985c
commit 13c1b72
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 5 deletions.
diff --git a/packages/twenty-front/src/modules/auth/states/currentWorkspaceMemberState.ts b/packages/twenty-front/src/modules/auth/states/currentWorkspaceMemberState.ts
@@ -4,7 +4,7 @@ import { WorkspaceMember } from '@/workspace-member/types/WorkspaceMember';
 
 export const currentWorkspaceMemberState = atom<Omit<
   WorkspaceMember,
-  'createdAt' | 'updatedAt' | 'userId'
+  'createdAt' | 'updatedAt' | 'userId'| 'userEmail'
 > | null>({
   key: 'currentWorkspaceMemberState',
   default: null,

diff --git a/packages/twenty-front/src/modules/auth/utils/getOnboardingStatus.ts b/packages/twenty-front/src/modules/auth/utils/getOnboardingStatus.ts
@@ -19,7 +19,7 @@ export const getOnboardingStatus = ({
   isLoggedIn: boolean;
   currentWorkspaceMember: Omit<
     WorkspaceMember,
-    'createdAt' | 'updatedAt' | 'userId'
+    'createdAt' | 'updatedAt' | 'userId'| 'userEmail'
   > | null;
   currentWorkspace: CurrentWorkspace | null;
   isBillingEnabled?: boolean;

diff --git a/packages/twenty-front/src/modules/workspace-member/types/WorkspaceMember.ts b/packages/twenty-front/src/modules/workspace-member/types/WorkspaceMember.ts
@@ -11,5 +11,6 @@ export type WorkspaceMember = {
   colorScheme?: ColorScheme;
   createdAt: string;
   updatedAt: string;
+  userEmail: string;
   userId: string;
 };
diff --git a/packages/twenty-front/src/modules/workspace/components/WorkspaceMemberCard.tsx b/packages/twenty-front/src/modules/workspace/components/WorkspaceMemberCard.tsx
@@ -51,9 +51,7 @@ export const WorkspaceMemberCard = ({
           workspaceMember.name.firstName + ' ' + workspaceMember.name.lastName
         }
       />
-      <StyledEmailText>
-        {workspaceMember.name.firstName + ' ' + workspaceMember.name.lastName}
-      </StyledEmailText>
+            <StyledEmailText>{workspaceMember.userEmail}</StyledEmailText>
     </StyledContent>
 
     {accessory}

diff --git a/packages/twenty-front/src/testing/mock-data/activities.ts b/packages/twenty-front/src/testing/mock-data/activities.ts
@@ -54,6 +54,7 @@ const workspaceMember: WorkspaceMember = {
   createdAt: '2023-04-26T10:23:42.33625+00:00',
   updatedAt: '2023-04-26T10:23:42.33625+00:00',
   userId: 'e2409670-1088-46b4-858e-f20a598d9d0f',
+  userEmail: 'charles@test.com',
   colorScheme: 'Light',
 };
 

diff --git a/packages/twenty-front/src/testing/mock-data/companies.ts b/packages/twenty-front/src/testing/mock-data/companies.ts
@@ -42,6 +42,7 @@ export const mockedCompaniesData: Array<MockedCompany> = [
       updatedAt: '2023-04-26T10:23:42.33625+00:00',
       createdAt: '2023-04-26T10:23:42.33625+00:00',
       userId: mockedUsersData[0].id,
+      userEmail: 'charles@test.com',
     },
   },
   {

diff --git a/packages/twenty-front/src/testing/mock-data/users.ts b/packages/twenty-front/src/testing/mock-data/users.ts
@@ -54,6 +54,7 @@ const workspaceMember: WorkspaceMember = {
   createdAt: '2023-04-26T10:23:42.33625+00:00',
   updatedAt: '2023-04-26T10:23:42.33625+00:00',
   userId: '2603c1f9-0172-4ea6-986c-eeaccdf7f4cf',
+  userEmail: 'charles@test.com',
 };
 
 export const mockedUsersData: Array<MockedUser> = [