The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
Merge branch 'main' into staging-sandbox
Kiran K78ca2c0c8b9b
diff --cc apps/web/app/(ee)/api/cron/payouts/charge-succeeded/route.tsindex 99cb384f4b,9018e97c23..9cee41d89d--- a/apps/web/app/(ee)/api/cron/payouts/charge-succeeded/route.ts+++ b/apps/web/app/(ee)/api/cron/payouts/charge-succeeded/route.ts@@@ -136,28 -117,14 +137,31 @@@ export async function POST(req: Request}await Promise.allSettled([- // Queue Stripe payouts- queueStripePayouts(invoice, skipStablecoinPayouts),- // Send PayPal payouts- sendPaypalPayouts(invoice),+ ...(isProductionWorkspace+ ? [+ // Queue Stripe payouts+ queueStripePayouts(invoice, skipStablecoinPayouts),++ // Send PayPal payouts+ sendPaypalPayouts(invoice),++++ // Queue Tremendous payouts++ queueTremendousPayouts(invoice),+ ]+ : []),+// Queue external payoutsqueueExternalPayouts(invoice),- // Queue Tremendous payouts- queueTremendousPayouts(invoice),++ // Mock sandbox payouts+ ...(!isProductionWorkspace+ ? [+ mockPayoutCompletion({+ invoice,+ workspace: invoice.program.workspace,+ }),+ ]+ : []),]);return logAndRespond(diff --cc apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/members/page.tsxindex 53ee85e5a2,c2425260d1..0f8d42f2b4--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/members/page.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/members/page.tsx@@@ -51,9 -53,10 +53,10 @@@ export default function WorkspaceMemberconst { setShowInviteCodeModal, InviteCodeModal } = useInviteCodeModal();- const { role, plan, environment } = useWorkspace();- const { role, plan, usersLimit } = useWorkspace();++ const { role, plan, usersLimit, environment } = useWorkspace();const { data: session } = useSession();const { id: workspaceId } = useWorkspace();+ const { users: workspaceUsers } = useWorkspaceUsers();const { queryParams, searchParams } = useRouterStuff();const { pagination, setPagination } = usePagination();@@@ -144,8 -166,8 +167,8 @@@return filters;}, [status, roleFilter]);- useKeyboardShortcut("m", () => {- if (!isStaging) setShowInviteWorkspaceUserModal(true);+ useKeyboardShortcut("m", () => setShowInviteWorkspaceUserModal(true), {- enabled: !invitePermissionError && !isAtUserLimit,++ enabled: !isStaging && !invitePermissionError && !isAtUserLimit,});const columns = useMemo<ColumnDef<WorkspaceUserProps>[]>(@@@ -278,7 -284,9 +301,9 @@@onClick={() => setShowInviteWorkspaceUserModal(true)}className="h-9 w-fit"shortcut="M"- disabledTooltip={inviteNewTeammatesError || undefined}+ disabledTooltip={- invitePermissionError || inviteUserLimitError || undefined++ inviteNewTeammatesError || inviteUserLimitError || undefined+ }/><Buttonicon={<LinkIcon className="h-4 w-4 text-neutral-800" />}diff --cc apps/web/lib/partners/create-stablecoin-payout.tsindex 8bc6c24d1b,e2aacde8ed..1d72dcab1a--- a/apps/web/lib/partners/create-stablecoin-payout.ts+++ b/apps/web/lib/partners/create-stablecoin-payout.ts@@@ -3,14 -3,12 +3,16 @@@ import { sendEmail } from "@dub/email"import PartnerPayoutForceWithdrawal from "@dub/email/templates/partner-payout-force-withdrawal";import PartnerPayoutProcessed from "@dub/email/templates/partner-payout-processed";import { prisma } from "@dub/prisma";-import { PartnerPayoutMethod, Prisma } from "@dub/prisma/client";+import {+ PartnerPayoutMethod,+ Prisma,+ WorkspaceEnvironment,+} from "@dub/prisma/client";import {APP_DOMAIN_WITH_NGROK,+ chunk,currencyFormatter,+ log,prettyPrint,} from "@dub/utils";import { waitUntil } from "@vercel/functions";diff --cc apps/web/lib/partners/create-stripe-transfer.tsindex 3dc7a1ef12,6eb411dd2e..d211d69a55--- a/apps/web/lib/partners/create-stripe-transfer.ts+++ b/apps/web/lib/partners/create-stripe-transfer.ts@@@ -9,10 -9,12 +9,12 @@@ import { sendEmail } from "@dub/email"import PartnerPayoutForceWithdrawal from "@dub/email/templates/partner-payout-force-withdrawal";import PartnerPayoutProcessed from "@dub/email/templates/partner-payout-processed";import { prisma } from "@dub/prisma";-import { Prisma } from "@dub/prisma/client";+import { Prisma, WorkspaceEnvironment } from "@dub/prisma/client";import {APP_DOMAIN_WITH_NGROK,+ chunk,currencyFormatter,+ log,pluralize,} from "@dub/utils";import { waitUntil } from "@vercel/functions";@@@ -80,24 -77,20 +82,26 @@@ export const createStripeTransfer = asy},include: commonInclude,}),+- prisma.payout.findMany({- where: {- partnerId: partner.id,- invoiceId,- status: "processing",- method: "connect",- program: {- workspace: {- environment: WorkspaceEnvironment.production,+ invoiceId+ ? prisma.payout.findMany({+ where: {+ partnerId: partner.id,+ invoiceId,+ status: "processing",+ method: "connect",++ program: {++ workspace: {++ environment: WorkspaceEnvironment.production,++ },++ },},- },- },- orderBy: {- id: "asc",- },- include: commonInclude,- }),+ orderBy: {+ id: "asc",+ },+ include: commonInclude,+ })+ : Promise.resolve([]),],);diff --cc packages/prisma/schema/workspace.prismaindex d32298c6d1,d9ac7f72f4..2200a2473a--- a/packages/prisma/schema/workspace.prisma+++ b/packages/prisma/schema/workspace.prisma@@@ -5,14 -5,8 +5,14 @@@ enum PlanPeriodbiweekly}+enum WorkspaceEnvironment {+ production+ staging+ sandbox+}+model Project {- id String @id @default(cuid())+ id String @idname Stringslug String @uniquelogo String?