From 6d336c59e495a3508f8d44775d34955cdaafb614 Mon Sep 17 00:00:00 2001
From: MartinBraquet <martin.braquet@gmail.com>
Date: Thu, 30 Jul 2026 19:30:40 +0200
Subject: [PATCH] Reorganize and group "Background" fields (Ethnicity and
 Raised In) with cultural information for better form flow and prioritization.

---
 common/messages/de.json                  |   1 +
 common/messages/fr.json                  |   1 +
 web/components/optional-profile-form.tsx | 113 ++++++++++++-----------
 3 files changed, 63 insertions(+), 52 deletions(-)

diff --git a/common/messages/de.json b/common/messages/de.json
index 567cabdb..b0e86d34 100644
--- a/common/messages/de.json
+++ b/common/messages/de.json
@@ -1155,6 +1155,7 @@
   "profile.optional.age_range": "Im Alter zwischen",
   "profile.optional.big5_hint": "Ziehen Sie jeden Schieber, um festzulegen, wo Sie sich bei diesen Merkmalen sehen (0 = niedrig, 100 = hoch).",
   "profile.optional.bio_description": "Hier kannst du ein langes Dokument über dich selbst und was du suchst schreiben. Es enthält schöne Formatierungen wie Überschriften, Fett, Kursiv, Listen, Links, eingebettete Bilder und mehr.",
+  "profile.optional.category.background": "Herkunft",
   "profile.optional.category.education": "Bildung",
   "profile.optional.category.family": "Familie",
   "profile.optional.category.interested_in": "Wen ich suche",
diff --git a/common/messages/fr.json b/common/messages/fr.json
index 20cd1c68..10cca653 100644
--- a/common/messages/fr.json
+++ b/common/messages/fr.json
@@ -1154,6 +1154,7 @@
   "profile.optional.age_range": "Âgés entre",
   "profile.optional.big5_hint": "Faites glisser chaque curseur pour définir où vous vous situez sur ces traits (0 = faible, 100 = élevé).",
   "profile.optional.bio_description": "Vous pouvez ici écrire un long document sur qui vous êtes et ce que vous recherchez. Il inclut une mise en forme agréable comme des titres, du gras, de l'italique, des listes, des liens, des images intégrées, et plus encore.",
+  "profile.optional.category.background": "Origines",
   "profile.optional.category.education": "Éducation",
   "profile.optional.category.family": "Famille",
   "profile.optional.category.interested_in": "Ce que je recherche",
