Merge branch 'main' into width-issue

CHANGELOG.md

@@ -1,3 +1,17 @@
+## [0.58.2](https://github.com/juspay/hyperswitch-web/compare/v0.58.1...v0.58.2) (2024-06-03)
+
+
+### Bug Fixes
+
+* remove postal code check ([#412](https://github.com/juspay/hyperswitch-web/issues/412)) ([13b9625](https://github.com/juspay/hyperswitch-web/commit/13b962581e8243d99f070b2fc7e2ab4edc180e49))
+
+## [0.58.1](https://github.com/juspay/hyperswitch-web/compare/v0.58.0...v0.58.1) (2024-06-03)
+
+
+### Bug Fixes
+
+* 3ds netcetra paymentloader ([#414](https://github.com/juspay/hyperswitch-web/issues/414)) ([3ffe27a](https://github.com/juspay/hyperswitch-web/commit/3ffe27a1ce4ded6888b4c983fc37a4da59042aef))
+
 # [0.58.0](https://github.com/juspay/hyperswitch-web/compare/v0.57.3...v0.58.0) (2024-05-31)
 
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "orca-payment-page",
-  "version": "0.58.0",
+  "version": "0.58.2",
   "main": "index.js",
   "private": true,
   "dependencies": {

src/Components/AddressPaymentInput.res

@@ -59,7 +59,6 @@ let make = (~paymentType, ~className="") => {
   let cityRef = React.useRef(Nullable.null)
   let postalRef = React.useRef(Nullable.null)
 
-  let (postalCodes, setPostalCodes) = React.useState(_ => [PostalCodeType.defaultPostalCode])
   let (stateJson, setStatesJson) = React.useState(_ => None)
   let (showOtherFileds, setShowOtherFields) = React.useState(_ => false)
 
@@ -68,17 +67,14 @@ let make = (~paymentType, ~className="") => {
   let checkPostalValidity = (
     postal: RecoilAtomTypes.field,
     setPostal: (RecoilAtomTypes.field => RecoilAtomTypes.field) => unit,
-    regex,
   ) => {
-    if RegExp.test(regex->RegExp.fromString, postal.value) && postal.value !== "" && regex !== "" {
+    if postal.value !== "" {
       setPostal(prev => {
         ...prev,
         isValid: Some(true),
         errorString: "",
       })
-    } else if (
-      regex !== "" && !RegExp.test(regex->RegExp.fromString, postal.value) && postal.value !== ""
-    ) {
+    } else {
       setPostal(prev => {
         ...prev,
         isValid: Some(false),
@@ -89,17 +85,6 @@ let make = (~paymentType, ~className="") => {
 
   React.useEffect0(() => {
     open Promise
-    // Dynamically import/download Postal codes and states JSON
-    PostalCodeType.importPostalCode("./../PostalCodes.bs.js")
-    ->then(res => {
-      setPostalCodes(_ => res.default)
-      resolve()
-    })
-    ->catch(_ => {
-      setPostalCodes(_ => [PostalCodeType.defaultPostalCode])
-      resolve()
-    })
-    ->ignore
     importStates("./../States.json")
     ->then(res => {
       setStatesJson(_ => Some(res.states))
@@ -114,12 +99,6 @@ let make = (~paymentType, ~className="") => {
     None
   })
 
-  let regex = CardUtils.postalRegex(
-    postalCodes,
-    ~country={getCountryCode(country.value).isoAlpha2},
-    (),
-  )
-
   let onPostalChange = ev => {
     let val = ReactEvent.Form.target(ev)["value"]
 
@@ -128,20 +107,17 @@ let make = (~paymentType, ~className="") => {
       value: val,
       errorString: "",
     })
-    if regex !== "" && RegExp.test(regex->RegExp.fromString, val) {
-      CardUtils.blurRef(postalRef)
-    }
   }
 
   let onPostalBlur = ev => {
     let val = ReactEvent.Focus.target(ev)["value"]
-    if regex !== "" && RegExp.test(regex->RegExp.fromString, val) && val !== "" {
+    if val !== "" {
       setPostalCode(prev => {
         ...prev,
         isValid: Some(true),
         errorString: "",
       })
-    } else if regex !== "" && !RegExp.test(regex->RegExp.fromString, val) && val !== "" {
+    } else {
       setPostalCode(prev => {
         ...prev,
         isValid: Some(false),
@@ -151,9 +127,9 @@ let make = (~paymentType, ~className="") => {
   }
 
   React.useEffect(() => {
-    checkPostalValidity(postalCode, setPostalCode, regex)
+    checkPostalValidity(postalCode, setPostalCode)
     None
-  }, (regex, country.value))
+  }, country.value)
 
   React.useEffect(() => {
     setState(prev => {

src/Components/DynamicFields.res

@@ -89,7 +89,7 @@ let make = (
     "postal_code",
     logger,
   )
-  let (postalCodes, setPostalCodes) = React.useState(_ => [PostalCodeType.defaultPostalCode])
+
   let (currency, setCurrency) = Recoil.useLoggedRecoilState(userCurrency, "currency", logger)
   let line1Ref = React.useRef(Nullable.null)
   let line2Ref = React.useRef(Nullable.null)
@@ -215,17 +215,6 @@ let make = (
 
   React.useEffect0(() => {
     open Promise
-    // Dynamically import/download Postal codes and states JSON
-    PostalCodeType.importPostalCode("./../PostalCodes.bs.js")
-    ->then(res => {
-      setPostalCodes(_ => res.default)
-      resolve()
-    })
-    ->catch(_ => {
-      setPostalCodes(_ => [PostalCodeType.defaultPostalCode])
-      resolve()
-    })
-    ->ignore
     AddressPaymentInput.importStates("./../States.json")
     ->then(res => {
       setStatesJson(_ => Some(res.states))
@@ -240,8 +229,6 @@ let make = (
     None
   })
 
-  let _regex = CardUtils.postalRegex(postalCodes, ~country={getCountryCode(country).isoAlpha2}, ())
-
   let onPostalChange = ev => {
     let val = ReactEvent.Form.target(ev)["value"]
 

src/Payment.res

@@ -97,8 +97,6 @@ let make = (~paymentMode, ~integrateError, ~logger) => {
     cardBrand->getCardType
   }, [cardBrand])
 
-  let (postalCodes, setPostalCodes) = React.useState(_ => [PostalCodeType.defaultPostalCode])
-
   React.useEffect(() => {
     let obj = getobjFromCardPattern(cardBrand)
     let cvcLength = obj.maxCVCLenth
@@ -111,23 +109,6 @@ let make = (~paymentMode, ~integrateError, ~logger) => {
     None
   }, (cvcNumber, cardNumber))
 
-  React.useEffect0(() => {
-    open Promise
-    if paymentMode->getPaymentMode == Card {
-      PostalCodeType.importPostalCode("./PostalCodes.bs.js")
-      ->then(res => {
-        setPostalCodes(_ => res.default)
-        resolve()
-      })
-      ->catch(_ => {
-        setPostalCodes(_ => [PostalCodeType.defaultPostalCode])
-        resolve()
-      })
-      ->ignore
-    }
-    None
-  })
-
   let changeCardNumber = ev => {
     let val = ReactEvent.Form.target(ev)["value"]
     logInputChangeInfo("cardNumber", logger)
@@ -175,10 +156,6 @@ let make = (~paymentMode, ~integrateError, ~logger) => {
   let changeZipCode = ev => {
     let val = ReactEvent.Form.target(ev)["value"]
     logInputChangeInfo("zipCode", logger)
-    let regex = postalRegex(postalCodes, ())
-    if regex !== "" && RegExp.test(regex->RegExp.fromString, val) {
-      blurRef(zipRef)
-    }
     setZipCode(_ => val)
   }
 
@@ -235,13 +212,10 @@ let make = (~paymentMode, ~integrateError, ~logger) => {
 
   let handleZipBlur = ev => {
     let zipCode = ReactEvent.Focus.target(ev)["value"]
-    let regex = postalRegex(postalCodes, ())
-    if RegExp.test(regex->RegExp.fromString, zipCode) || regex == "" {
-      setIsZipValid(_ => Some(true))
-    } else if zipCode->String.length == 0 {
-      setIsZipValid(_ => None)
-    } else {
+    if zipCode === "" {
       setIsZipValid(_ => Some(false))
+    } else {
+      setIsZipValid(_ => Some(true))
     }
   }