@reevit/react 0.5.3 → 0.5.5

package/dist/index.mjs

@@ -332,7 +332,7 @@ function reevitReducer(state, action) {
     case "INIT_ERROR":
       return { ...state, status: "failed", error: action.payload };
     case "SELECT_METHOD":
-      return { ...state, status: "method_selected", selectedMethod: action.payload, error: null };
+      return { ...state, status: "method_selected", selectedMethod: action.payload };
     case "PROCESS_START":
       return { ...state, status: "processing", error: null };
     case "PROCESS_SUCCESS":
@@ -423,6 +423,7 @@ function mapToPaymentIntent(response, config) {
     availableMethods: config.paymentMethods || ["card", "mobile_money"],
     reference: response.reference || response.id,
     // Use backend reference or fallback to ID
+    orgId: response.org_id,
     connectionId: response.connection_id,
     provider: response.provider,
     feeAmount: response.fee_amount,
@@ -624,11 +625,20 @@ function useReevit(options) {
     },
     [onError]
   );
-  const reset = useCallback(() => {
+  const reset = useCallback(async () => {
+    if (state.paymentIntent && state.status !== "success") {
+      try {
+        const apiClient = apiClientRef.current;
+        if (apiClient) {
+          await apiClient.cancelPaymentIntent(state.paymentIntent.id);
+        }
+      } catch {
+      }
+    }
     initializingRef.current = false;
     initRequestIdRef.current += 1;
     dispatch({ type: "RESET" });
-  }, []);
+  }, [state.paymentIntent, state.status]);
   const close = useCallback(async () => {
     if (state.paymentIntent && state.status !== "success") {
       try {
@@ -1128,7 +1138,6 @@ function PaystackBridge({
       if (!window.PaystackPop) {
         throw new Error("Paystack script loaded but PaystackPop not available");
       }
-      const safeMetadata = accessCode ? void 0 : metadata;
       const setupConfig = {
         key: publicKey,
         email,
@@ -1137,7 +1146,7 @@ function PaystackBridge({
         currency,
         ref: reference,
         access_code: accessCode,
-        metadata: safeMetadata,
+        metadata,
         channels,
         callback: (response) => {
           console.log("[PaystackBridge] Callback received", response);
@@ -2252,10 +2261,10 @@ function ReevitCheckout({
     [selectMethod]
   );
   const handleProviderSelect = useCallback(
-    (provider) => {
+    async (provider) => {
       if (provider === selectedProvider) {
         setSelectedProvider(null);
-        reset();
+        await reset();
         setShowPSPBridge(false);
         setMomoData(null);
         return;
@@ -2263,7 +2272,7 @@ function ReevitCheckout({
       const providerMethods = providerOptions.find((option) => option.provider === provider)?.methods || paymentMethods;
       const methodForInit = selectedMethod && providerMethods.includes(selectedMethod) ? selectedMethod : providerMethods[0] || paymentMethods[0];
       setSelectedProvider(provider);
-      reset();
+      await reset();
       setShowPSPBridge(false);
       setMomoData(null);
       initialize(methodForInit, { preferredProvider: provider, allowedProviders: [provider] });
@@ -2305,8 +2314,8 @@ function ReevitCheckout({
   const handlePSPClose = useCallback(() => {
     setShowPSPBridge(false);
   }, []);
-  const handleBack = useCallback(() => {
-    reset();
+  const handleBack = useCallback(async () => {
+    await reset();
     setMomoData(null);
     setShowPSPBridge(false);
   }, [reset]);
@@ -2395,6 +2404,7 @@ function ReevitCheckout({
       const pspKey = paymentIntent?.pspPublicKey || publicKey || "";
       const bridgeMetadata = {
         ...metadata,
+        org_id: paymentIntent?.orgId ?? metadata?.org_id,
         payment_id: paymentIntent?.id,
         connection_id: paymentIntent?.connectionId ?? metadata?.connection_id,
         customer_phone: momoData?.phone || phone