@graphcommerce/magento-cart-shipping-address 9.0.0-canary.79 → 9.0.0-canary.81

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Change Log
 
+## 9.0.0-canary.81
+
+## 9.0.0-canary.80
+
+### Minor Changes
+
+- [#2341](https://github.com/graphcommerce-org/graphcommerce/pull/2341) [`1d6512d`](https://github.com/graphcommerce-org/graphcommerce/commit/1d6512d4118cfb46602aa1f2432c3566fdb3261d) - Rename experimental_useV2 prop to deprecated_useV1 in useFromGql and enable it by default ([@Giovanni-Schroevers](https://github.com/Giovanni-Schroevers))
+
+### Patch Changes
+
+- [#2341](https://github.com/graphcommerce-org/graphcommerce/pull/2341) [`3043f94`](https://github.com/graphcommerce-org/graphcommerce/commit/3043f945c4caa2931c46f1f9ad940fd80b07e999) - In the shipping step show errors with a ApolloCartErrorSnackbar instead of a ApolloCartErrorAlert ([@Giovanni-Schroevers](https://github.com/Giovanni-Schroevers))
+
+- [#2341](https://github.com/graphcommerce-org/graphcommerce/pull/2341) [`3101681`](https://github.com/graphcommerce-org/graphcommerce/commit/3101681180e1a5a0cfba1bb89d72deb02cafdbbf) - When saving a shipping address it would always save the company after it was once saved. ([@Giovanni-Schroevers](https://github.com/Giovanni-Schroevers))
+
 ## 9.0.0-canary.79
 
 ## 9.0.0-canary.78

package/components/CustomerAddressForm/CustomerAddressActionCard.tsx

@@ -1,6 +1,7 @@
+import { ActionCardItemRenderProps } from '@graphcommerce/ecommerce-ui'
 import { CustomerAddressFragment } from '@graphcommerce/magento-customer/components/CreateCustomerAddressForm/CustomerAddress.gql'
 import { useFindCountry } from '@graphcommerce/magento-store'
-import { ActionCard, IconSvg, iconHome, ActionCardItemRenderProps } from '@graphcommerce/next-ui'
+import { ActionCard, IconSvg, iconHome } from '@graphcommerce/next-ui'
 import { Trans } from '@lingui/react'
 import { Button } from '@mui/material'
 import { useRouter } from 'next/router'

package/components/CustomerAddressForm/CustomerAddressForm.tsx

@@ -1,4 +1,5 @@
 import {
+  ActionCardListForm,
   FormAutoSubmit,
   FormPersist,
   TextFieldElement,
@@ -12,7 +13,7 @@ import {
   useFormGqlMutationCart,
 } from '@graphcommerce/magento-cart'
 import { CustomerDocument } from '@graphcommerce/magento-customer'
-import { ActionCardListForm, FormRow, filterNonNullableKeys } from '@graphcommerce/next-ui'
+import { FormRow, filterNonNullableKeys } from '@graphcommerce/next-ui'
 import { i18n } from '@lingui/core'
 import { Trans } from '@lingui/macro'
 import { Box, SxProps, Theme } from '@mui/material'
@@ -83,8 +84,8 @@ export function CustomerAddressForm(props: CustomerAddressListProps) {
       customer_address_id: number | null
     }
   >(Mutation, {
-    experimental_useV2: true,
     defaultValues: { customer_address_id: cartAddressId },
+    skipUnchanged: true,
     onBeforeSubmit: (vars) => {
       const { customer_address_id } = vars
       if (customer_address_id === -1) return false

package/components/ShippingAddressForm/ShippingAddressForm.tsx

@@ -16,10 +16,10 @@ import {
 import { CartAddressFragment } from '@graphcommerce/magento-cart/components/CartAddress/CartAddress.gql'
 import {
   AddressFields,
+  CompanyFields,
   CustomerDocument,
   NameFields,
   useCustomerQuery,
-  CompanyFields,
 } from '@graphcommerce/magento-customer'
 import { CountryRegionsDocument, StoreConfigDocument } from '@graphcommerce/magento-store'
 import { Form, FormRow } from '@graphcommerce/next-ui'
@@ -104,13 +104,17 @@ export const ShippingAddressForm = React.memo<ShippingAddressFormProps>((props)
           isCompany: Boolean(currentAddress?.company || currentAddress?.vat_id),
           customerNote: '',
         },
-    mode: 'onChange',
-    experimental_useV2: true,
+    skipUnchanged: true,
     onBeforeSubmit: (variables) => {
       const regionId = countries
         ?.find((country) => country?.two_letter_abbreviation === variables.countryCode)
         ?.available_regions?.find((region) => region?.id === variables.regionId)?.id
 
+      if (!variables.isCompany) {
+        variables.company = ''
+        variables.vatId = ''
+      }
+
       return {
         ...variables,
         telephone: variables.telephone || '000 - 000 0000',

package/package.json

@@ -2,7 +2,7 @@
   "name": "@graphcommerce/magento-cart-shipping-address",
   "homepage": "https://www.graphcommerce.org/",
   "repository": "github:graphcommerce-org/graphcommerce",
-  "version": "9.0.0-canary.79",
+  "version": "9.0.0-canary.81",
   "sideEffects": false,
   "prettier": "@graphcommerce/prettier-config-pwa",
   "eslintConfig": {
@@ -12,17 +12,17 @@
     }
   },
   "peerDependencies": {
-    "@graphcommerce/ecommerce-ui": "^9.0.0-canary.79",
-    "@graphcommerce/eslint-config-pwa": "^9.0.0-canary.79",
-    "@graphcommerce/graphql": "^9.0.0-canary.79",
-    "@graphcommerce/graphql-mesh": "^9.0.0-canary.79",
-    "@graphcommerce/image": "^9.0.0-canary.79",
-    "@graphcommerce/magento-cart": "^9.0.0-canary.79",
-    "@graphcommerce/magento-customer": "^9.0.0-canary.79",
-    "@graphcommerce/magento-store": "^9.0.0-canary.79",
-    "@graphcommerce/next-ui": "^9.0.0-canary.79",
-    "@graphcommerce/prettier-config-pwa": "^9.0.0-canary.79",
-    "@graphcommerce/typescript-config-pwa": "^9.0.0-canary.79",
+    "@graphcommerce/ecommerce-ui": "^9.0.0-canary.81",
+    "@graphcommerce/eslint-config-pwa": "^9.0.0-canary.81",
+    "@graphcommerce/graphql": "^9.0.0-canary.81",
+    "@graphcommerce/graphql-mesh": "^9.0.0-canary.81",
+    "@graphcommerce/image": "^9.0.0-canary.81",
+    "@graphcommerce/magento-cart": "^9.0.0-canary.81",
+    "@graphcommerce/magento-customer": "^9.0.0-canary.81",
+    "@graphcommerce/magento-store": "^9.0.0-canary.81",
+    "@graphcommerce/next-ui": "^9.0.0-canary.81",
+    "@graphcommerce/prettier-config-pwa": "^9.0.0-canary.81",
+    "@graphcommerce/typescript-config-pwa": "^9.0.0-canary.81",
     "@lingui/core": "^4.2.1",
     "@lingui/macro": "^4.2.1",
     "@lingui/react": "^4.2.1",