From 1b40f5d47584a68285488e47367d49dffce607de Mon Sep 17 00:00:00 2001
From: Scott Wilson <scottraywilson@gmail.com>
Date: Tue, 12 Aug 2025 14:08:17 -0700
Subject: [PATCH 1/3] improvement: adjust commit modal wording and icons and
 autofocus commit message

---
 .../SecretDashboardPage.tsx                   |  4 ++--
 .../components/CommitForm/CommitForm.tsx      | 23 +++++++++++++------
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/frontend/src/pages/secret-manager/SecretDashboardPage/SecretDashboardPage.tsx b/frontend/src/pages/secret-manager/SecretDashboardPage/SecretDashboardPage.tsx
index 3d9e58b3c..9241c2c6f 100644
--- a/frontend/src/pages/secret-manager/SecretDashboardPage/SecretDashboardPage.tsx
+++ b/frontend/src/pages/secret-manager/SecretDashboardPage/SecretDashboardPage.tsx
@@ -328,12 +328,12 @@ const Page = () => {
       createNotification({
         text: isProtectedBranch
           ? "Requested changes have been sent for review"
-          : "Changes committed successfully",
+          : "Changes saved successfully",
         type: "success"
       });
     } catch (error) {
       createNotification({
-        text: "Failed to commit changes",
+        text: "Failed to save changes",
         type: "error"
       });
       console.error(error);
diff --git a/frontend/src/pages/secret-manager/SecretDashboardPage/components/CommitForm/CommitForm.tsx b/frontend/src/pages/secret-manager/SecretDashboardPage/components/CommitForm/CommitForm.tsx
index c2e3ab12b..0d4983247 100644
--- a/frontend/src/pages/secret-manager/SecretDashboardPage/components/CommitForm/CommitForm.tsx
+++ b/frontend/src/pages/secret-manager/SecretDashboardPage/components/CommitForm/CommitForm.tsx
@@ -1,6 +1,14 @@
 /* eslint-disable jsx-a11y/label-has-associated-control */
 import React, { useCallback, useState } from "react";
-import { faCodeCommit, faEye, faFolder, faKey } from "@fortawesome/free-solid-svg-icons";
+import {
+  faClipboardCheck,
+  faClipboardList,
+  faCodeCommit,
+  faEye,
+  faFolder,
+  faKey,
+  faSave
+} from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 
 import { Badge, Button, Input, Modal, ModalContent } from "@app/components/v2";
@@ -328,12 +336,12 @@ export const CommitForm: React.FC<CommitFormProps> = ({
               </Button>
               <Button
                 variant="solid"
-                leftIcon={<FontAwesomeIcon icon={faEye} />}
+                leftIcon={<FontAwesomeIcon icon={faSave} />}
                 onClick={() => setIsModalOpen(true)}
                 isDisabled={totalChangesCount === 0}
                 className="px-6"
               >
-                Review Changes
+                Save Changes
               </Button>
             </div>
           </div>
@@ -345,14 +353,14 @@ export const CommitForm: React.FC<CommitFormProps> = ({
         <ModalContent
           title={
             <div className="flex items-center gap-2">
-              <FontAwesomeIcon icon={faCodeCommit} className="text-mineshaft-400" />
-              Commit Changes
+              <FontAwesomeIcon icon={faClipboardCheck} className="text-mineshaft-400" />
+              Review Changes
               <Badge variant="primary" className="mt-[0.05rem]">
                 {totalChangesCount} Change{totalChangesCount !== 1 ? "s" : ""}
               </Badge>
             </div>
           }
-          subTitle={"Write a commit message and review the changes you&apos;re about to commit."}
+          subTitle="Write a commit message and review the changes you're about to save."
           className="max-h-[90vh] max-w-[95%] md:max-w-7xl"
         >
           <div className="space-y-6">
@@ -413,6 +421,7 @@ export const CommitForm: React.FC<CommitFormProps> = ({
                 onChange={(e) => setCommitMessage(e.target.value)}
                 placeholder="Describe your changes..."
                 className="w-full"
+                autoFocus
                 required
               />
             </div>
@@ -435,7 +444,7 @@ export const CommitForm: React.FC<CommitFormProps> = ({
                 colorSchema="primary"
                 variant="outline_bg"
               >
-                {isCommitting ? "Committing..." : "Commit Changes"}
+                {isCommitting ? "Save..." : "Save Changes"}
               </Button>
             </div>
           </div>

From d5390fcafc9e00bf9cf28981c1b935e9123670db Mon Sep 17 00:00:00 2001
From: Scott Wilson <scottraywilson@gmail.com>
Date: Tue, 12 Aug 2025 14:10:24 -0700
Subject: [PATCH 2/3] fix: correct saving tense

---
 .../SecretDashboardPage/components/CommitForm/CommitForm.tsx    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/pages/secret-manager/SecretDashboardPage/components/CommitForm/CommitForm.tsx b/frontend/src/pages/secret-manager/SecretDashboardPage/components/CommitForm/CommitForm.tsx
index 0d4983247..f1a7c0d52 100644
--- a/frontend/src/pages/secret-manager/SecretDashboardPage/components/CommitForm/CommitForm.tsx
+++ b/frontend/src/pages/secret-manager/SecretDashboardPage/components/CommitForm/CommitForm.tsx
@@ -444,7 +444,7 @@ export const CommitForm: React.FC<CommitFormProps> = ({
                 colorSchema="primary"
                 variant="outline_bg"
               >
-                {isCommitting ? "Save..." : "Save Changes"}
+                {isCommitting ? "Saving..." : "Save Changes"}
               </Button>
             </div>
           </div>

From 7c28ee844ed1ea8c0a4b032e0d4c0c33e94a6d76 Mon Sep 17 00:00:00 2001
From: Carlos Monastyrski <charly.monastyrski@gmail.com>
Date: Tue, 12 Aug 2025 14:30:46 -0700
Subject: [PATCH 3/3] Type fix

---
 .../SecretDashboardPage/components/CommitForm/CommitForm.tsx    | 2 --
 1 file changed, 2 deletions(-)

diff --git a/frontend/src/pages/secret-manager/SecretDashboardPage/components/CommitForm/CommitForm.tsx b/frontend/src/pages/secret-manager/SecretDashboardPage/components/CommitForm/CommitForm.tsx
index f1a7c0d52..9bf9e3a15 100644
--- a/frontend/src/pages/secret-manager/SecretDashboardPage/components/CommitForm/CommitForm.tsx
+++ b/frontend/src/pages/secret-manager/SecretDashboardPage/components/CommitForm/CommitForm.tsx
@@ -2,9 +2,7 @@
 import React, { useCallback, useState } from "react";
 import {
   faClipboardCheck,
-  faClipboardList,
   faCodeCommit,
-  faEye,
   faFolder,
   faKey,
   faSave