Merge branch 'develop' into supernova/1143-expired_guest_cart

magento · Apr 26, 2019 · 5c3e147 · 5c3e147
2 parents efd614c + 3cc4deb
commit 5c3e147
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 19 deletions.
diff --git a/packages/venia-concept/src/actions/checkout/__tests__/asyncActions.spec.js b/packages/venia-concept/src/actions/checkout/__tests__/asyncActions.spec.js
@@ -518,7 +518,7 @@ describe('submitOrder', () => {
             2,
             checkoutReceiptActions.setOrderInformation({
                 id: response,
-                billing_address: address
+                billing_address: expect.any(Object)
             })
         );
         expect(dispatch).toHaveBeenNthCalledWith(
@@ -547,9 +547,7 @@ describe('submitOrder', () => {
             user: { isSignedIn: false }
         };
 
-        getState
-            .mockImplementationOnce(() => mockState)
-            .mockImplementationOnce(() => mockState);
+        getState.mockImplementationOnce(() => mockState);
 
         mockGetItem
             .mockImplementationOnce(
@@ -569,7 +567,7 @@ describe('submitOrder', () => {
             2,
             checkoutReceiptActions.setOrderInformation({
                 id: response,
-                billing_address: address
+                billing_address: expect.any(Object)
             })
         );
         expect(dispatch).toHaveBeenNthCalledWith(

diff --git a/packages/venia-concept/src/actions/checkout/asyncActions.js b/packages/venia-concept/src/actions/checkout/asyncActions.js
@@ -3,7 +3,6 @@ import { RestApi, Util } from '@magento/peregrine';
 import { closeDrawer } from 'src/actions/app';
 import { clearCartId, createCart } from 'src/actions/cart';
 import { getCountries } from 'src/actions/directory';
-import { getOrderInformation } from 'src/selectors/cart';
 import { getAccountInformation } from 'src/selectors/checkoutReceipt';
 import checkoutReceiptActions from 'src/actions/checkoutReceipt';
 import actions from './actions';
@@ -254,9 +253,10 @@ export const submitOrder = () =>
             });
 
             dispatch(
-                checkoutReceiptActions.setOrderInformation(
-                    getOrderInformation(getState(), response)
-                )
+                checkoutReceiptActions.setOrderInformation({
+                    id: response,
+                    billing_address
+                })
             );
 
             // Clear out everything we've saved about this cart from local storage.

diff --git a/packages/venia-concept/src/selectors/cart.js b/packages/venia-concept/src/selectors/cart.js
@@ -1,11 +1,3 @@
-export const getOrderInformation = (
-    { cart: { details: { billing_address } = {} } },
-    orderId
-) => ({
-    id: orderId,
-    billing_address
-});
-
 export const isEmptyCartVisible = ({ cart, checkout: { step } }) =>
     step === 'cart' && (!cart.details.items || cart.details.items.length === 0);
 

diff --git a/pwa-devdocs/src/peregrine/routing/index.md b/pwa-devdocs/src/peregrine/routing/index.md
@@ -123,14 +123,14 @@ class App extends Component {
     render(){
     ...
        return (
-           <div className={className}>
+           <Fragment>
                <Main isMasked={overlay}>
                    <Page>{renderRoutingError}</Page>
                </Main>
                <Mask isActive={overlay} dismiss={closeDrawer} />
                <Navigation isOpen={navIsOpen} />
                <MiniCart isOpen={cartIsOpen} />
-           </div>
+           </Fragment>
        );
     }
 }