@graphcommerce/magento-cart 4.2.14 → 4.3.1

package/CHANGELOG.md

@@ -1,5 +1,42 @@
 # Change Log
 
+## 4.3.1
+
+### Patch Changes
+
+- Updated dependencies [[`a9df81310`](https://github.com/graphcommerce-org/graphcommerce/commit/a9df81310c051876dd82fb2819105dece47cc213), [`55c2dcde7`](https://github.com/graphcommerce-org/graphcommerce/commit/55c2dcde7869ee51b84494af653b3edfd43904a4), [`597e2f413`](https://github.com/graphcommerce-org/graphcommerce/commit/597e2f413bdb5b76793b40ab631ce61390e26e81), [`f167f9963`](https://github.com/graphcommerce-org/graphcommerce/commit/f167f99630966a7de43717937d43669e66132494)]:
+  - @graphcommerce/next-ui@4.8.1
+  - @graphcommerce/framer-scroller@2.1.12
+  - @graphcommerce/framer-next-pages@3.2.2
+  - @graphcommerce/ecommerce-ui@1.0.13
+  - @graphcommerce/magento-customer@4.3.2
+  - @graphcommerce/magento-store@4.2.5
+  - @graphcommerce/image@3.1.6
+
+## 4.3.0
+
+### Minor Changes
+
+- [#1472](https://github.com/graphcommerce-org/graphcommerce/pull/1472) [`cf575395c`](https://github.com/graphcommerce-org/graphcommerce/commit/cf575395c16e9c571f75d4563004c3018a29aeaa) Thanks [@mikekeehnen](https://github.com/mikekeehnen)! - Added translations to cart errors
+
+### Patch Changes
+
+- Updated dependencies [[`a12db31b9`](https://github.com/graphcommerce-org/graphcommerce/commit/a12db31b9db9d27d86f59c1bfe58a0879999b9d3)]:
+  - @graphcommerce/magento-customer@4.3.1
+
+## 4.2.15
+
+### Patch Changes
+
+- [#1466](https://github.com/graphcommerce-org/graphcommerce/pull/1466) [`ed2b67a06`](https://github.com/graphcommerce-org/graphcommerce/commit/ed2b67a0618d9db97e79ed2a8226e0ae12403943) Thanks [@FrankHarland](https://github.com/FrankHarland)! - Added a new useCustomerSession hook to allow for more fine grained control over loading data for customers.
+
+- Updated dependencies [[`0363b9671`](https://github.com/graphcommerce-org/graphcommerce/commit/0363b9671db7c2932321d97faf6f1eb385238397), [`3ac90b57c`](https://github.com/graphcommerce-org/graphcommerce/commit/3ac90b57c68b96f9d81771d6664ed9435a28fc1d), [`00f6167ff`](https://github.com/graphcommerce-org/graphcommerce/commit/00f6167ff4096bf7432f3d8e8e739ecbf6ab0dd2), [`7159d3ab3`](https://github.com/graphcommerce-org/graphcommerce/commit/7159d3ab31e937c9c921023c46e80db5813e789c), [`32370574b`](https://github.com/graphcommerce-org/graphcommerce/commit/32370574bef6345b857ae911049ca27a64bc7e08), [`ed2b67a06`](https://github.com/graphcommerce-org/graphcommerce/commit/ed2b67a0618d9db97e79ed2a8226e0ae12403943), [`4c146c682`](https://github.com/graphcommerce-org/graphcommerce/commit/4c146c68242e6edc616807fb73173cc959c26034)]:
+  - @graphcommerce/next-ui@4.8.0
+  - @graphcommerce/magento-customer@4.3.0
+  - @graphcommerce/ecommerce-ui@1.0.12
+  - @graphcommerce/framer-scroller@2.1.11
+  - @graphcommerce/magento-store@4.2.4
+
 ## 4.2.14
 
 ### Patch Changes

package/components/ApolloCartError/ApolloCartErrorAlert.tsx

@@ -1,6 +1,5 @@
 import { ApolloErrorAlert, ApolloErrorAlertProps } from '@graphcommerce/ecommerce-ui'
-import { useQuery } from '@graphcommerce/graphql'
-import { CustomerTokenDocument } from '@graphcommerce/magento-customer'
+import { useCustomerSession } from '@graphcommerce/magento-customer'
 import { graphqlErrorByCategory } from '@graphcommerce/magento-graphql'
 import { i18n } from '@lingui/core'
 import { Trans } from '@lingui/react'
@@ -13,17 +12,21 @@ export type ApolloCartErrorAlertProps = ApolloErrorAlertProps
 export function ApolloCartErrorAlert(props: ApolloCartErrorAlertProps) {
   const { error } = props
   const clear = useClearCurrentCartId()
-  const token = useQuery(CustomerTokenDocument).data?.customerToken
+  const { token } = useCustomerSession()
 
   let action: JSX.Element | undefined
 
   const [, noSuchEntity] = graphqlErrorByCategory({ category: 'graphql-no-such-entity', error })
-  action = noSuchEntity ? <Button onClick={clear}>Reset Cart</Button> : undefined
+  action = noSuchEntity ? (
+    <Button onClick={clear}>
+      <Trans id='Reset Cart' />
+    </Button>
+  ) : undefined
 
   const [, authorizationError] = graphqlErrorByCategory({
     category: 'graphql-authorization',
     error,
-    mask: token?.token
+    mask: token
       ? i18n._(/* i18n */ `Please reauthenticate and try again`)
       : i18n._(/* i18n */ `You must sign in to continue`),
   })

package/components/ApolloCartError/ApolloCartErrorFullPage.tsx

@@ -1,6 +1,7 @@
 import { ApolloErrorFullPage, ApolloErrorFullPageProps } from '@graphcommerce/ecommerce-ui'
 import { graphqlErrorByCategory } from '@graphcommerce/magento-graphql'
 import { iconSadFace, IconSvg } from '@graphcommerce/next-ui'
+import { Trans } from '@lingui/react'
 import { Button } from '@mui/material'
 import { useClearCurrentCartId } from '../../hooks/useClearCurrentCartId'
 
@@ -11,7 +12,11 @@ export function ApolloCartErrorFullPage(props: ApolloCartErrorFullPageProps) {
   const clear = useClearCurrentCartId()
 
   const [, noSuchEntity] = graphqlErrorByCategory({ category: 'graphql-no-such-entity', error })
-  const action = noSuchEntity ? <Button onClick={clear}>Reset Cart</Button> : undefined
+  const action = noSuchEntity ? (
+    <Button onClick={clear}>
+      <Trans id='Reset Cart' />
+    </Button>
+  ) : undefined
 
   return (
     <ApolloErrorFullPage

package/components/ApolloCartError/ApolloCartErrorSnackbar.tsx

@@ -1,5 +1,6 @@
 import { ApolloErrorSnackbarProps, ApolloErrorSnackbar } from '@graphcommerce/ecommerce-ui'
 import { graphqlErrorByCategory } from '@graphcommerce/magento-graphql'
+import { Trans } from '@lingui/react'
 import { Button } from '@mui/material'
 import React from 'react'
 import { useClearCurrentCartId } from '../../hooks/useClearCurrentCartId'
@@ -13,7 +14,7 @@ export function ApolloCartErrorSnackbar(props: ApolloCartErrorSnackbarProps) {
   const [, noSuchEntity] = graphqlErrorByCategory({ category: 'graphql-no-such-entity', error })
   const action = noSuchEntity ? (
     <Button onClick={clear} variant='pill' color='secondary'>
-      Reset Cart
+      <Trans id='Reset Cart' />
     </Button>
   ) : undefined
 

package/hooks/useMergeCustomerCart.ts

@@ -1,5 +1,9 @@
 import { useMutation, useQuery } from '@graphcommerce/graphql'
-import { CustomerTokenDocument, useExtractCustomerErrors } from '@graphcommerce/magento-customer'
+import {
+  CustomerTokenDocument,
+  useCustomerSession,
+  useExtractCustomerErrors,
+} from '@graphcommerce/magento-customer'
 import { useEffect } from 'react'
 import { CustomerCartDocument } from './CustomerCart.gql'
 import { UseMergeCustomerCartDocument } from './UseMergeCustomerCart.gql'
@@ -18,9 +22,9 @@ export function useMergeCustomerCart() {
   const [merge, { error }] = useMutation(UseMergeCustomerCartDocument, { errorPolicy: 'all' })
 
   useExtractCustomerErrors({ error })
-  const customerToken = useQuery(CustomerTokenDocument)?.data?.customerToken
+  const { loggedIn } = useCustomerSession()
   const destinationCartId = useQuery(CustomerCartDocument, {
-    skip: !(customerToken?.token && customerToken.valid),
+    skip: !loggedIn,
   })?.data?.customerCart.id
 
   useEffect(() => {

package/package.json

@@ -2,7 +2,7 @@
   "name": "@graphcommerce/magento-cart",
   "homepage": "https://www.graphcommerce.org/",
   "repository": "github:graphcommerce-org/graphcommerce",
-  "version": "4.2.14",
+  "version": "4.3.1",
   "sideEffects": false,
   "prettier": "@graphcommerce/prettier-config-pwa",
   "eslintConfig": {
@@ -18,15 +18,15 @@
     "@playwright/test": "^1.21.1"
   },
   "dependencies": {
-    "@graphcommerce/ecommerce-ui": "1.0.11",
-    "@graphcommerce/framer-next-pages": "3.2.1",
-    "@graphcommerce/framer-scroller": "2.1.10",
+    "@graphcommerce/ecommerce-ui": "1.0.13",
+    "@graphcommerce/framer-next-pages": "3.2.2",
+    "@graphcommerce/framer-scroller": "2.1.12",
     "@graphcommerce/graphql": "3.1.3",
-    "@graphcommerce/image": "3.1.5",
-    "@graphcommerce/magento-customer": "4.2.12",
+    "@graphcommerce/image": "3.1.6",
+    "@graphcommerce/magento-customer": "4.3.2",
     "@graphcommerce/magento-graphql": "3.0.12",
-    "@graphcommerce/magento-store": "4.2.3",
-    "@graphcommerce/next-ui": "4.7.2",
+    "@graphcommerce/magento-store": "4.2.5",
+    "@graphcommerce/next-ui": "4.8.1",
     "@graphcommerce/react-hook-form": "3.1.3"
   },
   "peerDependencies": {