Merge branch 'main' into hide-saved-card-tick-icon

juspay · Jun 12, 2024 · 01f440e · 01f440e
2 parents 577615b + a3526d2
commit 01f440e
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,17 @@
+## [0.62.2](https://github.com/juspay/hyperswitch-web/compare/v0.62.1...v0.62.2) (2024-06-11)
+
+
+### Bug Fixes
+
+* button border changes ([#438](https://github.com/juspay/hyperswitch-web/issues/438)) ([b1168a5](https://github.com/juspay/hyperswitch-web/commit/b1168a5d284e6363e34b295c54262b17c8e4fdd0))
+
+## [0.62.1](https://github.com/juspay/hyperswitch-web/compare/v0.62.0...v0.62.1) (2024-06-11)
+
+
+### Bug Fixes
+
+* demo app docker url needed ([#437](https://github.com/juspay/hyperswitch-web/issues/437)) ([2fdf8a5](https://github.com/juspay/hyperswitch-web/commit/2fdf8a5d412e4e24984c876daaf1a9bd381c4400))
+
 # [0.62.0](https://github.com/juspay/hyperswitch-web/compare/v0.61.2...v0.62.0) (2024-06-11)
 
 

diff --git a/Hyperswitch-React-Demo-App/server.js b/Hyperswitch-React-Demo-App/server.js
@@ -107,18 +107,19 @@ app.get("/create-payment-intent", async (req, res) => {
       },
     };
     if (SERVER_URL) {
-      const apiResponse = await fetch(
-        `${process.env.HYPERSWITCH_SERVER_URL}/payments`,
-        {
-          method: "POST",
-          headers: {
-            "Content-Type": "application/json",
-            Accept: "application/json",
-            "api-key": process.env.HYPERSWITCH_SECRET_KEY,
-          },
-          body: JSON.stringify(request),
-        }
-      );
+      const url =
+        process.env.HYPERSWITCH_SERVER_URL_FOR_DEMO_APP ||
+        process.env.HYPERSWITCH_SERVER_URL;
+
+      const apiResponse = await fetch(`${url}/payments`, {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+          Accept: "application/json",
+          "api-key": process.env.HYPERSWITCH_SECRET_KEY,
+        },
+        body: JSON.stringify(request),
+      });
       paymentIntent = await apiResponse.json();
 
       if (paymentIntent.error) {

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.62.0",
+  "version": "0.62.2",
   "main": "index.js",
   "private": true,
   "dependencies": {

diff --git a/src/Payments/ApplePay.res b/src/Payments/ApplePay.res
@@ -148,7 +148,7 @@ let make = (~sessionObj: option<JSON.t>) => {
         height: 3rem;
         display: flex;
         cursor: pointer;
-        border-radius: 2px;
+        border-radius: ${options.wallets.style.buttonRadius->Int.toString}px;
     }
     .apple-pay-button-white-with-text {
         -apple-pay-button-style: white;
@@ -166,7 +166,7 @@ let make = (~sessionObj: option<JSON.t>) => {
           display: inline-flex;
           justify-content: center;
           font-size: 12px;
-          border-radius: 5px;
+          border-radius: ${options.wallets.style.buttonRadius->Int.toString}px;
           padding: 0px;
           box-sizing: border-box;
           min-width: 200px;

diff --git a/src/Payments/GPay.res b/src/Payments/GPay.res
@@ -216,6 +216,7 @@ let make = (~sessionObj: option<SessionsType.token>, ~thirdPartySessionObj: opti
       },
       "buttonSizeMode": "fill",
       "buttonColor": options.wallets.style.theme == Dark ? "black" : "white",
+      "buttonRadius": options.wallets.style.buttonRadius,
     }
     obj->Identity.anyTypeToJson
   }

diff --git a/src/Payments/PayPal.res b/src/Payments/PayPal.res
@@ -87,7 +87,7 @@ let make = () => {
       display: "inline-block",
       color: textColor,
       height: `${height->Int.toString}px`,
-      borderRadius: "2px",
+      borderRadius: `${options.wallets.style.buttonRadius->Int.toString}px`,
       width: "100%",
       backgroundColor: buttonColor,
     }

diff --git a/src/Types/PaymentType.res b/src/Types/PaymentType.res
@@ -87,6 +87,7 @@ type style = {
   type_: styleTypeArray,
   theme: theme,
   height: (heightType, heightType, heightType, heightType),
+  buttonRadius: int,
 }
 type wallets = {
   walletReturnUrl: string,
@@ -256,6 +257,7 @@ let defaultStyle = {
   type_: (ApplePay(Default), GooglePay(Default), Paypal(Paypal)),
   theme: Light,
   height: (ApplePay(48), GooglePay(48), Paypal(48), Klarna(48)),
+  buttonRadius: 2,
 }
 let defaultWallets = {
   walletReturnUrl: "",
@@ -770,6 +772,7 @@ let getStyle = (dict, str, logger) => {
       type_: getWarningString(json, "type", "", ~logger)->getTypeArray(logger),
       theme: getWarningString(json, "theme", "", ~logger)->getTheme(logger),
       height: getNumberWithWarning(json, "height", 48, ~logger)->getHeightArray(logger),
+      buttonRadius: getNumberWithWarning(json, "buttonRadius", 2, ~logger),
     }
     style
   })