max input length: bvn & code

src/components/Dashboard/DashboardHomeIntro.tsx

@@ -1,7 +1,11 @@
-import React, { FC } from "react";
+import React, { FC, useState, useEffect } from "react";
 import NairaBag from "../../assets/images/dashboard/naira-bag.png";
-import { Button } from "../";
+import { Button, Icons } from "../";
 import { useSelector } from "react-redux";
+import PendingList from "../paginated-list/PendingList";
+import { PendingTableList } from "../../core/models";
+import { NewDateTimeFormatter } from "../../lib/NewDateTimeFormatter";
+import { getUserPendingLoanList } from "../../core/apiRequest";
 
 export interface DashBoardCardProps {
   title?: string;
@@ -75,8 +79,31 @@ interface DashboardHomeIntroProps {
 
 const DashboardHomeIntro: FC<DashboardHomeIntroProps> = ({ handleNextStep, step }) => {
   const { userDetails } = useSelector((state:any) => state?.userDetails); // CHECKS IF USER Details are avaliable
+
+  const [userLoanList, setUserLoanList] = useState<{loading:boolean, data:PendingTableList}>({loading: true, data:[]})
+
+  useEffect(()=>{
+    let token = localStorage.getItem('token')
+    let uid = localStorage.getItem('uid')
+    if(!token || !uid){
+      return
+    }
+    getUserPendingLoanList(uid).then(res => {
+      console.log('RES', res)
+      console.log('RES', userLoanList)
+      if(!res || !res.data.loans){
+        setUserLoanList({loading:false, data:[]})
+        return
+      }
+      setUserLoanList({loading:false, data:res?.data?.loans})
+    }).catch(err => {
+      console.log(err)
+      setUserLoanList({loading:false, data:[]})
+    })
+  },[])
+
   return (
-    <>
+    <div className='w-full'>
     {step == 1 ?
       <>
         <h1 className="font-bold my-5 text-2xl">Hello, {userDetails.firstname}</h1>
@@ -114,7 +141,50 @@ const DashboardHomeIntro: FC<DashboardHomeIntroProps> = ({ handleNextStep, step
         </div>
     </>
     }
-    </>
+    {userLoanList.loading ?
+    null
+    :
+      <div className='mt-5 w-full'>
+        <PendingList
+          data={userLoanList.data}
+          itemsPerPage={5}
+          tableTitle='Current Applications'
+        >
+          {(data:any)=>(
+            <div className="w-full p-4 rounded-lg shadow-lg bg-white overflow-x-auto min-h-[250px] max-h-[450px]">
+              <table className="w-full table-auto">
+                <thead>
+                  <tr className='text-left border-b-2'>
+                    <th className='px-1 py-4'>Date</th>
+                    <th className='px-1 py-4 text-right'>Amount</th>
+                    <th className='px-1 py-4 text-center'>Payment Term</th>
+                    <th className='px-1 py-4 text-center'>Status</th>
+                    <th className='px-1 py-4'>Action</th>
+                  </tr>
+                </thead>
+                <tbody>
+                  {data.map((item:any, index:any) =>(
+                    <tr key={index || item} className='even:bg-slate-100'>
+                      <td className='px-1 py-2'>{NewDateTimeFormatter(item?.added)}</td>
+                      <td className='px-1 py-2 text-right'>{item?.loan_amount}</td>
+                      <td className='px-1 py-2 text-center'>{item?.payment_month}</td>
+                      <td className='px-1 py-2 text-center'>{item?.status}</td>
+                      <td className='px-1 py-2'>
+                        <button className='px-2 py-1 border-2 border-black flex gap-2 items-center'>
+                          View
+                          <Icons name='arrow-right' />
+                        </button>
+                      </td>
+                    </tr>
+                  ))}
+                </tbody>
+              </table>
+            </div>
+          )}
+        </PendingList>
+      </div>
+    }
+    </div>
   );
 };
 

src/components/Header/Header.tsx

@@ -52,7 +52,7 @@ const Header: React.FC<HiddenMenuItems> = ({
           <div className="flex flex-col-reverse lg:flex-col grow lg:grow-0 justify-between items-end">
             <ul className="flex gap-0 lg:gap-[10px] items-center justify-end w-full flex-wrap">
               {[
-                { text: "Open An Account", href: RouteHandler.getStarted },
+                { text: "Open An Account", href: RouteHandler.letsGetStarted },
                 {
                   text: "Internet Banking",
                   href: RouteHandler.businessBanking,

src/components/Icons/Icons.tsx

@@ -1,4 +1,4 @@
-import { FaCaretDown } from "react-icons/fa";
+import { FaCaretDown, FaCaretRight } from "react-icons/fa";
 
 import dashIcon from "../../assets/images/dashboard/dashDefault.svg";
 type Props = {
@@ -111,6 +111,8 @@ export default function Icons({ name, fillColor, className }: Props) {
         </svg>
       ) :name == 'arrow-down'?
           <FaCaretDown className={`text-xl ${className && className}`} />
+        :name == 'arrow-right'?
+          <FaCaretRight className={`text-xl ${className && className}`} />
         :name == "dash-icon" ? (
         <img src={dashIcon} alt="dash-icon" />
       ) : null}

src/components/LetsGetStated/LetsGetStarted.tsx

@@ -1,42 +1,42 @@
-import React from "react";
-import * as Yup from "yup";
-import { Form, Formik } from "formik";
-import { InputCompOne } from "..";
-import {useNavigate} from 'react-router-dom'
-import { RouteHandler } from "../../router/routes";
+import React from 'react';
+import * as Yup from 'yup';
+import { Form, Formik } from 'formik';
+import { InputCompOne } from '..';
+import { useNavigate } from 'react-router-dom';
+import { RouteHandler } from '../../router/routes';
 
-import { useDispatch } from "react-redux";
-import { updateUserDetails } from "../../store/UserDetails";
+import { useDispatch } from 'react-redux';
+import { updateUserDetails } from '../../store/UserDetails';
 
-import { validateBVN, verifyOTP } from "../../core/apiRequest";
-import { RequestStatus } from "../../core/models";
+import { validateBVN, verifyOTP } from '../../core/apiRequest';
+import { RequestStatus } from '../../core/models';
 
 // To get the validation schema
 const validationSchema = Yup.object().shape({
   bvn: Yup.string()
-  .required("BVN is required")
-  .test("no-e", "Invalid number", (value:any) => {
-    if (value && /^[0-9]*$/.test(value) == false) {
-      return false;
-    }
-    return true;
-  })
-  .min(11, "must be 11 digits")
-  .max(11, "must be 11 digits"),
+    .required('BVN is required')
+    .test('no-e', 'Invalid number', (value: any) => {
+      if (value && /^[0-9]*$/.test(value) == false) {
+        return false;
+      }
+      return true;
+    })
+    .min(11, 'must be 11 digits')
+    .max(11, 'must be 11 digits'),
   otp: Yup.string()
-  // .when('require_otp', {
-  //   is: true,
-  //   then: Yup.string().required("OTP is required")
-  // })
-  // .required("OTP is required")
-  .test("no-e", "Invalid number", (value:any) => {
-    if (value && /^[0-9]*$/.test(value) == false) {
-      return false;
-    }
-    return true;
-  })
-  .min(5, "must be 5 digits")
-  .max(5, "must be 5 digits"),
+    // .when('require_otp', {
+    //   is: true,
+    //   then: Yup.string().required("OTP is required")
+    // })
+    // .required("OTP is required")
+    .test('no-e', 'Invalid number', (value: any) => {
+      if (value && /^[0-9]*$/.test(value) == false) {
+        return false;
+      }
+      return true;
+    })
+    .min(5, 'must be 5 digits')
+    .max(5, 'must be 5 digits'),
   // .test("no-e", "must be 11 characters", (value:any) => {
   //   if (value.length < 11) {
   //     return false;
@@ -52,151 +52,207 @@ let initialValues = {
 };
 
 type ValidBVN = {
-  verification_id:string
-  valid: undefined | boolean
-}
+  verification_id: string;
+  valid: undefined | boolean;
+};
 
 const LetsGetStarted: React.FC = () => {
-  const dispatch = useDispatch()
-  const navigate = useNavigate()
+  const dispatch = useDispatch();
+  const navigate = useNavigate();
   // const [pinValues, setPinValues] = React.useState({
   //   bvn: "",
   //   otp: "",
   // });
   // const otpInputRef = React.useRef<HTMLInputElement>(null);
 
-  const [requestStatusBVN, setRequestStatusBVN] = React.useState<RequestStatus>({loading:false, status:undefined, message:''});
+  const [requestStatusBVN, setRequestStatusBVN] = React.useState<RequestStatus>(
+    { loading: false, status: undefined, message: '' }
+  );
 
-  const [requestStatusOTP, setRequestStatusOTP] = React.useState<RequestStatus>({loading:false, status:undefined, message:''});
+  const [requestStatusOTP, setRequestStatusOTP] = React.useState<RequestStatus>(
+    { loading: false, status: undefined, message: '' }
+  );
 
   const [bvnIsValid, setBvnIsValid] = React.useState<ValidBVN>({
     verification_id: '',
-    valid: undefined
+    valid: undefined,
   });
 
-
   // e: React.FormEvent<HTMLInputElement>
   // let { value } = e.target as HTMLInputElement;
-  const bvnValidation = (values:any) => {   // Function to Validate BVN
-    let bvn = values.bvn
-    setRequestStatusBVN({loading:true, status:false, message:''})
-    validateBVN({bvn}).then(res => {
-      if(!res || !res.data.call_return){
-        setBvnIsValid({verification_id:'', valid: false})
-        setRequestStatusBVN({loading:false, status:false, message:'unable to verify BVN'})
-        return setTimeout(()=>{
-          setRequestStatusBVN({loading:false, status:false, message:''})
-        }, 4000)
-      }
-      setBvnIsValid({verification_id:res.data.verification_id, valid: true})
-      setRequestStatusBVN({loading:false, status:true, message:'verified'})
-    }).catch(err => {
-      setBvnIsValid({verification_id:'', valid: false})
-      console.log(err)
-    })
+  const bvnValidation = (values: any) => {
+    // Function to Validate BVN
+    let bvn = values.bvn;
+    setRequestStatusBVN({ loading: true, status: false, message: '' });
+    validateBVN({ bvn })
+      .then((res) => {
+        if (!res || !res.data.call_return) {
+          setBvnIsValid({ verification_id: '', valid: false });
+          setRequestStatusBVN({
+            loading: false,
+            status: false,
+            message: 'unable to verify BVN',
+          });
+          return setTimeout(() => {
+            setRequestStatusBVN({ loading: false, status: false, message: '' });
+          }, 4000);
+        }
+        setBvnIsValid({
+          verification_id: res.data.verification_id,
+          valid: true,
+        });
+        setRequestStatusBVN({
+          loading: false,
+          status: true,
+          message: 'verified',
+        });
+      })
+      .catch((err) => {
+        setBvnIsValid({ verification_id: '', valid: false });
+        console.log(err);
+      });
   };
 
-  const handleSubmit = (values:any) => {  // Function to VERIFY OTP AND LOGIN USER
-    setRequestStatusOTP({loading:true, status:false, message:''})
+  const handleSubmit = (values: any) => {
+    // Function to VERIFY OTP AND LOGIN USER
+    setRequestStatusOTP({ loading: true, status: false, message: '' });
     // console.log('values', values)
-    verifyOTP({...values, verification_id:bvnIsValid.verification_id}).then(res=>{
-      if(!res || !res.data.call_return){
-        setRequestStatusOTP({loading:false, status:false, message:'wrong otp'})
-        return setTimeout(()=>{
-          setRequestStatusOTP({loading:false, status:false, message:''})
-        },4000)
-      }
-      // console.log(res.data)
-      localStorage.setItem('token', res.data?.token)
-      localStorage.setItem('uid', res?.data?.customer[0]?.uid)
-      dispatch(updateUserDetails({ ...res?.data?.customer[0] }));
-      navigate(RouteHandler.dashboardHome, {replace:true})
-    }).catch(err => {
-      setRequestStatusOTP({loading:false, status:false, message:'something went wrong, try again'})
-      console.log(err)
-      return setTimeout(()=>{
-        setRequestStatusOTP({loading:false, status:false, message:''})
-      },4000)
-    })
+    verifyOTP({ ...values, verification_id: bvnIsValid.verification_id })
+      .then((res) => {
+        if (!res || !res.data.call_return) {
+          setRequestStatusOTP({
+            loading: false,
+            status: false,
+            message: 'wrong otp',
+          });
+          return setTimeout(() => {
+            setRequestStatusOTP({ loading: false, status: false, message: '' });
+          }, 4000);
+        }
+        // console.log(res.data)
+        localStorage.setItem('token', res.data?.token);
+        localStorage.setItem('uid', res?.data?.customer[0]?.uid);
+        dispatch(updateUserDetails({ ...res?.data?.customer[0] }));
+        navigate(RouteHandler.dashboardHome, { replace: true });
+      })
+      .catch((err) => {
+        setRequestStatusOTP({
+          loading: false,
+          status: false,
+          message: 'something went wrong, try again',
+        });
+        console.log(err);
+        return setTimeout(() => {
+          setRequestStatusOTP({ loading: false, status: false, message: '' });
+        }, 4000);
+      });
   };
 
   return (
     <Formik
-    initialValues={initialValues}
-    validationSchema={validationSchema}
-    onSubmit={bvnIsValid.valid ? handleSubmit : bvnValidation}
+      initialValues={initialValues}
+      validationSchema={validationSchema}
+      onSubmit={bvnIsValid.valid ? handleSubmit : bvnValidation}
     >
-    {(props:any) => (
-      <Form className="">
-        <div className="w-full">
-          <div className="containerMode flex justify-between gap-1 xl:gap-8 flex-col">
-            <div className="my-[4rem] flex items-center justify-center w-full">
-              <h1 className="font-bold text-[2.375rem] text-[#5C2684] my-[.5rem] text-center">
-                Let’s Get You Started
-              </h1>
-            </div>
-            <div className="mx-auto flex flex-col gap-8 max-w-[31.625rem] ">
-              <div className='w-full'>
-                <InputCompOne
-                  parentClass="flex flex-col gap-2"
-                  label="Enter Your BVN "
-                  name="bvn"
-                  parentInputClass="w-full"
-                  labelSpan="( To get your BVN, dial *565*0# )"
-                  labelSpanClass="text-[13px] text-[#5a5a5a] font-semibold"
-                  placeholder="Enter your BVN"
-                  labelClass="font-bold text-[18px] leading-[21.78px] tracking-[2%] text-[#282828] mb-[2px] flex item-center gap-[4px]"
-                  input
-                  inputClass="w-full h-[3.625rem] rounded bg-[#EFEFEF] px-4"
-                  value={props.values.bvn}
-                  onChange={props.handleChange}
-                  error={(props.errors.bvn && props.touched.bvn) && props.errors.bvn}
-                />
-                <p className={`p-2 ${!requestStatusBVN.status ? 'text-red-500' : 'text-emerald-500'}`}>{requestStatusBVN.loading ? 'verifying...' : requestStatusBVN.message}</p>
+      {(props: any) => (
+        <Form className="">
+          <div className="w-full">
+            <div className="containerMode flex justify-between gap-1 xl:gap-8 flex-col">
+              <div className="my-[4rem] flex items-center justify-center w-full">
+                <h1 className="font-bold text-[2.375rem] text-[#5C2684] my-[.5rem] text-center">
+                  Let’s Get You Started
+                </h1>
               </div>
-              {bvnIsValid.valid && (
-                <InputCompOne
-                  parentClass="flex flex-col gap-2"
-                  label="Enter OTP "
-                  name="otp"
-                  parentInputClass="w-full"
-                  labelSpan="( Please check your BVN phone number for verification pin )"
-                  labelSpanClass="text-[13px] text-[#5a5a5a] font-semibold"
-                  placeholder="Enter your OTP"
-                  labelClass="font-bold text-[18px] leading-[21.78px] tracking-[2%] text-[#282828] mb-[2px] flex item-center gap-[4px]"
-                  input
-                  inputClass="w-full h-[3.625rem] rounded bg-[#EFEFEF] px-4"
-                  value={props.values.otp}
-                  onChange={props.handleChange}
-                  error={(props.errors.otp && props.touched.otp) && props.errors.otp}
-                />
-              )}
-              <button
-                type='submit'
-                className="w-full h-[3.625rem] rounded bg-[#FBB700] rounded-2 px-4 text-[18px] text-[#282828] font-semibold disabled:text-[#282828] disabled:text-opacity-50"
-                disabled={requestStatusBVN.loading || (!props.values.otp && bvnIsValid.valid)}
-              >
-                Enter
-              </button>
-              
-              <p className={`p-2 ${!requestStatusOTP.status ? 'text-red-500' : 'text-emerald-500'}`}>{requestStatusOTP.message}</p>
+              <div className="mx-auto flex flex-col gap-8 max-w-[31.625rem] ">
+                <div className="w-full">
+                  <InputCompOne
+                    parentClass="flex flex-col gap-2"
+                    label="Enter Your BVN "
+                    name="bvn"
+                    parentInputClass="w-full"
+                    labelSpan="( To get your BVN, dial *565*0# )"
+                    labelSpanClass="text-[13px] text-[#5a5a5a] font-semibold"
+                    placeholder="Enter your BVN"
+                    labelClass="font-bold text-[18px] leading-[21.78px] tracking-[2%] text-[#282828] mb-[2px] flex item-center gap-[4px]"
+                    input
+                    inputClass="w-full h-[3.625rem] rounded bg-[#EFEFEF] px-4"
+                    value={props.values.bvn}
+                    onChange={props.handleChange}
+                    error={
+                      props.errors.bvn && props.touched.bvn && props.errors.bvn
+                    }
+                    maxLength={11}
+                  />
+                  <p
+                    className={`p-2 ${
+                      !requestStatusBVN.status
+                        ? 'text-red-500'
+                        : 'text-emerald-500'
+                    }`}
+                  >
+                    {requestStatusBVN.loading
+                      ? 'verifying...'
+                      : requestStatusBVN.message}
+                  </p>
+                </div>
+                {bvnIsValid.valid && (
+                  <InputCompOne
+                    parentClass="flex flex-col gap-2"
+                    label="Enter OTP "
+                    name="otp"
+                    parentInputClass="w-full"
+                    labelSpan="( Please check your BVN phone number for verification pin )"
+                    labelSpanClass="text-[13px] text-[#5a5a5a] font-semibold"
+                    placeholder="Enter your OTP"
+                    labelClass="font-bold text-[18px] leading-[21.78px] tracking-[2%] text-[#282828] mb-[2px] flex item-center gap-[4px]"
+                    input
+                    inputClass="w-full h-[3.625rem] rounded bg-[#EFEFEF] px-4"
+                    value={props.values.otp}
+                    onChange={props.handleChange}
+                    error={
+                      props.errors.otp && props.touched.otp && props.errors.otp
+                    }
+                    maxLength={5}
+                  />
+                )}
+                <button
+                  type="submit"
+                  className="w-full h-[3.625rem] rounded bg-[#FBB700] rounded-2 px-4 text-[18px] text-[#282828] font-semibold disabled:text-[#282828] disabled:text-opacity-50"
+                  disabled={
+                    requestStatusBVN.loading ||
+                    (!props.values.otp && bvnIsValid.valid)
+                  }
+                >
+                  Enter
+                </button>
 
-              {bvnIsValid.valid || bvnIsValid.valid == undefined ? (
-                <p className="text-[#5C2684] mt-[1.5625rem] w-fit">
-                  ***Every personal information attached to your BVN is safe and
-                  secure. It is only important for us to verify your information and
-                  also give you access to your application profile/account.
+                <p
+                  className={`p-2 ${
+                    !requestStatusOTP.status
+                      ? 'text-red-500'
+                      : 'text-emerald-500'
+                  }`}
+                >
+                  {requestStatusOTP.message}
                 </p>
-              ) : (
-                <p className="text-[#5C2684] mt-[1.5625rem] w-fit">
-                  ***Did not receive OTP? Click to resend
-                </p>
-              )}
+
+                {bvnIsValid.valid || bvnIsValid.valid == undefined ? (
+                  <p className="text-[#5C2684] mt-[1.5625rem] w-fit">
+                    ***Every personal information attached to your BVN is safe
+                    and secure. It is only important for us to verify your
+                    information and also give you access to your application
+                    profile/account.
+                  </p>
+                ) : (
+                  <p className="text-[#5C2684] mt-[1.5625rem] w-fit">
+                    ***Did not receive OTP? Click to resend
+                  </p>
+                )}
+              </div>
             </div>
           </div>
-        </div>
-      </Form>
-    )}
+        </Form>
+      )}
     </Formik>
   );
 };

src/components/paginated-list/PendingList.tsx

@@ -0,0 +1,134 @@
+import { ReactNode, useEffect, useState } from "react";
+import { PendingTableList } from "../../core/models";
+
+type PaginatedListProps = {
+    data: PendingTableList,
+    itemsPerPage?: number,
+    filterItem?: string[],
+    tableTitle?: string,
+    titleClass?:string,
+    children: (data:PendingTableList) => ReactNode;
+}
+
+export default function PendingList({
+  data,
+  itemsPerPage = 5,
+  filterItem,
+  tableTitle,
+  titleClass,
+  children,
+}:PaginatedListProps) {
+  const [searchTerm, setSearchTerm] = useState("");
+  const [filteredData, setFilteredData] = useState(data);
+
+  const [currentPage, setCurrentPage] = useState(0);
+  const [newData, setNewData] = useState<any>([]);
+
+  const numberOfSelection = itemsPerPage;
+
+  const handlePrev = () => {
+    if (currentPage != 0) {
+      setCurrentPage((prev) => prev - numberOfSelection);
+    }
+  };
+  const handleNext = () => {
+    if (currentPage < data.length) {
+      setCurrentPage((prev) => prev + numberOfSelection);
+    }
+  };
+
+  const handleSearch = ({ target: { value } }:{target: {value:string}}, name:string) => {
+    setSearchTerm(value);
+    let newFilteredData:any = data.filter((item:any) =>
+      item[name].toLowerCase().startsWith(value.toLowerCase())
+    );
+    setFilteredData(newFilteredData);
+    setCurrentPage(0);
+  };
+
+  useEffect(() => {
+    setNewData(
+      filteredData?.slice(currentPage, numberOfSelection + currentPage)
+    );
+  }, [currentPage, filteredData]);
+
+  useEffect(()=>{
+    setCurrentPage(0)
+  },[itemsPerPage])
+
+  return (
+    <div className="w-full">
+      <h1 className={`text-2xl mb-5 font-semibold ${titleClass && titleClass}`}>{tableTitle}</h1>
+
+      {data.length > 0 && filterItem && (
+        <div className="mb-10 flex justify-end items-center gap-2">
+          {filterItem.map((item, index) => (
+            <label
+              key={index}
+              className="flex flex-col sm:flex-row items-center gap-2 text-slate-600 dark:text-slate-100 transition-all duration-500"
+            >
+              Search by {item[0].toUpperCase() + item.slice(1)}
+              <input
+                name={item}
+                type="text"
+                className="py-1 px-2 text-sm min-w-[100px] text-black dark:text-white bg-white dark:bg-slate-800 rounded-full border-0 outline-none ring-1 ring-slate-300 dark:ring-white transition-all duration-500"
+                value={searchTerm}
+                onChange={(e) => {
+                  handleSearch(e, item);
+                }}
+              />
+            </label>
+          ))}
+        </div>
+      )}
+
+      {children(newData)}
+
+      {/* show prev and next button if data exist */}
+      {(data.length > 0 && data.length > itemsPerPage) && (
+        <div className="mt-5 md:mt-10 w-full flex gap-4 justify-center items-center">
+        <button
+          onClick={handlePrev}
+          className={`w-6 h-6 md:w-12 md:h-12 text-sm md:text-lg rounded-full flex justify-center items-center transition-all duration-300 ${
+            currentPage == 0
+              ? "text-slate-400 border-slate-400 dark:text-slate-400 dark:border-slate-400 pointer-events-none"
+              : "text-slate-600 border-slate-600 dark:text-white dark:border-white"
+          }`}
+        >
+          &lt;
+        </button>
+
+        {data.length && data.map((item, index)=>{
+          item = item
+          if(index%itemsPerPage == 0 && index >= currentPage && index <= currentPage+itemsPerPage){
+            return (
+              <button
+                key={index}
+                onClick={handleNext}
+                className={`w-6 h-6 md:w-12 md:h-12 text-sm md:text-lg rounded-full flex justify-center items-center border transition-all duration-300 ${
+                  currentPage != index
+                    ? "text-slate-400 border-slate-400 dark:text-slate-400 dark:border-slate-400"
+                    : "text-slate-600 border-slate-600 dark:text-white dark:border-white pointer-events-none"
+                }`}
+              >
+                {index/itemsPerPage +1}
+              </button>
+            )
+          }
+        })}
+
+        <button
+          onClick={handleNext}
+          className={`w-6 h-6 md:w-12 md:h-12 text-sm md:text-lg rounded-full flex justify-center items-center transition-all duration-300 ${
+            currentPage + numberOfSelection >= data.length
+              ? "text-slate-400 border-slate-400 dark:text-slate-400 dark:border-slate-400 pointer-events-none"
+              : "text-slate-600 border-slate-600 dark:text-white dark:border-white"
+          }`}
+        >
+          &gt;
+        </button>
+      </div>
+      )}
+    </div>
+  );
+}

src/core/apiRequest.ts

@@ -26,11 +26,18 @@ export const applyForLoan = (postData:any) => {
     return postAuxEnd('/loan/apply', reqData)
 }
 
+// FUNCTION TO GET USER BY CUSTOMER UID
+export const getUserByID = (uid:string) => {
+    let reqData = {
+        // customer_uid: localStorage.getItem('uid'),
+    }
+    return getAuxEnd(`/profile?uid=${uid}`, reqData)
+}
 
 // FUNCTION TO GET USER BY CUSTOMER UID
-export const getUserByID = () => {
+export const getUserPendingLoanList = (uid:string) => {
     let reqData = {
-        customer_uid: localStorage.getItem('uid'),
+        // customer_uid: localStorage.getItem('uid'),
     }
-    return getAuxEnd(`/profile?uid=${reqData.customer_uid}`, reqData)
+    return getAuxEnd(`/dash?uid=${uid}`, reqData)
 }

src/core/models.ts

@@ -15,4 +15,13 @@ export interface User {
     token?:string
     customer_uid?:string
     call_return?:string
-  }
+  }
+
+
+export type PendingTableList = {
+    status?: string | boolean;
+    application_uid?: string
+    added?: string
+    loan_amount?: string
+    payment_month?: string    
+}[];

src/layouts/DashboardLayout/DashboardAuth.tsx

@@ -20,13 +20,14 @@ export default function DashboardAuth() {
 
   useEffect(()=>{
     let token = localStorage.getItem('token')
-    if(!token){
+    let uid = localStorage.getItem('uid')
+    if(!token || !uid){
       navigate(RouteHandler.letsGetStarted, {replace:true})
       return
     }
     const getUser = () => { // FUNCTION TO GET USER BY ID
       // let data = {firstname:'firstname', lastname:'lastname', uid:'28273737646466464'}
-      getUserByID().then(res=>{
+      getUserByID(uid).then(res=>{
         if(!res.data.call_return || !Object.keys(res.data.customer).length){
           navigate(RouteHandler.letsGetStarted, {replace:true})
           return
@@ -34,6 +35,7 @@ export default function DashboardAuth() {
         setLoading(false)
         dispatch(updateUserDetails(res.data.customer));
       }).catch(err=>{
+        navigate(RouteHandler.letsGetStarted, {replace:true})
         console.log('USER ERROR', err)
       })
     }

src/lib/NewDateTimeFormatter.ts

@@ -0,0 +1,18 @@
+
+export function NewDateTimeFormatter(isoDateString:any, addHour = true) {
+    const date = new Date(isoDateString);
+    if (addHour) {
+      date.setTime(date.getTime() + 1 * 60 * 60 * 1000);
+    }
+    const formattedDate = date.toLocaleDateString("en-US", {
+      year: "numeric",
+      month: "numeric",
+      day: "numeric",
+      hour: "2-digit",
+      minute: "2-digit",
+    //   second: "2-digit",
+      hour12: true,
+      timeZone: "UTC",
+    });
+    return formattedDate;
+  }