diff --git a/web/components/optional-profile-form.tsx b/web/components/optional-profile-form.tsx
index 186190d9..e86212b8 100644
--- a/web/components/optional-profile-form.tsx
+++ b/web/components/optional-profile-form.tsx
@@ -730,56 +730,9 @@ export const OptionalProfileUserForm = (props: {
           </Row>
         </Col>
 
-        <Col className={clsx(colClassName)}>
-          <label className={clsx(labelClassName)}>
-            {t('profile.optional.ethnicity', 'Ethnicity/origin')}
-          </label>
-          <MultiCheckbox
-            choices={RACE_CHOICES}
-            translationPrefix={'profile.race'}
-            selected={profile['ethnicity'] ?? []}
-            onChange={(selected) => setProfile('ethnicity', selected)}
-          />
-        </Col>
-
-        <Col className={clsx(colClassName)}>
-          <label className={clsx(labelClassName)}>
-            {t('profile.optional.raised_in', 'Place you grew up')}
-          </label>
-          <label className={clsx('guidance')}>
-            {t(
-              'profile.optional.raised_in_hint',
-              'Especially useful if you grew up in a different country than where you live now—and if it reflects your cultural references, values, and life experiences.',
-            )}
-          </label>
-          {profile.raised_in_geodb_city_id ? (
-            <Row className="border-primary-500 w-full justify-between rounded border px-4 py-2">
-              <CityRow
-                city={profileToRaisedInCity(profile as Profile)!}
-                onSelect={() => {}}
-                className="pointer-events-none"
-              />
-              <button
-                className="text-ink-700 hover:text-primary-700 text-sm underline"
-                onClick={() => {
-                  setProfileRaisedInCity(undefined)
-                }}
-              >
-                {t('common.change', 'Change')}
-              </button>
-            </Row>
-          ) : (
-            <CitySearchBox
-              onCitySelected={(city: City | undefined) => {
-                setProfileRaisedInCity(city)
-              }}
-            />
-          )}
-        </Col>
-
         {/* Its own section rather than the tail of Personal Information. Photos are a hero field —
             the first thing anyone looks at on the finished profile — and as the last row of a
-            section about height and ethnicity they were something you scrolled past on the way
+            section about height and gender they were something you scrolled past on the way
             somewhere else, with no entry in the index to come back to. */}
         <Category title={t('profile.optional.category.photos', 'Photos')} />
 
@@ -1514,6 +1467,59 @@ export const OptionalProfileUserForm = (props: {
           </p>
         </Col>
 
+        {/* Ethnicity and where you grew up used to sit at the tail of Personal Information, between
+            height and photos. They are secondary — nobody fills the top of the form to answer them —
+            and there they pushed the fields people do come for further down. Grouped here with
+            languages instead, which is the same kind of cultural-background information. */}
+        <Category title={t('profile.optional.category.background', 'Background')} />
+
+        <Col className={clsx(colClassName)}>
+          <label className={clsx(labelClassName)}>
+            {t('profile.optional.ethnicity', 'Ethnicity/origin')}
+          </label>
+          <MultiCheckbox
+            choices={RACE_CHOICES}
+            translationPrefix={'profile.race'}
+            selected={profile['ethnicity'] ?? []}
+            onChange={(selected) => setProfile('ethnicity', selected)}
+          />
+        </Col>
+
+        <Col className={clsx(colClassName)}>
+          <label className={clsx(labelClassName)}>
+            {t('profile.optional.raised_in', 'Place you grew up')}
+          </label>
+          <label className={clsx('guidance')}>
+            {t(
+              'profile.optional.raised_in_hint',
+              'Especially useful if you grew up in a different country than where you live now—and if it reflects your cultural references, values, and life experiences.',
+            )}
+          </label>
+          {profile.raised_in_geodb_city_id ? (
+            <Row className="border-primary-500 w-full justify-between rounded border px-4 py-2">
+              <CityRow
+                city={profileToRaisedInCity(profile as Profile)!}
+                onSelect={() => {}}
+                className="pointer-events-none"
+              />
+              <button
+                className="text-ink-700 hover:text-primary-700 text-sm underline"
+                onClick={() => {
+                  setProfileRaisedInCity(undefined)
+                }}
+              >
+                {t('common.change', 'Change')}
+              </button>
+            </Row>
+          ) : (
+            <CitySearchBox
+              onCitySelected={(city: City | undefined) => {
+                setProfileRaisedInCity(city)
+              }}
+            />
+          )}
+        </Col>
+
         <Category title={t('profile.optional.languages', 'Languages')} />
 
         <Col className={clsx(colClassName)}>
@@ -1553,6 +1559,13 @@ export const OptionalProfileUserForm = (props: {
         {/*  />*/}
         {/*</Col>*/}
 
+        <Category title={t('profile.optional.socials', 'Socials')} />
+
+        <SocialLinksSection profile={profile} setProfile={setProfile} />
+
+        {/* Socials before Accessibility to match the profile's own rail order (Links, then
+            Accessibility), and so the last thing before Submit is a short optional textarea rather
+            than an empty platform picker. */}
         <Category title={t('profile.optional.accessibility_notes', 'Accessibility')} />
 
         {/* Free text on purpose, not a checkbox list of conditions: a taxonomy exists mainly to be
@@ -1582,10 +1595,6 @@ export const OptionalProfileUserForm = (props: {
           />
         </Col>
 
-        <Category title={t('profile.optional.socials', 'Socials')} />
-
-        <SocialLinksSection profile={profile} setProfile={setProfile} />
-
         <Row className={'justify-end'}>
           <Button
             className={clsx(