employer uid added to request payload

src/_digifi/helpers/crud-helper/consts.ts

@@ -1,5 +1,12 @@
 const QUERIES = {
   USERS_LIST: 'users-list',
+  STARTED_LIST: 'started-list',
+  READY_LIST: 'ready-list',
+  PENDING_LIST: 'pending-list',
+  APPROVED_LIST: 'approved-list',
+  REJECTED_LIST: 'rejected-list',
+  EMPLOYERS_LIST: 'employers-list',
+  SIGNATORY_LIST: 'signatory-list',
 }
 
 export {QUERIES}

src/_digifi/helpers/crud-helper/models.ts

@@ -22,8 +22,11 @@ export type SearchState = {
 }
 
 export type Response<T> = {
+  call_return? : string | any
   data?: T
-  records?: Array<any>
+  records?: T
+  salary_sources?: Array<any>
+  employer_sector?: Array<any>
   payload?: {
     message?: string
     errors?: {

src/_digifi/helpers/formatNumbers.ts

@@ -0,0 +1,6 @@
+export const formatNumbers = (number: string | undefined): string | null => {
+    if(!number){
+        return null
+    }
+    return number.replace(/\B(?=(\d{3})+(?!\d))/g, ',');
+};

src/_digifi/layout/components/header/Navbar.tsx

@@ -1,18 +1,23 @@
-import clsx from 'clsx'
-import {KTIcon, toAbsoluteUrl} from '../../../helpers'
-import {HeaderNotificationsMenu, HeaderUserMenu, Search, ThemeModeSwitcher} from '../../../partials'
-import {useLayout} from '../../core'
+import clsx from 'clsx';
+import { KTIcon, toAbsoluteUrl } from '../../../helpers';
+import {
+  HeaderNotificationsMenu,
+  HeaderUserMenu,
+  Search,
+  ThemeModeSwitcher,
+} from '../../../partials';
+import { useLayout } from '../../core';
 
-const itemClass = 'ms-1 ms-md-4'
+const itemClass = 'ms-1 ms-md-4';
 const btnClass =
-  'btn btn-icon btn-custom btn-icon-muted btn-active-light btn-active-color-primary w-35px h-35px'
-const userAvatarClass = 'symbol-35px'
-const btnIconClass = 'fs-2'
+  'btn btn-icon btn-custom btn-icon-muted btn-active-light btn-active-color-primary w-35px h-35px';
+const userAvatarClass = 'symbol-35px';
+const btnIconClass = 'fs-2';
 
 const Navbar = () => {
-  const {config} = useLayout()
+  const { config } = useLayout();
   return (
-    <div className='app-navbar flex-shrink-0'>
+    <div className="app-navbar flex-shrink-0">
       {/* <div className={clsx('app-navbar-item align-items-stretch', itemClass)}>
         <Search />
       </div> */}
@@ -43,33 +48,38 @@ const Navbar = () => {
       </div> */}
 
       <div className={clsx('app-navbar-item', itemClass)}>
-        <ThemeModeSwitcher toggleBtnClass={clsx('btn-active-light-primary btn-custom')} />
+        <ThemeModeSwitcher
+          toggleBtnClass={clsx('btn-active-light-primary btn-custom')}
+        />
       </div>
 
       <div className={clsx('app-navbar-item', itemClass)}>
         <div
           className={clsx('cursor-pointer symbol', userAvatarClass)}
           data-kt-menu-trigger="{default: 'click'}"
-          data-kt-menu-attach='parent'
-          data-kt-menu-placement='bottom-end'
+          data-kt-menu-attach="parent"
+          data-kt-menu-placement="bottom-end"
         >
-          <img src={toAbsoluteUrl('media/avatars/300-3.jpg')} alt='' />
+          <img src={toAbsoluteUrl('media/avatars/300-3.jpg')} alt="" />
         </div>
         <HeaderUserMenu />
       </div>
 
       {config.app?.header?.default?.menu?.display && (
-        <div className='app-navbar-item d-lg-none ms-2 me-n3' title='Show header menu'>
+        <div
+          className="app-navbar-item d-lg-none ms-2 me-n3"
+          title="Show header menu"
+        >
           <div
-            className='btn btn-icon btn-active-color-primary w-35px h-35px'
-            id='kt_app_header_menu_toggle'
+            className="btn btn-icon btn-active-color-primary w-35px h-35px"
+            id="kt_app_header_menu_toggle"
           >
-            <KTIcon iconName='text-align-left' className={btnIconClass} />
+            <KTIcon iconName="text-align-left" className={btnIconClass} />
           </div>
         </div>
       )}
     </div>
-  )
-}
+  );
+};
 
-export {Navbar}
+export { Navbar };

src/_digifi/layout/components/sidebar/sidebar-menu/SidebarMenuMain.tsx

@@ -17,7 +17,7 @@ const SidebarMenuMain = () => {
       {/*<SidebarMenuItem to='/builder' icon='switch' title='Layout Builder' fontIcon='bi-layers' />*/}
       <div className='menu-item'>
         <div className='menu-content pt-8 pb-2'>
-          <span className='menu-section text-muted text-uppercase fs-8 ls-1'>Crafted</span>
+          <span className='menu-section text-muted text-uppercase fs-8 ls-1'>Loan</span>
         </div>
       </div>
       <SidebarMenuItemWithSub
@@ -87,7 +87,7 @@ const SidebarMenuMain = () => {
 
       <div className='menu-item'>
         <div className='menu-content pt-8 pb-2'>
-          <span className='menu-section text-muted text-uppercase fs-8 ls-1'>Apps</span>
+          <span className='menu-section text-muted text-uppercase fs-8 ls-1'>Tools</span>
         </div>
       </div>
 
@@ -103,11 +103,30 @@ const SidebarMenuMain = () => {
       </SidebarMenuItemWithSub> */}
 
       <SidebarMenuItem
-        to='/apps/user-management/users'
+        to='/tools/user-management/users'
         icon='abstract-28'
         title='User management'
         fontIcon='bi-layers'
       />
+
+
+      <div className='menu-item'>
+        <div className='menu-content pt-8 pb-2'>
+          <span className='menu-section text-muted text-uppercase fs-8 ls-1'>Employers</span>
+        </div>
+      </div>
+      <SidebarMenuItem
+        to='employers/employerslist'
+        icon='abstract-28'
+        title='List'
+        fontIcon='bi-layers'
+      />
+      <SidebarMenuItem
+        to='employers/signatory'
+        icon='abstract-28'
+        title='Signatory'
+        fontIcon='bi-layers'
+      />
       {/*<div className='menu-item'>*/}
       {/*  <a*/}
       {/*    target='_blank'*/}

src/_digifi/partials/layout/header-menus/HeaderUserMenu.tsx

@@ -1,64 +1,99 @@
-
-import {FC} from 'react'
-import {Link} from 'react-router-dom'
-import {useAuth} from '../../../../app/modules/auth'
-import {Languages} from './Languages'
-import {toAbsoluteUrl} from '../../../helpers'
+import { FC, useEffect } from 'react';
+import { Link } from 'react-router-dom';
+import { useAuth } from '../../../../app/modules/auth';
+import { Languages } from './Languages';
+import { toAbsoluteUrl } from '../../../helpers';
 
 const HeaderUserMenu: FC = () => {
-  const {currentUser, logout} = useAuth()
+  const { currentUser, logout } = useAuth();
+
+  // Listen for user activity and trigger logout
+  useEffect(() => {
+    let timeout: number;
+    const inactiveTime: number = 7 * 60 * 1000; //default inactive period (milliseconds)
+    // Logout user after inactiveTime minutes of inactivity
+    const resetTimeout = () => {
+      clearTimeout(timeout);
+      // Set logout timeout
+      timeout = window.setTimeout(() => {
+        logout();
+      }, inactiveTime);
+    };
+
+    const handleUserActivity: any = () => {
+      resetTimeout(); // reset session on user activity
+    };
+
+    document.addEventListener('mousemove', handleUserActivity);
+    document.addEventListener('keydown', handleUserActivity);
+    document.addEventListener('click', handleUserActivity);
+    document.addEventListener('focus', handleUserActivity);
+
+    // Initialize timeout
+    resetTimeout();
+
+    // Remove event listeners on unmount
+    return () => {
+      clearTimeout(timeout);
+      document.removeEventListener('mousemove', handleUserActivity);
+      document.removeEventListener('keydown', handleUserActivity);
+      document.removeEventListener('click', handleUserActivity);
+      document.removeEventListener('focus', handleUserActivity);
+    };
+  }, [logout]);
+
   return (
     <div
-      className='menu menu-sub menu-sub-dropdown menu-column menu-rounded menu-gray-600 menu-state-bg menu-state-primary fw-bold py-4 fs-6 w-275px'
-      data-kt-menu='true'
+      className="menu menu-sub menu-sub-dropdown menu-column menu-rounded menu-gray-600 menu-state-bg menu-state-primary fw-bold py-4 fs-6 w-275px"
+      data-kt-menu="true"
     >
-      <div className='menu-item px-3'>
-        <div className='menu-content d-flex align-items-center px-3'>
-          <div className='symbol symbol-50px me-5'>
-            <img alt='Logo' src={toAbsoluteUrl('media/avatars/300-3.jpg')} />
+      <div className="menu-item px-3">
+        <div className="menu-content d-flex align-items-center px-3">
+          <div className="symbol symbol-50px me-5">
+            <img alt="Logo" src={toAbsoluteUrl('media/avatars/300-3.jpg')} />
           </div>
 
-          <div className='d-flex flex-column'>
-            <div className='fw-bolder d-flex align-items-center fs-5'>
+          <div className="d-flex flex-column">
+            <div className="fw-bolder d-flex align-items-center fs-5">
               {currentUser?.first_name} {currentUser?.first_name}
               {/*<span className='badge badge-light-success fw-bolder fs-8 px-2 py-1 ms-2'>Pro</span>*/}
             </div>
-            <a href='#' className='fw-bold text-muted text-hover-primary fs-7'>
+            <a href="#" className="fw-bold text-muted text-hover-primary fs-7">
               {currentUser?.email}
             </a>
           </div>
         </div>
       </div>
 
-      <div className='separator my-2'></div>
+      {/* <div className="separator my-2"></div> */}
 
-      <div className='menu-item px-5'>
+      {/* <div className='menu-item px-5'>
         <Link to={'/crafted/pages/profile'} className='menu-link px-5'>
           My Profile
         </Link>
-      </div>
+      </div> */}
 
-      <div className='menu-item px-5'>
+      {/* <div className='menu-item px-5'>
         <a href='#' className='menu-link px-5'>
           <span className='menu-text'>My Projects</span>
           <span className='menu-badge'>
             <span className='badge badge-light-danger badge-circle fw-bolder fs-7'>3</span>
           </span>
         </a>
-      </div>
+      </div> */}
 
-      <div
-        className='menu-item px-5'
-        data-kt-menu-trigger='hover'
-        data-kt-menu-placement='left-start'
-        data-kt-menu-flip='bottom'
+      {/* <div
+        className="menu-item px-5"
+        data-kt-menu-trigger="hover"
+        data-kt-menu-placement="left-start"
+        data-kt-menu-flip="bottom"
       >
         <a href='#' className='menu-link px-5'>
           <span className='menu-title'>My Subscription</span>
           <span className='menu-arrow'></span>
         </a>
 
-        <div className='menu-sub menu-sub-dropdown w-175px py-4'>
+        <div className="menu-sub menu-sub-dropdown w-175px py-4">
           <div className='menu-item px-3'>
             <a href='#' className='menu-link px-5'>
               Referrals
@@ -88,7 +123,7 @@ const HeaderUserMenu: FC = () => {
             </a>
           </div>
 
-          <div className='separator my-2'></div>
+          <div className="separator my-2"></div>
 
           <div className='menu-item px-3'>
             <div className='menu-content px-3'>
@@ -105,31 +140,31 @@ const HeaderUserMenu: FC = () => {
             </div>
           </div>
         </div>
-      </div>
+      </div> */}
 
-      <div className='menu-item px-5'>
+      {/* <div className='menu-item px-5'>
         <a href='#' className='menu-link px-5'>
           My Statements
         </a>
-      </div>
+      </div> */}
 
-      <div className='separator my-2'></div>
+      <div className="separator my-2"></div>
 
-      <Languages />
+      {/* <Languages /> */}
 
-      <div className='menu-item px-5 my-1'>
+      {/* <div className='menu-item px-5 my-1'>
         <Link to='/crafted/account/settings' className='menu-link px-5'>
           Account Settings
         </Link>
-      </div>
+      </div> */}
 
-      <div className='menu-item px-5'>
-        <a onClick={logout} className='menu-link px-5'>
+      <div className="menu-item px-5">
+        <a onClick={logout} className="menu-link px-5">
           Sign Out
         </a>
       </div>
     </div>
-  )
-}
+  );
+};
 
-export {HeaderUserMenu}
+export { HeaderUserMenu };

src/app/App.tsx

@@ -5,6 +5,7 @@ import {LayoutProvider, LayoutSplashScreen} from '../_digifi/layout/core'
 import {MasterInit} from '../_digifi/layout/MasterInit'
 import {AuthInit} from './modules/auth'
 import {ThemeModeProvider} from '../_digifi/partials'
+import { CustomModalProvider } from '../context/CustomModal'
 
 const App = () => {
   return (
@@ -12,10 +13,12 @@ const App = () => {
       <I18nProvider>
         <LayoutProvider>
           <ThemeModeProvider>
-            <AuthInit>
-              <Outlet />
-              <MasterInit />
-            </AuthInit>
+            <CustomModalProvider>
+              <AuthInit>
+                <Outlet />
+                <MasterInit />
+              </AuthInit>
+            </CustomModalProvider>
           </ThemeModeProvider>
         </LayoutProvider>
       </I18nProvider>

src/app/modules/apps/user-management/UsersPage.tsx

@@ -5,7 +5,7 @@ import {UsersListWrapper} from './users-list/UsersList'
 const usersBreadcrumbs: Array<PageLink> = [
   {
     title: 'User Management',
-    path: '/apps/user-management/users',
+    path: '/tools/user-management/users',
     isSeparator: false,
     isActive: false,
   },
@@ -31,7 +31,7 @@ const UsersPage = () => {
           }
         />
       </Route>
-      <Route index element={<Navigate to='/apps/user-management/users' />} />
+      <Route index element={<Navigate to='/tools/user-management/users' />} />
     </Routes>
   )
 }

src/app/modules/employers/employers-list/UsersPage.tsx

@@ -0,0 +1,49 @@
+import {Route, Routes, Outlet, Navigate} from 'react-router-dom'
+import {PageLink, PageTitle} from '../../../../_digifi/layout/core'
+import {UsersListWrapper} from './users-list/UsersList'
+import {UsersListWrapper as SignatoryList} from './signatory-list/UsersList'
+
+const usersBreadcrumbs: Array<PageLink> = [
+  {
+    title: 'Employer Management',
+    path: '/employers/employerslist',
+    isSeparator: false,
+    isActive: false,
+  },
+  {
+    title: '',
+    path: '',
+    isSeparator: true,
+    isActive: false,
+  },
+]
+
+const EmployersPage = () => {
+  return (
+    <Routes>
+      <Route element={<Outlet />}>
+        <Route
+          path='employerslist'
+          element={
+            <>
+              <PageTitle breadcrumbs={usersBreadcrumbs}>Employers list</PageTitle>
+              <UsersListWrapper />
+            </>
+          }
+        />
+        <Route
+          path='signatory'
+          element={
+            <>
+              <PageTitle breadcrumbs={usersBreadcrumbs}>Signatory list</PageTitle>
+              <SignatoryList />
+            </>
+          }
+        />
+      </Route>
+      <Route index element={<Navigate to='/employers/employerslist' />} />
+    </Routes>
+  )
+}
+
+export default EmployersPage

src/app/modules/employers/employers-list/signatory-list/UsersList.tsx

@@ -1,6 +1,6 @@
 import {ListViewProvider, useListView} from './core/ListViewProvider'
 import {QueryRequestProvider} from './core/QueryRequestProvider'
-import {QueryResponseProvider} from './core/QueryResponseProvider'
+import {QueryResponseProvider, useAllResponse} from './core/QueryResponseProvider'
 import {UsersListHeader} from './components/header/UsersListHeader'
 import {UsersTable} from './table/UsersTable'
 import {UserEditModal} from './user-edit-modal/UserEditModal'
@@ -9,6 +9,8 @@ import { ToolbarWrapper } from '../../../../../_digifi/layout/components/toolbar
 import { Content } from '../../../../../_digifi/layout/components/content'
 
 const UsersList = () => {
+  const response = useAllResponse()
+  // console.log('RESPONSE', response)
   const {itemIdForUpdate} = useListView()
   return (
     <>

src/app/modules/employers/employers-list/signatory-list/add-signatory-modal/AddSignatoryModal.tsx

@@ -0,0 +1,44 @@
+import {useEffect} from 'react'
+import {AddSignatoryModalHeader} from './AddSignatoryModalHeader'
+import {AddSignatoryModalFormWrapper} from './AddSignatoryModalFormWrapper'
+
+const AddSignatoryModal = () => {
+  useEffect(() => {
+    document.body.classList.add('modal-open')
+    return () => {
+      document.body.classList.remove('modal-open')
+    }
+  }, [])
+
+  return (
+    <>
+      <div
+        className='modal fade show d-block'
+        id='kt_modal_add_user'
+        role='dialog'
+        tabIndex={-1}
+        aria-modal='true'
+      >
+        {/* begin::Modal dialog */}
+        <div className='modal-dialog modal-dialog-centered mw-650px'>
+          {/* begin::Modal content */}
+          <div className='modal-content'>
+            <AddSignatoryModalHeader />
+            {/* begin::Modal body */}
+            <div className='modal-body scroll-y mx-5 mx-xl-15 my-7'>
+              <AddSignatoryModalFormWrapper />
+            </div>
+            {/* end::Modal body */}
+          </div>
+          {/* end::Modal content */}
+        </div>
+        {/* end::Modal dialog */}
+      </div>
+      {/* begin::Modal Backdrop */}
+      <div className='modal-backdrop fade show'></div>
+      {/* end::Modal Backdrop */}
+    </>
+  )
+}
+
+export {AddSignatoryModal}

src/app/modules/employers/employers-list/signatory-list/add-signatory-modal/AddSignatoryModalForm.tsx

@@ -26,7 +26,7 @@ const editUserSchema = Yup.object().shape({
     .required('Name is required'),
 })
 
-const UserEditModalForm: FC<Props> = ({user, isUserLoading}) => {
+const AddSignatoryModalForm: FC<Props> = ({user, isUserLoading}) => {
   const {setItemIdForUpdate} = useListView()
   const {refetch} = useQueryResponse()
 
@@ -404,4 +404,4 @@ const UserEditModalForm: FC<Props> = ({user, isUserLoading}) => {
   )
 }
 
-export {UserEditModalForm}
+export {AddSignatoryModalForm}

src/app/modules/employers/employers-list/signatory-list/add-signatory-modal/AddSignatoryModalFormWrapper.tsx

@@ -1,10 +1,10 @@
 import {useQuery} from 'react-query'
-import {UserEditModalForm} from './UserEditModalForm'
+import {AddSignatoryModalForm} from './AddSignatoryModalForm'
 import {isNotEmpty, QUERIES} from '../../../../../../_digifi/helpers'
 import {useListView} from '../core/ListViewProvider'
 import {getUserById} from '../core/_requests'
 
-const UserEditModalFormWrapper = () => {
+const AddSignatoryModalFormWrapper = () => {
   const {itemIdForUpdate, setItemIdForUpdate} = useListView()
   const enabledQuery: boolean = isNotEmpty(itemIdForUpdate)
   const {
@@ -27,14 +27,14 @@ const UserEditModalFormWrapper = () => {
   )
 
   if (!itemIdForUpdate) {
-    return <UserEditModalForm isUserLoading={isLoading} user={{id: undefined}} />
+    return <AddSignatoryModalForm isUserLoading={isLoading} user={{id: undefined}} />
   }
 
   if (!isLoading && !error && user) {
-    return <UserEditModalForm isUserLoading={isLoading} user={user} />
+    return <AddSignatoryModalForm isUserLoading={isLoading} user={user} />
   }
 
   return null
 }
 
-export {UserEditModalFormWrapper}
+export {AddSignatoryModalFormWrapper}

src/app/modules/employers/employers-list/signatory-list/add-signatory-modal/AddSignatoryModalHeader.tsx

@@ -1,7 +1,7 @@
 import {KTIcon} from '../../../../../../_digifi/helpers'
 import {useListView} from '../core/ListViewProvider'
 
-const UserEditModalHeader = () => {
+const AddSignatoryModalHeader = () => {
   const {setItemIdForUpdate} = useListView()
 
   return (
@@ -24,4 +24,4 @@ const UserEditModalHeader = () => {
   )
 }
 
-export {UserEditModalHeader}
+export {AddSignatoryModalHeader}

src/app/modules/employers/employers-list/signatory-list/components/header/UserListToolbar.tsx

@@ -10,9 +10,7 @@ const UsersListToolbar = () => {
 
   return (
     <div className='d-flex justify-content-end' data-kt-user-table-toolbar='base'>
-      <UsersListFilter />
-
-      {/* begin::Export */}
+          {/* begin::Export */}
       {/* <button type='button' className='btn btn-light-primary me-3'>
         <KTIcon iconName='exit-up' className='fs-2' />
         Export
@@ -20,11 +18,13 @@ const UsersListToolbar = () => {
       {/* end::Export */}
 
       {/* begin::Add user */}
-      {/* <button type='button' className='btn btn-primary' onClick={openAddUserModal}>
+      {/* <button type='button' className='btn btn-primary me-3' onClick={openAddUserModal}>
         <KTIcon iconName='plus' className='fs-2' />
-        Add User
+        Add New
       </button> */}
       {/* end::Add user */}
+
+      <UsersListFilter />
     </div>
   )
 }

src/app/modules/employers/employers-list/signatory-list/core/QueryResponseProvider.tsx

@@ -11,7 +11,7 @@ import {
   stringifyRequestQuery,
   WithChildren,
 } from '../../../../../../_digifi/helpers'
-import {getStartedUsers} from './_requests'
+import {getSignatoryList} from './_requests'
 import {User} from './_models'
 import {useQueryRequest} from './QueryRequestProvider'
 
@@ -32,9 +32,9 @@ const QueryResponseProvider: FC<WithChildren> = ({children}) => {
     refetch,
     data: response,
   } = useQuery(
-    `${QUERIES.USERS_LIST}-${query}`,
+    `${QUERIES.SIGNATORY_LIST}-${query}`,
     () => {
-      return getStartedUsers(query)
+      return getSignatoryList(query)
     },
     {cacheTime: 0, keepPreviousData: true, refetchOnWindowFocus: false}
   )
@@ -53,10 +53,17 @@ const useQueryResponseData = () => {
   if (!response) {
     return []
   }
-
   return response?.records || []
 }
 
+const useAllResponse = () => {
+  const {response} = useQueryResponse()
+  if (!response) {
+    return []
+  }
+  return response || []
+}
+
 const useQueryResponsePagination = () => {
   const defaultPaginationState: PaginationState = {
     links: [],
@@ -82,4 +89,5 @@ export {
   useQueryResponseData,
   useQueryResponsePagination,
   useQueryResponseLoading,
+  useAllResponse
 }

src/app/modules/employers/employers-list/signatory-list/core/_models.ts

@@ -0,0 +1,34 @@
+import {ID, Response} from '../../../../../../_digifi/helpers'
+export type User = {
+  id?: ID
+  name?: string
+  avatar?: string
+  // email?: string
+  // position?: string
+  // role?: string
+  // last_login?: string
+  // two_steps?: boolean
+  // joined_day?: string
+  // online?: boolean
+  // initials?: {
+  //   label: string
+  //   state: string
+  // }
+  uid?: string
+  added?: string
+  updated?: string
+  email?: string
+  employer_name?: string
+  title?: string
+  phone?: string
+}
+
+export type UsersQueryResponse = Response<Array<User>>
+
+export const initialUser: User = {
+  avatar: 'avatars/300-6.jpg',
+  // position: 'Art Director',
+  // role: 'Administrator',
+  name: '',
+  email: '',
+}

src/app/modules/employers/employers-list/signatory-list/core/_requests.ts

@@ -13,9 +13,9 @@ const NEW_USER_ENDPOINT = import.meta.env.VITE_APP_USER_ENDPOINT
 //     .get(`${GET_USERS_URL}?${query}`)
 //     .then((d: AxiosResponse<UsersQueryResponse>) => d.data);
 // };
-const getStartedUsers = (query: string): Promise<UsersQueryResponse> => { // FUNCTION TO GET USERS THAT HAVE STARTED LOAN APPLICATION
+const getSignatoryList = (query: string): Promise<UsersQueryResponse> => { // FUNCTION TO GET EMPLOYERS LIST
   return axios
-    .get(`${NEW_USER_ENDPOINT}/loan/started`)
+    .get(`${NEW_USER_ENDPOINT}/employers/signatory`)
     .then((d: AxiosResponse<UsersQueryResponse>) => d.data);
 };
 
@@ -50,7 +50,7 @@ const deleteSelectedUsers = (userIds: Array<ID>): Promise<void> => {
 };
 
 export {
-  getStartedUsers,
+  getSignatoryList,
   deleteUser,
   deleteSelectedUsers,
   getUserById,

src/app/modules/employers/employers-list/signatory-list/table/columns/Phone.tsx

@@ -0,0 +1,11 @@
+import {FC} from 'react'
+
+type Props = {
+  phone?: string
+}
+
+const Phone: FC<Props> = ({phone}) => (
+  <div className='badge badge-light fw-bolder'>{phone}</div>
+)
+
+export {Phone}

src/app/modules/employers/employers-list/signatory-list/table/columns/UserActionsCell.tsx

@@ -56,6 +56,14 @@ const UserActionsCell: FC<Props> = ({id}) => {
         </div>
         {/* end::Menu item */}
 
+        {/* begin::Menu item */}
+        {/* <div className='menu-item px-3'>
+          <a className='menu-link px-3' onClick={openEditModal}>
+            Add Signatory
+          </a>
+        </div> */}
+        {/* end::Menu item */}
+
         {/* begin::Menu item */}
         <div className='menu-item px-3'>
           <a

src/app/modules/employers/employers-list/signatory-list/table/columns/UserInfoCell.tsx

@@ -25,14 +25,14 @@ const UserInfoCell: FC<Props> = ({user}) => (
               `text-${user.initials?.state}`
             )}
           >
-            {user.firstname?.substring(0,1).toUpperCase()} {user.lastname?.substring(0,1).toUpperCase()}
+            {user.name?.substring(0,1).toUpperCase()} {user.name?.substring(0,1).toUpperCase()}
           </div>
         )}
       </a>
     </div>
     <div className='d-flex flex-column'>
       <a href='#' className='text-gray-800 text-hover-primary mb-1'>
-      {user.firstname} {user.lastname}
+      {user.name}
       </a>
       <span>{user.email}</span>
     </div>

src/app/modules/employers/employers-list/signatory-list/table/columns/_columns.tsx

@@ -8,6 +8,7 @@ import {UserCustomHeader} from './UserCustomHeader'
 import {UserSelectionHeader} from './UserSelectionHeader'
 import {User} from '../../core/_models'
 import { AddedCell } from './AddedCell'
+import { Phone } from './Phone'
 
 const usersColumns: ReadonlyArray<Column<User>> = [
   {
@@ -17,26 +18,26 @@ const usersColumns: ReadonlyArray<Column<User>> = [
   },
   {
     Header: (props) => <UserCustomHeader tableProps={props} title='Name' className='min-w-125px' />,
-    id: 'firstname',
+    id: 'name',
     Cell: ({...props}) => <UserInfoCell user={props.data[props.row.index]} />,
   },
+  // {
+  //   Header: (props) => <UserCustomHeader tableProps={props} title='Max Loan' className='min-w-125px' />,
+  //   accessor: 'max_loan',
+  // },
   {
-    Header: (props) => <UserCustomHeader tableProps={props} title='Amount' className='min-w-125px' />,
-    accessor: 'loan_amount',
+    Header: (props) => (
+      <UserCustomHeader tableProps={props} title='Phone' className='min-w-125px' />
+    ),
+    id: 'phone',
+    Cell: ({...props}) => <Phone phone={props.data[props.row.index].phone} />,
   },
   {
     Header: (props) => (
-      <UserCustomHeader tableProps={props} title='Payment Terms' className='min-w-125px' />
+      <UserCustomHeader tableProps={props} title='Employer Name' className='min-w-125px' />
     ),
-    id: 'payment_month',
-    Cell: ({...props}) => <PaymentMonthCell payment_month={props.data[props.row.index].payment_month} />,
-  },
-  {
-    Header: (props) => (
-      <UserCustomHeader tableProps={props} title='Agent' className='min-w-125px' />
-    ),
-    id: 'sales_agent',
-    Cell: ({...props}) => <AgentCell agent={props.data[props.row.index].sales_agent} />,
+    id: 'employer_name',
+    Cell: ({...props}) => <PaymentMonthCell payment_month={props.data[props.row.index].employer_name} />,
   },
   {
     Header: (props) => (

src/app/modules/employers/employers-list/signatory-list/user-edit-modal/UserEditModalHeader.tsx

@@ -7,7 +7,7 @@ const UserEditModalHeader = () => {
   return (
     <div className='modal-header'>
       {/* begin::Modal title */}
-      <h2 className='fw-bolder'>Add User</h2>
+      <h2 className='fw-bolder'>Edit Signatory</h2>
       {/* end::Modal title */}
 
       {/* begin::Close */}

src/app/modules/employers/employers-list/users-list/UsersList.tsx

@@ -7,9 +7,13 @@ import {UserEditModal} from './user-edit-modal/UserEditModal'
 import {KTCard} from '../../../../../_digifi/helpers'
 import { ToolbarWrapper } from '../../../../../_digifi/layout/components/toolbar'
 import { Content } from '../../../../../_digifi/layout/components/content'
+import { AddSignatoryModal } from './add-signatory-modal/Modal'
+import { useCustomModal } from '../../../../../context/CustomModal'
 
 const UsersList = () => {
   const {itemIdForUpdate} = useListView()
+  const {MODALNAMES, showCustomModal} = useCustomModal()
+
   return (
     <>
       <KTCard>
@@ -17,6 +21,7 @@ const UsersList = () => {
         <UsersTable />
       </KTCard>
       {itemIdForUpdate !== undefined && <UserEditModal />}
+      {(showCustomModal && showCustomModal.name == MODALNAMES.addSignatory) && <AddSignatoryModal />}
     </>
   )
 }

src/app/modules/employers/employers-list/users-list/add-signatory-modal/Modal.tsx

@@ -0,0 +1,46 @@
+import {useEffect} from 'react'
+import { ModalHeader } from './ModalHeader'
+import { ModalFormWrapper } from './ModalFormWrapper'
+
+
+const AddSignatoryModal = () => {
+
+  useEffect(() => {
+    document.body.classList.add('modal-open')
+    return () => {
+      document.body.classList.remove('modal-open')
+    }
+  }, [])
+
+  return (
+    <>
+      <div
+        className='modal fade show d-block'
+        id='kt_modal_add_user'
+        role='dialog'
+        tabIndex={-1}
+        aria-modal='true'
+      >
+        {/* begin::Modal dialog */}
+        <div className='modal-dialog modal-dialog-centered mw-650px'>
+          {/* begin::Modal content */}
+          <div className='modal-content'>
+            <ModalHeader />
+            {/* begin::Modal body */}
+            <div className='modal-body scroll-y mx-5 mx-xl-15 my-7'>
+              <ModalFormWrapper />
+            </div>
+            {/* end::Modal body */}
+          </div>
+          {/* end::Modal content */}
+        </div>
+        {/* end::Modal dialog */}
+      </div>
+      {/* begin::Modal Backdrop */}
+      <div className='modal-backdrop fade show'></div>
+      {/* end::Modal Backdrop */}
+    </>
+  )
+}
+
+export {AddSignatoryModal}

src/app/modules/employers/employers-list/users-list/add-signatory-modal/ModalForm.tsx

@@ -0,0 +1,332 @@
+import { FC, useState } from "react";
+import * as Yup from "yup";
+import { useFormik } from "formik";
+import { isNotEmpty, toAbsoluteUrl } from "../../../../../../_digifi/helpers";
+// import { initialUser, User } from "../core/_models";
+import { initialUser, User } from "../../signatory-list/core/_models";
+import clsx from "clsx";
+import { useListView } from "../core/ListViewProvider";
+import { UsersListLoading } from "../components/loading/UsersListLoading";
+import { createSignatory, updateUser } from "../core/_requests";
+import { useQueryResponse } from "../core/QueryResponseProvider";
+import { useCustomModal } from "../../../../../../context/CustomModal";
+
+type Props = {
+  isUserLoading: boolean;
+  user: User;
+};
+
+const editUserSchema = Yup.object().shape({
+  email: Yup.string()
+    .email('Wrong email format')
+    .min(3, 'Minimum 3 symbols')
+    .max(50, 'Maximum 50 symbols')
+    .required('required'),
+  name: Yup.string()
+    .min(3, "Minimum 3 symbols")
+    .max(50, "Maximum 50 symbols")
+    .required("required"),
+  phone: Yup.string()
+    .min(11, "Minimum 11 symbols")
+    .max(11, "Maximum 11 symbols")
+    .required("required"),
+  title: Yup.string()
+    .min(2, "Minimum 2 symbols")
+    .max(20, "Maximum 20 symbols")
+    .required("required"),
+});
+
+const ModalForm: FC<Props> = ({ user, isUserLoading }) => {
+
+  const {closeCustomModal, showCustomModal} = useCustomModal()
+
+  const { setItemIdForUpdate } = useListView();
+  const { refetch, isLoading } = useQueryResponse();
+
+  const [userForEdit] = useState<User>({
+    ...user,
+    avatar: user.avatar || initialUser.avatar,
+    // role: user.role || initialUser.role,
+    // position: user.position || initialUser.position,
+    name: user.name || initialUser.name,
+    // email: user.email || initialUser.email,
+  });
+
+  const cancel = (withRefresh?: boolean) => {
+    if (withRefresh) {
+      refetch();
+    }
+    setItemIdForUpdate(undefined);
+    closeCustomModal()
+  };
+
+  const blankImg = toAbsoluteUrl("media/svg/avatars/blank.svg");
+  const userAvatarImg = toAbsoluteUrl(`media/${userForEdit.avatar}`);
+
+  const formik = useFormik({
+    initialValues: userForEdit,
+    validationSchema: editUserSchema,
+    onSubmit: async (values, { setSubmitting }) => {
+      setSubmitting(true);
+      try {
+        if (isNotEmpty(values.id)) {
+          await updateUser(values);
+        } else {
+          await createSignatory({employer_uid:showCustomModal?.data?.id, ...values});
+        }
+      } catch (ex) {
+        console.error(ex);
+      } finally {
+        setSubmitting(true);
+        cancel(true);
+      }
+    },
+  });
+
+  return (
+    <>
+      <form
+        id="kt_modal_add_user_form"
+        className="form"
+        onSubmit={formik.handleSubmit}
+        noValidate
+      >
+        {/* begin::Scroll */}
+        <div
+          className="d-flex flex-column scroll-y me-n7 pe-7"
+          id="kt_modal_add_user_scroll"
+          data-kt-scroll="true"
+          data-kt-scroll-activate="{default: false, lg: true}"
+          data-kt-scroll-max-height="auto"
+          data-kt-scroll-dependencies="#kt_modal_add_user_header"
+          data-kt-scroll-wrappers="#kt_modal_add_user_scroll"
+          data-kt-scroll-offset="300px"
+        >
+          {/* begin::Input group */}
+          {/* <div className='fv-row mb-7'>
+
+            <label className='d-block fw-bold fs-6 mb-5'>Avatar</label>
+
+            <div
+              className='image-input image-input-outline'
+              data-kt-image-input='true'
+              style={{backgroundImage: `url('${blankImg}')`}}
+            >
+              <div
+                className='image-input-wrapper w-125px h-125px'
+                style={{backgroundImage: `url('${userAvatarImg}')`}}
+              ></div>
+
+              <label
+              className='btn btn-icon btn-circle btn-active-color-primary w-25px h-25px bg-body shadow'
+              data-kt-image-input-action='change'
+              data-bs-toggle='tooltip'
+              title='Change avatar'
+            >
+              <i className='bi bi-pencil-fill fs-7'></i>
+
+              <input type='file' name='avatar' accept='.png, .jpg, .jpeg' />
+              <input type='hidden' name='avatar_remove' />
+            </label>
+
+              <span
+              className='btn btn-icon btn-circle btn-active-color-primary w-25px h-25px bg-body shadow'
+              data-kt-image-input-action='cancel'
+              data-bs-toggle='tooltip'
+              title='Cancel avatar'
+            >
+              <i className='bi bi-x fs-2'></i>
+            </span>
+
+              <span
+              className='btn btn-icon btn-circle btn-active-color-primary w-25px h-25px bg-body shadow'
+              data-kt-image-input-action='remove'
+              data-bs-toggle='tooltip'
+              title='Remove avatar'
+            >
+              <i className='bi bi-x fs-2'></i>
+            </span>
+            </div>
+            <div className='form-text'>Allowed file types: png, jpg, jpeg.</div>
+          </div> */}
+          {/* end::Input group */}
+
+          {/* begin::Input group */}
+          <div className="fv-row mb-7">
+            {/* begin::Label */}
+            <label className="required fw-bold fs-6 mb-2">Name</label>
+            {/* end::Label */}
+
+            {/* begin::Input */}
+            <input
+              placeholder="Full name"
+              {...formik.getFieldProps("name")}
+              type="text"
+              name="name"
+              className={clsx(
+                "form-control form-control-solid mb-3 mb-lg-0",
+                { "is-invalid": formik.touched.name && formik.errors.name },
+                {
+                  "is-valid": formik.touched.name && !formik.errors.name,
+                }
+              )}
+              autoComplete="off"
+              disabled={formik.isSubmitting || isUserLoading}
+            />
+            {formik.touched.name && formik.errors.name && (
+              <div className="fv-plugins-message-container">
+                <div className="fv-help-block">
+                  <span role="alert">{formik.errors.name}</span>
+                </div>
+              </div>
+            )}
+            {/* end::Input */}
+          </div>
+          {/* end::Input group */}
+
+          {/* begin::Input group */}
+          <div className="fv-row mb-7">
+            {/* begin::Label */}
+            <label className="required fw-bold fs-6 mb-2">Title</label>
+            {/* end::Label */}
+
+            {/* begin::Input */}
+            <input
+              placeholder="title"
+              {...formik.getFieldProps("title")}
+              className={clsx(
+                "form-control form-control-solid mb-3 mb-lg-0",
+                { "is-invalid": formik.touched.title && formik.errors.title },
+                {
+                  "is-valid": formik.touched.title && !formik.errors.title,
+                }
+              )}
+              type="text"
+              name="title"
+              autoComplete="off"
+              disabled={formik.isSubmitting || isUserLoading}
+            />
+            {/* end::Input */}
+            {formik.touched.title && formik.errors.title && (
+              // <div className="fv-plugins-message-container">
+              //   <span role="alert">{formik.errors.title}</span>
+              // </div>
+              <div className="fv-plugins-message-container">
+                <div className="fv-help-block">
+                  <span role="alert">{formik.errors.title}</span>
+                </div>
+              </div>
+            )}
+          </div>
+          {/* end::Input group */}
+
+          {/* begin::Input group */}
+          <div className="fv-row mb-7">
+            {/* begin::Label */}
+            <label className="required fw-bold fs-6 mb-2">Phone</label>
+            {/* end::Label */}
+
+            {/* begin::Input */}
+            <input
+              placeholder="Phone"
+              {...formik.getFieldProps("phone")}
+              className={clsx(
+                "form-control form-control-solid mb-3 mb-lg-0",
+                { "is-invalid": formik.touched.title && formik.errors.title },
+                {
+                  "is-valid": formik.touched.title && !formik.errors.title,
+                }
+              )}
+              type="text"
+              name="phone"
+              autoComplete="off"
+              disabled={formik.isSubmitting || isUserLoading}
+            />
+            {/* end::Input */}
+            {formik.touched.phone && formik.errors.phone && (
+              <div className="fv-plugins-message-container">
+                <div className="fv-help-block">
+                  <span role="alert">{formik.errors.phone}</span>
+                </div>
+              </div>
+            )}
+          </div>
+          {/* end::Input group */}
+
+          {/* begin::Input group */}
+          <div className="fv-row mb-7">
+            {/* begin::Label */}
+            <label className="required fw-bold fs-6 mb-2">Email</label>
+            {/* end::Label */}
+
+            {/* begin::Input */}
+            <input
+              placeholder="Email"
+              {...formik.getFieldProps("email")}
+              className={clsx(
+                "form-control form-control-solid mb-3 mb-lg-0",
+                { "is-invalid": formik.touched.email && formik.errors.email },
+                {
+                  "is-valid": formik.touched.email && !formik.errors.email,
+                }
+              )}
+              type="email"
+              name="email"
+              autoComplete="off"
+              disabled={formik.isSubmitting || isUserLoading}
+            />
+            {/* end::Input */}
+            {formik.touched.email && formik.errors.email && (
+              <div className="fv-plugins-message-container">
+                <div className="fv-help-block">
+                  <span role="alert">{formik.errors.email}</span>
+                </div>
+              </div>
+            )}
+          </div>
+          {/* end::Input group */}
+
+
+        </div>
+        {/* end::Scroll */}
+
+        {/* begin::Actions */}
+        <div className="text-center pt-15">
+          <button
+            type="reset"
+            onClick={() => cancel()}
+            className="btn btn-danger me-3"
+            data-kt-users-modal-action="cancel"
+            disabled={formik.isSubmitting || isUserLoading}
+          >
+            Cancel
+          </button>
+
+          <button
+            type="submit"
+            className="btn btn-primary"
+            data-kt-users-modal-action="submit"
+            disabled={
+              isUserLoading ||
+              formik.isSubmitting ||
+              !formik.isValid ||
+              !formik.touched
+            }
+          >
+            <span className="indicator-label">Add</span>
+            {(formik.isSubmitting || isUserLoading) && (
+              <span className="indicator-progress">
+                Please wait...{" "}
+                <span className="spinner-border spinner-border-sm align-middle ms-2"></span>
+              </span>
+            )}
+          </button>
+        </div>
+        {/* end::Actions */}
+      </form>
+      {(formik.isSubmitting || isUserLoading) && <UsersListLoading />}
+    </>
+  );
+};
+
+export { ModalForm };

src/app/modules/employers/employers-list/users-list/add-signatory-modal/ModalFormWrapper.tsx

@@ -1,10 +1,10 @@
 import {useQuery} from 'react-query'
-import {UserEditModalForm} from './UserEditModalForm'
+import {ModalForm} from './ModalForm'
 import {isNotEmpty, QUERIES} from '../../../../../../_digifi/helpers'
 import {useListView} from '../core/ListViewProvider'
 import {getUserById} from '../core/_requests'
 
-const UserEditModalFormWrapper = () => {
+const ModalFormWrapper = () => {
   const {itemIdForUpdate, setItemIdForUpdate} = useListView()
   const enabledQuery: boolean = isNotEmpty(itemIdForUpdate)
   const {
@@ -27,14 +27,14 @@ const UserEditModalFormWrapper = () => {
   )
 
   if (!itemIdForUpdate) {
-    return <UserEditModalForm isUserLoading={isLoading} user={{id: undefined}} />
+    return <ModalForm isUserLoading={isLoading} user={{id: undefined}} />
   }
 
   if (!isLoading && !error && user) {
-    return <UserEditModalForm isUserLoading={isLoading} user={user} />
+    return <ModalForm isUserLoading={isLoading} user={user} />
   }
 
   return null
 }
 
-export {UserEditModalFormWrapper}
+export {ModalFormWrapper}

src/app/modules/employers/employers-list/users-list/add-signatory-modal/ModalHeader.tsx

@@ -0,0 +1,34 @@
+import {KTIcon} from '../../../../../../_digifi/helpers'
+import {useListView} from '../core/ListViewProvider'
+import { useCustomModal } from '../../../../../../context/CustomModal'
+
+const ModalHeader = () => {
+  const {setItemIdForUpdate, itemIdForUpdate} = useListView()
+  const {closeCustomModal} = useCustomModal()
+
+  const onClose = () => {
+    setItemIdForUpdate(undefined)
+    closeCustomModal()
+  }
+
+  return (
+    <div className='modal-header'>
+      {/* begin::Modal title */}
+      <h2 className='fw-bolder'>Add Signatory</h2>
+      {/* end::Modal title */}
+
+      {/* begin::Close */}
+      <div
+        className='btn btn-icon btn-sm btn-active-icon-primary'
+        data-kt-users-modal-action='close'
+        onClick={onClose}
+        style={{cursor: 'pointer'}}
+      >
+        <KTIcon iconName='cross' className='fs-1' />
+      </div>
+      {/* end::Close */}
+    </div>
+  )
+}
+
+export {ModalHeader}

src/app/modules/employers/employers-list/users-list/components/header/UserListToolbar.tsx

@@ -10,9 +10,7 @@ const UsersListToolbar = () => {
 
   return (
     <div className='d-flex justify-content-end' data-kt-user-table-toolbar='base'>
-      <UsersListFilter />
-
-      {/* begin::Export */}
+          {/* begin::Export */}
       {/* <button type='button' className='btn btn-light-primary me-3'>
         <KTIcon iconName='exit-up' className='fs-2' />
         Export
@@ -20,11 +18,13 @@ const UsersListToolbar = () => {
       {/* end::Export */}
 
       {/* begin::Add user */}
-      {/* <button type='button' className='btn btn-primary' onClick={openAddUserModal}>
+      <button type='button' className='btn btn-primary me-3' onClick={openAddUserModal}>
         <KTIcon iconName='plus' className='fs-2' />
-        Add User
-      </button> */}
+        Add New
+      </button>
       {/* end::Add user */}
+
+      <UsersListFilter />
     </div>
   )
 }

src/app/modules/employers/employers-list/users-list/core/QueryResponseProvider.tsx

@@ -11,7 +11,7 @@ import {
   stringifyRequestQuery,
   WithChildren,
 } from '../../../../../../_digifi/helpers'
-import {getStartedUsers} from './_requests'
+import {getEmployersList} from './_requests'
 import {User} from './_models'
 import {useQueryRequest} from './QueryRequestProvider'
 
@@ -32,9 +32,9 @@ const QueryResponseProvider: FC<WithChildren> = ({children}) => {
     refetch,
     data: response,
   } = useQuery(
-    `${QUERIES.USERS_LIST}-${query}`,
+    `${QUERIES.EMPLOYERS_LIST}-${query}`,
     () => {
-      return getStartedUsers(query)
+      return getEmployersList(query)
     },
     {cacheTime: 0, keepPreviousData: true, refetchOnWindowFocus: false}
   )
@@ -53,10 +53,17 @@ const useQueryResponseData = () => {
   if (!response) {
     return []
   }
-
   return response?.records || []
 }
 
+const useAllResponse = () => {
+  const {response} = useQueryResponse()
+  if (!response) {
+    return []
+  }
+  return response || []
+}
+
 const useQueryResponsePagination = () => {
   const defaultPaginationState: PaginationState = {
     links: [],
@@ -82,4 +89,5 @@ export {
   useQueryResponseData,
   useQueryResponsePagination,
   useQueryResponseLoading,
+  useAllResponse
 }

src/app/modules/employers/employers-list/users-list/core/_models.ts

@@ -0,0 +1,38 @@
+import {ID, Response} from '../../../../../../_digifi/helpers'
+export type User = {
+  id?: ID
+  name?: string
+  avatar?: string
+  // email?: string
+  // position?: string
+  // role?: string
+  // last_login?: string
+  // two_steps?: boolean
+  // joined_day?: string
+  // online?: boolean
+  // initials?: {
+  //   label: string
+  //   state: string
+  // }
+  uid?: string
+  percent_interest?: string
+  max_loan?: string
+  tenor?: string
+  retirement_age?: string
+  status?: string
+  sector?: string
+  salary_source?: string
+  added?: string
+  updated?: string
+  email?: string
+}
+
+export type UsersQueryResponse = Response<Array<User>>
+
+export const initialUser: User = {
+  avatar: 'avatars/300-6.jpg',
+  // position: 'Art Director',
+  // role: 'Administrator',
+  name: '',
+  email: '',
+}

src/app/modules/employers/employers-list/users-list/core/_requests.ts

@@ -0,0 +1,93 @@
+import axios, { AxiosResponse } from "axios";
+import { ID, Response } from "../../../../../../_digifi/helpers";
+import { User, UsersQueryResponse } from "./_models";
+import { UsersQueryResponse as SignatoryQueryResponse } from "../../signatory-list/core/_models";
+
+const API_URL = import.meta.env.VITE_APP_THEME_API_URL;
+const USER_URL = `${API_URL}/user`;
+// const GET_USERS_URL = `${API_URL}/users/query`;
+
+const NEW_USER_ENDPOINT = import.meta.env.VITE_APP_USER_ENDPOINT
+
+// const getStartedUsers = (query: string): Promise<UsersQueryResponse> => {
+//   return axios
+//     .get(`${GET_USERS_URL}?${query}`)
+//     .then((d: AxiosResponse<UsersQueryResponse>) => d.data);
+// };
+const getEmployersList = (query: string): Promise<UsersQueryResponse> => { // FUNCTION TO GET EMPLOYERS LIST
+  return axios
+    .get(`${NEW_USER_ENDPOINT}/employers`)
+    .then((d: AxiosResponse<UsersQueryResponse>) => d.data);
+};
+
+// const createUser = (user: any): Promise<User | undefined> => { // FUNCTION TO ADD/CREATE NEW USER
+//       const formData = new FormData();
+//       delete user.email
+//       delete user.role
+//       delete user.position
+//       delete user.avatar
+//       delete user.id
+//       for (let data in user) {
+//         formData.append(data, user[data]);
+//       }
+//   return axios
+//     .post(`${NEW_USER_ENDPOINT}/employer`, formData)
+//     .then((response: AxiosResponse<Response<User>>) => response.data)
+//     .then((response: Response<User>) => response.data);
+// };
+
+const createUser = (user: any): Promise<UsersQueryResponse | undefined> => { // FUNCTION TO ADD/CREATE NEW USER
+  const formData = new FormData();
+  delete user.avatar
+  delete user.id
+  for (let data in user) {
+    formData.append(data, user[data]);
+  }
+  return axios.post(`${NEW_USER_ENDPOINT}/employer`, formData)
+    .then((response: AxiosResponse<UsersQueryResponse>) => response.data)
+};
+
+const createSignatory = (user: any): Promise<SignatoryQueryResponse | undefined> => { // FUNCTION TO ADD/CREATE NEW Signatory
+  const formData = new FormData();
+  delete user.avatar
+  delete user.id
+  for (let data in user) {
+    formData.append(data, user[data]);
+  }
+  return axios.post(`${NEW_USER_ENDPOINT}/employers/signatory`, formData)
+    .then((response: AxiosResponse<SignatoryQueryResponse>) => response.data)
+};
+
+const getUserById = (id: ID): Promise<User | undefined> => {
+  return axios
+    .get(`${USER_URL}/${id}`)
+    .then((response: AxiosResponse<Response<User>>) => response.data)
+    .then((response: Response<User>) => response.data);
+};
+
+const updateUser = (user: User): Promise<User | undefined> => {
+  return axios
+    .post(`${USER_URL}/${user.id}`, user)
+    .then((response: AxiosResponse<Response<User>>) => response.data)
+    .then((response: Response<User>) => response.data);
+};
+
+const deleteUser = (userId: ID): Promise<void> => {
+  return axios.delete(`${USER_URL}/${userId}`).then(() => {});
+};
+
+const deleteSelectedUsers = (userIds: Array<ID>): Promise<void> => {
+  const requests = userIds.map((id) => axios.delete(`${USER_URL}/${id}`));
+  return axios.all(requests).then(() => {});
+};
+
+export {
+  getEmployersList,
+  createUser,
+  createSignatory,
+
+  deleteUser,
+  deleteSelectedUsers,
+  getUserById,
+  updateUser,
+};

src/app/modules/employers/employers-list/users-list/table/columns/MaxLoan.tsx

@@ -0,0 +1,12 @@
+import {FC} from 'react'
+import { formatNumbers } from '../../../../../../../_digifi/helpers/formatNumbers'
+
+type Props = {
+  max_loan?: string
+}
+
+const MaxLoan: FC<Props> = ({max_loan}) => (
+  <div className='badge badge-light fw-bolder'>{formatNumbers(max_loan)}</div>
+)
+
+export {MaxLoan}

src/app/modules/employers/employers-list/users-list/table/columns/UserActionsCell.tsx

@@ -6,6 +6,7 @@ import {ID, KTIcon, QUERIES} from '../../../../../../../_digifi/helpers'
 import {useListView} from '../../core/ListViewProvider'
 import {useQueryResponse} from '../../core/QueryResponseProvider'
 import {deleteUser} from '../../core/_requests'
+import { useCustomModal } from '../../../../../../../context/CustomModal'
 
 type Props = {
   id: ID
@@ -16,6 +17,8 @@ const UserActionsCell: FC<Props> = ({id}) => {
   const {query} = useQueryResponse()
   const queryClient = useQueryClient()
 
+  const {MODALNAMES, openCustomModal} = useCustomModal()
+
   useEffect(() => {
     MenuComponent.reinitialization()
   }, [])
@@ -56,6 +59,17 @@ const UserActionsCell: FC<Props> = ({id}) => {
         </div>
         {/* end::Menu item */}
 
+        {/* begin::Menu item */}
+        <div className='menu-item px-3'>
+          <a className='menu-link px-3' onClick={()=>{openCustomModal(MODALNAMES.addSignatory, {id})}}>
+            Add Signatory
+          </a>
+        </div>
+        {/* end::Menu item */}
+        <div className='px-3'>
+          <div className='separator separator-dashed'></div>
+        </div>
+
         {/* begin::Menu item */}
         <div className='menu-item px-3'>
           <a

src/app/modules/employers/employers-list/users-list/table/columns/UserInfoCell.tsx

@@ -25,14 +25,14 @@ const UserInfoCell: FC<Props> = ({user}) => (
               `text-${user.initials?.state}`
             )}
           >
-            {user.firstname?.substring(0,1).toUpperCase()} {user.lastname?.substring(0,1).toUpperCase()}
+            {user.name?.substring(0,1).toUpperCase()} {user.name?.substring(0,1).toUpperCase()}
           </div>
         )}
       </a>
     </div>
     <div className='d-flex flex-column'>
       <a href='#' className='text-gray-800 text-hover-primary mb-1'>
-      {user.firstname} {user.lastname}
+      {user.name}
       </a>
       <span>{user.email}</span>
     </div>

src/app/modules/employers/employers-list/users-list/table/columns/_columns.tsx

@@ -0,0 +1,65 @@
+import {Column} from 'react-table'
+import {UserInfoCell} from './UserInfoCell'
+import { PaymentMonthCell } from './UserLastLoginCell'
+import {AgentCell} from './AgentCell'
+import {UserActionsCell} from './UserActionsCell'
+import {UserSelectionCell} from './UserSelectionCell'
+import {UserCustomHeader} from './UserCustomHeader'
+import {UserSelectionHeader} from './UserSelectionHeader'
+import {User} from '../../core/_models'
+import { AddedCell } from './AddedCell'
+import { MaxLoan } from './MaxLoan'
+
+const usersColumns: ReadonlyArray<Column<User>> = [
+  {
+    Header: (props) => <UserSelectionHeader tableProps={props} />,
+    id: 'selection',
+    Cell: ({...props}) => <UserSelectionCell id={props.data[props.row.index].uid} />,
+  },
+  {
+    Header: (props) => <UserCustomHeader tableProps={props} title='Name' className='min-w-125px' />,
+    id: 'name',
+    Cell: ({...props}) => <UserInfoCell user={props.data[props.row.index]} />,
+  },
+  // {
+  //   Header: (props) => <UserCustomHeader tableProps={props} title='Max Loan' className='min-w-125px' />,
+  //   accessor: 'max_loan',
+  // },
+  {
+    Header: (props) => (
+      <UserCustomHeader tableProps={props} title='Max Loan' className='min-w-125px' />
+    ),
+    id: 'max_loan',
+    Cell: ({...props}) => <MaxLoan max_loan={props.data[props.row.index].max_loan} />,
+  },
+  {
+    Header: (props) => (
+      <UserCustomHeader tableProps={props} title='Percent Interest' className='min-w-125px' />
+    ),
+    id: 'percent_interest',
+    Cell: ({...props}) => <PaymentMonthCell payment_month={props.data[props.row.index].percent_interest} />,
+  },
+  {
+    Header: (props) => (
+      <UserCustomHeader tableProps={props} title='Retirement Age' className='min-w-125px' />
+    ),
+    id: 'retirement_age',
+    Cell: ({...props}) => <AgentCell agent={props.data[props.row.index].retirement_age} />,
+  },
+  {
+    Header: (props) => (
+      <UserCustomHeader tableProps={props} title='Added' className='min-w-125px' />
+    ),
+    id: 'added',
+    Cell: ({...props}) => <AddedCell added={props.data[props.row.index].added} />,
+  },
+  {
+    Header: (props) => (
+      <UserCustomHeader tableProps={props} title='Actions' className='text-end min-w-100px' />
+    ),
+    id: 'actions',
+    Cell: ({...props}) => <UserActionsCell id={props.data[props.row.index].uid} />,
+  },
+]
+
+export {usersColumns}

src/app/modules/employers/employers-list/users-list/user-edit-modal/UserEditModal.tsx

@@ -0,0 +1,46 @@
+import {useEffect} from 'react'
+import {UserEditModalHeader} from './UserEditModalHeader'
+import {UserEditModalFormWrapper} from './UserEditModalFormWrapper'
+
+
+const UserEditModal = () => {
+
+  useEffect(() => {
+    document.body.classList.add('modal-open')
+    return () => {
+      document.body.classList.remove('modal-open')
+    }
+  }, [])
+
+  return (
+    <>
+      <div
+        className='modal fade show d-block'
+        id='kt_modal_add_user'
+        role='dialog'
+        tabIndex={-1}
+        aria-modal='true'
+      >
+        {/* begin::Modal dialog */}
+        <div className='modal-dialog modal-dialog-centered mw-650px'>
+          {/* begin::Modal content */}
+          <div className='modal-content'>
+            <UserEditModalHeader />
+            {/* begin::Modal body */}
+            <div className='modal-body scroll-y mx-5 mx-xl-15 my-7'>
+              <UserEditModalFormWrapper />
+            </div>
+            {/* end::Modal body */}
+          </div>
+          {/* end::Modal content */}
+        </div>
+        {/* end::Modal dialog */}
+      </div>
+      {/* begin::Modal Backdrop */}
+      <div className='modal-backdrop fade show'></div>
+      {/* end::Modal Backdrop */}
+    </>
+  )
+}
+
+export {UserEditModal}

src/app/modules/employers/employers-list/users-list/user-edit-modal/UserEditModalForm copy.tsx

@@ -0,0 +1,575 @@
+import { FC, useState } from "react";
+import * as Yup from "yup";
+import { useFormik } from "formik";
+import { isNotEmpty, toAbsoluteUrl } from "../../../../../../_digifi/helpers";
+import { initialUser, User } from "../core/_models";
+import clsx from "clsx";
+import { useListView } from "../core/ListViewProvider";
+import { UsersListLoading } from "../components/loading/UsersListLoading";
+import { createUser, updateUser } from "../core/_requests";
+import { useAllResponse, useQueryResponse } from "../core/QueryResponseProvider";
+
+type Props = {
+  isUserLoading: boolean;
+  user: User;
+};
+
+const editUserSchema = Yup.object().shape({
+  // email: Yup.string()
+  //   .email('Wrong email format')
+  //   .min(3, 'Minimum 3 symbols')
+  //   .max(50, 'Maximum 50 symbols')
+  //   .required('required'),
+  name: Yup.string()
+    .min(3, "Minimum 3 symbols")
+    .max(50, "Maximum 50 symbols")
+    .required("required"),
+  percent_interest: Yup.string()
+    .min(3, "Minimum 3 symbols")
+    .max(50, "Maximum 50 symbols")
+    .required("required"),
+  max_loan: Yup.string()
+    .min(3, "Minimum 3 symbols")
+    .max(50, "Maximum 50 symbols")
+    .required("required"),
+  tenor: Yup.string()
+    .min(3, "Minimum 3 symbols")
+    .max(50, "Maximum 50 symbols")
+    .required("required"),
+  retirement_age: Yup.string()
+    .min(3, "Minimum 3 symbols")
+    .max(50, "Maximum 50 symbols")
+    .required("is required"),
+  sector: Yup.string()
+    .min(3, "Minimum 3 symbols")
+    .max(50, "Maximum 50 symbols")
+    .required("required"),
+  salary_source: Yup.string()
+    .min(3, "Minimum 3 symbols")
+    .max(50, "Maximum 50 symbols")
+    .required("required"),
+});
+
+const UserEditModalForm: FC<Props> = ({ user, isUserLoading }) => {
+  const response:any = useAllResponse()
+  console.log('response', response)
+
+  const { setItemIdForUpdate } = useListView();
+  const { refetch, isLoading } = useQueryResponse();
+
+  const [userForEdit] = useState<User>({
+    ...user,
+    avatar: user.avatar || initialUser.avatar,
+    role: user.role || initialUser.role,
+    position: user.position || initialUser.position,
+    name: user.name || initialUser.name,
+    email: user.email || initialUser.email,
+  });
+
+  const cancel = (withRefresh?: boolean) => {
+    if (withRefresh) {
+      refetch();
+    }
+    setItemIdForUpdate(undefined);
+  };
+
+  const blankImg = toAbsoluteUrl("media/svg/avatars/blank.svg");
+  const userAvatarImg = toAbsoluteUrl(`media/${userForEdit.avatar}`);
+
+  const formik = useFormik({
+    initialValues: userForEdit,
+    validationSchema: editUserSchema,
+    onSubmit: async (values, { setSubmitting }) => {
+      console.log('values', values)
+      setSubmitting(true);
+      // try {
+      //   if (isNotEmpty(values.id)) {
+      //     await updateUser(values);
+      //   } else {
+      //     await createUser(values);
+      //   }
+      // } catch (ex) {
+      //   console.error(ex);
+      // } finally {
+      //   setSubmitting(true);
+      //   cancel(true);
+      // }
+    },
+  });
+
+  return (
+    <>
+      <form
+        id="kt_modal_add_user_form"
+        className="form"
+        onSubmit={formik.handleSubmit}
+        noValidate
+      >
+        {/* begin::Scroll */}
+        <div
+          className="d-flex flex-column scroll-y me-n7 pe-7"
+          id="kt_modal_add_user_scroll"
+          data-kt-scroll="true"
+          data-kt-scroll-activate="{default: false, lg: true}"
+          data-kt-scroll-max-height="auto"
+          data-kt-scroll-dependencies="#kt_modal_add_user_header"
+          data-kt-scroll-wrappers="#kt_modal_add_user_scroll"
+          data-kt-scroll-offset="300px"
+        >
+          {/* begin::Input group */}
+          {/* <div className='fv-row mb-7'>
+
+            <label className='d-block fw-bold fs-6 mb-5'>Avatar</label>
+
+            <div
+              className='image-input image-input-outline'
+              data-kt-image-input='true'
+              style={{backgroundImage: `url('${blankImg}')`}}
+            >
+              <div
+                className='image-input-wrapper w-125px h-125px'
+                style={{backgroundImage: `url('${userAvatarImg}')`}}
+              ></div>
+
+              <label
+              className='btn btn-icon btn-circle btn-active-color-primary w-25px h-25px bg-body shadow'
+              data-kt-image-input-action='change'
+              data-bs-toggle='tooltip'
+              title='Change avatar'
+            >
+              <i className='bi bi-pencil-fill fs-7'></i>
+
+              <input type='file' name='avatar' accept='.png, .jpg, .jpeg' />
+              <input type='hidden' name='avatar_remove' />
+            </label>
+
+              <span
+              className='btn btn-icon btn-circle btn-active-color-primary w-25px h-25px bg-body shadow'
+              data-kt-image-input-action='cancel'
+              data-bs-toggle='tooltip'
+              title='Cancel avatar'
+            >
+              <i className='bi bi-x fs-2'></i>
+            </span>
+
+              <span
+              className='btn btn-icon btn-circle btn-active-color-primary w-25px h-25px bg-body shadow'
+              data-kt-image-input-action='remove'
+              data-bs-toggle='tooltip'
+              title='Remove avatar'
+            >
+              <i className='bi bi-x fs-2'></i>
+            </span>
+            </div>
+            <div className='form-text'>Allowed file types: png, jpg, jpeg.</div>
+          </div> */}
+          {/* end::Input group */}
+
+          {/* begin::Input group */}
+          <div className="fv-row mb-7">
+            {/* begin::Label */}
+            <label className="required fw-bold fs-6 mb-2">Full Name</label>
+            {/* end::Label */}
+
+            {/* begin::Input */}
+            <input
+              placeholder="Full name"
+              {...formik.getFieldProps("name")}
+              type="text"
+              name="name"
+              className={clsx(
+                "form-control form-control-solid mb-3 mb-lg-0",
+                { "is-invalid": formik.touched.name && formik.errors.name },
+                {
+                  "is-valid": formik.touched.name && !formik.errors.name,
+                }
+              )}
+              autoComplete="off"
+              disabled={formik.isSubmitting || isUserLoading}
+            />
+            {formik.touched.name && formik.errors.name && (
+              <div className="fv-plugins-message-container">
+                <div className="fv-help-block">
+                  <span role="alert">{formik.errors.name}</span>
+                </div>
+              </div>
+            )}
+            {/* end::Input */}
+          </div>
+          {/* end::Input group */}
+
+          {/* begin::Input group */}
+          <div className="fv-row mb-7">
+            {/* begin::Label */}
+            <label className="required fw-bold fs-6 mb-2">Interest</label>
+            {/* end::Label */}
+
+            {/* begin::Input */}
+            <input
+              placeholder="Interest"
+              {...formik.getFieldProps("interest")}
+              className={clsx(
+                "form-control form-control-solid mb-3 mb-lg-0",
+                { "is-invalid": formik.touched.percent_interest && formik.errors.percent_interest },
+                {
+                  "is-valid": formik.touched.percent_interest && !formik.errors.percent_interest,
+                }
+              )}
+              type="text"
+              name="percent_interest"
+              autoComplete="off"
+              disabled={formik.isSubmitting || isUserLoading}
+            />
+            {/* end::Input */}
+            {formik.touched.percent_interest && formik.errors.percent_interest && (
+              // <div className="fv-plugins-message-container">
+              //   <span role="alert">{formik.errors.percent_interest}</span>
+              // </div>
+              <div className="fv-plugins-message-container">
+                <div className="fv-help-block">
+                  <span role="alert">{formik.errors.percent_interest}</span>
+                </div>
+              </div>
+            )}
+          </div>
+          {/* end::Input group */}
+
+          {/* begin::Input group */}
+          <div className="fv-row mb-7">
+            {/* begin::Label */}
+            <label className="required fw-bold fs-6 mb-2">Max Loan</label>
+            {/* end::Label */}
+
+            {/* begin::Input */}
+            <input
+              placeholder="Max Loan"
+              {...formik.getFieldProps("max_loan")}
+              className={clsx(
+                "form-control form-control-solid mb-3 mb-lg-0",
+                { "is-invalid": formik.touched.max_loan && formik.errors.max_loan },
+                {
+                  "is-valid": formik.touched.max_loan && !formik.errors.max_loan,
+                }
+              )}
+              type="text"
+              name="max_loan"
+              autoComplete="off"
+              disabled={formik.isSubmitting || isUserLoading}
+            />
+            {/* end::Input */}
+            {formik.touched.max_loan && formik.errors.max_loan && (
+              <div className="fv-plugins-message-container">
+                <div className="fv-help-block">
+                  <span role="alert">{formik.errors.max_loan}</span>
+                </div>
+              </div>
+            )}
+          </div>
+          {/* end::Input group */}
+
+          {/* begin::Input group */}
+          <div className="fv-row mb-7">
+            {/* begin::Label */}
+            <label className="required fw-bold fs-6 mb-2">Tenor</label>
+            {/* end::Label */}
+
+            {/* begin::Input */}
+            <input
+              placeholder="Tenor"
+              {...formik.getFieldProps("tenor")}
+              className={clsx(
+                "form-control form-control-solid mb-3 mb-lg-0",
+                { "is-invalid": formik.touched.tenor && formik.errors.tenor },
+                {
+                  "is-valid": formik.touched.tenor && !formik.errors.tenor,
+                }
+              )}
+              type="text"
+              name="tenor"
+              autoComplete="off"
+              disabled={formik.isSubmitting || isUserLoading}
+            />
+            {/* end::Input */}
+            {formik.touched.tenor && formik.errors.tenor && (
+              <div className="fv-plugins-message-container">
+                <div className="fv-help-block">
+                  <span role="alert">{formik.errors.tenor}</span>
+                </div>
+              </div>
+            )}
+          </div>
+          {/* end::Input group */}
+
+          {/* begin::Input group */}
+          <div className="fv-row mb-7">
+            {/* begin::Label */}
+            <label className="required fw-bold fs-6 mb-2">Ret Age</label>
+            {/* end::Label */}
+
+            {/* begin::Input */}
+            <input
+              placeholder="Retirement Age"
+              {...formik.getFieldProps("retirement_age")}
+              className={clsx(
+                "form-control form-control-solid mb-3 mb-lg-0",
+                { "is-invalid": formik.touched.retirement_age && formik.errors.retirement_age },
+                {
+                  "is-valid": formik.touched.retirement_age && !formik.errors.retirement_age,
+                }
+              )}
+              type="text"
+              name="retirement_age"
+              autoComplete="off"
+              disabled={formik.isSubmitting || isUserLoading}
+            />
+            {/* end::Input */}
+            {formik.touched.retirement_age && formik.errors.retirement_age && (
+              <div className="fv-plugins-message-container">
+                <div className="fv-help-block">
+                  <span role="alert">{formik.errors.retirement_age}</span>
+                </div>
+              </div>
+            )}
+          </div>
+          {/* end::Input group */}
+
+          {/* begin::Input group */}
+          <div className="fv-row mb-7">
+            <label className="required fw-bold fs-6 mb-2">Sector</label>
+            <select
+                {...formik.getFieldProps("sector")}
+                className={clsx(
+                  "form-control form-control-solid mb-3 mb-lg-0",
+                  { "is-invalid": formik.touched.sector && formik.errors.sector },
+                  {
+                    "is-valid": formik.touched.sector && !formik.errors.sector,
+                  }
+                )}
+                name="sector"
+                autoComplete="off"
+                disabled={formik.isSubmitting || isUserLoading}
+              >
+                {isLoading ? 
+                <option value=''>Loading...</option>
+                :
+                <>
+                  <option value=''>Select Sector</option>
+                  {response?.employer_sector?.map((item:any) => (
+                    <option value={item.uid}>{item.name}</option>
+                  ))
+                  }
+                </>
+                }
+              </select>
+            {/* end::Input */}
+            {formik.touched.sector && formik.errors.sector && (
+              <div className="fv-plugins-message-container">
+                <div className="fv-help-block">
+                  <span role="alert">{formik.errors.sector}</span>
+                </div>
+              </div>
+            )}
+          </div>
+          {/* end::Input group */}
+
+          {/* begin::Input group */}
+          <div className="fv-row mb-7">
+            {/* begin::Label */}
+            <label className="required fw-bold fs-6 mb-2">Salary</label>
+            {/* end::Label */}
+
+            {/* begin::Input */}
+            <select
+              {...formik.getFieldProps("salary_source")}
+              className={clsx(
+                "form-control form-control-solid mb-3 mb-lg-0",
+                { "is-invalid": formik.touched.salary_source && formik.errors.salary_source },
+                {
+                  "is-valid": formik.touched.salary_source && !formik.errors.salary_source,
+                }
+              )}
+              name="salary_source"
+              autoComplete="off"
+              disabled={formik.isSubmitting || isUserLoading}
+            >
+              {isLoading ? 
+              <option value=''>Loading...</option>
+              :
+              <>
+                <option value=''>Select Salary Source</option>
+                {response?.salary_sources?.map((item:any) => (
+                  <option value={item.uid}>{item.name}</option>
+                ))
+                }
+              </>
+              }
+            </select>
+            {/* end::Input */}
+            {formik.touched.salary_source && formik.errors.salary_source && (
+              <div className="fv-plugins-message-container">
+                <div className="fv-help-block">
+                  <span role="alert">{formik.errors.salary_source}</span>
+                </div>
+              </div>
+            )}
+          </div>
+          {/* end::Input group */}
+
+
+
+
+
+          {/* begin::Input group */}
+          {/* <div className='mb-7'>
+            <label className='required fw-bold fs-6 mb-5'>Role</label>
+            <div className='d-flex fv-row'>
+              <div className='form-check form-check-custom form-check-solid'>
+                <input
+                  className='form-check-input me-3'
+                  {...formik.getFieldProps('role')}
+                  name='role'
+                  type='radio'
+                  value='Administrator'
+                  id='kt_modal_update_role_option_0'
+                  checked={formik.values.role === 'Administrator'}
+                  disabled={formik.isSubmitting || isUserLoading}
+                />
+                <label className='form-check-label' htmlFor='kt_modal_update_role_option_0'>
+                  <div className='fw-bolder text-gray-800'>Administrator</div>
+                  <div className='text-gray-600'>
+                    Best for business owners and company administrators
+                  </div>
+                </label>
+              </div>
+            </div>
+            <div className='separator separator-dashed my-5'></div>
+            <div className='d-flex fv-row'>
+              <div className='form-check form-check-custom form-check-solid'>
+                <input
+                  className='form-check-input me-3'
+                  {...formik.getFieldProps('role')}
+                  name='role'
+                  type='radio'
+                  value='Developer'
+                  id='kt_modal_update_role_option_1'
+                  checked={formik.values.role === 'Developer'}
+                  disabled={formik.isSubmitting || isUserLoading}
+                />
+                <label className='form-check-label' htmlFor='kt_modal_update_role_option_1'>
+                  <div className='fw-bolder text-gray-800'>Developer</div>
+                  <div className='text-gray-600'>
+                    Best for developers or people primarily using the API
+                  </div>
+                </label>
+              </div>
+            </div>
+            <div className='separator separator-dashed my-5'></div>
+            <div className='d-flex fv-row'>
+              <div className='form-check form-check-custom form-check-solid'>
+                <input
+                  className='form-check-input me-3'
+                  {...formik.getFieldProps('role')}
+                  name='role'
+                  type='radio'
+                  value='Analyst'
+                  id='kt_modal_update_role_option_2'
+                  checked={formik.values.role === 'Analyst'}
+                  disabled={formik.isSubmitting || isUserLoading}
+                />
+                <label className='form-check-label' htmlFor='kt_modal_update_role_option_2'>
+                  <div className='fw-bolder text-gray-800'>Analyst</div>
+                  <div className='text-gray-600'>
+                    Best for people who need full access to analytics data, but don't need to update
+                    business settings
+                  </div>
+                </label>
+              </div>
+            </div>
+            <div className='separator separator-dashed my-5'></div>
+            <div className='d-flex fv-row'>
+              <div className='form-check form-check-custom form-check-solid'>
+                <input
+                  className='form-check-input me-3'
+                  {...formik.getFieldProps('role')}
+                  name='role'
+                  type='radio'
+                  value='Support'
+                  id='kt_modal_update_role_option_3'
+                  checked={formik.values.role === 'Support'}
+                  disabled={formik.isSubmitting || isUserLoading}
+                />
+                <label className='form-check-label' htmlFor='kt_modal_update_role_option_3'>
+                  <div className='fw-bolder text-gray-800'>Support</div>
+                  <div className='text-gray-600'>
+                    Best for employees who regularly refund payments and respond to disputes
+                  </div>
+                </label>
+              </div>
+            </div>
+            <div className='separator separator-dashed my-5'></div>
+            <div className='d-flex fv-row'>
+              <div className='form-check form-check-custom form-check-solid'>
+                <input
+                  className='form-check-input me-3'
+                  {...formik.getFieldProps('role')}
+                  name='role'
+                  type='radio'
+                  id='kt_modal_update_role_option_4'
+                  value='Trial'
+                  checked={formik.values.role === 'Trial'}
+                  disabled={formik.isSubmitting || isUserLoading}
+                />
+                <label className='form-check-label' htmlFor='kt_modal_update_role_option_4'>
+                  <div className='fw-bolder text-gray-800'>Trial</div>
+                  <div className='text-gray-600'>
+                    Best for people who need to preview content data, but don't need to make any
+                    updates
+                  </div>
+                </label>
+              </div>
+            </div>
+          </div> */}
+          {/* end::Input group */}
+        </div>
+        {/* end::Scroll */}
+
+        {/* begin::Actions */}
+        <div className="text-center pt-15">
+          <button
+            type="reset"
+            onClick={() => cancel()}
+            className="btn btn-danger me-3"
+            data-kt-users-modal-action="cancel"
+            disabled={formik.isSubmitting || isUserLoading}
+          >
+            Cancel
+          </button>
+
+          <button
+            type="submit"
+            className="btn btn-primary"
+            data-kt-users-modal-action="submit"
+            disabled={
+              isUserLoading ||
+              formik.isSubmitting ||
+              !formik.isValid ||
+              !formik.touched
+            }
+          >
+            <span className="indicator-label">Add</span>
+            {(formik.isSubmitting || isUserLoading) && (
+              <span className="indicator-progress">
+                Please wait...{" "}
+                <span className="spinner-border spinner-border-sm align-middle ms-2"></span>
+              </span>
+            )}
+          </button>
+        </div>
+        {/* end::Actions */}
+      </form>
+      {(formik.isSubmitting || isUserLoading) && <UsersListLoading />}
+    </>
+  );
+};
+
+export { UserEditModalForm };

src/app/modules/employers/employers-list/users-list/user-edit-modal/UserEditModalForm.tsx

@@ -0,0 +1,460 @@
+import { FC, useState } from "react";
+import * as Yup from "yup";
+import { useFormik } from "formik";
+import { isNotEmpty, toAbsoluteUrl } from "../../../../../../_digifi/helpers";
+import { initialUser, User } from "../core/_models";
+import clsx from "clsx";
+import { useListView } from "../core/ListViewProvider";
+import { UsersListLoading } from "../components/loading/UsersListLoading";
+import { createUser, updateUser } from "../core/_requests";
+import { useAllResponse, useQueryResponse } from "../core/QueryResponseProvider";
+
+type Props = {
+  isUserLoading: boolean;
+  user: User;
+};
+
+const editUserSchema = Yup.object().shape({
+  // email: Yup.string()
+  //   .email('Wrong email format')
+  //   .min(3, 'Minimum 3 symbols')
+  //   .max(50, 'Maximum 50 symbols')
+  //   .required('required'),
+  name: Yup.string()
+    .min(3, "Minimum 3 symbols")
+    .max(50, "Maximum 50 symbols")
+    .required("required"),
+  percent_interest: Yup.number()
+    .typeError("Invalid number")
+    .min(1, "must be greater than 0")
+    // .test("no-e", "Invalid number", (value) => {
+    //   if (value && /\d+e/.test(value)) {
+    //     return false;
+    //   }
+    //   return true;
+    // })
+    .required("required"),
+  max_loan: Yup.number()
+    .typeError("Invalid number")
+    .min(1, "must be greater than 0")
+    .required("required"),
+  tenor: Yup.number()
+    .typeError("Invalid number")
+    .min(1, "must be greater than 0")
+    .required("required"),
+  retirement_age: Yup.number()
+    .typeError("Invalid number")
+    .min(1, "must be greater than 0")
+    .required("is required"),
+  sector: Yup.string()
+    .required("required"),
+  salary_source: Yup.string()
+    .required("required"),
+});
+
+const UserEditModalForm: FC<Props> = ({ user, isUserLoading }) => {
+  const response:any = useAllResponse()
+
+  const { setItemIdForUpdate } = useListView();
+  const { refetch, isLoading } = useQueryResponse();
+
+  const [userForEdit] = useState<User>({
+    ...user,
+    avatar: user.avatar || initialUser.avatar,
+    // role: user.role || initialUser.role,
+    // position: user.position || initialUser.position,
+    name: user.name || initialUser.name,
+    // email: user.email || initialUser.email,
+  });
+
+  const cancel = (withRefresh?: boolean) => {
+    if (withRefresh) {
+      refetch();
+    }
+    setItemIdForUpdate(undefined);
+  };
+
+  const blankImg = toAbsoluteUrl("media/svg/avatars/blank.svg");
+  const userAvatarImg = toAbsoluteUrl(`media/${userForEdit.avatar}`);
+
+  const formik = useFormik({
+    initialValues: userForEdit,
+    validationSchema: editUserSchema,
+    onSubmit: async (values, { setSubmitting }) => {
+      setSubmitting(true);
+      try {
+        if (isNotEmpty(values.id)) {
+          await updateUser(values);
+        } else {
+          await createUser(values);
+        }
+      } catch (ex) {
+        console.error(ex);
+      } finally {
+        setSubmitting(true);
+        cancel(true);
+      }
+    },
+  });
+
+  return (
+    <>
+      <form
+        id="kt_modal_add_user_form"
+        className="form"
+        onSubmit={formik.handleSubmit}
+        noValidate
+      >
+        {/* begin::Scroll */}
+        <div
+          className="d-flex flex-column scroll-y me-n7 pe-7"
+          id="kt_modal_add_user_scroll"
+          data-kt-scroll="true"
+          data-kt-scroll-activate="{default: false, lg: true}"
+          data-kt-scroll-max-height="auto"
+          data-kt-scroll-dependencies="#kt_modal_add_user_header"
+          data-kt-scroll-wrappers="#kt_modal_add_user_scroll"
+          data-kt-scroll-offset="300px"
+        >
+          {/* begin::Input group */}
+          {/* <div className='fv-row mb-7'>
+
+            <label className='d-block fw-bold fs-6 mb-5'>Avatar</label>
+
+            <div
+              className='image-input image-input-outline'
+              data-kt-image-input='true'
+              style={{backgroundImage: `url('${blankImg}')`}}
+            >
+              <div
+                className='image-input-wrapper w-125px h-125px'
+                style={{backgroundImage: `url('${userAvatarImg}')`}}
+              ></div>
+
+              <label
+              className='btn btn-icon btn-circle btn-active-color-primary w-25px h-25px bg-body shadow'
+              data-kt-image-input-action='change'
+              data-bs-toggle='tooltip'
+              title='Change avatar'
+            >
+              <i className='bi bi-pencil-fill fs-7'></i>
+
+              <input type='file' name='avatar' accept='.png, .jpg, .jpeg' />
+              <input type='hidden' name='avatar_remove' />
+            </label>
+
+              <span
+              className='btn btn-icon btn-circle btn-active-color-primary w-25px h-25px bg-body shadow'
+              data-kt-image-input-action='cancel'
+              data-bs-toggle='tooltip'
+              title='Cancel avatar'
+            >
+              <i className='bi bi-x fs-2'></i>
+            </span>
+
+              <span
+              className='btn btn-icon btn-circle btn-active-color-primary w-25px h-25px bg-body shadow'
+              data-kt-image-input-action='remove'
+              data-bs-toggle='tooltip'
+              title='Remove avatar'
+            >
+              <i className='bi bi-x fs-2'></i>
+            </span>
+            </div>
+            <div className='form-text'>Allowed file types: png, jpg, jpeg.</div>
+          </div> */}
+          {/* end::Input group */}
+
+          {/* begin::Input group */}
+          <div className="fv-row mb-7">
+            {/* begin::Label */}
+            <label className="required fw-bold fs-6 mb-2">Full Name</label>
+            {/* end::Label */}
+
+            {/* begin::Input */}
+            <input
+              placeholder="Full name"
+              {...formik.getFieldProps("name")}
+              type="text"
+              name="name"
+              className={clsx(
+                "form-control form-control-solid mb-3 mb-lg-0",
+                { "is-invalid": formik.touched.name && formik.errors.name },
+                {
+                  "is-valid": formik.touched.name && !formik.errors.name,
+                }
+              )}
+              autoComplete="off"
+              disabled={formik.isSubmitting || isUserLoading}
+            />
+            {formik.touched.name && formik.errors.name && (
+              <div className="fv-plugins-message-container">
+                <div className="fv-help-block">
+                  <span role="alert">{formik.errors.name}</span>
+                </div>
+              </div>
+            )}
+            {/* end::Input */}
+          </div>
+          {/* end::Input group */}
+
+          {/* begin::Input group */}
+          <div className="fv-row mb-7">
+            {/* begin::Label */}
+            <label className="required fw-bold fs-6 mb-2">Interest</label>
+            {/* end::Label */}
+
+            {/* begin::Input */}
+            <input
+              placeholder="Interest"
+              {...formik.getFieldProps("percent_interest")}
+              className={clsx(
+                "form-control form-control-solid mb-3 mb-lg-0",
+                { "is-invalid": formik.touched.percent_interest && formik.errors.percent_interest },
+                {
+                  "is-valid": formik.touched.percent_interest && !formik.errors.percent_interest,
+                }
+              )}
+              type="text"
+              name="percent_interest"
+              autoComplete="off"
+              disabled={formik.isSubmitting || isUserLoading}
+            />
+            {/* end::Input */}
+            {formik.touched.percent_interest && formik.errors.percent_interest && (
+              // <div className="fv-plugins-message-container">
+              //   <span role="alert">{formik.errors.percent_interest}</span>
+              // </div>
+              <div className="fv-plugins-message-container">
+                <div className="fv-help-block">
+                  <span role="alert">{formik.errors.percent_interest}</span>
+                </div>
+              </div>
+            )}
+          </div>
+          {/* end::Input group */}
+
+          {/* begin::Input group */}
+          <div className="fv-row mb-7">
+            {/* begin::Label */}
+            <label className="required fw-bold fs-6 mb-2">Max Loan</label>
+            {/* end::Label */}
+
+            {/* begin::Input */}
+            <input
+              placeholder="Max Loan"
+              {...formik.getFieldProps("max_loan")}
+              className={clsx(
+                "form-control form-control-solid mb-3 mb-lg-0",
+                { "is-invalid": formik.touched.max_loan && formik.errors.max_loan },
+                {
+                  "is-valid": formik.touched.max_loan && !formik.errors.max_loan,
+                }
+              )}
+              type="text"
+              name="max_loan"
+              autoComplete="off"
+              disabled={formik.isSubmitting || isUserLoading}
+            />
+            {/* end::Input */}
+            {formik.touched.max_loan && formik.errors.max_loan && (
+              <div className="fv-plugins-message-container">
+                <div className="fv-help-block">
+                  <span role="alert">{formik.errors.max_loan}</span>
+                </div>
+              </div>
+            )}
+          </div>
+          {/* end::Input group */}
+
+          {/* begin::Input group */}
+          <div className="fv-row mb-7">
+            {/* begin::Label */}
+            <label className="required fw-bold fs-6 mb-2">Tenor</label>
+            {/* end::Label */}
+
+            {/* begin::Input */}
+            <input
+              placeholder="Tenor"
+              {...formik.getFieldProps("tenor")}
+              className={clsx(
+                "form-control form-control-solid mb-3 mb-lg-0",
+                { "is-invalid": formik.touched.tenor && formik.errors.tenor },
+                {
+                  "is-valid": formik.touched.tenor && !formik.errors.tenor,
+                }
+              )}
+              type="text"
+              name="tenor"
+              autoComplete="off"
+              disabled={formik.isSubmitting || isUserLoading}
+            />
+            {/* end::Input */}
+            {formik.touched.tenor && formik.errors.tenor && (
+              <div className="fv-plugins-message-container">
+                <div className="fv-help-block">
+                  <span role="alert">{formik.errors.tenor}</span>
+                </div>
+              </div>
+            )}
+          </div>
+          {/* end::Input group */}
+
+          {/* begin::Input group */}
+          <div className="fv-row mb-7">
+            {/* begin::Label */}
+            <label className="required fw-bold fs-6 mb-2">Ret Age</label>
+            {/* end::Label */}
+
+            {/* begin::Input */}
+            <input
+              placeholder="Retirement Age"
+              {...formik.getFieldProps("retirement_age")}
+              className={clsx(
+                "form-control form-control-solid mb-3 mb-lg-0",
+                { "is-invalid": formik.touched.retirement_age && formik.errors.retirement_age },
+                {
+                  "is-valid": formik.touched.retirement_age && !formik.errors.retirement_age,
+                }
+              )}
+              type="text"
+              name="retirement_age"
+              autoComplete="off"
+              disabled={formik.isSubmitting || isUserLoading}
+            />
+            {/* end::Input */}
+            {formik.touched.retirement_age && formik.errors.retirement_age && (
+              <div className="fv-plugins-message-container">
+                <div className="fv-help-block">
+                  <span role="alert">{formik.errors.retirement_age}</span>
+                </div>
+              </div>
+            )}
+          </div>
+          {/* end::Input group */}
+
+          {/* begin::Input group */}
+          <div className="fv-row mb-7">
+            <label className="required fw-bold fs-6 mb-2">Sector</label>
+            <select
+                {...formik.getFieldProps("sector")}
+                className={clsx(
+                  "form-control form-control-solid mb-3 mb-lg-0",
+                  { "is-invalid": formik.touched.sector && formik.errors.sector },
+                  {
+                    "is-valid": formik.touched.sector && !formik.errors.sector,
+                  }
+                )}
+                name="sector"
+                autoComplete="off"
+                disabled={formik.isSubmitting || isUserLoading}
+              >
+                {isLoading ? 
+                <option value=''>Loading...</option>
+                :
+                <>
+                  <option value=''>Select Sector</option>
+                  {response?.employer_sector?.map((item:any) => (
+                    <option value={item.uid}>{item.name}</option>
+                  ))
+                  }
+                </>
+                }
+              </select>
+            {/* end::Input */}
+            {formik.touched.sector && formik.errors.sector && (
+              <div className="fv-plugins-message-container">
+                <div className="fv-help-block">
+                  <span role="alert">{formik.errors.sector}</span>
+                </div>
+              </div>
+            )}
+          </div>
+          {/* end::Input group */}
+
+          {/* begin::Input group */}
+          <div className="fv-row mb-7">
+            {/* begin::Label */}
+            <label className="required fw-bold fs-6 mb-2">Salary</label>
+            {/* end::Label */}
+
+            {/* begin::Input */}
+            <select
+              {...formik.getFieldProps("salary_source")}
+              className={clsx(
+                "form-control form-control-solid mb-3 mb-lg-0",
+                { "is-invalid": formik.touched.salary_source && formik.errors.salary_source },
+                {
+                  "is-valid": formik.touched.salary_source && !formik.errors.salary_source,
+                }
+              )}
+              name="salary_source"
+              autoComplete="off"
+              disabled={formik.isSubmitting || isUserLoading}
+            >
+              {isLoading ? 
+              <option value=''>Loading...</option>
+              :
+              <>
+                <option value=''>Select Salary Source</option>
+                {response?.salary_sources?.map((item:any) => (
+                  <option value={item.uid}>{item.name}</option>
+                ))
+                }
+              </>
+              }
+            </select>
+            {/* end::Input */}
+            {formik.touched.salary_source && formik.errors.salary_source && (
+              <div className="fv-plugins-message-container">
+                <div className="fv-help-block">
+                  <span role="alert">{formik.errors.salary_source}</span>
+                </div>
+              </div>
+            )}
+          </div>
+          {/* end::Input group */}
+
+        </div>
+        {/* end::Scroll */}
+
+        {/* begin::Actions */}
+        <div className="text-center pt-15">
+          <button
+            type="reset"
+            onClick={() => cancel()}
+            className="btn btn-danger me-3"
+            data-kt-users-modal-action="cancel"
+            disabled={formik.isSubmitting || isUserLoading}
+          >
+            Cancel
+          </button>
+
+          <button
+            type="submit"
+            className="btn btn-primary"
+            data-kt-users-modal-action="submit"
+            disabled={
+              isUserLoading ||
+              formik.isSubmitting ||
+              !formik.isValid ||
+              !formik.touched
+            }
+          >
+            <span className="indicator-label">Add</span>
+            {(formik.isSubmitting || isUserLoading) && (
+              <span className="indicator-progress">
+                Please wait...{" "}
+                <span className="spinner-border spinner-border-sm align-middle ms-2"></span>
+              </span>
+            )}
+          </button>
+        </div>
+        {/* end::Actions */}
+      </form>
+      {(formik.isSubmitting || isUserLoading) && <UsersListLoading />}
+    </>
+  );
+};
+
+export { UserEditModalForm };

src/app/modules/employers/employers-list/users-list/user-edit-modal/UserEditModalHeader.tsx

@@ -2,12 +2,12 @@ import {KTIcon} from '../../../../../../_digifi/helpers'
 import {useListView} from '../core/ListViewProvider'
 
 const UserEditModalHeader = () => {
-  const {setItemIdForUpdate} = useListView()
+  const {setItemIdForUpdate, itemIdForUpdate} = useListView()
 
   return (
     <div className='modal-header'>
       {/* begin::Modal title */}
-      <h2 className='fw-bolder'>Add User</h2>
+      <h2 className='fw-bolder'>{itemIdForUpdate ? 'Edit Employer' : 'Add Employer'}</h2>
       {/* end::Modal title */}
 
       {/* begin::Close */}

src/app/modules/process/components/UserApprovedList.tsx

@@ -1,37 +1,5 @@
-import { KTCard } from "../../../../_digifi/helpers"
-import { Content } from "../../../../_digifi/layout/components/content"
-import { ToolbarWrapper } from "../../../../_digifi/layout/components/toolbar"
-import { UsersListHeader } from "../user-approved/users-list/components/header/UsersListHeader"
-import { ListViewProvider, useListView } from "../user-approved/users-list/core/ListViewProvider"
-import { QueryRequestProvider } from "../user-approved/users-list/core/QueryRequestProvider"
-import { QueryResponseProvider } from "../user-approved/users-list/core/QueryResponseProvider"
-import { UsersTable } from "../user-approved/users-list/table/UsersTable"
-import { UserEditModal } from "../user-approved/users-list/user-edit-modal/UserEditModal"
+import { UsersListWrapper } from "../user-approved/UsersList";
 
-const UsersList = () => {
-  const {itemIdForUpdate} = useListView()
-  return (
-    <>
-      <KTCard>
-        <UsersListHeader />
-        <UsersTable />
-      </KTCard>
-      {itemIdForUpdate !== undefined && <UserEditModal />}
-    </>
-  )
-}
+const UserApprovedList = () => <UsersListWrapper />;
 
-const UserApprovedList = () => (
-  <QueryRequestProvider>
-    <QueryResponseProvider>
-      <ListViewProvider>
-        <ToolbarWrapper />
-        <Content>
-          <UsersList />
-        </Content>
-      </ListViewProvider>
-    </QueryResponseProvider>
-  </QueryRequestProvider>
-)
-
-export {UserApprovedList}
+export { UserApprovedList };

src/app/modules/process/components/UserPendingList.tsx

@@ -1,37 +1,5 @@
-import { KTCard } from "../../../../_digifi/helpers"
-import { Content } from "../../../../_digifi/layout/components/content"
-import { ToolbarWrapper } from "../../../../_digifi/layout/components/toolbar"
-import { UsersListHeader } from "../user-pending/users-list/components/header/UsersListHeader"
-import { ListViewProvider, useListView } from "../user-pending/users-list/core/ListViewProvider"
-import { QueryRequestProvider } from "../user-pending/users-list/core/QueryRequestProvider"
-import { QueryResponseProvider } from "../user-pending/users-list/core/QueryResponseProvider"
-import { UsersTable } from "../user-pending/users-list/table/UsersTable"
-import { UserEditModal } from "../user-pending/users-list/user-edit-modal/UserEditModal"
+import { UsersListWrapper } from "../user-pending/UsersList";
 
-const UsersList = () => {
-  const {itemIdForUpdate} = useListView()
-  return (
-    <>
-      <KTCard>
-        <UsersListHeader />
-        <UsersTable />
-      </KTCard>
-      {itemIdForUpdate !== undefined && <UserEditModal />}
-    </>
-  )
-}
+const UserPendingList = () => <UsersListWrapper />;
 
-const UserPendingList = () => (
-  <QueryRequestProvider>
-    <QueryResponseProvider>
-      <ListViewProvider>
-        <ToolbarWrapper />
-        <Content>
-          <UsersList />
-        </Content>
-      </ListViewProvider>
-    </QueryResponseProvider>
-  </QueryRequestProvider>
-)
-
-export {UserPendingList}
+export { UserPendingList };

src/app/modules/process/components/UserReadyList.tsx

@@ -1,37 +1,5 @@
-import { KTCard } from "../../../../_digifi/helpers"
-import { Content } from "../../../../_digifi/layout/components/content"
-import { ToolbarWrapper } from "../../../../_digifi/layout/components/toolbar"
-import { UsersListHeader } from "../user-ready/users-list/components/header/UsersListHeader"
-import { ListViewProvider, useListView } from "../user-ready/users-list/core/ListViewProvider"
-import { QueryRequestProvider } from "../user-ready/users-list/core/QueryRequestProvider"
-import { QueryResponseProvider } from "../user-ready/users-list/core/QueryResponseProvider"
-import { UsersTable } from "../user-ready/users-list/table/UsersTable"
-import { UserEditModal } from "../user-ready/users-list/user-edit-modal/UserEditModal"
+import { UsersListWrapper } from "../user-ready/UsersList";
 
-const UsersList = () => {
-  const {itemIdForUpdate} = useListView()
-  return (
-    <>
-      <KTCard>
-        <UsersListHeader />
-        <UsersTable />
-      </KTCard>
-      {itemIdForUpdate !== undefined && <UserEditModal />}
-    </>
-  )
-}
+const UserReadyList = () => <UsersListWrapper />;
 
-const UserReadyList = () => (
-  <QueryRequestProvider>
-    <QueryResponseProvider>
-      <ListViewProvider>
-        <ToolbarWrapper />
-        <Content>
-          <UsersList />
-        </Content>
-      </ListViewProvider>
-    </QueryResponseProvider>
-  </QueryRequestProvider>
-)
-
-export {UserReadyList}
+export { UserReadyList };

src/app/modules/process/components/UserRejectedList.tsx

@@ -1,37 +1,5 @@
-import { KTCard } from "../../../../_digifi/helpers"
-import { Content } from "../../../../_digifi/layout/components/content"
-import { ToolbarWrapper } from "../../../../_digifi/layout/components/toolbar"
-import { UsersListHeader } from "../user-rejected/users-list/components/header/UsersListHeader"
-import { ListViewProvider, useListView } from "../user-rejected/users-list/core/ListViewProvider"
-import { QueryRequestProvider } from "../user-rejected/users-list/core/QueryRequestProvider"
-import { QueryResponseProvider } from "../user-rejected/users-list/core/QueryResponseProvider"
-import { UsersTable } from "../user-rejected/users-list/table/UsersTable"
-import { UserEditModal } from "../user-rejected/users-list/user-edit-modal/UserEditModal"
+import { UsersListWrapper } from "../user-rejected/UsersList";
 
-const UsersList = () => {
-  const {itemIdForUpdate} = useListView()
-  return (
-    <>
-      <KTCard>
-        <UsersListHeader />
-        <UsersTable />
-      </KTCard>
-      {itemIdForUpdate !== undefined && <UserEditModal />}
-    </>
-  )
-}
+const UserRejectedList = () => <UsersListWrapper />;
 
-const UserRejectedList = () => (
-  <QueryRequestProvider>
-    <QueryResponseProvider>
-      <ListViewProvider>
-        <ToolbarWrapper />
-        <Content>
-          <UsersList />
-        </Content>
-      </ListViewProvider>
-    </QueryResponseProvider>
-  </QueryRequestProvider>
-)
-
-export {UserRejectedList}
+export { UserRejectedList };

src/app/modules/process/components/UserStartedList.tsx

@@ -1,37 +1,5 @@
-import { KTCard } from "../../../../_digifi/helpers"
-import { Content } from "../../../../_digifi/layout/components/content"
-import { ToolbarWrapper } from "../../../../_digifi/layout/components/toolbar"
-import { UsersListHeader } from "../user-started/users-list/components/header/UsersListHeader"
-import { ListViewProvider, useListView } from "../user-started/users-list/core/ListViewProvider"
-import { QueryRequestProvider } from "../user-started/users-list/core/QueryRequestProvider"
-import { QueryResponseProvider } from "../user-started/users-list/core/QueryResponseProvider"
-import { UsersTable } from "../user-started/users-list/table/UsersTable"
-import { UserEditModal } from "../user-started/users-list/user-edit-modal/UserEditModal"
+import { UsersListWrapper } from "../user-started/UsersList";
 
-const UsersList = () => {
-  const {itemIdForUpdate} = useListView()
-  return (
-    <>
-      <KTCard>
-        <UsersListHeader />
-        <UsersTable />
-      </KTCard>
-      {itemIdForUpdate !== undefined && <UserEditModal />}
-    </>
-  )
-}
+const UserStartedList = () => <UsersListWrapper />;
 
-const UserStartedList = () => (
-  <QueryRequestProvider>
-    <QueryResponseProvider>
-      <ListViewProvider>
-        <ToolbarWrapper />
-        <Content>
-          <UsersList />
-        </Content>
-      </ListViewProvider>
-    </QueryResponseProvider>
-  </QueryRequestProvider>
-)
-
-export {UserStartedList}
+export { UserStartedList };

src/app/modules/process/core/_models.ts

@@ -1,4 +1,5 @@
-import {ID, Response} from '../../../../../../_digifi/helpers'
+import { ID, Response } from "../../../../_digifi/helpers"
+
 export type User = {
   id?: ID
   name?: string
@@ -29,6 +30,7 @@ export type User = {
   status?: string
   added?: string
   updated?: string
+  employer_name?: string
 }
 
 export type UsersQueryResponse = Response<Array<User>>

src/app/modules/process/core/_requests.ts

@@ -1,6 +1,7 @@
 import axios, { AxiosResponse } from "axios";
-import { ID, Response } from "../../../../../../_digifi/helpers";
+import { ID, Response } from "../../../../_digifi/helpers"
 import { User, UsersQueryResponse } from "./_models";
+import { postAuxEnd } from "../../auth/core/AxiosCallHelper";
 
 const API_URL = import.meta.env.VITE_APP_THEME_API_URL;
 const USER_URL = `${API_URL}/user`;
@@ -19,6 +20,34 @@ const getStartedUsers = (query: string): Promise<UsersQueryResponse> => { // FUN
     .then((d: AxiosResponse<UsersQueryResponse>) => d.data);
 };
 
+const getRejectedUsers = (query: string): Promise<UsersQueryResponse> => { // FUNCTION TO GET USERS THAT HAVE REJECTED LOAN APPLICATION
+  return axios
+    .get(`${NEW_USER_ENDPOINT}/loan/rejected`)
+    .then((d: AxiosResponse<UsersQueryResponse>) => d.data);
+};
+
+const getPendingUsers = (query: string): Promise<UsersQueryResponse> => { // FUNCTION TO GET USERS THAT HAVE PENDING LOAN APPLICATION
+  return axios
+    .get(`${NEW_USER_ENDPOINT}/loan/pending`)
+    .then((d: AxiosResponse<UsersQueryResponse>) => d.data);
+};
+
+const getReadyUsers = (query: string): Promise<UsersQueryResponse> => { // FUNCTION TO GET USERS THAT HAVE READY LOAN APPLICATION
+  return axios
+    .get(`${NEW_USER_ENDPOINT}/loan/ready`)
+    .then((d: AxiosResponse<UsersQueryResponse>) => d.data);
+};
+
+const getApprovedUsers = (query: string): Promise<UsersQueryResponse> => { // FUNCTION TO GET USERS THAT HAVE APPROVED LOAN APPLICATION
+  return axios
+    .get(`${NEW_USER_ENDPOINT}/loan/approved`)
+    .then((d: AxiosResponse<UsersQueryResponse>) => d.data);
+};
+
+const employersVerify = (uid: ID): Promise<UsersQueryResponse> => { // FUNCTION FOR EMPLOYERS VERIFICATION
+    return postAuxEnd('/employers/verify', {application_uid:uid})
+};
+
 const getUserById = (id: ID): Promise<User | undefined> => {
   return axios
     .get(`${USER_URL}/${id}`)
@@ -51,6 +80,11 @@ const deleteSelectedUsers = (userIds: Array<ID>): Promise<void> => {
 
 export {
   getStartedUsers,
+  getRejectedUsers,
+  getPendingUsers,
+  getReadyUsers,
+  getApprovedUsers,
+  employersVerify,
   deleteUser,
   deleteSelectedUsers,
   getUserById,

src/app/modules/process/user-approved/UsersList.tsx

@@ -0,0 +1,37 @@
+import { ListViewProvider, useListView } from "./core/ListViewProvider";
+import { QueryRequestProvider } from "./core/QueryRequestProvider";
+import { QueryResponseProvider } from "./core/QueryResponseProvider";
+import { UsersListHeader } from "./components/header/UsersListHeader";
+import { UsersTable } from "./table/UsersTable";
+import { UserEditModal } from "./user-edit-modal/UserEditModal";
+import { KTCard } from "../../../../_digifi/helpers";
+import { ToolbarWrapper } from "../../../../_digifi/layout/components/toolbar";
+import { Content } from "../../../../_digifi/layout/components/content";
+
+const UsersList = () => {
+  const { itemIdForUpdate } = useListView();
+  return (
+    <>
+      <KTCard>
+        <UsersListHeader />
+        <UsersTable />
+      </KTCard>
+      {itemIdForUpdate !== undefined && <UserEditModal />}
+    </>
+  );
+};
+
+const UsersListWrapper = () => (
+  <QueryRequestProvider>
+    <QueryResponseProvider>
+      <ListViewProvider>
+        <ToolbarWrapper />
+        <Content>
+          <UsersList />
+        </Content>
+      </ListViewProvider>
+    </QueryResponseProvider>
+  </QueryRequestProvider>
+);
+
+export { UsersListWrapper };

src/app/modules/process/user-approved/UsersPage.tsx

@@ -1,39 +0,0 @@
-import {Route, Routes, Outlet, Navigate} from 'react-router-dom'
-import {PageLink, PageTitle} from '../../../../_digifi/layout/core'
-import {UsersListWrapper} from './users-list/UsersList'
-
-const usersBreadcrumbs: Array<PageLink> = [
-  {
-    title: 'User Management',
-    path: '/apps/user-management/users',
-    isSeparator: false,
-    isActive: false,
-  },
-  {
-    title: '',
-    path: '',
-    isSeparator: true,
-    isActive: false,
-  },
-]
-
-const UsersPage = () => {
-  return (
-    <Routes>
-      <Route element={<Outlet />}>
-        <Route
-          path='users'
-          element={
-            <>
-              <PageTitle breadcrumbs={usersBreadcrumbs}>Users list</PageTitle>
-              <UsersListWrapper />
-            </>
-          }
-        />
-      </Route>
-      <Route index element={<Navigate to='/apps/user-management/users' />} />
-    </Routes>
-  )
-}
-
-export default UsersPage

src/app/modules/process/user-approved/components/header/UserListToolbar.tsx

@@ -1,15 +1,18 @@
-import {KTIcon} from '../../../../../../../_digifi/helpers'
-import {useListView} from '../../core/ListViewProvider'
-import {UsersListFilter} from './UsersListFilter'
+import { KTIcon } from "../../../../../../_digifi/helpers";
+import { useListView } from "../../core/ListViewProvider";
+import { UsersListFilter } from "./UsersListFilter";
 
 const UsersListToolbar = () => {
-  const {setItemIdForUpdate} = useListView()
+  const { setItemIdForUpdate } = useListView();
   const openAddUserModal = () => {
-    setItemIdForUpdate(null)
-  }
+    setItemIdForUpdate(null);
+  };
 
   return (
-    <div className='d-flex justify-content-end' data-kt-user-table-toolbar='base'>
+    <div
+      className="d-flex justify-content-end"
+      data-kt-user-table-toolbar="base"
+    >
       <UsersListFilter />
 
       {/* begin::Export */}
@@ -26,7 +29,7 @@ const UsersListToolbar = () => {
       </button> */}
       {/* end::Add user */}
     </div>
-  )
-}
+  );
+};
 
-export {UsersListToolbar}
+export { UsersListToolbar };

src/app/modules/process/user-approved/components/header/UsersListFilter.tsx

@@ -0,0 +1,136 @@
+import { useEffect, useState } from "react";
+import { MenuComponent } from "../../../../../../_digifi/assets/ts/components";
+import { initialQueryState, KTIcon } from "../../../../../../_digifi/helpers";
+import { useQueryRequest } from "../../core/QueryRequestProvider";
+import { useQueryResponse } from "../../core/QueryResponseProvider";
+
+const UsersListFilter = () => {
+  const { updateState } = useQueryRequest();
+  const { isLoading } = useQueryResponse();
+  const [role, setRole] = useState<string | undefined>();
+  const [lastLogin, setLastLogin] = useState<string | undefined>();
+
+  useEffect(() => {
+    MenuComponent.reinitialization();
+  }, []);
+
+  const resetData = () => {
+    updateState({ filter: undefined, ...initialQueryState });
+  };
+
+  const filterData = () => {
+    updateState({
+      filter: { role, last_login: lastLogin },
+      ...initialQueryState,
+    });
+  };
+
+  return (
+    <>
+      {/* begin::Filter Button */}
+      <button
+        disabled={isLoading}
+        type="button"
+        className="btn btn-light-primary me-3"
+        data-kt-menu-trigger="click"
+        data-kt-menu-placement="bottom-end"
+      >
+        <KTIcon iconName="filter" className="fs-2" />
+        Filter
+      </button>
+      {/* end::Filter Button */}
+      {/* begin::SubMenu */}
+      <div
+        className="menu menu-sub menu-sub-dropdown w-300px w-md-325px"
+        data-kt-menu="true"
+      >
+        {/* begin::Header */}
+        <div className="px-7 py-5">
+          <div className="fs-5 text-gray-900 fw-bolder">Filter Options</div>
+        </div>
+        {/* end::Header */}
+
+        {/* begin::Separator */}
+        <div className="separator border-gray-200"></div>
+        {/* end::Separator */}
+
+        {/* begin::Content */}
+        <div className="px-7 py-5" data-kt-user-table-filter="form">
+          {/* begin::Input group */}
+          <div className="mb-10">
+            <label className="form-label fs-6 fw-bold">Role:</label>
+            <select
+              className="form-select form-select-solid fw-bolder"
+              data-kt-select2="true"
+              data-placeholder="Select option"
+              data-allow-clear="true"
+              data-kt-user-table-filter="role"
+              data-hide-search="true"
+              onChange={(e) => setRole(e.target.value)}
+              value={role}
+            >
+              <option value=""></option>
+              <option value="Administrator">Administrator</option>
+              <option value="Analyst">Analyst</option>
+              <option value="Developer">Developer</option>
+              <option value="Support">Support</option>
+              <option value="Trial">Trial</option>
+            </select>
+          </div>
+          {/* end::Input group */}
+
+          {/* begin::Input group */}
+          <div className="mb-10">
+            <label className="form-label fs-6 fw-bold">Last login:</label>
+            <select
+              className="form-select form-select-solid fw-bolder"
+              data-kt-select2="true"
+              data-placeholder="Select option"
+              data-allow-clear="true"
+              data-kt-user-table-filter="two-step"
+              data-hide-search="true"
+              onChange={(e) => setLastLogin(e.target.value)}
+              value={lastLogin}
+            >
+              <option value=""></option>
+              <option value="Yesterday">Yesterday</option>
+              <option value="20 mins ago">20 mins ago</option>
+              <option value="5 hours ago">5 hours ago</option>
+              <option value="2 days ago">2 days ago</option>
+            </select>
+          </div>
+          {/* end::Input group */}
+
+          {/* begin::Actions */}
+          <div className="d-flex justify-content-end">
+            <button
+              type="button"
+              disabled={isLoading}
+              onClick={filterData}
+              className="btn btn-light btn-active-light-primary fw-bold me-2 px-6"
+              data-kt-menu-dismiss="true"
+              data-kt-user-table-filter="reset"
+            >
+              Reset
+            </button>
+            <button
+              disabled={isLoading}
+              type="button"
+              onClick={resetData}
+              className="btn btn-primary fw-bold px-6"
+              data-kt-menu-dismiss="true"
+              data-kt-user-table-filter="filter"
+            >
+              Apply
+            </button>
+          </div>
+          {/* end::Actions */}
+        </div>
+        {/* end::Content */}
+      </div>
+      {/* end::SubMenu */}
+    </>
+  );
+};
+
+export { UsersListFilter };

src/app/modules/process/user-approved/components/header/UsersListGrouping.tsx

@@ -0,0 +1,38 @@
+import { useQueryClient, useMutation } from "react-query";
+import { QUERIES } from "../../../../../../_digifi/helpers";
+import { useListView } from "../../core/ListViewProvider";
+import { useQueryResponse } from "../../core/QueryResponseProvider";
+import { deleteSelectedUsers } from "../../../core/_requests";
+
+const UsersListGrouping = () => {
+  const { selected, clearSelected } = useListView();
+  const queryClient = useQueryClient();
+  const { query } = useQueryResponse();
+
+  const deleteSelectedItems = useMutation(() => deleteSelectedUsers(selected), {
+    // 💡 response of the mutation is passed to onSuccess
+    onSuccess: () => {
+      // ✅ update detail view directly
+      queryClient.invalidateQueries([`${QUERIES.USERS_LIST}-${query}`]);
+      clearSelected();
+    },
+  });
+
+  return (
+    <div className="d-flex justify-content-end align-items-center">
+      <div className="fw-bolder me-5">
+        <span className="me-2">{selected.length}</span> Selected
+      </div>
+
+      <button
+        type="button"
+        className="btn btn-danger"
+        onClick={async () => await deleteSelectedItems.mutateAsync()}
+      >
+        Delete Selected
+      </button>
+    </div>
+  );
+};
+
+export { UsersListGrouping };

src/app/modules/process/user-approved/components/header/UsersListSearchComponent.tsx

@@ -0,0 +1,49 @@
+/* eslint-disable react-hooks/exhaustive-deps */
+
+import { useEffect, useState } from "react";
+import {
+  initialQueryState,
+  KTIcon,
+  useDebounce,
+} from "../../../../../../_digifi/helpers";
+import { useQueryRequest } from "../../core/QueryRequestProvider";
+
+const UsersListSearchComponent = () => {
+  const { updateState } = useQueryRequest();
+  const [searchTerm, setSearchTerm] = useState<string>("");
+  // Debounce search term so that it only gives us latest value ...
+  // ... if searchTerm has not been updated within last 500ms.
+  // The goal is to only have the API call fire when user stops typing ...
+  // ... so that we aren't hitting our API rapidly.
+  const debouncedSearchTerm = useDebounce(searchTerm, 150);
+  // Effect for API call
+  useEffect(
+    () => {
+      if (debouncedSearchTerm !== undefined && searchTerm !== undefined) {
+        updateState({ search: debouncedSearchTerm, ...initialQueryState });
+      }
+    },
+    [debouncedSearchTerm] // Only call effect if debounced search term changes
+    // More details about useDebounce: https://usehooks.com/useDebounce/
+  );
+
+  return (
+    <div className="card-title">
+      {/* begin::Search */}
+      <div className="d-flex align-items-center position-relative my-1">
+        <KTIcon iconName="magnifier" className="fs-1 position-absolute ms-6" />
+        <input
+          type="text"
+          data-kt-user-table-filter="search"
+          className="form-control form-control-solid w-250px ps-14"
+          placeholder="Search user"
+          value={searchTerm}
+          onChange={(e) => setSearchTerm(e.target.value)}
+        />
+      </div>
+      {/* end::Search */}
+    </div>
+  );
+};
+
+export { UsersListSearchComponent };

src/app/modules/process/user-approved/components/pagination/UsersListPagination.tsx

@@ -0,0 +1,179 @@
+import clsx from "clsx";
+import {
+  useQueryResponseLoading,
+  useQueryResponsePagination,
+} from "../../core/QueryResponseProvider";
+import { useQueryRequest } from "../../core/QueryRequestProvider";
+import { PaginationState } from "../../../../../../_digifi/helpers";
+import { useMemo } from "react";
+
+const mappedLabel = (label: string): string => {
+  if (label === "« Previous") {
+    return "Previous";
+  }
+
+  if (label === "Next »") {
+    return "Next";
+  }
+
+  return label;
+};
+
+const UsersListPagination = () => {
+  const pagination = useQueryResponsePagination();
+  const isLoading = useQueryResponseLoading();
+  const { updateState } = useQueryRequest();
+  const updatePage = (page: number | undefined | null) => {
+    if (!page || isLoading || pagination.page === page) {
+      return;
+    }
+
+    updateState({ page, items_per_page: pagination.items_per_page || 10 });
+  };
+
+  const PAGINATION_PAGES_COUNT = 5;
+  const sliceLinks = (pagination?: PaginationState) => {
+    if (!pagination?.links?.length) {
+      return [];
+    }
+
+    const scopedLinks = [...pagination.links];
+
+    let pageLinks: Array<{
+      label: string;
+      active: boolean;
+      url: string | null;
+      page: number | null;
+    }> = [];
+    const previousLink: {
+      label: string;
+      active: boolean;
+      url: string | null;
+      page: number | null;
+    } = scopedLinks.shift()!;
+    const nextLink: {
+      label: string;
+      active: boolean;
+      url: string | null;
+      page: number | null;
+    } = scopedLinks.pop()!;
+
+    const halfOfPagesCount = Math.floor(PAGINATION_PAGES_COUNT / 2);
+
+    pageLinks.push(previousLink);
+
+    if (
+      pagination.page <= Math.round(PAGINATION_PAGES_COUNT / 2) ||
+      scopedLinks.length <= PAGINATION_PAGES_COUNT
+    ) {
+      pageLinks = [
+        ...pageLinks,
+        ...scopedLinks.slice(0, PAGINATION_PAGES_COUNT),
+      ];
+    }
+
+    if (
+      pagination.page > scopedLinks.length - halfOfPagesCount &&
+      scopedLinks.length > PAGINATION_PAGES_COUNT
+    ) {
+      pageLinks = [
+        ...pageLinks,
+        ...scopedLinks.slice(
+          scopedLinks.length - PAGINATION_PAGES_COUNT,
+          scopedLinks.length
+        ),
+      ];
+    }
+
+    if (
+      !(
+        pagination.page <= Math.round(PAGINATION_PAGES_COUNT / 2) ||
+        scopedLinks.length <= PAGINATION_PAGES_COUNT
+      ) &&
+      !(pagination.page > scopedLinks.length - halfOfPagesCount)
+    ) {
+      pageLinks = [
+        ...pageLinks,
+        ...scopedLinks.slice(
+          pagination.page - 1 - halfOfPagesCount,
+          pagination.page + halfOfPagesCount
+        ),
+      ];
+    }
+
+    pageLinks.push(nextLink);
+
+    return pageLinks;
+  };
+
+  const paginationLinks = useMemo(() => sliceLinks(pagination), [pagination]);
+
+  return (
+    <div className="row">
+      <div className="col-sm-12 col-md-5 d-flex align-items-center justify-content-center justify-content-md-start"></div>
+      <div className="col-sm-12 col-md-7 d-flex align-items-center justify-content-center justify-content-md-end">
+        <div id="kt_table_users_paginate">
+          <ul className="pagination">
+            <li
+              className={clsx("page-item", {
+                disabled: isLoading || pagination.page === 1,
+              })}
+            >
+              <a
+                onClick={() => updatePage(1)}
+                style={{ cursor: "pointer" }}
+                className="page-link"
+              >
+                First
+              </a>
+            </li>
+            {paginationLinks
+              ?.map((link) => {
+                return { ...link, label: mappedLabel(link.label) };
+              })
+              .map((link) => (
+                <li
+                  key={link.label}
+                  className={clsx("page-item", {
+                    active: pagination.page === link.page,
+                    disabled: isLoading,
+                    previous: link.label === "Previous",
+                    next: link.label === "Next",
+                  })}
+                >
+                  <a
+                    className={clsx("page-link", {
+                      "page-text":
+                        link.label === "Previous" || link.label === "Next",
+                      "me-5": link.label === "Previous",
+                    })}
+                    onClick={() => updatePage(link.page)}
+                    style={{ cursor: "pointer" }}
+                  >
+                    {mappedLabel(link.label)}
+                  </a>
+                </li>
+              ))}
+            <li
+              className={clsx("page-item", {
+                disabled:
+                  isLoading ||
+                  pagination.page === (pagination.links?.length || 3) - 2,
+              })}
+            >
+              <a
+                onClick={() => updatePage((pagination.links?.length || 3) - 2)}
+                style={{ cursor: "pointer" }}
+                className="page-link"
+              >
+                Last
+              </a>
+            </li>
+          </ul>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export { UsersListPagination };

src/app/modules/process/user-approved/core/ListViewProvider.tsx

@@ -0,0 +1,62 @@
+/* eslint-disable react-refresh/only-export-components */
+import { FC, useState, createContext, useContext, useMemo } from "react";
+import {
+  ID,
+  calculatedGroupingIsDisabled,
+  calculateIsAllDataSelected,
+  groupingOnSelect,
+  initialListView,
+  ListViewContextProps,
+  groupingOnSelectAll,
+  WithChildren,
+} from "../../../../../_digifi/helpers";
+import {
+  useQueryResponse,
+  useQueryResponseData,
+} from "./QueryResponseProvider";
+
+const ListViewContext = createContext<ListViewContextProps>(initialListView);
+
+const ListViewProvider: FC<WithChildren> = ({ children }) => {
+  const [selected, setSelected] = useState<Array<ID>>(initialListView.selected);
+  const [itemIdForUpdate, setItemIdForUpdate] = useState<ID>(
+    initialListView.itemIdForUpdate
+  );
+  const { isLoading } = useQueryResponse();
+  const data = useQueryResponseData();
+  const disabled = useMemo(
+    () => calculatedGroupingIsDisabled(isLoading, data),
+    [isLoading, data]
+  );
+  const isAllSelected = useMemo(
+    () => calculateIsAllDataSelected(data, selected),
+    [data, selected]
+  );
+
+  return (
+    <ListViewContext.Provider
+      value={{
+        selected,
+        itemIdForUpdate,
+        setItemIdForUpdate,
+        disabled,
+        isAllSelected,
+        onSelect: (id: ID) => {
+          groupingOnSelect(id, selected, setSelected);
+        },
+        onSelectAll: () => {
+          groupingOnSelectAll(isAllSelected, setSelected, data);
+        },
+        clearSelected: () => {
+          setSelected([]);
+        },
+      }}
+    >
+      {children}
+    </ListViewContext.Provider>
+  );
+};
+
+const useListView = () => useContext(ListViewContext);
+
+export { ListViewProvider, useListView };

src/app/modules/process/user-approved/core/QueryRequestProvider.tsx

@@ -0,0 +1,29 @@
+/* eslint-disable react-refresh/only-export-components */
+import { FC, useState, createContext, useContext } from "react";
+import {
+  QueryState,
+  QueryRequestContextProps,
+  initialQueryRequest,
+  WithChildren,
+} from "../../../../../_digifi/helpers";
+
+const QueryRequestContext =
+  createContext<QueryRequestContextProps>(initialQueryRequest);
+
+const QueryRequestProvider: FC<WithChildren> = ({ children }) => {
+  const [state, setState] = useState<QueryState>(initialQueryRequest.state);
+
+  const updateState = (updates: Partial<QueryState>) => {
+    const updatedState = { ...state, ...updates } as QueryState;
+    setState(updatedState);
+  };
+
+  return (
+    <QueryRequestContext.Provider value={{ state, updateState }}>
+      {children}
+    </QueryRequestContext.Provider>
+  );
+};
+
+const useQueryRequest = () => useContext(QueryRequestContext);
+export { QueryRequestProvider, useQueryRequest };

src/app/modules/process/user-approved/core/QueryResponseProvider.tsx

@@ -0,0 +1,87 @@
+/* eslint-disable react-refresh/only-export-components */
+/* eslint-disable react-hooks/exhaustive-deps */
+import { FC, useContext, useState, useEffect, useMemo } from "react";
+import { useQuery } from "react-query";
+import {
+  createResponseContext,
+  initialQueryResponse,
+  initialQueryState,
+  PaginationState,
+  QUERIES,
+  stringifyRequestQuery,
+  WithChildren,
+} from "../../../../../_digifi/helpers";
+import { getApprovedUsers } from "../../core/_requests";
+import { User } from "../../core/_models";
+import { useQueryRequest } from "./QueryRequestProvider";
+
+const QueryResponseContext = createResponseContext<User>(initialQueryResponse);
+const QueryResponseProvider: FC<WithChildren> = ({ children }) => {
+  const { state } = useQueryRequest();
+  const [query, setQuery] = useState<string>(stringifyRequestQuery(state));
+  const updatedQuery = useMemo(() => stringifyRequestQuery(state), [state]);
+
+  useEffect(() => {
+    if (query !== updatedQuery) {
+      setQuery(updatedQuery);
+    }
+  }, [updatedQuery]);
+
+  const {
+    isFetching,
+    refetch,
+    data: response,
+  } = useQuery(
+    `${QUERIES.APPROVED_LIST}-${query}`,
+    () => {
+      return getApprovedUsers(query);
+    },
+    { cacheTime: 0, keepPreviousData: true, refetchOnWindowFocus: false }
+  );
+
+  return (
+    <QueryResponseContext.Provider
+      value={{ isLoading: isFetching, refetch, response, query }}
+    >
+      {children}
+    </QueryResponseContext.Provider>
+  );
+};
+
+const useQueryResponse = () => useContext(QueryResponseContext);
+
+const useQueryResponseData = () => {
+  const { response } = useQueryResponse();
+  if (!response) {
+    return [];
+  }
+
+  return response?.records || [];
+};
+
+const useQueryResponsePagination = () => {
+  const defaultPaginationState: PaginationState = {
+    links: [],
+    ...initialQueryState,
+  };
+
+  const { response } = useQueryResponse();
+  if (!response || !response.payload || !response.payload.pagination) {
+    return defaultPaginationState;
+  }
+
+  return response.payload.pagination;
+};
+
+const useQueryResponseLoading = (): boolean => {
+  const { isLoading } = useQueryResponse();
+  return isLoading;
+};
+
+export {
+  QueryResponseProvider,
+  useQueryResponse,
+  useQueryResponseData,
+  useQueryResponsePagination,
+  useQueryResponseLoading,
+};

src/app/modules/process/user-approved/table/UsersTable.tsx

@@ -0,0 +1,66 @@
+import { useMemo } from "react";
+import { useTable, ColumnInstance, Row } from "react-table";
+import { CustomHeaderColumn } from "./columns/CustomHeaderColumn";
+import { CustomRow } from "./columns/CustomRow";
+import {
+  useQueryResponseData,
+  useQueryResponseLoading,
+} from "../core/QueryResponseProvider";
+import { usersColumns } from "./columns/_columns";
+import { User } from "../../core/_models";
+import { UsersListLoading } from "../components/loading/UsersListLoading";
+import { UsersListPagination } from "../components/pagination/UsersListPagination";
+import { KTCardBody } from "../../../../../_digifi/helpers";
+
+const UsersTable = () => {
+  const users = useQueryResponseData();
+  // console.log('users', users)
+  const isLoading = useQueryResponseLoading();
+  const data = useMemo(() => users, [users]);
+  const columns = useMemo(() => usersColumns, []);
+  const { getTableProps, getTableBodyProps, headers, rows, prepareRow } =
+    useTable({
+      columns,
+      data,
+    });
+
+  return (
+    <KTCardBody className="py-4">
+      <div className="table-responsive">
+        <table
+          id="kt_table_users"
+          className="table align-middle table-row-dashed fs-6 gy-5 dataTable no-footer"
+          {...getTableProps()}
+        >
+          <thead>
+            <tr className="text-start text-muted fw-bolder fs-7 text-uppercase gs-0">
+              {headers.map((column: ColumnInstance<User>) => (
+                <CustomHeaderColumn key={column.id} column={column} />
+              ))}
+            </tr>
+          </thead>
+          <tbody className="text-gray-600 fw-bold" {...getTableBodyProps()}>
+            {rows.length > 0 ? (
+              rows.map((row: Row<User>, i) => {
+                prepareRow(row);
+                return <CustomRow row={row} key={`row-${i}-${row.id}`} />;
+              })
+            ) : (
+              <tr>
+                <td colSpan={7}>
+                  <div className="d-flex text-center w-100 align-content-center justify-content-center">
+                    No matching records found
+                  </div>
+                </td>
+              </tr>
+            )}
+          </tbody>
+        </table>
+      </div>
+      <UsersListPagination />
+      {isLoading && <UsersListLoading />}
+    </KTCardBody>
+  );
+};
+
+export { UsersTable };

src/app/modules/process/user-approved/table/columns/AddedCell.tsx

@@ -0,0 +1,14 @@
+import { FC } from "react";
+import { NewDateTimeFormatter } from "../../../../../../_digifi/lib/NewDateTimeFormatter";
+
+type Props = {
+  added?: string;
+};
+
+const AddedCell: FC<Props> = ({ added }) => (
+  <div className="badge badge-light fw-bolder">
+    {NewDateTimeFormatter(added)}
+  </div>
+);
+
+export { AddedCell };