From 4fe1ece010b4397d8a1bb726415f39e7d48086ab Mon Sep 17 00:00:00 2001
From: Sapphire <imsapphire0@gmail.com>
Date: Fri, 6 Mar 2026 02:10:34 -0600
Subject: [PATCH] Don't always advance to next Stay Aligned setup step on reset

---
 .../stay-aligned-steps/PreparationStep.tsx             | 10 +++++++++-
 .../stay-aligned/stay-aligned-steps/VerifyMounting.tsx |  7 ++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/gui/src/components/onboarding/pages/stay-aligned/stay-aligned-steps/PreparationStep.tsx b/gui/src/components/onboarding/pages/stay-aligned/stay-aligned-steps/PreparationStep.tsx
index 78a6c5abe..f1b328634 100644
--- a/gui/src/components/onboarding/pages/stay-aligned/stay-aligned-steps/PreparationStep.tsx
+++ b/gui/src/components/onboarding/pages/stay-aligned/stay-aligned-steps/PreparationStep.tsx
@@ -11,6 +11,7 @@ import { ResetType } from 'solarxr-protocol';
 export function PreparationStep({
   nextStep,
   prevStep,
+  isActive,
 }: VerticalStepComponentProps) {
   return (
     <div className="flex flex-col flex-grow justify-between py-2 gap-2">
@@ -53,7 +54,14 @@ export function PreparationStep({
           <Button variant={'secondary'} onClick={prevStep} />
         </Localized>
 
-        <ResetButton type={ResetType.Full} onReseted={nextStep} />
+        <ResetButton
+          type={ResetType.Full}
+          onReseted={() => {
+            if (isActive) {
+              nextStep();
+            }
+          }}
+        />
       </div>
     </div>
   );
diff --git a/gui/src/components/onboarding/pages/stay-aligned/stay-aligned-steps/VerifyMounting.tsx b/gui/src/components/onboarding/pages/stay-aligned/stay-aligned-steps/VerifyMounting.tsx
index 18f969e87..6c5d72862 100644
--- a/gui/src/components/onboarding/pages/stay-aligned/stay-aligned-steps/VerifyMounting.tsx
+++ b/gui/src/components/onboarding/pages/stay-aligned/stay-aligned-steps/VerifyMounting.tsx
@@ -10,6 +10,7 @@ import { ManualMountingPageStayAligned } from '@/components/onboarding/pages/mou
 export function VerifyMountingStep({
   nextStep,
   prevStep,
+  isActive,
 }: VerticalStepComponentProps) {
   const { isMobile } = useBreakpoint('mobile');
   const [isOpen, setOpen] = useState(false);
@@ -79,7 +80,11 @@ export function VerifyMountingStep({
             onClick={() => setDisableMounting(true)}
             type={ResetType.Mounting}
             group="default"
-            onReseted={goNextStep}
+            onReseted={() => {
+              if (isActive) {
+                nextStep();
+              }
+            }}
             onFailed={() => setDisableMounting(false)}
           />
         </div>