From 731ac503e93d051cf3dc1b34593e91b896105897 Mon Sep 17 00:00:00 2001 From: Pritish Budhiraja <1805317@kiit.ac.in> Date: Tue, 2 Jan 2024 12:57:57 +0530 Subject: [PATCH 1/3] fix: Scrollbar revert (#153) --- tailwindHyperSwitch.config.js | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/tailwindHyperSwitch.config.js b/tailwindHyperSwitch.config.js index 01d2183ec..3766ecf0b 100644 --- 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); }), ], From 707581209d18e19c9247a551544a317035cd2039 Mon Sep 17 00:00:00 2001 From: Riddhiagrawal001 <50551695+Riddhiagrawal001@users.noreply.github.com> Date: Tue, 2 Jan 2024 13:03:08 +0530 Subject: [PATCH 2/3] fix: business profile addition modal bugfix (#152) --- .../HyperSwitch/Settings/BusinessMapping/BusinessProfile.res | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/screens/HyperSwitch/Settings/BusinessMapping/BusinessProfile.res b/src/screens/HyperSwitch/Settings/BusinessMapping/BusinessProfile.res index ad54c171b..86933d241 100644 --- 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) + }} /> Date: Tue, 2 Jan 2024 13:36:52 +0530 Subject: [PATCH 3/3] fix: Unnecessary API List count of connectors stop (#154) --- src/screens/HyperSwitch/Home/HomeUtils.res | 7 ++++++- src/screens/HyperSwitch/Order/Orders.res | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/screens/HyperSwitch/Home/HomeUtils.res b/src/screens/HyperSwitch/Home/HomeUtils.res index 7eda29b8c..cc3b647ee 100644 --- 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 index e5543c27b..821d3929e 100644 --- a/src/screens/HyperSwitch/Order/Orders.res +++ b/src/screens/HyperSwitch/Order/Orders.res @@ -11,7 +11,12 @@ 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", "")