@graphcommerce/magento-cart 3.1.3 → 3.1.4

package/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.1.4](https://github.com/ho-nl/m2-pwa/compare/@graphcommerce/magento-cart@3.1.3...@graphcommerce/magento-cart@3.1.4) (2021-10-08)
+
+
+### Bug Fixes
+
+* conditional hook in CartSummary ([780c5c1](https://github.com/ho-nl/m2-pwa/commit/780c5c140e03ea5f77ea9cf5409498ed853e772c))
+* issue where the cart shippingMethod didn't have a value defined ([a1f27d1](https://github.com/ho-nl/m2-pwa/commit/a1f27d1bff01921ff2cf783394c2bb4a65285d17))
+
+
+
+
+
 ## [3.1.3](https://github.com/ho-nl/m2-pwa/compare/@graphcommerce/magento-cart@3.1.2...@graphcommerce/magento-cart@3.1.3) (2021-10-07)
 
 

package/components/CartSummary/index.tsx

@@ -46,15 +46,14 @@ export default function CartSummary(props: CartSummaryProps) {
   const { children, editable } = props
 
   const { data } = useCartQuery(GetCartSummaryDocument, { allowUrl: true })
+  const { href: historyHref, onClick: historyOnClick } = useHistoryLink({
+    href: '/checkout',
+  })
 
   if (!data?.cart) return null
 
   const { email, shipping_addresses, billing_address } = data.cart
 
-  const { href: historyHref, onClick: historyOnClick } = useHistoryLink({
-    href: '/checkout',
-  })
-
   return (
     <div className={classes.root}>
       <div className={classes.detailsContainer}>

package/components/CartTotals/CartTotals.tsx

@@ -65,9 +65,10 @@ export default function CartTotals(props: CartTotalsProps) {
   const { containerMargin } = props
   const { shipping_addresses, prices } = data.cart
   const shippingMethod = shipping_addresses?.[0]?.selected_shipping_method
+
   const shippingMethodPrices = shipping_addresses?.[0]?.available_shipping_methods?.find(
     (avail) =>
-      (shippingMethod?.amount.value ?? 0) > 0 &&
+      (shippingMethod?.amount?.value ?? 0) > 0 &&
       avail?.carrier_code === shippingMethod?.carrier_code &&
       avail?.method_code === shippingMethod?.method_code,
   )

package/components/EmptyCart/EmptyCart.tsx

@@ -1,54 +1,16 @@
-import {
-  responsiveVal,
-  SvgImage,
-  iconSadShoppingBag,
-  FullPageMessage,
-} from '@graphcommerce/next-ui'
-import { Button, makeStyles, Theme, Typography } from '@material-ui/core'
+import { iconSadShoppingBag, FullPageMessage, SvgImageSimple } from '@graphcommerce/next-ui'
+import { Button } from '@material-ui/core'
 import Link from 'next/link'
 import React from 'react'
 
-const useStyles = makeStyles(
-  (theme: Theme) => ({
-    root: {
-      textAlign: 'center',
-      display: 'flex',
-      justifyContent: 'center',
-      alignItems: 'center',
-      [theme.breakpoints.down('sm')]: {
-        minHeight: '70vh',
-      },
-      [theme.breakpoints.up('md')]: {
-        minHeight: '60vh',
-      },
-    },
-    img: {
-      display: 'block',
-      margin: `0 auto ${theme.spacings.xxs} auto`,
-      width: responsiveVal(120, 180),
-      height: responsiveVal(120, 180),
-    },
-  }),
-  { name: 'EmptyCart' },
-)
-
 type EmptyCartProps = { children?: React.ReactNode }
 export default function EmptyCart(props: EmptyCartProps) {
   const { children } = props
-  const classes = useStyles()
 
   return (
     <FullPageMessage
-      title={'Your cart is empty'}
-      icon={
-        <SvgImage
-          src={iconSadShoppingBag}
-          alt='Empty Cart'
-          className={classes.img}
-          loading='eager'
-          size='large'
-        />
-      }
+      title='Your cart is empty'
+      icon={<SvgImageSimple src={iconSadShoppingBag} alt='Empty Cart' layout='fill' />}
       button={
         <Link href='/' passHref>
           <Button variant='contained' color='primary' size='large'>
@@ -57,30 +19,7 @@ export default function EmptyCart(props: EmptyCartProps) {
         </Link>
       }
     >
-      Discover our collection and add items to your basket!
+      {children ?? <>Discover our collection and add items to your basket!</>}
     </FullPageMessage>
   )
-
-  return (
-    <div className={classes.root}>
-      <div>
-        <SvgImage
-          src={iconSadShoppingBag}
-          alt='Empty Cart'
-          className={classes.img}
-          loading='eager'
-          size='large'
-        />
-
-        {children ?? (
-          <>
-            <Typography variant='h3' gutterBottom component='h1'>
-              Your cart is empty
-            </Typography>
-            <Typography>Discover our collection and add items to your basket!</Typography>
-          </>
-        )}
-      </div>
-    </div>
-  )
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphcommerce/magento-cart",
-  "version": "3.1.3",
+  "version": "3.1.4",
   "sideEffects": false,
   "prettier": "@graphcommerce/prettier-config-pwa",
   "browserslist": [
@@ -24,10 +24,10 @@
     "@graphcommerce/framer-scroller": "^0.2.7",
     "@graphcommerce/graphql": "^2.103.5",
     "@graphcommerce/image": "^2.104.6",
-    "@graphcommerce/magento-customer": "^3.0.16",
+    "@graphcommerce/magento-customer": "^3.0.17",
     "@graphcommerce/magento-graphql": "^2.103.5",
-    "@graphcommerce/magento-store": "^3.0.14",
-    "@graphcommerce/next-ui": "^3.1.6",
+    "@graphcommerce/magento-store": "^3.0.15",
+    "@graphcommerce/next-ui": "^3.1.7",
     "@graphcommerce/react-hook-form": "^2.102.6",
     "@graphql-typed-document-node/core": "^3.1.0",
     "@material-ui/core": "^4.12.3",
@@ -38,5 +38,5 @@
     "react": "^17.0.2",
     "react-dom": "^17.0.2"
   },
-  "gitHead": "717bd3c1658e421c247c1f8b210935cdb7780197"
+  "gitHead": "7c6ad9b6fdf91e48b33013218d962ad15f931db8"
 }