diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
deleted file mode 100644
index e196dae09e..0000000000
--- a/.devcontainer/devcontainer.json
+++ /dev/null
@@ -1,42 +0,0 @@
-// For format details, see https://aka.ms/devcontainer.json. For config options, see the
-// README at: https://github.com/devcontainers/templates/tree/main/src/docker-outside-of-docker
-{
- "name": "Docker outside of Docker",
- // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
- "image": "mcr.microsoft.com/devcontainers/base:bullseye",
-
- "features": {
- "ghcr.io/devcontainers/features/docker-from-docker:1": {
- "version": "latest",
- "enableNonRootDocker": "true",
- "moby": "true"
- },
- "ghcr.io/devcontainers/features/node:1": {},
- "ghcr.io/devcontainers-contrib/features/npm-package:1": {},
- "ghcr.io/devcontainers-contrib/features/jest:2": {},
- "ghcr.io/devcontainers-contrib/features/prisma:2": {},
- "ghcr.io/guiyomh/features/vim:0": {}
- },
-
- // Use this environment variable if you need to bind mount your local source code into a new container.
- "remoteEnv": {
- "LOCAL_WORKSPACE_FOLDER": "${localWorkspaceFolder}"
- },
-
- "hostRequirements": {
- "cpus": 4,
- "memory": "8gb"
- },
-
- // Use 'postCreateCommand' to run commands after the container is created.
- "postCreateCommand": "./deploy/install.sh"
-
- // Use 'forwardPorts' to make a list of ports inside the container available locally.
- // "forwardPorts": [],
-
- // Configure tool-specific properties.
- // "customizations": {},
-
- // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
- // "remoteUser": "root"
-}
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 919ae19b36..4c07cd934a 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -6,6 +6,6 @@
},
"typescript.preferences.importModuleSpecifier": "non-relative",
"spellright.language": ["en"],
- "spellright.documentTypes": ["markdown", "typescript"],
+ "spellright.documentTypes": ["markdown", "typescript", "typescriptreact"],
"tailwindCSS.experimental.classRegex": [["cva\\(([^)]*)\\)", "[\"'`]([^\"'`]*).*?[\"'`]"]]
}
diff --git a/apps/storybook/.storybook/main.js b/apps/storybook/.storybook/main.js
index 9b0d21eada..ae653ae06e 100644
--- a/apps/storybook/.storybook/main.js
+++ b/apps/storybook/.storybook/main.js
@@ -71,5 +71,5 @@ module.exports = {
return config;
},
- typescript: { reactDocgen: 'react-docgen' }
+ typescript: { reactDocgen: "react-docgen" },
};
diff --git a/apps/web/components/booking/AvailableTimes.tsx b/apps/web/components/booking/AvailableTimes.tsx
index 19cabe0b85..394225ba3a 100644
--- a/apps/web/components/booking/AvailableTimes.tsx
+++ b/apps/web/components/booking/AvailableTimes.tsx
@@ -11,7 +11,7 @@ import useMediaQuery from "@calcom/lib/hooks/useMediaQuery";
import { TimeFormat } from "@calcom/lib/timeFormat";
import { nameOfDay } from "@calcom/lib/weekday";
import { trpc } from "@calcom/trpc/react";
-import type { Slot } from "@calcom/trpc/server/routers/viewer/slots";
+import type { Slot } from "@calcom/trpc/server/routers/viewer/slots/types";
import { SkeletonContainer, SkeletonText, ToggleGroup } from "@calcom/ui";
import classNames from "@lib/classNames";
diff --git a/apps/web/components/booking/BookingListItem.tsx b/apps/web/components/booking/BookingListItem.tsx
index 64c7d24b09..63a8a9fe2d 100644
--- a/apps/web/components/booking/BookingListItem.tsx
+++ b/apps/web/components/booking/BookingListItem.tsx
@@ -280,13 +280,13 @@ function BookingListItem(booking: BookingItemProps) {
isOpenDialog={isOpenSetLocationDialog}
setShowLocationModal={setIsOpenLocationDialog}
/>
- {booking.paid && (
+ {booking.paid && booking.payment[0] && (
{t("two_factor_auth")}
-