paymob-pixel-alpha 1.1.27 → 1.1.28

package/main.js

@@ -13604,6 +13604,9 @@ const ContactForm = /*#__PURE__*/(/* unused pure expression or super */ null &&
     needsName,
     needsEmail,
     needsPhone,
+    emailRequired = true,
+    phoneRequired = true,
+    nameRequired = true,
     defaultCountryISO = 'EG',
     defaultValues,
     hideLabels,
@@ -13623,7 +13626,8 @@ const ContactForm = /*#__PURE__*/(/* unused pure expression or super */ null &&
     formState: {
       errors,
       isDirty,
-      isValid
+      isValid,
+      dirtyFields
     },
     setValue,
     trigger,
@@ -13729,8 +13733,8 @@ const ContactForm = /*#__PURE__*/(/* unused pure expression or super */ null &&
     } else if (onClientData) {
       onClientData(null);
     }
-    onValidityChange == null || onValidityChange(isValid && (isDirty || !!defaultValues), isDirty || !(verifiedFields != null && verifiedFields.email) || !(verifiedFields != null && verifiedFields.phone));
-  }, [isDirty, isValid, watchFieldsJson]);
+    onValidityChange == null || onValidityChange(isValid && (isDirty || !!defaultValues), !!Object.keys(dirtyFields).length || !(verifiedFields != null && verifiedFields.email) && !!getValues('email') || !(verifiedFields != null && verifiedFields.phone) && !!getValues('phone'));
+  }, [isDirty, isValid, watchFieldsJson, Object.keys(dirtyFields).length]);
   useEffect(() => {
     const getRegionData = async () => {
       setIsLoadingRegionData(true);
@@ -13780,11 +13784,12 @@ const ContactForm = /*#__PURE__*/(/* unused pure expression or super */ null &&
           setValue(_field, e.target.value);
         }
       },
-      required: {
+      required: emailRequired ? {
         value: true,
         message: t('EMAIL_IS_REQUIRED')
-      },
+      } : false,
       validate: value => {
+        if (!value) return !emailRequired || t('EMAIL_IS_REQUIRED');
         const regex = /^[a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$/;
         return regex.test(value) || t('EMAIL_NOT_VALID');
       }
@@ -13819,10 +13824,10 @@ const ContactForm = /*#__PURE__*/(/* unused pure expression or super */ null &&
           }
         }
       },
-      required: {
+      required: nameRequired ? {
         value: true,
         message: t('NAME_IS_REQUIRED')
-      }
+      } : false
     });
   }, []);
   const createPhoneRegister = useCallback(({
@@ -13836,12 +13841,13 @@ const ContactForm = /*#__PURE__*/(/* unused pure expression or super */ null &&
         const trimmedNumber = phoneNumber.replace(/\D/g, '');
         setValue(_field3, trimmedNumber);
       },
-      required: {
+      required: phoneRequired ? {
         value: true,
         message: t('PHONE_IS_REQUIRED')
-      },
+      } : false,
       validate: value => {
         var _parseMax;
+        if (!value) return !phoneRequired || t('PHONE_IS_REQUIRED');
         return ((_parseMax = parseMax(countryCode + value)) == null ? void 0 : _parseMax.isValid()) || t('PHONE_NOT_VALID');
       }
     });
@@ -21007,6 +21013,7 @@ function formatAmountBasedOnCurrency_formatAmountBasedOnCurrency(amount, currenc
 
 
 
+
 
 
 ;// ../../node_modules/react-loading-skeleton/dist/index.js
@@ -21530,8 +21537,12 @@ function cardFormViewTwo_Card(props) {
     setIsOmanNetCard == null || setIsOmanNetCard(cardType === CARD_TYPES.OMAN);
   }, [cardType, setIsOmanNetCard]);
   useEffect(() => {
-    onDiscount == null || onDiscount(cardNum, isValidCard);
-  }, [isValidCard, cardNum]);
+    onDiscount == null || onDiscount({
+      cardNum,
+      isValidCard,
+      cardType
+    });
+  }, [isValidCard, cardNum, cardType]);
   return /*#__PURE__*/_jsxs("form", {
     onSubmit: handleSubmit(onSubmit),
     noValidate: true,
@@ -21861,8 +21872,12 @@ function mobileCardFormViewTwo_MobileCard(props) {
     }
   }, [expiryWatch, cvcWatch]);
   useEffect(() => {
-    onDiscount == null || onDiscount(cardNum, isValidCard);
-  }, [isValidCard, cardNum]);
+    onDiscount == null || onDiscount({
+      cardNum,
+      isValidCard,
+      cardType
+    });
+  }, [isValidCard, cardNum, cardType]);
   return /*#__PURE__*/_jsxs(_Fragment, {
     children: [/*#__PURE__*/_jsxs("form", {
       onSubmit: handleSubmit(onSubmit),
@@ -22120,10 +22135,10 @@ function IframeCard(props) {
       cardNum,
       isValidCard,
       discountsCount,
-      integrationId: hasOmanNetIntegration && isOmanNetCard ? subType.integrationId : integrationId,
-      paymentToken: hasOmanNetIntegration && isOmanNetCard ? subType.paymentToken : paymentToken
+      integrationId: hasOmanNetIntegration && cardType === CARD_TYPES.OMAN ? subType.integrationId : integrationId,
+      paymentToken: hasOmanNetIntegration && cardType === CARD_TYPES.OMAN ? subType.paymentToken : paymentToken
     });
-  }, [cardNum, isValidCard, discountsCount, hasOmanNetIntegration, isOmanNetCard, subType, paymentToken, integrationId]);
+  }, [cardNum, isValidCard, discountsCount, hasOmanNetIntegration, cardType, subType, paymentToken, integrationId]);
   const handleDataFromSDK = event => {
     if (event.data.type === 'setPrevFocus') {
       handlePrevFocusFromSDK(event.data.payload);
@@ -23001,9 +23016,12 @@ function SavedCardsViewTwo(props) {
     setSelectedCardCVV('');
     if ((selectedCard == null ? void 0 : selectedCard.id) === card.id) setSelectedCard(null);else {
       setSelectedCard(card);
-      onDiscount == null || onDiscount(card.identifier, !!card.identifier && !!card.hasDiscount, true);
+      onDiscount == null || onDiscount({
+        cardNum: card.identifier,
+        isValidCard: !!card.identifier && !!card.hasDiscount,
+        savedCardType: card.type
+      });
     }
-    ;
   };
   const handleSelectDeleteCard = (e, card) => {
     e.stopPropagation();
@@ -23819,10 +23837,13 @@ const CardElement = /*#__PURE__*/(0,react.forwardRef)(({
     setDiscountAppliedMessage(null);
     setTotalAmount("");
   };
-  const handleSavedCardDiscount = async (identifier, hasDiscount) => {
+  const handleSavedCardDiscount = async (identifier, hasDiscount, savedCardType) => {
+    var _payment$subType4, _payment$subType5;
     handleResetDiscountMessages();
     if (!hasDiscount) return;
-    const res = await checkDiscount(payment.token, payment.id, identifier, true);
+    const paymentToken = savedCardType === constants_SAVED_CARD_TYPES.OMAN_NET ? payment == null || (_payment$subType4 = payment.subType) == null ? void 0 : _payment$subType4.token : payment == null ? void 0 : payment.token;
+    const integrationId = savedCardType === constants_SAVED_CARD_TYPES.OMAN_NET ? payment == null || (_payment$subType5 = payment.subType) == null ? void 0 : _payment$subType5.integrationId : payment == null ? void 0 : payment.id;
+    const res = await checkDiscount(paymentToken, integrationId, identifier, savedCardType);
     handleDiscount(res);
   };
   const handleDiscount = res => {
@@ -23874,7 +23895,7 @@ const CardElement = /*#__PURE__*/(0,react.forwardRef)(({
     setSelectedCardCVV('');
     if ((selectedCard == null ? void 0 : selectedCard.id) === card.id) setSelectedCard(null);else {
       setSelectedCard(card);
-      handleSavedCardDiscount == null || handleSavedCardDiscount(card.identifier, !!card.identifier && !!card.hasDiscount);
+      handleSavedCardDiscount == null || handleSavedCardDiscount(card.identifier, !!card.identifier && !!card.hasDiscount, card.type);
     }
     ;
   };
@@ -23884,7 +23905,7 @@ const CardElement = /*#__PURE__*/(0,react.forwardRef)(({
     setSelectedDeleteCard(card);
   };
   const handleSavedCardSubmit = async () => {
-    var _payment$subType4;
+    var _payment$subType6;
     if (loading) return;
     setLoading(true);
     if (onBeforePaymentComplete) {
@@ -23902,7 +23923,7 @@ const CardElement = /*#__PURE__*/(0,react.forwardRef)(({
     };
     const payload = Object.assign({
       identifier: data.identifier,
-      token: (selectedCard == null ? void 0 : selectedCard.type) === constants_SAVED_CARD_TYPES.OMAN_NET ? payment == null || (_payment$subType4 = payment.subType) == null ? void 0 : _payment$subType4.token : payment == null ? void 0 : payment.token
+      token: (selectedCard == null ? void 0 : selectedCard.type) === constants_SAVED_CARD_TYPES.OMAN_NET ? payment == null || (_payment$subType6 = payment.subType) == null ? void 0 : _payment$subType6.token : payment == null ? void 0 : payment.token
     }, data.cvv && {
       cvv: data.cvv
     }, {
@@ -23942,14 +23963,14 @@ const CardElement = /*#__PURE__*/(0,react.forwardRef)(({
     }
   };
   const handleOTPSubmit = async otp => {
-    var _iframeRef$current1, _payment$subType5;
+    var _iframeRef$current1, _payment$subType7;
     setSendOTPLoading(true);
     (_iframeRef$current1 = iframeRef.current) == null || (_iframeRef$current1 = _iframeRef$current1.contentWindow) == null || _iframeRef$current1.postMessage({
       type: 'otpData',
       payload: {
         paymentToken: payment.token,
         subType: {
-          paymentToken: (_payment$subType5 = payment.subType) == null ? void 0 : _payment$subType5.token
+          paymentToken: (_payment$subType7 = payment.subType) == null ? void 0 : _payment$subType7.token
         },
         otp,
         paymentId

package/package.json

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