Merge branch 'main' into union-pay-fix

CHANGELOG.md

@@ -1,3 +1,17 @@
+## [0.110.2](https://github.com/juspay/hyperswitch-web/compare/v0.110.1...v0.110.2) (2025-01-30)
+
+
+### Bug Fixes
+
+* inconsistent country code dropdown border ([#881](https://github.com/juspay/hyperswitch-web/issues/881)) ([9841f63](https://github.com/juspay/hyperswitch-web/commit/9841f635dca15efa1612d2c04dcf010dc85cf1cb))
+
+## [0.110.1](https://github.com/juspay/hyperswitch-web/compare/v0.110.0...v0.110.1) (2025-01-29)
+
+
+### Bug Fixes
+
+* fixed click to pay loader coming above saved cards ([#880](https://github.com/juspay/hyperswitch-web/issues/880)) ([94c63c4](https://github.com/juspay/hyperswitch-web/commit/94c63c4fdffecfb93c8b7606d1c9bd0fea77b9ed))
+
 # [0.110.0](https://github.com/juspay/hyperswitch-web/compare/v0.109.1...v0.110.0) (2025-01-29)
 
 

package.json

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

src/Components/DropdownField.res

@@ -103,7 +103,7 @@ let make = (
       <div className="relative">
         <RenderIf condition={isDisplayValueVisible && displayValue->Option.isSome}>
           <div
-            className="absolute top-1 left-1 right-0 bottom-0  pointer-events-none rounded-sm z-20 whitespace-nowrap"
+            className="absolute top-[2px] left-[2px] right-0 bottom-[2px]  pointer-events-none rounded-sm z-20 whitespace-nowrap"
             style={
               background: disabled ? disbaledBG : themeObj.colorBackground,
               opacity: disabled ? "35%" : "",

src/PaymentElement.res

@@ -529,24 +529,25 @@ let make = (~cardProps, ~expiryProps, ~cvcProps, ~paymentType: CardThemeType.mod
         {paymentLabel->Option.getOr("")->React.string}
       </div>
     </RenderIf>
-    <RenderIf condition={clickToPayConfig.isReady->Option.isNone}>
+    {if clickToPayConfig.isReady->Option.isNone {
       <ClickToPayHelpers.SrcLoader />
-    </RenderIf>
-    <RenderIf
-      condition={!showFields &&
-      (displaySavedPaymentMethods || isShowPaymentMethodsDependingOnClickToPay)}>
-      <SavedMethods
-        paymentToken
-        setPaymentToken
-        savedMethods
-        loadSavedCards
-        cvcProps
-        paymentType
-        sessions
-        isClickToPayAuthenticateError
-        setIsClickToPayAuthenticateError
-      />
-    </RenderIf>
+    } else {
+      <RenderIf
+        condition={!showFields &&
+        (displaySavedPaymentMethods || isShowPaymentMethodsDependingOnClickToPay)}>
+        <SavedMethods
+          paymentToken
+          setPaymentToken
+          savedMethods
+          loadSavedCards
+          cvcProps
+          paymentType
+          sessions
+          isClickToPayAuthenticateError
+          setIsClickToPayAuthenticateError
+        />
+      </RenderIf>
+    }}
     <RenderIf
       condition={(paymentOptions->Array.length > 0 || walletOptions->Array.length > 0) &&
       showFields &&