Merge branch 'main' into feature/three_ds_partB

CHANGELOG.md

@@ -1,3 +1,17 @@
+## [0.55.2](https://github.com/juspay/hyperswitch-web/compare/v0.55.1...v0.55.2) (2024-05-27)
+
+
+### Bug Fixes
+
+* blik code hyphen removal ([#401](https://github.com/juspay/hyperswitch-web/issues/401)) ([4953f7a](https://github.com/juspay/hyperswitch-web/commit/4953f7a861ed40ebe2c59b139aa06f9b822f8e67))
+
+## [0.55.1](https://github.com/juspay/hyperswitch-web/compare/v0.55.0...v0.55.1) (2024-05-27)
+
+
+### Bug Fixes
+
+* sdk button loader issue ([#400](https://github.com/juspay/hyperswitch-web/issues/400)) ([e012642](https://github.com/juspay/hyperswitch-web/commit/e012642865231e6c2787b828730cfc1c41ebbe36))
+
 # [0.55.0](https://github.com/juspay/hyperswitch-web/compare/v0.54.2...v0.55.0) (2024-05-23)
 
 

package.json

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

src/Components/PayNowButton.res

@@ -21,9 +21,23 @@ let make = () => {
   let confirmPayload = sdkHandleConfirmPayment->PaymentBody.confirmPayloadForSDKButton
   let buttonText = sdkHandleConfirmPayment.buttonText->Option.getOr(localeString.payNowButton)
 
+  let handleMessage = (event: Types.event) => {
+    let json = event.data->Identity.anyTypeToJson->getStringFromJson("")->safeParse
+    let dict = json->getDictFromJson
+    switch dict->Dict.get("submitSuccessful") {
+    | Some(submitSuccessfulVal) =>
+      if !(submitSuccessfulVal->JSON.Decode.bool->Option.getOr(false)) {
+        setIsPayNowButtonDisable(_ => false)
+        setShowLoader(_ => false)
+      }
+    | None => ()
+    }
+  }
+
   let handleOnClick = _ => {
     setIsPayNowButtonDisable(_ => true)
     setShowLoader(_ => true)
+    EventListenerManager.addSmartEventListener("message", handleMessage, "onSubmitSuccessful")
     handlePostMessage([("handleSdkConfirm", confirmPayload)])
   }
 

src/Payments/PaymentMethodsWrapper.res

@@ -33,7 +33,6 @@ let make = (~paymentType: CardThemeType.mode, ~paymentMethodName: string) => {
   let (country, _) = Recoil.useRecoilState(userCountry)
   let (selectedBank, _) = Recoil.useRecoilState(userBank)
   let setFieldComplete = Recoil.useSetRecoilState(fieldsComplete)
-  let cleanBlik = str => str->String.replaceRegExp(%re("/-/g"), "")
   let cleanPhoneNumber = str => str->String.replaceRegExp(%re("/\s/g"), "")
 
   let (requiredFieldsBody, setRequiredFieldsBody) = React.useState(_ => Dict.make())
@@ -79,7 +78,7 @@ let make = (~paymentType: CardThemeType.mode, ~paymentMethodName: string) => {
             ~fullName=fullName.value,
             ~email=email.value,
             ~bank=bank.hyperSwitch,
-            ~blikCode=blikCode.value->cleanBlik,
+            ~blikCode=blikCode.value->removeHyphen,
             ~phoneNumber=cleanPhoneNumber(
               phoneNumber.countryCode->Option.getOr("") ++ phoneNumber.value,
             ),

src/Utilities/DynamicFieldsUtils.res

@@ -408,7 +408,7 @@ let useRequiredFieldsBody = (
     | AddressCity => city.value
     | AddressPincode => postalCode.value
     | AddressState => state.value
-    | BlikCode => blikCode.value
+    | BlikCode => blikCode.value->Utils.removeHyphen
     | PhoneNumber => phone.value
     | Currency(_) => currency
     | Country => country

src/Utilities/Utils.res

@@ -1278,3 +1278,5 @@ let getStateNameFromStateCodeAndCountry = (list: JSON.t, stateCode: string, coun
   | None => stateCode
   }
 }
+
+let removeHyphen = str => str->String.replaceRegExp(%re("/-/g"), "")