Merge branch 'main' into samsung-pay-dev

juspay · Nov 26, 2024 · f93542a · f93542a
2 parents 4dd3878 + bbc0283
commit f93542a
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,12 @@
+## [0.103.2](https://github.com/juspay/hyperswitch-web/compare/v0.103.1...v0.103.2) (2024-11-26)
+
+## [0.103.1](https://github.com/juspay/hyperswitch-web/compare/v0.103.0...v0.103.1) (2024-11-25)
+
+
+### Bug Fixes
+
+* crypto currency payment method ([#810](https://github.com/juspay/hyperswitch-web/issues/810)) ([c3aed42](https://github.com/juspay/hyperswitch-web/commit/c3aed42b9f218b8c44e2574f3032081cd7a45999))
+
 # [0.103.0](https://github.com/juspay/hyperswitch-web/compare/v0.102.9...v0.103.0) (2024-11-21)
 
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "orca-payment-page",
-  "version": "0.103.0",
+  "version": "0.103.2",
   "main": "index.js",
   "private": true,
   "dependencies": {

diff --git a/src/Payments/PaymentMethodsWrapper.res b/src/Payments/PaymentMethodsWrapper.res
@@ -40,17 +40,15 @@ let make = (~paymentType: CardThemeType.mode, ~paymentMethodName: string) => {
   let areRequiredFieldsValid = Recoil.useRecoilValueFromAtom(areRequiredFieldsValid)
   let areRequiredFieldsEmpty = Recoil.useRecoilValueFromAtom(areRequiredFieldsEmpty)
 
-  let complete = areRequiredFieldsValid
-
   React.useEffect(() => {
-    setFieldComplete(_ => complete)
+    setFieldComplete(_ => areRequiredFieldsValid)
     None
-  }, [complete])
+  }, [areRequiredFieldsValid])
 
   let empty = areRequiredFieldsEmpty
 
   UtilityHooks.useHandlePostMessages(
-    ~complete,
+    ~complete=areRequiredFieldsValid,
     ~empty,
     ~paymentType=paymentMethodDetails.paymentMethodName,
   )
@@ -59,7 +57,7 @@ let make = (~paymentType: CardThemeType.mode, ~paymentMethodName: string) => {
     let json = ev.data->safeParse
     let confirm = json->getDictFromJson->ConfirmType.itemToObjMapper
     if confirm.doSubmit {
-      if complete {
+      if areRequiredFieldsValid {
         let countryCode =
           Country.getCountry(paymentMethodName)
           ->Array.filter(item => item.countryName == country)
@@ -105,7 +103,10 @@ let make = (~paymentType: CardThemeType.mode, ~paymentMethodName: string) => {
     paymentMethodName,
     isManualRetryEnabled,
     phoneNumber.value,
-    (selectedBank, currency, requiredFieldsBody),
+    selectedBank,
+    currency,
+    requiredFieldsBody,
+    areRequiredFieldsValid,
   ))
   useSubmitPaymentData(submitCallback)
   <div

diff --git a/src/Utilities/DynamicFieldsUtils.res b/src/Utilities/DynamicFieldsUtils.res
@@ -290,6 +290,7 @@ let useRequiredFieldsEmptyAndValid = (
     cardExpiry,
     cvcNumber,
     bankAccountNumber,
+    cryptoCurrencyNetworks,
   ))
 }
 

diff --git a/webpack.common.js b/webpack.common.js
@@ -50,16 +50,14 @@ const getEnvironmentDomain = (prodDomain, integDomain, defaultDomain) => {
 
 const backendDomain = getEnvironmentDomain("checkout", "dev", "beta");
 const confirmDomain = getEnvironmentDomain("api", "integ-api", "sandbox");
-const logDomain = getEnvironmentDomain("api", "integ-api", "sandbox");
 
 const backendEndPoint =
   envBackendUrl || `https://${backendDomain}.hyperswitch.io/api`;
 
 const confirmEndPoint =
   envBackendUrl || `https://${confirmDomain}.hyperswitch.io`;
 
-const logEndpoint =
-  envLoggingUrl || `https://${logDomain}.hyperswitch.io/logs/sdk`;
+const logEndpoint = envLoggingUrl;
 
 const loggingLevel = "DEBUG";
 const maxLogsPushedPerEventName = 100;