@akinon/pz-flow-payment 1.108.0-rc.1 → 1.108.0-rc.3

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @akinon/pz-flow-payment
 
+## 1.108.0-rc.3
+
+### Minor Changes
+
+- e00b4a8: ZERO-3640: Refactor wallet selection initialization and error handling; streamline payment session management
+
+## 1.108.0-rc.2
+
 ## 1.108.0-rc.1
 
 ### Minor Changes

package/package.json

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

package/src/views/index.tsx

@@ -77,8 +77,8 @@ 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);
   const [errors, setErrors] = useState<any>(null);
+  const [walletSelectionReady, setWalletSelectionReady] = useState<boolean>(false);
 
   // Memoize the amount to track actual changes
   const currentAmount = useMemo(() => {
@@ -98,14 +98,26 @@ export default function FlowPayment({
       );
 
     if (!walletPaymentPageContext) {
+      setErrors('Payment method not available. Please try a different payment option.');
+      setWalletSelectionReady(false);
       return;
     }
 
-    // FIX: Only call setWalletPaymentPage if not already initialized
-    if (!walletPaymentInitialized.current) {
-      walletPaymentInitialized.current = true;
-      dispatch(checkoutApi.endpoints.setWalletPaymentPage.initiate({}));
+    // Initialize wallet payment page to get payment session data
+    const walletPaymentPageResponse = await dispatch(
+      checkoutApi.endpoints.setWalletPaymentPage.initiate({
+        payment_method: 'checkout_flow',
+        wallet_method: preOrder.wallet_method
+      })
+    ).unwrap();
+
+    if (walletPaymentPageResponse.errors) {
+      setErrors(walletPaymentPageResponse.errors);
+      setWalletSelectionReady(false);
+      return;
     }
+
+    setWalletSelectionReady(true);
   };
 
   const handlePaymentSuccess = async (paymentData: any) => {
@@ -184,24 +196,13 @@ export default function FlowPayment({
         container.innerHTML = '';
       }
 
-      // FIX: Use existing payment session instead of making another API call
+      // FIX: Use existing payment session from preOrder.context_extras
       let paymentSession = 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;
-        }
+      // If we don't have payment session data, we need to wait for it
+      if (!paymentSession) {
+        console.warn('FlowPayment: Payment session not available yet, component will retry when data is ready');
+        return;
       }
 
       // Update the last amount reference after getting fresh data
@@ -246,10 +247,21 @@ export default function FlowPayment({
   useEffect(() => {
     if (
       !preOrder.wallet_method ||
-      !preOrder.token ||
       !walletPaymentData?.data?.public_key ||
-      preOrder.wallet_method !== 'checkout_flow'
+      preOrder.wallet_method !== 'checkout_flow' ||
+      !walletSelectionReady ||
+      !preOrder.context_extras
     ) {
+      console.log('====================================');
+      console.log('FlowPayment: Missing required data to initialize payment components.', {
+        wallet_method: preOrder.wallet_method,
+        token: preOrder.token,
+        public_key: walletPaymentData?.data?.public_key,
+        walletSelectionReady,
+        context_extras: preOrder.context_extras
+      });
+      console.log('====================================');
+
       return;
     }
 
@@ -260,7 +272,9 @@ export default function FlowPayment({
     preOrder.wallet_method,
     preOrder.token,
     currentAmount, // Use memoized amount instead of preOrder.total_amount
-    walletPaymentData?.data?.public_key
+    walletPaymentData?.data?.public_key,
+    walletSelectionReady,
+    preOrder.context_extras // Add payment session dependency
   ]);
 
   // Cleanup function when component unmounts
@@ -273,8 +287,6 @@ export default function FlowPayment({
           console.warn('Error destroying flow component on unmount:', error);
         }
       }
-      // Reset initialization flag on unmount
-      walletPaymentInitialized.current = false;
     };
   }, []);