From 7a5e83099caac0bf7d9ff5886bdbf9c49a8a1482 Mon Sep 17 00:00:00 2001
From: Eliezer Steinbock <3090527+elie222@users.noreply.github.com>
Date: Sun, 13 Jul 2025 10:49:18 +0200
Subject: [PATCH 1/2] Split out settings tab

---
 .../[emailAccountId]/assistant/RulesTab.tsx   | 24 +++++++++++++++
 .../assistant/SettingsTab.tsx                 | 30 ++++---------------
 .../[emailAccountId]/automation/page.tsx      | 11 ++++++-
 version.txt                                   |  2 +-
 4 files changed, 40 insertions(+), 27 deletions(-)
 create mode 100644 apps/web/app/(app)/[emailAccountId]/assistant/RulesTab.tsx

diff --git a/apps/web/app/(app)/[emailAccountId]/assistant/RulesTab.tsx b/apps/web/app/(app)/[emailAccountId]/assistant/RulesTab.tsx
new file mode 100644
index 0000000000..0dd4ebe728
--- /dev/null
+++ b/apps/web/app/(app)/[emailAccountId]/assistant/RulesTab.tsx
@@ -0,0 +1,24 @@
+import { Rules } from "@/app/(app)/[emailAccountId]/assistant/Rules";
+import { RulesPrompt } from "@/app/(app)/[emailAccountId]/assistant/RulesPrompt";
+import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
+
+export function RulesTab() {
+  return (
+    <Tabs defaultValue="prompt" searchParam="settings-tab">
+      <div className="flex items-center gap-2 pt-2">
+        <span className="text-sm font-medium">View as:</span>
+        <TabsList>
+          <TabsTrigger value="prompt">Prompt</TabsTrigger>
+          <TabsTrigger value="rules">Rules</TabsTrigger>
+        </TabsList>
+      </div>
+
+      <TabsContent value="prompt">
+        <RulesPrompt />
+      </TabsContent>
+      <TabsContent value="rules">
+        <Rules />
+      </TabsContent>
+    </Tabs>
+  );
+}
diff --git a/apps/web/app/(app)/[emailAccountId]/assistant/SettingsTab.tsx b/apps/web/app/(app)/[emailAccountId]/assistant/SettingsTab.tsx
index 3c0df5deca..41d6b1076d 100644
--- a/apps/web/app/(app)/[emailAccountId]/assistant/SettingsTab.tsx
+++ b/apps/web/app/(app)/[emailAccountId]/assistant/SettingsTab.tsx
@@ -1,33 +1,13 @@
 import { AboutSetting } from "@/app/(app)/[emailAccountId]/assistant/AboutSetting";
 import { DigestSetting } from "@/app/(app)/[emailAccountId]/assistant/DigestSetting";
 import { DraftReplies } from "@/app/(app)/[emailAccountId]/assistant/DraftReplies";
-import { Rules } from "@/app/(app)/[emailAccountId]/assistant/Rules";
-import { RulesPrompt } from "@/app/(app)/[emailAccountId]/assistant/RulesPrompt";
-import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
 
 export function SettingsTab() {
   return (
-    <Tabs defaultValue="prompt" searchParam="settings-tab">
-      <div className="flex items-center gap-2 pt-2">
-        <span className="text-sm font-medium">View as:</span>
-        <TabsList>
-          <TabsTrigger value="prompt">Prompt</TabsTrigger>
-          <TabsTrigger value="rules">Rules</TabsTrigger>
-        </TabsList>
-      </div>
-
-      <TabsContent value="prompt">
-        <RulesPrompt />
-      </TabsContent>
-      <TabsContent value="rules">
-        <Rules />
-      </TabsContent>
-
-      <div className="mt-8 space-y-2">
-        <DraftReplies />
-        <AboutSetting />
-        <DigestSetting />
-      </div>
-    </Tabs>
+    <div className="space-y-2">
+      <DraftReplies />
+      <AboutSetting />
+      <DigestSetting />
+    </div>
   );
 }
