paymob-pixel-alpha 1.1.69 → 1.1.71

package/main.js

@@ -83754,6 +83754,10 @@ const CardElement = /*#__PURE__*/(0,react.forwardRef)(({
   const [instantRefundAmount, setInstantRefundAmount] = (0,react.useState)('');
   const [isInquiringInstantRefund, setIsInquiringInstantRefund] = (0,react.useState)(false);
   const [isInstantRefundChecked, setIsInstantRefundChecked] = (0,react.useState)(false);
+  const checkInstantRefundGeographicEligibility = () => {
+    const countriesCurrencies = ["EGP"];
+    return countriesCurrencies.includes(currency);
+  };
   const showCvvInput = paymentMethodType === constants_PAYMENT_METHODS_TYPES.MOTO && useCvv || paymentMethodType === constants_PAYMENT_METHODS_TYPES.ONLINE;
   const shouldDisablePayBtn = showCvvInput ? loading || (isAmexCardSelected ? selectedCardCvvLength !== src_constants_AMEX_CVV_LENGTH : selectedCardCvvLength !== constants_CVV_LENGTH) : !selectedCardId;
   const resetInstantRefundState = () => {
@@ -83843,9 +83847,14 @@ const CardElement = /*#__PURE__*/(0,react.forwardRef)(({
           res
         } = toggleResponse != null ? toggleResponse : {};
         if (success && res) {
-          handleDiscount(res);
+          if (res.status === 200) {
+            handleDiscount(res);
+          }
         }
-        instantRefundToggleResolve.current == null || instantRefundToggleResolve.current(!!success);
+        instantRefundToggleResolve.current == null || instantRefundToggleResolve.current({
+          ok: !!success,
+          res
+        });
         instantRefundToggleResolve.current = null;
         setIsInquiringInstantRefund(false);
       }
@@ -84008,10 +84017,11 @@ const CardElement = /*#__PURE__*/(0,react.forwardRef)(({
       type: 'INSTANT_REFUND_TOGGLE',
       payload: {
         enabled: isInstantRefundChecked,
-        instantRefundAmount: (_instantRefundData$in = instantRefundData == null ? void 0 : instantRefundData.instant_refund_fees) != null ? _instantRefundData$in : '',
+        instantRefundAmount: Number((_instantRefundData$in = instantRefundData == null ? void 0 : instantRefundData.instant_refund_fees) != null ? _instantRefundData$in : 0) / 100,
         eligible: (_instantRefundData$el = instantRefundData == null ? void 0 : instantRefundData.eligible) != null ? _instantRefundData$el : false,
         totalAmount,
-        originalAmount: payment == null ? void 0 : payment.amount
+        originalAmount: payment == null ? void 0 : payment.amount,
+        currency
       }
     });
   }, [isInstantRefundChecked, instantRefundData, totalAmount]);
@@ -84257,7 +84267,10 @@ const CardElement = /*#__PURE__*/(0,react.forwardRef)(({
       }, '*');
       instantRefundToggleTimeoutRef.current = setTimeout(() => {
         if (instantRefundToggleResolve.current) {
-          instantRefundToggleResolve.current(false);
+          instantRefundToggleResolve.current({
+            ok: false,
+            res: undefined
+          });
           instantRefundToggleResolve.current = null;
           setIsInquiringInstantRefund(false);
         }
@@ -84268,13 +84281,25 @@ const CardElement = /*#__PURE__*/(0,react.forwardRef)(({
     const discountIntegrationId = getDiscountIntegrationId();
     if (!discountIntegrationId) {
       applyNoDiscountInstantRefundAmounts(nextChecked);
-      return true;
+      return {
+        ok: true,
+        res: undefined
+      };
     }
     const token = nextChecked ? instantRefundData == null ? void 0 : instantRefundData.new_payment_token : payment == null ? void 0 : payment.token;
     const res = await checkDiscount(token, payment.id, selectedCard.identifier, selectedCard.type);
-    if ((res == null ? void 0 : res.status) !== 200) return false;
+    if ((res == null ? void 0 : res.status) !== 200) {
+      return {
+        ok: true,
+        res: res
+      };
+    }
+    ;
     handleDiscount(res);
-    return true;
+    return {
+      ok: true,
+      res: res
+    };
   };
   const handleInstantRefundToggleChange = async currentChecked => {
     if (!payment || !(instantRefundData != null && instantRefundData.eligible)) return false;
@@ -84282,10 +84307,11 @@ const CardElement = /*#__PURE__*/(0,react.forwardRef)(({
     const isSavedCardContext = !!(savedCards != null && savedCards.length) && !showCardModal && !!selectedCard;
     setIsInquiringInstantRefund(true);
     try {
-      const ok = isSavedCardContext ? await handleSavedCardToggle(nextChecked) : await postToggleToIframe(nextChecked);
-      if (!ok) return false;
+      var _response$res;
+      const response = isSavedCardContext ? await handleSavedCardToggle(nextChecked) : await postToggleToIframe(nextChecked);
+      if (!response.ok) return false;
       setIsInstantRefundChecked(nextChecked);
-      if (!hasDiscountForPayment) {
+      if (!hasDiscountForPayment || ((_response$res = response.res) == null ? void 0 : _response$res.status) !== 200) {
         applyNoDiscountInstantRefundAmounts(nextChecked);
       }
       return true;
@@ -84471,7 +84497,7 @@ const CardElement = /*#__PURE__*/(0,react.forwardRef)(({
             fontFamily: currencyFontFamily
           },
           children: displayCurrency
-        }), ' ', amount]
+        }), ' ', formattedAmount]
       })]
     }), discountedAmount && /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
       className: "flex justify-between items-center text-green-600",
@@ -84662,7 +84688,7 @@ const CardElement = /*#__PURE__*/(0,react.forwardRef)(({
                 customError: customStyle == null || (_customStyle$errorTex4 = customStyle.errorText) == null ? void 0 : _customStyle$errorTex4.holderName
               })
             })]
-          }), isInstantRefundActive && /*#__PURE__*/(0,jsx_runtime.jsx)(InstantRefund_InstantRefundToggle, {
+          }), isInstantRefundActive && checkInstantRefundGeographicEligibility() && /*#__PURE__*/(0,jsx_runtime.jsx)(InstantRefund_InstantRefundToggle, {
             checked: isInstantRefundChecked,
             onChange: handleInstantRefundToggleChange,
             instantRefundData: instantRefundData,
@@ -84748,7 +84774,7 @@ const CardElement = /*#__PURE__*/(0,react.forwardRef)(({
             children: [/*#__PURE__*/(0,jsx_runtime.jsx)("span", {
               children: discountAppliedMessage
             }), /*#__PURE__*/(0,jsx_runtime.jsx)(icons_CircleCheck, {})]
-          }), isInstantRefundActive && selectedCard && !showCardModal && card.id === selectedCardId && /*#__PURE__*/(0,jsx_runtime.jsx)(InstantRefund_InstantRefundToggle, {
+          }), isInstantRefundActive && selectedCard && !showCardModal && card.id === selectedCardId && checkInstantRefundGeographicEligibility() && /*#__PURE__*/(0,jsx_runtime.jsx)(InstantRefund_InstantRefundToggle, {
             checked: isInstantRefundChecked,
             onChange: handleInstantRefundToggleChange,
             instantRefundData: instantRefundData,
@@ -94743,11 +94769,21 @@ function KnetApplePay(props) {
       }
     }
     session.onvalidatemerchant = async event => {
-      const merchantSession = await validatemerchant(event.validationURL, integrationId);
-      session.completeMerchantValidation(merchantSession);
+      try {
+        const merchantSession = await validatemerchant(event.validationURL, integrationId);
+        if (!merchantSession || typeof merchantSession !== 'object' || merchantSession.status === 0) {
+          session.abort();
+          setLoading(false);
+          return;
+        }
+        session.completeMerchantValidation(merchantSession);
+      } catch (e) {
+        session.abort();
+        setLoading(false);
+      }
     };
     session.onpaymentauthorized = async event => {
-      var _payRes$data, _payRes$data2, _payRes$data3;
+      var _event$payment, _payRes$data, _payRes$data2, _payRes$data3;
       let clientData = null;
       if (!clientInfo) {
         try {
@@ -94769,7 +94805,7 @@ function KnetApplePay(props) {
           console.log(e);
         }
       }
-      const payRes = await knetApplePayPayment(JSON.stringify(event.payment.token.paymentData), paymentToken, clientData);
+      const payRes = await knetApplePayPayment(JSON.stringify((_event$payment = event.payment) == null || (_event$payment = _event$payment.token) == null ? void 0 : _event$payment.paymentData), paymentToken, clientData);
       setLoading(false);
       let status;
       let resStatus = '';
@@ -94804,15 +94840,19 @@ function KnetApplePay(props) {
         resStatus = 'invalid';
       }
       if (onAfterPaymentComplete) {
-        session.completePayment({
-          status
-        });
+        try {
+          session.completePayment({
+            status
+          });
+        } catch (_) {}
         onAfterPaymentComplete(payRes);
       } else {
         onSubmit(resStatus, payRes.data);
-        session.completePayment({
-          status
-        });
+        try {
+          session.completePayment({
+            status
+          });
+        } catch (_) {}
       }
     };
     session.oncancel = () => {
@@ -95100,14 +95140,18 @@ function apple_pay_ApplePay(props) {
       }
     }
     session.onvalidatemerchant = async event => {
-      console.log("start validation request");
-      console.log(`validationURL: ${event.validationURL}`);
-      console.log(`integrationId: ${integrationId}`);
-      const merchantSession = await validatemerchant(event.validationURL, integrationId, displayName);
-      console.log("validation request completed");
-      console.log(`merchantSession: ${merchantSession}`);
-      console.log("start completeMerchantValidation");
-      session.completeMerchantValidation(merchantSession);
+      try {
+        const merchantSession = await validatemerchant(event.validationURL, integrationId, displayName);
+        if (!merchantSession || typeof merchantSession !== 'object' || merchantSession.status === 0) {
+          session.abort();
+          setLoading(false);
+          return;
+        }
+        session.completeMerchantValidation(merchantSession);
+      } catch (e) {
+        session.abort();
+        setLoading(false);
+      }
     };
     session.onshippingcontactselected = async event => {
       console.log({
@@ -95135,7 +95179,7 @@ function apple_pay_ApplePay(props) {
       });
     };
     session.onpaymentauthorized = async event => {
-      var _payRes$data, _payRes$data2, _payRes$data3;
+      var _event$payment, _payRes$data, _payRes$data2, _payRes$data3;
       let clientData = null;
       if (!clientInfo) {
         const billingAddress = event.payment.billingContact;
@@ -95182,7 +95226,7 @@ function apple_pay_ApplePay(props) {
       //   dispatch(addClientInfo(clientData));
       // }
       console.log("start pay request");
-      const payRes = await paymentauthorized(JSON.stringify(event.payment.token.paymentData), paymentToken, clientData);
+      const payRes = await paymentauthorized(JSON.stringify((_event$payment = event.payment) == null || (_event$payment = _event$payment.token) == null ? void 0 : _event$payment.paymentData), paymentToken, clientData);
       setLoading(false);
       let status;
       let resStatus = '';
@@ -95217,15 +95261,19 @@ function apple_pay_ApplePay(props) {
         resStatus = 'invalid';
       }
       if (onAfterPaymentComplete) {
-        session.completePayment({
-          status
-        });
+        try {
+          session.completePayment({
+            status
+          });
+        } catch (_) {}
         onAfterPaymentComplete(payRes);
       } else {
         onSubmit(resStatus, payRes.data);
-        session.completePayment({
-          status
-        });
+        try {
+          session.completePayment({
+            status
+          });
+        } catch (_) {}
       }
       //}
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "paymob-pixel-alpha",
-  "version": "1.1.69",
+  "version": "1.1.71",
   "keywords": ["paymob","pixel","paymob-pixel"],
   "main": "./main.js",
   "license": "MIT",