Merge pull request #193 from davidchin/fix_billing_address

CHECKOUT-4421: Make customer and billing address objects not mandatory for customer component

package.json

@@ -23,7 +23,7 @@
   },
   "homepage": "https://github.com/bigcommerce/checkout-js#readme",
   "dependencies": {
-    "@bigcommerce/checkout-sdk": "^1.46.0",
+    "@bigcommerce/checkout-sdk": "^1.46.1",
     "@bigcommerce/citadel": "^2.15.1",
     "@bigcommerce/form-poster": "^1.2.2",
     "@bigcommerce/memoize": "^1.0.0",

src/app/customer/Customer.spec.tsx

@@ -71,6 +71,30 @@ describe('Customer', () => {
                 .toEqual(true);
         });
 
+        it('renders guest form if billing address is undefined', () => {
+            jest.spyOn(checkoutService.getState().data, 'getBillingAddress')
+                .mockReturnValue(undefined);
+
+            const component = mount(
+                <CustomerTest viewType={ CustomerViewType.Guest } />
+            );
+
+            expect(component.find(GuestForm).exists())
+                .toEqual(true);
+        });
+
+        it('renders guest form if customer is undefined', () => {
+            jest.spyOn(checkoutService.getState().data, 'getCustomer')
+                .mockReturnValue(undefined);
+
+            const component = mount(
+                <CustomerTest viewType={ CustomerViewType.Guest } />
+            );
+
+            expect(component.find(GuestForm).exists())
+                .toEqual(true);
+        });
+
         it('passes data to guest form', () => {
             const component = mount(
                 <CustomerTest viewType={ CustomerViewType.Guest } />

src/app/customer/Customer.tsx

@@ -201,7 +201,7 @@ export function mapToWithCheckoutCustomerProps(
     const customer = getCustomer();
     const config = getConfig();
 
-    if (!billingAddress || !checkout || !customer || !config) {
+    if (!checkout || !config) {
         return null;
     }
 
@@ -213,8 +213,8 @@ export function mapToWithCheckoutCustomerProps(
         createAccountUrl: config.links.createAccountLink,
         defaultShouldSubscribe: config.shopperConfig.defaultNewsletterSignup,
         deinitializeCustomer: checkoutService.deinitializeCustomer,
-        email: billingAddress.email || customer.email,
-        firstName: customer.firstName,
+        email: (billingAddress && billingAddress.email) || (customer && customer.email),
+        firstName: customer && customer.firstName,
         forgotPasswordUrl: config.links.forgotPasswordLink,
         initializeCustomer: checkoutService.initializeCustomer,
         isContinuingAsGuest: isContinuingAsGuest(),