From df8544b8055e61af6ae9ebb336c857593c8384b6 Mon Sep 17 00:00:00 2001
From: Gabriel Garcia <ggarciaseco@gmail.com>
Date: Fri, 20 Mar 2026 09:45:26 +0100
Subject: [PATCH 1/5] fix(force-value) - fix title property

---
 example/src/Onboarding.tsx                    |  2 +-
 src/components/form/JSONSchemaForm.tsx        |  1 +
 .../form/fields/ForcedValueField.tsx          | 35 ++++++++-----------
 3 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/example/src/Onboarding.tsx b/example/src/Onboarding.tsx
index f14cd3e96..45a0fca20 100644
--- a/example/src/Onboarding.tsx
+++ b/example/src/Onboarding.tsx
@@ -266,7 +266,7 @@ const OnboardingWithProps = ({
       options={{
         features: ['onboarding_reserves'],
         jsonSchemaVersion: {
-          employment_basic_information: 'latest',
+          employment_basic_information: 3,
         },
         jsonSchemaVersionByCountry: {
           DEU: {
diff --git a/src/components/form/JSONSchemaForm.tsx b/src/components/form/JSONSchemaForm.tsx
index 1eaea9f5a..8bef2adcf 100644
--- a/src/components/form/JSONSchemaForm.tsx
+++ b/src/components/form/JSONSchemaForm.tsx
@@ -65,6 +65,7 @@ export const JSONSchemaFormFields = ({
             <ForcedValueField
               key={field.name as string}
               name={field.name as string}
+              title={field.title as string}
               description={field.description as string}
               value={field.const as string}
               statement={field.statement as any}
diff --git a/src/components/form/fields/ForcedValueField.tsx b/src/components/form/fields/ForcedValueField.tsx
index c4f33f5f3..fbcf86645 100644
--- a/src/components/form/fields/ForcedValueField.tsx
+++ b/src/components/form/fields/ForcedValueField.tsx
@@ -38,6 +38,7 @@ const Description = ({
 export type ForcedValueFieldProps = {
   name: string;
   value: string;
+  title: string;
   description: string;
   statement?: {
     title?: string;
@@ -69,30 +70,24 @@ export function ForcedValueField({
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
+  const titleSanitized = statement?.title
+    ? sanitizeHtml(statement?.title)
+    : sanitizeHtml(label);
   return (
     <div>
-      {statement ? (
-        <>
-          {/* if statement?.title is undefined which could be for example belgium contract details form, we need to use the label attribute */}
-          <p
-            className={`text-sm RemoteFlows__ForcedValue__Title__${name}`}
-            dangerouslySetInnerHTML={{
-              __html: sanitizeHtml(statement?.title || label),
-            }}
-          />
-          <Description
-            name={name}
-            description={sanitizeHtml(statement?.description || description)}
-            helpCenter={helpCenter}
-          />
-        </>
-      ) : (
-        <Description
-          name={name}
-          description={descriptionSanitized}
-          helpCenter={helpCenter}
+      {titleSanitized && (
+        <p
+          className={`text-sm RemoteFlows__ForcedValue__Title__${name}`}
+          dangerouslySetInnerHTML={{
+            __html: titleSanitized,
+          }}
         />
       )}
+      <Description
+        name={name}
+        description={descriptionSanitized}
+        helpCenter={helpCenter}
+      />
     </div>
   );
 }

From 453eee458586e9c4cf69a3f71d36c431f217514c Mon Sep 17 00:00:00 2001
From: Gabriel Garcia <ggarciaseco@gmail.com>
Date: Fri, 20 Mar 2026 09:50:24 +0100
Subject: [PATCH 2/5] fix props

---
 src/components/form/JSONSchemaForm.tsx          | 1 -
 src/components/form/fields/ForcedValueField.tsx | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/components/form/JSONSchemaForm.tsx b/src/components/form/JSONSchemaForm.tsx
index 8bef2adcf..1eaea9f5a 100644
--- a/src/components/form/JSONSchemaForm.tsx
+++ b/src/components/form/JSONSchemaForm.tsx
@@ -65,7 +65,6 @@ export const JSONSchemaFormFields = ({
             <ForcedValueField
               key={field.name as string}
               name={field.name as string}
-              title={field.title as string}
               description={field.description as string}
               value={field.const as string}
               statement={field.statement as any}
diff --git a/src/components/form/fields/ForcedValueField.tsx b/src/components/form/fields/ForcedValueField.tsx
index fbcf86645..9fe906e5a 100644
--- a/src/components/form/fields/ForcedValueField.tsx
+++ b/src/components/form/fields/ForcedValueField.tsx
@@ -38,7 +38,6 @@ const Description = ({
 export type ForcedValueFieldProps = {
   name: string;
   value: string;
-  title: string;
   description: string;
   statement?: {
     title?: string;

From db8dd50353dccc97b8f7a0d9d39bff2898b50b6d Mon Sep 17 00:00:00 2001
From: Gabriel Garcia <ggarciaseco@gmail.com>
Date: Fri, 20 Mar 2026 10:22:49 +0100
Subject: [PATCH 3/5] solve flat fieldsets

---
 src/components/form/JSONSchemaForm.tsx |  6 ++++++
 src/components/form/utils.ts           | 10 +++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/components/form/JSONSchemaForm.tsx b/src/components/form/JSONSchemaForm.tsx
index 1eaea9f5a..33afd7686 100644
--- a/src/components/form/JSONSchemaForm.tsx
+++ b/src/components/form/JSONSchemaForm.tsx
@@ -37,6 +37,7 @@ export const JSONSchemaFormFields = ({
 
   if (!fields || fields.length === 0) return null;
 
+  console.log({ fields, fieldsets, fieldValues });
   const maybeFieldWithFlatFieldsets =
     fieldsets && fieldValues
       ? getFieldsWithFlatFieldsets({
@@ -46,6 +47,8 @@ export const JSONSchemaFormFields = ({
         })
       : fields;
 
+  console.log({ fields, maybeFieldWithFlatFieldsets });
+
   return (
     <>
       {maybeFieldWithFlatFieldsets.map((field) => {
@@ -57,6 +60,7 @@ export const JSONSchemaFormFields = ({
         }
 
         if (field.isVisible === false || field.deprecated || field.hidden) {
+          console.log('skipping field', field.name);
           return null; // Skip hidden or deprecated fields
         }
 
@@ -136,6 +140,8 @@ export const JSONSchemaFormFields = ({
           FieldComponent = fieldsMap['multi-select'];
         }
 
+        console.log('rendering field', field.name);
+
         return (
           <Fragment key={field.name as string}>
             <FieldComponent
diff --git a/src/components/form/utils.ts b/src/components/form/utils.ts
index 8f4e32ed1..ba4309a6d 100644
--- a/src/components/form/utils.ts
+++ b/src/components/form/utils.ts
@@ -806,9 +806,13 @@ export function getFieldsWithFlatFieldsets({
     return accumulatedFieldsSorted;
   }, fields);
 
-  const filteredFields = sortedFields.filter(
-    (field) => !flatFieldsetsFieldNames.has(field.name!),
-  );
+  const filteredFields = sortedFields.filter((field) => {
+    //  Always keep the fieldset wrapper
+    if (field.type === 'fieldset-flat') {
+      return true;
+    }
+    return !flatFieldsetsFieldNames.has(field.name!);
+  });
 
   return filteredFields;
 }

From a828178b0863e9a0e74ec9d5c9248e7e146f8c13 Mon Sep 17 00:00:00 2001
From: Gabriel Garcia <ggarciaseco@gmail.com>
Date: Fri, 20 Mar 2026 10:23:18 +0100
Subject: [PATCH 4/5] remove logs

---
 src/components/form/JSONSchemaForm.tsx | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/components/form/JSONSchemaForm.tsx b/src/components/form/JSONSchemaForm.tsx
index 33afd7686..1eaea9f5a 100644
--- a/src/components/form/JSONSchemaForm.tsx
+++ b/src/components/form/JSONSchemaForm.tsx
@@ -37,7 +37,6 @@ export const JSONSchemaFormFields = ({
 
   if (!fields || fields.length === 0) return null;
 
-  console.log({ fields, fieldsets, fieldValues });
   const maybeFieldWithFlatFieldsets =
     fieldsets && fieldValues
       ? getFieldsWithFlatFieldsets({
@@ -47,8 +46,6 @@ export const JSONSchemaFormFields = ({
         })
       : fields;
 
-  console.log({ fields, maybeFieldWithFlatFieldsets });
-
   return (
     <>
       {maybeFieldWithFlatFieldsets.map((field) => {
@@ -60,7 +57,6 @@ export const JSONSchemaFormFields = ({
         }
 
         if (field.isVisible === false || field.deprecated || field.hidden) {
-          console.log('skipping field', field.name);
           return null; // Skip hidden or deprecated fields
         }
 
@@ -140,8 +136,6 @@ export const JSONSchemaFormFields = ({
           FieldComponent = fieldsMap['multi-select'];
         }
 
-        console.log('rendering field', field.name);
-
         return (
           <Fragment key={field.name as string}>
             <FieldComponent

From b7b06d461b4a6895dafb67eddebd9b9b09d7fe34 Mon Sep 17 00:00:00 2001
From: Gabriel Garcia <ggarciaseco@gmail.com>
Date: Fri, 20 Mar 2026 10:31:37 +0100
Subject: [PATCH 5/5] fix test

---
 src/components/form/fields/tests/ForcedValueField.test.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/form/fields/tests/ForcedValueField.test.tsx b/src/components/form/fields/tests/ForcedValueField.test.tsx
index 84b086059..d7d18a11f 100644
--- a/src/components/form/fields/tests/ForcedValueField.test.tsx
+++ b/src/components/form/fields/tests/ForcedValueField.test.tsx
@@ -29,13 +29,13 @@ describe('ForcedValueField Component', () => {
   });
 
   describe('when statement is not provided', () => {
-    it('renders only the description', () => {
+    it('renders only the label and description', () => {
       renderWithFormContext(defaultProps);
 
       expect(
         screen.getByText('This is a test description'),
       ).toBeInTheDocument();
-      expect(screen.queryByText('Test Label')).not.toBeInTheDocument();
+      expect(screen.getByText('Test Label')).toBeInTheDocument();
     });
   });