diff --git a/apps/web/app/(app)/[emailAccountId]/automation/page.tsx b/apps/web/app/(app)/[emailAccountId]/automation/page.tsx
index d92b1db49a..b9e165eea8 100644
--- a/apps/web/app/(app)/[emailAccountId]/automation/page.tsx
+++ b/apps/web/app/(app)/[emailAccountId]/automation/page.tsx
@@ -19,10 +19,16 @@ import { checkUserOwnsEmailAccount } from "@/utils/email-account";
 import { SettingsTab } from "@/app/(app)/[emailAccountId]/assistant/SettingsTab";
 import { PageHeading } from "@/components/Typography";
 import { TabSelect } from "@/components/TabSelect";
+import { RulesTab } from "@/app/(app)/[emailAccountId]/assistant/RulesTab";
 
 export const maxDuration = 300; // Applies to the actions
 
 const tabOptions = (emailAccountId: string) => [
+  {
+    id: "rules",
+    label: "Rules",
+    href: `/${emailAccountId}/automation?tab=rules`,
+  },
   {
     id: "settings",
     label: "Settings",
@@ -106,7 +112,10 @@ export default async function AutomationPage({
                 </Suspense>
               </div>
 
-              <Tabs defaultValue="settings">
+              <Tabs defaultValue="rules">
+                <TabsContent value="rules" className="mb-10">
+                  <RulesTab />
+                </TabsContent>
                 <TabsContent value="settings" className="mb-10">
                   <SettingsTab />
                 </TabsContent>
diff --git a/version.txt b/version.txt
index ba1e8bf0bd..b95e90dc75 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-v1.9.1
+v1.9.2

From 1f57f52eeef1b282cfd62a9ba52a4a3eba30ea4f Mon Sep 17 00:00:00 2001
From: Eliezer Steinbock <3090527+elie222@users.noreply.github.com>
Date: Sun, 13 Jul 2025 11:04:24 +0200
Subject: [PATCH 2/2] clean up naming

---
 apps/web/app/(app)/[emailAccountId]/assistant/RulesTab.tsx | 2 +-
 apps/web/app/(app)/[emailAccountId]/automation/page.tsx    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/web/app/(app)/[emailAccountId]/assistant/RulesTab.tsx b/apps/web/app/(app)/[emailAccountId]/assistant/RulesTab.tsx
index 0dd4ebe728..2862b015c4 100644
--- a/apps/web/app/(app)/[emailAccountId]/assistant/RulesTab.tsx
+++ b/apps/web/app/(app)/[emailAccountId]/assistant/RulesTab.tsx
@@ -4,7 +4,7 @@ import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
 
 export function RulesTab() {
   return (
-    <Tabs defaultValue="prompt" searchParam="settings-tab">
+    <Tabs defaultValue="prompt" searchParam="view">
       <div className="flex items-center gap-2 pt-2">
         <span className="text-sm font-medium">View as:</span>
         <TabsList>
diff --git a/apps/web/app/(app)/[emailAccountId]/automation/page.tsx b/apps/web/app/(app)/[emailAccountId]/automation/page.tsx
index b9e165eea8..91029eb617 100644
--- a/apps/web/app/(app)/[emailAccountId]/automation/page.tsx
+++ b/apps/web/app/(app)/[emailAccountId]/automation/page.tsx
@@ -100,7 +100,7 @@ export default async function AutomationPage({
                   fallback={
                     <TabSelect
                       options={tabOptions(emailAccountId)}
-                      selected={tab ?? "settings"}
+                      selected={tab ?? "rules"}
                     />
                   }
                 >
@@ -160,7 +160,7 @@ async function TabNavigation({
             ]
           : []),
       ]}
-      selected={tab ?? "settings"}
+      selected={tab ?? "rules"}
     />
   );
 }