Revert "fix: account Form Fields Display Name not updating correctly h…

…ttps://bigc-b2b.atlassian.net/browse/BUN-1805"

This reverts commit e66f37b.

apps/storefront/src/pages/accountSetting/AccountSetting.tsx

@@ -23,7 +23,7 @@ import {
   updateBCAccountSettings,
 } from '@/shared/service/b2b'
 import { Fields, ParamProps } from '@/types/accountSetting'
-import { B3SStorage, snackbar } from '@/utils'
+import { B3SStorage, manipulateString, snackbar } from '@/utils'
 
 import { getAccountFormFields } from '../registered/config'
 
@@ -288,6 +288,16 @@ function AccountSetting() {
     })()
   }
 
+  const convertLabel = (infos: Partial<Fields>[]) =>
+    infos.map((info: Partial<Fields>) => {
+      const { label } = info
+      if (label) {
+        info.label = manipulateString(label)
+      }
+
+      return info
+    }) || []
+
   return (
     <B3Sping isSpinning={isloadding} background={backgroundColor}>
       <Box
@@ -315,7 +325,7 @@ function AccountSetting() {
         }}
       >
         <B3CustomForm
-          formFields={accountInfoFormFields}
+          formFields={convertLabel(accountInfoFormFields)}
           errors={errors}
           control={control}
           getValues={getValues}

apps/storefront/src/pages/address/Address.tsx

@@ -12,7 +12,7 @@ import {
   getB2BCountries,
   getBCCustomerAddress,
 } from '@/shared/service/b2b'
