fix: merge conflcts

juspay · Sep 3, 2024 · 9754371 · 9754371
1 parent 2999f22
commit 9754371
Show file tree

Hide file tree

Showing 33 changed files with 354 additions and 172 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,26 @@
+## [0.84.9](https://github.com/juspay/hyperswitch-web/compare/v0.84.8...v0.84.9) (2024-09-03)
+
+
+### Bug Fixes
+
+* added loader for netecetera when openurl_if_required is sent post otp submission ([#589](https://github.com/juspay/hyperswitch-web/issues/589)) ([bf04562](https://github.com/juspay/hyperswitch-web/commit/bf0456234bb6746a4e8c44fd7f9cd364c914e665))
+
+## [0.84.8](https://github.com/juspay/hyperswitch-web/compare/v0.84.7...v0.84.8) (2024-09-02)
+
+
+### Bug Fixes
+
+* added customization for padding inside accordion item rule ([#595](https://github.com/juspay/hyperswitch-web/issues/595)) ([a251de5](https://github.com/juspay/hyperswitch-web/commit/a251de52d70b0389bc5b0e789bcc1982cf343344))
+
+## [0.84.7](https://github.com/juspay/hyperswitch-web/compare/v0.84.6...v0.84.7) (2024-09-02)
+
+## [0.84.6](https://github.com/juspay/hyperswitch-web/compare/v0.84.5...v0.84.6) (2024-08-30)
+
+
+### Bug Fixes
+
+* added support for customPodUri instead of switchToCustomPod ([#591](https://github.com/juspay/hyperswitch-web/issues/591)) ([f9fed51](https://github.com/juspay/hyperswitch-web/commit/f9fed5117e74c63f813117d5eceafc4a000e17dc))
+
 ## [0.84.5](https://github.com/juspay/hyperswitch-web/compare/v0.84.4...v0.84.5) (2024-08-26)
 
 ## [0.84.4](https://github.com/juspay/hyperswitch-web/compare/v0.84.3...v0.84.4) (2024-08-23)

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.84.5",
+  "version": "0.84.9",
   "main": "index.js",
   "private": true,
   "dependencies": {
@@ -56,6 +56,7 @@
   "devDependencies": {
     "@babel/core": "^7.25.2",
     "@babel/preset-env": "^7.25.3",
+    "@babel/preset-react": "^7.24.7",
     "@commitlint/cli": "^17.0.3",
     "@commitlint/config-conventional": "^17.0.3",
     "@semantic-release/changelog": "^6.0.3",
@@ -65,6 +66,7 @@
     "@semantic-release/release-notes-generator": "^14.0.1",
     "autoprefixer": "^10.4.8",
     "babel-loader": "^9.1.3",
+    "babel-plugin-add-react-displayname": "^0.0.5",
     "copy-webpack-plugin": "^11.0.0",
     "css-loader": "^6.7.1",
     "cz-conventional-changelog": "^3.3.0",

diff --git a/src/App.res b/src/App.res
@@ -45,6 +45,7 @@ let make = () => {
             "hyperComponentName",
           )->Types.getHyperComponentNameFromStr
         let merchantHostname = CardUtils.getQueryParamsDictforKey(url.search, "merchantHostname")
+        let customPodUri = CardUtils.getQueryParamsDictforKey(url.search, "customPodUri")
 
         <PreMountLoader
           publishableKey
@@ -54,6 +55,7 @@ let make = () => {
           ephemeralKey
           hyperComponentName
           merchantHostname
+          customPodUri
         />
       }
     | "achBankTransfer"

diff --git a/src/BrutalTheme.res b/src/BrutalTheme.res
@@ -138,6 +138,7 @@ let brutalRules = (theme: CardThemeType.themeClass) =>
       "color": theme.colorBackgroundText,
       "transition": "height 1s ease",
       "borderColor": `#000000 !important`,
+      "padding": "20px",
     },
     ".AccordionMore": {
       "backgroundColor": theme.colorBackground,

diff --git a/src/CharcoalTheme.res b/src/CharcoalTheme.res
@@ -137,6 +137,7 @@ let charcoalRules = theme =>
       "backgroundColor": theme.colorBackground,
       "color": theme.colorTextSecondary,
       "transition": "height 1s ease",
+      "padding": "20px",
     },
     ".AccordionMore": {
       "backgroundColor": theme.colorBackground,

diff --git a/src/Components/Accordion.res b/src/Components/Accordion.res
@@ -39,7 +39,6 @@ let make = (
     style={
       minHeight: "60px",
       width: "-webkit-fill-available",
-      padding: "20px",
       cursor: "pointer",
       marginBottom: layoutClass.spacedAccordionItems ? themeObj.spacingAccordionItem : "",
       border: `1px solid ${themeObj.borderColor}`,

diff --git a/src/Components/AccordionContainer.res b/src/Components/AccordionContainer.res
@@ -34,7 +34,6 @@ module Loader = {
             },
             borderTopStyle: {i == 0 && !layoutClass.spacedAccordionItems ? "hidden" : "solid"},
             width: "100%",
-            paddingLeft: "25px",
             marginBottom: layoutClass.spacedAccordionItems ? themeObj.spacingAccordionItem : "",
             cursor: "pointer",
           }>

diff --git a/src/Components/SavedPaymentManagement.res b/src/Components/SavedPaymentManagement.res
@@ -5,7 +5,7 @@ let make = (~savedMethods: array<PaymentType.customerMethods>, ~setSavedMethods)
 
   let {iframeId} = Recoil.useRecoilValueFromAtom(RecoilAtoms.keys)
   let {config} = Recoil.useRecoilValueFromAtom(RecoilAtoms.configAtom)
-  let switchToCustomPod = Recoil.useRecoilValueFromAtom(RecoilAtoms.switchToCustomPod)
+  let customPodUri = Recoil.useRecoilValueFromAtom(RecoilAtoms.customPodUri)
   let logger = Recoil.useRecoilValueFromAtom(RecoilAtoms.loggerAtom)
 
   let removeSavedMethod = (
@@ -28,7 +28,7 @@ let make = (~savedMethods: array<PaymentType.customerMethods>, ~setSavedMethods)
       ~ephemeralKey=config.ephemeralKey,
       ~paymentMethodId=paymentItem.paymentMethodId,
       ~logger,
-      ~switchToCustomPod,
+      ~customPodUri,
     )
     ->then(res => {
       let dict = res->getDictFromJson

diff --git a/src/DefaultTheme.res b/src/DefaultTheme.res
@@ -147,6 +147,7 @@ let defaultRules = theme =>
       "color": theme.colorTextSecondary,
       "transition": "height 1s ease",
       "boxShadow": "0px 1px 1px rgb(0 0 0 / 3%), 0px 3px 6px rgb(0 0 0 / 2%)",
+      "padding": "20px",
     },
     ".AccordionMore": {
       "backgroundColor": theme.colorBackground,

diff --git a/src/Index.res b/src/Index.res
@@ -9,7 +9,7 @@ let app = switch ReactDOM.querySelector("#app") {
     <div className="h-auto flex flex-col ">
       <div className="h-auto flex flex-col">
         <Recoil.RecoilRoot>
-          <ErrorBoundary level=ErrorBoundary.Top>
+          <ErrorBoundary level=ErrorBoundary.Top componentName="App">
             <App />
           </ErrorBoundary>
         </Recoil.RecoilRoot>

diff --git a/src/LoaderController.res b/src/LoaderController.res
@@ -11,7 +11,7 @@ let make = (~children, ~paymentMode, ~setIntegrateErrorError, ~logger, ~initTime
   let (optionsPayment, setOptionsPayment) = Recoil.useRecoilState(optionAtom)
   let setSessionId = Recoil.useSetRecoilState(sessionId)
   let setBlockConfirm = Recoil.useSetRecoilState(isConfirmBlocked)
-  let setSwitchToCustomPod = Recoil.useSetRecoilState(switchToCustomPod)
+  let setCustomPodUri = Recoil.useSetRecoilState(customPodUri)
   let setIsGooglePayReady = Recoil.useSetRecoilState(isGooglePayReady)
   let setIsApplePayReady = Recoil.useSetRecoilState(isApplePayReady)
   let (divH, setDivH) = React.useState(_ => 0.0)
@@ -231,8 +231,8 @@ let make = (~children, ~paymentMode, ~setIntegrateErrorError, ~logger, ~initTime
               logger.setSessionId(sdkSessionId)
               if Window.isInteg {
                 setBlockConfirm(_ => dict->getBool("blockConfirm", false))
-                setSwitchToCustomPod(_ => dict->getBool("switchToCustomPod", false))
               }
+              setCustomPodUri(_ => dict->getString("customPodUri", ""))
               updateOptions(dict)
               setSessionId(_ => {
                 sdkSessionId

diff --git a/src/MidnightTheme.res b/src/MidnightTheme.res
@@ -154,6 +154,7 @@ let midnightRules = theme =>
       "transition": "height 1s ease",
       "color": "#e0e0e0",
       "boxShadow": "0px 2px 4px rgb(0 0 0 / 50%), 0px 1px 6px rgb(0 0 0 / 25%)",
+      "padding": "20px",
     },
     ".AccordionItem:hover": {
       "color": theme.colorTextSecondary,