From a3ec8adeaa8b20d36d96469cdd18fa1b2a1832d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cemal=20K=C4=B1l=C4=B1=C3=A7?=
 <cemalkilic@users.noreply.github.com>
Date: Mon, 24 Nov 2025 11:55:15 +0700
Subject: [PATCH] feat(studio): set email rate limit to 30 when enabling custom
 SMTP (#40638)

---
 .../components/interfaces/Auth/SmtpForm/SmtpForm.tsx   | 10 +++++++++-
 .../interfaces/Auth/SmtpForm/SmtpForm.utils.ts         |  1 -
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/apps/studio/components/interfaces/Auth/SmtpForm/SmtpForm.tsx b/apps/studio/components/interfaces/Auth/SmtpForm/SmtpForm.tsx
index bae64905289..01be3cbe7dc 100644
--- a/apps/studio/components/interfaces/Auth/SmtpForm/SmtpForm.tsx
+++ b/apps/studio/components/interfaces/Auth/SmtpForm/SmtpForm.tsx
@@ -149,7 +149,15 @@ export const SmtpForm = () => {
 
   const onSubmit = (values: SmtpFormValues) => {
     const { ENABLE_SMTP, ...rest } = values
-    const payload = ENABLE_SMTP ? rest : defaultDisabledSmtpFormValues
+    const basePayload = ENABLE_SMTP ? rest : defaultDisabledSmtpFormValues
+
+    // When enabling SMTP, set RATE_LIMIT_EMAIL_SENT to 30
+    // When disabling, backend will handle resetting to default
+    const isEnablingSmtp = ENABLE_SMTP && !isSmtpEnabled(authConfig)
+    const payload = {
+      ...basePayload,
+      ...(isEnablingSmtp && { RATE_LIMIT_EMAIL_SENT: 30 }),
+    }
 
     // Format payload: Convert port to string
     if (payload.SMTP_PORT) {
diff --git a/apps/studio/components/interfaces/Auth/SmtpForm/SmtpForm.utils.ts b/apps/studio/components/interfaces/Auth/SmtpForm/SmtpForm.utils.ts
index 40af16727c2..b7b54b3bb37 100644
--- a/apps/studio/components/interfaces/Auth/SmtpForm/SmtpForm.utils.ts
+++ b/apps/studio/components/interfaces/Auth/SmtpForm/SmtpForm.utils.ts
@@ -27,6 +27,5 @@ export const generateFormValues = (config?: Partial<AuthConfig>): Partial<AuthCo
     SMTP_PASS: '',
     SMTP_PORT: config?.SMTP_PORT ?? '465',
     SMTP_MAX_FREQUENCY: config?.SMTP_MAX_FREQUENCY ?? 60,
-    RATE_LIMIT_EMAIL_SENT: config?.RATE_LIMIT_EMAIL_SENT ?? 30,
   }
 }