-import { snackbar } from '@/utils'
+import { manipulateString, snackbar } from '@/utils'
 
 import B3Filter from '../../components/filter/B3Filter'
 import {
@@ -87,7 +87,14 @@ function Address() {
             !isBCPermission,
             countries
           )
-          setAddressFields(addressFields || [])
+          const newAddressFields =
+            addressFields?.map((field) => {
+              const { label } = field
+              if (label) field.label = manipulateString(label)
+
+              return field
+            }) || []
+          setAddressFields(newAddressFields)
         } catch (err) {
           console.log(err)
         } finally {

apps/storefront/src/pages/registered/RegisterComplete.tsx

@@ -22,7 +22,7 @@ import {
   sendSubscribersState,
   uploadB2BFile,
 } from '@/shared/service/b2b'
-import { storeHash } from '@/utils'
+import { convertLabel, manipulateString, storeHash } from '@/utils'
 
 import RegisteredStepButton from './component/RegisteredStepButton'
 import { RegisteredContext } from './context/RegisteredContext'
@@ -85,9 +85,11 @@ export default function RegisterComplete(props: RegisterCompleteProps) {
   const list: RegisterCompleteList =
     accountType === '1' ? contactInformation : bcContactInformation
   const passwordInfo: RegisterCompleteList =
-    accountType === '1' ? passwordInformation : bcPasswordInformation
+    accountType === '1'
+      ? convertLabel(passwordInformation)
+      : convertLabel(bcPasswordInformation)
 
-  const passwordName = passwordInfo[0]?.groupName || ''
+  const passwordName = manipulateString(passwordInfo[0]?.groupName) || ''
 
   const additionalInfo: RegisterCompleteList =
     accountType === '1' ? additionalInformation : bcAdditionalInformation

apps/storefront/src/pages/registered/RegisteredAccount.tsx

@@ -20,6 +20,7 @@ import { CustomStyleContext } from '@/shared/customStyleButtton'
 import { GlobaledContext } from '@/shared/global'
 import { checkUserBCEmail, checkUserEmail } from '@/shared/service/b2b'
 import { themeFrameSelector } from '@/store'
+import { convertLabel, manipulateString } from '@/utils'
 
 import RegisteredStepButton from './component/RegisteredStepButton'
 import { RegisteredContext } from './context/RegisteredContext'
@@ -78,31 +79,37 @@ export default function RegisteredAccount(props: RegisteredAccountProps) {
     accountType === '1' ? 'additionalInformation' : 'bcAdditionalInformation'
   const additionalInfo: any =
     accountType === '1'
-      ? additionalInformation || []
-      : bcAdditionalInformation || []
+      ? convertLabel(additionalInformation || [])
+      : convertLabel(bcAdditionalInformation || [])
 
   const newContactInformation = contactInformation?.map(
     (info: CustomFieldItems) => {
       if (info.fieldId === 'field_email' && accountType === '1') {
         info.isTip = true
         info.tipText = 'This email will be used to sign in to your account'
       }
+      const { label } = info
+      if (label) {
+        info.label = manipulateString(label)
+      }
 
       return info
     }
   )
 
   const contactInfo: any =
-    accountType === '1' ? newContactInformation : bcContactInformation || []
+    accountType === '1'
+      ? newContactInformation
+      : convertLabel(bcContactInformation || [])
   const contactName =
     accountType === '1' ? 'contactInformation' : 'bcContactInformationFields'
 
   const contactInformationLabel = contactInfo.length
-    ? contactInfo[0]?.groupName
+    ? manipulateString(contactInfo[0]?.groupName)
     : ''
 
   const additionalInformationLabel = additionalInfo.length
-    ? additionalInfo[0]?.groupName
+    ? manipulateString(additionalInfo[0]?.groupName)
     : ''
 
   const handleChange = (event: ChangeEvent<HTMLInputElement>) => {

apps/storefront/src/pages/registered/RegisteredBCToB2B.tsx

@@ -18,7 +18,12 @@ import { getContrastColor } from '@/components/outSideComponents/utils/b3CustomS
 import { useMobile } from '@/hooks'
 import { CustomStyleContext } from '@/shared/customStyleButtton'
 import { GlobaledContext } from '@/shared/global'
-import { getCurrentCustomerInfo, storeHash } from '@/utils'
+import {
+  convertLabel,
+  getCurrentCustomerInfo,
+  manipulateString,
+  storeHash,
+} from '@/utils'
 
 import {
   createB2BCompanyUser,
@@ -590,11 +595,13 @@ export default function RegisteredBCToB2B(props: RegisteredProps) {
                 >
                   <InformationFourLabels>
                     {bcTob2bContactInformation?.length
-                      ? bcTob2bContactInformation[0]?.groupName
+                      ? manipulateString(
+                          bcTob2bContactInformation[0]?.groupName
+                        )
                       : ''}
                   </InformationFourLabels>
                   <B3CustomForm
-                    formFields={bcTob2bContactInformation || []}
+                    formFields={convertLabel(bcTob2bContactInformation || [])}
                     errors={errors}
                     control={control}
                     getValues={getValues}
@@ -609,13 +616,15 @@ export default function RegisteredBCToB2B(props: RegisteredProps) {
                 >
                   <InformationFourLabels>
                     {bcTob2bCompanyInformation?.length
-                      ? bcTob2bCompanyInformation[0]?.groupName
+                      ? manipulateString(
+                          bcTob2bCompanyInformation[0]?.groupName
+                        )
                       : ''}
                   </InformationFourLabels>
                   <B3CustomForm
                     formFields={[
-                      ...bcTob2bCompanyInformation,
-                      ...bcTob2bCompanyExtraFields,
+                      ...convertLabel(bcTob2bCompanyInformation),
+                      ...convertLabel(bcTob2bCompanyExtraFields),
                     ]}
                     errors={errors}
                     control={control}
@@ -631,12 +640,14 @@ export default function RegisteredBCToB2B(props: RegisteredProps) {
                 >
                   <InformationFourLabels>
                     {bcTob2bAddressBasicFields?.length
-                      ? bcTob2bAddressBasicFields[0]?.groupName
+                      ? manipulateString(
+                          bcTob2bAddressBasicFields[0]?.groupName
+                        )
                       : ''}
                   </InformationFourLabels>
 
                   <B3CustomForm
-                    formFields={bcTob2bAddressBasicFields}
+                    formFields={convertLabel(bcTob2bAddressBasicFields)}
                     errors={errors}
                     control={control}
                     getValues={getValues}

apps/storefront/src/pages/registered/RegisteredDetail.tsx

@@ -6,6 +6,7 @@ import { B3CustomForm } from '@/components'
 import { getContrastColor } from '@/components/outSideComponents/utils/b3CustomStyles'
 import { CustomStyleContext } from '@/shared/customStyleButtton'
 import { validateBCCompanyExtraFields } from '@/shared/service/b2b'
+import { convertLabel, manipulateString } from '@/utils'
 
 import RegisteredStepButton from './component/RegisteredStepButton'
 import { RegisteredContext } from './context/RegisteredContext'
@@ -54,14 +55,18 @@ export default function RegisteredDetail(props: RegisteredDetailProps) {
     mode: 'all',
   })
   const businessDetailsName =
-    accountType === '1' ? companyInformation[0]?.groupName : ''
+    accountType === '1'
+      ? manipulateString(companyInformation[0]?.groupName)
+      : ''
 
   const addressBasicName =
     accountType === '1' ? 'addressBasicFields' : 'bcAddressBasicFields'
   const addressBasicList =
-    accountType === '1' ? addressBasicFields : bcAddressBasicFields
+    accountType === '1'
+      ? convertLabel(addressBasicFields)
+      : convertLabel(bcAddressBasicFields)
 
-  const addressName = addressBasicList[0]?.groupName || ''
+  const addressName = manipulateString(addressBasicList[0]?.groupName) || ''
 
   const handleCountryChange = (countryCode: string, stateCode = '') => {
     const stateList =
@@ -261,7 +266,7 @@ export default function RegisteredDetail(props: RegisteredDetailProps) {
         <Box>
           <InformationFourLabels>{businessDetailsName}</InformationFourLabels>
           <B3CustomForm
-            formFields={[...companyInformation]}
+            formFields={[...convertLabel(companyInformation)]}
             errors={errors}
             control={control}
             getValues={getValues}