updated btn

src/_digifi/layout/components/header/header-menus/MenuInner.tsx

@@ -2,12 +2,17 @@ import {useIntl} from 'react-intl'
 import {MenuItem} from './MenuItem'
 import {MenuInnerWithSub} from './MenuInnerWithSub'
 import {MegaMenu} from './MegaMenu'
+import { useLocation } from 'react-router-dom'
 
 export function MenuInner() {
   const intl = useIntl()
+  const {pathname} = useLocation()
+  const isHelpPath = pathname == '/help'
   return (
     <>
-      <MenuItem title={intl.formatMessage({id: 'MENU.DASHBOARD'})} to='/dashboard' />
+      {/* <MenuItem title={intl.formatMessage({id: 'MENU.DASHBOARD'})} to='/dashboard' /> */} 
+      <MenuItem title={`${isHelpPath ? 'Help' : 'Dashboard'}`} to={`${isHelpPath ? '/help' : '/dashboard'}`} />
+
       {/* <MenuItem title='Layout Builder' to='/builder' /> */}
       <MenuInnerWithSub
         title='Crafted'

src/_digifi/partials/widgets/lists/ListsWidget3.tsx

@@ -62,6 +62,12 @@ const ListsWidget3: React.FC<Props> = ({dashData, className}) => {
                     </span>
                     <span className='text-muted fw-semibold d-block'>{NewDateTimeFormatter(item?.added)}</span>
                   </div>
+                  <div className='flex-grow-1'>
+                    <span className='text-gray-800 fw-bold fs-6'>
+                      Pin
+                    </span>
+                    <span className='text-muted fw-semibold d-block'>{item?.pin || 'dummy'}</span>
+                  </div>
                   {/* end::Description */}
                   <span className='badge badge-light-primary fs-8 fw-bold'>status: {item?.status}</span>
                 </div>

src/app/modules/apps/user-management/customers-list/core/_requests.ts

@@ -19,6 +19,12 @@ const getCustomerList = (query: string): Promise<UsersQueryResponse> => { // FUN
     .then((d: AxiosResponse<UsersQueryResponse>) => d.data);
 };
 
+const getAdminUserList = (query: string): Promise<UsersQueryResponse> => { // FUNCTION TO GET USERS THAT HAVE STARTED LOAN APPLICATION
+  return axios
+    .get(`${NEW_USER_ENDPOINT}/users`)
+    .then((d: AxiosResponse<UsersQueryResponse>) => d.data);
+};
+
 const getUserById = (id: ID): Promise<User | undefined> => {
   return axios
     .get(`${USER_URL}/${id}`)
@@ -51,6 +57,7 @@ const deleteSelectedUsers = (userIds: Array<ID>): Promise<void> => {
 
 export {
   getCustomerList,
+  getAdminUserList,
   deleteUser,
   deleteSelectedUsers,
   getUserById,

src/app/modules/apps/user-management/customers-list/table/columns/UserActionsCell.tsx

@@ -40,13 +40,13 @@ const UserActionsCell: FC<Props> = ({id}) => {
         data-kt-menu-trigger='click'
         data-kt-menu-placement='bottom-end'
       >
-        Actions
-        <KTIcon iconName='down' className='fs-5 m-0' />
+        View
+        {/* <KTIcon iconName='down' className='fs-5 m-0' /> */}
       </a>
       {/* begin::Menu */}
       <div
         className='menu menu-sub menu-sub-dropdown menu-column menu-rounded menu-gray-600 menu-state-bg-light-primary fw-bold fs-7 w-125px py-4'
-        data-kt-menu='true'
+        data-kt-menu='false'
       >
         {/* begin::Menu item */}
         <div className='menu-item px-3'>

src/app/modules/apps/user-management/users-list/core/_requests.ts

@@ -57,10 +57,10 @@ const deleteSelectedUsers = (userIds: Array<ID>): Promise<void> => {
 
 export {
   getCustomerList,
+  getAdminUserList,
   deleteUser,
   deleteSelectedUsers,
   getUserById,
-  getAdminUserList,
   createUser,
   updateUser,
 };

src/app/modules/apps/user-management/users-list/table/columns/UserInfoCell.tsx

@@ -34,7 +34,7 @@ const UserInfoCell: FC<Props> = ({user}) => (
       <a href='#' className='text-gray-800 text-hover-primary mb-1'>
       {user.firstname} {user.lastname}
       </a>
-      <span>{user.email}</span>
+      <span>{user.username}</span>
     </div>
   </div>
 )

src/app/modules/help/HelpPage.tsx

@@ -1,8 +1,11 @@
+import { Content } from "../../../_digifi/layout/components/content";
 
 export default function HelpPage() {
   return (
-    <div className="w-100 h-100">
-      <h1 className="fs-2hx fw-bold text-gray-800">Help</h1>
-    </div>
+    <Content>
+      <div className="w-100 h-100">
+        <h1 className="fs-2hx fw-bold text-gray-800">Help</h1>
+      </div>
+    </Content>
   )
 }

src/app/modules/process/user-ready/table/columns/UserActionsCell.tsx

@@ -72,7 +72,7 @@ const UserActionsCell: FC<Props> = ({ id }) => {
             data-kt-users-table-filter="delete_row"
             onClick={async () => resendVerification()}
           >
-            Resend Verification
+            Employer Verification
           </a>
         </div>
         {/* end::Menu item */}

src/app/pages/dashboard/model.ts

@@ -30,6 +30,7 @@ export type RecentBVNProps = {
   birthdate?: string | null
   phone?: string | null
   nationality?: string | null
+  pin?: string | null
 }[]
 
 export type DataProps = {

src/app/routing/AppRoutes.tsx

@@ -11,7 +11,6 @@ import {PrivateRoutes} from './PrivateRoutes'
 import {ErrorsPage} from '../modules/errors/ErrorsPage'
 import {Logout, AuthPage, useAuth} from '../modules/auth'
 import {App} from '../App'
-import HelpPage from '../modules/help/HelpPage'
 
 /**
  * Base URL of the website.
@@ -27,7 +26,6 @@ const AppRoutes: FC = () => {
       <Routes>
         <Route element={<App />}>
           <Route path='error/*' element={<ErrorsPage />} />
-          <Route path='/help' element={<HelpPage />} />
           <Route path='logout' element={<Logout />} />
           {currentUser ? (
             <>

src/app/routing/PrivateRoutes.tsx

@@ -6,6 +6,7 @@ import { DashboardWrapper } from "../pages/dashboard/DashboardWrapper";
 // import {MenuTestPage} from '../pages/MenuTestPage'
 import { getCSSVariableValue } from "../../_digifi/assets/ts/_utils";
 import { WithChildren } from "../../_digifi/helpers";
+import HelpPage from "../modules/help/HelpPage";
 // import BuilderPageWrapper from '../pages/layout-builder/BuilderPageWrapper'
 
 const PrivateRoutes = () => {
@@ -98,6 +99,7 @@ const PrivateRoutes = () => {
             </SuspensedView>
           }
         />
+        <Route path='/help' element={<HelpPage />} />
         {/* Page Not Found */}
         <Route path="*" element={<Navigate to="/error/404" />} />
       </Route>