From 54f36af94339762c9cee045644972b2b4f917ac1 Mon Sep 17 00:00:00 2001
From: Mendral AI <sam+githubbot@mendral.com>
Date: Tue, 7 Apr 2026 11:13:17 -0700
Subject: [PATCH 1/3] fix(tests): add missing vi.mock() to prevent vitest
 worker shutdown flake in InstantBookingCreateService (#28773)

Signed-off-by: Mendral Agent <support@mendral.com>
Co-authored-by: Mendral Agent <support@mendral.com>
---
 .../bookings/lib/service/InstantBookingCreateService.test.ts  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/features/bookings/lib/service/InstantBookingCreateService.test.ts b/packages/features/bookings/lib/service/InstantBookingCreateService.test.ts
index 25d6a2606e0f3f..ca29d2b1b8a200 100644
--- a/packages/features/bookings/lib/service/InstantBookingCreateService.test.ts
+++ b/packages/features/bookings/lib/service/InstantBookingCreateService.test.ts
@@ -22,6 +22,10 @@ vi.mock("@calcom/features/notifications/sendNotification", () => ({
   sendNotification: vi.fn(),
 }));
 
+vi.mock("@calcom/app-store/feishucalendar/lib/CalendarService", () => ({
+  default: class MockFeishuCalendarService {},
+}));
+
 vi.mock("@calcom/features/conferencing/lib/videoClient", () => ({
   createInstantMeetingWithCalVideo: vi.fn().mockResolvedValue({
     type: "daily_video",

From cdeaca4dc2d6388561fdc4675d08d5844f4e3b54 Mon Sep 17 00:00:00 2001
From: Abhishek Saxena <saxenaa218@gmail.com>
Date: Tue, 7 Apr 2026 23:47:46 +0530
Subject: [PATCH 2/3] fix(web): add vertical padding to social login buttons
 (#28767)

---
 apps/web/modules/auth/login-view.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/web/modules/auth/login-view.tsx b/apps/web/modules/auth/login-view.tsx
index bf7ac4fc18a9bb..a8808175e0a909 100644
--- a/apps/web/modules/auth/login-view.tsx
+++ b/apps/web/modules/auth/login-view.tsx
@@ -218,7 +218,7 @@ export default function Login({
                 <div className="flex flex-col gap-2">
                   {isGoogleLoginEnabled && (
                     <Button
-                      className="w-full"
+                      className="w-full py-1"
                       disabled={formState.isSubmitting}
                       data-testid="google"
                       onClick={async (e) => {
@@ -236,7 +236,7 @@ export default function Login({
                   {isOutlookLoginEnabled && (
                     <Button
                       variant="outline"
-                      className="w-full"
+                      className="w-full py-1"
                       data-testid="microsoft"
                       onClick={async (e) => {
                         e.preventDefault();

From 3c52f5723105a9c65bb24c4fd3ef12f1d85a2485 Mon Sep 17 00:00:00 2001
From: Akash Santra <santraakash999@gmail.com>
Date: Tue, 7 Apr 2026 23:57:44 +0530
Subject: [PATCH 3/3] fix: prevent negative wait time in rate limit error
 message (#28765)

Co-authored-by: Romit <85230081+romitg2@users.noreply.github.com>
---
 .../lib/checkRateLimitAndThrowError.test.ts     | 17 +++++++++++++++++
 packages/lib/checkRateLimitAndThrowError.ts     |  2 +-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/packages/lib/checkRateLimitAndThrowError.test.ts b/packages/lib/checkRateLimitAndThrowError.test.ts
index 0c20560b585c22..993335853a363f 100644
--- a/packages/lib/checkRateLimitAndThrowError.test.ts
+++ b/packages/lib/checkRateLimitAndThrowError.test.ts
@@ -67,4 +67,21 @@ describe("checkRateLimitAndThrowError", () => {
 
     await expect(checkRateLimitAndThrowError({ rateLimitingType, identifier })).resolves.not.toThrow();
   });
+  it("should not return negative wait time when reset is in the past", async () => {
+    vi.mocked(rateLimiter).mockReturnValue(() => {
+      return {
+        limit: 10,
+        remaining: -1,
+        reset: Date.now() - 5000, // past time
+        success: false,
+      } as RatelimitResponse;
+    });
+
+    const identifier = "test-identifier";
+    const rateLimitingType = "core";
+
+    await expect(
+      checkRateLimitAndThrowError({ rateLimitingType, identifier })
+    ).rejects.toThrow("0 seconds");
+  });
 });
diff --git a/packages/lib/checkRateLimitAndThrowError.ts b/packages/lib/checkRateLimitAndThrowError.ts
index 35ada22389032b..73f01132bee201 100644
--- a/packages/lib/checkRateLimitAndThrowError.ts
+++ b/packages/lib/checkRateLimitAndThrowError.ts
@@ -13,7 +13,7 @@ export async function checkRateLimitAndThrowError({
   const { success, reset } = response;
   if (!success) {
     const convertToSeconds = (ms: number) => Math.floor(ms / 1000);
-    const secondsToWait = convertToSeconds(reset - Date.now());
+    const secondsToWait = Math.max(0, convertToSeconds(reset - Date.now()));
     throw new HttpError({
       statusCode: 429,
       message: `Rate limit exceeded. Try again in ${secondsToWait} seconds.`,