From 04864f124fe175b8273a568721c716bbe67ab25f Mon Sep 17 00:00:00 2001
From: regexowl <ksimicko@redhat.com>
Date: Wed, 1 Apr 2026 16:29:58 +0200
Subject: [PATCH 1/2] Wizard: Gate repositories title and description

This adds gating logic to render the title and the descriptions of the repositories step differently for WizardV3.
---
 .../steps/Repositories/index.tsx              | 26 ++++++++++++++-----
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/Components/CreateImageWizard/steps/Repositories/index.tsx b/src/Components/CreateImageWizard/steps/Repositories/index.tsx
index ac571ec1ff..7ed5394ed6 100644
--- a/src/Components/CreateImageWizard/steps/Repositories/index.tsx
+++ b/src/Components/CreateImageWizard/steps/Repositories/index.tsx
@@ -9,6 +9,7 @@ import {
   selectRecommendedRepositories,
   selectWizardMode,
 } from '@/store/slices/wizard';
+import { useFlag } from '@/Utilities/useGetEnvironment';
 
 import ManageRepositoriesButton from './components/ManageRepositoriesButton';
 import Repositories from './components/Repositories';
@@ -18,15 +19,26 @@ const RepositoriesStep = () => {
   const packages = useAppSelector(selectPackages);
   const recommendedRepos = useAppSelector(selectRecommendedRepositories);
 
+  const isWizardRevampEnabled = useFlag('image-builder.wizard-revamp.enabled');
+
+  const Wrapper = isWizardRevampEnabled ? React.Fragment : Form;
   return (
-    <Form>
+    <Wrapper>
       <CustomizationLabels customization='repositories' />
-      <Title headingLevel='h1' size='xl'>
-        Included repositories
-      </Title>
       <Content>
-        Can&apos;t find a repository? Ensure it&apos;s been added on{' '}
-        <ManageRepositoriesButton label={'the Repositories page'} icon={true} />
+        <Title
+          headingLevel={isWizardRevampEnabled ? 'h2' : 'h1'}
+          size={isWizardRevampEnabled ? 'lg' : 'xl'}
+        >
+          Included repositories
+        </Title>
+        <Content component={isWizardRevampEnabled ? 'small' : 'p'}>
+          Can&apos;t find a repository? Ensure it&apos;s been added on{' '}
+          <ManageRepositoriesButton
+            label={'the Repositories page'}
+            icon={true}
+          />
+        </Content>
       </Content>
       {wizardMode === 'edit' && (
         <Alert
@@ -50,7 +62,7 @@ const RepositoriesStep = () => {
         ''
       )}
       <Repositories />
-    </Form>
+    </Wrapper>
   );
 };
 

From 5093b69d6f4ebd2b5a8de9c74db1fbac741dd042 Mon Sep 17 00:00:00 2001
From: regexowl <ksimicko@redhat.com>
Date: Wed, 1 Apr 2026 17:00:47 +0200
Subject: [PATCH 2/2] Wizard: Prevent submit on 'Enter'

This prevents submit on 'Enter' keydown for the Repositories and Packages step.
---
 src/Components/CreateImageWizard3/CreateImageWizard3.tsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Components/CreateImageWizard3/CreateImageWizard3.tsx b/src/Components/CreateImageWizard3/CreateImageWizard3.tsx
index a8acb21a27..091c1c019b 100644
--- a/src/Components/CreateImageWizard3/CreateImageWizard3.tsx
+++ b/src/Components/CreateImageWizard3/CreateImageWizard3.tsx
@@ -276,6 +276,10 @@ const CreateImageWizard3 = () => {
     );
   }
 
+  const handleFormSubmit = (event: React.FormEvent) => {
+    event.preventDefault();
+  };
+
   return (
     <Modal
       isOpen={showWizardModal}
@@ -353,7 +357,7 @@ const CreateImageWizard3 = () => {
             <CustomWizardFooter disableNext={false} isOnPremise={isOnPremise} />
           }
         >
-          <Form>
+          <Form onSubmit={handleFormSubmit}>
             <Title headingLevel='h1' size='xl'>
               Repositories and packages
             </Title>