From 2fdf8a5d412e4e24984c876daaf1a9bd381c4400 Mon Sep 17 00:00:00 2001 From: Pritish Budhiraja Date: Tue, 11 Jun 2024 14:38:12 +0530 Subject: [PATCH 1/4] fix: demo app docker url needed (#437) --- Hyperswitch-React-Demo-App/server.js | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/Hyperswitch-React-Demo-App/server.js b/Hyperswitch-React-Demo-App/server.js index caddd6e02..916978a7a 100644 --- 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) { From 8acf7726b94ef386dffa38716514a4d17d308f1d Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Tue, 11 Jun 2024 09:09:49 +0000 Subject: [PATCH 2/4] chore(release): 0.62.1 [skip ci] ## [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)) --- CHANGELOG.md | 7 +++++++ package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f7c28f4ed..2ef00e3a1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [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/package-lock.json b/package-lock.json index 2c08b49a0..64102f992 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "orca-payment-page", - "version": "0.62.0", + "version": "0.62.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "orca-payment-page", - "version": "0.62.0", + "version": "0.62.1", "hasInstallScript": true, "dependencies": { "@aws-sdk/client-cloudfront": "^3.414.0", diff --git a/package.json b/package.json index a63479079..2e6967fc6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "orca-payment-page", - "version": "0.62.0", + "version": "0.62.1", "main": "index.js", "private": true, "dependencies": { From b1168a5d284e6363e34b295c54262b17c8e4fdd0 Mon Sep 17 00:00:00 2001 From: Pritish Budhiraja Date: Tue, 11 Jun 2024 15:32:50 +0530 Subject: [PATCH 3/4] fix: button border changes (#438) --- src/Payments/ApplePay.res | 4 ++-- src/Payments/GPay.res | 1 + src/Payments/PayPal.res | 2 +- src/Types/PaymentType.res | 3 +++ 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/Payments/ApplePay.res b/src/Payments/ApplePay.res index 2cf65d806..b677684ff 100644 --- a/src/Payments/ApplePay.res +++ b/src/Payments/ApplePay.res @@ -148,7 +148,7 @@ let make = (~sessionObj: option) => { 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) => { 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 index 95c0308e8..997a4cfc7 100644 --- a/src/Payments/GPay.res +++ b/src/Payments/GPay.res @@ -216,6 +216,7 @@ let make = (~sessionObj: option, ~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 index 63386baf3..7098952cf 100644 --- 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 index afbf6d5fa..a9b3c807c 100644 --- 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, @@ -255,6 +256,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: "", @@ -768,6 +770,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 }) From a3526d250e6b77437286dc0ff26e169622a27dbe Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Tue, 11 Jun 2024 10:04:26 +0000 Subject: [PATCH 4/4] chore(release): 0.62.2 [skip ci] ## [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)) --- CHANGELOG.md | 7 +++++++ package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2ef00e3a1..fc5f07853 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [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) diff --git a/package-lock.json b/package-lock.json index 64102f992..ea7e42c55 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "orca-payment-page", - "version": "0.62.1", + "version": "0.62.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "orca-payment-page", - "version": "0.62.1", + "version": "0.62.2", "hasInstallScript": true, "dependencies": { "@aws-sdk/client-cloudfront": "^3.414.0", diff --git a/package.json b/package.json index 2e6967fc6..041f52f9c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "orca-payment-page", - "version": "0.62.1", + "version": "0.62.2", "main": "index.js", "private": true, "dependencies": {