From 940f69de80fafa0b4b48d6b89a511410d9c5a2a6 Mon Sep 17 00:00:00 2001
From: Pritish Budhiraja <1805317@kiit.ac.in>
Date: Wed, 14 Feb 2024 18:01:32 +0530
Subject: [PATCH 01/12] feat: Delete user added

---
 .env                                          |  2 +-
 src/screens/HyperSwitch/APIUtils/APIUtils.res |  1 +
 .../HyperSwitch/APIUtils/APIUtilsTypes.res    |  1 +
 .../UserManagement/ShowUserData.res           | 91 +++++++++++++++++--
 .../UserManagement/UserRoleEntity.res         |  2 -
 5 files changed, 85 insertions(+), 12 deletions(-)

diff --git a/.env b/.env
index ad42dae28..8acc5a320 100644
--- a/.env
+++ b/.env
@@ -1,3 +1,3 @@
-apiBaseUrl=https://sandbox.hyperswitch.io
+apiBaseUrl=https://integ-api.hyperswitch.io
 sdkBaseUrl=https://beta.hyperswitch.io/v1/HyperLoader.js
 mixpanelToken=
\ No newline at end of file
diff --git a/src/screens/HyperSwitch/APIUtils/APIUtils.res b/src/screens/HyperSwitch/APIUtils/APIUtils.res
index 1c602ba4c..753eaae4c 100644
--- a/src/screens/HyperSwitch/APIUtils/APIUtils.res
+++ b/src/screens/HyperSwitch/APIUtils/APIUtils.res
@@ -171,6 +171,7 @@ let getURL = (
       | _ => `${userUrl}/${(userType :> string)->String.toLowerCase}`
       }
     | #GET_PERMISSIONS => `${userUrl}/role`
+    | #USER_DELETE => `${userUrl}/user/delete`
     | #SIGNINV2 => `${userUrl}/v2/signin`
     | #VERIFY_EMAILV2 => `${userUrl}/v2/verify_email`
     | #ACCEPT_INVITE => `${userUrl}/user/invite/accept`
