@akinon/pz-gpay 1.119.0-rc.2 → 1.119.0

package/CHANGELOG.md

@@ -1,18 +1,6 @@
 # @akinon/pz-gpay
 
-## 1.119.0-rc.2
-
-### Minor Changes
-
-- 6ad72e8d: ZERO-4032: Add loading state management for payment submissions across multiple components and add safe guarding
-
-## 1.119.0-rc.1
-
-## 1.119.0-rc.0
-
-### Minor Changes
-
-- 6ad72e8d: ZERO-4032: Add loading state management for payment submissions across multiple components and add safe guarding
+## 1.119.0
 
 ## 1.118.0
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akinon/pz-gpay",
-  "version": "1.119.0-rc.2",
+  "version": "1.119.0",
   "license": "MIT",
   "main": "src/index.tsx",
   "peerDependencies": {

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, checkPaymentWillRedirect } from '@akinon/next/utils';
+import { getPosError } from '@akinon/next/utils';
 
 type GPayForm = Record<string, never>;
 
@@ -61,7 +61,6 @@ 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 };
 
@@ -73,46 +72,25 @@ export function GPayOption(props: GPayOptionProps) {
   const {
     handleSubmit,
     control,
-    formState: { errors: formErrors, isSubmitting }
+    formState: { errors: formErrors }
   } = useForm<GPayForm>({
     resolver: yupResolver(gpayFormSchema)
   });
 
   const [setPaymentOption] = useSetPaymentOptionMutation();
-  const [setGPayMethod, { isLoading: isSettingMethod }] =
-    useSetGPayMethodMutation();
-  const [setCompleteGPay, { isLoading: isCompleting }] =
-    useSetCompleteGPayMutation();
-
-  const isButtonDisabled =
-    isSubmitting ||
-    isPaymentStepBusy ||
-    isSettingMethod ||
-    isCompleting ||
-    isProcessing;
+  const [setGPayMethod] = useSetGPayMethodMutation();
+  const [setCompleteGPay] = useSetCompleteGPayMutation();
 
   const onSubmit: SubmitHandler<GPayForm> = async () => {
-    if (isButtonDisabled) return;
+    if (isPaymentStepBusy) return;
 
-    setIsProcessing(true);
     setFormError(null);
+    await setGPayMethod();
 
-    try {
-      await setGPayMethod();
+    const response = await setCompleteGPay().unwrap();
 
-      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);
+    if (response?.errors?.non_field_errors) {
+      setFormError(response.errors.non_field_errors);
     }
   };
 
@@ -159,7 +137,6 @@ 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>