{teams &&
@@ -248,7 +248,7 @@ const SettingsSidebarContainer = ({
}>
setTeamMenuState([
...teamMenuState,
diff --git a/packages/lib/cva/cva.test.ts b/packages/lib/cva/cva.test.ts
index d73a113b4e..31c29eb4ac 100644
--- a/packages/lib/cva/cva.test.ts
+++ b/packages/lib/cva/cva.test.ts
@@ -1,3 +1,5 @@
+import { describe, expect, it } from "vitest";
+
import { applyStyleToMultipleVariants } from "./cva";
describe("CVA Utils", () => {
diff --git a/packages/lib/defaultAvatarImage.test.ts b/packages/lib/defaultAvatarImage.test.ts
index 6119ae5804..14d7ca2392 100644
--- a/packages/lib/defaultAvatarImage.test.ts
+++ b/packages/lib/defaultAvatarImage.test.ts
@@ -1,3 +1,5 @@
+import { describe, expect, it } from "vitest";
+
import { defaultAvatarSrc, getPlaceholderAvatar } from "./defaultAvatarImage";
describe("Default Avatar Image tests", () => {
diff --git a/packages/lib/getBrandColours.test.ts b/packages/lib/getBrandColours.test.ts
index b1152a2e1c..8a9b253eee 100644
--- a/packages/lib/getBrandColours.test.ts
+++ b/packages/lib/getBrandColours.test.ts
@@ -1,3 +1,5 @@
+import { describe, expect, it } from "vitest";
+
import { createColorMap } from "./getBrandColours";
describe("useGetBrandingColours", () => {
diff --git a/packages/lib/hooks/useHasPaidPlan.ts b/packages/lib/hooks/useHasPaidPlan.ts
index e0509d4d95..9111f4a43b 100644
--- a/packages/lib/hooks/useHasPaidPlan.ts
+++ b/packages/lib/hooks/useHasPaidPlan.ts
@@ -12,7 +12,8 @@ export function useHasPaidPlan() {
const isLoading = isLoadingTeamQuery || isLoadingUserQuery;
- const isCurrentUsernamePremium = user && user.metadata && hasKeyInMetadata(user, "isPremium");
+ const isCurrentUsernamePremium =
+ user && hasKeyInMetadata(user, "isPremium") ? !!user.metadata.isPremium : false;
const hasPaidPlan = hasTeamPlan?.hasTeamPlan || isCurrentUsernamePremium;
diff --git a/packages/lib/random.test.ts b/packages/lib/random.test.ts
index b8e02bc1af..d978b895e9 100644
--- a/packages/lib/random.test.ts
+++ b/packages/lib/random.test.ts
@@ -1,3 +1,5 @@
+import { describe, expect, it } from "vitest";
+
import { randomString } from "./random";
describe("Random util tests", () => {
diff --git a/packages/lib/test/CalEventParser.test.ts b/packages/lib/test/CalEventParser.test.ts
index f146d6c363..c90a8daa15 100644
--- a/packages/lib/test/CalEventParser.test.ts
+++ b/packages/lib/test/CalEventParser.test.ts
@@ -1,4 +1,5 @@
import { faker } from "@faker-js/faker";
+import { describe, expect, it, vi } from "vitest";
import {
getLocation,
@@ -8,11 +9,11 @@ import {
} from "../CalEventParser";
import { buildCalendarEvent, buildVideoCallData } from "./builder";
-jest.mock("@calcom/lib/constants", () => ({
+vi.mock("@calcom/lib/constants", () => ({
WEBAPP_URL: "http://localhost:3000",
}));
-jest.mock("short-uuid", () => ({
+vi.mock("short-uuid", () => ({
__esModule: true,
default: () => ({ fromUUID: () => "FAKE_UUID" }),
}));
diff --git a/packages/lib/text.test.ts b/packages/lib/text.test.ts
index 1424775365..4d60a46f14 100644
--- a/packages/lib/text.test.ts
+++ b/packages/lib/text.test.ts
@@ -1,3 +1,5 @@
+import { describe, expect, it } from "vitest";
+
import { truncate } from "./text";
describe("Text util tests", () => {
diff --git a/packages/lib/weekday.test.ts b/packages/lib/weekday.test.ts
index 81f22321fc..076a618562 100644
--- a/packages/lib/weekday.test.ts
+++ b/packages/lib/weekday.test.ts
@@ -1,3 +1,5 @@
+import { describe, expect, it } from "vitest";
+
import { nameOfDay, weekdayNames } from "./weekday";
describe("Weekday tests", () => {
diff --git a/packages/trpc/server/routers/viewer/bookings/get.handler.ts b/packages/trpc/server/routers/viewer/bookings/get.handler.ts
index 7420dbbd97..a3e90a2a8f 100644
--- a/packages/trpc/server/routers/viewer/bookings/get.handler.ts
+++ b/packages/trpc/server/routers/viewer/bookings/get.handler.ts
@@ -102,6 +102,15 @@ export const getHandler = async ({ ctx, input }: GetOptions) => {
},
],
},
+ eventTypeIds: {
+ AND: [
+ {
+ eventTypeId: {
+ in: input.filters?.eventTypeIds,
+ },
+ },
+ ],
+ },
};
const filtersCombined: Prisma.BookingWhereInput[] =
diff --git a/packages/trpc/server/routers/viewer/workflows/getWorkflowActionOptions.handler.ts b/packages/trpc/server/routers/viewer/workflows/getWorkflowActionOptions.handler.ts
index ad12d6ddd6..a4159afcf3 100644
--- a/packages/trpc/server/routers/viewer/workflows/getWorkflowActionOptions.handler.ts
+++ b/packages/trpc/server/routers/viewer/workflows/getWorkflowActionOptions.handler.ts
@@ -17,7 +17,8 @@ type GetWorkflowActionOptionsOptions = {
export const getWorkflowActionOptionsHandler = async ({ ctx }: GetWorkflowActionOptionsOptions) => {
const { user } = ctx;
- const isCurrentUsernamePremium = user && user.metadata && hasKeyInMetadata(user, "isPremium");
+ const isCurrentUsernamePremium =
+ user && hasKeyInMetadata(user, "isPremium") ? !!user.metadata.isPremium : false;
let isTeamsPlan = false;
if (!isCurrentUsernamePremium) {
diff --git a/packages/trpc/server/routers/viewer/workflows/update.handler.ts b/packages/trpc/server/routers/viewer/workflows/update.handler.ts
index bb44f10f2a..64c7fe0ed9 100644
--- a/packages/trpc/server/routers/viewer/workflows/update.handler.ts
+++ b/packages/trpc/server/routers/viewer/workflows/update.handler.ts
@@ -66,7 +66,7 @@ export const updateHandler = async ({ ctx, input }: UpdateOptions) => {
throw new TRPCError({ code: "UNAUTHORIZED" });
}
- const isCurrentUsernamePremium = user && user.metadata && hasKeyInMetadata(user, "isPremium");
+ const isCurrentUsernamePremium = hasKeyInMetadata(user, "isPremium") ? !!user.metadata.isPremium : false;
let isTeamsPlan = false;
if (!isCurrentUsernamePremium) {
diff --git a/packages/ui/components/card/Card.tsx b/packages/ui/components/card/Card.tsx
index 153f1325e4..b7c0dcdb2a 100644
--- a/packages/ui/components/card/Card.tsx
+++ b/packages/ui/components/card/Card.tsx
@@ -152,12 +152,14 @@ export function Card({
{learnMore.text}
)}
-
+ {actionButton?.child && (
+
+ )}
)}
+
+
+ Read the API docs
+
-
- 3. In your new app, go to `Overview` and next to `Installed add-ons`, click `Configure Add-ons`. We need this to set up our database.
- 
-
- 4. Once you clicked on `Configure Add-ons`, click on `Find more add-ons` and search for `postgres`. One of the options will be `Heroku Postgres` - click on that option.
- 
-
- 5. Once the pop-up appears, click `Submit Order Form` - plan name should be `Hobby Dev - Free`.
-
- 
-
- 6. Once you completed the above steps, click on your newly created `Heroku Postgres` and go to its `Settings`.
- 
-
- 7. In `Settings`, copy your URI to your Cal.com .env file and replace the `postgresql://