[pull] main from dubinc:main

apps/web/app/(ee)/api/stripe/integration/webhook/route.ts

@@ -144,17 +144,17 @@ export const POST = withAxiom(async (req: Request) => {
         !result.response.startsWith("Workspace not found") &&
         event.account
       ) {
-        const workspace = await prisma.project.findUnique({
+        const stripeWebhookWorkspace = await prisma.project.findUnique({
           where: {
             stripeConnectId: event.account,
           },
           select: {
             id: true,
           },
         });
-        if (workspace) {
+        if (stripeWebhookWorkspace) {
           // if workspace exists, we set the workspace ID
-          result.workspaceId = workspace.id;
+          result.workspaceId = stripeWebhookWorkspace.id;
         }
       }
 

apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/logs/[logId]/page-client.tsx

@@ -11,11 +11,13 @@ import { CopyButton, StatusBadge, TimestampTooltip } from "@dub/ui";
 import { ChevronRight, StackY3 } from "@dub/ui/icons";
 import { fetcher, formatDateTime } from "@dub/utils";
 import Link from "next/link";
+import { useParams } from "next/navigation";
 import { useEffect, useState } from "react";
 import type { HighlighterCore } from "shiki";
 import useSWR from "swr";
 
-export function LogDetailPageClient({ logId }: { logId: string }) {
+export function LogDetailPageClient() {
+  const { logId } = useParams();
   const { id: workspaceId, slug } = useWorkspace();
 
   const {

apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/logs/[logId]/page.tsx

@@ -1,9 +1,5 @@
 import { LogDetailPageClient } from "./page-client";
 
-export default async function LogDetailPage(props: {
-  params: Promise<{ logId: string }>;
-}) {
-  const params = await props.params;
-
-  return <LogDetailPageClient logId={params.logId} />;
+export default function LogDetailPage() {
+  return <LogDetailPageClient />;
 }

apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/logs/page.tsx

@@ -1,6 +1,6 @@
 import { PageContent } from "@/ui/layout/page-content";
 import { PageWidthWrapper } from "@/ui/layout/page-width-wrapper";
-import { LogsPageClient } from "./page-client";
+import { LogsTable } from "@/ui/logs/logs-table";
 
 export default function LogsPage() {
   return (
@@ -12,7 +12,7 @@ export default function LogsPage() {
       }}
     >
       <PageWidthWrapper>
-        <LogsPageClient />
+        <LogsTable />
       </PageWidthWrapper>
     </PageContent>
   );

apps/web/lib/auth/options.ts

@@ -350,8 +350,6 @@ export const authOptions: NextAuthOptions = {
   },
   callbacks: {
     signIn: async ({ user, account, profile }) => {
-      console.log({ user, account, profile });
-
       if (!user.email || (await isBlacklistedEmail(user.email))) {
         return false;
       }
@@ -560,7 +558,6 @@ export const authOptions: NextAuthOptions = {
   },
   events: {
     async signIn(message) {
-      console.log("signIn", message);
       const email = message.user.email as string;
       const user = await prisma.user.findUnique({
         where: { email },