diff --git a/packages/frontend-2/components/auth/WorkspaceInviteHeader.vue b/packages/frontend-2/components/auth/WorkspaceInviteHeader.vue index d7b1d9177..1ef79a0b0 100644 --- a/packages/frontend-2/components/auth/WorkspaceInviteHeader.vue +++ b/packages/frontend-2/components/auth/WorkspaceInviteHeader.vue @@ -3,7 +3,7 @@

Join workspace

You're accepting an invitation to join - {{ invite.workspaceName }} + {{ invite.workspace.name }} @@ -29,8 +29,10 @@ graphql(` id ...LimitedUserAvatar } - workspaceId - workspaceName + workspace { + id + name + } token user { id diff --git a/packages/frontend-2/components/invite/Banner.vue b/packages/frontend-2/components/invite/Banner.vue index 2e700e363..49b307708 100644 --- a/packages/frontend-2/components/invite/Banner.vue +++ b/packages/frontend-2/components/invite/Banner.vue @@ -66,7 +66,7 @@ type GenericInviteItem = { invitedBy?: AvatarUserType workspace?: { id: string - logo?: string + logo?: MaybeNullOrUndefined name: string } user?: MaybeNullOrUndefined<{ diff --git a/packages/frontend-2/components/workspace/JoinPage.vue b/packages/frontend-2/components/workspace/JoinPage.vue index 39421dd75..1c0b2d621 100644 --- a/packages/frontend-2/components/workspace/JoinPage.vue +++ b/packages/frontend-2/components/workspace/JoinPage.vue @@ -145,7 +145,7 @@ const actionedWorkspaces = ref< const remainingWorkspaces = computed(() => { const actionedIds = new Set(actionedWorkspaces.value.map((w) => w.id)) const inviteWorkspaceIds = new Set( - localInvites.value.map((invite) => invite.workspaceId) + localInvites.value.map((invite) => invite.workspace.id) ) return (discoverableWorkspacesAndJoinRequests.value || []).filter( diff --git a/packages/frontend-2/components/workspace/invite/Banner.vue b/packages/frontend-2/components/workspace/invite/Banner.vue index 1481c657b..05511ea84 100644 --- a/packages/frontend-2/components/workspace/invite/Banner.vue +++ b/packages/frontend-2/components/workspace/invite/Banner.vue @@ -5,7 +5,7 @@ has invited you to join @@ -25,8 +25,11 @@ graphql(` id ...LimitedUserAvatar } - workspaceId - workspaceName + workspace { + id + name + logo + } token user { id @@ -63,7 +66,7 @@ const processInvite = async (shouldAccept: boolean, token: Optional) => mixpanel.track('Workspace Joined', { location: 'invite banner', // eslint-disable-next-line camelcase - workspace_id: props.invite.workspaceId + workspace_id: props.invite.workspace.id }) } else { await decline() diff --git a/packages/frontend-2/components/workspace/invite/Block.vue b/packages/frontend-2/components/workspace/invite/Block.vue index f8b5179ca..791862ff1 100644 --- a/packages/frontend-2/components/workspace/invite/Block.vue +++ b/packages/frontend-2/components/workspace/invite/Block.vue @@ -3,7 +3,7 @@

Join workspace

You're accepting an invitation to join - {{ invite.workspaceName }} + {{ invite.workspace.name }}