@graphcommerce/magento-payment-adyen 8.0.6-canary.4 → 8.0.7

package/CHANGELOG.md

@@ -1,25 +1,8 @@
 # @graphcommerce/magento-payment-adyen
 
-## 8.0.6-canary.4
+## 8.0.7
 
-## 8.0.6-canary.3
-
-## 8.0.6-canary.2
-
-### Patch Changes
-
-- [#2234](https://github.com/graphcommerce-org/graphcommerce/pull/2234) [`0767bc4`](https://github.com/graphcommerce-org/graphcommerce/commit/0767bc40f7b596209f24ca4e745ff0441f3275c9) - Upgrade input components to no longer use muiRegister, which improves INP scores
-  ([@FrankHarland](https://github.com/FrankHarland))
-
-- [#2234](https://github.com/graphcommerce-org/graphcommerce/pull/2234) [`530076e`](https://github.com/graphcommerce-org/graphcommerce/commit/530076e3664703cb8b577b7fcf1998a420819f60) - Moved all usages of useFormPersist to the <FormPersist/> component to prevent rerenders.
-  ([@FrankHarland](https://github.com/FrankHarland))
-
-- [#2234](https://github.com/graphcommerce-org/graphcommerce/pull/2234) [`43bd04a`](https://github.com/graphcommerce-org/graphcommerce/commit/43bd04a777c5800cc7e01bee1e123a5aad82f194) - Prevent BillingPage query from rerunning on each mutation
-  ([@FrankHarland](https://github.com/FrankHarland))
-
-## 8.0.6-canary.1
-
-## 8.0.6-canary.0
+## 8.0.6
 
 ## 8.0.5
 

package/components/AdyenPaymentOptionsAndPlaceOrder/AdyenPaymentOptionsAndPlaceOrder.tsx

@@ -1,10 +1,12 @@
-import { FormPersist, TextFieldElement, useFormCompose } from '@graphcommerce/ecommerce-ui'
+import { useFormCompose, useFormPersist, useFormValidFields } from '@graphcommerce/ecommerce-ui'
 import { useFormGqlMutationCart } from '@graphcommerce/magento-cart'
 import {
   PaymentOptionsProps,
   usePaymentMethodContext,
 } from '@graphcommerce/magento-cart-payment-method'
-import { FormRow } from '@graphcommerce/next-ui'
+import { FormRow, InputCheckmark } from '@graphcommerce/next-ui'
+// eslint-disable-next-line @typescript-eslint/no-restricted-imports
+import { TextField } from '@mui/material'
 import { useRouter } from 'next/router'
 import { useAdyenCartLock } from '../../hooks/useAdyenCartLock'
 import { useAdyenPaymentMethod } from '../../hooks/useAdyenPaymentMethod'
@@ -52,11 +54,14 @@ export function HppOptions(props: PaymentOptionsProps) {
     },
   })
 
-  const { handleSubmit, control, formState, required } = form
+  const { handleSubmit, muiRegister, formState, required } = form
 
   const submit = handleSubmit(() => {})
 
   const key = `PaymentMethodOptions_${code}${brandCode}`
+  useFormPersist({ form, name: key, persist: ['issuer'], storage: 'localStorage' })
+
+  const valid = useFormValidFields(form, required)
 
   /** To use an external Pay button we register the current form to be handled there as well. */
   useFormCompose({ form, step, submit, key })
@@ -69,16 +74,10 @@ export function HppOptions(props: PaymentOptionsProps) {
    */
   return (
     <form key={key} onSubmit={submit} noValidate>
-      <FormPersist form={form} name={key} persist={['issuer']} storage='localStorage' />
       {conf?.issuers && (
         <FormRow>
-          <TextFieldElement
-            control={control}
-            name='issuer'
+          <TextField
             defaultValue=''
-            rules={{
-              required: { value: true, message: 'Please provide an issuer' },
-            }}
             variant='outlined'
             color='secondary'
             select
@@ -87,6 +86,10 @@ export function HppOptions(props: PaymentOptionsProps) {
             helperText={formState.isSubmitted && formState.errors.issuer?.message}
             label={brandCode === 'ideal' ? 'Select your bank' : conf?.name}
             required
+            {...muiRegister('issuer', {
+              required: { value: true, message: 'Please provide an issuer' },
+            })}
+            InputProps={{ endAdornment: <InputCheckmark show={valid.issuer} select /> }}
           >
             {/* eslint-disable-next-line jsx-a11y/control-has-associated-label */}
             <option value='' />
@@ -99,7 +102,7 @@ export function HppOptions(props: PaymentOptionsProps) {
                 </option>
               )
             })}
-          </TextFieldElement>
+          </TextField>
         </FormRow>
       )}
     </form>

package/hooks/UseAdyenPaymentMethods.graphql

@@ -6,7 +6,8 @@ query UseAdyenPaymentMethods($cartId: String!) {
       configuration {
         currency
         amount {
-          ...Money
+          currency
+          value
         }
       }
       icon {

package/package.json

@@ -2,7 +2,7 @@
   "name": "@graphcommerce/magento-payment-adyen",
   "homepage": "https://www.graphcommerce.org/",
   "repository": "github:graphcommerce-org/graphcommerce",
-  "version": "8.0.6-canary.4",
+  "version": "8.0.7",
   "sideEffects": false,
   "prettier": "@graphcommerce/prettier-config-pwa",
   "eslintConfig": {
@@ -12,18 +12,18 @@
     }
   },
   "peerDependencies": {
-    "@graphcommerce/ecommerce-ui": "^8.0.6-canary.4",
-    "@graphcommerce/eslint-config-pwa": "^8.0.6-canary.4",
-    "@graphcommerce/graphql": "^8.0.6-canary.4",
-    "@graphcommerce/graphql-mesh": "^8.0.6-canary.4",
-    "@graphcommerce/image": "^8.0.6-canary.4",
-    "@graphcommerce/magento-cart": "^8.0.6-canary.4",
-    "@graphcommerce/magento-cart-payment-method": "^8.0.6-canary.4",
-    "@graphcommerce/magento-product": "^8.0.6-canary.4",
-    "@graphcommerce/magento-store": "^8.0.6-canary.4",
-    "@graphcommerce/next-ui": "^8.0.6-canary.4",
-    "@graphcommerce/prettier-config-pwa": "^8.0.6-canary.4",
-    "@graphcommerce/typescript-config-pwa": "^8.0.6-canary.4",
+    "@graphcommerce/ecommerce-ui": "^8.0.7",
+    "@graphcommerce/eslint-config-pwa": "^8.0.7",
+    "@graphcommerce/graphql": "^8.0.7",
+    "@graphcommerce/graphql-mesh": "^8.0.7",
+    "@graphcommerce/image": "^8.0.7",
+    "@graphcommerce/magento-cart": "^8.0.7",
+    "@graphcommerce/magento-cart-payment-method": "^8.0.7",
+    "@graphcommerce/magento-product": "^8.0.7",
+    "@graphcommerce/magento-store": "^8.0.7",
+    "@graphcommerce/next-ui": "^8.0.7",
+    "@graphcommerce/prettier-config-pwa": "^8.0.7",
+    "@graphcommerce/typescript-config-pwa": "^8.0.7",
     "@lingui/core": "^4.2.1",
     "@lingui/macro": "^4.2.1",
     "@lingui/react": "^4.2.1",