From 0cf603fc7955252279d7ac298951a613c35cb02f Mon Sep 17 00:00:00 2001
From: TekH <h.tek@digitaldata.works>
Date: Thu, 5 Nov 2026 16:18:17 +0100
Subject: [PATCH] Swap steps 1 and 3 in CreateEnvelopeWizardPopup

Reorganize the wizard steps to prioritize "Receivers" (step 1)
before "Message and Options" (step 3). Update `_currentStep`
logic, conditional checks, and validation to reflect the new
step order. Adjust `GetStepTitle` and `GetStepDescription`
methods to align with the updated step titles and descriptions.
Ensure user input handling and step-skipping behavior are
consistent with the new flow.
---
 .../Sender/CreateEnvelopeWizardPopup.razor    | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Components/Sender/CreateEnvelopeWizardPopup.razor b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Components/Sender/CreateEnvelopeWizardPopup.razor
index bab1bd41..090cc193 100644
--- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Components/Sender/CreateEnvelopeWizardPopup.razor
+++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Components/Sender/CreateEnvelopeWizardPopup.razor
@@ -74,7 +74,7 @@
                                                 </div>
                                             </div>
                                         }
-                                        else if (_currentStep == 1)
+                                        else if (_currentStep == 3)
                                         {
                                             <div class="sender-create-wizard__form-grid">
                                                 <div class="sender-create-wizard__field sender-create-wizard__field--full">
@@ -188,7 +188,7 @@
                                                 </div>
                                             </div>
                                         }
-                                        else if (_currentStep == 3)
+                                        else if (_currentStep == 1)
                                         {
                                             <div class="sender-create-wizard__suggestions">
                                                 <div class="sender-create-wizard__suggestions-title">@L("SenderWizard_RecentReceivers", "Zuletzt verwendete Empfänger")</div>
@@ -465,7 +465,7 @@
 
     private bool IsFirstStep => _currentStep <= 0;
     private bool IsLastStep => _currentStep >= TotalSteps - 1;
-    private bool CanSkipCurrentStep => _currentStep == 1;
+    private bool CanSkipCurrentStep => _currentStep == 3;
 
     private IReadOnlyList<RecentReceiverSuggestionDto> FilteredRecentSuggestions =>
         BuildFilteredRecentSuggestions();
@@ -481,9 +481,9 @@
     private string GetStepTitle(int step) => step switch
     {
         0 => L("SenderWizard_Step_Basics", "Grunddaten"),
-        1 => L("SenderWizard_Step_Message", "Nachricht und Optionen"),
+        1 => L("SenderWizard_Step_Receivers", "Empfänger"),
         2 => L("SenderEditor_EnvelopeSettings", "Envelope-Einstellungen"),
-        3 => L("SenderWizard_Step_Receivers", "Empfänger"),
+        3 => L("SenderWizard_Step_Message", "Nachricht und Optionen"),
         4 => L("SenderWizard_Step_Document", "Dokument"),
         _ => L("SenderWizard_Step_Basics", "Grunddaten")
     };
@@ -491,9 +491,9 @@
     private string GetStepDescription(int step) => step switch
     {
         0 => L("SenderWizard_Step_Basics_Desc", "Starten Sie mit den Pflichtangaben für den Umschlag."),
-        1 => L("SenderWizard_Step_Message_Desc", "Fügen Sie optionale Nachricht und Einstellungen hinzu."),
+        1 => L("SenderWizard_Step_Receivers_Desc", "Definieren Sie die Empfänger für den Signaturprozess."),
         2 => L("SenderWizard_Step_Settings_Desc", "Konfigurieren Sie Sicherheits-, Erinnerungs- und Ablaufoptionen."),
-        3 => L("SenderWizard_Step_Receivers_Desc", "Definieren Sie die Empfänger für den Signaturprozess."),
+        3 => L("SenderWizard_Step_Message_Desc", "Fügen Sie optionale Nachricht und Einstellungen hinzu."),
         4 => L("SenderWizard_Step_Document_Desc", "Laden Sie das Dokument hoch und platzieren Sie Signaturfelder."),
         _ => L("SenderWizard_Step_Basics_Desc", "Starten Sie mit den Pflichtangaben für den Umschlag.")
     };
@@ -716,7 +716,7 @@
             {
                 _currentStep++;
 
-                if (_currentStep == 3)
+                if (_currentStep == 1)
                     await EnsureRecentSuggestionsLoadedAsync();
             }
         }
@@ -810,10 +810,10 @@
         if (!string.Equals(args.Key, "Enter", StringComparison.OrdinalIgnoreCase))
             return;
 
-        if (_currentStep == 1)
+        if (_currentStep == 3)
             return;
 
-        if (_currentStep == 3 && (!string.IsNullOrWhiteSpace(_receiverName) || !string.IsNullOrWhiteSpace(_receiverEmail)))
+        if (_currentStep == 1 && (!string.IsNullOrWhiteSpace(_receiverName) || !string.IsNullOrWhiteSpace(_receiverEmail)))
         {
             await AddReceiver();
             return;
@@ -907,7 +907,7 @@
             return true;
         }
 
-        if (_currentStep == 3)
+        if (_currentStep == 1)
         {
             if (_receivers.Count == 0)
             {