fix: resolve window.b3 build

bigcommerce · Jul 20, 2022 · 47c60fe · 47c60fe
1 parent c2a6e2d
commit 47c60fe
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 18 deletions.
diff --git a/apps/storefront/src/pages/registered/Registered.tsx b/apps/storefront/src/pages/registered/Registered.tsx
@@ -67,13 +67,13 @@ export default function Registered() {
         const { storeBasicInfo: { storeName } } = await storeB2BBasicInfo()
         const registerLogo = getRegisterLogo(quoteConfig)
 
-        const newCustomerAccount = customerAccount.length && customerAccount.filter((field: RegisterFileds) => field.custom)
+        const newCustomerAccount = customerAccount.length ? customerAccount.filter((field: RegisterFileds) => field.custom) : []
         const newAdditionalInformation: Array<RegisterFileds> = conversionDataFormat(newCustomerAccount)
 
-        const filterCompanyExtraFields = companyExtraFields.length && companyExtraFields.filter((field: RegisterFileds) => field?.visibleToEnduser)
+        const filterCompanyExtraFields = companyExtraFields.length ? companyExtraFields.filter((field: RegisterFileds) => field?.visibleToEnduser) : []
         const newCompanyExtraFields: Array<RegisterFileds> = conversionDataFormat(filterCompanyExtraFields)
 
-        const customAddress = billingAddress.length && billingAddress.filter((field: RegisterFileds) => field.custom)
+        const customAddress = billingAddress.length ? billingAddress.filter((field: RegisterFileds) => field.custom) : []
         const addressExtraFields: Array<RegisterFileds> = conversionDataFormat(customAddress)
 
         const newAddressInformationFields = addressInformationFields(b3Lang).map((addressFileds) => {
@@ -83,7 +83,7 @@ export default function Registered() {
           return addressFileds
         })
 
-        const filterPasswordInformation = customerAccount.length && customerAccount.filter((field: RegisterFileds) => !field.custom && field.fieldType === 'password')
+        const filterPasswordInformation = customerAccount.length ? customerAccount.filter((field: RegisterFileds) => !field.custom && field.fieldType === 'password') : []
         const newPasswordInformation: Array<RegisterFileds> = conversionDataFormat(filterPasswordInformation)
         if (dispatch) {
           dispatch({

diff --git a/apps/storefront/src/pages/registered/RegisteredAccount.tsx b/apps/storefront/src/pages/registered/RegisteredAccount.tsx
@@ -119,6 +119,8 @@ export default function RegisteredAccount(props: RegisteredAccountProps) {
     dispatch({ type: 'emailSletter', payload: { emailMarketingNewsletter: event.target.checked } })
   }, [])
 
+  const additionalList: any = accountType === '1' ? contactInformation : bcContactInformationFields
+
   return (
     <Box
       sx={{
@@ -176,17 +178,19 @@ export default function RegisteredAccount(props: RegisteredAccountProps) {
           />
         </RadioGroup>
       </FormControl>
+
       <Box>
         <InformationFourLabels>{b3Lang('intl.user.register.registeredAccount.contactInformation')}</InformationFourLabels>
         <B3CustomForm
-          formFields={accountType === '1' ? contactInformation : bcContactInformationFields}
+          formFields={additionalList}
           errors={errors}
           control={control}
           getValues={getValues}
           setValue={setValue}
         />
 
       </Box>
+
       <Box
         sx={{
           mt: 4,
@@ -199,16 +203,21 @@ export default function RegisteredAccount(props: RegisteredAccountProps) {
         />
       </Box>
       <Box />
-      <Box>
-        <InformationFourLabels>{b3Lang('intl.user.register.registeredAccount.additionalInformation')}</InformationFourLabels>
-        <B3CustomForm
-          formFields={additionalInformation}
-          errors={errors}
-          control={control}
-          getValues={getValues}
-          setValue={setValue}
-        />
-      </Box>
+      {
+        (additionalInformation && additionalInformation.length) ? (
+          <Box>
+            <InformationFourLabels>{b3Lang('intl.user.register.registeredAccount.additionalInformation')}</InformationFourLabels>
+            <B3CustomForm
+              formFields={additionalInformation}
+              errors={errors}
+              control={control}
+              getValues={getValues}
+              setValue={setValue}
+            />
+          </Box>
+        ) : ''
+      }
+
       <RegisteredStepButton
         activeStep={activeStep}
         handleBack={handleBack}

diff --git a/apps/storefront/src/utils/basicConfig.ts b/apps/storefront/src/utils/basicConfig.ts
@@ -1,6 +1,6 @@
-const storeHash = (window as any).b3?.setting.storeHash || import.meta.env.VITE_B2B_STOREHASH
+const storeHash = (window as any).b3?.setting?.storeHash || import.meta.env.VITE_B2B_STOREHASH
 
-const getCcBaseUrl = () => {
+const getBcBaseUrl = () => {
   let baseUrl = ''
   if (import.meta.env.VITE_NODE_ENV === 'development') {
     baseUrl = '/bigcommerce'
@@ -10,7 +10,7 @@ const getCcBaseUrl = () => {
 
   return baseUrl
 }
-const bcBaseUrl = getCcBaseUrl()
+const bcBaseUrl = getBcBaseUrl()
 
 export {
   storeHash,