merge parallel alembic heads after rebase, fix dropdown styling of

preferred language dropdown

Author: chene0

backend/migrations/versions/93cc5dac324a_merge_multiple_heads.py

@@ -0,0 +1,22 @@
+"""merge multiple heads
+
+Revision ID: 93cc5dac324a
+Revises: 23dae9594e1d, 329a7ab72d38
+Create Date: 2025-11-24 19:04:33.167997
+
+"""
+from typing import Sequence, Union
+
+# revision identifiers, used by Alembic.
+revision: str = '93cc5dac324a'
+down_revision: Union[str, None] = ('23dae9594e1d', '329a7ab72d38')
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    pass
+
+
+def downgrade() -> None:
+    pass

frontend/src/components/intake/demographic-cancer-form.tsx

@@ -133,6 +133,17 @@ const ETHNIC_OPTIONS = [
   'Another background/Prefer to self-describe (please specify):',
 ];
 
+const LANGUAGE_OPTIONS = ['English', 'Français'];
+
+// Helper to convert between display names and language codes
+const languageToCode = (language: string): string => {
+  return language === 'English' ? 'en' : language === 'Français' ? 'fr' : '';
+};
+
+const codeToLanguage = (code: string): string => {
+  return code === 'en' ? 'English' : code === 'fr' ? 'Français' : '';
+};
+
 export function DemographicCancerForm({
   formType,
   onNext,
@@ -479,11 +490,13 @@ export function DemographicCancerForm({
                   control={control}
                   rules={{ required: 'Please select your preferred language' }}
                   render={({ field }) => (
-                    <StyledSelect {...field} error={!!errors.preferredLanguage}>
-                      <option value="">Select language</option>
-                      <option value="en">English</option>
-                      <option value="fr">Français</option>
-                    </StyledSelect>
+                    <SingleSelectDropdown
+                      options={LANGUAGE_OPTIONS}
+                      selectedValue={codeToLanguage(field.value || '')}
+                      onSelectionChange={(language) => field.onChange(languageToCode(language))}
+                      placeholder="Preferred Language"
+                      error={!!errors.preferredLanguage}
+                    />
                   )}
                 />
               </FormField>
@@ -1062,11 +1075,13 @@ export function BasicDemographicsForm({ formType, onNext }: BasicDemographicsFor
                   control={control}
                   rules={{ required: 'Please select your preferred language' }}
                   render={({ field }) => (
-                    <StyledSelect {...field} error={!!errors.preferredLanguage}>
-                      <option value="">Select language</option>
-                      <option value="en">English</option>
-                      <option value="fr">Français</option>
-                    </StyledSelect>
+                    <SingleSelectDropdown
+                      options={LANGUAGE_OPTIONS}
+                      selectedValue={codeToLanguage(field.value || '')}
+                      onSelectionChange={(language) => field.onChange(languageToCode(language))}
+                      placeholder="Preferred Language"
+                      error={!!errors.preferredLanguage}
+                    />
                   )}
                 />
               </FormField>