@akinon/pz-flow-payment 1.100.0 → 1.101.0-rc.73

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @akinon/pz-flow-payment
 
+## 1.101.0-rc.73
+
+### Minor Changes
+
+- 1b9e9be: BRDG-14604: Refactor FlowPayment component to utilize RTK Query mutations for payment options and wallet selection, enhancing session management and initialization logic
+- d8be48fb: ZERO-3422: Update fetch method to use dynamic request method in wallet complete redirection middleware
+- 8b1d24eb: ZERO-3422: Update fetch method to use dynamic request method in wallet complete redirection middleware
+
 ## 1.100.0
 
 ### Minor Changes
@@ -25,6 +33,29 @@
 ### Minor Changes
 
 - 69e4cc5: BRDG-14604: Refactor FlowPayment component to optimize flow initialization and cleanup logic
+- d8be48fb: ZERO-3422: Update fetch method to use dynamic request method in wallet complete redirection middleware
+- 8b1d24eb: ZERO-3422: Update fetch method to use dynamic request method in wallet complete redirection middleware
+
+## 1.96.0-rc.60
+
+## 1.96.0-rc.59
+
+## 1.96.0-rc.58
+
+## 1.96.0-rc.57
+
+## 1.96.0-rc.56
+
+### Minor Changes
+
+- 69e4cc5: BRDG-14604: Refactor FlowPayment component to optimize flow initialization and cleanup logic
+
+## 1.96.0-rc.55
+
+### Minor Changes
+
+- d8be48fb: ZERO-3422: Update fetch method to use dynamic request method in wallet complete redirection middleware
+- 8b1d24eb: ZERO-3422: Update fetch method to use dynamic request method in wallet complete redirection middleware
 
 ## 1.95.0
 

package/package.json

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

package/src/views/index.tsx

@@ -1,5 +1,10 @@
 import { checkoutApi } from '@akinon/next/data/client/checkout';
 import { useAppDispatch, useAppSelector } from '@akinon/next/redux/hooks';
