From 8e5fc2487586f818823e972ded388c58f4dcc98b Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 8 Oct 2024 13:07:43 +0000
Subject: [PATCH 1/3] chore(version): 2024.10.08.2

---
 CHANGELOG.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9fdb4c62c..51eb8926a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,16 @@ All notable changes to this project will be documented in this file. See [conven
 
 - - -
 
+## 2024.10.08.2
+
+### Features
+
+- Addition of new connector "NEXIXPAY" ([#1569](https://github.com/juspay/hyperswitch-control-center/pull/1569)) ([`8437983`](https://github.com/juspay/hyperswitch-control-center/commit/8437983269d3554d4abd0ab3a6649ddf88da373e))
+
+**Full Changelog:** [`2024.10.08.1...2024.10.08.2`](https://github.com/juspay/hyperswitch-control-center/compare/2024.10.08.1...2024.10.08.2)
+
+- - -
+
 ## 2024.10.08.1
 
 ### Features

From ebc0a33b21dc9ecfb50cc812161f05b1debeead7 Mon Sep 17 00:00:00 2001
From: Riddhiagrawal001 <50551695+Riddhiagrawal001@users.noreply.github.com>
Date: Wed, 9 Oct 2024 13:51:51 +0530
Subject: [PATCH 2/3] chore: user-permission type change (#1577)

---
 src/Recoils/HyperswitchAtom.res               |   9 +-
 src/components/ACLButton.res                  |   6 +-
 src/components/ACLButton.resi                 |   2 +-
 src/components/ACLDiv.res                     |   6 +-
 src/components/ACLDiv.resi                    |   2 +-
 src/components/tooltip/ACLToolTip.res         |   4 +-
 src/components/tooltip/ACLToolTip.resi        |   2 +-
 src/container/AnalyticsContainer.res          |  12 +-
 src/container/BusinessProfileContainer.res    |   4 +-
 src/container/ConnectorContainer.res          |  32 ++--
 src/container/MerchantAccountContainer.res    |  13 +-
 src/container/TransactionContainer.res        |  11 +-
 src/container/UserManagementContainer.res     |  14 +-
 src/entryPoints/HyperSwitchApp.res            |  76 ++++-----
 src/entryPoints/Provider/GlobalProvider.res   |   1 +
 src/entryPoints/Provider/ProviderHelper.res   |   1 -
 src/entryPoints/SidebarValues.res             | 149 +++++++++---------
 src/screens/APIUtils/APIUtils.res             |   6 +-
 src/screens/APIUtils/APIUtilsTypes.res        |   4 +-
 .../GlobalSearch/GlobalSearchBar.res          |   4 +-
 .../GlobalSearchResults/SearchResultsPage.res |   5 +-
 .../HomePageOverviewComponent.res             |   9 +-
 .../ConfigurePMTs/PaymentMethodConfig.res     |   4 +-
 src/screens/Connectors/ConnectorList.res      |   4 +-
 .../Connectors/ConnectorTableUtils.res        |   6 +-
 .../Developer/APIKeys/KeyManagement.res       |   4 +-
 .../PaymentSettings/PaymentSettingsList.res   |   7 +-
 .../PaymentSettingsListEntity.res             |   6 +-
 src/screens/Disputes/ShowDisputes.res         |   5 +-
 src/screens/FraudAndRisk/FRMSelect.res        |   8 +-
 src/screens/FraudAndRisk/FRMTableUtils.res    |   6 +-
 .../GenerateReports/GenerateReport.res        |  10 +-
 src/screens/Hooks/ClearRecoilValueHook.res    |   4 +-
 src/screens/Hooks/GroupACLHooks.res           |  72 +++++++++
 src/screens/OMPSwitch/OMPSwitchHelper.res     |   8 +-
 src/screens/Order/OrderUIUtils.res            |   6 +-
 src/screens/Order/ShowOrder.res               |  11 +-
 .../PMAuthenticationConnectorList.res         |   4 +-
 .../PMAuthenticationTableEntity.res           |   6 +-
 .../PayoutRouting/PayoutHistoryTable.res      |   7 +-
 .../PayoutHistoryTableEntity.res              |   6 +-
 src/screens/Processors/ProcessorCards.res     |  12 +-
 src/screens/Refunds/ShowRefund.res            |   9 +-
 src/screens/Routing/ActiveRouting.res         |  10 +-
 src/screens/Routing/History.res               |   7 +-
 src/screens/Routing/HistoryEntity.res         |   6 +-
 src/screens/Settings/BusinessDetails.res      |   4 +-
 .../BusinessMapping/BusinessProfile.res       |   4 +-
 src/screens/Settings/HSwitchSettings.res      |   6 +-
 src/screens/Surcharge/Surcharge.res           |   4 +-
 src/screens/TaxProcessor/TaxProcessorList.res |   4 +-
 .../TaxProcessor/TaxProcessorTableEntity.res  |   6 +-
 src/screens/ThreeDSFlow/HSwitchThreeDS.res    |   4 +-
 .../ThreeDsConnectorList.res                  |   4 +-
 .../ThreeDsProcessors/ThreeDsTableEntity.res  |   6 +-
 .../UserRevamp/CreateCustomRole.res           |   4 +-
 .../UserRevamp/GroupAccessUtils.res           |   8 +
 .../UserManagement/UserRevamp/ListRoles.res   |   4 +-
 .../UserRevamp/ListRolesTableEntity.res       |   8 +-
 .../UserManagement/UserRevamp/ListUsers.res   |   4 +-
 .../UserRevamp/NewUserInvitationForm.res      |  10 +-
 .../UserRevamp/PermissionUtils.res            |  92 -----------
 .../UserManagement/UserRevamp/UserInfo.res    |   6 +-
 .../UserRevamp/UserManagementTypes.res        |  12 +-
 .../UserRevamp/UserManagementUtils.res        |  45 ------
 src/utils/AccessControl.res                   |   4 +-
 src/utils/Mappers/GroupACLMapper.res          |  82 ++++++++++
 67 files changed, 477 insertions(+), 444 deletions(-)
 create mode 100644 src/screens/Hooks/GroupACLHooks.res
 create mode 100644 src/screens/UserManagement/UserRevamp/GroupAccessUtils.res
 delete mode 100644 src/screens/UserManagement/UserRevamp/PermissionUtils.res
 create mode 100644 src/utils/Mappers/GroupACLMapper.res

diff --git a/src/Recoils/HyperswitchAtom.res b/src/Recoils/HyperswitchAtom.res
index 333b12a3a..39e30dabc 100644
--- a/src/Recoils/HyperswitchAtom.res
+++ b/src/Recoils/HyperswitchAtom.res
@@ -23,11 +23,16 @@ let paypalAccountStatusAtom: Recoil.recoilAtom<PayPalFlowTypes.setupAccountStatu
   "paypalAccountStatusAtom",
   PayPalFlowTypes.Connect_paypal_landing,
 )
-let userPermissionAtom: Recoil.recoilAtom<UserManagementTypes.permissionJson> = Recoil.atom(
+// TODO: remove this after userGroupPermissionsAtom is stable
+let userPermissionAtom: Recoil.recoilAtom<UserManagementTypes.groupAccessJsonType> = Recoil.atom(
   "userPermissionAtom",
-  PermissionUtils.defaultValueForPermission,
+  GroupACLMapper.defaultValueForGroupAccessJson,
 )
 
+let userGroupACLAtom: Recoil.recoilAtom<
+  option<Map.t<UserManagementTypes.groupAccessType, CommonAuthTypes.authorization>>,
+> = Recoil.atom("userGroupACLAtom", None)
+
 let switchMerchantListAtom: Recoil.recoilAtom<
   array<SwitchMerchantUtils.switchMerchantListResponse>,
 > = Recoil.atom("switchMerchantListAtom", [SwitchMerchantUtils.defaultValue])
diff --git a/src/components/ACLButton.res b/src/components/ACLButton.res
index 89f449ba5..71a9ef501 100644
--- a/src/components/ACLButton.res
+++ b/src/components/ACLButton.res
@@ -28,16 +28,16 @@ let make = (
   ~customHeightClass=?,
   ~customBackColor=?,
   ~showBtnTextToolTip=false,
-  ~access=CommonAuthTypes.Access,
+  ~authorization=CommonAuthTypes.Access,
   ~tooltipText=HSwitchUtils.noAccessControlText,
   ~toolTipPosition=?,
 ) => {
-  let buttonState = switch access {
+  let buttonState = switch authorization {
   | Access => buttonState
   | NoAccess => Button.Disabled
   }
 
-  let showBtnTextToolTip = access === NoAccess
+  let showBtnTextToolTip = authorization === NoAccess
 
   <Button
     buttonState
diff --git a/src/components/ACLButton.resi b/src/components/ACLButton.resi
index 09fdee577..67fcb9b88 100644
--- a/src/components/ACLButton.resi
+++ b/src/components/ACLButton.resi
@@ -26,7 +26,7 @@ let make: (
   ~customHeightClass: string=?,
   ~customBackColor: string=?,
   ~showBtnTextToolTip: bool=?,
-  ~access: CommonAuthTypes.authorization=?,
+  ~authorization: CommonAuthTypes.authorization=?,
   ~tooltipText: string=?,
   ~toolTipPosition: ToolTip.toolTipPosition=?,
 ) => React.element
diff --git a/src/components/ACLDiv.res b/src/components/ACLDiv.res
index 72aead1f1..f6f5ba3cc 100644
--- a/src/components/ACLDiv.res
+++ b/src/components/ACLDiv.res
@@ -1,6 +1,6 @@
 @react.component
 let make = (
-  ~permission,
+  ~authorization,
   ~onClick,
   ~children,
   ~className="",
@@ -15,7 +15,7 @@ let make = (
   ~height=?,
 ) => {
   <ACLToolTip
-    access=permission
+    authorization
     ?noAccessDescription
     ?tooltipForWidthClass
     ?description
@@ -26,7 +26,7 @@ let make = (
     ?height
     toolTipFor={<AddDataAttributes
       attributes=[("data-testid", dataAttrStr->Option.getOr("")->String.toLowerCase)]>
-      <div className onClick={permission === CommonAuthTypes.Access ? onClick : {_ => ()}}>
+      <div className onClick={authorization === CommonAuthTypes.Access ? onClick : {_ => ()}}>
         {children}
       </div>
     </AddDataAttributes>}
diff --git a/src/components/ACLDiv.resi b/src/components/ACLDiv.resi
index 9caa66362..69968b40f 100644
--- a/src/components/ACLDiv.resi
+++ b/src/components/ACLDiv.resi
@@ -1,6 +1,6 @@
 @react.component
 let make: (
-  ~permission: CommonAuthTypes.authorization,
+  ~authorization: CommonAuthTypes.authorization,
   ~onClick: JsxEvent.Mouse.t => unit,
   ~children: React.element,
   ~className: string=?,
diff --git a/src/components/tooltip/ACLToolTip.res b/src/components/tooltip/ACLToolTip.res
index 34bbe8211..ce2e50bda 100644
--- a/src/components/tooltip/ACLToolTip.res
+++ b/src/components/tooltip/ACLToolTip.res
@@ -2,7 +2,7 @@ open ToolTip
 
 @react.component
 let make = (
-  ~access,
+  ~authorization,
   ~noAccessDescription=HSwitchUtils.noAccessControlText,
   ~description="",
   ~descriptionComponent=React.null,
@@ -28,7 +28,7 @@ let make = (
   ~isRelative=true,
   ~dismissable=false,
 ) => {
-  let description = access === CommonAuthTypes.Access ? description : noAccessDescription
+  let description = authorization === CommonAuthTypes.Access ? description : noAccessDescription
 
   <ToolTip
     description
diff --git a/src/components/tooltip/ACLToolTip.resi b/src/components/tooltip/ACLToolTip.resi
index 2ab37b232..cf670a8a5 100644
--- a/src/components/tooltip/ACLToolTip.resi
+++ b/src/components/tooltip/ACLToolTip.resi
@@ -1,6 +1,6 @@
 @react.component
 let make: (
-  ~access: CommonAuthTypes.authorization,
+  ~authorization: CommonAuthTypes.authorization,
   ~noAccessDescription: string=?,
   ~description: string=?,
   ~descriptionComponent: React.element=?,
diff --git a/src/container/AnalyticsContainer.res b/src/container/AnalyticsContainer.res
index 136874bb1..d6bc3c702 100644
--- a/src/container/AnalyticsContainer.res
+++ b/src/container/AnalyticsContainer.res
@@ -3,31 +3,33 @@ let make = () => {
   open HSwitchUtils
   open HyperswitchAtom
   let url = RescriptReactRouter.useUrl()
-  let userPermissionJson = Recoil.useRecoilValueFromAtom(userPermissionAtom)
+  let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
   let {userInfo: {analyticsEntity}} = React.useContext(UserInfoProvider.defaultContext)
   let {performanceMonitor, disputeAnalytics} = featureFlagAtom->Recoil.useRecoilValueFromAtom
   <div key={(analyticsEntity :> string)}>
     {switch url.path->urlPath {
     | list{"analytics-payments"} =>
-      <AccessControl permission=userPermissionJson.analyticsView>
+      <AccessControl authorization={userHasAccess(~groupAccess=AnalyticsView)}>
         <FilterContext key="PaymentsAnalytics" index="PaymentsAnalytics">
           <PaymentAnalytics />
         </FilterContext>
       </AccessControl>
     | list{"analytics-refunds"} =>
-      <AccessControl permission=userPermissionJson.analyticsView>
+      <AccessControl authorization={userHasAccess(~groupAccess=AnalyticsView)}>
         <FilterContext key="PaymentsRefunds" index="PaymentsRefunds">
           <RefundsAnalytics />
         </FilterContext>
       </AccessControl>
     | list{"analytics-disputes"} =>
-      <AccessControl isEnabled={disputeAnalytics} permission=userPermissionJson.analyticsView>
+      <AccessControl
+        isEnabled={disputeAnalytics} authorization={userHasAccess(~groupAccess=AnalyticsView)}>
         <FilterContext key="DisputeAnalytics" index="DisputeAnalytics">
           <DisputeAnalytics />
         </FilterContext>
       </AccessControl>
     | list{"performance-monitor"} =>
-      <AccessControl permission=userPermissionJson.analyticsView isEnabled={performanceMonitor}>
+      <AccessControl
+        authorization={userHasAccess(~groupAccess=AnalyticsView)} isEnabled={performanceMonitor}>
         <FilterContext key="PerformanceMonitor" index="PerformanceMonitor">
           <PerformanceMonitor domain="payments" />
         </FilterContext>
diff --git a/src/container/BusinessProfileContainer.res b/src/container/BusinessProfileContainer.res
index 1f549de00..ff8ea8979 100644
--- a/src/container/BusinessProfileContainer.res
+++ b/src/container/BusinessProfileContainer.res
@@ -27,11 +27,11 @@ let make = () => {
     {switch url.path->urlPath {
     // Business Profile Modules
     | list{"business-details"} =>
-      <AccessControl isEnabled=featureFlagDetails.default permission={Access}>
+      <AccessControl isEnabled=featureFlagDetails.default authorization={Access}>
         <BusinessDetails />
       </AccessControl>
     | list{"business-profiles"} =>
-      <AccessControl permission=Access>
+      <AccessControl authorization=Access>
         <BusinessProfile />
       </AccessControl>
     | list{"payment-settings", ...remainingPath} =>
diff --git a/src/container/ConnectorContainer.res b/src/container/ConnectorContainer.res
index 4ad94134d..5ec04e2ac 100644
--- a/src/container/ConnectorContainer.res
+++ b/src/container/ConnectorContainer.res
@@ -6,8 +6,7 @@ let make = () => {
   open HSwitchUtils
   open HyperswitchAtom
   let url = RescriptReactRouter.useUrl()
-
-  let userPermissionJson = Recoil.useRecoilValueFromAtom(userPermissionAtom)
+  let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
   let featureFlagDetails = featureFlagAtom->Recoil.useRecoilValueFromAtom
   let fetchConnectorListResponse = ConnectorListHook.useFetchConnectorList()
   let fetchBusinessProfiles = BusinessProfileHook.useFetchBusinessProfiles()
@@ -16,9 +15,9 @@ let make = () => {
     try {
       setScreenState(_ => PageLoaderWrapper.Loading)
       if (
-        userPermissionJson.connectorsView === Access ||
-        userPermissionJson.workflowsView === Access ||
-        userPermissionJson.workflowsManage === Access
+        userHasAccess(~groupAccess=ConnectorsView) === Access ||
+        userHasAccess(~groupAccess=WorkflowsView) === Access ||
+        userHasAccess(~groupAccess=WorkflowsManage) === Access
       ) {
         let _ = await fetchConnectorListResponse()
         let _ = await fetchBusinessProfiles()
@@ -38,7 +37,7 @@ let make = () => {
     {switch url.path->urlPath {
     // Connector Modules
     | list{"connectors", ...remainingPath} =>
-      <AccessControl permission=userPermissionJson.connectorsView>
+      <AccessControl authorization={userHasAccess(~groupAccess=ConnectorsView)}>
         <EntityScaffold
           entityName="Connectors"
           remainingPath
@@ -49,7 +48,8 @@ let make = () => {
       </AccessControl>
     | list{"payoutconnectors", ...remainingPath} =>
       <AccessControl
-        isEnabled={featureFlagDetails.payOut} permission=userPermissionJson.connectorsView>
+        isEnabled={featureFlagDetails.payOut}
+        authorization={userHasAccess(~groupAccess=ConnectorsView)}>
         <EntityScaffold
           entityName="PayoutConnectors"
           remainingPath
@@ -60,7 +60,7 @@ let make = () => {
       </AccessControl>
     | list{"3ds-authenticators", ...remainingPath} =>
       <AccessControl
-        permission=userPermissionJson.connectorsView
+        authorization={userHasAccess(~groupAccess=ConnectorsView)}
         isEnabled={featureFlagDetails.threedsAuthenticator}>
         <EntityScaffold
           entityName="3DS Authenticator"
@@ -73,7 +73,7 @@ let make = () => {
 
     | list{"pm-authentication-processor", ...remainingPath} =>
       <AccessControl
-        permission=userPermissionJson.connectorsView
+        authorization={userHasAccess(~groupAccess=ConnectorsView)}
         isEnabled={featureFlagDetails.pmAuthenticationProcessor}>
         <EntityScaffold
           entityName="PM Authentication Processor"
@@ -85,7 +85,8 @@ let make = () => {
       </AccessControl>
     | list{"tax-processor", ...remainingPath} =>
       <AccessControl
-        permission=userPermissionJson.connectorsView isEnabled={featureFlagDetails.taxProcessor}>
+        authorization={userHasAccess(~groupAccess=ConnectorsView)}
+        isEnabled={featureFlagDetails.taxProcessor}>
         <EntityScaffold
           entityName="Tax Processor"
           remainingPath
@@ -96,7 +97,8 @@ let make = () => {
       </AccessControl>
     | list{"fraud-risk-management", ...remainingPath} =>
       <AccessControl
-        isEnabled={featureFlagDetails.frm} permission=userPermissionJson.connectorsView>
+        isEnabled={featureFlagDetails.frm}
+        authorization={userHasAccess(~groupAccess=ConnectorsView)}>
         <EntityScaffold
           entityName="risk-management"
           remainingPath
@@ -107,7 +109,8 @@ let make = () => {
       </AccessControl>
     | list{"configure-pmts", ...remainingPath} =>
       <AccessControl
-        permission=userPermissionJson.connectorsView isEnabled={featureFlagDetails.configurePmts}>
+        authorization={userHasAccess(~groupAccess=ConnectorsView)}
+        isEnabled={featureFlagDetails.configurePmts}>
         <FilterContext key="ConfigurePmts" index="ConfigurePmts">
           <EntityScaffold
             entityName="ConfigurePMTs"
@@ -119,7 +122,7 @@ let make = () => {
       </AccessControl>
     // Routing
     | list{"routing", ...remainingPath} =>
-      <AccessControl permission=userPermissionJson.workflowsView>
+      <AccessControl authorization={userHasAccess(~groupAccess=WorkflowsView)}>
         <EntityScaffold
           entityName="Routing"
           remainingPath
@@ -129,7 +132,8 @@ let make = () => {
       </AccessControl>
     | list{"payoutrouting", ...remainingPath} =>
       <AccessControl
-        isEnabled={featureFlagDetails.payOut} permission=userPermissionJson.workflowsView>
+        isEnabled={featureFlagDetails.payOut}
+        authorization={userHasAccess(~groupAccess=WorkflowsView)}>
         <EntityScaffold
           entityName="PayoutRouting"
           remainingPath
diff --git a/src/container/MerchantAccountContainer.res b/src/container/MerchantAccountContainer.res
index d4149ce0e..e85142445 100644
--- a/src/container/MerchantAccountContainer.res
+++ b/src/container/MerchantAccountContainer.res
@@ -7,7 +7,7 @@ let make = () => {
   open HyperswitchAtom
   let url = RescriptReactRouter.useUrl()
   let (surveyModal, setSurveyModal) = React.useState(_ => false)
-  let userPermissionJson = Recoil.useRecoilValueFromAtom(userPermissionAtom)
+  let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
   let featureFlagDetails = featureFlagAtom->Recoil.useRecoilValueFromAtom
   let fetchConnectorListResponse = ConnectorListHook.useFetchConnectorList()
   let fetchBusinessProfiles = BusinessProfileHook.useFetchBusinessProfiles()
@@ -20,7 +20,7 @@ let make = () => {
       setScreenState(_ => PageLoaderWrapper.Loading)
 
       let _ = await fetchMerchantAccountDetails()
-      if userPermissionJson.connectorsView === Access {
+      if userHasAccess(~groupAccess=ConnectorsView) === Access {
         if !featureFlagDetails.isLiveMode {
           let _ = await fetchConnectorListResponse()
           let _ = await fetchBusinessProfiles()
@@ -43,7 +43,7 @@ let make = () => {
 
       | list{"recon"} =>
         <AccessControl
-          isEnabled={featureFlagDetails.recon && !checkUserEntity([#Profile])} permission=Access>
+          isEnabled={featureFlagDetails.recon && !checkUserEntity([#Profile])} authorization=Access>
           <Recon />
         </AccessControl>
       | list{"upload-files"}
@@ -53,12 +53,13 @@ let make = () => {
       | list{"config-settings"}
       | list{"file-processor"} =>
         <AccessControl
-          isEnabled={featureFlagDetails.recon && !checkUserEntity([#Profile])} permission=Access>
+          isEnabled={featureFlagDetails.recon && !checkUserEntity([#Profile])} authorization=Access>
           <ReconModule urlList={url.path->urlPath} />
         </AccessControl>
       | list{"sdk"} =>
         <AccessControl
-          isEnabled={!featureFlagDetails.isLiveMode} permission={userPermissionJson.connectorsView}>
+          isEnabled={!featureFlagDetails.isLiveMode}
+          authorization={userHasAccess(~groupAccess=ConnectorsView)}>
           <SDKPage />
         </AccessControl>
       | list{"unauthorized"} => <UnauthorizedPage />
@@ -66,7 +67,7 @@ let make = () => {
       }}
       <RenderIf
         condition={!featureFlagDetails.isLiveMode &&
-        userPermissionJson.merchantDetailsManage === Access &&
+        userHasAccess(~groupAccess=MerchantDetailsManage) === Access &&
         merchantDetailsTypedValue.merchant_name->Option.isNone}>
         <SbxOnboardingSurvey showModal=surveyModal setShowModal=setSurveyModal />
       </RenderIf>
diff --git a/src/container/TransactionContainer.res b/src/container/TransactionContainer.res
index aa1ea1546..e3e21ae56 100644
--- a/src/container/TransactionContainer.res
+++ b/src/container/TransactionContainer.res
@@ -3,13 +3,14 @@ let make = () => {
   open HSwitchUtils
   open HyperswitchAtom
   let url = RescriptReactRouter.useUrl()
-  let userPermissionJson = Recoil.useRecoilValueFromAtom(userPermissionAtom)
+
+  let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
   let {userInfo: {transactionEntity}} = React.useContext(UserInfoProvider.defaultContext)
   let {payOut} = featureFlagAtom->Recoil.useRecoilValueFromAtom
   <div key={(transactionEntity :> string)}>
     {switch url.path->urlPath {
     | list{"payments", ...remainingPath} =>
-      <AccessControl permission=userPermissionJson.operationsView>
+      <AccessControl authorization={userHasAccess(~groupAccess=OperationsView)}>
         <FilterContext key="payments" index="payments">
           <EntityScaffold
             entityName="Payments"
@@ -21,7 +22,7 @@ let make = () => {
         </FilterContext>
       </AccessControl>
     | list{"payouts", ...remainingPath} =>
-      <AccessControl isEnabled={payOut} permission=userPermissionJson.operationsView>
+      <AccessControl isEnabled={payOut} authorization={userHasAccess(~groupAccess=OperationsView)}>
         <FilterContext key="payouts" index="payouts">
           <EntityScaffold
             entityName="Payouts"
@@ -33,7 +34,7 @@ let make = () => {
         </FilterContext>
       </AccessControl>
     | list{"refunds", ...remainingPath} =>
-      <AccessControl permission=userPermissionJson.operationsView>
+      <AccessControl authorization={userHasAccess(~groupAccess=OperationsView)}>
         <FilterContext key="refunds" index="refunds">
           <EntityScaffold
             entityName="Refunds"
@@ -45,7 +46,7 @@ let make = () => {
         </FilterContext>
       </AccessControl>
     | list{"disputes", ...remainingPath} =>
-      <AccessControl permission=userPermissionJson.operationsView>
+      <AccessControl authorization={userHasAccess(~groupAccess=OperationsView)}>
         <FilterContext key="disputes" index="disputes">
           <EntityScaffold
             entityName="Disputes"
diff --git a/src/container/UserManagementContainer.res b/src/container/UserManagementContainer.res
index 101737016..e65659115 100644
--- a/src/container/UserManagementContainer.res
+++ b/src/container/UserManagementContainer.res
@@ -3,24 +3,24 @@ This container holds the APIs needed for all user management-related modules.
 It ensures that the necessary data is available before any user management component loads.
 
 Pre-requisite APIs :
- - ROLE_INFO : To get the list available permissions for modules 
+ - ROLE_INFO : To get the list available authorizations for modules 
 */
 
 @react.component
 let make = () => {
   open HSwitchUtils
-  open HyperswitchAtom
+
   open APIUtils
   let getURL = useGetURL()
   let fetchDetails = useGetMethod()
   let url = RescriptReactRouter.useUrl()
-  let userPermissionJson = Recoil.useRecoilValueFromAtom(userPermissionAtom)
+  let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
   let (screenState, setScreenState) = React.useState(_ => PageLoaderWrapper.Loading)
   let setRoleInfo = Recoil.useSetRecoilState(HyperswitchAtom.moduleListRecoil)
 
   let fetchModuleList = async () => {
     try {
-      if userPermissionJson.usersManage === Access {
+      if userHasAccess(~groupAccess=UsersManage) === Access {
         let url = getURL(
           ~entityName=USERS,
           ~userType=#ROLE_INFO,
@@ -47,15 +47,15 @@ let make = () => {
     {switch url.path->urlPath {
     // User Management modules
     | list{"users", "invite-users"} =>
-      <AccessControl permission={userPermissionJson.usersManage}>
+      <AccessControl authorization={userHasAccess(~groupAccess=UsersManage)}>
         <InviteMember />
       </AccessControl>
     | list{"users", "create-custom-role"} =>
-      <AccessControl permission=userPermissionJson.usersManage>
+      <AccessControl authorization={userHasAccess(~groupAccess=UsersManage)}>
         <CreateCustomRole baseUrl="users" breadCrumbHeader="Team management" />
       </AccessControl>
     | list{"users", ...remainingPath} =>
-      <AccessControl permission={userPermissionJson.usersView}>
+      <AccessControl authorization={userHasAccess(~groupAccess=UsersView)}>
         <EntityScaffold
           entityName="UserManagement"
           remainingPath
diff --git a/src/entryPoints/HyperSwitchApp.res b/src/entryPoints/HyperSwitchApp.res
index f162d4745..a66276da1 100644
--- a/src/entryPoints/HyperSwitchApp.res
+++ b/src/entryPoints/HyperSwitchApp.res
@@ -3,13 +3,11 @@ let make = () => {
   open HSwitchUtils
   open GlobalVars
   open APIUtils
-  open PermissionUtils
-  open LogicUtils
+
   open HyperswitchAtom
   let pageViewEvent = MixpanelHook.usePageView()
-  let getURL = useGetURL()
   let url = RescriptReactRouter.useUrl()
-  let fetchDetails = useGetMethod()
+
   let {
     showFeedbackModal,
     setShowFeedbackModal,
@@ -19,7 +17,8 @@ let make = () => {
   let (screenState, setScreenState) = React.useState(_ => PageLoaderWrapper.Loading)
   let merchantDetailsTypedValue = Recoil.useRecoilValueFromAtom(merchantDetailsValueAtom)
   let featureFlagDetails = featureFlagAtom->Recoil.useRecoilValueFromAtom
-  let (userPermissionJson, setuserPermissionJson) = Recoil.useRecoilState(userPermissionAtom)
+  let (userGroupACL, setuserGroupACL) = Recoil.useRecoilState(userGroupACLAtom)
+  let {fetchUserGroupACL, userHasAccess} = GroupACLHooks.useUserGroupACLHook()
   let {userInfo: {orgId, merchantId, profileId, roleId}, checkUserEntity} = React.useContext(
     UserInfoProvider.defaultContext,
   )
@@ -37,46 +36,20 @@ let make = () => {
   let hyperSwitchAppSidebars = SidebarValues.useGetSidebarValues(~isReconEnabled)
   sessionExpired := false
 
-  let fetchPermissions = async () => {
-    try {
-      let url = getURL(
-        ~entityName=USERS,
-        ~userType=#GET_PERMISSIONS,
-        ~methodType=Get,
-        ~queryParamerters=Some(`groups=true`),
-      )
-      let response = await fetchDetails(url)
-      let permissionsValue =
-        response->getArrayFromJson([])->Array.map(ele => ele->JSON.Decode.string->Option.getOr(""))
-      let permissionJson =
-        permissionsValue->Array.map(ele => ele->mapStringToPermissionType)->getPermissionJson
-      setuserPermissionJson(_ => permissionJson)
-      permissionJson
-    } catch {
-    | Exn.Error(e) => {
-        let err = Exn.message(e)->Option.getOr("Failed to Fetch!")
-        Exn.raiseError(err)
-      }
-    }
-  }
   let (renderKey, setRenderkey) = React.useState(_ => "")
 
   let setUpDashboard = async () => {
     try {
+      // NOTE: Treat groupACL map similar to screenstate
+      setuserGroupACL(_ => None)
       Window.connectorWasmInit()->ignore
-      let _ = await fetchPermissions()
-
-      // This needs to be removed
-      // TODO: change userPermissionJson type to option<permissionJson>
-      await HyperSwitchUtils.delay(2000)
-
+      let _ = await fetchUserGroupACL()
       switch url.path->urlPath {
       | list{"unauthorized"} => RescriptReactRouter.push(appendDashboardPath(~url="/home"))
       | _ => ()
       }
       setDashboardPageState(_ => #HOME)
       setRenderkey(_ => profileId)
-      setScreenState(_ => PageLoaderWrapper.Success)
     } catch {
     | _ => setScreenState(_ => PageLoaderWrapper.Error(""))
     }
@@ -95,6 +68,13 @@ let make = () => {
     None
   }, (featureFlagDetails.mixpanel, path))
 
+  React.useEffect1(() => {
+    if userGroupACL->Option.isSome {
+      setScreenState(_ => PageLoaderWrapper.Success)
+    }
+    None
+  }, [userGroupACL])
+
   <>
     <PageLoaderWrapper screenState={screenState} sectionHeight="!h-screen" showLogoutButton=true>
       <div>
@@ -181,14 +161,14 @@ let make = () => {
                         | list{"new-analytics-payment"} =>
                           <AccessControl
                             isEnabled={featureFlagDetails.newAnalytics}
-                            permission=userPermissionJson.analyticsView>
+                            authorization={userHasAccess(~groupAccess=AnalyticsView)}>
                             <FilterContext key="NewAnalytics" index="NewAnalytics">
                               <NewAnalyticsContainer />
                             </FilterContext>
                           </AccessControl>
                         | list{"customers", ...remainingPath} =>
                           <AccessControl
-                            permission={userPermissionJson.operationsView}
+                            authorization={userHasAccess(~groupAccess=OperationsView)}
                             isEnabled={[#Organization, #Merchant]->checkUserEntity}>
                             <EntityScaffold
                               entityName="Customers"
@@ -203,7 +183,7 @@ let make = () => {
                           <AccessControl
                             isEnabled={featureFlagDetails.userJourneyAnalytics &&
                             [#Organization, #Merchant]->checkUserEntity}
-                            permission=userPermissionJson.analyticsView>
+                            authorization={userHasAccess(~groupAccess=AnalyticsView)}>
                             <FilterContext key="UserJourneyAnalytics" index="UserJourneyAnalytics">
                               <UserJourneyAnalytics />
                             </FilterContext>
@@ -212,7 +192,7 @@ let make = () => {
                           <AccessControl
                             isEnabled={featureFlagDetails.authenticationAnalytics &&
                             [#Organization, #Merchant]->checkUserEntity}
-                            permission=userPermissionJson.analyticsView>
+                            authorization={userHasAccess(~groupAccess=AnalyticsView)}>
                             <FilterContext
                               key="AuthenticationAnalytics" index="AuthenticationAnalytics">
                               <AuthenticationAnalytics />
@@ -220,14 +200,14 @@ let make = () => {
                           </AccessControl>
                         | list{"developer-api-keys"} =>
                           <AccessControl
-                            permission=userPermissionJson.merchantDetailsManage
+                            authorization={userHasAccess(~groupAccess=MerchantDetailsManage)}
                             isEnabled={!checkUserEntity([#Profile])}>
                             <KeyManagement.KeysManagement />
                           </AccessControl>
                         | list{"developer-system-metrics"} =>
                           <AccessControl
                             isEnabled={isInternalUser && featureFlagDetails.systemMetrics}
-                            permission=userPermissionJson.analyticsView>
+                            authorization={userHasAccess(~groupAccess=AnalyticsView)}>
                             <FilterContext key="SystemMetrics" index="SystemMetrics">
                               <SystemMetricsAnalytics />
                             </FilterContext>
@@ -235,23 +215,23 @@ let make = () => {
 
                         | list{"compliance"} =>
                           <AccessControl
-                            isEnabled=featureFlagDetails.complianceCertificate permission=Access>
+                            isEnabled=featureFlagDetails.complianceCertificate authorization=Access>
                             <Compliance />
                           </AccessControl>
                         | list{"3ds"} =>
-                          <AccessControl permission=userPermissionJson.workflowsView>
+                          <AccessControl authorization={userHasAccess(~groupAccess=WorkflowsView)}>
                             <HSwitchThreeDS />
                           </AccessControl>
                         | list{"surcharge"} =>
                           <AccessControl
                             isEnabled={featureFlagDetails.surcharge}
-                            permission=userPermissionJson.workflowsView>
+                            authorization={userHasAccess(~groupAccess=WorkflowsView)}>
                             <Surcharge />
                           </AccessControl>
                         | list{"account-settings"} =>
                           <AccessControl
                             isEnabled=featureFlagDetails.sampleData
-                            permission=userPermissionJson.merchantDetailsManage>
+                            authorization={userHasAccess(~groupAccess=MerchantDetailsManage)}>
                             <HSwitchSettings />
                           </AccessControl>
                         | list{"account-settings", "profile", ...remainingPath} =>
@@ -265,25 +245,25 @@ let make = () => {
                         | list{"payment-attempts"} =>
                           <AccessControl
                             isEnabled={featureFlagDetails.globalSearch}
-                            permission=userPermissionJson.operationsView>
+                            authorization={userHasAccess(~groupAccess=OperationsView)}>
                             <PaymentAttemptTable />
                           </AccessControl>
                         | list{"payment-intents"} =>
                           <AccessControl
                             isEnabled={featureFlagDetails.globalSearch}
-                            permission=userPermissionJson.operationsView>
+                            authorization={userHasAccess(~groupAccess=OperationsView)}>
                             <PaymentIntentTable />
                           </AccessControl>
                         | list{"refunds-global"} =>
                           <AccessControl
                             isEnabled={featureFlagDetails.globalSearch}
-                            permission=userPermissionJson.operationsView>
+                            authorization={userHasAccess(~groupAccess=OperationsView)}>
                             <RefundsTable />
                           </AccessControl>
                         | list{"dispute-global"} =>
                           <AccessControl
                             isEnabled={featureFlagDetails.globalSearch}
-                            permission=userPermissionJson.operationsView>
+                            authorization={userHasAccess(~groupAccess=OperationsView)}>
                             <DisputeTable />
                           </AccessControl>
                         | list{"unauthorized"} => <UnauthorizedPage />
diff --git a/src/entryPoints/Provider/GlobalProvider.res b/src/entryPoints/Provider/GlobalProvider.res
index e26f6d811..40b2bb80c 100644
--- a/src/entryPoints/Provider/GlobalProvider.res
+++ b/src/entryPoints/Provider/GlobalProvider.res
@@ -10,6 +10,7 @@ let defaultValue = {
   setIntegrationDetails: _ => (),
   dashboardPageState: #DEFAULT,
   setDashboardPageState: _ => (),
+  // TODO: change this when custom role for user-management revamp is picked
   permissionInfo: [],
   setPermissionInfo: _ => (),
   isProdIntentCompleted: None,
diff --git a/src/entryPoints/Provider/ProviderHelper.res b/src/entryPoints/Provider/ProviderHelper.res
index 74cf41056..cdbe7532a 100644
--- a/src/entryPoints/Provider/ProviderHelper.res
+++ b/src/entryPoints/Provider/ProviderHelper.res
@@ -32,6 +32,5 @@ let itemToObjMapperForGetInfo: Dict.t<JSON.t> => UserManagementTypes.getInfoType
   {
     module_: getString(dict, "group", ""),
     description: getString(dict, "description", ""),
-    isPermissionAllowed: false,
   }
 }
diff --git a/src/entryPoints/SidebarValues.res b/src/entryPoints/SidebarValues.res
index cd172ba99..8c8537a0b 100644
--- a/src/entryPoints/SidebarValues.res
+++ b/src/entryPoints/SidebarValues.res
@@ -49,8 +49,9 @@ let emptyComponent = CustomComponent({
   component: React.null,
 })
 
-let productionAccessComponent = (isProductionAccessEnabled, permissionJson) =>
-  isProductionAccessEnabled && permissionJson.merchantDetailsManage === Access
+let productionAccessComponent = (isProductionAccessEnabled, userHasAccess) =>
+  isProductionAccessEnabled &&
+  userHasAccess(~groupAccess=MerchantDetailsManage) === CommonAuthTypes.Access
     ? CustomComponent({
         component: <GetProductionAccess />,
       })
@@ -68,57 +69,57 @@ let home = isHomeEnabled =>
       })
     : emptyComponent
 
-let payments = permissionJson => {
+let payments = userHasAccess => {
   SubLevelLink({
     name: "Payments",
     link: `/payments`,
-    access: permissionJson.operationsView,
+    access: userHasAccess(~groupAccess=OperationsView),
     searchOptions: [("View payment operations", "")],
   })
 }
 
-let refunds = permissionJson => {
+let refunds = userHasAccess => {
   SubLevelLink({
     name: "Refunds",
     link: `/refunds`,
-    access: permissionJson.operationsView,
+    access: userHasAccess(~groupAccess=OperationsView),
     searchOptions: [("View refund operations", "")],
   })
 }
 
-let disputes = permissionJson => {
+let disputes = userHasAccess => {
   SubLevelLink({
     name: "Disputes",
     link: `/disputes`,
-    access: permissionJson.operationsView,
+    access: userHasAccess(~groupAccess=OperationsView),
     searchOptions: [("View dispute operations", "")],
   })
 }
 
-let customers = permissionJson => {
+let customers = userHasAccess => {
   SubLevelLink({
     name: "Customers",
     link: `/customers`,
-    access: permissionJson.operationsView,
+    access: userHasAccess(~groupAccess=OperationsView),
     searchOptions: [("View customers", "")],
   })
 }
 
-let payouts = permissionJson => {
+let payouts = userHasAccess => {
   SubLevelLink({
     name: "Payouts",
     link: `/payouts`,
-    access: permissionJson.operationsView,
+    access: userHasAccess(~groupAccess=OperationsView),
     searchOptions: [("View payouts operations", "")],
   })
 }
 
-let operations = (isOperationsEnabled, ~permissionJson, ~isPayoutsEnabled, ~userEntity) => {
-  let payments = payments(permissionJson)
-  let refunds = refunds(permissionJson)
-  let disputes = disputes(permissionJson)
-  let customers = customers(permissionJson)
-  let payouts = payouts(permissionJson)
+let operations = (isOperationsEnabled, ~userHasAccess, ~isPayoutsEnabled, ~userEntity) => {
+  let payments = payments(userHasAccess)
+  let refunds = refunds(userHasAccess)
+  let disputes = disputes(userHasAccess)
+  let customers = customers(userHasAccess)
+  let payouts = payouts(userHasAccess)
 
   let links = [payments, refunds, disputes]
   let isCustomersEnabled = userEntity !== #Profile
@@ -140,11 +141,11 @@ let operations = (isOperationsEnabled, ~permissionJson, ~isPayoutsEnabled, ~user
     : emptyComponent
 }
 
-let paymentProcessor = (isLiveMode, permissionJson) => {
+let paymentProcessor = (isLiveMode, userHasAccess) => {
   SubLevelLink({
     name: "Payment Processors",
     link: `/connectors`,
-    access: permissionJson.connectorsView,
+    access: userHasAccess(~groupAccess=ConnectorsView),
     searchOptions: HSwitchUtils.getSearchOptionsForProcessors(
       ~processorList=isLiveMode
         ? ConnectorUtils.connectorListForLive
@@ -154,11 +155,11 @@ let paymentProcessor = (isLiveMode, permissionJson) => {
   })
 }
 
-let payoutConnectors = (~permissionJson) => {
+let payoutConnectors = (~userHasAccess) => {
   SubLevelLink({
     name: "Payout Processors",
     link: `/payoutconnectors`,
-    access: permissionJson.connectorsView,
+    access: userHasAccess(~groupAccess=ConnectorsView),
     searchOptions: HSwitchUtils.getSearchOptionsForProcessors(
       ~processorList=ConnectorUtils.payoutConnectorList,
       ~getNameFromString=ConnectorUtils.getConnectorNameString,
@@ -166,20 +167,20 @@ let payoutConnectors = (~permissionJson) => {
   })
 }
 
-let fraudAndRisk = (~permissionJson) => {
+let fraudAndRisk = (~userHasAccess) => {
   SubLevelLink({
     name: "Fraud & Risk",
     link: `/fraud-risk-management`,
-    access: permissionJson.connectorsView,
+    access: userHasAccess(~groupAccess=ConnectorsView),
     searchOptions: [],
   })
 }
 
-let threeDsConnector = (~permissionJson) => {
+let threeDsConnector = (~userHasAccess) => {
   SubLevelLink({
     name: "3DS Authenticator",
     link: "/3ds-authenticators",
-    access: permissionJson.connectorsView,
+    access: userHasAccess(~groupAccess=ConnectorsView),
     searchOptions: [
       ("Connect 3dsecure.io", "/new?name=threedsecureio"),
       ("Connect threedsecureio", "/new?name=threedsecureio"),
@@ -187,11 +188,11 @@ let threeDsConnector = (~permissionJson) => {
   })
 }
 
-let pmAuthenticationProcessor = (~permissionJson) => {
+let pmAuthenticationProcessor = (~userHasAccess) => {
   SubLevelLink({
     name: "PM Authentication Processor",
     link: `/pm-authentication-processor`,
-    access: permissionJson.connectorsView,
+    access: userHasAccess(~groupAccess=ConnectorsView),
     searchOptions: HSwitchUtils.getSearchOptionsForProcessors(
       ~processorList=ConnectorUtils.pmAuthenticationConnectorList,
       ~getNameFromString=ConnectorUtils.getConnectorNameString,
@@ -199,11 +200,11 @@ let pmAuthenticationProcessor = (~permissionJson) => {
   })
 }
 
-let taxProcessor = (~permissionJson) => {
+let taxProcessor = (~userHasAccess) => {
   SubLevelLink({
     name: "Tax Processor",
     link: `/tax-processor`,
-    access: permissionJson.connectorsView,
+    access: userHasAccess(~groupAccess=ConnectorsView),
     searchOptions: HSwitchUtils.getSearchOptionsForProcessors(
       ~processorList=ConnectorUtils.taxProcessorList,
       ~getNameFromString=ConnectorUtils.getConnectorNameString,
@@ -219,27 +220,27 @@ let connectors = (
   ~isThreedsConnectorEnabled,
   ~isPMAuthenticationProcessor,
   ~isTaxProcessor,
-  ~permissionJson,
+  ~userHasAccess,
 ) => {
-  let connectorLinkArray = [paymentProcessor(isLiveMode, permissionJson)]
+  let connectorLinkArray = [paymentProcessor(isLiveMode, userHasAccess)]
 
   if isPayoutsEnabled {
-    connectorLinkArray->Array.push(payoutConnectors(~permissionJson))->ignore
+    connectorLinkArray->Array.push(payoutConnectors(~userHasAccess))->ignore
   }
   if isThreedsConnectorEnabled {
-    connectorLinkArray->Array.push(threeDsConnector(~permissionJson))->ignore
+    connectorLinkArray->Array.push(threeDsConnector(~userHasAccess))->ignore
   }
 
   if isFrmEnabled {
-    connectorLinkArray->Array.push(fraudAndRisk(~permissionJson))->ignore
+    connectorLinkArray->Array.push(fraudAndRisk(~userHasAccess))->ignore
   }
 
   if isPMAuthenticationProcessor {
-    connectorLinkArray->Array.push(pmAuthenticationProcessor(~permissionJson))->ignore
+    connectorLinkArray->Array.push(pmAuthenticationProcessor(~userHasAccess))->ignore
   }
 
   if isTaxProcessor {
-    connectorLinkArray->Array.push(taxProcessor(~permissionJson))->ignore
+    connectorLinkArray->Array.push(taxProcessor(~userHasAccess))->ignore
   }
 
   isConnectorsEnabled
@@ -310,7 +311,7 @@ let analytics = (
   disputeAnalyticsFlag,
   performanceMonitorFlag,
   newAnalyticsflag,
-  ~permissionJson,
+  ~userHasAccess,
 ) => {
   let links = [paymentAnalytcis, refundAnalytics]
 
@@ -337,16 +338,16 @@ let analytics = (
     ? Section({
         name: "Analytics",
         icon: "analytics",
-        showSection: permissionJson.analyticsView === Access,
+        showSection: userHasAccess(~groupAccess=AnalyticsView) === CommonAuthTypes.Access,
         links,
       })
     : emptyComponent
 }
-let routing = permissionJson => {
+let routing = userHasAccess => {
   SubLevelLink({
     name: "Routing",
     link: `/routing`,
-    access: permissionJson.workflowsView,
+    access: userHasAccess(~groupAccess=WorkflowsView),
     searchOptions: [
       ("Manage default routing configuration", "/default"),
       ("Create new volume based routing", "/volume"),
@@ -356,11 +357,11 @@ let routing = permissionJson => {
   })
 }
 
-let payoutRouting = permissionJson => {
+let payoutRouting = userHasAccess => {
   SubLevelLink({
     name: "Payout Routing",
     link: `/payoutrouting`,
-    access: permissionJson.workflowsView,
+    access: userHasAccess(~groupAccess=WorkflowsView),
     searchOptions: [
       ("Manage default routing configuration", "/default"),
       ("Create new volume based routing", "/volume"),
@@ -370,19 +371,19 @@ let payoutRouting = permissionJson => {
   })
 }
 
-let threeDs = permissionJson => {
+let threeDs = userHasAccess => {
   SubLevelLink({
     name: "3DS Decision Manager",
     link: `/3ds`,
-    access: permissionJson.workflowsView,
+    access: userHasAccess(~groupAccess=WorkflowsView),
     searchOptions: [("Configure 3ds", "")],
   })
 }
-let surcharge = permissionJson => {
+let surcharge = userHasAccess => {
   SubLevelLink({
     name: "Surcharge",
     link: `/surcharge`,
-    access: permissionJson.workflowsView,
+    access: userHasAccess(~groupAccess=WorkflowsView),
     searchOptions: [("Add Surcharge", "")],
   })
 }
@@ -390,14 +391,14 @@ let surcharge = permissionJson => {
 let workflow = (
   isWorkflowEnabled,
   isSurchargeEnabled,
-  ~permissionJson,
+  ~userHasAccess,
   ~isPayoutEnabled,
   ~userEntity,
 ) => {
-  let routing = routing(permissionJson)
-  let threeDs = threeDs(permissionJson)
-  let payoutRouting = payoutRouting(permissionJson)
-  let surcharge = surcharge(permissionJson)
+  let routing = routing(userHasAccess)
+  let threeDs = threeDs(userHasAccess)
+  let payoutRouting = payoutRouting(userHasAccess)
+  let surcharge = surcharge(userHasAccess)
 
   let defaultWorkFlow = [routing]
   let isNotProfileEntity = userEntity !== #Profile
@@ -422,11 +423,11 @@ let workflow = (
     : emptyComponent
 }
 
-let userManagement = permissionJson => {
+let userManagement = userHasAccess => {
   SubLevelLink({
     name: "Users",
     link: `/users`,
-    access: permissionJson.usersView,
+    access: userHasAccess(~groupAccess=UsersView),
     searchOptions: [("View user management", "")],
   })
 }
@@ -449,11 +450,11 @@ let businessProfiles = () => {
   })
 }
 
-let configurePMTs = permissionJson => {
+let configurePMTs = userHasAccess => {
   SubLevelLink({
     name: "Configure PMTs",
     link: `/configure-pmts`,
-    access: permissionJson.connectorsView,
+    access: userHasAccess(~groupAccess=ConnectorsView),
     searchOptions: [("Configure payment methods", "Configure country currency")],
   })
 }
@@ -467,18 +468,18 @@ let complianceCertificateSection = {
   })
 }
 
-let settings = (~isConfigurePmtsEnabled, ~permissionJson, ~complianceCertificate) => {
+let settings = (~isConfigurePmtsEnabled, ~userHasAccess, ~complianceCertificate) => {
   let settingsLinkArray = [businessDetails(), businessProfiles()]
 
   if isConfigurePmtsEnabled {
-    settingsLinkArray->Array.push(configurePMTs(permissionJson))->ignore
+    settingsLinkArray->Array.push(configurePMTs(userHasAccess))->ignore
   }
 
   if complianceCertificate {
     settingsLinkArray->Array.push(complianceCertificateSection)->ignore
   }
 
-  settingsLinkArray->Array.push(userManagement(permissionJson))->ignore
+  settingsLinkArray->Array.push(userManagement(userHasAccess))->ignore
 
   Section({
     name: "Settings",
@@ -488,20 +489,20 @@ let settings = (~isConfigurePmtsEnabled, ~permissionJson, ~complianceCertificate
   })
 }
 
-let apiKeys = permissionJson => {
+let apiKeys = userHasAccess => {
   SubLevelLink({
     name: "API Keys",
     link: `/developer-api-keys`,
-    access: permissionJson.merchantDetailsManage,
+    access: userHasAccess(~groupAccess=MerchantDetailsManage),
     searchOptions: [("View API Keys", "")],
   })
 }
 
-let systemMetric = permissionJson => {
+let systemMetric = userHasAccess => {
   SubLevelLink({
     name: "System Metrics",
     link: `/developer-system-metrics`,
-    access: permissionJson.analyticsView,
+    access: userHasAccess(~groupAccess=AnalyticsView),
     iconTag: "betaTag",
     searchOptions: [("View System Metrics", "")],
   })
@@ -519,15 +520,15 @@ let paymentSettings = () => {
 let developers = (
   isDevelopersEnabled,
   systemMetrics,
-  ~permissionJson,
+  ~userHasAccess,
   ~checkUserEntity,
   ~roleId,
 ) => {
   let isInternalUser = roleId->HyperSwitchUtils.checkIsInternalUser
   let isProfileUser = checkUserEntity([#Profile])
-  let apiKeys = apiKeys(permissionJson)
+  let apiKeys = apiKeys(userHasAccess)
   let paymentSettings = paymentSettings()
-  let systemMetric = systemMetric(permissionJson)
+  let systemMetric = systemMetric(userHasAccess)
 
   let defaultDevelopersOptions = [paymentSettings]
 
@@ -630,7 +631,7 @@ let reconAndSettlement = (recon, isReconEnabled, checkUserEntity) => {
 
 let useGetSidebarValues = (~isReconEnabled: bool) => {
   let featureFlagDetails = HyperswitchAtom.featureFlagAtom->Recoil.useRecoilValueFromAtom
-  let permissionJson = Recoil.useRecoilValueFromAtom(HyperswitchAtom.userPermissionAtom)
+  let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
   let {userInfo: {userEntity, roleId}, checkUserEntity} = React.useContext(
     UserInfoProvider.defaultContext,
   )
@@ -656,9 +657,9 @@ let useGetSidebarValues = (~isReconEnabled: bool) => {
   } = featureFlagDetails
 
   let sidebar = [
-    productionAccessComponent(quickStart, permissionJson),
+    productionAccessComponent(quickStart, userHasAccess),
     default->home,
-    default->operations(~permissionJson, ~isPayoutsEnabled=payOut, ~userEntity),
+    default->operations(~userHasAccess, ~isPayoutsEnabled=payOut, ~userEntity),
     default->connectors(
       ~isLiveMode,
       ~isFrmEnabled=frm,
@@ -666,7 +667,7 @@ let useGetSidebarValues = (~isReconEnabled: bool) => {
       ~isThreedsConnectorEnabled=threedsAuthenticator,
       ~isPMAuthenticationProcessor=pmAuthenticationProcessor,
       ~isTaxProcessor=taxProcessor,
-      ~permissionJson,
+      ~userHasAccess,
     ),
     default->analytics(
       userJourneyAnalyticsFlag,
@@ -674,12 +675,12 @@ let useGetSidebarValues = (~isReconEnabled: bool) => {
       disputeAnalytics,
       performanceMonitorFlag,
       newAnalytics,
-      ~permissionJson,
+      ~userHasAccess,
     ),
-    default->workflow(isSurchargeEnabled, ~permissionJson, ~isPayoutEnabled=payOut, ~userEntity),
+    default->workflow(isSurchargeEnabled, ~userHasAccess, ~isPayoutEnabled=payOut, ~userEntity),
     recon->reconAndSettlement(isReconEnabled, checkUserEntity),
-    default->developers(systemMetrics, ~permissionJson, ~checkUserEntity, ~roleId),
-    settings(~isConfigurePmtsEnabled=configurePmts, ~permissionJson, ~complianceCertificate),
+    default->developers(systemMetrics, ~userHasAccess, ~checkUserEntity, ~roleId),
+    settings(~isConfigurePmtsEnabled=configurePmts, ~userHasAccess, ~complianceCertificate),
   ]
 
   sidebar
diff --git a/src/screens/APIUtils/APIUtils.res b/src/screens/APIUtils/APIUtils.res
index 2dd442a2d..7d51b1de8 100644
--- a/src/screens/APIUtils/APIUtils.res
+++ b/src/screens/APIUtils/APIUtils.res
@@ -612,14 +612,14 @@ let useGetURL = () => {
       | #MERCHANT_DATA => `${userUrl}/data`
       | #USER_INFO => userUrl
 
-      // USER PERMISSIONS
-      | #GET_PERMISSIONS =>
+      // USER GROUP ACCESS
+      | #GET_GROUP_ACL =>
         switch queryParamerters {
         | Some(params) => `${userUrl}/role?${params}`
         | None => `${userUrl}/role`
         }
       | #ROLE_INFO => `${userUrl}/module/list`
-      | #PERMISSION_INFO =>
+      | #GROUP_ACCESS_INFO =>
         switch queryParamerters {
         | Some(params) => `${userUrl}/${(userType :> string)->String.toLowerCase}?${params}`
         | None => `${userUrl}/${(userType :> string)->String.toLowerCase}`
diff --git a/src/screens/APIUtils/APIUtilsTypes.res b/src/screens/APIUtils/APIUtilsTypes.res
index 07def5d5f..647854abf 100644
--- a/src/screens/APIUtils/APIUtilsTypes.res
+++ b/src/screens/APIUtils/APIUtilsTypes.res
@@ -72,7 +72,7 @@ type userType = [
   | #VERIFY_EMAILV2
   | #ACCEPT_INVITE_FROM_EMAIL
   | #SET_METADATA
-  | #PERMISSION_INFO
+  | #GROUP_ACCESS_INFO
   | #ROLE_INFO
   | #MERCHANT_DATA
   | #USER_DATA
@@ -83,7 +83,7 @@ type userType = [
   | #RESEND_INVITE
   | #CREATE_MERCHANT
   | #ACCEPT_INVITE
-  | #GET_PERMISSIONS
+  | #GET_GROUP_ACL
   | #CREATE_CUSTOM_ROLE
   | #FROM_EMAIL
   | #USER_INFO
diff --git a/src/screens/Analytics/GlobalSearch/GlobalSearchBar.res b/src/screens/Analytics/GlobalSearch/GlobalSearchBar.res
index b99f8d302..45620c037 100644
--- a/src/screens/Analytics/GlobalSearch/GlobalSearchBar.res
+++ b/src/screens/Analytics/GlobalSearch/GlobalSearchBar.res
@@ -215,8 +215,8 @@ let make = () => {
   let searchText = searchText->String.trim
   let loader = LottieFiles.useLottieJson("loader-circle.json")
   let {globalSearch} = HyperswitchAtom.featureFlagAtom->Recoil.useRecoilValueFromAtom
-  let permissionJson = Recoil.useRecoilValueFromAtom(HyperswitchAtom.userPermissionAtom)
-  let isShowRemoteResults = globalSearch && permissionJson.operationsView === Access
+  let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
+  let isShowRemoteResults = globalSearch && userHasAccess(~groupAccess=OperationsView) === Access
   let mixpanelEvent = MixpanelHook.useSendEvent()
   let {userInfo: {merchantId}} = React.useContext(UserInfoProvider.defaultContext)
 
diff --git a/src/screens/Analytics/GlobalSearchResults/SearchResultsPage.res b/src/screens/Analytics/GlobalSearchResults/SearchResultsPage.res
index 010c6e07a..89741ec65 100644
--- a/src/screens/Analytics/GlobalSearchResults/SearchResultsPage.res
+++ b/src/screens/Analytics/GlobalSearchResults/SearchResultsPage.res
@@ -91,10 +91,9 @@ let make = () => {
   let hswitchTabs = SidebarValues.useGetSidebarValues(~isReconEnabled)
   let query = UrlUtils.useGetFilterDictFromUrl("")->getString("query", "")
   let {globalSearch} = HyperswitchAtom.featureFlagAtom->Recoil.useRecoilValueFromAtom
-  let permissionJson = Recoil.useRecoilValueFromAtom(HyperswitchAtom.userPermissionAtom)
+  let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
   let {userInfo: {merchantId}} = React.useContext(UserInfoProvider.defaultContext)
-
-  let isShowRemoteResults = globalSearch && permissionJson.operationsView === Access
+  let isShowRemoteResults = globalSearch && userHasAccess(~groupAccess=OperationsView) === Access
 
   let getSearchResults = async results => {
     try {
diff --git a/src/screens/Analytics/HomePageOverview/HomePageOverviewComponent.res b/src/screens/Analytics/HomePageOverview/HomePageOverviewComponent.res
index 3006b0c90..5820d5086 100644
--- a/src/screens/Analytics/HomePageOverview/HomePageOverviewComponent.res
+++ b/src/screens/Analytics/HomePageOverview/HomePageOverviewComponent.res
@@ -4,8 +4,8 @@ module ConnectorOverview = {
   @react.component
   let make = () => {
     open ConnectorUtils
+    let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
     let {globalUIConfig: {backgroundColor}} = React.useContext(ThemeProvider.themeContext)
-    let userPermissionJson = Recoil.useRecoilValueFromAtom(HyperswitchAtom.userPermissionAtom)
     let connectorsList =
       HyperswitchAtom.connectorListAtom
       ->Recoil.useRecoilValueFromAtom
@@ -52,7 +52,7 @@ module ConnectorOverview = {
         </div>
         <ACLButton
           text="+ Add More"
-          access={userPermissionJson.connectorsView}
+          authorization={userHasAccess(~groupAccess=ConnectorsView)}
           buttonType={PrimaryOutline}
           customButtonStyle="w-10 !px-3"
           buttonSize={Small}
@@ -198,12 +198,13 @@ module OverviewInfo = {
 @react.component
 let make = () => {
   let {systemMetrics} = HyperswitchAtom.featureFlagAtom->Recoil.useRecoilValueFromAtom
-  let userPermissionJson = Recoil.useRecoilValueFromAtom(HyperswitchAtom.userPermissionAtom)
+  let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
+
   <div className="flex flex-col gap-4">
     <p className=headingStyle> {"Overview"->React.string} </p>
     <div className="grid grid-cols-1 md:grid-cols-3 w-full gap-4">
       <ConnectorOverview />
-      <RenderIf condition={userPermissionJson.analyticsView === Access}>
+      <RenderIf condition={userHasAccess(~groupAccess=AnalyticsView) === Access}>
         <PaymentOverview />
       </RenderIf>
       <RenderIf condition={systemMetrics}>
diff --git a/src/screens/ConfigurePMTs/PaymentMethodConfig.res b/src/screens/ConfigurePMTs/PaymentMethodConfig.res
index 492ec931b..186eb093a 100644
--- a/src/screens/ConfigurePMTs/PaymentMethodConfig.res
+++ b/src/screens/ConfigurePMTs/PaymentMethodConfig.res
@@ -71,8 +71,8 @@ let make = (
   ~element: option<React.element>=?,
 ) => {
   open FormRenderer
+  let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
 
-  let permissionJson = Recoil.useRecoilValueFromAtom(HyperswitchAtom.userPermissionAtom)
   let (showPaymentMthdConfigModal, setShowPaymentMthdConfigModal) = React.useState(_ => false)
   let (initialValues, setInitialValues) = React.useState(_ => Dict.make()->JSON.Encode.object)
   let (currencies, setCurrencies) = React.useState(_ => [])
@@ -196,7 +196,7 @@ let make = (
       </Modal>
     </RenderIf>
     <ACLDiv
-      permission=permissionJson.connectorsManage
+      authorization={userHasAccess(~groupAccess=ConnectorsManage)}
       className="cursor-pointer w-150"
       onClick={_ => getProcessorDetails()->ignore}>
       {switch element {
diff --git a/src/screens/Connectors/ConnectorList.res b/src/screens/Connectors/ConnectorList.res
index 1b58d10ba..c855f78b6 100644
--- a/src/screens/Connectors/ConnectorList.res
+++ b/src/screens/Connectors/ConnectorList.res
@@ -10,7 +10,7 @@ let make = (~isPayoutFlow=false) => {
   let (searchText, setSearchText) = React.useState(_ => "")
   let (processorModal, setProcessorModal) = React.useState(_ => false)
   let connectorListFromRecoil = HyperswitchAtom.connectorListAtom->Recoil.useRecoilValueFromAtom
-  let userPermissionJson = Recoil.useRecoilValueFromAtom(HyperswitchAtom.userPermissionAtom)
+  let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
   let featureFlagDetails = HyperswitchAtom.featureFlagAtom->Recoil.useRecoilValueFromAtom
 
   let textStyle = HSwitchUtils.getTextClass((H2, Optional))
@@ -139,7 +139,7 @@ let make = (~isPayoutFlow=false) => {
             setOffset
             entity={ConnectorTableUtils.connectorEntity(
               `${entityPrefix}connectors`,
-              ~permission=userPermissionJson.connectorsManage,
+              ~authorization=userHasAccess(~groupAccess=ConnectorsManage),
             )}
             currrentFetchCount={filteredConnectorData->Array.length}
             collapseTableRow=false
diff --git a/src/screens/Connectors/ConnectorTableUtils.res b/src/screens/Connectors/ConnectorTableUtils.res
index 027578777..112194ac3 100644
--- a/src/screens/Connectors/ConnectorTableUtils.res
+++ b/src/screens/Connectors/ConnectorTableUtils.res
@@ -125,7 +125,7 @@ let getPreviouslyConnectedList: JSON.t => array<connectorPayload> = json => {
   LogicUtils.getArrayDataFromJson(json, ConnectorListMapper.getProcessorPayloadType)
 }
 
-let connectorEntity = (path: string, ~permission: CommonAuthTypes.authorization) => {
+let connectorEntity = (path: string, ~authorization: CommonAuthTypes.authorization) => {
   EntityType.makeEntity(
     ~uri=``,
     ~getObjects=getPreviouslyConnectedList,
@@ -135,11 +135,11 @@ let connectorEntity = (path: string, ~permission: CommonAuthTypes.authorization)
     ~dataKey="",
     ~getShowLink={
       connec =>
-        PermissionUtils.linkForGetShowLinkViaAccess(
+        GroupAccessUtils.linkForGetShowLinkViaAccess(
           ~url=GlobalVars.appendDashboardPath(
             ~url=`/${path}/${connec.merchant_connector_id}?name=${connec.connector_name}`,
           ),
-          ~permission,
+          ~authorization,
         )
     },
   )
diff --git a/src/screens/Developer/APIKeys/KeyManagement.res b/src/screens/Developer/APIKeys/KeyManagement.res
index 88c385aa4..a6451777d 100644
--- a/src/screens/Developer/APIKeys/KeyManagement.res
+++ b/src/screens/Developer/APIKeys/KeyManagement.res
@@ -177,7 +177,7 @@ module ApiKeyAddBtn = {
   @react.component
   let make = (~getAPIKeyDetails) => {
     let mixpanelEvent = MixpanelHook.useSendEvent()
-    let userPermissionJson = Recoil.useRecoilValueFromAtom(HyperswitchAtom.userPermissionAtom)
+    let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
     let (showModal, setShowModal) = React.useState(_ => false)
     let initialValues = Dict.make()
     initialValues->Dict.set("expiration", Never->getStringFromRecordType->JSON.Encode.string)
@@ -191,7 +191,7 @@ module ApiKeyAddBtn = {
             name="plus" size=12 className="jp-gray-900 fill-opacity-50 dark:jp-gray-text_darktheme"
           />,
         )}
-        access=userPermissionJson.merchantDetailsManage
+        authorization={userHasAccess(~groupAccess=MerchantDetailsManage)}
         buttonType=Secondary
         buttonSize=Small
         onClick={_ => {
diff --git a/src/screens/Developer/PaymentSettings/PaymentSettingsList.res b/src/screens/Developer/PaymentSettings/PaymentSettingsList.res
index 28aadb746..682278f42 100644
--- a/src/screens/Developer/PaymentSettings/PaymentSettingsList.res
+++ b/src/screens/Developer/PaymentSettings/PaymentSettingsList.res
@@ -6,8 +6,7 @@ let make = (
 ) => {
   open PaymentSettingsListEntity
   let (offset, setOffset) = React.useState(_ => 0)
-  let userPermissionJson = Recoil.useRecoilValueFromAtom(HyperswitchAtom.userPermissionAtom)
-
+  let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
   let businessProfileValues = HyperswitchAtom.businessProfilesAtom->Recoil.useRecoilValueFromAtom
 
   <RenderIf condition=isFromSettings>
@@ -22,7 +21,9 @@ let make = (
           hideTitle=true
           resultsPerPage=7
           visibleColumns
-          entity={webhookProfileTableEntity(~permission=userPermissionJson.merchantDetailsManage)}
+          entity={webhookProfileTableEntity(
+            ~authorization=userHasAccess(~groupAccess=MerchantDetailsManage),
+          )}
           showSerialNumber=true
           actualData={businessProfileValues->Array.map(Nullable.make)}
           totalResults={businessProfileValues->Array.length}
diff --git a/src/screens/Developer/PaymentSettings/PaymentSettingsListEntity.res b/src/screens/Developer/PaymentSettings/PaymentSettingsListEntity.res
index a8e0b2145..9362a821a 100644
--- a/src/screens/Developer/PaymentSettings/PaymentSettingsListEntity.res
+++ b/src/screens/Developer/PaymentSettings/PaymentSettingsListEntity.res
@@ -66,7 +66,7 @@ let getItems: JSON.t => array<profileEntity> = json => {
   LogicUtils.getArrayDataFromJson(json, itemToObjMapper)
 }
 
-let webhookProfileTableEntity = (~permission: CommonAuthTypes.authorization) =>
+let webhookProfileTableEntity = (~authorization: CommonAuthTypes.authorization) =>
   EntityType.makeEntity(
     ~uri="",
     ~getObjects=getItems,
@@ -77,9 +77,9 @@ let webhookProfileTableEntity = (~permission: CommonAuthTypes.authorization) =>
     ~getCell,
     ~getShowLink={
       profile =>
-        PermissionUtils.linkForGetShowLinkViaAccess(
+        GroupAccessUtils.linkForGetShowLinkViaAccess(
           ~url=GlobalVars.appendDashboardPath(~url=`/payment-settings/${profile.profile_id}`),
-          ~permission,
+          ~authorization,
         )
     },
   )
diff --git a/src/screens/Disputes/ShowDisputes.res b/src/screens/Disputes/ShowDisputes.res
index d676b036e..0c5879149 100644
--- a/src/screens/Disputes/ShowDisputes.res
+++ b/src/screens/Disputes/ShowDisputes.res
@@ -173,7 +173,7 @@ let make = (~id, ~profileId) => {
   let url = RescriptReactRouter.useUrl()
   let getURL = useGetURL()
   let fetchDetails = useGetMethod()
-  let userPermissionJson = Recoil.useRecoilValueFromAtom(HyperswitchAtom.userPermissionAtom)
+  let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
   let (screenState, setScreenState) = React.useState(_ => PageLoaderWrapper.Loading)
   let featureFlagDetails = HyperswitchAtom.featureFlagAtom->Recoil.useRecoilValueFromAtom
   let (disputeData, setDisputeData) = React.useState(_ => JSON.Encode.null)
@@ -220,7 +220,8 @@ let make = (~id, ~profileId) => {
       <DisputesInfo orderDict={data} setDisputeData />
       <div className="mt-5" />
       <RenderIf
-        condition={featureFlagDetails.auditTrail && userPermissionJson.analyticsView == Access}>
+        condition={featureFlagDetails.auditTrail &&
+        userHasAccess(~groupAccess=AnalyticsView) == Access}>
         <OrderUIUtils.RenderAccordian
           accordion={[
             {
diff --git a/src/screens/FraudAndRisk/FRMSelect.res b/src/screens/FraudAndRisk/FRMSelect.res
index 2fb6ac03d..29423861b 100644
--- a/src/screens/FraudAndRisk/FRMSelect.res
+++ b/src/screens/FraudAndRisk/FRMSelect.res
@@ -2,7 +2,7 @@ module NewProcessorCards = {
   open FRMInfo
   @react.component
   let make = (~configuredFRMs: array<ConnectorTypes.connectorTypes>) => {
-    let userPermissionJson = Recoil.useRecoilValueFromAtom(HyperswitchAtom.userPermissionAtom)
+    let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
     let mixpanelEvent = MixpanelHook.useSendEvent()
     let frmAvailableForIntegration = frmList
     let unConfiguredFRMs = frmAvailableForIntegration->Array.filter(total =>
@@ -47,7 +47,7 @@ module NewProcessorCards = {
               </div>
               <ACLButton
                 text="Connect"
-                access=userPermissionJson.connectorsManage
+                authorization={userHasAccess(~groupAccess=ConnectorsManage)}
                 buttonType=Secondary
                 buttonSize=Small
                 onClick={_ => handleClick(frmName)}
@@ -82,7 +82,7 @@ let make = () => {
   let (screenState, setScreenState) = React.useState(_ => PageLoaderWrapper.Loading)
   let fetchDetails = APIUtils.useGetMethod()
   let isMobileView = MatchMedia.useMatchMedia("(max-width: 844px)")
-  let userPermissionJson = Recoil.useRecoilValueFromAtom(HyperswitchAtom.userPermissionAtom)
+  let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
   let (
     configuredFRMs: array<ConnectorTypes.connectorTypes>,
     setConfiguredFRMs,
@@ -180,7 +180,7 @@ let make = () => {
           setOffset
           entity={FRMTableUtils.connectorEntity(
             "fraud-risk-management",
-            ~permission={userPermissionJson.connectorsManage},
+            ~authorization={userHasAccess(~groupAccess=ConnectorsManage)},
           )}
           currrentFetchCount={filteredFRMData->Array.length}
           collapseTableRow=false
diff --git a/src/screens/FraudAndRisk/FRMTableUtils.res b/src/screens/FraudAndRisk/FRMTableUtils.res
index 4d8f94a35..f7097fee8 100644
--- a/src/screens/FraudAndRisk/FRMTableUtils.res
+++ b/src/screens/FraudAndRisk/FRMTableUtils.res
@@ -14,7 +14,7 @@ let getPreviouslyConnectedList: JSON.t => array<ConnectorTypes.connectorPayload>
   )->ConnectorTableUtils.sortPreviouslyConnectedList
 }
 
-let connectorEntity = (path: string, ~permission: CommonAuthTypes.authorization) => {
+let connectorEntity = (path: string, ~authorization: CommonAuthTypes.authorization) => {
   EntityType.makeEntity(
     ~uri=``,
     ~getObjects=getPreviouslyConnectedList,
@@ -24,11 +24,11 @@ let connectorEntity = (path: string, ~permission: CommonAuthTypes.authorization)
     ~dataKey="",
     ~getShowLink={
       connec =>
-        PermissionUtils.linkForGetShowLinkViaAccess(
+        GroupAccessUtils.linkForGetShowLinkViaAccess(
           ~url=GlobalVars.appendDashboardPath(
             ~url=`/${path}/${connec.merchant_connector_id}?name=${connec.connector_name}`,
           ),
-          ~permission,
+          ~authorization,
         )
     },
   )
diff --git a/src/screens/GenerateReports/GenerateReport.res b/src/screens/GenerateReports/GenerateReport.res
index 79d572030..ff4d472dc 100644
--- a/src/screens/GenerateReports/GenerateReport.res
+++ b/src/screens/GenerateReports/GenerateReport.res
@@ -2,11 +2,11 @@
 let make = (~entityName) => {
   let mixpanelEvent = MixpanelHook.useSendEvent()
   let (reportModal, setReportModal) = React.useState(_ => false)
-  let userPermissionJson = Recoil.useRecoilValueFromAtom(HyperswitchAtom.userPermissionAtom)
+  let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
 
-  let accessForGenerateReports = PermissionUtils.hasAnyPermission(
-    userPermissionJson.operationsView,
-    userPermissionJson.analyticsView,
+  let accessForGenerateReports = GroupACLMapper.hasAnyGroupAccess(
+    userHasAccess(~groupAccess=OperationsView),
+    userHasAccess(~groupAccess=AnalyticsView),
   )
 
   <>
@@ -18,7 +18,7 @@ let make = (~entityName) => {
         setReportModal(_ => true)
         mixpanelEvent(~eventName="generate_reports")
       }}
-      access={accessForGenerateReports}
+      authorization={accessForGenerateReports}
       toolTipPosition={Left}
     />
     <RenderIf condition={reportModal}>
diff --git a/src/screens/Hooks/ClearRecoilValueHook.res b/src/screens/Hooks/ClearRecoilValueHook.res
index 813a7e47b..8ab81df9f 100644
--- a/src/screens/Hooks/ClearRecoilValueHook.res
+++ b/src/screens/Hooks/ClearRecoilValueHook.res
@@ -7,6 +7,7 @@ let useClearRecoilValue = () => {
   let setEnumVariantAtom = enumVariantAtom->Recoil.useSetRecoilState
   let setPaypalAccountStatusAtom = paypalAccountStatusAtom->Recoil.useSetRecoilState
   let setUserPermissionAtom = userPermissionAtom->Recoil.useSetRecoilState
+  let setUserGroupACLAtom = userGroupACLAtom->Recoil.useSetRecoilState
   let setSwitchMerchantListAtom = switchMerchantListAtom->Recoil.useSetRecoilState
   let setCurrentTabNameRecoilAtom = currentTabNameRecoilAtom->Recoil.useSetRecoilState
   let setOrgListRecoilAtom = orgListAtom->Recoil.useSetRecoilState
@@ -22,7 +23,8 @@ let useClearRecoilValue = () => {
     )
     setEnumVariantAtom(_ => "")
     setPaypalAccountStatusAtom(_ => PayPalFlowTypes.Connect_paypal_landing)
-    setUserPermissionAtom(_ => PermissionUtils.defaultValueForPermission)
+    setUserPermissionAtom(_ => GroupACLMapper.defaultValueForGroupAccessJson)
+    setUserGroupACLAtom(_ => None)
     setSwitchMerchantListAtom(_ => [SwitchMerchantUtils.defaultValue])
     setCurrentTabNameRecoilAtom(_ => "ActiveTab")
     setOrgListRecoilAtom(_ => OMPSwitchUtils.ompDefaultValue("", ""))
diff --git a/src/screens/Hooks/GroupACLHooks.res b/src/screens/Hooks/GroupACLHooks.res
new file mode 100644
index 000000000..02d4e7751
--- /dev/null
+++ b/src/screens/Hooks/GroupACLHooks.res
@@ -0,0 +1,72 @@
+/**
+ * @module GroupACLHook
+ *
+ * @description This exposes a hook to call the list of user group access
+ *               and to check if the user has access to that group
+ *
+ *  @functions
+ *  - fetchUserGroupACL : fetches the list of user group level access
+ *  - userHasAccess: checks if the user has access to that group or not
+ *         @params
+ *         - groupAccess : group to check if the user has access or not
+ *
+ *
+ */
+type userGroupACLType = {
+  fetchUserGroupACL: unit => promise<UserManagementTypes.groupAccessJsonType>,
+  userHasAccess: (
+    ~groupAccess: UserManagementTypes.groupAccessType,
+  ) => CommonAuthTypes.authorization,
+}
+
+let useUserGroupACLHook = () => {
+  open APIUtils
+  open LogicUtils
+  open GroupACLMapper
+  open HyperswitchAtom
+  let getURL = useGetURL()
+  let fetchDetails = useGetMethod()
+  let (userGroupACL, setuserGroupACL) = Recoil.useRecoilState(userGroupACLAtom)
+  let setuserPermissionJson = Recoil.useSetRecoilState(userPermissionAtom)
+
+  let fetchUserGroupACL = async () => {
+    try {
+      let url = getURL(
+        ~entityName=USERS,
+        ~userType=#GET_GROUP_ACL,
+        ~methodType=Get,
+        ~queryParamerters=Some(`groups=true`),
+      )
+      let response = await fetchDetails(url)
+      let groupsAccessValue =
+        response->getArrayFromJson([])->Array.map(ele => ele->JSON.Decode.string->Option.getOr(""))
+      setuserGroupACL(_ => Some(
+        groupsAccessValue
+        ->Array.map(ele => ele->mapStringToGroupAccessType)
+        ->convertValueToMap,
+      ))
+      let permissionJson =
+        groupsAccessValue->Array.map(ele => ele->mapStringToGroupAccessType)->getGroupAccessJson
+      setuserPermissionJson(_ => permissionJson)
+      permissionJson
+    } catch {
+    | Exn.Error(e) => {
+        let err = Exn.message(e)->Option.getOr("Failed to Fetch!")
+        Exn.raiseError(err)
+      }
+    }
+  }
+
+  let userHasAccess = (~groupAccess) => {
+    switch userGroupACL {
+    | Some(groupACLValue) =>
+      switch groupACLValue->Map.get(groupAccess) {
+      | Some(value) => value
+      | None => NoAccess
+      }
+    | None => NoAccess
+    }
+  }
+
+  {fetchUserGroupACL, userHasAccess}
+}
diff --git a/src/screens/OMPSwitch/OMPSwitchHelper.res b/src/screens/OMPSwitch/OMPSwitchHelper.res
index 39a2b8788..087bdfbf6 100644
--- a/src/screens/OMPSwitch/OMPSwitchHelper.res
+++ b/src/screens/OMPSwitch/OMPSwitchHelper.res
@@ -32,10 +32,12 @@ module AddNewMerchantProfileButton = {
     ~customHRTagStyle="",
     ~addItemBtnStyle="",
   ) => {
-    let userPermissionJson = Recoil.useRecoilValueFromAtom(HyperswitchAtom.userPermissionAtom)
-    let cursorStyles = PermissionUtils.cursorStyles(userPermissionJson.merchantDetailsManage)
+    let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
+    let cursorStyles = GroupAccessUtils.cursorStyles(
+      userHasAccess(~groupAccess=MerchantDetailsManage),
+    )
     <ACLDiv
-      permission={userPermissionJson.merchantDetailsManage}
+      authorization={userHasAccess(~groupAccess=MerchantDetailsManage)}
       onClick={_ => setShowModal(_ => true)}
       isRelative=false
       contentAlign=Default
diff --git a/src/screens/Order/OrderUIUtils.res b/src/screens/Order/OrderUIUtils.res
index 132b60863..545978168 100644
--- a/src/screens/Order/OrderUIUtils.res
+++ b/src/screens/Order/OrderUIUtils.res
@@ -56,7 +56,7 @@ module GenerateSampleDataButton = {
     let showToast = ToastState.useShowToast()
     let showPopUp = PopUpState.useShowPopUp()
     let {sampleData} = HyperswitchAtom.featureFlagAtom->Recoil.useRecoilValueFromAtom
-    let userPermissionJson = Recoil.useRecoilValueFromAtom(HyperswitchAtom.userPermissionAtom)
+    let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
 
     let generateSampleData = async () => {
       mixpanelEvent(~eventName="generate_sample_data")
@@ -116,7 +116,7 @@ module GenerateSampleDataButton = {
     <RenderIf condition={sampleData && !previewOnly}>
       <div className="flex items-start">
         <ACLButton
-          access={userPermissionJson.operationsManage}
+          authorization={userHasAccess(~groupAccess=OperationsManage)}
           buttonType={Secondary}
           buttonSize={XSmall}
           text="Generate Sample Data"
@@ -126,7 +126,7 @@ module GenerateSampleDataButton = {
         />
         <ACLDiv
           height="h-fit"
-          permission={userPermissionJson.operationsManage}
+          authorization={userHasAccess(~groupAccess=OperationsManage)}
           className="bg-jp-gray-button_gray text-jp-gray-900 text-opacity-75 hover:bg-jp-gray-secondary_hover hover:text-jp-gray-890  focus:outline-none items-center border border-border_gray cursor-pointer p-2.5 overflow-hidden text-jp-gray-950 hover:text-black
           border flex items-center justify-center rounded-r-md"
           onClick={ev => rightIconClick(ev)}>
diff --git a/src/screens/Order/ShowOrder.res b/src/screens/Order/ShowOrder.res
index 45b6a53f0..bc7846f81 100644
--- a/src/screens/Order/ShowOrder.res
+++ b/src/screens/Order/ShowOrder.res
@@ -24,7 +24,7 @@ module ShowOrderDetails = {
     ~border="border border-jp-gray-940 border-opacity-75 dark:border-jp-gray-960",
     ~sectionTitle=?,
   ) => {
-    let userPermissionJson = Recoil.useRecoilValueFromAtom(HyperswitchAtom.userPermissionAtom)
+    let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
     let typedPaymentStatus = paymentStatus->statusVariantMapper
     let statusUI = useGetStatus(data)
     <Section customCssClass={`${border} ${bgColor} rounded-md px-5 pt-5 h-full`}>
@@ -50,7 +50,7 @@ module ShowOrderDetails = {
           </div>
           {statusUI}
           <ACLButton
-            access={userPermissionJson.operationsManage}
+            authorization={userHasAccess(~groupAccess=OperationsManage)}
             text="+ Refund"
             onClick={_ => {
               openRefundModal()
@@ -591,7 +591,7 @@ let make = (~id, ~profileId) => {
   open OrderUIUtils
   let url = RescriptReactRouter.useUrl()
   let getURL = useGetURL()
-  let userPermissionJson = Recoil.useRecoilValueFromAtom(HyperswitchAtom.userPermissionAtom)
+  let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
   let featureFlagDetails = HyperswitchAtom.featureFlagAtom->Recoil.useRecoilValueFromAtom
   let showToast = ToastState.useShowToast()
   let (screenState, setScreenState) = React.useState(_ => PageLoaderWrapper.Loading)
@@ -678,7 +678,7 @@ let make = (~id, ~profileId) => {
         </div>
         <RenderIf condition={showSyncButton()}>
           <ACLButton
-            access={userPermissionJson.operationsView}
+            authorization={userHasAccess(~groupAccess=OperationsView)}
             text="Sync"
             leftIcon={Button.CustomIcon(
               <Icon
@@ -710,7 +710,8 @@ let make = (~id, ~profileId) => {
           isNonRefundConnector={isNonRefundConnector(orderData.connector)}
         />
         <RenderIf
-          condition={featureFlagDetails.auditTrail && userPermissionJson.analyticsView == Access}>
+          condition={featureFlagDetails.auditTrail &&
+          userHasAccess(~groupAccess=AnalyticsView) === Access}>
           <RenderAccordian
             initialExpandedArray=[0]
             accordion={[
diff --git a/src/screens/PMAuthenticationProcessor/PMAuthenticationConnectorList.res b/src/screens/PMAuthenticationProcessor/PMAuthenticationConnectorList.res
index 93997f981..79dfc480e 100644
--- a/src/screens/PMAuthenticationProcessor/PMAuthenticationConnectorList.res
+++ b/src/screens/PMAuthenticationProcessor/PMAuthenticationConnectorList.res
@@ -4,7 +4,7 @@ let make = () => {
   let (screenState, setScreenState) = React.useState(_ => PageLoaderWrapper.Success)
   let (configuredConnectors, setConfiguredConnectors) = React.useState(_ => [])
   let (offset, setOffset) = React.useState(_ => 0)
-  let userPermissionJson = Recoil.useRecoilValueFromAtom(HyperswitchAtom.userPermissionAtom)
+  let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
 
   let getConnectorList = async _ => {
     try {
@@ -51,7 +51,7 @@ let make = () => {
             resultsPerPage=20
             entity={PMAuthenticationTableEntity.pmAuthenticationEntity(
               `pm-authentication-processor`,
-              ~permission=userPermissionJson.connectorsManage,
+              ~authorization=userHasAccess(~groupAccess=ConnectorsManage),
             )}
             offset
             setOffset
diff --git a/src/screens/PMAuthenticationProcessor/PMAuthenticationTableEntity.res b/src/screens/PMAuthenticationProcessor/PMAuthenticationTableEntity.res
index 6a2c00801..0f443e684 100644
--- a/src/screens/PMAuthenticationProcessor/PMAuthenticationTableEntity.res
+++ b/src/screens/PMAuthenticationProcessor/PMAuthenticationTableEntity.res
@@ -86,7 +86,7 @@ let getPreviouslyConnectedList: JSON.t => array<connectorPayload> = json => {
   LogicUtils.getArrayDataFromJson(json, ConnectorListMapper.getProcessorPayloadType)
 }
 
-let pmAuthenticationEntity = (path: string, ~permission: CommonAuthTypes.authorization) => {
+let pmAuthenticationEntity = (path: string, ~authorization: CommonAuthTypes.authorization) => {
   EntityType.makeEntity(
     ~uri=``,
     ~getObjects=getPreviouslyConnectedList,
@@ -96,11 +96,11 @@ let pmAuthenticationEntity = (path: string, ~permission: CommonAuthTypes.authori
     ~dataKey="",
     ~getShowLink={
       connec =>
-        PermissionUtils.linkForGetShowLinkViaAccess(
+        GroupAccessUtils.linkForGetShowLinkViaAccess(
           ~url=GlobalVars.appendDashboardPath(
             ~url=`/${path}/${connec.merchant_connector_id}?name=${connec.connector_name}`,
           ),
-          ~permission,
+          ~authorization,
         )
     },
   )
diff --git a/src/screens/PayoutRouting/PayoutHistoryTable.res b/src/screens/PayoutRouting/PayoutHistoryTable.res
index bfe9a25b5..83151c272 100644
--- a/src/screens/PayoutRouting/PayoutHistoryTable.res
+++ b/src/screens/PayoutRouting/PayoutHistoryTable.res
@@ -2,14 +2,17 @@ open PayoutHistoryTableEntity
 
 @react.component
 let make = (~records, ~activeRoutingIds: array<string>) => {
-  let userPermissionJson = Recoil.useRecoilValueFromAtom(HyperswitchAtom.userPermissionAtom)
+  let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
   let (offset, setOffset) = React.useState(_ => 0)
 
   <LoadedTable
     title="History"
     hideTitle=true
     actualData=records
-    entity={payoutHistoryEntity(activeRoutingIds, ~permission=userPermissionJson.workflowsManage)}
+    entity={payoutHistoryEntity(
+      activeRoutingIds,
+      ~authorization=userHasAccess(~groupAccess=WorkflowsManage),
+    )}
     resultsPerPage=10
     showSerialNumber=true
     totalResults={records->Array.length}
diff --git a/src/screens/PayoutRouting/PayoutHistoryTableEntity.res b/src/screens/PayoutRouting/PayoutHistoryTableEntity.res
index ba9a2f218..4aef75bf6 100644
--- a/src/screens/PayoutRouting/PayoutHistoryTableEntity.res
+++ b/src/screens/PayoutRouting/PayoutHistoryTableEntity.res
@@ -82,7 +82,7 @@ let getHistoryRules: JSON.t => array<historyData> = json => {
 
 let payoutHistoryEntity = (
   activeRoutingIds: array<string>,
-  ~permission: CommonAuthTypes.authorization,
+  ~authorization: CommonAuthTypes.authorization,
 ) => {
   EntityType.makeEntity(
     ~uri=``,
@@ -94,7 +94,7 @@ let payoutHistoryEntity = (
     ~dataKey="records",
     ~getShowLink={
       value => {
-        PermissionUtils.linkForGetShowLinkViaAccess(
+        GroupAccessUtils.linkForGetShowLinkViaAccess(
           ~url=GlobalVars.appendDashboardPath(
             ~url=`/payoutrouting/${value.kind
               ->routingTypeMapper
@@ -102,7 +102,7 @@ let payoutHistoryEntity = (
                 ? "&isActive=true"
                 : ""}`,
           ),
-          ~permission,
+          ~authorization,
         )
       }
     },
diff --git a/src/screens/Processors/ProcessorCards.res b/src/screens/Processors/ProcessorCards.res
index a5aaa6fde..de9e88a1e 100644
--- a/src/screens/Processors/ProcessorCards.res
+++ b/src/screens/Processors/ProcessorCards.res
@@ -23,11 +23,11 @@ module RequestConnector = {
 module CantFindProcessor = {
   @react.component
   let make = (~showRequestConnectorBtn, ~setShowModal) => {
-    let userPermissionJson = Recoil.useRecoilValueFromAtom(HyperswitchAtom.userPermissionAtom)
+    let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
 
     <RenderIf condition={showRequestConnectorBtn}>
       <ACLButton
-        access={userPermissionJson.merchantDetailsManage}
+        authorization={userHasAccess(~groupAccess=MerchantDetailsManage)}
         text="Request a Processor"
         buttonType={Transparent}
         buttonSize={Small}
@@ -57,7 +57,7 @@ let make = (
 ) => {
   open ConnectorUtils
   let mixpanelEvent = MixpanelHook.useSendEvent()
-  let userPermissionJson = Recoil.useRecoilValueFromAtom(HyperswitchAtom.userPermissionAtom)
+  let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
   let featureFlagDetails = HyperswitchAtom.featureFlagAtom->Recoil.useRecoilValueFromAtom
 
   let unConfiguredConnectors =
@@ -121,7 +121,7 @@ let make = (
           showDummyConnectorButton &&
           urlPrefix == "connectors/new"}>
           <ACLButton
-            access={userPermissionJson.connectorsManage}
+            authorization={userHasAccess(~groupAccess=ConnectorsManage)}
             leftIcon={CustomIcon(
               <Icon
                 name="plus"
@@ -150,7 +150,7 @@ let make = (
             let size = "w-14 h-14 rounded-sm"
 
             <ACLDiv
-              permission={userPermissionJson.connectorsManage}
+              authorization={userHasAccess(~groupAccess=ConnectorsManage)}
               onClick={_ => ()}
               key={i->string_of_int}
               className="border p-6 gap-4 bg-white rounded flex flex-col justify-between"
@@ -165,7 +165,7 @@ let make = (
                 {connectorInfo.description->React.string}
               </p>
               <ACLButton
-                access={userPermissionJson.connectorsManage}
+                authorization={userHasAccess(~groupAccess=ConnectorsManage)}
                 text="Connect"
                 onClick={_ => handleClick(connectorName)}
                 buttonType={Transparent}
diff --git a/src/screens/Refunds/ShowRefund.res b/src/screens/Refunds/ShowRefund.res
index da592fe1d..15649c6df 100644
--- a/src/screens/Refunds/ShowRefund.res
+++ b/src/screens/Refunds/ShowRefund.res
@@ -77,7 +77,7 @@ let make = (~id, ~profileId) => {
   open HSwitchOrderUtils
   let url = RescriptReactRouter.useUrl()
   let getURL = APIUtils.useGetURL()
-  let userPermissionJson = Recoil.useRecoilValueFromAtom(HyperswitchAtom.userPermissionAtom)
+  let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
   let featureFlagDetails = HyperswitchAtom.featureFlagAtom->Recoil.useRecoilValueFromAtom
   let (screenStateForRefund, setScreenStateForRefund) = React.useState(_ =>
     PageLoaderWrapper.Loading
@@ -158,7 +158,7 @@ let make = (~id, ~profileId) => {
         </div>
         <RenderIf condition={showSyncButton()}>
           <ACLButton
-            access={userPermissionJson.operationsView}
+            authorization={userHasAccess(~groupAccess=OperationsView)}
             text="Sync"
             leftIcon={Button.CustomIcon(
               <Icon
@@ -182,7 +182,8 @@ let make = (~id, ~profileId) => {
       <RefundInfo orderDict={refundData->LogicUtils.getDictFromJsonObject} />
       <div className="mt-5" />
       <RenderIf
-        condition={featureFlagDetails.auditTrail && userPermissionJson.analyticsView == Access}>
+        condition={featureFlagDetails.auditTrail &&
+        userHasAccess(~groupAccess=AnalyticsView) === Access}>
         <OrderUIUtils.RenderAccordian
           initialExpandedArray=[0]
           accordion={[
@@ -198,7 +199,7 @@ let make = (~id, ~profileId) => {
           ]}
         />
       </RenderIf>
-      <RenderIf condition={userPermissionJson.operationsView !== NoAccess}>
+      <RenderIf condition={userHasAccess(~groupAccess=OperationsView) === Access}>
         <LoadedTable
           title="Payment"
           actualData=orderData
diff --git a/src/screens/Routing/ActiveRouting.res b/src/screens/Routing/ActiveRouting.res
index 375176ce6..d8d6eaf55 100644
--- a/src/screens/Routing/ActiveRouting.res
+++ b/src/screens/Routing/ActiveRouting.res
@@ -29,7 +29,7 @@ module ActionButtons = {
       ThemeProvider.themeContext,
     )
     let mixpanelEvent = MixpanelHook.useSendEvent()
-    let userPermissionJson = Recoil.useRecoilValueFromAtom(HyperswitchAtom.userPermissionAtom)
+    let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
 
     switch routeType {
     | PRIORITY
@@ -37,7 +37,7 @@ module ActionButtons = {
     | ADVANCED =>
       <ACLButton
         text={"Setup"}
-        access={userPermissionJson.workflowsManage}
+        authorization={userHasAccess(~groupAccess=WorkflowsManage)}
         buttonType=Secondary
         buttonSize={Small}
         customButtonStyle={` !${borderColor.primaryNormal} bg-white ${textColor.primaryNormal}`}
@@ -53,7 +53,7 @@ module ActionButtons = {
     | DEFAULTFALLBACK =>
       <ACLButton
         text={"Manage"}
-        access={userPermissionJson.workflowsManage}
+        authorization={userHasAccess(~groupAccess=WorkflowsManage)}
         buttonType=Secondary
         customButtonStyle={`!${borderColor.primaryNormal} bg-white ${textColor.primaryNormal}`}
         buttonSize={Small}
@@ -78,7 +78,7 @@ module ActiveSection = {
     open LogicUtils
     let activeRoutingType =
       activeRouting->getDictFromJsonObject->getString("kind", "")->routingTypeMapper
-    let userPermissionJson = Recoil.useRecoilValueFromAtom(HyperswitchAtom.userPermissionAtom)
+    let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
 
     let routingName = switch activeRoutingType {
     | DEFAULTFALLBACK => ""
@@ -119,7 +119,7 @@ module ActiveSection = {
         </div>
         <div className="flex gap-5 pt-6 w-1/4">
           <ACLButton
-            access={userPermissionJson.workflowsManage}
+            authorization={userHasAccess(~groupAccess=WorkflowsManage)}
             text="Manage"
             buttonType=Secondary
             customButtonStyle="w-2/3"
diff --git a/src/screens/Routing/History.res b/src/screens/Routing/History.res
index 441ebf146..73e68d8cb 100644
--- a/src/screens/Routing/History.res
+++ b/src/screens/Routing/History.res
@@ -2,14 +2,17 @@ open HistoryEntity
 module HistoryTable = {
   @react.component
   let make = (~records, ~activeRoutingIds: array<string>) => {
-    let userPermissionJson = Recoil.useRecoilValueFromAtom(HyperswitchAtom.userPermissionAtom)
+    let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
     let (offset, setOffset) = React.useState(_ => 0)
 
     <LoadedTable
       title="History"
       hideTitle=true
       actualData=records
-      entity={historyEntity(activeRoutingIds, ~permission=userPermissionJson.workflowsManage)}
+      entity={historyEntity(
+        activeRoutingIds,
+        ~authorization=userHasAccess(~groupAccess=WorkflowsManage),
+      )}
       resultsPerPage=10
       showSerialNumber=true
       totalResults={records->Array.length}
diff --git a/src/screens/Routing/HistoryEntity.res b/src/screens/Routing/HistoryEntity.res
index 93b693a4a..9c727bb42 100644
--- a/src/screens/Routing/HistoryEntity.res
+++ b/src/screens/Routing/HistoryEntity.res
@@ -82,7 +82,7 @@ let getHistoryRules: JSON.t => array<historyData> = json => {
 
 let historyEntity = (
   activeRoutingIds: array<string>,
-  ~permission: CommonAuthTypes.authorization,
+  ~authorization: CommonAuthTypes.authorization,
 ) => {
   EntityType.makeEntity(
     ~uri=``,
@@ -94,7 +94,7 @@ let historyEntity = (
     ~dataKey="records",
     ~getShowLink={
       value => {
-        PermissionUtils.linkForGetShowLinkViaAccess(
+        GroupAccessUtils.linkForGetShowLinkViaAccess(
           ~url=GlobalVars.appendDashboardPath(
             ~url=`/routing/${value.kind
               ->routingTypeMapper
@@ -102,7 +102,7 @@ let historyEntity = (
                 ? "&isActive=true"
                 : ""}`,
           ),
-          ~permission,
+          ~authorization,
         )
       }
     },
diff --git a/src/screens/Settings/BusinessDetails.res b/src/screens/Settings/BusinessDetails.res
index cfb1f6bee..927e2e3b2 100644
--- a/src/screens/Settings/BusinessDetails.res
+++ b/src/screens/Settings/BusinessDetails.res
@@ -61,7 +61,7 @@ let make = () => {
   let fetchDetails = useGetMethod()
   let updateDetails = useUpdateMethod()
   let showToast = ToastState.useShowToast()
-  let userPermissionJson = Recoil.useRecoilValueFromAtom(HyperswitchAtom.userPermissionAtom)
+  let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
   let featureFlagDetails = HyperswitchAtom.featureFlagAtom->Recoil.useRecoilValueFromAtom
   let (uid, setUid) = React.useState(() => None)
   let (merchantInfo, setMerchantInfo) = React.useState(() => Dict.make())
@@ -153,7 +153,7 @@ let make = () => {
           {switch formState {
           | Preview =>
             <ACLButton
-              access={userPermissionJson.merchantDetailsManage}
+              authorization={userHasAccess(~groupAccess=MerchantDetailsManage)}
               text="Edit"
               onClick={_ => setFormState(_ => Edit)}
               buttonType=Primary
diff --git a/src/screens/Settings/BusinessMapping/BusinessProfile.res b/src/screens/Settings/BusinessMapping/BusinessProfile.res
index b7945a7db..9477ee320 100644
--- a/src/screens/Settings/BusinessMapping/BusinessProfile.res
+++ b/src/screens/Settings/BusinessMapping/BusinessProfile.res
@@ -26,7 +26,7 @@ module AddEntryBtn = {
       [
         ("profile_name", `default${list->Array.length->Int.toString}`->JSON.Encode.string),
       ]->Dict.fromArray
-    let userPermissionJson = Recoil.useRecoilValueFromAtom(HyperswitchAtom.userPermissionAtom)
+    let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
     let modalBody =
       <div>
         {switch modalState {
@@ -95,7 +95,7 @@ module AddEntryBtn = {
       <RenderIf condition=isFromSettings>
         <ACLButton
           text="Add"
-          access={userPermissionJson.merchantDetailsManage}
+          authorization={userHasAccess(~groupAccess=MerchantDetailsManage)}
           buttonSize=Small
           buttonType={Primary}
           onClick={_ => {
diff --git a/src/screens/Settings/HSwitchSettings.res b/src/screens/Settings/HSwitchSettings.res
index 438c29e51..a6d67406d 100644
--- a/src/screens/Settings/HSwitchSettings.res
+++ b/src/screens/Settings/HSwitchSettings.res
@@ -26,7 +26,7 @@ module TileComponent = {
     let showPopUp = PopUpState.useShowPopUp()
     let showToast = ToastState.useShowToast()
     let updateDetails = useUpdateMethod()
-    let userPermissionJson = Recoil.useRecoilValueFromAtom(HyperswitchAtom.userPermissionAtom)
+    let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
 
     let deleteSampleData = async () => {
       try {
@@ -79,7 +79,7 @@ module TileComponent = {
       }
     }
     let accessBasedOnCardName = switch cardName {
-    | #DELETE_SAMPLE_DATA => userPermissionJson.operationsManage
+    | #DELETE_SAMPLE_DATA => userHasAccess(~groupAccess=OperationsManage)
     | _ => Access
     }
 
@@ -95,7 +95,7 @@ module TileComponent = {
         </p>
       </div>
       <ACLButton
-        access=accessBasedOnCardName
+        authorization=accessBasedOnCardName
         text=buttonText
         buttonType=Secondary
         customButtonStyle="w-2/3"
diff --git a/src/screens/Surcharge/Surcharge.res b/src/screens/Surcharge/Surcharge.res
index f99480dcc..3b2b064d3 100644
--- a/src/screens/Surcharge/Surcharge.res
+++ b/src/screens/Surcharge/Surcharge.res
@@ -106,7 +106,7 @@ let make = () => {
   let (pageView, setPageView) = React.useState(_ => LANDING)
   let showPopUp = PopUpState.useShowPopUp()
   let (showWarning, setShowWarning) = React.useState(_ => true)
-  let userPermissionJson = Recoil.useRecoilValueFromAtom(HyperswitchAtom.userPermissionAtom)
+  let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
   let mixpanelEvent = MixpanelHook.useSendEvent()
 
   let getWasm = async () => {
@@ -285,7 +285,7 @@ let make = () => {
             </p>
             <ACLButton
               text="Create New"
-              access=userPermissionJson.workflowsManage
+              authorization={userHasAccess(~groupAccess=WorkflowsManage)}
               buttonType=Primary
               customButtonStyle="!w-1/6 "
               onClick={_ => handleCreateNew()}
diff --git a/src/screens/TaxProcessor/TaxProcessorList.res b/src/screens/TaxProcessor/TaxProcessorList.res
index 907308842..9e6f93268 100644
--- a/src/screens/TaxProcessor/TaxProcessorList.res
+++ b/src/screens/TaxProcessor/TaxProcessorList.res
@@ -4,7 +4,7 @@ let make = () => {
   let (screenState, setScreenState) = React.useState(_ => PageLoaderWrapper.Success)
   let (configuredConnectors, setConfiguredConnectors) = React.useState(_ => [])
   let (offset, setOffset) = React.useState(_ => 0)
-  let userPermissionJson = Recoil.useRecoilValueFromAtom(HyperswitchAtom.userPermissionAtom)
+  let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
 
   let getConnectorList = async _ => {
     try {
@@ -50,7 +50,7 @@ let make = () => {
             resultsPerPage=20
             entity={TaxProcessorTableEntity.taxProcessorEntity(
               `tax-processor`,
-              ~permission=userPermissionJson.connectorsManage,
+              ~authorization=userHasAccess(~groupAccess=ConnectorsManage),
             )}
             offset
             setOffset
diff --git a/src/screens/TaxProcessor/TaxProcessorTableEntity.res b/src/screens/TaxProcessor/TaxProcessorTableEntity.res
index f2fb86883..d97a3c2e7 100644
--- a/src/screens/TaxProcessor/TaxProcessorTableEntity.res
+++ b/src/screens/TaxProcessor/TaxProcessorTableEntity.res
@@ -86,7 +86,7 @@ let getPreviouslyConnectedList: JSON.t => array<connectorPayload> = json => {
   LogicUtils.getArrayDataFromJson(json, ConnectorListMapper.getProcessorPayloadType)
 }
 
-let taxProcessorEntity = (path: string, ~permission: CommonAuthTypes.authorization) => {
+let taxProcessorEntity = (path: string, ~authorization: CommonAuthTypes.authorization) => {
   EntityType.makeEntity(
     ~uri=``,
     ~getObjects=getPreviouslyConnectedList,
@@ -96,11 +96,11 @@ let taxProcessorEntity = (path: string, ~permission: CommonAuthTypes.authorizati
     ~dataKey="",
     ~getShowLink={
       connec =>
-        PermissionUtils.linkForGetShowLinkViaAccess(
+        GroupAccessUtils.linkForGetShowLinkViaAccess(
           ~url=GlobalVars.appendDashboardPath(
             ~url=`/${path}/${connec.merchant_connector_id}?name=${connec.connector_name}`,
           ),
-          ~permission,
+          ~authorization,
         )
     },
   )
diff --git a/src/screens/ThreeDSFlow/HSwitchThreeDS.res b/src/screens/ThreeDSFlow/HSwitchThreeDS.res
index dc8fb1c5f..85368ee42 100644
--- a/src/screens/ThreeDSFlow/HSwitchThreeDS.res
+++ b/src/screens/ThreeDSFlow/HSwitchThreeDS.res
@@ -148,7 +148,7 @@ let make = () => {
   let (pageView, setPageView) = React.useState(_ => NEW)
   let showPopUp = PopUpState.useShowPopUp()
   let (showWarning, setShowWarning) = React.useState(_ => true)
-  let userPermissionJson = Recoil.useRecoilValueFromAtom(HyperswitchAtom.userPermissionAtom)
+  let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
 
   let getWasm = async () => {
     try {
@@ -364,7 +364,7 @@ let make = () => {
             </p>
             <ACLButton
               text="Create New"
-              access=userPermissionJson.workflowsManage
+              authorization={userHasAccess(~groupAccess=WorkflowsManage)}
               buttonType=Primary
               customButtonStyle="!w-1/6"
               onClick={_ => handleCreateNew()}
diff --git a/src/screens/ThreeDsProcessors/ThreeDsConnectorList.res b/src/screens/ThreeDsProcessors/ThreeDsConnectorList.res
index 20bfa0c81..2f379f81d 100644
--- a/src/screens/ThreeDsProcessors/ThreeDsConnectorList.res
+++ b/src/screens/ThreeDsProcessors/ThreeDsConnectorList.res
@@ -5,7 +5,7 @@ let make = () => {
   let (screenState, setScreenState) = React.useState(_ => PageLoaderWrapper.Success)
   let (configuredConnectors, setConfiguredConnectors) = React.useState(_ => [])
   let (offset, setOffset) = React.useState(_ => 0)
-  let userPermissionJson = Recoil.useRecoilValueFromAtom(HyperswitchAtom.userPermissionAtom)
+  let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
 
   let getConnectorList = async _ => {
     try {
@@ -54,7 +54,7 @@ let make = () => {
             resultsPerPage=20
             entity={ThreeDsTableEntity.threeDsAuthenticatorEntity(
               `3ds-authenticators`,
-              ~permission=userPermissionJson.connectorsManage,
+              ~authorization=userHasAccess(~groupAccess=ConnectorsManage),
             )}
             offset
             setOffset
diff --git a/src/screens/ThreeDsProcessors/ThreeDsTableEntity.res b/src/screens/ThreeDsProcessors/ThreeDsTableEntity.res
index 47502293e..77fe50f47 100644
--- a/src/screens/ThreeDsProcessors/ThreeDsTableEntity.res
+++ b/src/screens/ThreeDsProcessors/ThreeDsTableEntity.res
@@ -86,7 +86,7 @@ let getPreviouslyConnectedList: JSON.t => array<connectorPayload> = json => {
   LogicUtils.getArrayDataFromJson(json, ConnectorListMapper.getProcessorPayloadType)
 }
 
-let threeDsAuthenticatorEntity = (path: string, ~permission: CommonAuthTypes.authorization) => {
+let threeDsAuthenticatorEntity = (path: string, ~authorization: CommonAuthTypes.authorization) => {
   EntityType.makeEntity(
     ~uri=``,
     ~getObjects=getPreviouslyConnectedList,
@@ -96,11 +96,11 @@ let threeDsAuthenticatorEntity = (path: string, ~permission: CommonAuthTypes.aut
     ~dataKey="",
     ~getShowLink={
       connec =>
-        PermissionUtils.linkForGetShowLinkViaAccess(
+        GroupAccessUtils.linkForGetShowLinkViaAccess(
           ~url=GlobalVars.appendDashboardPath(
             ~url=`/${path}/${connec.merchant_connector_id}?name=${connec.connector_name}`,
           ),
-          ~permission,
+          ~authorization,
         )
     },
   )
diff --git a/src/screens/UserManagement/UserRevamp/CreateCustomRole.res b/src/screens/UserManagement/UserRevamp/CreateCustomRole.res
index bc7889175..2612658df 100644
--- a/src/screens/UserManagement/UserRevamp/CreateCustomRole.res
+++ b/src/screens/UserManagement/UserRevamp/CreateCustomRole.res
@@ -20,7 +20,7 @@ module RenderCustomRoles = {
     }
 
     <RenderIf
-      condition={groupName->PermissionUtils.mapStringToPermissionType !== OrganizationManage}>
+      condition={groupName->GroupACLMapper.mapStringToGroupAccessType !== OrganizationManage}>
       <div className="flex gap-6 items-start cursor-pointer" onClick={_ => onClickGroup(groupName)}>
         <div className="mt-1">
           <CheckBoxIcon isSelected={checkboxSelected} size={Large} />
@@ -120,7 +120,7 @@ let make = (~isInviteUserFlow=true, ~setNewRoleSelected=_ => (), ~baseUrl, ~brea
       setScreenState(_ => PageLoaderWrapper.Loading)
       let url = getURL(
         ~entityName=USERS,
-        ~userType=#PERMISSION_INFO,
+        ~userType=#GROUP_ACCESS_INFO,
         ~methodType=Get,
         ~queryParamerters=Some(`groups=true`),
       )
diff --git a/src/screens/UserManagement/UserRevamp/GroupAccessUtils.res b/src/screens/UserManagement/UserRevamp/GroupAccessUtils.res
new file mode 100644
index 000000000..c0cfc76e7
--- /dev/null
+++ b/src/screens/UserManagement/UserRevamp/GroupAccessUtils.res
@@ -0,0 +1,8 @@
+open CommonAuthTypes
+
+let linkForGetShowLinkViaAccess = (~authorization, ~url) => {
+  authorization === Access ? url : ``
+}
+
+let cursorStyles = authorization =>
+  authorization === Access ? "cursor-pointer" : "cursor-not-allowed"
diff --git a/src/screens/UserManagement/UserRevamp/ListRoles.res b/src/screens/UserManagement/UserRevamp/ListRoles.res
index 9a97e7ae8..2a9d58b8b 100644
--- a/src/screens/UserManagement/UserRevamp/ListRoles.res
+++ b/src/screens/UserManagement/UserRevamp/ListRoles.res
@@ -9,7 +9,7 @@ let make = (~userModuleEntity: UserManagementTypes.userModuleTypes) => {
   let (rolesOffset, setRolesOffset) = React.useState(_ => 0)
   let {checkUserEntity} = React.useContext(UserInfoProvider.defaultContext)
   let mixpanelEvent = MixpanelHook.useSendEvent()
-  let userPermissionJson = Recoil.useRecoilValueFromAtom(HyperswitchAtom.userPermissionAtom)
+  let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
 
   let getRolesAvailable = async () => {
     setScreenStateRoles(_ => PageLoaderWrapper.Loading)
@@ -40,7 +40,7 @@ let make = (~userModuleEntity: UserManagementTypes.userModuleTypes) => {
     <PageLoaderWrapper screenState={screenStateRoles}>
       <div className="flex flex-1 justify-end">
         <ACLButton
-          access={userPermissionJson.usersManage}
+          authorization={userHasAccess(~groupAccess=UsersManage)}
           text={"Create custom roles"}
           buttonType=Primary
           onClick={_ => {
diff --git a/src/screens/UserManagement/UserRevamp/ListRolesTableEntity.res b/src/screens/UserManagement/UserRevamp/ListRolesTableEntity.res
index efed441cc..0fe1f40bb 100644
--- a/src/screens/UserManagement/UserRevamp/ListRolesTableEntity.res
+++ b/src/screens/UserManagement/UserRevamp/ListRolesTableEntity.res
@@ -11,9 +11,9 @@ type rolesColTypes =
   | RoleName
   | RoleScope
   | EntityType
-  | ModulePermissions
+  | RoleGroupAccess
 
-let defaultColumnsForRoles = [RoleName, EntityType, ModulePermissions]
+let defaultColumnsForRoles = [RoleName, EntityType, RoleGroupAccess]
 
 let itemToObjMapperForRoles = dict => {
   {
@@ -29,7 +29,7 @@ let getHeadingForRoles = (colType: rolesColTypes) => {
   | RoleName => Table.makeHeaderInfo(~key="role_name", ~title="Role name", ~showSort=true)
   | RoleScope => Table.makeHeaderInfo(~key="role_scope", ~title="Role scope")
   | EntityType => Table.makeHeaderInfo(~key="entity_type", ~title="Entity Type")
-  | ModulePermissions => Table.makeHeaderInfo(~key="groups", ~title="Module permissions")
+  | RoleGroupAccess => Table.makeHeaderInfo(~key="groups", ~title="Module permissions")
   }
 }
 
@@ -38,7 +38,7 @@ let getCellForRoles = (data: rolesTableTypes, colType: rolesColTypes): Table.cel
   | RoleName => Text(data.role_name->LogicUtils.snakeToTitle)
   | RoleScope => Text(data.role_scope->LogicUtils.capitalizeString)
   | EntityType => Text(data.entity_name->LogicUtils.capitalizeString)
-  | ModulePermissions =>
+  | RoleGroupAccess =>
     Table.CustomCell(
       <div>
         {data.groups
diff --git a/src/screens/UserManagement/UserRevamp/ListUsers.res b/src/screens/UserManagement/UserRevamp/ListUsers.res
index 2d1cc74a0..651491b7c 100644
--- a/src/screens/UserManagement/UserRevamp/ListUsers.res
+++ b/src/screens/UserManagement/UserRevamp/ListUsers.res
@@ -7,7 +7,7 @@ let make = (~userModuleEntity: UserManagementTypes.userModuleTypes) => {
   let getURL = useGetURL()
   let fetchDetails = useGetMethod()
   let mixpanelEvent = MixpanelHook.useSendEvent()
-  let userPermissionJson = Recoil.useRecoilValueFromAtom(HyperswitchAtom.userPermissionAtom)
+  let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
   let (usersData, setUsersData) = React.useState(_ => [])
   let (usersFilterData, setUsersFilterData) = React.useState(_ => [])
   let (screenStateUsers, setScreenStateUsers) = React.useState(_ => PageLoaderWrapper.Loading)
@@ -59,7 +59,7 @@ let make = (~userModuleEntity: UserManagementTypes.userModuleTypes) => {
     <div className="relative mt-5 w-full flex flex-col gap-12">
       <div className="absolute right-0 z-10">
         <ACLButton
-          access={userPermissionJson.usersManage}
+          authorization={userHasAccess(~groupAccess=UsersManage)}
           text={"Invite users"}
           buttonType=Primary
           onClick={_ => {
diff --git a/src/screens/UserManagement/UserRevamp/NewUserInvitationForm.res b/src/screens/UserManagement/UserRevamp/NewUserInvitationForm.res
index 5144cc046..e25d24c8d 100644
--- a/src/screens/UserManagement/UserRevamp/NewUserInvitationForm.res
+++ b/src/screens/UserManagement/UserRevamp/NewUserInvitationForm.res
@@ -3,7 +3,7 @@ let p2MediumTextClass = HSwitchUtils.getTextClass((P2, Medium))
 let p3MediumTextClass = HSwitchUtils.getTextClass((P3, Medium))
 let p3RegularTextClass = HSwitchUtils.getTextClass((P3, Regular))
 
-module ModulePermissionRender = {
+module ModuleAccessRenderer = {
   @react.component
   let make = (~elem: UserManagementTypes.userModuleType, ~index, ~customCss="") => {
     open UserUtils
@@ -33,7 +33,7 @@ module ModulePermissionRender = {
     </div>
   }
 }
-module RoleToPermission = {
+module RoleAccessOverview = {
   @react.component
   let make = (~roleDict, ~role) => {
     open LogicUtils
@@ -47,12 +47,12 @@ module RoleToPermission = {
     <div className="flex flex-col gap-8">
       {modulesWithAccess
       ->Array.mapWithIndex((elem, index) => {
-        <ModulePermissionRender elem index />
+        <ModuleAccessRenderer elem index />
       })
       ->React.array}
       {moduleWithoutAccess
       ->Array.mapWithIndex((elem, index) => {
-        <ModulePermissionRender elem index customCss="text-grey-200" />
+        <ModuleAccessRenderer elem index customCss="text-grey-200" />
       })
       ->React.array}
     </div>
@@ -200,7 +200,7 @@ let make = () => {
             </p>
             <PageLoaderWrapper screenState>
               <div className="border rounded-md p-4 flex flex-col">
-                <RoleToPermission roleDict role={roleTypeValue->Option.getOr("")} />
+                <RoleAccessOverview roleDict role={roleTypeValue->Option.getOr("")} />
               </div>
             </PageLoaderWrapper>
           </>
diff --git a/src/screens/UserManagement/UserRevamp/PermissionUtils.res b/src/screens/UserManagement/UserRevamp/PermissionUtils.res
deleted file mode 100644
index 1edce8e47..000000000
--- a/src/screens/UserManagement/UserRevamp/PermissionUtils.res
+++ /dev/null
@@ -1,92 +0,0 @@
-open CommonAuthTypes
-open UserManagementTypes
-
-let mapPermissionTypeToString = permissionType => {
-  switch permissionType {
-  | OperationsView => "operations_view"
-  | OperationsManage => "operations_manage"
-  | ConnectorsView => "connectors_view"
-  | ConnectorsManage => "connectors_manage"
-  | WorkflowsView => "workflows_view"
-  | WorkflowsManage => "workflows_manage"
-  | AnalyticsView => "analytics_view"
-  | UsersView => "users_view"
-  | UsersManage => "users_manage"
-  | MerchantDetailsView => "merchant_details_view"
-  | MerchantDetailsManage => "merchant_details_manage"
-  | OrganizationManage => "organization_manage"
-  | UnknownPermission(val) => val
-  }
-}
-
-let mapStringToPermissionType = val => {
-  switch val {
-  | "operations_view" => OperationsView
-  | "operations_manage" => OperationsManage
-  | "connectors_view" => ConnectorsView
-  | "connectors_manage" => ConnectorsManage
-  | "workflows_view" => WorkflowsView
-  | "workflows_manage" => WorkflowsManage
-  | "analytics_view" => AnalyticsView
-  | "users_view" => UsersView
-  | "users_manage" => UsersManage
-  | "merchant_details_view" => MerchantDetailsView
-  | "merchant_details_manage" => MerchantDetailsManage
-  | "organization_manage" => OrganizationManage
-  | val => UnknownPermission(val)
-  }
-}
-
-let getAccessValue = (~permissionValue: permissionType, ~permissionList) => {
-  let isPermissionFound = permissionList->Array.find(ele => {
-    ele == permissionValue
-  })
-
-  isPermissionFound->Option.isSome ? Access : NoAccess
-}
-
-let defaultValueForPermission = {
-  operationsView: NoAccess,
-  operationsManage: NoAccess,
-  connectorsView: NoAccess,
-  connectorsManage: NoAccess,
-  workflowsView: NoAccess,
-  workflowsManage: NoAccess,
-  analyticsView: NoAccess,
-  usersView: NoAccess,
-  usersManage: NoAccess,
-  merchantDetailsView: NoAccess,
-  merchantDetailsManage: NoAccess,
-  organizationManage: NoAccess,
-}
-
-// TODO: Refactor to not call function for every permission
-let getPermissionJson = permissionList => {
-  {
-    operationsView: getAccessValue(~permissionValue=OperationsView, ~permissionList),
-    operationsManage: getAccessValue(~permissionValue=OperationsManage, ~permissionList),
-    connectorsView: getAccessValue(~permissionValue=ConnectorsView, ~permissionList),
-    connectorsManage: getAccessValue(~permissionValue=ConnectorsManage, ~permissionList),
-    workflowsView: getAccessValue(~permissionValue=WorkflowsView, ~permissionList),
-    workflowsManage: getAccessValue(~permissionValue=WorkflowsManage, ~permissionList),
-    analyticsView: getAccessValue(~permissionValue=AnalyticsView, ~permissionList),
-    usersView: getAccessValue(~permissionValue=UsersView, ~permissionList),
-    usersManage: getAccessValue(~permissionValue=UsersManage, ~permissionList),
-    merchantDetailsView: getAccessValue(~permissionValue=MerchantDetailsView, ~permissionList),
-    merchantDetailsManage: getAccessValue(~permissionValue=MerchantDetailsManage, ~permissionList),
-    organizationManage: getAccessValue(~permissionValue=OrganizationManage, ~permissionList),
-  }
-}
-
-let linkForGetShowLinkViaAccess = (~permission, ~url) => {
-  permission === Access ? url : ``
-}
-
-let cursorStyles = permission => permission === Access ? "cursor-pointer" : "cursor-not-allowed"
-
-let hasAnyPermission = (permission1, permission2) => {
-  switch (permission1, permission2) {
-  | (NoAccess, NoAccess) => NoAccess
-  | (_, _) => Access
-  }
-}
diff --git a/src/screens/UserManagement/UserRevamp/UserInfo.res b/src/screens/UserManagement/UserRevamp/UserInfo.res
index 35c1e4798..b48161dac 100644
--- a/src/screens/UserManagement/UserRevamp/UserInfo.res
+++ b/src/screens/UserManagement/UserRevamp/UserInfo.res
@@ -6,7 +6,7 @@ module UserAction = {
     open UserManagementTypes
 
     let url = RescriptReactRouter.useUrl()
-    let userPermissionJson = Recoil.useRecoilValueFromAtom(HyperswitchAtom.userPermissionAtom)
+    let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
     let userEmail =
       url.search
       ->LogicUtils.getDictFromUrlSearchParams
@@ -23,8 +23,8 @@ module UserAction = {
       } else if userEmail === email {
         // User cannot update its own role
         NoActionAccess
-      } else if userPermissionJson.usersManage === NoAccess {
-        // User doesn't have user write permission
+      } else if userHasAccess(~groupAccess=UsersManage) === NoAccess {
+        // User doesn't have user write access
         NoActionAccess
       } else if (
         // Profile level user
diff --git a/src/screens/UserManagement/UserRevamp/UserManagementTypes.res b/src/screens/UserManagement/UserRevamp/UserManagementTypes.res
index d2c42a926..62162f07f 100644
--- a/src/screens/UserManagement/UserRevamp/UserManagementTypes.res
+++ b/src/screens/UserManagement/UserRevamp/UserManagementTypes.res
@@ -2,7 +2,8 @@ type userManagementTypes = UsersTab | RolesTab
 
 type internalUserType = InternalViewOnly | InternalAdmin | NonInternal
 
-type permissionType =
+@unboxed
+type groupAccessType =
   | OperationsView
   | OperationsManage
   | ConnectorsView
@@ -15,10 +16,10 @@ type permissionType =
   | MerchantDetailsView
   | MerchantDetailsManage
   | OrganizationManage
-  | UnknownPermission(string)
+  | UnknownGroupAccess(string)
 
 open CommonAuthTypes
-type permissionJson = {
+type groupAccessJsonType = {
   operationsView: authorization,
   operationsManage: authorization,
   connectorsView: authorization,
@@ -36,7 +37,6 @@ type permissionJson = {
 type getInfoType = {
   module_: string,
   description: string,
-  mutable isPermissionAllowed: bool,
 }
 
 type userModuleType = {
@@ -70,10 +70,10 @@ type parentGroupType =
   | Users
   | Merchant
   | Organization
-  | UnknownPermission(string)
+  | UnknownGroup(string)
 
 @unboxed
-type groupPermissionType = View | Manage
+type groupControlType = View | Manage
 
 type allSelectionType = [#All_Merchants | #All_Profiles]
 
diff --git a/src/screens/UserManagement/UserRevamp/UserManagementUtils.res b/src/screens/UserManagement/UserRevamp/UserManagementUtils.res
index 10f86f359..3727ffb85 100644
--- a/src/screens/UserManagement/UserRevamp/UserManagementUtils.res
+++ b/src/screens/UserManagement/UserRevamp/UserManagementUtils.res
@@ -93,51 +93,6 @@ let validateFormForRoles = values => {
   errors->JSON.Encode.object
 }
 
-let getArrayOfPermissionData = json => {
-  json
-  ->LogicUtils.getDictFromJsonObject
-  ->LogicUtils.getArrayFromDict("groups", [])
-  ->Array.map(i => i->JSON.Decode.string->Option.getOr(""))
-}
-
-let updatePresentInInfoList = (infoData, permissionsData) => {
-  let copyOfInfoData = infoData->Array.copy
-  let copyOfPermissionsData = permissionsData->Array.copy
-
-  copyOfInfoData->Array.map((infoValItem: UserManagementTypes.getInfoType) => {
-    if copyOfPermissionsData->Array.includes(infoValItem.module_) {
-      infoValItem.isPermissionAllowed = true
-    } else {
-      infoValItem.isPermissionAllowed = false
-    }
-    infoValItem
-  })
-}
-
-let defaultPresentInInfoList = infoData => {
-  let copyOfInfoData = infoData->Array.copy
-
-  copyOfInfoData->Array.map((infoValItem: UserManagementTypes.getInfoType) => {
-    infoValItem.isPermissionAllowed = false
-    infoValItem
-  })
-}
-
-module RolePermissionValueRenderer = {
-  @react.component
-  let make = (~heading: string, ~description: string, ~isPermissionAllowed: bool=false) => {
-    <div className="flex justify-between">
-      <div className="flex flex-col gap-3 items-start col-span-1">
-        <div className="font-semibold"> {heading->React.string} </div>
-        <div className="text-base text-hyperswitch_black opacity-50 flex-1">
-          {description->React.string}
-        </div>
-      </div>
-      <Icon size=22 name={isPermissionAllowed ? "permitted" : "not-permitted"} />
-    </div>
-  }
-}
-
 let tabIndeToVariantMapper = index => {
   open UserManagementTypes
   switch index {
diff --git a/src/utils/AccessControl.res b/src/utils/AccessControl.res
index 73a9f8cb6..84db4baae 100644
--- a/src/utils/AccessControl.res
+++ b/src/utils/AccessControl.res
@@ -1,6 +1,6 @@
 open CommonAuthTypes
 @react.component
-let make = (~isEnabled=true, ~permission, ~children) => {
-  let isAccessAllowed = permission === Access
+let make = (~isEnabled=true, ~authorization, ~children) => {
+  let isAccessAllowed = authorization === Access
   isEnabled && isAccessAllowed ? children : <UnauthorizedPage />
 }
diff --git a/src/utils/Mappers/GroupACLMapper.res b/src/utils/Mappers/GroupACLMapper.res
new file mode 100644
index 000000000..4b25f57ea
--- /dev/null
+++ b/src/utils/Mappers/GroupACLMapper.res
@@ -0,0 +1,82 @@
+open CommonAuthTypes
+open UserManagementTypes
+
+let mapGroupAccessTypeToString = groupAccessType =>
+  switch groupAccessType {
+  | OperationsView => "operations_view"
+  | OperationsManage => "operations_manage"
+  | ConnectorsView => "connectors_view"
+  | ConnectorsManage => "connectors_manage"
+  | WorkflowsView => "workflows_view"
+  | WorkflowsManage => "workflows_manage"
+  | AnalyticsView => "analytics_view"
+  | UsersView => "users_view"
+  | UsersManage => "users_manage"
+  | MerchantDetailsView => "merchant_details_view"
+  | MerchantDetailsManage => "merchant_details_manage"
+  | OrganizationManage => "organization_manage"
+  | UnknownGroupAccess(val) => val
+  }
+
+let mapStringToGroupAccessType = val =>
+  switch val {
+  | "operations_view" => OperationsView
+  | "operations_manage" => OperationsManage
+  | "connectors_view" => ConnectorsView
+  | "connectors_manage" => ConnectorsManage
+  | "workflows_view" => WorkflowsView
+  | "workflows_manage" => WorkflowsManage
+  | "analytics_view" => AnalyticsView
+  | "users_view" => UsersView
+  | "users_manage" => UsersManage
+  | "merchant_details_view" => MerchantDetailsView
+  | "merchant_details_manage" => MerchantDetailsManage
+  | "organization_manage" => OrganizationManage
+  | val => UnknownGroupAccess(val)
+  }
+
+let defaultValueForGroupAccessJson = {
+  operationsView: NoAccess,
+  operationsManage: NoAccess,
+  connectorsView: NoAccess,
+  connectorsManage: NoAccess,
+  workflowsView: NoAccess,
+  workflowsManage: NoAccess,
+  analyticsView: NoAccess,
+  usersView: NoAccess,
+  usersManage: NoAccess,
+  merchantDetailsView: NoAccess,
+  merchantDetailsManage: NoAccess,
+  organizationManage: NoAccess,
+}
+
+let hasAnyGroupAccess = (group1, group2) =>
+  switch (group1, group2) {
+  | (NoAccess, NoAccess) => NoAccess
+  | (_, _) => Access
+  }
+
+let getAccessValue = (~groupAccess: groupAccessType, ~groupACL) =>
+  groupACL->Array.find(ele => ele == groupAccess)->Option.isSome ? Access : NoAccess
+
+// TODO: Refactor to not call function for every group
+let getGroupAccessJson = groupACL => {
+  operationsView: getAccessValue(~groupAccess=OperationsView, ~groupACL),
+  operationsManage: getAccessValue(~groupAccess=OperationsManage, ~groupACL),
+  connectorsView: getAccessValue(~groupAccess=ConnectorsView, ~groupACL),
+  connectorsManage: getAccessValue(~groupAccess=ConnectorsManage, ~groupACL),
+  workflowsView: getAccessValue(~groupAccess=WorkflowsView, ~groupACL),
+  workflowsManage: getAccessValue(~groupAccess=WorkflowsManage, ~groupACL),
+  analyticsView: getAccessValue(~groupAccess=AnalyticsView, ~groupACL),
+  usersView: getAccessValue(~groupAccess=UsersView, ~groupACL),
+  usersManage: getAccessValue(~groupAccess=UsersManage, ~groupACL),
+  merchantDetailsView: getAccessValue(~groupAccess=MerchantDetailsView, ~groupACL),
+  merchantDetailsManage: getAccessValue(~groupAccess=MerchantDetailsManage, ~groupACL),
+  organizationManage: getAccessValue(~groupAccess=OrganizationManage, ~groupACL),
+}
+
+let convertValueToMap = arrayValue => {
+  let userGroupACLMap: Map.t<groupAccessType, authorization> = Map.make()
+  arrayValue->Array.forEach(value => userGroupACLMap->Map.set(value, Access))
+  userGroupACLMap
+}

From a13717a04ca4761021c4ddcbba15507233dc7635 Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 10 Oct 2024 00:25:32 +0000
Subject: [PATCH 3/3] chore(version): 2024.10.10.0

---
 CHANGELOG.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 51eb8926a..febc20637 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,16 @@ All notable changes to this project will be documented in this file. See [conven
 
 - - -
 
+## 2024.10.10.0
+
+### Miscellaneous Tasks
+
+- User-permission type change ([#1577](https://github.com/juspay/hyperswitch-control-center/pull/1577)) ([`ebc0a33`](https://github.com/juspay/hyperswitch-control-center/commit/ebc0a33b21dc9ecfb50cc812161f05b1debeead7))
+
+**Full Changelog:** [`2024.10.08.2...2024.10.10.0`](https://github.com/juspay/hyperswitch-control-center/compare/2024.10.08.2...2024.10.10.0)
+
+- - -
+
 ## 2024.10.08.2
 
 ### Features