Skip to content

Commit

Permalink
Merge branch 'main' into locale-support
Browse files Browse the repository at this point in the history
  • Loading branch information
PritishBudhiraja authored Jul 16, 2024
2 parents 2424b8d + 74ffd68 commit 371b987
Show file tree
Hide file tree
Showing 11 changed files with 688 additions and 311 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
# [0.75.0](https://github.com/juspay/hyperswitch-web/compare/v0.74.5...v0.75.0) (2024-07-16)


### Features

* **payout-link:** add input validations for payment methods in CollectWidget ([#460](https://github.com/juspay/hyperswitch-web/issues/460)) ([c2686cf](https://github.com/juspay/hyperswitch-web/commit/c2686cf046a41176ba93afb0625d6adf5625ccdc))

## [0.74.5](https://github.com/juspay/hyperswitch-web/compare/v0.74.4...v0.74.5) (2024-07-12)


Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "orca-payment-page",
"version": "0.74.5",
"version": "0.75.0",
"main": "index.js",
"private": true,
"dependencies": {
Expand Down
115 changes: 93 additions & 22 deletions public/icons/orca.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 1 addition & 7 deletions src/App.res
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ let make = () => {
let url = RescriptReactRouter.useUrl()
let (integrateError, setIntegrateErrorError) = React.useState(() => false)
let setLoggerState = Recoil.useSetRecoilState(RecoilAtoms.loggerAtom)
let {showLoader} = Recoil.useRecoilValueFromAtom(RecoilAtoms.configAtom)

let paymentMode = CardUtils.getQueryParamsDictforKey(url.search, "componentName")
let paymentType = paymentMode->CardThemeType.getPaymentMode
Expand All @@ -20,12 +19,7 @@ let make = () => {
let renderFullscreen = switch paymentMode {
| "paymentMethodCollect" =>
<LoaderController paymentMode setIntegrateErrorError logger initTimestamp>
<React.Suspense
fallback={<RenderIf condition={showLoader}>
<PaymentElementShimmer />
</RenderIf>}>
<PaymentMethodCollectElementLazy integrateError logger />
</React.Suspense>
<PaymentMethodCollectElement integrateError logger />
</LoaderController>
| _ =>
switch fullscreenMode {
Expand Down
Loading

0 comments on commit 371b987

Please sign in to comment.