@akinon/pz-flow-payment 1.97.0 → 1.98.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @akinon/pz-flow-payment
 
+## 1.98.0
+
+### Minor Changes
+
+- 950fbc8: ZERO-3630: Refactor wallet payment initialization logic to prevent redundant API calls and ensure proper session management
+
 ## 1.97.0
 
 ## 1.96.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@akinon/pz-flow-payment",
   "license": "MIT",
-  "version": "1.97.0",
+  "version": "1.98.0",
   "main": "src/index.tsx",
   "dependencies": {
     "@checkout.com/checkout-web-components": "0.7.0-beta"

package/src/views/index.tsx

@@ -59,6 +59,7 @@ export default function FlowPayment({
   const flowComponentRef = useRef<any>(null);
   const lastAmountRef = useRef<string | null>(null);
   const isInitializingRef = useRef<boolean>(false);
+  const walletPaymentInitialized = useRef<boolean>(false);
 
   // Memoize the amount to track actual changes
   const currentAmount = useMemo(() => {
@@ -81,7 +82,11 @@ export default function FlowPayment({
       return;
     }
 
-    dispatch(checkoutApi.endpoints.setWalletPaymentPage.initiate({}));
+    // FIX: Only call setWalletPaymentPage if not already initialized
+    if (!walletPaymentInitialized.current) {
+      walletPaymentInitialized.current = true;
+      dispatch(checkoutApi.endpoints.setWalletPaymentPage.initiate({}));
+    }
   };
 
   const initFlowPaymentWebComponents = async ({
@@ -118,16 +123,24 @@ export default function FlowPayment({
         container.innerHTML = '';
       }
 
-      // Only get fresh payment data when amount has changed from the last recorded amount
+      // FIX: Use existing payment session instead of making another API call
       let paymentSession = preOrder.context_extras;
 
-      if (lastAmountRef.current !== currentAmount || !paymentSession) {
-        const walletPaymentResponse = await dispatch(
-          checkoutApi.endpoints.setWalletPaymentPage.initiate({})
-        ).unwrap();
-        paymentSession =
-          walletPaymentResponse?.pre_order?.context_extras ||
-          preOrder.context_extras;
+      // Only get fresh payment data if we don't have a valid session
+      if (!paymentSession && lastAmountRef.current !== currentAmount) {
+        // Check if another call is already in progress
+        if (!walletPaymentInitialized.current) {
+          walletPaymentInitialized.current = true;
+          const walletPaymentResponse = await dispatch(
+            checkoutApi.endpoints.setWalletPaymentPage.initiate({})
+          ).unwrap();
+          paymentSession =
+            walletPaymentResponse?.pre_order?.context_extras ||
+            preOrder.context_extras;
+        } else {
+          // Use existing context_extras if another call was already made
+          paymentSession = preOrder.context_extras;
+        }
       }
 
       // Update the last amount reference after getting fresh data
@@ -192,6 +205,8 @@ export default function FlowPayment({
           console.warn('Error destroying flow component on unmount:', error);
         }
       }
+      // Reset initialization flag on unmount
+      walletPaymentInitialized.current = false;
     };
   }, []);