From 9f1aa5be6df31aeb3e969bb6bc71a2d792c47105 Mon Sep 17 00:00:00 2001
From: EthanHealy01 <ethan.healy.21@gmail.com>
Date: Tue, 23 Sep 2025 13:11:05 +0100
Subject: [PATCH] combine steps 2 and 3

---
 .../public/locales/en-GB/translation.json     |  3 +-
 .../public/locales/en-US/translation.json     |  3 +-
 frontend/src/tools/AddStamp.tsx               | 30 ++++++-------------
 3 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/frontend/public/locales/en-GB/translation.json b/frontend/public/locales/en-GB/translation.json
index b85080e27..72f305b05 100644
--- a/frontend/public/locales/en-GB/translation.json
+++ b/frontend/public/locales/en-GB/translation.json
@@ -2178,6 +2178,7 @@
     "tags": "Stamp, Add image, center image, Watermark, PDF, Embed, Customize,Customise",
     "header": "Stamp PDF",
     "title": "Stamp PDF",
+    "stampSetup": "Stamp Setup",
     "stampType": "Stamp Type",
     "stampText": "Stamp Text",
     "stampImage": "Stamp Image",
@@ -2191,7 +2192,7 @@
     "customMargin": "Custom Margin",
     "customColor": "Custom Text Colour",
     "submit": "Submit",
-    "noStampSelected": "No stamp selected. Return to Step 3."
+    "noStampSelected": "No stamp selected. Return to Step 1."
   },
   "removeImagePdf": {
     "tags": "Remove Image,Page operations,Back end,server side"
diff --git a/frontend/public/locales/en-US/translation.json b/frontend/public/locales/en-US/translation.json
index ba95d6c77..c241b3909 100644
--- a/frontend/public/locales/en-US/translation.json
+++ b/frontend/public/locales/en-US/translation.json
@@ -1455,6 +1455,7 @@
     "tags": "Stamp, Add image, center image, Watermark, PDF, Embed, Customize",
     "header": "Stamp PDF",
     "title": "Stamp PDF",
+    "stampSetup": "Stamp Setup",
     "stampType": "Stamp Type",
     "stampText": "Stamp Text",
     "stampImage": "Stamp Image",
@@ -1468,7 +1469,7 @@
     "customMargin": "Custom Margin",
     "customColor": "Custom Text Color",
     "submit": "Submit",
-    "noStampSelected": "No stamp selected. Return to Step 3."
+    "noStampSelected": "No stamp selected. Return to Step 1."
   },
   "removeImagePdf": {
     "tags": "Remove Image,Page operations,Back end,server side"
diff --git a/frontend/src/tools/AddStamp.tsx b/frontend/src/tools/AddStamp.tsx
index ef1d8544e..61cb45c84 100644
--- a/frontend/src/tools/AddStamp.tsx
+++ b/frontend/src/tools/AddStamp.tsx
@@ -6,7 +6,7 @@ import { BaseToolProps, ToolComponent } from "../types/tool";
 import { useEndpointEnabled } from "../hooks/useEndpointConfig";
 import { useAddStampParameters } from "../components/tools/addStamp/useAddStampParameters";
 import { useAddStampOperation } from "../components/tools/addStamp/useAddStampOperation";
-import { Group, Select, Stack, Textarea, TextInput, ColorInput, Button, Slider, Text, NumberInput } from "@mantine/core";
+import { Group, Select, Stack, Textarea, TextInput, ColorInput, Button, Slider, Text, NumberInput, Divider } from "@mantine/core";
 import StampPreview from "../components/tools/addStamp/StampPreview";
 import LocalIcon from "../components/shared/LocalIcon";
 import styles from "../components/tools/addStamp/StampPreview.module.css";
@@ -50,14 +50,13 @@ const AddStamp = ({ onPreviewFile, onComplete, onError }: BaseToolProps) => {
 
   enum AddStampStep {
     NONE = 'none',
-    PAGE_SELECTION = 'pageSelection',
-    STAMP_TYPE = 'stampType',
+    STAMP_SETUP = 'stampSetup',
     POSITION_FORMATTING = 'positionFormatting'
   }
 
   const accordion = useAccordionSteps<AddStampStep>({
     noneValue: AddStampStep.NONE,
-    initialStep: AddStampStep.PAGE_SELECTION,
+    initialStep: AddStampStep.STAMP_SETUP,
     stateConditions: {
       hasFiles,
       hasResults
@@ -71,11 +70,11 @@ const AddStamp = ({ onPreviewFile, onComplete, onError }: BaseToolProps) => {
   const getSteps = () => {
     const steps: any[] = [];
 
-    // Step 1: File settings (page selection)
+    // Step 1: Stamp Setup 
     steps.push({
-      title: t("AddStampRequest.pageSelection", "Page Selection"),
-      isCollapsed: accordion.getCollapsedState(AddStampStep.PAGE_SELECTION),
-      onCollapsedClick: () => accordion.handleStepToggle(AddStampStep.PAGE_SELECTION),
+      title: t("AddStampRequest.stampSetup", "Stamp Setup"),
+      isCollapsed: accordion.getCollapsedState(AddStampStep.STAMP_SETUP),
+      onCollapsedClick: () => accordion.handleStepToggle(AddStampStep.STAMP_SETUP),
       isVisible: hasFiles || hasResults,
       content: (
         <Stack gap="md">
@@ -85,18 +84,7 @@ const AddStamp = ({ onPreviewFile, onComplete, onError }: BaseToolProps) => {
             onChange={(e) => params.updateParameter('pageNumbers', e.currentTarget.value)}
             disabled={endpointLoading}
           />
-        </Stack>
-      ),
-    });
-
-    // Step 2: Type & Content
-    steps.push({
-      title: t("AddStampRequest.stampType", "Stamp Type"),
-      isCollapsed: accordion.getCollapsedState(AddStampStep.STAMP_TYPE),
-      onCollapsedClick: () => accordion.handleStepToggle(AddStampStep.STAMP_TYPE),
-      isVisible: hasFiles || hasResults,
-      content: (
-        <Stack gap="md" justify="space-between" flex={1}>
+          <Divider/>
           <div>
             <Text size="sm" fw={500} mb="xs">{t('AddStampRequest.stampType', 'Stamp Type')}</Text>
             <ButtonSelector
@@ -374,7 +362,7 @@ const AddStamp = ({ onPreviewFile, onComplete, onError }: BaseToolProps) => {
             }
             overlayMessage={
               <Text size="sm" c="white" fw={600}>
-                {t('AddStampRequest.noStampSelected', 'No stamp selected. Return to Step 3.')}
+                {t('AddStampRequest.noStampSelected', 'No stamp selected. Return to Step 1.')}
               </Text>
             }
           >