blsmedia/sign
2
0
Fork 0
Code Issues Packages Releases Activity

Merge branch 'main' into feat/separate-document-page

Browse Source
This commit is contained in:
David Nguyen
2024-02-13 11:15:31 +11:00
committed by GitHub
parent 82b87739d0 a868ecf2d2
commit 524a2f4ea9
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/web/src/app/(teams)/t/[teamUrl]/settings/team-transfer-status.tsx
View File

@@ -18,7 +18,7 @@ export type TeamTransferStatusProps = {
className?: string; className?: string;
currentUserTeamRole: TeamMemberRole; currentUserTeamRole: TeamMemberRole;
teamId: number; teamId: number;
transferVerification: TeamTransferVerification | null; transferVerification: Pick<TeamTransferVerification, 'email' | 'expiresAt' | 'name'> | null;
}; };
export const TeamTransferStatus = ({ export const TeamTransferStatus = ({

16
packages/lib/server-only/team/get-team.ts
View File

@@ -72,8 +72,20 @@ export const getTeamByUrl = async ({ userId, teamUrl }: GetTeamByUrlOptions) =>
where: whereFilter, where: whereFilter,
include: { include: {
teamEmail: true, teamEmail: true,
emailVerification: true, emailVerification: {
transferVerification: true, select: {
expiresAt: true,
name: true,
email: true,
},
},
transferVerification: {
select: {
expiresAt: true,
name: true,
email: true,
},
},
subscription: true, subscription: true,
members: { members: {
where: { where: {