@tagadapay/plugin-sdk 3.1.5 → 3.1.9

package/dist/v2/react/components/GooglePayButton.js

@@ -4,13 +4,32 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
  * Uses v2 useExpressPaymentMethods hook and follows clean architecture principles
  */
 import GooglePayButtonReact from '@google-pay/button-react';
-import { useCallback, useEffect, useState } from 'react';
+import { useCallback, useEffect, useMemo, useState } from 'react';
 import { useExpressPaymentMethods } from '../hooks/useExpressPaymentMethods';
-const basistheoryPublicKey = (typeof process !== 'undefined' && process.env?.NEXT_PUBLIC_BASIS_THEORY_PUBLIC_API_KEY) || '';
-const basistheoryTenantId = (typeof process !== 'undefined' && process.env?.NEXT_PUBLIC_BASIS_THEORY_TENANT_ID) ||
-    '0b283fa3-44a1-4535-adff-e99ad0a58a47';
-export const GooglePayButton = ({ className = '', disabled = false, onSuccess, onError, onCancel, checkout, size = 'lg', buttonColor = 'black', buttonType = 'plain', }) => {
+import { usePaymentQuery } from '../hooks/usePaymentQuery';
+import { useShippingRatesQuery } from '../hooks/useShippingRatesQuery';
+import { getBasisTheoryKeys } from '../../../config/basisTheory';
+export const GooglePayButton = ({ className = '', disabled = false, onSuccess, onError, onCancel, checkout, size = 'lg', buttonColor = 'black', buttonType = 'plain', requiresShipping: requiresShippingProp, }) => {
     const { googlePayPaymentMethod, shippingMethods, lineItems, handleAddExpressId, updateCheckoutSessionValues, updateCustomerEmail, reComputeOrderSummary, setError: setContextError, } = useExpressPaymentMethods();
+    // Use payment query hook for processing
+    const { processGooglePayPayment } = usePaymentQuery();
+    // Use shipping rates hook for selecting shipping rates
+    const { selectRate } = useShippingRatesQuery({ checkout });
+    // Get Basis Theory credentials based on sandboxed flag from payment method config
+    // When sandboxed is true (even on production hostname), use test keys
+    const { basistheoryPublicKey, basistheoryTenantId } = useMemo(() => {
+        const useProductionKeys = googlePayPaymentMethod?.metadata?.sandboxed === false;
+        const keys = getBasisTheoryKeys(useProductionKeys);
+        console.log('[GooglePayButton] Using Basis Theory keys:', {
+            sandboxed: googlePayPaymentMethod?.metadata?.sandboxed,
+            useProductionKeys,
+            tenantId: keys.tenantId,
+        });
+        return {
+            basistheoryPublicKey: keys.apiKey,
+            basistheoryTenantId: keys.tenantId,
+        };
+    }, [googlePayPaymentMethod?.metadata?.sandboxed]);
     const [processingPayment, setProcessingPayment] = useState(false);
     const [pendingPaymentData, setPendingPaymentData] = useState(null);
     const [googlePayError, setGooglePayError] = useState(null);
@@ -65,46 +84,32 @@ export const GooglePayButton = ({ className = '', disabled = false, onSuccess, o
             throw error;
         }
     }, []);
-    // Process Google Pay payment
-    const processGooglePayPayment = useCallback(async (token) => {
-        if (!checkout.checkoutSession.id) {
-            throw new Error('Checkout session ID is not available');
-        }
+    // Process Google Pay payment using SDK hook
+    const handleGooglePayPayment = useCallback(async (token) => {
         setProcessingPayment(true);
         try {
-            // Process payment with backend API
-            const response = await fetch('/api/v1/google-pay/process-payment', {
-                method: 'POST',
-                headers: {
-                    'Content-Type': 'application/json',
+            const result = await processGooglePayPayment(checkout.checkoutSession.id, token, {
+                onPaymentSuccess: (response) => {
+                    // Keep processing state true during navigation
+                },
+                onPaymentFailed: (err) => {
+                    setProcessingPayment(false);
+                    setGooglePayError(err.message);
+                    setContextError(err.message);
+                    throw new Error(err.message);
                 },
-                body: JSON.stringify({
-                    checkoutSessionId: checkout.checkoutSession.id,
-                    paymentToken: token,
-                }),
             });
-            if (!response.ok) {
-                throw new Error('Failed to process Google Pay payment');
-            }
-            const paymentResult = await response.json();
-            if (onSuccess) {
-                onSuccess(paymentResult);
-            }
+            return result;
         }
         catch (error) {
-            console.error('Error processing Google Pay payment:', error);
+            console.error('Payment processing failed:', error);
+            setProcessingPayment(false);
             const errorMessage = error instanceof Error ? error.message : 'Google Pay payment failed';
             setGooglePayError(errorMessage);
             setContextError(errorMessage);
-            if (onError) {
-                onError(errorMessage);
-            }
             throw error;
         }
-        finally {
-            setProcessingPayment(false);
-        }
-    }, [checkout.checkoutSession.id, onSuccess, onError, setContextError]);
+    }, [processGooglePayPayment, checkout.checkoutSession.id, setContextError]);
     // Process payment data
     const onGooglePaymentData = useCallback(async (paymentData) => {
         setProcessingPayment(true);
@@ -137,7 +142,11 @@ export const GooglePayButton = ({ className = '', disabled = false, onSuccess, o
                 });
             }
             const payToken = await tokenizeGooglePayTokenWithBasisTheory(paymentData);
-            await processGooglePayPayment(payToken);
+            const result = await handleGooglePayPayment(payToken);
+            // Call success callback
+            if (onSuccess) {
+                onSuccess(result);
+            }
         }
         catch (error) {
             console.error('Error processing Google Pay payment:', error);
@@ -154,7 +163,8 @@ export const GooglePayButton = ({ className = '', disabled = false, onSuccess, o
         updateCheckoutSessionValues,
         updateCustomerEmail,
         tokenizeGooglePayTokenWithBasisTheory,
-        processGooglePayPayment,
+        handleGooglePayPayment,
+        onSuccess,
         onError,
         setContextError,
     ]);
@@ -200,8 +210,12 @@ export const GooglePayButton = ({ className = '', disabled = false, onSuccess, o
                         });
                         const newOrderSummary = await reComputeOrderSummary();
                         if (newOrderSummary) {
+                            // Use selected shipping rate ID if available, otherwise fall back to first one
+                            const defaultSelectedId = newOrderSummary.selectedShippingRateId ||
+                                newOrderSummary.shippingMethods[0]?.identifier ||
+                                '';
                             paymentDataRequestUpdate.newShippingOptionParameters = {
-                                defaultSelectedOptionId: newOrderSummary.shippingMethods[0]?.identifier || '',
+                                defaultSelectedOptionId: defaultSelectedId,
                                 shippingOptions: newOrderSummary.shippingMethods.map((method) => ({
                                     id: method.identifier,
                                     label: method.label,
@@ -218,17 +232,8 @@ export const GooglePayButton = ({ className = '', disabled = false, onSuccess, o
                     else if (intermediatePaymentData.callbackTrigger === 'SHIPPING_OPTION') {
                         // Update shipping rate
                         if (intermediatePaymentData.shippingOptionData?.id) {
-                            const response = await fetch('/api/v1/shipping-rates/select', {
-                                method: 'POST',
-                                headers: {
-                                    'Content-Type': 'application/json',
-                                },
-                                body: JSON.stringify({
-                                    checkoutSessionId: checkout.checkoutSession.id,
-                                    shippingRateId: intermediatePaymentData.shippingOptionData.id,
-                                }),
-                            });
-                            if (response.ok) {
+                            try {
+                                await selectRate(intermediatePaymentData.shippingOptionData.id);
                                 const newOrderSummary = await reComputeOrderSummary();
                                 if (newOrderSummary) {
                                     paymentDataRequestUpdate.newTransactionInfo = {
@@ -238,13 +243,17 @@ export const GooglePayButton = ({ className = '', disabled = false, onSuccess, o
                                     };
                                 }
                             }
+                            catch (error) {
+                                console.error('Error selecting shipping rate:', error);
+                                throw error;
+                            }
                         }
                     }
                     else if (intermediatePaymentData.callbackTrigger === 'OFFER') {
-                        console.log('OFFER callback triggered, no action needed');
+                        // No action needed for OFFER callback
                     }
                     else if (intermediatePaymentData.callbackTrigger === 'INITIALIZE') {
-                        console.log('INITIALIZE callback triggered, no action needed');
+                        // No action needed for INITIALIZE callback
                     }
                     resolve(paymentDataRequestUpdate);
                 }
@@ -261,7 +270,7 @@ export const GooglePayButton = ({ className = '', disabled = false, onSuccess, o
             };
             void processCallback();
         });
-    }, [updateCheckoutSessionValues, reComputeOrderSummary, checkout]);
+    }, [updateCheckoutSessionValues, reComputeOrderSummary, checkout, selectRate]);
     // Handle payment authorization
     const handleGooglePayAuthorized = useCallback((paymentData) => {
         setPendingPaymentData(paymentData);
@@ -295,6 +304,8 @@ export const GooglePayButton = ({ className = '', disabled = false, onSuccess, o
             gatewayMerchantId: basistheoryTenantId,
         },
     };
+    // Determine if shipping is required: use prop if provided, otherwise auto-detect from shippingMethods
+    const requiresShipping = requiresShippingProp ?? shippingMethods.length > 0;
     const paymentRequest = {
         apiVersion: 2,
         apiVersionMinor: 0,
@@ -313,22 +324,28 @@ export const GooglePayButton = ({ className = '', disabled = false, onSuccess, o
             merchantName: googlePayPaymentMethod?.metadata?.merchantName ||
                 checkout.checkoutSession?.store?.name ||
                 'Store',
+            // Use test merchant ID for sandbox, actual merchant ID for production
             merchantId: googlePayPaymentMethod?.metadata?.sandboxed
-                ? '12345678901234567890'
+                ? '12345678901234567890' // Google's test merchant ID for sandbox
                 : googlePayPaymentMethod?.metadata?.merchantId || '12345678901234567890',
         },
-        shippingAddressRequired: true,
-        shippingOptionRequired: true,
+        shippingAddressRequired: requiresShipping,
+        shippingOptionRequired: requiresShipping,
         emailRequired: true,
-        callbackIntents: ['SHIPPING_OPTION', 'SHIPPING_ADDRESS', 'PAYMENT_AUTHORIZATION'],
-        shippingOptionParameters: {
-            defaultSelectedOptionId: shippingMethods.length > 0 ? shippingMethods[0].identifier : '',
-            shippingOptions: shippingMethods.map((method) => ({
-                id: method.identifier,
-                label: method.label,
-                description: method.amount + ': ' + method.detail || '',
-            })),
-        },
+        callbackIntents: requiresShipping
+            ? ['SHIPPING_OPTION', 'SHIPPING_ADDRESS', 'PAYMENT_AUTHORIZATION']
+            : ['PAYMENT_AUTHORIZATION'],
+        ...(requiresShipping && {
+            shippingOptionParameters: {
+                defaultSelectedOptionId: checkout.checkoutSession?.shippingRate?.id ||
+                    (shippingMethods.length > 0 ? shippingMethods[0].identifier : ''),
+                shippingOptions: shippingMethods.map((method) => ({
+                    id: method.identifier,
+                    label: method.label,
+                    description: method.amount + ': ' + method.detail || '',
+                })),
+            },
+        }),
     };
     const environment = googlePayPaymentMethod?.metadata?.sandboxed ? 'TEST' : 'PRODUCTION';
     // Button size classes
@@ -347,7 +364,6 @@ export const GooglePayButton = ({ className = '', disabled = false, onSuccess, o
                         onError(errorMessage);
                     }
                 }, onCancel: () => {
-                    console.log('Google Pay payment cancelled');
                     if (onCancel) {
                         onCancel();
                     }

package/dist/v2/react/components/PreviewModeIndicator.d.ts

@@ -0,0 +1,46 @@
+/**
+ * Preview Mode Indicator
+ *
+ * Visual indicator shown when the SDK is in draft/preview mode
+ * Helps users distinguish between preview and production environments
+ */
+export interface PreviewModeIndicatorProps {
+    /**
+     * Position of the indicator
+     * @default 'bottom-right'
+     */
+    position?: 'top-left' | 'top-right' | 'bottom-left' | 'bottom-right';
+    /**
+     * Custom className for styling
+     */
+    className?: string;
+    /**
+     * Show detailed info on hover
+     * @default true
+     */
+    showDetails?: boolean;
+}
+/**
+ * Preview Mode Indicator Component
+ *
+ * Automatically shows when:
+ * - Draft mode is enabled (draft=true)
+ * - Funnel tracking is disabled (funnelTracking=false)
+ * - Custom API environment is set (tagadaClientEnv)
+ * - Custom API base URL is set (tagadaClientBaseUrl)
+ *
+ * @example
+ * ```tsx
+ * import { PreviewModeIndicator } from '@tagadapay/plugin-sdk';
+ *
+ * function App() {
+ *   return (
+ *     <>
+ *       <PreviewModeIndicator />
+ *       {/* Your app content *\/}
+ *     </>
+ *   );
+ * }
+ * ```
+ */
+export declare function PreviewModeIndicator({ position, className, showDetails, }?: PreviewModeIndicatorProps): import("react/jsx-runtime").JSX.Element | null;

package/dist/v2/react/components/PreviewModeIndicator.js

@@ -0,0 +1,113 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+/**
+ * Preview Mode Indicator
+ *
+ * Visual indicator shown when the SDK is in draft/preview mode
+ * Helps users distinguish between preview and production environments
+ */
+import { useEffect, useState } from 'react';
+import { isDraftMode, isFunnelTrackingEnabled, getSDKParams } from '../../core/utils/previewMode';
+/**
+ * Preview Mode Indicator Component
+ *
+ * Automatically shows when:
+ * - Draft mode is enabled (draft=true)
+ * - Funnel tracking is disabled (funnelTracking=false)
+ * - Custom API environment is set (tagadaClientEnv)
+ * - Custom API base URL is set (tagadaClientBaseUrl)
+ *
+ * @example
+ * ```tsx
+ * import { PreviewModeIndicator } from '@tagadapay/plugin-sdk';
+ *
+ * function App() {
+ *   return (
+ *     <>
+ *       <PreviewModeIndicator />
+ *       {/* Your app content *\/}
+ *     </>
+ *   );
+ * }
+ * ```
+ */
+export function PreviewModeIndicator({ position = 'bottom-right', className, showDetails = true, } = {}) {
+    const [isVisible, setIsVisible] = useState(false);
+    const [params, setParams] = useState({});
+    const [isExpanded, setIsExpanded] = useState(false);
+    useEffect(() => {
+        // Check if we're in preview mode
+        const sdkParams = getSDKParams();
+        const draftMode = isDraftMode();
+        const trackingDisabled = !isFunnelTrackingEnabled();
+        const hasCustomEnv = !!(sdkParams.tagadaClientEnv || sdkParams.tagadaClientBaseUrl);
+        setParams(sdkParams);
+        setIsVisible(draftMode || trackingDisabled || hasCustomEnv);
+    }, []);
+    if (!isVisible)
+        return null;
+    const positionStyles = {
+        'top-left': { top: '16px', left: '16px' },
+        'top-right': { top: '16px', right: '16px' },
+        'bottom-left': { bottom: '16px', left: '16px' },
+        'bottom-right': { bottom: '16px', right: '16px' },
+    };
+    const isDraft = isDraftMode();
+    const trackingDisabled = !isFunnelTrackingEnabled();
+    return (_jsxs("div", { className: className, style: {
+            position: 'fixed',
+            zIndex: 999999,
+            ...positionStyles[position],
+            fontFamily: '-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif',
+        }, onMouseEnter: () => showDetails && setIsExpanded(true), onMouseLeave: () => setIsExpanded(false), children: [_jsxs("div", { style: {
+                    background: isDraft ? '#ff9500' : '#007aff',
+                    color: 'white',
+                    padding: '8px 12px',
+                    borderRadius: '8px',
+                    fontSize: '13px',
+                    fontWeight: '600',
+                    boxShadow: '0 2px 8px rgba(0, 0, 0, 0.15)',
+                    cursor: showDetails ? 'pointer' : 'default',
+                    transition: 'all 0.2s ease',
+                    display: 'flex',
+                    alignItems: 'center',
+                    gap: '6px',
+                }, children: [_jsx("span", { style: { fontSize: '16px' }, children: "\uD83D\uDD0D" }), _jsx("span", { children: isDraft ? 'Preview Mode' : 'Dev Mode' })] }), showDetails && isExpanded && (_jsxs("div", { style: {
+                    position: 'absolute',
+                    bottom: position.includes('bottom') ? 'calc(100% + 8px)' : undefined,
+                    top: position.includes('top') ? 'calc(100% + 8px)' : undefined,
+                    right: position.includes('right') ? 0 : undefined,
+                    left: position.includes('left') ? 0 : undefined,
+                    background: 'white',
+                    border: '1px solid #e5e5e5',
+                    borderRadius: '8px',
+                    boxShadow: '0 4px 12px rgba(0, 0, 0, 0.15)',
+                    padding: '12px',
+                    minWidth: '250px',
+                    fontSize: '12px',
+                    lineHeight: '1.5',
+                }, children: [_jsx("div", { style: { marginBottom: '8px', fontWeight: '600', color: '#1d1d1f' }, children: "Current Environment" }), _jsxs("div", { style: { display: 'flex', flexDirection: 'column', gap: '6px' }, children: [isDraft && (_jsxs("div", { style: { display: 'flex', justifyContent: 'space-between', color: '#86868b' }, children: [_jsx("span", { children: "Draft Mode:" }), _jsx("span", { style: { color: '#ff9500', fontWeight: '600' }, children: "ON" })] })), trackingDisabled && (_jsxs("div", { style: { display: 'flex', justifyContent: 'space-between', color: '#86868b' }, children: [_jsx("span", { children: "Tracking:" }), _jsx("span", { style: { color: '#ff3b30', fontWeight: '600' }, children: "DISABLED" })] })), params.funnelEnv && (_jsxs("div", { style: { display: 'flex', justifyContent: 'space-between', color: '#86868b' }, children: [_jsx("span", { children: "Funnel Env:" }), _jsx("span", { style: { color: '#1d1d1f', fontWeight: '600', fontFamily: 'monospace', fontSize: '11px' }, children: params.funnelEnv })] })), params.tagadaClientEnv && (_jsxs("div", { style: { display: 'flex', justifyContent: 'space-between', color: '#86868b' }, children: [_jsx("span", { children: "API Env:" }), _jsx("span", { style: { color: '#1d1d1f', fontWeight: '600', fontFamily: 'monospace', fontSize: '11px' }, children: params.tagadaClientEnv })] })), params.tagadaClientBaseUrl && (_jsxs("div", { style: { color: '#86868b' }, children: [_jsx("div", { style: { marginBottom: '4px' }, children: "API URL:" }), _jsx("div", { style: {
+                                            color: '#1d1d1f',
+                                            fontWeight: '600',
+                                            fontFamily: 'monospace',
+                                            fontSize: '10px',
+                                            wordBreak: 'break-all',
+                                            background: '#f5f5f7',
+                                            padding: '4px 6px',
+                                            borderRadius: '4px',
+                                        }, children: params.tagadaClientBaseUrl })] })), params.funnelId && (_jsxs("div", { style: { color: '#86868b', marginTop: '4px', paddingTop: '8px', borderTop: '1px solid #e5e5e5' }, children: [_jsx("div", { style: { marginBottom: '4px' }, children: "Funnel ID:" }), _jsx("div", { style: {
+                                            color: '#1d1d1f',
+                                            fontFamily: 'monospace',
+                                            fontSize: '10px',
+                                            wordBreak: 'break-all',
+                                            background: '#f5f5f7',
+                                            padding: '4px 6px',
+                                            borderRadius: '4px',
+                                        }, children: params.funnelId })] }))] }), _jsxs("div", { style: {
+                            marginTop: '12px',
+                            paddingTop: '8px',
+                            borderTop: '1px solid #e5e5e5',
+                            fontSize: '11px',
+                            color: '#86868b',
+                            textAlign: 'center',
+                        }, children: ["Add ", _jsx("code", { style: { background: '#f5f5f7', padding: '2px 4px', borderRadius: '3px' }, children: "?forceReset=true" }), " to reset"] })] }))] }));
+}

package/dist/v2/react/hooks/useApplePayCheckout.d.ts

@@ -0,0 +1,16 @@
+import { CheckoutData } from '../../core/resources/checkout';
+export interface UseApplePayCheckoutOptions {
+    checkout: CheckoutData | undefined;
+    onSuccess?: (result: {
+        payment: any;
+        order?: any;
+    }) => void;
+    onError?: (error: string) => void;
+    onCancel?: () => void;
+}
+export declare function useApplePayCheckout({ checkout, onSuccess, onError, onCancel, }: UseApplePayCheckoutOptions): {
+    handleApplePayClick: () => void;
+    processingPayment: boolean;
+    error: string | null;
+    clearError: () => void;
+};

package/dist/v2/react/hooks/useApplePayCheckout.js

@@ -0,0 +1,193 @@
+import { useState, useCallback, useMemo } from 'react';
+import { usePaymentQuery } from './usePaymentQuery';
+import { getBasisTheoryApiKey } from '../../../react/config/payment';
+export function useApplePayCheckout({ checkout, onSuccess, onError, onCancel, }) {
+    const [processingPayment, setProcessingPayment] = useState(false);
+    const [error, setError] = useState(null);
+    const { processApplePayPayment } = usePaymentQuery();
+    const basistheoryPublicKey = useMemo(() => getBasisTheoryApiKey(), []);
+    // Validate merchant with Basis Theory
+    const validateMerchant = useCallback(async () => {
+        try {
+            const response = await fetch('https://api.basistheory.com/apple-pay/session', {
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/json',
+                    'BT-API-KEY': basistheoryPublicKey,
+                },
+                body: JSON.stringify({
+                    display_name: checkout?.checkoutSession?.store?.name || 'Store',
+                    domain: window.location.host,
+                }),
+            });
+            if (!response.ok) {
+                throw new Error(`HTTP error! Status: ${response.status}`);
+            }
+            return await response.json();
+        }
+        catch (err) {
+            console.error('Merchant validation failed:', err);
+            throw err;
+        }
+    }, [basistheoryPublicKey, checkout?.checkoutSession?.store?.name]);
+    // Tokenize Apple Pay payment
+    const tokenizeApplePay = useCallback(async (event) => {
+        try {
+            const response = await fetch('https://api.basistheory.com/apple-pay', {
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/json',
+                    'BT-API-KEY': basistheoryPublicKey,
+                },
+                body: JSON.stringify({
+                    apple_payment_data: event.payment.token,
+                }),
+            });
+            if (!response.ok) {
+                throw new Error(`HTTP error! Status: ${response.status}`);
+            }
+            const result = await response.json();
+            return result.apple_pay;
+        }
+        catch (err) {
+            console.error('Tokenization failed:', err);
+            throw err;
+        }
+    }, [basistheoryPublicKey]);
+    // Handle Apple Pay payment click
+    const handleApplePayClick = useCallback(() => {
+        // Don't proceed if checkout is not available
+        if (!checkout) {
+            console.error('Checkout data not available');
+            if (onError) {
+                onError('Checkout not ready');
+            }
+            return;
+        }
+        // Create line items from checkout summary
+        const lineItems = [
+            {
+                label: 'Subtotal',
+                amount: (checkout.summary.subtotalAdjustedAmount / 100).toFixed(2),
+                type: 'final',
+            },
+            {
+                label: 'Shipping',
+                amount: ((checkout.summary.shippingCost ?? 0) / 100).toFixed(2),
+                type: 'final',
+            },
+            {
+                label: 'Tax',
+                amount: (checkout.summary.totalTaxAmount / 100).toFixed(2),
+                type: 'final',
+            },
+        ];
+        const total = {
+            label: checkout.checkoutSession.store?.name || 'Store',
+            amount: (checkout.summary.totalAdjustedAmount / 100).toFixed(2),
+            type: 'final',
+        };
+        const request = {
+            countryCode: 'US', // Could be from payment method metadata
+            currencyCode: checkout.summary.currency,
+            supportedNetworks: ['visa', 'masterCard', 'amex', 'discover'],
+            merchantCapabilities: ['supports3DS'],
+            total,
+            lineItems,
+        };
+        try {
+            const session = new window.ApplePaySession(3, request);
+            // Merchant validation
+            session.onvalidatemerchant = (event) => {
+                void (async () => {
+                    try {
+                        const merchantSession = await validateMerchant();
+                        session.completeMerchantValidation(merchantSession);
+                    }
+                    catch (error) {
+                        console.error('Merchant validation failed:', error);
+                        session.abort();
+                        if (onError) {
+                            onError('Merchant validation failed');
+                        }
+                    }
+                })();
+            };
+            // Payment authorized
+            session.onpaymentauthorized = (event) => {
+                void (async () => {
+                    try {
+                        setProcessingPayment(true);
+                        // Tokenize payment
+                        const applePayToken = await tokenizeApplePay(event);
+                        // Complete Apple Pay sheet
+                        session.completePayment(window.ApplePaySession.STATUS_SUCCESS);
+                        // Process payment via SDK hook
+                        const result = await processApplePayPayment(checkout.checkoutSession.id, applePayToken, {
+                            onPaymentSuccess: (response) => {
+                                // Keep processing state true during navigation
+                            },
+                            onPaymentFailed: (err) => {
+                                setProcessingPayment(false);
+                                setError(err.message);
+                                if (onError) {
+                                    onError(err.message);
+                                }
+                            },
+                        });
+                        // Call success callback
+                        if (onSuccess) {
+                            onSuccess(result);
+                        }
+                    }
+                    catch (error) {
+                        console.error('Payment failed:', error);
+                        session.completePayment(window.ApplePaySession.STATUS_FAILURE);
+                        setProcessingPayment(false);
+                        const errorMsg = error instanceof Error ? error.message : 'Payment failed';
+                        setError(errorMsg);
+                        if (onError) {
+                            onError(errorMsg);
+                        }
+                    }
+                })();
+            };
+            // Handle cancellation
+            session.oncancel = () => {
+                console.log('Apple Pay cancelled by user');
+                setProcessingPayment(false);
+                if (onCancel) {
+                    onCancel();
+                }
+            };
+            // Handle errors
+            session.onerror = (event) => {
+                console.error('Apple Pay session error:', event);
+                setProcessingPayment(false);
+            };
+            session.begin();
+        }
+        catch (error) {
+            console.error('Failed to start Apple Pay session:', error);
+            const errorMsg = 'Failed to start Apple Pay';
+            setError(errorMsg);
+            if (onError) {
+                onError(errorMsg);
+            }
+        }
+    }, [
+        checkout,
+        validateMerchant,
+        tokenizeApplePay,
+        processApplePayPayment,
+        onSuccess,
+        onError,
+        onCancel,
+    ]);
+    return {
+        handleApplePayClick,
+        processingPayment,
+        error,
+        clearError: () => setError(null),
+    };
+}