diff --git a/src/screens/HyperSwitch/APIUtils/APIUtilsTypes.res b/src/screens/HyperSwitch/APIUtils/APIUtilsTypes.res
index 2433e5306..3358b155b 100644
--- a/src/screens/HyperSwitch/APIUtils/APIUtilsTypes.res
+++ b/src/screens/HyperSwitch/APIUtils/APIUtilsTypes.res
@@ -59,6 +59,7 @@ type userType = [
   | #MERCHANT_DATA
   | #USER_DATA
   | #INVITE
+  | #USER_DELETE
   | #INVITE_MULTIPLE
   | #RESEND_INVITE
   | #CREATE_MERCHANT
diff --git a/src/screens/HyperSwitch/UserManagement/ShowUserData.res b/src/screens/HyperSwitch/UserManagement/ShowUserData.res
index 410580c18..33f822975 100644
--- a/src/screens/HyperSwitch/UserManagement/ShowUserData.res
+++ b/src/screens/HyperSwitch/UserManagement/ShowUserData.res
@@ -4,6 +4,76 @@ external typeConversion: array<Nullable.t<UserRoleEntity.userTableTypes>> => arr
   UserRoleEntity.userTableTypes,
 > = "%identity"
 
+module UserUtilsPopover = {
+  @react.component
+  let make = (~infoValue: UserRoleEntity.userTableTypes) => {
+    open HeadlessUI
+    open APIUtils
+
+    let updateDetails = useUpdateMethod()
+    let showToast = ToastState.useShowToast()
+
+    let deleteUser = async () => {
+      try {
+        let url = getURL(~entityName=USERS, ~methodType=Post, ~userType={#USER_DELETE}, ())
+        let body =
+          [("email", infoValue.email->JSON.Encode.string)]->LogicUtils.getJsonFromArrayOfJson
+        let _ = await updateDetails(url, body, Delete, ())
+        showToast(~message=`User has been successfully deleted.`, ~toastType=ToastSuccess, ())
+        RescriptReactRouter.replace("/users")
+      } catch {
+      | _ => ()
+      }
+    }
+
+    <Popover className="relative inline-block text-left">
+      {popoverProps => <>
+        <Popover.Button
+          className={
+            let openClasses = if popoverProps["open"] {
+              `group border py-2 rounded-md inline-flex items-center text-base font-medium hover:text-opacity-100 focus:outline-none`
+            } else {
+              `text-opacity-90 group border py-2 rounded-md inline-flex items-center text-base font-medium hover:text-opacity-100 focus:outline-none`
+            }
+            `${openClasses} border-none`
+          }>
+          {buttonProps => <Icon name="menu-option" size=28 />}
+        </Popover.Button>
+        <Transition
+          \"as"="span"
+          enter={"transition ease-out duration-200"}
+          enterFrom="opacity-0 translate-y-1"
+          enterTo="opacity-100 translate-y-0"
+          leave={"transition ease-in duration-150"}
+          leaveFrom="opacity-100 translate-y-0"
+          leaveTo="opacity-0 translate-y-1">
+          <Popover.Panel className={`absolute !z-30 right-2`}>
+            {panelProps => {
+              <div
+                className="relative flex flex-col py-3 rounded-lg shadow-lg ring-1 ring-black ring-opacity-5 w-40">
+                <Navbar.MenuOption
+                  text="Update role"
+                  onClick={_ => {
+                    panelProps["close"]()
+                  }}
+                />
+                <UIUtils.RenderIf condition={infoValue.role_id !== "org_admin"}>
+                  <Navbar.MenuOption
+                    text="Delete user"
+                    onClick={_ => {
+                      deleteUser()->ignore
+                    }}
+                  />
+                </UIUtils.RenderIf>
+              </div>
+            }}
+          </Popover.Panel>
+        </Transition>
+      </>}
+    </Popover>
+  }
+}
+
 module UserHeading = {
   @react.component
   let make = (~infoValue: UserRoleEntity.userTableTypes) => {
@@ -42,15 +112,18 @@ module UserHeading = {
           | _ => infoValue.status->String.toUpperCase->React.string
           }}
         </div>
-        <UIUtils.RenderIf condition={status !== Active}>
-          <Button
-            text="Resend Invite"
-            buttonState
-            buttonType={SecondaryFilled}
-            customButtonStyle="!px-2"
-            onClick={_ => resendInvite()->ignore}
-          />
-        </UIUtils.RenderIf>
+        <div className="flex items-center gap-2">
+          <UIUtils.RenderIf condition={status !== Active}>
+            <Button
+              text="Resend Invite"
+              buttonState
+              buttonType={SecondaryFilled}
+              customButtonStyle="!px-2"
+              onClick={_ => resendInvite()->ignore}
+            />
+          </UIUtils.RenderIf>
+          <UserUtilsPopover infoValue />
+        </div>
       </div>
     </div>
   }
diff --git a/src/screens/HyperSwitch/UserManagement/UserRoleEntity.res b/src/screens/HyperSwitch/UserManagement/UserRoleEntity.res
index d804146a1..954f22222 100644
--- a/src/screens/HyperSwitch/UserManagement/UserRoleEntity.res
+++ b/src/screens/HyperSwitch/UserManagement/UserRoleEntity.res
@@ -5,7 +5,6 @@ type role = Admin | ViewOnly | Operations | Developer | None
 type userStatus = Active | InviteSent | None
 
 type userTableTypes = {
-  user_id: string,
   email: string,
   name: string,
   role_id: string,
@@ -32,7 +31,6 @@ type roleColTypes =
 
 let itemToObjMapperForUser = dict => {
   {
-    user_id: getString(dict, "user_id", ""),
     email: getString(dict, "email", ""),
     name: getString(dict, "name", ""),
     role_id: getString(dict, "role_id", ""),

From 1e681eb11b0ceff3952db601c17cb272a197bd4b Mon Sep 17 00:00:00 2001
From: Pritish Budhiraja <1805317@kiit.ac.in>
Date: Thu, 15 Feb 2024 13:31:06 +0530
Subject: [PATCH 02/12] fix: update role added

---
 .env                                          |   2 +-
 src/screens/HyperSwitch/APIUtils/APIUtils.res |   3 +-
 .../HyperSwitch/APIUtils/APIUtilsTypes.res    |   1 +
 .../UserManagement/InviteUsers.res            |  70 ++++++-----
 .../UserManagement/ShowUserData.res           | 110 ++++++++++++------
 5 files changed, 121 insertions(+), 65 deletions(-)

diff --git a/.env b/.env
index 8acc5a320..ad42dae28 100644
--- a/.env
+++ b/.env
@@ -1,3 +1,3 @@
-apiBaseUrl=https://integ-api.hyperswitch.io
+apiBaseUrl=https://sandbox.hyperswitch.io
 sdkBaseUrl=https://beta.hyperswitch.io/v1/HyperLoader.js
 mixpanelToken=
\ No newline at end of file
diff --git a/src/screens/HyperSwitch/APIUtils/APIUtils.res b/src/screens/HyperSwitch/APIUtils/APIUtils.res
index 753eaae4c..ed30e7653 100644
--- a/src/screens/HyperSwitch/APIUtils/APIUtils.res
+++ b/src/screens/HyperSwitch/APIUtils/APIUtils.res
@@ -171,10 +171,11 @@ let getURL = (
       | _ => `${userUrl}/${(userType :> string)->String.toLowerCase}`
       }
     | #GET_PERMISSIONS => `${userUrl}/role`
-    | #USER_DELETE => `${userUrl}/user/delete`
     | #SIGNINV2 => `${userUrl}/v2/signin`
     | #VERIFY_EMAILV2 => `${userUrl}/v2/verify_email`
     | #ACCEPT_INVITE => `${userUrl}/user/invite/accept`
+    | #USER_DELETE => `${userUrl}/user/delete`
+    | #UPDATE_ROLE => `${userUrl}/user/${(userType :> string)->String.toLowerCase}`
     | #SIGNIN
     | #SIGNUP
     | #VERIFY_EMAIL
diff --git a/src/screens/HyperSwitch/APIUtils/APIUtilsTypes.res b/src/screens/HyperSwitch/APIUtils/APIUtilsTypes.res
index 3358b155b..0ca436f81 100644
--- a/src/screens/HyperSwitch/APIUtils/APIUtilsTypes.res
+++ b/src/screens/HyperSwitch/APIUtils/APIUtilsTypes.res
@@ -60,6 +60,7 @@ type userType = [
   | #USER_DATA
   | #INVITE
   | #USER_DELETE
+  | #UPDATE_ROLE
   | #INVITE_MULTIPLE
   | #RESEND_INVITE
   | #CREATE_MERCHANT
diff --git a/src/screens/HyperSwitch/UserManagement/InviteUsers.res b/src/screens/HyperSwitch/UserManagement/InviteUsers.res
index 5ffb7a42a..bdba329ec 100644
--- a/src/screens/HyperSwitch/UserManagement/InviteUsers.res
+++ b/src/screens/HyperSwitch/UserManagement/InviteUsers.res
@@ -1,9 +1,10 @@
 module InviteEmailForm = {
   open UserManagementUtils
   @react.component
-  let make = (~setRoleTypeValue) => {
+  let make = (~setRoleTypeValue, ~isEmailTextInputVisible, ~setNewRoleSelected) => {
     open LogicUtils
     open APIUtils
+    open UIUtils
     let fetchDetails = useGetMethod()
     let {magicLink} = HyperswitchAtom.featureFlagAtom->Recoil.useRecoilValueFromAtom
     let (roleListData, setRoleListData) = React.useState(_ => [])
@@ -14,6 +15,11 @@ module InviteEmailForm = {
       ->getValueFromArray(0, ""->JSON.Encode.string)
       ->getStringFromJson("")
 
+    React.useEffect1(() => {
+      setNewRoleSelected(_ => role)
+      None
+    }, [role])
+
     let getRolesList = async () => {
       try {
         let roleListUrl = getURL(
@@ -42,22 +48,24 @@ module InviteEmailForm = {
     }, [role])
 
     <>
-      <div className="flex justify-between">
-        <div className="flex flex-col w-full">
-          <FormRenderer.FieldRenderer
-            field=inviteEmail
-            fieldWrapperClass="w-4/5"
-            labelClass="!text-black !text-base !-ml-[0.5px]"
-          />
-        </div>
-        <div className="absolute top-10 right-5">
-          <FormRenderer.SubmitButton
-            text={magicLink ? "Send Invite" : "Add User"} loadingText="Loading..."
-          />
+      <RenderIf condition={isEmailTextInputVisible}>
+        <div className="flex justify-between">
+          <div className="flex flex-col w-full">
+            <FormRenderer.FieldRenderer
+              field=inviteEmail
+              fieldWrapperClass="w-4/5"
+              labelClass="!text-black !text-base !-ml-[0.5px]"
+            />
+          </div>
+          <div className="absolute top-10 right-5">
+            <FormRenderer.SubmitButton
+              text={magicLink ? "Send Invite" : "Add User"} loadingText="Loading..."
+            />
+          </div>
         </div>
-      </div>
+      </RenderIf>
       <FormRenderer.FieldRenderer
-        fieldWrapperClass="w-full mt-5"
+        fieldWrapperClass={`w-full ${isEmailTextInputVisible ? "mt-5" : ""}`}
         field={roleType(roleListData)}
         errorClass
         labelClass="!text-black !font-semibold"
@@ -67,10 +75,11 @@ module InviteEmailForm = {
 }
 
 @react.component
-let make = () => {
+let make = (~isInviteUserFlow=true, ~setNewRoleSelected=_ => ()) => {
   open UserManagementUtils
   open APIUtils
   open LogicUtils
+  open UIUtils
   let fetchDetails = useGetMethod()
   let updateDetails = useUpdateMethod()
   let showToast = ToastState.useShowToast()
@@ -80,6 +89,8 @@ let make = () => {
   let (roleTypeValue, setRoleTypeValue) = React.useState(_ => "merchant_view_only")
   let (roleDict, setRoleDict) = React.useState(_ => Dict.make())
   let (loaderForInviteUsers, setLoaderForInviteUsers) = React.useState(_ => false)
+  let paddingClass = isInviteUserFlow ? "p-10" : ""
+  let marginClass = isInviteUserFlow ? "mt-5" : ""
 
   let initialValues = React.useMemo0(() => {
     [("roleType", ["merchant_view_only"->JSON.Encode.string]->JSON.Encode.array)]
@@ -312,20 +323,25 @@ let make = () => {
   }, [roleTypeValue])
 
   <div className="flex flex-col overflow-y-scroll h-full">
-    <BreadCrumbNavigation
-      path=[{title: "Users", link: "/users"}] currentPageTitle="Invite new users"
-    />
-    <PageUtils.PageHeading
-      title="Invite New Users"
-      subTitle="An invite will be sent to the email addresses to set up a new account"
-    />
-    <div className="h-4/5 bg-white mt-5 p-10 relative overflow-y-scroll flex flex-col gap-10">
+    <RenderIf condition={isInviteUserFlow}>
+      <BreadCrumbNavigation
+        path=[{title: "Users", link: "/users"}] currentPageTitle="Invite new users"
+      />
+      <PageUtils.PageHeading
+        title="Invite New Users"
+        subTitle="An invite will be sent to the email addresses to set up a new account"
+      />
+    </RenderIf>
+    <div
+      className={`h-4/5 bg-white relative overflow-y-scroll flex flex-col gap-10 ${paddingClass} ${marginClass}`}>
       <Form
         key="invite-user-management"
         initialValues={initialValues}
         validate={values => values->validateForm(~fieldsToValidate=["emailList"])}
         onSubmit>
-        <InviteEmailForm setRoleTypeValue />
+        <InviteEmailForm
+          setRoleTypeValue isEmailTextInputVisible=isInviteUserFlow setNewRoleSelected
+        />
       </Form>
       <PageLoaderWrapper screenState={screenState}>
         <div className="flex flex-col justify-between gap-12 show-scrollbar overflow-scroll">
@@ -342,12 +358,12 @@ let make = () => {
         </div>
       </PageLoaderWrapper>
     </div>
-    <UIUtils.RenderIf condition={!magicLink}>
+    <RenderIf condition={!magicLink}>
       <LoaderModal
         showModal={loaderForInviteUsers}
         setShowModal={setLoaderForInviteUsers}
         text="Inviting Users"
       />
-    </UIUtils.RenderIf>
+    </RenderIf>
   </div>
 }
diff --git a/src/screens/HyperSwitch/UserManagement/ShowUserData.res b/src/screens/HyperSwitch/UserManagement/ShowUserData.res
index 33f822975..632885ba3 100644
--- a/src/screens/HyperSwitch/UserManagement/ShowUserData.res
+++ b/src/screens/HyperSwitch/UserManagement/ShowUserData.res
@@ -1,4 +1,5 @@
 open UserManagementUtils
+open UIUtils
 
 external typeConversion: array<Nullable.t<UserRoleEntity.userTableTypes>> => array<
   UserRoleEntity.userTableTypes,
@@ -6,7 +7,7 @@ external typeConversion: array<Nullable.t<UserRoleEntity.userTableTypes>> => arr
 
 module UserUtilsPopover = {
   @react.component
-  let make = (~infoValue: UserRoleEntity.userTableTypes) => {
+  let make = (~infoValue: UserRoleEntity.userTableTypes, ~setIsUpdateRoleSelected) => {
     open HeadlessUI
     open APIUtils
 
@@ -55,16 +56,17 @@ module UserUtilsPopover = {
                   text="Update role"
                   onClick={_ => {
                     panelProps["close"]()
+                    setIsUpdateRoleSelected(_ => true)
                   }}
                 />
-                <UIUtils.RenderIf condition={infoValue.role_id !== "org_admin"}>
+                <RenderIf condition={infoValue.role_id !== "org_admin"}>
                   <Navbar.MenuOption
                     text="Delete user"
                     onClick={_ => {
                       deleteUser()->ignore
                     }}
                   />
-                </UIUtils.RenderIf>
+                </RenderIf>
               </div>
             }}
           </Popover.Panel>
@@ -76,7 +78,12 @@ module UserUtilsPopover = {
 
 module UserHeading = {
   @react.component
-  let make = (~infoValue: UserRoleEntity.userTableTypes) => {
+  let make = (
+    ~infoValue: UserRoleEntity.userTableTypes,
+    ~isUpdateRoleSelected,
+    ~setIsUpdateRoleSelected,
+    ~newRoleSelected,
+  ) => {
     open APIUtils
     let showToast = ToastState.useShowToast()
     let updateDetails = useUpdateMethod()
@@ -97,6 +104,20 @@ module UserHeading = {
       }
     }
 
+    let updateRole = async () => {
+      try {
+        let url = getURL(~entityName=USERS, ~methodType=Post, ~userType={#UPDATE_ROLE}, ())
+        let body =
+          [
+            ("email", infoValue.email->JSON.Encode.string),
+            ("role_id", newRoleSelected->JSON.Encode.string),
+          ]->LogicUtils.getJsonFromArrayOfJson
+        let _ = await updateDetails(url, body, Post, ())
+      } catch {
+      | _ => ()
+      }
+    }
+
     <div className="flex justify-between flex-wrap">
       <PageUtils.PageHeading
         title=infoValue.name
@@ -105,26 +126,31 @@ module UserHeading = {
         isTag=true
         tagText={infoValue.role_name->String.toUpperCase}
       />
-      <div className="flex items-center gap-4">
-        <div className={`font-semibold text-green-700`}>
-          {switch status {
-          | InviteSent => "INVITE SENT"->String.toUpperCase->React.string
-          | _ => infoValue.status->String.toUpperCase->React.string
-          }}
-        </div>
-        <div className="flex items-center gap-2">
-          <UIUtils.RenderIf condition={status !== Active}>
-            <Button
-              text="Resend Invite"
-              buttonState
-              buttonType={SecondaryFilled}
-              customButtonStyle="!px-2"
-              onClick={_ => resendInvite()->ignore}
-            />
-          </UIUtils.RenderIf>
-          <UserUtilsPopover infoValue />
+      <RenderIf condition={isUpdateRoleSelected}>
+        <Button buttonType={Primary} text="Update" onClick={_ => updateRole()->ignore} />
+      </RenderIf>
+      <RenderIf condition={!isUpdateRoleSelected}>
+        <div className="flex items-center gap-4">
+          <div className={`font-semibold text-green-700`}>
+            {switch status {
+            | InviteSent => "INVITE SENT"->String.toUpperCase->React.string
+            | _ => infoValue.status->String.toUpperCase->React.string
+            }}
+          </div>
+          <div className="flex items-center gap-2">
+            <RenderIf condition={status !== Active}>
+              <Button
+                text="Resend Invite"
+                buttonState
+                buttonType={SecondaryFilled}
+                customButtonStyle="!px-2"
+                onClick={_ => resendInvite()->ignore}
+              />
+            </RenderIf>
+            <UserUtilsPopover infoValue setIsUpdateRoleSelected />
+          </div>
         </div>
-      </div>
+      </RenderIf>
     </div>
   }
 }
@@ -137,6 +163,8 @@ let make = () => {
   let (roleData, setRoleData) = React.useState(_ => JSON.Encode.null)
   let {permissionInfo, setPermissionInfo} = React.useContext(GlobalProvider.defaultContext)
   let (screenState, setScreenState) = React.useState(_ => PageLoaderWrapper.Loading)
+  let (isUpdateRoleSelected, setIsUpdateRoleSelected) = React.useState(_ => false)
+  let (newRoleSelected, setNewRoleSelected) = React.useState(_ => "")
   let (currentSelectedUser, setCurrentSelectedUser) = React.useState(_ =>
     Dict.make()->UserRoleEntity.itemToObjMapperForUser
   )
@@ -246,19 +274,29 @@ let make = () => {
         path=[{title: "Users", link: "/users"}] currentPageTitle=currentSelectedUser.name
       />
       <div className="h-4/5 bg-white mt-5 p-10 relative flex flex-col gap-8">
-        <UserHeading infoValue={currentSelectedUser} />
-        <div className="flex flex-col justify-between gap-12 show-scrollbar overflow-scroll">
-          {permissionInfo
-          ->Array.mapWithIndex((ele, index) => {
-            <RolePermissionValueRenderer
-              key={index->string_of_int}
-              heading={`${ele.module_} module`}
-              description={ele.description}
-              readWriteValues={ele.permissions}
-            />
-          })
-          ->React.array}
-        </div>
+        <UserHeading
+          infoValue={currentSelectedUser}
+          isUpdateRoleSelected
+          setIsUpdateRoleSelected
+          newRoleSelected
+        />
+        <RenderIf condition={!isUpdateRoleSelected}>
+          <div className="flex flex-col justify-between gap-12 show-scrollbar overflow-scroll">
+            {permissionInfo
+            ->Array.mapWithIndex((ele, index) => {
+              <RolePermissionValueRenderer
+                key={index->string_of_int}
+                heading={`${ele.module_} module`}
+                description={ele.description}
+                readWriteValues={ele.permissions}
+              />
+            })
+            ->React.array}
+          </div>
+        </RenderIf>
+        <RenderIf condition={isUpdateRoleSelected}>
+          <InviteUsers isInviteUserFlow=false setNewRoleSelected />
+        </RenderIf>
       </div>
     </div>
   </PageLoaderWrapper>

From 498eaa563e50df6d56451e66f148c6f8737fb602 Mon Sep 17 00:00:00 2001
From: Pritish Budhiraja <1805317@kiit.ac.in>
Date: Thu, 15 Feb 2024 15:45:54 +0530
Subject: [PATCH 03/12] fix: return back to Users page

---
 .../HyperSwitch/UserManagement/ShowUserData.res | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/screens/HyperSwitch/UserManagement/ShowUserData.res b/src/screens/HyperSwitch/UserManagement/ShowUserData.res
index 632885ba3..63d15ced3 100644
--- a/src/screens/HyperSwitch/UserManagement/ShowUserData.res
+++ b/src/screens/HyperSwitch/UserManagement/ShowUserData.res
@@ -113,6 +113,8 @@ module UserHeading = {
             ("role_id", newRoleSelected->JSON.Encode.string),
           ]->LogicUtils.getJsonFromArrayOfJson
         let _ = await updateDetails(url, body, Post, ())
+        showToast(~message=`Role successfully updated!`, ~toastType=ToastSuccess, ())
+        RescriptReactRouter.replace("/users")
       } catch {
       | _ => ()
       }
@@ -127,7 +129,20 @@ module UserHeading = {
         tagText={infoValue.role_name->String.toUpperCase}
       />
       <RenderIf condition={isUpdateRoleSelected}>
-        <Button buttonType={Primary} text="Update" onClick={_ => updateRole()->ignore} />
+        <div className="flex items-center gap-2">
+          <Button
+            buttonType={Secondary}
+            text="Back"
+            onClick={_ => setIsUpdateRoleSelected(_ => false)}
+            customButtonStyle="!p-3"
+          />
+          <Button
+            buttonType={Primary}
+            text="Update role"
+            onClick={_ => updateRole()->ignore}
+            customButtonStyle="!p-3"
+          />
+        </div>
       </RenderIf>
       <RenderIf condition={!isUpdateRoleSelected}>
         <div className="flex items-center gap-4">

From 0a02f13127e6b524e1827d791439ad2426392f9f Mon Sep 17 00:00:00 2001
From: Pritish Budhiraja <1805317@kiit.ac.in>
Date: Thu, 15 Feb 2024 16:39:13 +0530
Subject: [PATCH 04/12] fix: merchantEmail check added

---
 .../UserManagement/ShowUserData.res           | 87 ++++++++++---------
 1 file changed, 45 insertions(+), 42 deletions(-)

diff --git a/src/screens/HyperSwitch/UserManagement/ShowUserData.res b/src/screens/HyperSwitch/UserManagement/ShowUserData.res
index 63d15ced3..7531f95fc 100644
--- a/src/screens/HyperSwitch/UserManagement/ShowUserData.res
+++ b/src/screens/HyperSwitch/UserManagement/ShowUserData.res
@@ -13,6 +13,7 @@ module UserUtilsPopover = {
 
     let updateDetails = useUpdateMethod()
     let showToast = ToastState.useShowToast()
+    let merchantEmail = HSLocalStorage.getFromMerchantDetails("email")
 
     let deleteUser = async () => {
       try {
@@ -27,52 +28,54 @@ module UserUtilsPopover = {
       }
     }
 
-    <Popover className="relative inline-block text-left">
-      {popoverProps => <>
-        <Popover.Button
-          className={
-            let openClasses = if popoverProps["open"] {
-              `group border py-2 rounded-md inline-flex items-center text-base font-medium hover:text-opacity-100 focus:outline-none`
-            } else {
-              `text-opacity-90 group border py-2 rounded-md inline-flex items-center text-base font-medium hover:text-opacity-100 focus:outline-none`
-            }
-            `${openClasses} border-none`
-          }>
-          {buttonProps => <Icon name="menu-option" size=28 />}
-        </Popover.Button>
-        <Transition
-          \"as"="span"
-          enter={"transition ease-out duration-200"}
-          enterFrom="opacity-0 translate-y-1"
-          enterTo="opacity-100 translate-y-0"
-          leave={"transition ease-in duration-150"}
-          leaveFrom="opacity-100 translate-y-0"
-          leaveTo="opacity-0 translate-y-1">
-          <Popover.Panel className={`absolute !z-30 right-2`}>
-            {panelProps => {
-              <div
-                className="relative flex flex-col py-3 rounded-lg shadow-lg ring-1 ring-black ring-opacity-5 w-40">
-                <Navbar.MenuOption
-                  text="Update role"
-                  onClick={_ => {
-                    panelProps["close"]()
-                    setIsUpdateRoleSelected(_ => true)
-                  }}
-                />
-                <RenderIf condition={infoValue.role_id !== "org_admin"}>
+    <UIUtils.RenderIf condition={infoValue.email !== merchantEmail}>
+      <Popover className="relative inline-block text-left">
+        {popoverProps => <>
+          <Popover.Button
+            className={
+              let openClasses = if popoverProps["open"] {
+                `group border py-2 rounded-md inline-flex items-center text-base font-medium hover:text-opacity-100 focus:outline-none`
+              } else {
+                `text-opacity-90 group border py-2 rounded-md inline-flex items-center text-base font-medium hover:text-opacity-100 focus:outline-none`
+              }
+              `${openClasses} border-none`
+            }>
+            {buttonProps => <Icon name="menu-option" size=28 />}
+          </Popover.Button>
+          <Transition
+            \"as"="span"
+            enter={"transition ease-out duration-200"}
+            enterFrom="opacity-0 translate-y-1"
+            enterTo="opacity-100 translate-y-0"
+            leave={"transition ease-in duration-150"}
+            leaveFrom="opacity-100 translate-y-0"
+            leaveTo="opacity-0 translate-y-1">
+            <Popover.Panel className={`absolute !z-30 right-2`}>
+              {panelProps => {
+                <div
+                  className="relative flex flex-col py-3 rounded-lg shadow-lg ring-1 ring-black ring-opacity-5 w-40">
                   <Navbar.MenuOption
-                    text="Delete user"
+                    text="Update role"
                     onClick={_ => {
-                      deleteUser()->ignore
+                      panelProps["close"]()
+                      setIsUpdateRoleSelected(_ => true)
                     }}
                   />
-                </RenderIf>
-              </div>
-            }}
-          </Popover.Panel>
-        </Transition>
-      </>}
-    </Popover>
+                  <RenderIf condition={infoValue.role_id !== "org_admin"}>
+                    <Navbar.MenuOption
+                      text="Delete user"
+                      onClick={_ => {
+                        deleteUser()->ignore
+                      }}
+                    />
+                  </RenderIf>
+                </div>
+              }}
+            </Popover.Panel>
+          </Transition>
+        </>}
+      </Popover>
+    </UIUtils.RenderIf>
   }
 }
 

From dd02343e64d81bd2bc388e5317135f0d32e3ba1f Mon Sep 17 00:00:00 2001
From: Pritish Budhiraja <1805317@kiit.ac.in>
Date: Sat, 17 Feb 2024 16:29:07 +0530
Subject: [PATCH 05/12] feat: Update role back functionality

---
 .../UserManagement/InviteUsers.res            | 12 ++++--
 .../UserManagement/ShowUserData.res           | 40 +++++++++++++++++--
 2 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/src/screens/HyperSwitch/UserManagement/InviteUsers.res b/src/screens/HyperSwitch/UserManagement/InviteUsers.res
index bdba329ec..35e789e76 100644
--- a/src/screens/HyperSwitch/UserManagement/InviteUsers.res
+++ b/src/screens/HyperSwitch/UserManagement/InviteUsers.res
@@ -75,7 +75,7 @@ module InviteEmailForm = {
 }
 
 @react.component
-let make = (~isInviteUserFlow=true, ~setNewRoleSelected=_ => ()) => {
+let make = (~isInviteUserFlow=true, ~setNewRoleSelected=_ => (), ~currentRole=?) => {
   open UserManagementUtils
   open APIUtils
   open LogicUtils
@@ -83,17 +83,23 @@ let make = (~isInviteUserFlow=true, ~setNewRoleSelected=_ => ()) => {
   let fetchDetails = useGetMethod()
   let updateDetails = useUpdateMethod()
   let showToast = ToastState.useShowToast()
+
+  let defaultRole = switch currentRole {
+  | Some(val) => val
+  | None => "merchant_view_only"
+  }
+
   let {magicLink, inviteMultiple} = 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 (roleTypeValue, setRoleTypeValue) = React.useState(_ => defaultRole)
   let (roleDict, setRoleDict) = React.useState(_ => Dict.make())
   let (loaderForInviteUsers, setLoaderForInviteUsers) = React.useState(_ => false)
   let paddingClass = isInviteUserFlow ? "p-10" : ""
   let marginClass = isInviteUserFlow ? "mt-5" : ""
 
   let initialValues = React.useMemo0(() => {
-    [("roleType", ["merchant_view_only"->JSON.Encode.string]->JSON.Encode.array)]
+    [("roleType", [defaultRole->JSON.Encode.string]->JSON.Encode.array)]
     ->Dict.fromArray
     ->JSON.Encode.object
   })
diff --git a/src/screens/HyperSwitch/UserManagement/ShowUserData.res b/src/screens/HyperSwitch/UserManagement/ShowUserData.res
index 7531f95fc..1cd5f3233 100644
--- a/src/screens/HyperSwitch/UserManagement/ShowUserData.res
+++ b/src/screens/HyperSwitch/UserManagement/ShowUserData.res
@@ -88,10 +88,12 @@ module UserHeading = {
     ~newRoleSelected,
   ) => {
     open APIUtils
+    let fetchDetails = useGetMethod()
     let showToast = ToastState.useShowToast()
     let updateDetails = useUpdateMethod()
     let status = infoValue.status->UserRoleEntity.statusToVariantMapper
     let (buttonState, setButtonState) = React.useState(_ => Button.Normal)
+    let {permissionInfo, setPermissionInfo} = React.useContext(GlobalProvider.defaultContext)
 
     let resendInvite = async () => {
       try {
@@ -107,6 +109,30 @@ module UserHeading = {
       }
     }
 
+    let updatePermissionInfoOnBack = async () => {
+      try {
+        let url = getURL(
+          ~entityName=USER_MANAGEMENT,
+          ~userRoleTypes=ROLE_ID,
+          ~id=Some(infoValue.role_id),
+          ~methodType=Get,
+          (),
+        )
+        let res = await fetchDetails(url)
+
+        let defaultList = defaultPresentInInfoList(permissionInfo)
+        setPermissionInfo(_ => defaultList)
+        let updatedPermissionListForGivenRole = updatePresentInInfoList(
+          defaultList,
+          res->getArrayOfPermissionData,
+        )
+        setPermissionInfo(_ => updatedPermissionListForGivenRole)
+        setIsUpdateRoleSelected(_ => false)
+      } catch {
+      | _ => RescriptReactRouter.replace("/users")
+      }
+    }
+
     let updateRole = async () => {
       try {
         let url = getURL(~entityName=USERS, ~methodType=Post, ~userType={#UPDATE_ROLE}, ())
@@ -136,7 +162,13 @@ module UserHeading = {
           <Button
             buttonType={Secondary}
             text="Back"
-            onClick={_ => setIsUpdateRoleSelected(_ => false)}
+            onClick={_ => {
+              if newRoleSelected === infoValue.role_id {
+                setIsUpdateRoleSelected(_ => false)
+              } else {
+                updatePermissionInfoOnBack()->ignore
+              }
+            }}
             customButtonStyle="!p-3"
           />
           <Button
@@ -160,7 +192,7 @@ module UserHeading = {
               <Button
                 text="Resend Invite"
                 buttonState
-                buttonType={SecondaryFilled}
+                buttonType={Primary}
                 customButtonStyle="!px-2"
                 onClick={_ => resendInvite()->ignore}
               />
@@ -313,7 +345,9 @@ let make = () => {
           </div>
         </RenderIf>
         <RenderIf condition={isUpdateRoleSelected}>
-          <InviteUsers isInviteUserFlow=false setNewRoleSelected />
+          <InviteUsers
+            isInviteUserFlow=false setNewRoleSelected currentRole={currentSelectedUser.role_id}
+          />
         </RenderIf>
       </div>
     </div>

From 1214e08d5d3a941b95c130ded7dad14c07f25d71 Mon Sep 17 00:00:00 2001
From: Pritish Budhiraja <1805317@kiit.ac.in>
Date: Mon, 19 Feb 2024 11:42:01 +0530
Subject: [PATCH 06/12] fix: height issue

---
 src/screens/HyperSwitch/UserManagement/UserRoleEntry.res | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/screens/HyperSwitch/UserManagement/UserRoleEntry.res b/src/screens/HyperSwitch/UserManagement/UserRoleEntry.res
index b877f0aa6..95f7fe2c7 100644
--- a/src/screens/HyperSwitch/UserManagement/UserRoleEntry.res
+++ b/src/screens/HyperSwitch/UserManagement/UserRoleEntry.res
@@ -102,7 +102,6 @@ let make = () => {
               currrentFetchCount={usersFilterData->Array.length}
               showSerialNumber=true
               collapseTableRow=false
-              rowHeightClass="h-20"
               tableheadingClass="h-16"
             />
           </div>

From 7272e9ed36a1282e3e9ee1159b2eee0824db12fd Mon Sep 17 00:00:00 2001
From: Pritish Budhiraja <1805317@kiit.ac.in>
Date: Mon, 19 Feb 2024 11:45:09 +0530
Subject: [PATCH 07/12] fix: style fix

---
 src/screens/HyperSwitch/UserManagement/UserRoleEntry.res | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/screens/HyperSwitch/UserManagement/UserRoleEntry.res b/src/screens/HyperSwitch/UserManagement/UserRoleEntry.res
index 95f7fe2c7..3c3024726 100644
--- a/src/screens/HyperSwitch/UserManagement/UserRoleEntry.res
+++ b/src/screens/HyperSwitch/UserManagement/UserRoleEntry.res
@@ -102,7 +102,7 @@ let make = () => {
               currrentFetchCount={usersFilterData->Array.length}
               showSerialNumber=true
               collapseTableRow=false
-              tableheadingClass="h-16"
+              tableheadingClass="h-12"
             />
           </div>
         </PageLoaderWrapper>,

From c8c084a492dbbcca11fd7f21912145c18a6b0079 Mon Sep 17 00:00:00 2001
From: Pritish Budhiraja <1805317@kiit.ac.in>
Date: Tue, 20 Feb 2024 14:48:56 +0530
Subject: [PATCH 08/12] feat: delete warning modal added

---
 .../UserManagement/ShowUserData.res           | 40 ++++++++++++-------
 1 file changed, 25 insertions(+), 15 deletions(-)

diff --git a/src/screens/HyperSwitch/UserManagement/ShowUserData.res b/src/screens/HyperSwitch/UserManagement/ShowUserData.res
index 1cd5f3233..445933e38 100644
--- a/src/screens/HyperSwitch/UserManagement/ShowUserData.res
+++ b/src/screens/HyperSwitch/UserManagement/ShowUserData.res
@@ -14,6 +14,7 @@ module UserUtilsPopover = {
     let updateDetails = useUpdateMethod()
     let showToast = ToastState.useShowToast()
     let merchantEmail = HSLocalStorage.getFromMerchantDetails("email")
+    let showPopUp = PopUpState.useShowPopUp()
 
     let deleteUser = async () => {
       try {
@@ -28,7 +29,7 @@ module UserUtilsPopover = {
       }
     }
 
-    <UIUtils.RenderIf condition={infoValue.email !== merchantEmail}>
+    <RenderIf condition={infoValue.email !== merchantEmail}>
       <Popover className="relative inline-block text-left">
         {popoverProps => <>
           <Popover.Button
@@ -65,7 +66,13 @@ module UserUtilsPopover = {
                     <Navbar.MenuOption
                       text="Delete user"
                       onClick={_ => {
-                        deleteUser()->ignore
+                        panelProps["close"]()
+                        showPopUp({
+                          popUpType: (Warning, WithIcon),
+                          heading: `Confirm Deletion!`,
+                          description: React.string(`Are you sure you want to delete this user? Press Confirm to delete the user.`),
+                          handleConfirm: {text: "Confirm", onClick: _ => deleteUser()->ignore},
+                        })
                       }}
                     />
                   </RenderIf>
@@ -75,7 +82,7 @@ module UserUtilsPopover = {
           </Transition>
         </>}
       </Popover>
-    </UIUtils.RenderIf>
+    </RenderIf>
   }
 }
 
@@ -94,6 +101,7 @@ module UserHeading = {
     let status = infoValue.status->UserRoleEntity.statusToVariantMapper
     let (buttonState, setButtonState) = React.useState(_ => Button.Normal)
     let {permissionInfo, setPermissionInfo} = React.useContext(GlobalProvider.defaultContext)
+    let userPermissionJson = HyperswitchAtom.userPermissionAtom->Recoil.useRecoilValueFromAtom
 
     let resendInvite = async () => {
       try {
@@ -187,18 +195,20 @@ module UserHeading = {
             | _ => infoValue.status->String.toUpperCase->React.string
             }}
           </div>
-          <div className="flex items-center gap-2">
-            <RenderIf condition={status !== Active}>
-              <Button
-                text="Resend Invite"
-                buttonState
-                buttonType={Primary}
-                customButtonStyle="!px-2"
-                onClick={_ => resendInvite()->ignore}
-              />
-            </RenderIf>
-            <UserUtilsPopover infoValue setIsUpdateRoleSelected />
-          </div>
+          <RenderIf condition={userPermissionJson.usersWrite === Access}>
+            <div className="flex items-center gap-2">
+              <RenderIf condition={status !== Active}>
+                <Button
+                  text="Resend Invite"
+                  buttonState
+                  buttonType={Primary}
+                  customButtonStyle="!px-2"
+                  onClick={_ => resendInvite()->ignore}
+                />
+              </RenderIf>
+              <UserUtilsPopover infoValue setIsUpdateRoleSelected />
+            </div>
+          </RenderIf>
         </div>
       </RenderIf>
     </div>

From 9808d8b8be2eecda4e96c3963c7c4dd8daf99c18 Mon Sep 17 00:00:00 2001
From: Pritish Budhiraja <1805317@kiit.ac.in>
Date: Tue, 20 Feb 2024 14:53:40 +0530
Subject: [PATCH 09/12] feat: Back button added

---
 src/screens/HyperSwitch/UserManagement/ShowUserData.res | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/screens/HyperSwitch/UserManagement/ShowUserData.res b/src/screens/HyperSwitch/UserManagement/ShowUserData.res
index 445933e38..df8ee3064 100644
--- a/src/screens/HyperSwitch/UserManagement/ShowUserData.res
+++ b/src/screens/HyperSwitch/UserManagement/ShowUserData.res
@@ -72,6 +72,7 @@ module UserUtilsPopover = {
                           heading: `Confirm Deletion!`,
                           description: React.string(`Are you sure you want to delete this user? Press Confirm to delete the user.`),
                           handleConfirm: {text: "Confirm", onClick: _ => deleteUser()->ignore},
+                          handleCancel: {text: "Back"},
                         })
                       }}
                     />

From 0b33e5f4061a5300ee0b1cd5df51191ab885bc86 Mon Sep 17 00:00:00 2001
From: Pritish Budhiraja <1805317@kiit.ac.in>
Date: Tue, 20 Feb 2024 15:56:41 +0530
Subject: [PATCH 10/12] fix: text changes

---
 src/screens/HyperSwitch/UserManagement/ShowUserData.res | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/screens/HyperSwitch/UserManagement/ShowUserData.res b/src/screens/HyperSwitch/UserManagement/ShowUserData.res
index df8ee3064..60738d35c 100644
--- a/src/screens/HyperSwitch/UserManagement/ShowUserData.res
+++ b/src/screens/HyperSwitch/UserManagement/ShowUserData.res
@@ -69,8 +69,8 @@ module UserUtilsPopover = {
                         panelProps["close"]()
                         showPopUp({
                           popUpType: (Warning, WithIcon),
-                          heading: `Confirm Deletion!`,
-                          description: React.string(`Are you sure you want to delete this user? Press Confirm to delete the user.`),
+                          heading: `Are you sure you want to delete this user?`,
+                          description: React.string(`This action cannot be undone. Deleting the user will permanently remove all associated data from this account. Press Confirm to delete.`),
                           handleConfirm: {text: "Confirm", onClick: _ => deleteUser()->ignore},
                           handleCancel: {text: "Back"},
                         })

From 70e38118e8563f968d15fe4be9f3f066a298581a Mon Sep 17 00:00:00 2001
From: Pritish Budhiraja <1805317@kiit.ac.in>
Date: Fri, 23 Feb 2024 16:26:39 +0530
Subject: [PATCH 11/12] fix: comment addressed

---
 src/components/DynamicSingleStat.res              |  3 +--
 src/context/SingleStatContext.res                 |  3 +--
 src/context/UserPrefContext.res                   |  3 +--
 .../Analytics/Logs/PaymentLogs/PaymentLogs.res    |  4 +---
 src/screens/Connectors/ConnectorUtils.res         |  3 +--
 src/screens/FraudAndRisk/FRMUtils.res             |  6 +++---
 .../HSwitchProdOnboarding/ProdOnboardingUtils.res |  8 ++------
 .../SetupAccount/HSwitchSetupAccountUtils.res     | 15 ++++++---------
 src/screens/UserManagement/InviteUsers.res        |  4 +---
 src/utils/UserPrefUtils.res                       |  3 +--
 10 files changed, 18 insertions(+), 34 deletions(-)

diff --git a/src/components/DynamicSingleStat.res b/src/components/DynamicSingleStat.res
index 2efaf6f59..e012bce1e 100644
--- a/src/components/DynamicSingleStat.res
+++ b/src/components/DynamicSingleStat.res
@@ -207,8 +207,7 @@ let make = (
       let (key, value) = entries
       filterKeys->Array.includes(key) ? Some((key, value)) : None
     })
-    ->Dict.fromArray
-    ->JSON.Encode.object
+    ->getJsonFromArrayOfJson
     ->Some
   }, [topFiltersToSearchParam])
 
diff --git a/src/context/SingleStatContext.res b/src/context/SingleStatContext.res
index a4d6ccf88..a351beb9b 100644
--- a/src/context/SingleStatContext.res
+++ b/src/context/SingleStatContext.res
@@ -112,8 +112,7 @@ let make = (
       let (key, value) = entries
       filterKeys->Array.includes(key) ? Some((key, value)) : None
     })
-    ->Dict.fromArray
-    ->JSON.Encode.object
+    ->getJsonFromArrayOfJson
     ->Some
   }, [topFiltersToSearchParam])
 
diff --git a/src/context/UserPrefContext.res b/src/context/UserPrefContext.res
index 535b6e3f3..26bf19f87 100644
--- a/src/context/UserPrefContext.res
+++ b/src/context/UserPrefContext.res
@@ -175,8 +175,7 @@ let make = (~children) => {
       let (key, value) = item
       (key, value->userPrefToJson)
     })
-    ->Dict.fromArray
-    ->JSON.Encode.object
+    ->LogicUtils.getJsonFromArrayOfJson
     ->JSON.stringify
 
   let value = React.useMemo4(() => {
diff --git a/src/screens/Analytics/Logs/PaymentLogs/PaymentLogs.res b/src/screens/Analytics/Logs/PaymentLogs/PaymentLogs.res
index 04028a930..dcb38c515 100644
--- a/src/screens/Analytics/Logs/PaymentLogs/PaymentLogs.res
+++ b/src/screens/Analytics/Logs/PaymentLogs/PaymentLogs.res
@@ -33,9 +33,7 @@ let make = (~paymentId, ~createdAt) => {
         ->Dict.fromArray
         ->JSON.Encode.object,
       ),
-    ]
-    ->Dict.fromArray
-    ->JSON.Encode.object
+    ]->getJsonFromArrayOfJson
   let webhookLogsUrl = getURL(
     ~entityName=WEBHOOKS_EVENT_LOGS,
     ~methodType=Get,
diff --git a/src/screens/Connectors/ConnectorUtils.res b/src/screens/Connectors/ConnectorUtils.res
index f989f89ae..633ab3bc0 100644
--- a/src/screens/Connectors/ConnectorUtils.res
+++ b/src/screens/Connectors/ConnectorUtils.res
@@ -646,8 +646,7 @@ let ignoreFields = (json, id, fields) => {
       let (key, _val) = entry
       !(fields->Array.includes(key))
     })
-    ->Dict.fromArray
-    ->JSON.Encode.object
+    ->LogicUtils.getJsonFromArrayOfJson
   }
 }
 
diff --git a/src/screens/FraudAndRisk/FRMUtils.res b/src/screens/FraudAndRisk/FRMUtils.res
index bc09d28d7..acc6e843b 100644
--- a/src/screens/FraudAndRisk/FRMUtils.res
+++ b/src/screens/FraudAndRisk/FRMUtils.res
@@ -24,9 +24,9 @@ let size = "w-14 h-14 rounded-full"
 
 let generateInitialValuesDict = (~selectedFRMInfo, ~isLiveMode, ()) => {
   let frmAccountDetailsDict =
-    [("auth_type", selectedFRMInfo.name->getFRMAuthType->JSON.Encode.string)]
-    ->Dict.fromArray
-    ->JSON.Encode.object
+    [
+      ("auth_type", selectedFRMInfo.name->getFRMAuthType->JSON.Encode.string),
+    ]->LogicUtils.getJsonFromArrayOfJson
 
   [
     ("connector_name", selectedFRMInfo.name->getFRMNameString->JSON.Encode.string),
diff --git a/src/screens/SelfServe/HSwitchProdOnboarding/ProdOnboardingUtils.res b/src/screens/SelfServe/HSwitchProdOnboarding/ProdOnboardingUtils.res
index 4c86bc94d..d92096fc7 100644
--- a/src/screens/SelfServe/HSwitchProdOnboarding/ProdOnboardingUtils.res
+++ b/src/screens/SelfServe/HSwitchProdOnboarding/ProdOnboardingUtils.res
@@ -148,9 +148,7 @@ let getProdApiBody = (
         (parentVariant :> string),
         [("connector_id", connectorId->JSON.Encode.string)]->Dict.fromArray->JSON.Encode.object,
       ),
-    ]
-    ->Dict.fromArray
-    ->JSON.Encode.object
+    ]->LogicUtils.getJsonFromArrayOfJson
 
   | #ProductionAgreement =>
     [
@@ -160,9 +158,7 @@ let getProdApiBody = (
           ("version", HSwitchGlobalVars.agreementVersion->JSON.Encode.string),
         ]->LogicUtils.getJsonFromArrayOfJson,
       ),
-    ]
-    ->Dict.fromArray
-    ->JSON.Encode.object
+    ]->LogicUtils.getJsonFromArrayOfJson
   | _ => (parentVariant :> string)->JSON.Encode.string
   }
 }
diff --git a/src/screens/SetupAccount/HSwitchSetupAccountUtils.res b/src/screens/SetupAccount/HSwitchSetupAccountUtils.res
index 977d713e1..46c828edb 100644
--- a/src/screens/SetupAccount/HSwitchSetupAccountUtils.res
+++ b/src/screens/SetupAccount/HSwitchSetupAccountUtils.res
@@ -23,18 +23,17 @@ let constructBody = (~connectorName, ~json, ~profileId) => {
   let bodyType = connectorAccountDict->Dict.keysToArray->Array.get(0)->Option.getOr("")
 
   let connectorAccountDetails =
-    [("auth_type", bodyType->JSON.Encode.string), ("api_key", "test"->JSON.Encode.string)]
-    ->Dict.fromArray
-    ->JSON.Encode.object
+    [
+      ("auth_type", bodyType->JSON.Encode.string),
+      ("api_key", "test"->JSON.Encode.string),
+    ]->getJsonFromArrayOfJson
 
   let initialValueForPayload = generateInitialValuesDict(
     ~values=[
       ("profile_id", profileId->JSON.Encode.string),
       ("connector_account_details", connectorAccountDetails),
       ("connector_label", `${connectorName}_default`->JSON.Encode.string),
-    ]
-    ->Dict.fromArray
-    ->JSON.Encode.object,
+    ]->getJsonFromArrayOfJson,
     ~connector=connectorName,
     ~bodyType,
     (),
@@ -113,9 +112,7 @@ let constructRoutingPayload = (routingData: routingData) => {
     [
       ("connector", routingData.connector_name->JSON.Encode.string),
       ("merchant_connector_id", routingData.merchant_connector_id->JSON.Encode.string),
-    ]
-    ->Dict.fromArray
-    ->JSON.Encode.object
+    ]->LogicUtils.getJsonFromArrayOfJson
   [("split", 50.0->JSON.Encode.float), ("connector", innerRoutingDict)]
   ->Dict.fromArray
   ->JSON.Encode.object
diff --git a/src/screens/UserManagement/InviteUsers.res b/src/screens/UserManagement/InviteUsers.res
index b1886876e..078fe60f5 100644
--- a/src/screens/UserManagement/InviteUsers.res
+++ b/src/screens/UserManagement/InviteUsers.res
@@ -99,9 +99,7 @@ let make = (~isInviteUserFlow=true, ~setNewRoleSelected=_ => (), ~currentRole=?)
   let marginClass = isInviteUserFlow ? "mt-5" : ""
 
   let initialValues = React.useMemo0(() => {
-    [("roleType", [defaultRole->JSON.Encode.string]->JSON.Encode.array)]
-    ->Dict.fromArray
-    ->JSON.Encode.object
+    [("roleType", [defaultRole->JSON.Encode.string]->JSON.Encode.array)]->getJsonFromArrayOfJson
   })
 
   let inviteListOfUsersWithInviteMultiple = async values => {
diff --git a/src/utils/UserPrefUtils.res b/src/utils/UserPrefUtils.res
index b4d94c5d4..23e99cd5c 100644
--- a/src/utils/UserPrefUtils.res
+++ b/src/utils/UserPrefUtils.res
@@ -62,8 +62,7 @@ let saveUserPref = (userPref: Dict.t<userPref>) => {
       let (key, value) = item
       (key, value->userPrefToJson)
     })
-    ->Dict.fromArray
-    ->JSON.Encode.object
+    ->LogicUtils.getJsonFromArrayOfJson
     ->JSON.stringify,
   )
 }

From 3b4344b4ff946a656ac27e0f0e11b6269645470d Mon Sep 17 00:00:00 2001
From: Pritish Budhiraja <1805317@kiit.ac.in>
Date: Mon, 26 Feb 2024 12:22:35 +0530
Subject: [PATCH 12/12] fix: comments addressed

---
 src/screens/UserManagement/ShowUserData.res | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/screens/UserManagement/ShowUserData.res b/src/screens/UserManagement/ShowUserData.res
index 60738d35c..66e9eb203 100644
--- a/src/screens/UserManagement/ShowUserData.res
+++ b/src/screens/UserManagement/ShowUserData.res
@@ -158,6 +158,14 @@ module UserHeading = {
       }
     }
 
+    let onClickHandler = () => {
+      if newRoleSelected === infoValue.role_id {
+        setIsUpdateRoleSelected(_ => false)
+      } else {
+        updatePermissionInfoOnBack()->ignore
+      }
+    }
+
     <div className="flex justify-between flex-wrap">
       <PageUtils.PageHeading
         title=infoValue.name
@@ -171,13 +179,7 @@ module UserHeading = {
           <Button
             buttonType={Secondary}
             text="Back"
-            onClick={_ => {
-              if newRoleSelected === infoValue.role_id {
-                setIsUpdateRoleSelected(_ => false)
-              } else {
-                updatePermissionInfoOnBack()->ignore
-              }
-            }}
+            onClick={_ => onClickHandler()}
             customButtonStyle="!p-3"
           />
           <Button