fix: Wrong key for line_2 attribute

commercelayer · Mar 28, 2022 · 03b84a9 · 03b84a9
1 parent 7a5450d
commit 03b84a9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/src/components/BillingAddressForm.tsx b/src/components/BillingAddressForm.tsx
@@ -1,12 +1,6 @@
 import AddressesContext from '#context/AddressContext'
 import useRapidForm from 'rapid-form'
-import React, {
-  FunctionComponent,
-  ReactNode,
-  useContext,
-  useEffect,
-  useRef,
-} from 'react'
+import React, { ReactNode, useContext, useEffect, useRef } from 'react'
 import BillingAddressFormContext from '#context/BillingAddressFormContext'
 import { isEmpty } from 'lodash'
 import { BaseError, CodeErrorType } from '#typings/errors'
@@ -26,7 +20,7 @@ type BillingAddressFormProps = {
   errorClassName?: string
 } & Omit<JSX.IntrinsicElements['form'], 'onSubmit'>
 
-const BillingAddressForm: FunctionComponent<BillingAddressFormProps> = (
+const BillingAddressForm: React.FunctionComponent<BillingAddressFormProps> = (
   props
 ) => {
   const {
@@ -92,7 +86,7 @@ const BillingAddressForm: FunctionComponent<BillingAddressFormProps> = (
           isBusiness
         )
         if (!mandatory) delete values[name]
-        if (field?.value) {
+        if (field?.value || field?.required === false) {
           values[name.replace('billing_address_', '')] = field.value
           delete values[name]
         }

diff --git a/src/components/ShippingAddressForm.tsx b/src/components/ShippingAddressForm.tsx
@@ -90,7 +90,7 @@ const ShippingAddressForm: FunctionComponent<ShippingAddressFormProps> = (
           isBusiness
         )
         if (!mandatory) delete values[name]
-        if (field?.value) {
+        if (field?.value || field?.required === false) {
           values[name.replace('shipping_address_', '')] = field.value
           delete values[name]
         }