@reevit/react 0.4.4 → 0.4.6

package/dist/index.mjs

@@ -210,12 +210,14 @@ var ReevitAPIClient = class {
     const request = {
       amount: config.amount,
       currency: config.currency,
-      method: this.mapPaymentMethod(method),
       country,
       customer_id: config.email || config.metadata?.customerId,
       phone: config.phone,
       metadata
     };
+    if (method) {
+      request.method = this.mapPaymentMethod(method);
+    }
     if (options?.preferredProviders?.length || options?.allowedProviders?.length) {
       request.policy = {
         prefer: options?.preferredProviders,
@@ -422,7 +424,8 @@ function useReevit(options) {
         }
         const reference = config.reference || generateReference();
         const country = detectCountryFromCurrency(config.currency);
-        const paymentMethod = method || config.paymentMethods?.[0] || "card";
+        const defaultMethod = config.paymentMethods && config.paymentMethods.length === 1 ? config.paymentMethods[0] : void 0;
+        const paymentMethod = method ?? defaultMethod;
         let data;
         let error;
         if (config.paymentLinkCode) {
@@ -1080,7 +1083,9 @@ function HubtelBridge({
   publicKey,
   merchantAccount,
   amount,
+  currency,
   reference,
+  email,
   phone,
   description = "Payment",
   callbackUrl,
@@ -1095,7 +1100,6 @@ function HubtelBridge({
   autoStart = true
 }) {
   const initialized = useRef(false);
-  const checkoutRef = useRef(null);
   const [authValue, setAuthValue] = useState("");
   const [isLoading, setIsLoading] = useState(false);
   const [resolvedMerchantAccount, setResolvedMerchantAccount] = useState(merchantAccount);
@@ -1109,19 +1113,17 @@ function HubtelBridge({
         try {
           const client = createReevitClient({ publicKey, baseUrl: apiBaseUrl });
           const { data, error } = await client.createHubtelSession(paymentId, clientSecret);
-          if (error) {
+          if (error || !data?.basicAuth) {
             onError({
               code: "SESSION_ERROR",
-              message: error.message || "Failed to create Hubtel session",
+              message: error?.message || "Failed to create Hubtel session",
               recoverable: true
             });
             return;
           }
-          if (data) {
-            setAuthValue(data.token);
-            if (data.merchantAccount) {
-              setResolvedMerchantAccount(data.merchantAccount);
-            }
+          setAuthValue(data.basicAuth);
+          if (data.merchantAccount) {
+            setResolvedMerchantAccount(data.merchantAccount);
           }
         } catch (err) {
           onError({
@@ -1145,13 +1147,13 @@ function HubtelBridge({
     }
     try {
       const checkout = new CheckoutSdk();
-      checkoutRef.current = checkout;
       const methodPreference = preferredMethod === "mobile_money" ? "momo" : preferredMethod === "card" ? "card" : void 0;
       const purchaseInfo = {
         amount: amount / 100,
         // Convert from minor to major units
         purchaseDescription: description,
         customerPhoneNumber: phone || "",
+        ...email ? { customerEmail: email } : {},
         clientReference: reference || `hubtel_${Date.now()}`,
         ...methodPreference ? { paymentMethod: methodPreference } : {}
       };
@@ -1159,8 +1161,6 @@ function HubtelBridge({
         branding: "enabled",
         callbackUrl: callbackUrl || window.location.href,
         merchantAccount: typeof resolvedMerchantAccount === "string" ? parseInt(resolvedMerchantAccount, 10) : resolvedMerchantAccount,
-        // Use session token or basicAuth for authentication
-        // Session tokens are base64-encoded credentials fetched securely from the server
         basicAuth: authValue || "",
         ...methodPreference ? { paymentMethod: methodPreference } : {}
       };
@@ -1174,8 +1174,8 @@ function HubtelBridge({
               paymentId: data.transactionId || reference || "",
               reference: data.clientReference || reference || "",
               amount,
-              currency: "GHS",
-              paymentMethod: "mobile_money",
+              currency: currency || "GHS",
+              paymentMethod: preferredMethod || "mobile_money",
               psp: "hubtel",
               pspReference: data.transactionId || "",
               status: "success"
@@ -1206,7 +1206,21 @@ function HubtelBridge({
       };
       onError(error);
     }
-  }, [merchantAccount, amount, reference, phone, description, callbackUrl, authValue, isLoading, preferredMethod, onSuccess, onError, onClose]);
+  }, [
+    amount,
+    reference,
+    phone,
+    description,
+    callbackUrl,
+    authValue,
+    isLoading,
+    preferredMethod,
+    onSuccess,
+    onError,
+    onClose,
+    resolvedMerchantAccount,
+    currency
+  ]);
   useEffect(() => {
     if (autoStart && !initialized.current && !isLoading && authValue) {
       initialized.current = true;
@@ -2240,7 +2254,7 @@ function ReevitCheckout({
             {
               paymentId: paymentIntent?.id || "",
               publicKey,
-              merchantAccount: pspKey,
+              merchantAccount: paymentIntent?.pspCredentials?.merchantAccount || "",
               amount: paymentIntent?.amount ?? amount,
               currency: paymentIntent?.currency ?? currency,
               reference: paymentIntent?.reference || reference,