@akinon/pz-gpay 2.0.0-beta.12 → 2.0.0-beta.14

package/CHANGELOG.md

@@ -1,63 +1,114 @@
 # @akinon/pz-gpay
 
-## 2.0.0-beta.12
+## 2.0.0-beta.14
 
 ### Minor Changes
 
-- 1d79e32: ZERO-3540: Next.js Upgrade to 15.4.5
+- 6ad72e8d: ZERO-4032: Add loading state management for payment submissions across multiple components and add safe guarding
 
-## 2.0.0-beta.11
+## 2.0.0-beta.13
 
-### Minor Changes
+## 1.118.0
 
-- ac783d6: ZERO-3482: Update tailwindcss to version 4.1.11 and enhance button cursor styles
+## 1.117.0
 
-## 2.0.0-beta.10
+## 1.116.0
 
-### Minor Changes
+## 1.115.0
 
-- 2806320: ZERO-3390: Update version tailwindcss, autoprefixer, tailwind-merge, postcss
+## 1.114.0
 
-## 2.0.0-beta.9
+## 1.113.0
 
-### Minor Changes
+## 1.112.0
+
+## 1.111.0
+
+## 1.110.0
+
+## 1.109.0
+
+## 1.108.0
+
+## 1.107.0
 
-- 0fe7711: ZERO-3387: Upgrade nextjs, eslint-config-next
+## 1.106.0
 
-## 2.0.0-beta.8
+## 1.105.0
 
-## 2.0.0-beta.7
+## 1.104.0
 
-## 2.0.0-beta.6
+## 1.103.0
+
+## 1.102.0
+
+## 1.101.0
+
+## 1.100.0
+
+## 1.99.0
 
 ### Minor Changes
 
-- 8f05f9b: ZERO-3250: Beta branch synchronized with Main branch
+- d58538b: ZERO-3638: Enhance RC pipeline: add fetch, merge, and pre-release setup with conditional commit
+
+## 1.98.0
+
+## 1.97.0
+
+## 1.96.0
 
-## 2.0.0-beta.5
+## 1.95.0
 
-## 2.0.0-beta.4
+## 1.94.0
 
-## 2.0.0-beta.3
+## 1.93.0
 
-## 2.0.0-beta.2
+## 1.92.0
+
+## 1.91.0
+
+## 1.90.0
 
 ### Minor Changes
 
-- a006015: ZERO-3116: Add not-found page and update default middleware.
-- 1eeb3d8: ZERO-3116: Add not found page
+- a1463fd: ZERO-3381: Add customUIRender support for flexible UI rendering
 
-## 2.0.0-beta.1
+## 1.89.0
 
 ### Minor Changes
 
-- ZERO-3091: Upgrade Next.js to v15 and React to v19
+- 57a6184: ZERO-3332 :Add data-testid attribute to GPay payment button for testing
+
+## 1.88.0
+
+## 1.87.0
+
+## 1.86.0
+
+## 1.85.0
+
+## 1.84.0
+
+### Minor Changes
+
+- 624a4eb: ZERO-3276: Update installation instructions across multiple README files to standardize format and improve clarity
+
+## 1.83.0
+
+## 1.82.0
+
+## 1.81.0
+
+## 1.80.0
+
+## 1.79.0
 
-## 2.0.0-beta.0
+## 1.78.0
 
-### Major Changes
+## 1.77.0
 
-- be6c09d: ZERO-3114: Create beta version.
+## 1.76.0
 
 ## 1.75.0
 

package/package.json

@@ -1,19 +1,19 @@
 {
   "name": "@akinon/pz-gpay",
-  "version": "2.0.0-beta.12",
+  "version": "2.0.0-beta.14",
   "license": "MIT",
   "main": "src/index.tsx",
   "peerDependencies": {
-    "react": "^19.0.0",
-    "react-dom": "^19.0.0"
+    "react": "^18.0.0 || ^19.0.0",
+    "react-dom": "^18.0.0 || ^19.0.0"
   },
   "devDependencies": {
-    "@types/node": "^22.10.2",
-    "@types/react": "^19.0.2",
-    "@types/react-dom": "^19.0.2",
-    "react": "^19.0.0",
-    "react-dom": "^19.0.0",
-    "typescript": "^5.7.2",
+    "@types/node": "^18.7.8",
+    "@types/react": "^18.0.17",
+    "@types/react-dom": "^18.0.6",
+    "react": "^19.2.4",
+    "react-dom": "^19.2.4",
+    "typescript": "^4.7.4",
     "react-hook-form": "7.31.3",
     "@hookform/resolvers": "2.9.0"
   }

package/src/views/gpay-option.tsx

@@ -19,7 +19,7 @@ import {
 } from '../endpoints';
 import { twMerge } from 'tailwind-merge';
 import { Button } from '@akinon/next/components/button';
-import { getPosError } from '@akinon/next/utils';
+import { getPosError, checkPaymentWillRedirect } from '@akinon/next/utils';
 
 type GPayForm = Record<string, never>;
 
@@ -61,6 +61,7 @@ const defaultTranslations: GPayTranslations = {
 export function GPayOption(props: GPayOptionProps) {
   const [formError, setFormError] = useState<string | null>(null);
   const [errors, setErrors] = useState<string[]>([]);
+  const [isProcessing, setIsProcessing] = useState(false);
 
   const translations = { ...defaultTranslations, ...props.translations };
 
@@ -72,25 +73,46 @@ export function GPayOption(props: GPayOptionProps) {
   const {
     handleSubmit,
     control,
-    formState: { errors: formErrors }
+    formState: { errors: formErrors, isSubmitting }
   } = useForm<GPayForm>({
-    resolver: yupResolver(gpayFormSchema)
+    resolver: yupResolver(gpayFormSchema) as any
   });
 
   const [setPaymentOption] = useSetPaymentOptionMutation();
-  const [setGPayMethod] = useSetGPayMethodMutation();
-  const [setCompleteGPay] = useSetCompleteGPayMutation();
+  const [setGPayMethod, { isLoading: isSettingMethod }] =
+    useSetGPayMethodMutation();
+  const [setCompleteGPay, { isLoading: isCompleting }] =
+    useSetCompleteGPayMutation();
+
+  const isButtonDisabled =
+    isSubmitting ||
+    isPaymentStepBusy ||
+    isSettingMethod ||
+    isCompleting ||
+    isProcessing;
 
   const onSubmit: SubmitHandler<GPayForm> = async () => {
-    if (isPaymentStepBusy) return;
+    if (isButtonDisabled) return;
 
+    setIsProcessing(true);
     setFormError(null);
-    await setGPayMethod();
 
-    const response = await setCompleteGPay().unwrap();
+    try {
+      await setGPayMethod();
 
-    if (response?.errors?.non_field_errors) {
-      setFormError(response.errors.non_field_errors);
+      const response = await setCompleteGPay().unwrap();
+
+      if (response?.errors?.non_field_errors) {
+        setFormError(response.errors.non_field_errors);
+        setIsProcessing(false);
+        return;
+      }
+
+      if (response?.errors || !checkPaymentWillRedirect(response)) {
+        setIsProcessing(false);
+      }
+    } catch (error) {
+      setIsProcessing(false);
     }
   };
 
@@ -137,6 +159,7 @@ export function GPayOption(props: GPayOptionProps) {
         data-testid="gpay-payment-button"
         className={twMerge('w-full mt-3', props.buttonClassName)}
         type="submit"
+        disabled={isButtonDisabled}
       >
         {translations.button}
       </Button>