From d295a507ac5a2095552d12a5a6dcb71cedf47ec1 Mon Sep 17 00:00:00 2001
From: Robert Bond <Robert.Bond@test.gov.wales>
Date: Mon, 11 May 2026 10:47:39 +0000
Subject: [PATCH] Merged PR 2303: updated company name to pinswg_companyname

updated company name to pinswg_companyname

Related work items: #22774
---
 components/account/personaldetails.js        | 18 +++++++++---------
 components/account/personaldetailsCheck.js   |  8 ++++----
 components/newappeal/aboutyou.js             |  4 ++--
 pages/api/endpoint/getpersonalaccount_api.js |  2 +-
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/components/account/personaldetails.js b/components/account/personaldetails.js
index 80b94de9..d729046f 100644
--- a/components/account/personaldetails.js
+++ b/components/account/personaldetails.js
@@ -140,12 +140,12 @@ const RenderPickList = ({
     input,
     optionsArr,
     meta: { touched, error },
-    errorMsg,
+    errorMsg
 }) => {
     let { t, lang } = useTranslation();
     optionsArr = [
         t("account:account-preferred-language-english") + ":846040001",
-        t("account:account-preferred-language-welsh") + ":846040000",
+        t("account:account-preferred-language-welsh") + ":846040000"
     ];
     return (
         <>
@@ -202,7 +202,7 @@ let PersonalDetails = (props) => {
         load,
         pristine,
         reset,
-        submitting,
+        submitting
     } = props;
     let { t, lang } = useTranslation();
 
@@ -324,8 +324,8 @@ let PersonalDetails = (props) => {
                                     label={t("account:account-telephone-label")}
                                 />
                                 <Field
-                                    name="company"
-                                    id="company"
+                                    name="pinswg_companyname"
+                                    id="pinswg_companyname"
                                     component={RenderTextfield}
                                     type="text"
                                     className="govuk-input govuk-input--width-20"
@@ -444,7 +444,7 @@ const mapStateToProps = (state) => {
         searchResultsObj: state.searchResultsObj,
         formData: state.formData,
         appealType: state.appealType,
-        accountDetails: state.accountDetails,
+        accountDetails: state.accountDetails
         //form: state.form,
     };
 };
@@ -453,7 +453,7 @@ const mapDispatchToProps = (dispatch) => {
     return {
         setCurrentSection: (currentSection) => {
             dispatch(setCurrentSection(currentSection));
-        },
+        }
     };
 };
 
@@ -484,12 +484,12 @@ const selector = formValueSelector("personalDetailsForm"); // <-- same as form n
 PersonalDetails = reduxForm({
     form: "personalDetailsForm",
     enableReinitialize: true, // this is needed!!
-    destroyOnUnmount: false,
+    destroyOnUnmount: false
 })(PersonalDetails);
 
 // You have to connect() to any reducers that you wish to connect to yourself
 PersonalDetails = connect((state) => ({
-    initialValues: state.accountDetails.accountDetails, // pull initial values from account reducer
+    initialValues: state.accountDetails.accountDetails // pull initial values from account reducer
 }))(PersonalDetails);
 
 export default PersonalDetails;
diff --git a/components/account/personaldetailsCheck.js b/components/account/personaldetailsCheck.js
index efa40415..20c6c65d 100644
--- a/components/account/personaldetailsCheck.js
+++ b/components/account/personaldetailsCheck.js
@@ -11,7 +11,7 @@ const BuildCheckPersonalDetails = (props) => {
         handleSubmit,
         value,
         setPersonalDetailsComplete,
-        setAccountUpdatedComplete,
+        setAccountUpdatedComplete
     } = props;
     let { t, lang } = useTranslation();
 
@@ -142,7 +142,7 @@ const BuildCheckPersonalDetails = (props) => {
                     <dd className="govuk-summary-list__value">
                         {
                             props.props.props.form.personalDetailsForm.values
-                                .company
+                                .pinswg_companyname
                         }
                     </dd>
                     <dd className="govuk-summary-list__actions">
@@ -354,7 +354,7 @@ const mapStateToProps = (state) => {
         searchResultsObj: state.searchResultsObj,
         formData: state.formData,
         appealType: state.appealType,
-        accountDetails: state.accountDetails,
+        accountDetails: state.accountDetails
         //form: state.form,
     };
 };
@@ -363,7 +363,7 @@ const mapDispatchToProps = (dispatch) => {
     return {
         setCurrentSection: (currentSection) => {
             dispatch(setCurrentSection(currentSection));
-        },
+        }
     };
 };
 
diff --git a/components/newappeal/aboutyou.js b/components/newappeal/aboutyou.js
index 1167350b..3016fdea 100644
--- a/components/newappeal/aboutyou.js
+++ b/components/newappeal/aboutyou.js
@@ -912,7 +912,7 @@ const mapStateToProps = (state) => {
             pinswg_appellantlastname:
                 state.accountDetails.accountDetails.lastname,
             pinswg_appellantcompany:
-                state.accountDetails.accountDetails.company,
+                state.accountDetails.accountDetails.pinswg_companyname,
             pinswg_appellantemailaddress:
                 state.accountDetails.accountDetails.emailaddress1,
             pinswg_appellantaddress:
@@ -920,7 +920,7 @@ const mapStateToProps = (state) => {
             pinswg_appellantphonenumber:
                 state.accountDetails.accountDetails.telephone1,
             pinswg_agentcompanyname:
-                state.accountDetails.accountDetails.company,
+                state.accountDetails.accountDetails.pinswg_companyname,
             pinswg_agentfirstname:
                 state.accountDetails.accountDetails.firstname,
             pinswg_agentlastname: state.accountDetails.accountDetails.lastname,
diff --git a/pages/api/endpoint/getpersonalaccount_api.js b/pages/api/endpoint/getpersonalaccount_api.js
index 41a70be1..43a14cd2 100644
--- a/pages/api/endpoint/getpersonalaccount_api.js
+++ b/pages/api/endpoint/getpersonalaccount_api.js
@@ -35,7 +35,7 @@ export default async function ApiProxy(req, res) {
     const queryUrl =
         "contacts(" +
         contactid +
-        ")?$select=firstname, lastname, emailaddress1, telephone1, company, address1_line1,address1_line2,address1_city, address1_county,address1_postalcode,pinswg_typeofinvolvement,pinswg_contact_associatedlpa,pinswg_preferredlanguage&$count=true";
+        ")?$select=firstname, lastname, emailaddress1, telephone1, pinswg_companyname, address1_line1,address1_line2,address1_city, address1_county,address1_postalcode,pinswg_typeofinvolvement,pinswg_contact_associatedlpa,pinswg_preferredlanguage&$count=true";
 
     const relayPolicy = RELAY_POLICY_LOOKUP;