chore: merged latest branch

juspay · Jan 2, 2024 · 91c7340 · 91c7340
2 parents 3704f20 + 40ae278
commit 91c7340
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 4 deletions.
diff --git a/src/screens/HyperSwitch/Home/HomeUtils.res b/src/screens/HyperSwitch/Home/HomeUtils.res
@@ -171,7 +171,12 @@ module CheckoutCard = {
     let (_authStatus, setAuthStatus) = React.useContext(AuthInfoProvider.authStatusContext)
     let {setIsSidebarExpanded} = React.useContext(SidebarProvider.defaultContext)
     let isPlayground = HSLocalStorage.getIsPlaygroundFromLocalStorage()
-    let isConfigureConnector = ListHooks.useListCount(~entityName=CONNECTOR) > 0
+    let connectorList =
+      HyperswitchAtom.connectorListAtom
+      ->Recoil.useRecoilValueFromAtom
+      ->LogicUtils.safeParse
+      ->LogicUtils.getObjectArrayFromJson
+    let isConfigureConnector = connectorList->Array.length > 0
     let urlPath = url.path->Belt.List.toArray->Js.Array2.joinWith("_")
 
     let handleOnClick = _ => {

diff --git a/src/screens/HyperSwitch/Order/Orders.res b/src/screens/HyperSwitch/Order/Orders.res
@@ -11,7 +11,13 @@ let make = (~previewOnly=false) => {
   let (searchText, setSearchText) = React.useState(_ => "")
   let (filters, setFilters) = React.useState(_ => None)
   let (paymentModal, setPaymentModal) = React.useState(_ => false)
-  let isConfigureConnector = ListHooks.useListCount(~entityName=CONNECTOR) > 0
+  let connectorList =
+    HyperswitchAtom.connectorListAtom
+    ->Recoil.useRecoilValueFromAtom
+    ->LogicUtils.safeParse
+    ->LogicUtils.getObjectArrayFromJson
+  let isConfigureConnector = connectorList->Array.length > 0
+
   let (widthClass, heightClass) = React.useMemo1(() => {
     previewOnly ? ("w-full", "max-h-96") : ("w-full", "")
   }, [previewOnly])

diff --git a/src/screens/HyperSwitch/Settings/BusinessMapping/BusinessProfile.res b/src/screens/HyperSwitch/Settings/BusinessMapping/BusinessProfile.res
@@ -93,7 +93,10 @@ module AddEntryBtn = {
           buttonSize=Small
           buttonType={Primary}
           rightIcon={FontAwesome("plus")}
-          onClick={_ => setShowModal(_ => true)}
+          onClick={_ => {
+            setModalState(_ => Edit)
+            setShowModal(_ => true)
+          }}
         />
       </UIUtils.RenderIf>
       <Modal

diff --git a/tailwindHyperSwitch.config.js b/tailwindHyperSwitch.config.js
@@ -588,7 +588,28 @@ module.exports = {
   variants: {},
   plugins: [
     plugin(function ({ addUtilities }) {
-      const newUtilities = {};
+      const newUtilities = {
+        "*::-webkit-scrollbar": {
+          display: "none", // chrome and other
+        },
+        "*": {
+          scrollbarWidth: "none", // firefox
+        },
+        ".show-scrollbar::-webkit-scrollbar": {
+          display: "block",
+          overflow: "scroll",
+          height: "4px",
+          width: "8px",
+        },
+        ".show-scrollbar::-webkit-scrollbar-thumb": {
+          display: "block",
+          borderRadius: "20rem",
+          backgroundColor: "#8A8C8F",
+        },
+        ".show-scrollbar::-webkit-scrollbar-track": {
+          backgroundColor: "#FFFFFFF",
+        },
+      };
       addUtilities(newUtilities);
     }),
   ],