+import {
+  useSetPaymentOptionMutation,
+  useSetWalletSelectionPageMutation,
+  useSetWalletPaymentPageMutation
+} from '@akinon/next/data/client/checkout';
 import {
   ComponentOptions,
   CustomTranslations,
@@ -61,35 +66,38 @@ export default function FlowPayment({
   const isInitializingRef = useRef<boolean>(false);
   const walletPaymentInitialized = useRef<boolean>(false);
 
+  // RTK Query mutations
+  const [setPaymentOption] = useSetPaymentOptionMutation();
+  const [setWalletSelectionPage] = useSetWalletSelectionPageMutation();
+  const [setWalletPaymentPage] = useSetWalletPaymentPageMutation();
+
   // Memoize the amount to track actual changes
   const currentAmount = useMemo(() => {
     return preOrder.total_amount;
   }, [preOrder.total_amount]);
 
   const initWalletSelection = async () => {
-    const walletSelectionPageResponse = await dispatch(
-      checkoutApi.endpoints.setWalletSelectionPage.initiate({
-        payment_option: preOrder.payment_option?.pk
-      })
-    ).unwrap();
+    if (!walletPaymentInitialized.current) {
+      walletPaymentInitialized.current = true;
 
-    const walletPaymentPageContext =
-      walletSelectionPageResponse.context_list.find(
-        (c) => c.page_name === 'WalletPaymentPage'
-      );
+      const walletSelectionPageResponse = await dispatch(
+        checkoutApi.endpoints.setWalletSelectionPage.initiate({
+          payment_option: preOrder.payment_option?.pk
+        })
+      ).unwrap();
 
-    if (!walletPaymentPageContext) {
-      return;
-    }
+      const walletPaymentPageContext =
+        walletSelectionPageResponse.context_list.find(
+          (c) => c.page_name === 'WalletPaymentPage'
+        );
 
-    // FIX: Only call setWalletPaymentPage if not already initialized
-    if (!walletPaymentInitialized.current) {
-      walletPaymentInitialized.current = true;
-      dispatch(checkoutApi.endpoints.setWalletPaymentPage.initiate({}));
+      if (walletPaymentPageContext) {
+        dispatch(checkoutApi.endpoints.setWalletPaymentPage.initiate({}));
+      }
     }
   };
 
-  const initFlowPaymentWebComponents = async ({
+  const refreshPaymentSessionAndInitFlow = async ({
     publicKey
   }: {
     publicKey: string;
@@ -99,13 +107,70 @@ export default function FlowPayment({
       return;
     }
 
-    // Check if amount has actually changed
-    if (lastAmountRef.current === currentAmount && flowComponentRef.current) {
-      return; // Don't recreate component if amount hasn't changed
-    }
-
     isInitializingRef.current = true;
 
+    try {
+      // Step 1: Re-set the current payment option to refresh the session with new amount
+      if (preOrder.payment_option?.pk) {
+        const paymentOptionResponse = await setPaymentOption(
+          preOrder.payment_option.pk
+        ).unwrap();
+
+        // Check if WalletSelectionPage is available in the context list
+        const walletSelectionPageContext =
+          paymentOptionResponse.context_list?.find(
+            (c) => c.page_name === 'WalletSelectionPage'
+          );
+
+        if (!walletSelectionPageContext) {
+          console.warn(
+            'WalletSelectionPage not found in payment option response context list'
+          );
+          return;
+        }
+      }
+
+      // Step 2: Set wallet selection page
+      const walletSelectionResponse = await setWalletSelectionPage({
+        payment_option: preOrder.payment_option?.pk
+      }).unwrap();
+
+      const walletPaymentPageContext =
+        walletSelectionResponse.context_list?.find(
+          (c) => c.page_name === 'WalletPaymentPage'
+        );
+
+      if (!walletPaymentPageContext) {
+        return;
+      }
+
+      // Step 3: Set wallet payment page to get updated payment session
+      const walletPaymentResponse = await setWalletPaymentPage({}).unwrap();
+
+      // Step 4: Initialize flow component with fresh payment session
+      await initFlowPaymentWebComponents({
+        publicKey,
+        paymentSession:
+          walletPaymentResponse?.pre_order?.context_extras ||
+          preOrder.context_extras
+      });
+    } catch (error) {
+      console.error(
+        'Error refreshing payment session and initializing flow:',
+        error
+      );
+    } finally {
+      isInitializingRef.current = false;
+    }
+  };
+
+  const initFlowPaymentWebComponents = async ({
+    publicKey,
+    paymentSession
+  }: {
+    publicKey: string;
+    paymentSession?: any;
+  }) => {
     try {
       // Destroy existing flow component if it exists
       if (flowComponentRef.current) {
@@ -123,27 +188,7 @@ export default function FlowPayment({
         container.innerHTML = '';
       }
 
-      // FIX: Use existing payment session instead of making another API call
-      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;
-        }
-      }
-
-      // Update the last amount reference after getting fresh data
+      // Update the last amount reference
       lastAmountRef.current = currentAmount;
 
       const checkout = await loadCheckoutWebComponents({
@@ -151,7 +196,8 @@ export default function FlowPayment({
         environment: options?.environment || 'production',
         locale: options?.locale || 'en',
         translations: options?.translations,
-        paymentSession: paymentSession as PaymentSessionResponse,
+        paymentSession:
+          paymentSession || (preOrder.context_extras as PaymentSessionResponse),
         appearance: options?.appearance,
         componentOptions: options?.componentOptions
           ? { flow: options.componentOptions }
@@ -166,8 +212,6 @@ export default function FlowPayment({
       }
     } catch (error) {
       console.error('Error initializing flow payment components:', error);
-    } finally {
-      isInitializingRef.current = false;
     }
   };
 
@@ -175,6 +219,7 @@ export default function FlowPayment({
     initWalletSelection();
   }, []);
 
+  // Initial flow component initialization
   useEffect(() => {
     if (
       !preOrder.wallet_method ||
@@ -185,16 +230,37 @@ export default function FlowPayment({
       return;
     }
 
-    initFlowPaymentWebComponents({
-      publicKey: walletPaymentData.data.public_key
-    });
+    // Only initialize if component doesn't exist yet (initial mount)
+    if (!flowComponentRef.current) {
+      initFlowPaymentWebComponents({
+        publicKey: walletPaymentData.data.public_key
+      });
+    }
   }, [
     preOrder.wallet_method,
     preOrder.token,
-    currentAmount, // Use memoized amount instead of preOrder.total_amount
     walletPaymentData?.data?.public_key
   ]);
 
+  // Handle amount changes by refreshing payment session
+  useEffect(() => {
+    if (
+      !preOrder.wallet_method ||
+      !preOrder.token ||
+      !walletPaymentData?.data?.public_key ||
+      preOrder.wallet_method !== 'checkout_flow'
+    ) {
+      return;
+    }
+
+    // Only refresh if component exists and amount has changed
+    if (flowComponentRef.current && lastAmountRef.current !== currentAmount) {
+      refreshPaymentSessionAndInitFlow({
+        publicKey: walletPaymentData.data.public_key
+      });
+    }
+  }, [currentAmount]);
+
   // Cleanup function when component unmounts
   useEffect(() => {
     return () => {