diff --git a/packages/twenty-front/src/modules/auth/states/currentWorkspaceMemberState.ts b/packages/twenty-front/src/modules/auth/states/currentWorkspaceMemberState.ts index 6cdf64737eb..7f5214d7656 100644 --- 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 | 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 index 4d8f533ef0f..4af9fd5d4c4 100644 --- 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 index af7cd775a55..4f8b8adcad6 100644 --- 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 index 3c5e3acab9b..9ee787a1df3 100644 --- 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 } /> - - {workspaceMember.name.firstName + ' ' + workspaceMember.name.lastName} - + {workspaceMember.userEmail} {accessory} diff --git a/packages/twenty-front/src/testing/mock-data/activities.ts b/packages/twenty-front/src/testing/mock-data/activities.ts index 423580a2d50..d43b848bf16 100644 --- 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 index d5a96d4c71e..52dfaa4615a 100644 --- 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 = [ 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 index 677ed0dc296..ffdc7cbcf16 100644 --- 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 = [