From 243630ea5d22fb0f24024f0e22a3c8f8c5838cdc Mon Sep 17 00:00:00 2001 From: Philipp Stracker Date: Mon, 16 Sep 2024 15:45:41 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Revert=20logic=20to=20call=20set?= =?UTF-8?q?PaymentComponent?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Before the change, the paymentComponent always was null, as it was not set anywhere. --- .../resources/js/hooks/usePaymentSetupEffect.js | 16 +++++++++++----- modules/ppcp-axo-block/resources/js/index.js | 5 ++--- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/modules/ppcp-axo-block/resources/js/hooks/usePaymentSetupEffect.js b/modules/ppcp-axo-block/resources/js/hooks/usePaymentSetupEffect.js index bc10e1533..087fc807e 100644 --- a/modules/ppcp-axo-block/resources/js/hooks/usePaymentSetupEffect.js +++ b/modules/ppcp-axo-block/resources/js/hooks/usePaymentSetupEffect.js @@ -1,6 +1,10 @@ import { useEffect, useCallback } from '@wordpress/element'; -const usePaymentSetupEffect = ( onPaymentSetup, handlePaymentSetup ) => { +const usePaymentSetupEffect = ( + onPaymentSetup, + handlePaymentSetup, + setPaymentComponent +) => { /** * `onPaymentSetup()` fires when we enter the "PROCESSING" state in the checkout flow. * It pre-processes the payment details and returns data for server-side processing. @@ -13,10 +17,12 @@ const usePaymentSetupEffect = ( onPaymentSetup, handlePaymentSetup ) => { }; }, [ onPaymentSetup, handlePaymentSetup ] ); - const handlePaymentLoad = useCallback( ( component ) => { - // We'll return this function instead of calling setPaymentComponent directly - return component; - }, [] ); + const handlePaymentLoad = useCallback( + ( component ) => { + setPaymentComponent( component ); + }, + [ setPaymentComponent ] + ); return { handlePaymentLoad }; }; diff --git a/modules/ppcp-axo-block/resources/js/index.js b/modules/ppcp-axo-block/resources/js/index.js index 26b2c188d..17321df15 100644 --- a/modules/ppcp-axo-block/resources/js/index.js +++ b/modules/ppcp-axo-block/resources/js/index.js @@ -6,7 +6,6 @@ import useFastlaneSdk from './hooks/useFastlaneSdk'; import useTokenizeCustomerData from './hooks/useTokenizeCustomerData'; import useCardChange from './hooks/useCardChange'; import useAxoSetup from './hooks/useAxoSetup'; -import usePaymentSetup from './hooks/usePaymentSetup'; import useAxoCleanup from './hooks/useAxoCleanup'; import useHandlePaymentSetup from './hooks/useHandlePaymentSetup'; @@ -47,11 +46,11 @@ const Axo = ( props ) => { setShippingAddress, setCard ); - usePaymentSetup( onPaymentSetup, emitResponse, card ); const { handlePaymentLoad } = usePaymentSetupEffect( onPaymentSetup, - handlePaymentSetup + handlePaymentSetup, + setPaymentComponent ); useAxoCleanup();