diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9549ffeb6..5dc051fa9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,18 @@ All notable changes to this project will be documented in this file. See [conven
 
 - - -
 
+## 1.25.1 (2024-01-17)
+
+### Miscellaneous Tasks
+
+- Sidebar refactoring & permissions added ([#264](https://github.com/juspay/hyperswitch-control-center/pull/264)) ([`f428679`](https://github.com/juspay/hyperswitch-control-center/commit/f428679fa9b98e002e8bb1f670af65595ae64845))
+- Access Control Module added ([#266](https://github.com/juspay/hyperswitch-control-center/pull/266)) ([`59d0b53`](https://github.com/juspay/hyperswitch-control-center/commit/59d0b5387476536ed3a7f6a9f3468a3bd115232f))
+
+**Full Changelog:** [`v1.25.0...v1.25.1`](https://github.com/juspay/hyperswitch-control-center/compare/v1.25.0...v1.25.1)
+
+- - -
+
+
 ## 1.25.0 (2024-01-16)
 
 ### Features
diff --git a/src/components/EntityScaffold.res b/src/components/EntityScaffold.res
index bea10957d..68afbe809 100644
--- a/src/components/EntityScaffold.res
+++ b/src/components/EntityScaffold.res
@@ -1,89 +1,32 @@
-module ComingSoon = {
-  @react.component
-  let make = (~title) => {
-    <div className="h-full w-full flex flex-col items-center justify-center">
-      <div className="text-2xl text-gray-500 pb-4"> {React.string(title)} </div>
-      <div> {React.string("Coming soon...")} </div>
-    </div>
-  }
-}
-
-module ShowPage = {
-  @react.component
-  let make = (~entityName, ~id) => {
-    <div className="h-full w-fit flex flex-col m-12">
-      <div className="text-2xl text-gray-500 pb-4">
-        {React.string(`Show ${entityName} `)}
-        <span className="text-sm"> {React.string(`#${id}`)} </span>
-      </div>
-      <div> {React.string("Coming soon...")} </div>
-    </div>
-  }
-}
-
-module UnauthorizedPage = {
-  @react.component
-  let make = (~entityName) => {
-    <div className="h-full w-fit flex flex-col m-12">
-      <div className="text-2xl text-gray-500 pb-4"> {React.string(entityName)} </div>
-      <div> {React.string("You don't have access to this module. Contact admin for access")} </div>
-    </div>
-  }
-}
-
 @react.component
 let make = (
   ~entityName="",
   ~remainingPath,
   ~isAdminAccount=false,
-  ~access: AuthTypes.authorization=ReadWrite,
-  ~renderList=() => <ComingSoon title="List" />,
-  ~renderNewForm=() => <ComingSoon title="New Form" />,
+  ~access: AuthTypes.authorization=Access,
+  ~renderList,
+  ~renderNewForm=?,
   ~renderShow=?,
-  ~renderOrder=?,
-  ~renderEdit=_id => <ComingSoon title="Edit Form" />,
-  ~renderEditWithMultiId=(_id1, _id2) => <ComingSoon title="Edit Form" />,
-  ~renderClone=_id => <ComingSoon title="Clone Form" />,
 ) => {
   if access === NoAccess {
-    <UnauthorizedPage entityName />
+    <UnauthorizedPage />
   } else {
     switch remainingPath {
     | list{"new"} =>
       switch access {
-      | ReadWrite => renderNewForm()
-      | Checker => isAdminAccount ? renderNewForm() : <UnauthorizedPage entityName />
-      | _ => <UnauthorizedPage entityName />
-      }
-    | list{id, "clone"} =>
-      switch access {
-      | ReadWrite => renderClone(id)
-      | _ => <UnauthorizedPage entityName />
+      | Access =>
+        switch renderNewForm {
+        | Some(element) => element()
+        | None => React.null
+        }
+      | NoAccess => <UnauthorizedPage />
       }
     | list{id} =>
       let page = switch renderShow {
       | Some(fn) => fn(id)
-      | None => <ShowPage entityName id />
+      | None => React.null
       }
       page
-    | list{id, "edit"} =>
-      switch access {
-      | ReadWrite => renderEdit(id)
-      | Checker => isAdminAccount ? renderEdit(id) : <UnauthorizedPage entityName />
-      | _ => <UnauthorizedPage entityName />
-      }
-    | list{id1, id2, "edit"} =>
-      switch access {
-      | ReadWrite => renderEditWithMultiId(id1, id2)
-      | Checker =>
-        isAdminAccount ? renderEditWithMultiId(id1, id2) : <UnauthorizedPage entityName />
-      | _ => <UnauthorizedPage entityName />
-      }
-    | list{"order", id} =>
-      switch renderOrder {
-      | Some(fn) => fn(id)
-      | None => <NotFoundPage />
-      }
     | list{} => renderList()
     | _ => <NotFoundPage />
     }
diff --git a/src/components/UnauthorizedPage.res b/src/components/UnauthorizedPage.res
new file mode 100644
index 000000000..55bddadc9
--- /dev/null
+++ b/src/components/UnauthorizedPage.res
@@ -0,0 +1,19 @@
+@react.component
+let make = (~message="You don't have access to this module. Contact admin for access") => {
+  let {setDashboardPageState} = React.useContext(GlobalProvider.defaultContext)
+  React.useEffect0(() => {
+    RescriptReactRouter.replace("/unauthorized")
+    None
+  })
+  <NoDataFound message renderType={Locked}>
+    <Button
+      text={"Go to Home"}
+      buttonType=Primary
+      onClick={_ => {
+        setDashboardPageState(_ => #HOME)
+        RescriptReactRouter.replace("/home")
+      }}
+      customButtonStyle="mt-4 !p-2"
+    />
+  </NoDataFound>
+}
diff --git a/src/components/form/BoolInput.res b/src/components/form/BoolInput.res
index 64ec789f0..8ada7a9aa 100644
--- a/src/components/form/BoolInput.res
+++ b/src/components/form/BoolInput.res
@@ -114,7 +114,6 @@ let make = (
   ~boolCustomClass="",
   ~addAttributeId="",
 ) => {
-  let accessLevel = React.useContext(FormAuthContext.formAuthContext)
   let boolInput = baseInput->ffInputToBoolInput
   let boolValue: Js.Json.t = boolInput.value
 
@@ -126,14 +125,8 @@ let make = (
   let setIsSelected = boolInput.onChange
 
   isCheckBox
-    ? <CheckBoxIcon
-        isSelected setIsSelected isDisabled={isDisabled || accessLevel == AuthTypes.Read}
-      />
+    ? <CheckBoxIcon isSelected setIsSelected isDisabled={isDisabled} />
     : <BaseComponent
-        isSelected
-        setIsSelected
-        isDisabled={isDisabled || accessLevel == AuthTypes.Read}
-        boolCustomClass
-        addAttributeId
+        isSelected setIsSelected isDisabled={isDisabled} boolCustomClass addAttributeId
       />
 }
diff --git a/src/context/FormAuthContext.res b/src/context/FormAuthContext.res
index e59430a3d..6d87a6061 100644
--- a/src/context/FormAuthContext.res
+++ b/src/context/FormAuthContext.res
@@ -1,3 +1,3 @@
-let formAuthContext = React.createContext(AuthTypes.ReadWrite)
+let formAuthContext = React.createContext(AuthTypes.Access)
 
 let make = React.Context.provider(formAuthContext)
diff --git a/src/entryPoints/hyperswitch/HyperSwitchApp.res b/src/entryPoints/hyperswitch/HyperSwitchApp.res
index 795a31657..f8d8e2979 100644
--- a/src/entryPoints/hyperswitch/HyperSwitchApp.res
+++ b/src/entryPoints/hyperswitch/HyperSwitchApp.res
@@ -4,19 +4,6 @@ open HSLocalStorage
 open HSwitchGlobalVars
 open APIUtils
 
-module FeatureFlagEnabledComponent = {
-  @react.component
-  let make = (~isEnabled, ~children) => {
-    let {setDashboardPageState} = React.useContext(GlobalProvider.defaultContext)
-    let updateRoute = () => {
-      setDashboardPageState(_ => #HOME)
-      RescriptReactRouter.replace("/home")
-      React.null
-    }
-    <> {isEnabled ? children : updateRoute()} </>
-  }
-}
-
 @react.component
 let make = () => {
   let url = RescriptReactRouter.useUrl()
@@ -40,7 +27,6 @@ let make = () => {
     ->QuickStartUtils.getTypedValueFromDict
 
   let featureFlagDetails = HyperswitchAtom.featureFlagAtom->Recoil.useRecoilValueFromAtom
-
   let getEnumDetails = EnumVariantHook.useFetchEnumDetails()
   let verificationDays = getFromMerchantDetails("verification")->LogicUtils.getIntFromString(-1)
   let userRole = getFromUserDetails("user_role")
@@ -55,12 +41,7 @@ let make = () => {
   let isReconEnabled =
     (merchantDetailsValue->MerchantAccountUtils.getMerchantDetails).recon_status === Active
 
-  let hyperSwitchAppSidebars = SidebarValues.getHyperSwitchAppSidebars(
-    ~isReconEnabled,
-    ~featureFlagDetails,
-    ~userRole,
-    (),
-  )
+  let hyperSwitchAppSidebars = SidebarValues.useGetSidebarValues(~isReconEnabled)
 
   let comingSoonPage =
     <DefaultLandingPage
@@ -225,11 +206,11 @@ let make = () => {
                     <ErrorBoundary>
                       {switch url.path {
                       | list{"home"} =>
-                        <FeatureFlagEnabledComponent isEnabled={featureFlagDetails.default}>
+                        <AccessControl isEnabled={featureFlagDetails.default}>
                           {featureFlagDetails.quickStart ? <HomeV2 /> : <Home />}
-                        </FeatureFlagEnabledComponent>
+                        </AccessControl>
                       | list{"fraud-risk-management", ...remainingPath} =>
-                        <FeatureFlagEnabledComponent isEnabled={featureFlagDetails.frm}>
+                        <AccessControl isEnabled={featureFlagDetails.frm}>
                           <EntityScaffold
                             entityName="risk-management"
                             remainingPath
@@ -237,7 +218,7 @@ let make = () => {
                             renderNewForm={() => <FRMConfigure />}
                             renderShow={_ => <FRMConfigure />}
                           />
-                        </FeatureFlagEnabledComponent>
+                        </AccessControl>
                       | list{"connectors", ...remainingPath} =>
                         <EntityScaffold
                           entityName="Connectors"
@@ -259,7 +240,7 @@ let make = () => {
                           <EntityScaffold
                             entityName="Payments"
                             remainingPath
-                            access=ReadWrite
+                            access=Access
                             renderList={() => <Orders />}
                             renderShow={id => <ShowOrder id />}
                           />
@@ -269,7 +250,7 @@ let make = () => {
                           <EntityScaffold
                             entityName="Refunds"
                             remainingPath
-                            access=ReadWrite
+                            access=Access
                             renderList={() => <Refund />}
                             renderShow={id => <ShowRefund id />}
                           />
@@ -278,20 +259,20 @@ let make = () => {
                         <EntityScaffold
                           entityName="Disputes"
                           remainingPath
-                          access=ReadWrite
+                          access=Access
                           renderList={() => <Disputes />}
                           renderShow={id => <ShowDisputes id />}
                         />
                       | list{"customers", ...remainingPath} =>
-                        <FeatureFlagEnabledComponent isEnabled=featureFlagDetails.customersModule>
+                        <AccessControl isEnabled=featureFlagDetails.customersModule>
                           <EntityScaffold
                             entityName="Customers"
                             remainingPath
-                            access=ReadWrite
+                            access=Access
                             renderList={() => <Customers />}
                             renderShow={id => <ShowCustomers id />}
                           />
-                        </FeatureFlagEnabledComponent>
+                        </AccessControl>
                       | list{"routing", ...remainingPath} =>
                         <EntityScaffold
                           entityName="Routing"
@@ -304,7 +285,7 @@ let make = () => {
                         <EntityScaffold
                           entityName="UserManagement"
                           remainingPath
-                          access=ReadWrite
+                          access=Access
                           renderList={() => <UserRoleEntry />}
                           renderShow={_ => <UserRoleShowData />}
                         />
@@ -317,12 +298,11 @@ let make = () => {
                           <RefundsAnalytics />
                         </FilterContext>
                       | list{"analytics-user-journey"} =>
-                        <FeatureFlagEnabledComponent
-                          isEnabled=featureFlagDetails.userJourneyAnalytics>
+                        <AccessControl isEnabled=featureFlagDetails.userJourneyAnalytics>
                           <FilterContext key="UserJourneyAnalytics" index="UserJourneyAnalytics">
                             <UserJourneyAnalytics />
                           </FilterContext>
-                        </FeatureFlagEnabledComponent>
+                        </AccessControl>
                       | list{"monitoring"} => comingSoonPage
                       | list{"developer-api-keys"} => <KeyManagement.KeysManagement />
                       | list{"developer-system-metrics"} =>
@@ -342,35 +322,35 @@ let make = () => {
                             <PaymentSettings webhookOnly=false showFormOnly=false />}
                         />
                       | list{"recon"} =>
-                        <FeatureFlagEnabledComponent isEnabled=featureFlagDetails.recon>
+                        <AccessControl isEnabled=featureFlagDetails.recon>
                           <Recon />
-                        </FeatureFlagEnabledComponent>
+                        </AccessControl>
                       | list{"sdk"} =>
-                        <FeatureFlagEnabledComponent isEnabled={!featureFlagDetails.isLiveMode}>
+                        <AccessControl isEnabled={!featureFlagDetails.isLiveMode}>
                           <SDKPage />
-                        </FeatureFlagEnabledComponent>
+                        </AccessControl>
                       | list{"3ds"} => <HSwitchThreeDS />
                       | list{"surcharge"} =>
-                        <FeatureFlagEnabledComponent isEnabled={featureFlagDetails.surcharge}>
+                        <AccessControl isEnabled={featureFlagDetails.surcharge}>
                           <Surcharge />
-                        </FeatureFlagEnabledComponent>
+                        </AccessControl>
                       | list{"account-settings"} =>
-                        <FeatureFlagEnabledComponent isEnabled=featureFlagDetails.sampleData>
+                        <AccessControl isEnabled=featureFlagDetails.sampleData>
                           <HSwitchSettings />
-                        </FeatureFlagEnabledComponent>
+                        </AccessControl>
                       | list{"account-settings", "profile"} => <HSwitchProfileSettings />
                       | list{"business-details"} =>
-                        <FeatureFlagEnabledComponent isEnabled=featureFlagDetails.default>
+                        <AccessControl isEnabled=featureFlagDetails.default>
                           <BusinessDetails />
-                        </FeatureFlagEnabledComponent>
+                        </AccessControl>
                       | list{"business-profiles"} =>
-                        <FeatureFlagEnabledComponent isEnabled=featureFlagDetails.businessProfile>
+                        <AccessControl isEnabled=featureFlagDetails.businessProfile>
                           <BusinessProfile />
-                        </FeatureFlagEnabledComponent>
+                        </AccessControl>
                       | list{"quick-start"} => determineQuickStartPageState()
                       | list{"woocommerce"} => determineWooCommerce()
                       | list{"stripe-plus-paypal"} => determineStripePlusPayPal()
-
+                      | list{"unauthorized"} => <UnauthorizedPage />
                       | _ =>
                         RescriptReactRouter.replace(`${hyperSwitchFEPrefix}/home`)
                         <Home />
diff --git a/src/entryPoints/hyperswitch/HyperswitchAtom.res b/src/entryPoints/hyperswitch/HyperswitchAtom.res
index 11db93cca..9a600b266 100644
--- a/src/entryPoints/hyperswitch/HyperswitchAtom.res
+++ b/src/entryPoints/hyperswitch/HyperswitchAtom.res
@@ -10,8 +10,11 @@ let featureFlagAtom: Recoil.recoilAtom<FeatureFlagUtils.featureFlag> = Recoil.at
   "featureFlag",
   Js.Json.null->FeatureFlagUtils.featureFlagType,
 )
-
 let paypalAccountStatusAtom: Recoil.recoilAtom<PayPalFlowTypes.setupAccountStatus> = Recoil.atom(.
   "paypalAccountStatusAtom",
   PayPalFlowTypes.Account_not_found,
 )
+let userPermissionAtom: Recoil.recoilAtom<array<PermissionUtils.permissionType>> = Recoil.atom(.
+  "userPermissionAtom",
+  [],
+)
diff --git a/src/entryPoints/hyperswitch/SidebarValues.res b/src/entryPoints/hyperswitch/SidebarValues.res
index 3463c58bc..648d74cde 100644
--- a/src/entryPoints/hyperswitch/SidebarValues.res
+++ b/src/entryPoints/hyperswitch/SidebarValues.res
@@ -54,35 +54,35 @@ let home = isHomeEnabled =>
         name: "Home",
         icon: "hswitch-home",
         link: "/home",
-        access: ReadWrite,
+        access: Access,
       })
     : emptyComponent
 
 let payments = SubLevelLink({
   name: "Payments",
   link: `/payments`,
-  access: ReadWrite,
+  access: Access,
   searchOptions: [("View payment operations", "")],
 })
 
 let refunds = SubLevelLink({
   name: "Refunds",
   link: `/refunds`,
-  access: ReadWrite,
+  access: Access,
   searchOptions: [("View refund operations", "")],
 })
 
 let disputes = SubLevelLink({
   name: "Disputes",
   link: `/disputes`,
-  access: ReadWrite,
+  access: Access,
   searchOptions: [("View dispute operations", "")],
 })
 
 let customers = SubLevelLink({
   name: "Customers",
   link: `/customers`,
-  access: ReadWrite,
+  access: Access,
   searchOptions: [("View customers", "")],
 })
 
@@ -105,7 +105,7 @@ let connectors = (isConnectorsEnabled, isLiveMode) => {
         name: "Processors",
         link: `/connectors`,
         icon: "connectors",
-        access: ReadWrite,
+        access: Access,
         searchOptions: HSwitchUtils.getSearchOptionsForProcessors(
           ~processorList=isLiveMode
             ? ConnectorUtils.connectorListForLive
@@ -119,21 +119,21 @@ let connectors = (isConnectorsEnabled, isLiveMode) => {
 let paymentAnalytcis = SubLevelLink({
   name: "Payments",
   link: `/analytics-payments`,
-  access: ReadWrite,
+  access: Access,
   searchOptions: [("View analytics", "")],
 })
 
 let refundAnalytics = SubLevelLink({
   name: "Refunds",
   link: `/analytics-refunds`,
-  access: ReadWrite,
+  access: Access,
   searchOptions: [("View analytics", "")],
 })
 
 let userJourneyAnalytics = SubLevelLink({
   name: "User Journey",
   link: `/analytics-user-journey`,
-  access: ReadWrite,
+  access: Access,
   iconTag: "betaTag",
   searchOptions: [("View analytics", "")],
 })
@@ -153,7 +153,7 @@ let analytics = (isAnalyticsEnabled, userJourneyAnalyticsFlag) =>
 let routing = SubLevelLink({
   name: "Routing",
   link: `/routing`,
-  access: ReadWrite,
+  access: Access,
   searchOptions: [
     ("Manage default routing configuration", "/default"),
     ("Create new volume based routing", "/volume"),
@@ -165,14 +165,14 @@ let routing = SubLevelLink({
 let threeDs = SubLevelLink({
   name: "3DS Decision Manager",
   link: `/3ds`,
-  access: ReadWrite,
+  access: Access,
   searchOptions: [("Configure 3ds", "")],
 })
 
 let surcharge = SubLevelLink({
   name: "Surcharge",
   link: `/surcharge`,
-  access: ReadWrite,
+  access: Access,
   searchOptions: [("Add Surcharge", "")],
 })
 
@@ -189,14 +189,14 @@ let workflow = (isWorkflowEnabled, isSurchargeEnabled) =>
 let userManagement = SubLevelLink({
   name: "Team",
   link: `/users`,
-  access: ReadWrite,
+  access: Access,
   searchOptions: [("View team management", "")],
 })
 
 let accountSettings = SubLevelLink({
   name: "Account Settings",
   link: `/account-settings`,
-  access: ReadWrite,
+  access: Access,
   searchOptions: [
     ("View profile", "/profile"),
     ("Change password", "/profile"),
@@ -207,14 +207,14 @@ let accountSettings = SubLevelLink({
 let businessDetails = SubLevelLink({
   name: "Business Details",
   link: `/business-details`,
-  access: ReadWrite,
+  access: Access,
   searchOptions: [("Configure business details", "")],
 })
 
 let businessProfiles = SubLevelLink({
   name: "Business Profiles",
   link: `/business-profiles`,
-  access: ReadWrite,
+  access: Access,
   searchOptions: [("Configure business profiles", "")],
 })
 
@@ -242,14 +242,14 @@ let settings = (~isSampleDataEnabled, ~isUserManagementEnabled, ~isBusinessProfi
 let apiKeys = SubLevelLink({
   name: "API Keys",
   link: `/developer-api-keys`,
-  access: ReadWrite,
+  access: Access,
   searchOptions: [("View API Keys", "")],
 })
 
 let systemMetric = SubLevelLink({
   name: "System Metrics",
   link: `/developer-system-metrics`,
-  access: ReadWrite,
+  access: Access,
   iconTag: "betaTag",
   searchOptions: [("View System Metrics", "")],
 })
@@ -257,7 +257,7 @@ let systemMetric = SubLevelLink({
 let paymentSettings = SubLevelLink({
   name: "Payment Settings",
   link: `/payment-settings`,
-  access: ReadWrite,
+  access: Access,
   searchOptions: [("View payment settings", ""), ("View webhooks", ""), ("View return url", "")],
 })
 
@@ -282,7 +282,7 @@ let fraudAndRisk = isfraudAndRiskEnabled =>
         name: "Fraud & Risk",
         icon: "shield-alt",
         link: `/fraud-risk-management`,
-        access: isfraudAndRiskEnabled ? ReadWrite : NoAccess,
+        access: isfraudAndRiskEnabled ? Access : NoAccess,
         searchOptions: [],
       })
     : emptyComponent
@@ -293,7 +293,7 @@ let payoutConnectors = isPayoutConnectorsEnabled =>
         name: "Payout Processors",
         link: `/payoutconnectors`,
         icon: "connectors",
-        access: ReadWrite,
+        access: Access,
         searchOptions: HSwitchUtils.getSearchOptionsForProcessors(
           ~processorList=ConnectorUtils.payoutConnectorList,
           ~getNameFromString=ConnectorUtils.getConnectorNameString,
@@ -307,16 +307,14 @@ let reconTag = (recon, isReconEnabled) =>
         name: "Reconcilation",
         icon: isReconEnabled ? "recon" : "recon-lock",
         link: `/recon`,
-        access: ReadWrite,
+        access: Access,
       })
     : emptyComponent
 
-let getHyperSwitchAppSidebars = (
-  ~isReconEnabled: bool,
-  ~featureFlagDetails: FeatureFlagUtils.featureFlag,
-  ~userRole,
-  (),
-) => {
+let useGetSidebarValues = (~isReconEnabled: bool) => {
+  let userRole = HSLocalStorage.getFromUserDetails("user_role")
+  let featureFlagDetails = HyperswitchAtom.featureFlagAtom->Recoil.useRecoilValueFromAtom
+
   let {
     productionAccess,
     frm,
@@ -332,6 +330,7 @@ let getHyperSwitchAppSidebars = (
     isLiveMode,
     customersModule,
   } = featureFlagDetails
+
   let sidebar = [
     productionAccess->productionAccessComponent,
     default->home,
diff --git a/src/screens/HyperSwitch/SDKPayment/SDKPage.res b/src/screens/HyperSwitch/SDKPayment/SDKPage.res
index 7d87fe11f..6542b3032 100644
--- a/src/screens/HyperSwitch/SDKPayment/SDKPage.res
+++ b/src/screens/HyperSwitch/SDKPayment/SDKPage.res
@@ -49,13 +49,13 @@ module SDKConfiguarationFields = {
         InputFields.numericTextInput(
           ~input={
             ...input,
-            value: (initialValues.amount / 100)->string_of_int->Js.Json.string,
+            value: (initialValues.amount /. 100.00)->Js.Float.toString->Js.Json.string,
             onChange: {
               ev => {
-                let eventValueToInt =
-                  ev->Identity.formReactEventToString->LogicUtils.getIntFromString(0)
+                let eventValueToFloat =
+                  ev->Identity.formReactEventToString->LogicUtils.getFloatFromString(0.00)
                 let valInCents =
-                  (eventValueToInt * 100)->string_of_int->Identity.stringToFormReactEvent
+                  (eventValueToFloat *. 100.00)->Js.Float.toString->Identity.stringToFormReactEvent
                 input.onChange(valInCents)
               }
             },
@@ -63,6 +63,7 @@ module SDKConfiguarationFields = {
           ~isDisabled=false,
           ~customStyle="w-full",
           ~placeholder="Enter amount",
+          ~precision=2,
           (),
         ),
       (),
diff --git a/src/screens/HyperSwitch/SDKPayment/SDKPaymentTypes.res b/src/screens/HyperSwitch/SDKPayment/SDKPaymentTypes.res
index 631956251..2b1b8e2f2 100644
--- a/src/screens/HyperSwitch/SDKPayment/SDKPaymentTypes.res
+++ b/src/screens/HyperSwitch/SDKPayment/SDKPaymentTypes.res
@@ -27,7 +27,7 @@ type billing = {
 type orderDetails = {
   product_name: string,
   quantity: int,
-  amount: int,
+  amount: float,
 }
 type metadata = {order_details: orderDetails}
 
@@ -55,13 +55,13 @@ type mandateData = {
 }
 
 type paymentType = {
-  amount: int,
+  amount: float,
   mutable currency: string,
   profile_id: string,
   customer_id: string,
   description: string,
   capture_method: string,
-  amount_to_capture: Js.Nullable.t<int>,
+  amount_to_capture: Js.Nullable.t<float>,
   email: string,
   name: string,
   phone: string,
diff --git a/src/screens/HyperSwitch/SDKPayment/SDKPaymentUtils.res b/src/screens/HyperSwitch/SDKPayment/SDKPaymentUtils.res
index 31e35445a..39bcc56f0 100644
--- a/src/screens/HyperSwitch/SDKPayment/SDKPaymentUtils.res
+++ b/src/screens/HyperSwitch/SDKPayment/SDKPaymentUtils.res
@@ -1,6 +1,6 @@
 let initialValueForForm: HSwitchSettingTypes.profileEntity => SDKPaymentTypes.paymentType = defaultBusinessProfile => {
   {
-    amount: 10000,
+    amount: 10000.00,
     currency: "United States-USD",
     profile_id: defaultBusinessProfile.profile_id,
     description: "Default value",
@@ -48,11 +48,11 @@ let initialValueForForm: HSwitchSettingTypes.profileEntity => SDKPaymentTypes.pa
       order_details: {
         product_name: "Apple iphone 15",
         quantity: 1,
-        amount: 100,
+        amount: 100.00,
       },
     },
     capture_method: "automatic",
-    amount_to_capture: Js.Nullable.return(100),
+    amount_to_capture: Js.Nullable.return(100.00),
     return_url: `${Window.Location.origin}${Window.Location.pathName}`,
   }
 }
@@ -95,7 +95,7 @@ let getTypedValueForPayment: Js.Json.t => SDKPaymentTypes.paymentType = values =
       },
     },
   }
-  let amount = dictOfValues->getInt("amount", 100)
+  let amount = dictOfValues->getFloat("amount", 100.00)
 
   {
     amount,
@@ -150,10 +150,10 @@ let getTypedValueForPayment: Js.Json.t => SDKPaymentTypes.paymentType = values =
       },
     },
     capture_method: "automatic",
-    amount_to_capture: amount === 0 ? Js.Nullable.null : Js.Nullable.return(amount),
+    amount_to_capture: amount === 0.00 ? Js.Nullable.null : Js.Nullable.return(amount),
     return_url: dictOfValues->getString("return_url", ""),
-    payment_type: amount === 0 ? Js.Nullable.return("setup_mandate") : Js.Nullable.null,
-    setup_future_usage: amount === 0 ? Js.Nullable.return("off_session") : Js.Nullable.null,
-    mandate_data: amount === 0 ? Js.Nullable.return(mandateData) : Js.Nullable.null,
+    payment_type: amount === 0.00 ? Js.Nullable.return("setup_mandate") : Js.Nullable.null,
+    setup_future_usage: amount === 0.00 ? Js.Nullable.return("off_session") : Js.Nullable.null,
+    mandate_data: amount === 0.00 ? Js.Nullable.return(mandateData) : Js.Nullable.null,
   }
 }
diff --git a/src/screens/HyperSwitch/SDKPayment/WebSDK.res b/src/screens/HyperSwitch/SDKPayment/WebSDK.res
index 170873f83..505a32eaf 100644
--- a/src/screens/HyperSwitch/SDKPayment/WebSDK.res
+++ b/src/screens/HyperSwitch/SDKPayment/WebSDK.res
@@ -232,7 +232,7 @@ module CheckoutForm = {
             | WIDGET => <CardWidget id="card-widget" options={paymentElementOptions} />
             }}
             <Button
-              text={`Pay ${currency} ${(amount / 100)->Belt.Int.toString}`}
+              text={`Pay ${currency} ${(amount /. 100.00)->Belt.Float.toString}`}
               loadingText="Please wait..."
               buttonState=btnState
               buttonType={Primary}
@@ -282,7 +282,7 @@ let make = (
   ~methodsOrder=[],
   ~saveViewToSdk=false,
   ~isSpaceAccordion=false,
-  ~amount=65400,
+  ~amount=65400.00,
   ~setClientSecret,
 ) => {
   let (screenState, setScreenState) = React.useState(_ => PageLoaderWrapper.Loading)
diff --git a/src/screens/HyperSwitch/SwitchMerchant/SwitchMerchant.res b/src/screens/HyperSwitch/SwitchMerchant/SwitchMerchant.res
index 0c24b62f4..f8c8f3ca0 100644
--- a/src/screens/HyperSwitch/SwitchMerchant/SwitchMerchant.res
+++ b/src/screens/HyperSwitch/SwitchMerchant/SwitchMerchant.res
@@ -318,16 +318,9 @@ let make = (~userRole, ~isAddMerchantEnabled=false) => {
   } else {
     <>
       <ExternalUser switchMerchant isAddMerchantEnabled />
-      <Modal
-        showModal=successModal
-        setShowModal=setSuccessModal
-        modalClass="w-80 !h-48 flex items-center justify-center m-auto"
-        paddingClass=""
-        childClass="flex items-center justify-center h-full w-full">
-        {<div className="flex items-center gap-2">
-          <p className="text-xl font-semibold"> {"Switching merchant..."->React.string} </p>
-        </div>}
-      </Modal>
+      <LoaderModal
+        showModal={successModal} setShowModal={setSuccessModal} text="Switching merchant..."
+      />
     </>
   }
 }
diff --git a/src/screens/HyperSwitch/UserManagement/InviteUsers.res b/src/screens/HyperSwitch/UserManagement/InviteUsers.res
index 9823d77ac..f8e9b5375 100644
--- a/src/screens/HyperSwitch/UserManagement/InviteUsers.res
+++ b/src/screens/HyperSwitch/UserManagement/InviteUsers.res
@@ -5,6 +5,7 @@ module InviteEmailForm = {
     open LogicUtils
     open APIUtils
     let fetchDetails = useGetMethod()
+    let {magicLink} = HyperswitchAtom.featureFlagAtom->Recoil.useRecoilValueFromAtom
     let (roleListData, setRoleListData) = React.useState(_ => [])
 
     let emailList =
@@ -53,7 +54,7 @@ module InviteEmailForm = {
           <div className="text-sm text-grey-500"> {emailList->React.string} </div>
         </div>
         <div className="absolute top-10 right-5">
-          <FormRenderer.SubmitButton text="Send Invite" />
+          <FormRenderer.SubmitButton text={magicLink ? "Send Invite" : "Add User"} />
         </div>
       </div>
       <FormRenderer.FieldRenderer
@@ -74,10 +75,12 @@ let make = () => {
   let fetchDetails = useGetMethod()
   let updateDetails = useUpdateMethod()
   let showToast = ToastState.useShowToast()
+  let {magicLink} = HyperswitchAtom.featureFlagAtom->Recoil.useRecoilValueFromAtom
   let {permissionInfo, setPermissionInfo} = React.useContext(GlobalProvider.defaultContext)
   let (screenState, setScreenState) = React.useState(_ => PageLoaderWrapper.Loading)
   let (roleTypeValue, setRoleTypeValue) = React.useState(_ => "merchant_view_only")
   let (roleDict, setRoleDict) = React.useState(_ => Dict.make())
+  let (loaderForInviteUsers, setLoaderForInviteUsers) = React.useState(_ => false)
 
   let initialValues = React.useMemo0(() => {
     [("roleType", ["merchant_view_only"->Js.Json.string]->Js.Json.array)]
@@ -85,36 +88,70 @@ let make = () => {
     ->Js.Json.object_
   })
 
-  let inviteUserReq = async (body, index) => {
-    try {
-      let url = getURL(~entityName=USERS, ~userType=#INVITE, ~methodType=Post, ())
-      let _ = await updateDetails(url, body, Post)
-      if index === 0 {
-        showToast(~message=`Invite(s) sent successfully via Email`, ~toastType=ToastSuccess, ())
-      }
-    } catch {
-    | _ => ()
-    }
+  let inviteUserReq = body => {
+    let url = getURL(~entityName=USERS, ~userType=#INVITE, ~methodType=Post, ())
+    let response = updateDetails(url, body, Post)
+    response
   }
 
   let inviteListOfUsers = async values => {
+    if !magicLink {
+      setLoaderForInviteUsers(_ => true)
+    }
     let valDict = values->getDictFromJsonObject
     let role = valDict->getStrArray("roleType")->LogicUtils.getValueFromArray(0, "")
+    let emailList = valDict->getStrArray("emailList")
+    let emailPasswordsArray = []
 
-    valDict
-    ->getStrArray("emailList")
-    ->Array.forEachWithIndex((ele, index) => {
+    let arrayOfPromises = emailList->Array.map(ele => {
       let body =
         [
           ("email", ele->String.toLowerCase->Js.Json.string),
           ("name", ele->getNameFromEmail->Js.Json.string),
           ("role_id", role->Js.Json.string),
-        ]
-        ->Dict.fromArray
-        ->Js.Json.object_
-      let _ = inviteUserReq(body, index)
+        ]->LogicUtils.getJsonFromArrayOfJson
+      inviteUserReq(body)
     })
-    await HyperSwitchUtils.delay(400)
+
+    let response = await PromiseUtils.allSettledPolyfill(arrayOfPromises)
+    if !magicLink {
+      response->Array.forEachWithIndex((ele, index) => {
+        switch Js.Json.classify(ele) {
+        | Js.Json.JSONObject(jsonDict) => {
+            let passwordFromResponse = jsonDict->getString("password", "")
+            emailPasswordsArray->Array.push(
+              [
+                ("email", emailList[index]->Option.getWithDefault("")->Js.Json.string),
+                ("password", passwordFromResponse->Js.Json.string),
+              ]->LogicUtils.getJsonFromArrayOfJson,
+            )
+          }
+        | _ => ()
+        }
+      })
+    }
+
+    showToast(
+      ~message=magicLink
+        ? `Invite(s) sent successfully via Email`
+        : `The user accounts have been successfully created. The file with their credentials has been downloaded.`,
+      ~toastType=ToastSuccess,
+      (),
+    )
+
+    if !magicLink && emailPasswordsArray->Array.length > 0 {
+      DownloadUtils.download(
+        ~fileName=`invited-users.txt`,
+        ~content=emailPasswordsArray->Js.Json.array->Js.Json.stringifyWithSpace(3),
+        ~fileType="application/json",
+      )
+    }
+
+    if !magicLink {
+      setLoaderForInviteUsers(_ => false)
+    } else {
+      await HyperSwitchUtils.delay(400)
+    }
     RescriptReactRouter.push("/users")
     Js.Nullable.null
   }
@@ -222,5 +259,12 @@ let make = () => {
         </div>
       </PageLoaderWrapper>
     </div>
+    <UIUtils.RenderIf condition={!magicLink}>
+      <LoaderModal
+        showModal={loaderForInviteUsers}
+        setShowModal={setLoaderForInviteUsers}
+        text="Inviting Users"
+      />
+    </UIUtils.RenderIf>
   </div>
 }
diff --git a/src/screens/HyperSwitch/UserManagement/PermissionUtils.res b/src/screens/HyperSwitch/UserManagement/PermissionUtils.res
new file mode 100644
index 000000000..bf529ff77
--- /dev/null
+++ b/src/screens/HyperSwitch/UserManagement/PermissionUtils.res
@@ -0,0 +1,107 @@
+type permissionType =
+  | PaymentRead
+  | PaymentWrite
+  | RefundRead
+  | RefundWrite
+  | ApiKeyRead
+  | ApiKeyWrite
+  | MerchantAccountRead
+  | MerchantAccountWrite
+  | MerchantConnectorAccountRead
+  | MerchantConnectorAccountWrite
+  | ForexRead
+  | RoutingRead
+  | RoutingWrite
+  | DisputeRead
+  | DisputeWrite
+  | MandateRead
+  | MandateWrite
+  | CustomerRead
+  | CustomerWrite
+  | FileRead
+  | FileWrite
+  | Analytics
+  | ThreeDsDecisionManagerWrite
+  | ThreeDsDecisionManagerRead
+  | SurchargeDecisionManagerWrite
+  | SurchargeDecisionManagerRead
+  | UsersRead
+  | UsersWrite
+  | UnknownPermission(string)
+
+let mapPermissionTypeToString = permissionType => {
+  switch permissionType {
+  | PaymentRead => "PaymentRead"
+  | PaymentWrite => "PaymentWrite"
+  | RefundRead => "RefundRead"
+  | RefundWrite => "RefundWrite"
+  | ApiKeyRead => "ApiKeyRead"
+  | ApiKeyWrite => "ApiKeyWrite"
+  | MerchantAccountRead => "MerchantAccountRead"
+  | MerchantAccountWrite => "MerchantAccountWrite"
+  | MerchantConnectorAccountRead => "MerchantConnectorAccountRead"
+  | MerchantConnectorAccountWrite => "MerchantConnectorAccountWrite"
+  | ForexRead => "ForexRead"
+  | RoutingRead => "RoutingRead"
+  | RoutingWrite => "RoutingWrite"
+  | DisputeRead => "DisputeRead"
+  | DisputeWrite => "DisputeWrite"
+  | MandateRead => "MandateRead"
+  | MandateWrite => "MandateWrite"
+  | CustomerRead => "CustomerRead"
+  | CustomerWrite => "CustomerWrite"
+  | FileRead => "FileRead"
+  | FileWrite => "FileWrite"
+  | Analytics => "Analytics"
+  | ThreeDsDecisionManagerWrite => "ThreeDsDecisionManagerWrite"
+  | ThreeDsDecisionManagerRead => "ThreeDsDecisionManagerRead"
+  | SurchargeDecisionManagerWrite => "SurchargeDecisionManagerWrite"
+  | SurchargeDecisionManagerRead => "SurchargeDecisionManagerRead"
+  | UsersRead => "UsersRead"
+  | UsersWrite => "UsersWrite"
+  | UnknownPermission(val) => val
+  }
+}
+
+let mapStringToPermissionType = val => {
+  switch val {
+  | "PaymentRead" => PaymentRead
+  | "PaymentWrite" => PaymentWrite
+  | "RefundRead" => RefundRead
+  | "RefundWrite" => RefundWrite
+  | "ApiKeyRead" => ApiKeyRead
+  | "ApiKeyWrite" => ApiKeyWrite
+  | "MerchantAccountRead" => MerchantAccountRead
+  | "MerchantAccountWrite" => MerchantAccountWrite
+  | "MerchantConnectorAccountRead" => MerchantConnectorAccountRead
+  | "MerchantConnectorAccountWrite" => MerchantConnectorAccountWrite
+  | "ForexRead" => ForexRead
+  | "RoutingRead" => RoutingRead
+  | "RoutingWrite" => RoutingWrite
+  | "DisputeRead" => DisputeRead
+  | "DisputeWrite" => DisputeWrite
+  | "MandateRead" => MandateRead
+  | "MandateWrite" => MandateWrite
+  | "CustomerRead" => CustomerRead
+  | "CustomerWrite" => CustomerWrite
+  | "FileRead" => FileRead
+  | "FileWrite" => FileWrite
+  | "Analytics" => Analytics
+  | "ThreeDsDecisionManagerWrite" => ThreeDsDecisionManagerWrite
+  | "ThreeDsDecisionManagerRead" => ThreeDsDecisionManagerRead
+  | "SurchargeDecisionManagerWrite" => SurchargeDecisionManagerWrite
+  | "SurchargeDecisionManagerRead" => SurchargeDecisionManagerRead
+  | "UsersRead" => UsersRead
+  | "UsersWrite" => UsersWrite
+  | val => UnknownPermission(val)
+  }
+}
+
+let getAccessValue = (~permissionValue: permissionType, permissionList) => {
+  open AuthTypes
+  let isPermissionFound = permissionList->Array.find(ele => {
+    ele === permissionValue
+  })
+
+  isPermissionFound->Option.isSome ? Access : NoAccess
+}
diff --git a/src/screens/HyperSwitch/Utils/HSwitchGlobalSearchBar.res b/src/screens/HyperSwitch/Utils/HSwitchGlobalSearchBar.res
index 9e4829184..d6e8f24ab 100644
--- a/src/screens/HyperSwitch/Utils/HSwitchGlobalSearchBar.res
+++ b/src/screens/HyperSwitch/Utils/HSwitchGlobalSearchBar.res
@@ -57,18 +57,11 @@ let make = () => {
   let (showModal, setShowModal) = React.useState(_ => false)
   let (searchText, setSearchText) = React.useState(_ => "")
   let (arr, setArr) = React.useState(_ => [])
-  let featureFlagDetails = HyperswitchAtom.featureFlagAtom->Recoil.useRecoilValueFromAtom
   let merchentDetails = HSwitchUtils.useMerchantDetailsValue()
-  let userRole = HSLocalStorage.getFromUserDetails("user_role")
   let isReconEnabled =
     (merchentDetails->MerchantAccountUtils.getMerchantDetails).recon_status === Active
 
-  let hswitchTabs = SidebarValues.getHyperSwitchAppSidebars(
-    ~isReconEnabled,
-    ~featureFlagDetails,
-    ~userRole,
-    (),
-  )
+  let hswitchTabs = SidebarValues.useGetSidebarValues(~isReconEnabled)
   let searchText = searchText->String.trim
   React.useEffect1(_ => {
     let matchedList = hswitchTabs->Array.reduce([], (acc, item) => {
diff --git a/src/screens/login/AuthTypes.res b/src/screens/login/AuthTypes.res
index cf51ce9fc..1bb419c39 100644
--- a/src/screens/login/AuthTypes.res
+++ b/src/screens/login/AuthTypes.res
@@ -1 +1 @@
-type authorization = NoAccess | Read | ReadWrite | Checker
+type authorization = NoAccess | Access
diff --git a/src/utils/AccessControl.res b/src/utils/AccessControl.res
new file mode 100644
index 000000000..93d9c0951
--- /dev/null
+++ b/src/utils/AccessControl.res
@@ -0,0 +1,11 @@
+@react.component
+let make = (~isEnabled, ~children) => {
+  let {setDashboardPageState} = React.useContext(GlobalProvider.defaultContext)
+
+  let updateRoute = () => {
+    setDashboardPageState(_ => #HOME)
+    RescriptReactRouter.replace("/home")
+    React.null
+  }
+  isEnabled ? children : updateRoute()
+}
diff --git a/src/utils/LoaderModal.res b/src/utils/LoaderModal.res
new file mode 100644
index 000000000..48799a00d
--- /dev/null
+++ b/src/utils/LoaderModal.res
@@ -0,0 +1,16 @@
+@react.component
+let make = (~showModal, ~setShowModal, ~text) => {
+  <UIUtils.RenderIf condition={showModal}>
+    <Modal
+      showModal
+      setShowModal
+      modalClass="w-80 !h-56 flex items-center justify-center m-auto"
+      paddingClass=""
+      childClass="flex items-center justify-center h-full w-full">
+      <div className="flex flex-col items-center gap-2">
+        <Loader />
+        <div className="text-xl font-semibold mb-4"> {text->React.string} </div>
+      </div>
+    </Modal>
+  </UIUtils.RenderIf>
+}
diff --git a/src/utils/PromiseUtils.res b/src/utils/PromiseUtils.res
new file mode 100644
index 000000000..3309ebc7b
--- /dev/null
+++ b/src/utils/PromiseUtils.res
@@ -0,0 +1,21 @@
+// Pollyfill for Promise.allSettled()
+// Promise.allSettled() takes an iterable of promises and returns a single promise that is fulfilled with an array of promise settlement result
+
+let allSettledPolyfill = (arr: array<promise<Js.Json.t>>) => {
+  arr
+  ->Array.map(promise =>
+    promise
+    ->Promise.then(val => {
+      Promise.resolve(val)
+    })
+    ->Promise.catch(err => {
+      switch err {
+      | Js.Exn.Error(e) =>
+        let err = Js.Exn.message(e)->Belt.Option.getWithDefault("Failed to Fetch!")
+        err->Js.Json.string
+      | _ => Js.Json.null
+      }->Promise.resolve
+    })
+  )
+  ->Promise.all
+}