Skip to content

Commit

Permalink
Merge branch 'main' into react-hooks-errors
Browse files Browse the repository at this point in the history
  • Loading branch information
Pritish Budhiraja authored Mar 15, 2024
2 parents c3f6c8b + 19f125d commit d46d275
Show file tree
Hide file tree
Showing 72 changed files with 444 additions and 349 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
## [0.33.7](https://github.com/juspay/hyperswitch-web/compare/v0.33.6...v0.33.7) (2024-03-14)

## [0.33.6](https://github.com/juspay/hyperswitch-web/compare/v0.33.5...v0.33.6) (2024-03-14)

## [0.33.5](https://github.com/juspay/hyperswitch-web/compare/v0.33.4...v0.33.5) (2024-03-14)
Expand Down
209 changes: 150 additions & 59 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "orca-payment-page",
"version": "0.33.6",
"version": "0.33.7",
"main": "index.js",
"private": true,
"dependencies": {
Expand Down Expand Up @@ -32,6 +32,7 @@
"re:build": "rescript",
"re:clean": "rescript clean",
"re:start": "rescript build -w",
"re:format": "rescript format -all",
"start:dev": "npm run re:start & npm run start",
"start:playground": "npm run postinstall && cd Hyperswitch-React-Demo-App && node promptScript.js && npm run start",
"build:playground": "npm run postinstall && cd Hyperswitch-React-Demo-App && node promptScript.js && npm run build",
Expand Down
4 changes: 2 additions & 2 deletions src/BrowserSpec.res
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ type navigator = {
userAgent: string,
language: string,
}
type date = {getTimezoneOffset: (. unit) => float}
type date = {getTimezoneOffset: unit => float}
type screen = {colorDepth: int, height: int, width: int}

@val external navigator: navigator = "navigator"
Expand Down Expand Up @@ -32,7 +32,7 @@ let broswerInfo = () => [
("color_depth", screen.colorDepth->Belt.Int.toFloat->JSON.Encode.float),
("screen_height", screen.height->Belt.Int.toFloat->JSON.Encode.float),
("screen_width", screen.width->Belt.Int.toFloat->JSON.Encode.float),
("time_zone", date.getTimezoneOffset(.)->JSON.Encode.float),
("time_zone", date.getTimezoneOffset()->JSON.Encode.float),
("java_enabled", true->JSON.Encode.bool),
("java_script_enabled", true->JSON.Encode.bool),
]
Expand Down
6 changes: 4 additions & 2 deletions src/Components/Accordion.res
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,13 @@ let make = (
~borderBottomStyle=borderBottom ? "solid" : "hidden",
(),
)}
onClick={_ => setSelectedOption(._ => paymentOption.paymentMethodName)}>
onClick={_ => setSelectedOption(_ => paymentOption.paymentMethodName)}>
<div
className={`flex flex-row items-center ${accordionClass}`}
style={ReactDOMStyle.make(~columnGap=themeObj.spacingUnit, ())}>
<RenderIf condition=layoutClass.radios> <Radio checked=radioClass /> </RenderIf>
<RenderIf condition=layoutClass.radios>
<Radio checked=radioClass />
</RenderIf>
<div className={`AccordionItemIcon ${accordionItemIconClass} flex items-center`}>
{switch icon {
| Some(ele) => ele
Expand Down
2 changes: 1 addition & 1 deletion src/Components/AccordionContainer.res
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ let make = (~paymentOptions: array<string>, ~checkoutEle: React.element) => {
}

React.useEffect0(() => {
layoutClass.defaultCollapsed ? setSelectedOption(._ => "") : ()
layoutClass.defaultCollapsed ? setSelectedOption(_ => "") : ()
None
})
<div className="w-full">
Expand Down
Loading

0 comments on commit d46d275

Please sign in to comment.