@akinon/pz-apple-pay 1.119.0-rc.2 → 1.119.0

package/CHANGELOG.md

@@ -1,18 +1,6 @@
 # @akinon/pz-apple-pay
 
-## 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-apple-pay",
-  "version": "1.119.0-rc.2",
+  "version": "1.119.0",
   "license": "MIT",
   "main": "src/index.tsx",
   "peerDependencies": {

package/src/hooks/use-apple-pay.tsx

@@ -11,7 +11,6 @@ export default function useApplePay() {
   );
   const dispatch = useAppDispatch();
   const [errors, setErrors] = useState(null);
-  const [isProcessing, setIsProcessing] = useState(false);
 
   const paymentErrors = useMemo(() => {
     if (typeof errors === 'string') {
@@ -80,70 +79,60 @@ export default function useApplePay() {
   }, [walletPaymentData]);
 
   const initPaymentRequest = async () => {
-    if (isProcessing) return;
-
-    setIsProcessing(true);
     setErrors(null);
 
-    try {
-      const request = paymentRequest;
-      const paymentRequestResponse = await request.show();
+    const request = paymentRequest;
+    const paymentRequestResponse = await request.show();
+
+    if (paymentRequestResponse.details?.token?.paymentData) {
+      const paymentData = paymentRequestResponse.details.token.paymentData;
+
+      const walletPaymentPageResponse = await dispatch(
+        checkoutApi.endpoints.setWalletPaymentPage.initiate({
+          payment_token: JSON.stringify(paymentData)
+        })
+      ).unwrap();
 
-      if (paymentRequestResponse.details?.token?.paymentData) {
-        const paymentData = paymentRequestResponse.details.token.paymentData;
+      if (walletPaymentPageResponse.errors) {
+        setErrors(walletPaymentPageResponse.errors);
+      }
 
-        const walletPaymentPageResponse = await dispatch(
-          checkoutApi.endpoints.setWalletPaymentPage.initiate({
-            payment_token: JSON.stringify(paymentData)
+      if (
+        walletPaymentPageResponse.context_list.find(
+          (c) => c.page_name === 'WalletCompletePage'
+        )
+      ) {
+        const paymentCompleteResponse = await dispatch(
+          checkoutApi.endpoints.setWalletCompletePage.initiate({
+            success: true
           })
         ).unwrap();
 
-        if (walletPaymentPageResponse.errors) {
-          setErrors(walletPaymentPageResponse.errors);
+        if (paymentCompleteResponse.errors) {
+          setErrors(paymentCompleteResponse.errors);
         }
 
         if (
-          walletPaymentPageResponse.context_list.find(
-            (c) => c.page_name === 'WalletCompletePage'
+          paymentCompleteResponse.context_list.find(
+            (c) => c.page_name === 'ThankYouPage'
           )
         ) {
-          const paymentCompleteResponse = await dispatch(
-            checkoutApi.endpoints.setWalletCompletePage.initiate({
-              success: true
-            })
-          ).unwrap();
-
-          if (paymentCompleteResponse.errors) {
-            setErrors(paymentCompleteResponse.errors);
-          }
-
-          if (
-            paymentCompleteResponse.context_list.find(
-              (c) => c.page_name === 'ThankYouPage'
-            )
-          ) {
-            const redirectUrl = paymentCompleteResponse.context_list.find(
-              (c) => c.page_name === 'ThankYouPage'
-            )?.page_context.context_data.redirect_url;
-
-            const redirectUrlWithLocale = `${
-              window.location.origin
-            }${getUrlPathWithLocale(redirectUrl, getCookie('pz-locale'))}`;
-
-            await paymentRequestResponse.complete('success');
-            window.location.href = redirectUrlWithLocale;
-          } else {
-            await paymentRequestResponse.complete('fail');
-          }
+          const redirectUrl = paymentCompleteResponse.context_list.find(
+            (c) => c.page_name === 'ThankYouPage'
+          )?.page_context.context_data.redirect_url;
+
+          const redirectUrlWithLocale = `${
+            window.location.origin
+          }${getUrlPathWithLocale(redirectUrl, getCookie('pz-locale'))}`;
+
+          await paymentRequestResponse.complete('success');
+          window.location.href = redirectUrlWithLocale;
         } else {
           await paymentRequestResponse.complete('fail');
         }
+      } else {
+        await paymentRequestResponse.complete('fail');
       }
-    } catch (error) {
-      console.error('Apple Pay error:', error);
-      setErrors(error?.message || 'Payment failed');
-    } finally {
-      setIsProcessing(false);
     }
   };
 
@@ -152,7 +141,6 @@ export default function useApplePay() {
     paymentErrors,
     setPaymentErrors: setErrors,
     onMerchantValidation,
-    initPaymentRequest,
-    isProcessing
+    initPaymentRequest
   };
 }

package/src/views/index.tsx

@@ -15,7 +15,7 @@ export default function ApplePay({ customUIRender }: ApplePayProps) {
   const { walletPaymentData } = useAppSelector(
     (state: RootState) => state.checkout
   );
-  const { paymentErrors, initPaymentRequest, isProcessing } = useApplePay();
+  const { paymentErrors, initPaymentRequest } = useApplePay();
 
   if (!walletPaymentData) {
     return null;
@@ -30,9 +30,7 @@ export default function ApplePay({ customUIRender }: ApplePayProps) {
 
   return (
     <div>
-      <button onClick={initPaymentRequest} disabled={isProcessing}>
-        {isProcessing ? 'Processing...' : 'Pay with Apple Pay'}
-      </button>
+      <button onClick={initPaymentRequest}>Pay with Apple Pay</button>
 
       {paymentErrors?.length > 0 && (
         <div className="text-error-100 text-xs mt-5">{paymentErrors}</div>