chore: merged latest branch

juspay · Jan 3, 2024 · ae03d50 · ae03d50
2 parents 91c7340 + 543e074
commit ae03d50
Show file tree

Hide file tree

Showing 79 changed files with 733 additions and 1,368 deletions.
diff --git a/.env b/.env
@@ -1,2 +1,3 @@
 apiBaseUrl=https://sandbox.hyperswitch.io
-sdkBaseUrl=https://beta.hyperswitch.io/v1/HyperLoader.js
+sdkBaseUrl=https://beta.hyperswitch.io/v1/HyperLoader.js
+mixpanelToken=
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,23 @@ All notable changes to this project will be documented in this file. See [conven
 
 - - -
 
+## 1.18.3 (2024-01-02)
+
+### Bug Fixes
+
+- Scrollbar revert ([#153](https://github.com/juspay/hyperswitch-control-center/pull/153)) ([`731ac50`](https://github.com/juspay/hyperswitch-control-center/commit/731ac503e93d051cf3dc1b34593e91b896105897))
+- Business profile addition modal bugfix ([#152](https://github.com/juspay/hyperswitch-control-center/pull/152)) ([`7075812`](https://github.com/juspay/hyperswitch-control-center/commit/707581209d18e19c9247a551544a317035cd2039))
+- Unnecessary API List count of connectors stop ([#154](https://github.com/juspay/hyperswitch-control-center/pull/154)) ([`40ae278`](https://github.com/juspay/hyperswitch-control-center/commit/40ae2788172c19f05206df59131e6a35e1b70f8e))
+
+### Miscellaneous Tasks
+
+- Mixpanel clearing ([#155](https://github.com/juspay/hyperswitch-control-center/pull/155)) ([`c3a6eaf`](https://github.com/juspay/hyperswitch-control-center/commit/c3a6eaff6f42abc977e8121e1730f2372fc1b5de))
+
+**Full Changelog:** [`v1.18.2...v1.18.3`](https://github.com/juspay/hyperswitch-control-center/compare/v1.18.2...v1.18.3)
+
+- - -
+
+
 ## 1.16.0 (2023-12-26)
 
 ### Features

diff --git a/README.md b/README.md
@@ -44,6 +44,8 @@ Follow these simple steps to set up Hyperswitch on your local machine.
    ```bash
    apiBaseUrl = your-backend-url
    sdkBaseUrl = your-sdk-url
+   mixpanelToken = mixpanel-token
+   # To view Mixpanel events on the Mixpanel dashboard, you must add your Mixpanel token; otherwise, you can ignore this requirement.
    ```
 
 5. Start the ReScript compiler:

diff --git a/public/hyperswitch/module.js b/public/hyperswitch/module.js
@@ -79,6 +79,14 @@ function getThreeDsKeys() {
   }
 }
 
+function getSurchargeKeys() {
+  if (wasm) {
+    return wasm.getSurchargeKeys();
+  } else {
+    return [];
+  }
+}
+
 function getAllKeys() {
   if (wasm) {
     return wasm.getAllKeys();

diff --git a/src/components/Button.res b/src/components/Button.res
@@ -346,10 +346,6 @@ let make = (
   ~customButtonStyle="",
   ~textStyleClass=?,
   ~customTextPaddingClass=?,
-  ~hswitchMixPanelDescription=?,
-  ~hswitchMixPanelPageName=?,
-  ~hswitchMixPanelContextName=?,
-  ~hswitchMixPanelActionName=?,
   ~allowButtonTextMinWidth=true,
   ~badge: badge={
     value: 1->Belt.Int.toString,
@@ -365,7 +361,6 @@ let make = (
   ~isPhoneDropdown=false,
   ~showBtnTextToolTip=false,
 ) => {
-  let hyperswitchMixPanel = HSMixPanel.useSendEvent()
   let parentRef = React.useRef(Js.Nullable.null)
   let dummyRef = React.useRef(Js.Nullable.null)
   let buttonRef = disableRipple ? dummyRef : parentRef
@@ -664,23 +659,7 @@ let make = (
   }
   let handleClick = ev => {
     switch onClick {
-    | Some(fn) => {
-        if (
-          hswitchMixPanelPageName->Belt.Option.isSome &&
-          hswitchMixPanelActionName->Belt.Option.isSome &&
-          hswitchMixPanelContextName->Belt.Option.isSome
-        ) {
-          hyperswitchMixPanel(
-            ~pageName=hswitchMixPanelPageName->Belt.Option.getWithDefault(""),
-            ~actionName=hswitchMixPanelActionName->Belt.Option.getWithDefault(""),
-            ~contextName=hswitchMixPanelContextName->Belt.Option.getWithDefault(""),
-            ~description=hswitchMixPanelDescription,
-            (),
-          )
-        }
-        fn(ev)
-      }
-
+    | Some(fn) => fn(ev)
     | None => ()
     }
   }

diff --git a/src/components/Button.resi b/src/components/Button.resi
@@ -22,7 +22,6 @@ type buttonType =
   | Dropdown
   | LightBlue
   | ArdraDefaultBlue
-
 type buttonSize = Large | Medium | Small | XSmall
 type iconType =
   | FontAwesome(string)
@@ -103,12 +102,8 @@ let make: (
   ~fullLength: bool=?,
   ~disableRipple: bool=?,
   ~customButtonStyle: Js.String2.t=?,
-  ~textStyleClass: Js.String2.t=?,
+  ~textStyleClass: string=?,
   ~customTextPaddingClass: string=?,
-  ~hswitchMixPanelDescription: string=?,
-  ~hswitchMixPanelPageName: string=?,
-  ~hswitchMixPanelContextName: string=?,
-  ~hswitchMixPanelActionName: string=?,
   ~allowButtonTextMinWidth: bool=?,
   ~badge: badge=?,
   ~buttonRightText: string=?,

diff --git a/src/components/DynamicTable.res b/src/components/DynamicTable.res
@@ -115,7 +115,6 @@ let make = (
     filterCheck,
     filterForRow,
   } = entity
-  let hyperswitchMixPanel = HSMixPanel.useSendEvent()
   let tableName =
     prefixAddition->Belt.Option.getWithDefault(false)
       ? title->Js.String.replaceByRe(%re("/ /g"), "-", _)->Js.String.toLowerCase->Some
@@ -249,17 +248,6 @@ let make = (
     fetchApi(uri, ~bodyStr=Js.Json.stringify(finalJson), ~headers, ~method_=method, ())
     ->then(resp => {
       let status = resp->Fetch.Response.status
-      if status >= 200 && status < 300 {
-        hyperswitchMixPanel(
-          ~description=resp->Js.Json.stringifyAny,
-          ~isApiFailure=true,
-          ~apiUrl=`Dynamic Table Loading Failed - ${uri}`,
-          ~apiMethodName=method->LogicUtils.methodStr,
-          ~xRequestId=Some(resp->HyperSwitchUtils.fetchRequestIdFromAPI),
-          ~responseStatusCode=Some(status),
-          (),
-        )
-      }
       if status >= 300 {
         setFetchSuccess(_ => false)
         setTableDataLoading(_ => false)
@@ -296,14 +284,6 @@ let make = (
       resolve()
     })
     ->catch(_ => {
-      hyperswitchMixPanel(
-        ~description=Some("Failed to fetch"),
-        ~isApiFailure=true,
-        ~apiUrl=`Dynamic Table Loading Failed - ${uri}`,
-        ~apiMethodName=method->LogicUtils.methodStr,
-        (),
-      )
-
       resolve()
     })
     ->ignore

diff --git a/src/components/HSwitchFeedBackModal.res b/src/components/HSwitchFeedBackModal.res
@@ -8,20 +8,10 @@ let make = (
 ) => {
   open HSwitchFeedBackModalUtils
   open APIUtils
-  let hyperswitchMixPanel = HSMixPanel.useSendEvent()
-  let url = RescriptReactRouter.useUrl()
   let showToast = ToastState.useShowToast()
   let updateDetails = useUpdateMethod()
 
   let onSubmit = async (values, _) => {
-    let mixPanelAction = switch modalType {
-    | FeedBackModal => "givefeedback"
-    | RequestConnectorModal => "request_connector"
-    }
-    ["global", url.path->LogicUtils.getListHead]->Js.Array2.forEach(ele =>
-      hyperswitchMixPanel(~pageName=ele, ~contextName=feedbackVia, ~actionName=mixPanelAction, ())
-    )
-
     try {
       let url = getURL(~entityName=USERS, ~userType=#USER_DATA, ~methodType=Post, ())
       let body =

diff --git a/src/components/RemoteFilter.res b/src/components/RemoteFilter.res
@@ -277,7 +277,6 @@ module CheckCustomFilters = {
     ~showAddFilter,
     ~showSelectFiltersSearch,
   ) => {
-    let hyperswitchMixPanel = HSMixPanel.useSendEvent()
     let formState: ReactFinalForm.formState = ReactFinalForm.useFormState(
       ReactFinalForm.useFormSubscription(["values"])->Js.Nullable.return,
     )
@@ -294,8 +293,6 @@ module CheckCustomFilters = {
       } else {
         removeFilters(fieldNameArr, values)
       }
-
-      hyperswitchMixPanel(~eventName=Some("analytics_addfilters"), ())
     }
 
     let selectOptions = options->Js.Array2.map(obj => obj.urlKey)
@@ -553,7 +550,6 @@ let make = (
   ~revampedFilter=false,
 ) => {
   let {query} = React.useContext(FilterContext.filterContext)
-  let hyperswitchMixPanel = HSMixPanel.useSendEvent()
   let alreadySelectedFiltersUserpref = `remote_filters_selected_keys_${tableName->Belt.Option.getWithDefault(
       "",
     )}`
@@ -962,13 +958,6 @@ let make = (
                       )
                       onClick={_ => {
                         setHideFilters(_ => !hideFilters)
-                        hyperswitchMixPanel(
-                          ~eventName=Some(
-                            `analytics_${hideFilters ? "showfilters" : "hidefilters"}`,
-                          ),
-                          ~description=Some(hideFilters ? "show_filters" : "hide_filters"),
-                          (),
-                        )
                       }}
                     />
                   </div>}
@@ -994,13 +983,6 @@ let make = (
                         }
                         onClick={_ => {
                           setShowFiltersModal(_ => true)
-                          hyperswitchMixPanel(
-                            ~eventName=Some(
-                              `analytics_${hideFilters ? "showfilters" : "hidefilters"}`,
-                            ),
-                            ~description=Some(hideFilters ? "show_filters" : "hide_filters"),
-                            (),
-                          )
                         }}
                       />
                       <UIUtils.RenderIf condition={count > 0 && filterHovered}>

diff --git a/src/components/form/FormRenderer.res b/src/components/form/FormRenderer.res
@@ -594,8 +594,6 @@ module SubmitButton = {
     ~textWeight=?,
     ~customHeightClass=?,
   ) => {
-    let url = RescriptReactRouter.useUrl()
-    let hyperswitchMixPanel = HSMixPanel.useSendEvent()
     let dict = Js.Dict.empty()
     [
       "hasSubmitErrors",
@@ -686,22 +684,7 @@ module SubmitButton = {
           buttonState
           loadingText
           onClick={_ev => {
-            let filterKeys =
-              formState.values
-              ->LogicUtils.getDictFromJsonObject
-              ->Js.Dict.keys
-              ->Js.Array2.filter(key => {
-                ["startTime", "endTime"]->Js.Array2.includes(key)->not
-              })
-              ->Js.Json.stringifyAny
             form.submit()->ignore
-            if text === "Apply Filters" {
-              hyperswitchMixPanel(
-                ~eventName=Some(`${url.path->LogicUtils.getListHead}_applyfilters`),
-                ~description=filterKeys,
-                (),
-              )
-            }
           }} //either onclick or type_should be called #warning
           leftIcon=icon
           rightIcon

diff --git a/src/entryPoints/hyperswitch/HyperSwitchApp.res b/src/entryPoints/hyperswitch/HyperSwitchApp.res
@@ -329,6 +329,7 @@ let make = () => {
                           <SDKPage />
                         </FeatureFlagEnabledComponent>
                       | list{"3ds"} => <HSwitchThreeDS />
+                      | list{"surcharge"} => <Surcharge />
                       | list{"account-settings"} =>
                         <FeatureFlagEnabledComponent isEnabled=featureFlagDetails.sampleData>
                           <HSwitchSettings />

diff --git a/src/entryPoints/hyperswitch/HyperSwitchEntry.res b/src/entryPoints/hyperswitch/HyperSwitchEntry.res
@@ -2,7 +2,6 @@ module HyperSwitchEntryComponent = {
   @react.component
   let make = () => {
     open HSLocalStorage
-    let hyperswitchMixPanel = HSMixPanel.useSendEvent()
     let postDetails = APIUtils.useUpdateMethod()
     let email = getFromMerchantDetails("email")
     let name = getFromUserDetails("name")
@@ -44,10 +43,6 @@ module HyperSwitchEntryComponent = {
         : `${page} - Dashboard [Test]`
       DOMUtils.document.title = title
       GoogleAnalytics.send({hitType: "pageview", page})
-      hyperswitchMixPanel(
-        ~eventName=Some(pageTitle->HyperSwitchUtils.getMixpanelRouteName(url)),
-        (),
-      )
     }
 
     React.useEffect1(() => {

diff --git a/src/entryPoints/hyperswitch/SidebarValues.res b/src/entryPoints/hyperswitch/SidebarValues.res
@@ -5,6 +5,7 @@ open SidebarTypes
 module GetProductionAccess = {
   @react.component
   let make = () => {
+    let mixpanelEvent = MixpanelHook.useSendEvent()
     let textStyles = HSwitchUtils.getTextClass(~textVariant=P2, ~paragraphTextVariant=Medium, ())
     let {isProdIntentCompleted, setShowProdIntentForm} = React.useContext(
       GlobalProvider.defaultContext,
@@ -18,7 +19,12 @@ module GetProductionAccess = {
     <div
       className={`flex items-center gap-2 ${backgroundColor} ${cursorStyles} px-4 py-3 m-2 ml-2 mb-3 !mx-4 whitespace-nowrap rounded`}
       onClick={_ => {
-        isProdIntentCompleted ? () : setShowProdIntentForm(_ => true)
+        isProdIntentCompleted
+          ? ()
+          : {
+              setShowProdIntentForm(_ => true)
+              mixpanelEvent(~eventName="get_production_access", ())
+            }
       }}>
       <div className={`text-white ${textStyles} !font-semibold`}>
         {productionAccessString->React.string}
@@ -149,13 +155,20 @@ let threeDs = SubLevelLink({
   searchOptions: [("Configure 3ds", "")],
 })
 
+let surcharge = SubLevelLink({
+  name: "Surcharge",
+  link: `/surcharge`,
+  access: ReadWrite,
+  searchOptions: [("Add Surcharge", "")],
+})
+
 let workflow = isWorkflowEnabled =>
   isWorkflowEnabled
     ? Section({
         name: "Workflow",
         icon: "3ds",
         showSection: true,
-        links: [routing, threeDs],
+        links: [routing, threeDs, surcharge],
       })
     : emptyComponent
 

diff --git a/src/entryPoints/hyperswitch/WooCommerce/WooCommerce.res b/src/entryPoints/hyperswitch/WooCommerce/WooCommerce.res
@@ -114,7 +114,7 @@ module ConfigurePlugin = {
                     {"Use this key to authenticate all calls from your application's client"->React.string}
                   </div>
                 </div>
-                <UserOnboardingUIUtils.PublishableKeyArea currentRoute={WooCommercePlugin} />
+                <UserOnboardingUIUtils.PublishableKeyArea />
               </div>
               <div className="grid grid-cols-3 w-full py-4">
                 <div className="col-span-2">
@@ -123,9 +123,7 @@ module ConfigurePlugin = {
                     {"This helps to authenticate and verify live events send by Hyperswitch."->React.string}
                   </div>
                 </div>
-                <UserOnboardingUIUtils.PaymentResponseHashKeyArea
-                  currentRoute={WooCommercePlugin}
-                />
+                <UserOnboardingUIUtils.PaymentResponseHashKeyArea />
               </div>
             </div>
           </div>

diff --git a/src/genericUtils/Identity.res b/src/genericUtils/Identity.res
@@ -14,3 +14,4 @@ external jsonToFormReactEvent: Js.Json.t => ReactEvent.Form.t = "%identity"
 external arrayOfGenericTypeToFormReactEvent: array<'a> => ReactEvent.Form.t = "%identity"
 external webAPIFocusEventToReactEventFocus: Webapi.Dom.FocusEvent.t => ReactEvent.Focus.t =
   "%identity"
+external toWasm: Js.Dict.t<Js.Json.t> => RoutingTypes.wasmModule = "%identity"
diff --git a/src/libraries/Window.res b/src/libraries/Window.res
@@ -41,6 +41,9 @@ external getPayoutConnectorConfig: string => Js.Json.t = "getPayoutConnectorConf
 @val @scope("window")
 external getThreeDsKeys: unit => array<string> = "getThreeDsKeys"
 
+@val @scope("window")
+external getSurchargeKeys: unit => array<string> = "getSurchargeKeys"
+
 @val @scope("window")
 external getAllKeys: unit => array<string> = "getAllKeys"
 
@@ -224,6 +227,6 @@ external fcWidget: 'a = "fcWidget"
 type boundingClient = {x: int, y: int, width: int, height: int}
 @send external getBoundingClientRect: Dom.element => boundingClient = "getBoundingClientRect"
 
-type env = {apiBaseUrl?: string, sdkBaseUrl?: string}
+type env = {apiBaseUrl?: string, sdkBaseUrl?: string, mixpanelToken?: string}
 @val @scope("window")
 external env: env = "_env_"