From 8947b510f66c05be1bca385515e0f50a8ce97387 Mon Sep 17 00:00:00 2001
From: Borghild <borghild.vikoyr@miles.no>
Date: Thu, 21 Nov 2024 12:38:03 +0100
Subject: [PATCH] :art: fix selects and labels

---
 .../topicPages/Form/CareerFairForm.tsx        | 33 ++++++++++---------
 .../topicPages/Form/SubscribeForm.tsx         |  1 +
 .../careersContactForm/CareersContactForm.tsx |  1 -
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/web/pageComponents/topicPages/Form/CareerFairForm.tsx b/web/pageComponents/topicPages/Form/CareerFairForm.tsx
index bde94b27a..20a2371d2 100644
--- a/web/pageComponents/topicPages/Form/CareerFairForm.tsx
+++ b/web/pageComponents/topicPages/Form/CareerFairForm.tsx
@@ -41,10 +41,7 @@ const CareerFairForm = () => {
       email: '',
       contactPerson: '',
       phone: '',
-      event: intl.formatMessage({
-        id: 'career_fair_form_invite_career_fair',
-        defaultMessage: 'Invite Equinor to a career fair or student event',
-      }),
+      event: '',
       eventDescription: '',
       website: '',
       supportingDocuments: '',
@@ -112,10 +109,10 @@ const CareerFairForm = () => {
                 <FormTextField
                   {...props}
                   id={props.name}
-                  label={intl.formatMessage({
+                  label={`${intl.formatMessage({
                     id: 'career_fair_form_organisation',
                     defaultMessage: 'School / Organisation',
-                  })}
+                  })}*`}
                   inputRef={ref}
                   aria-required="true"
                   inputIcon={invalid ? <Icon data={error_filled} title="error" /> : undefined}
@@ -137,10 +134,10 @@ const CareerFairForm = () => {
                 <FormTextField
                   {...props}
                   id={props.name}
-                  label={intl.formatMessage({
+                  label={`${intl.formatMessage({
                     id: 'career_fair_form_contact_person',
                     defaultMessage: 'Contact Person',
-                  })}
+                  })}*`}
                   inputRef={ref}
                   aria-required="true"
                   inputIcon={invalid ? <Icon data={error_filled} title="error" /> : undefined}
@@ -169,10 +166,10 @@ const CareerFairForm = () => {
                 <TextField
                   {...props}
                   id={props.name}
-                  label={intl.formatMessage({
+                  label={`${intl.formatMessage({
                     id: 'career_fair_form_phone',
                     defaultMessage: 'Phone Number',
-                  })}
+                  })}*`}
                   description={intl.formatMessage({
                     id: 'country_code_format',
                     defaultMessage: 'Enter phone number with country code',
@@ -207,10 +204,10 @@ const CareerFairForm = () => {
                 <FormTextField
                   {...props}
                   id={props.name}
-                  label={intl.formatMessage({
-                    id: 'career_fair_form_email',
+                  label={`${intl.formatMessage({
+                    id: 'email',
                     defaultMessage: 'Email',
-                  })}
+                  })}*`}
                   inputRef={ref}
                   inputIcon={invalid ? <Icon data={error_filled} title="error" /> : undefined}
                   helperText={error?.message}
@@ -231,6 +228,12 @@ const CareerFairForm = () => {
                     aria-describedby="select-helper-text-${id}"
                     label={intl.formatMessage({ id: 'career_fair_form_event', defaultMessage: 'Event' })}
                   >
+                    <option value="">
+                      {intl.formatMessage({
+                        id: 'form_please_select_an_option',
+                        defaultMessage: 'Please select an option',
+                      })}
+                    </option>
                     <option>
                       {intl.formatMessage({
                         id: 'career_fair_form_invite_career_fair',
@@ -284,10 +287,10 @@ const CareerFairForm = () => {
                   rowsMax={10}
                   maxLength={3400}
                   aria-required="true"
-                  label={intl.formatMessage({
+                  label={`${intl.formatMessage({
                     id: 'career_fair_form_event_description',
                     defaultMessage: 'Event Description',
-                  })}
+                  })}*`}
                   description={intl.formatMessage(
                     {
                       id: 'form_validation_maxChars',
diff --git a/web/pageComponents/topicPages/Form/SubscribeForm.tsx b/web/pageComponents/topicPages/Form/SubscribeForm.tsx
index cbad71324..5bcdc77ce 100644
--- a/web/pageComponents/topicPages/Form/SubscribeForm.tsx
+++ b/web/pageComponents/topicPages/Form/SubscribeForm.tsx
@@ -93,6 +93,7 @@ const SubscribeForm = () => {
                     id="subscribe_form_choose"
                     defaultMessage="Please choose one or more of the following"
                   />
+                  *
                 </legend>
               )}
               {errors.categories && (
diff --git a/web/pageComponents/topicPages/Form/careersContactForm/CareersContactForm.tsx b/web/pageComponents/topicPages/Form/careersContactForm/CareersContactForm.tsx
index 5404f798c..c656d1c00 100644
--- a/web/pageComponents/topicPages/Form/careersContactForm/CareersContactForm.tsx
+++ b/web/pageComponents/topicPages/Form/careersContactForm/CareersContactForm.tsx
@@ -255,7 +255,6 @@ const CareersContactForm = () => {
               rules={{
                 validate: {
                   require: (value) => {
-                    console.log('value', value)
                     if (!value && setPositionIdMandatory) {
                       console.log('not validated required field')
                       return intl.formatMessage({