diff --git a/src/components/dashboard/navgan/followUp-loan/index.jsx b/src/components/dashboard/navgan/followUp-loan/index.jsx
index cda243c..de3176c 100644
--- a/src/components/dashboard/navgan/followUp-loan/index.jsx
+++ b/src/components/dashboard/navgan/followUp-loan/index.jsx
@@ -1,66 +1,37 @@
 import DashboardLayouts from "@/layouts/dashboardLayouts";
-import useUser from "@/lib/app/hooks/useUser";
-import ExpandMoreIcon from "@mui/icons-material/ExpandMore";
 import {
-    Avatar,
-    Card,
-    CardActions,
-    CardContent,
-    CardHeader,
-    Collapse,
     Grid,
-    IconButton,
     Stack,
-    Typography
 } from "@mui/material";
-import {styled} from "@mui/material/styles";
-import {useTranslations} from "next-intl";
-import {useState} from "react";
-
-const ExpandMore = styled((props) => {
-    const {expand, ...other} = props;
-    return <IconButton {...other} />;
-})(({theme, expand}) => ({
-    transform: !expand ? "rotate(0deg)" : "rotate(180deg)",
-    marginLeft: "auto",
-    transition: theme.transitions.create("transform", {
-        duration: theme.transitions.duration.shortest,
-    }),
-}));
-
-const data = [
-    {
-        name: "جان دو",
-        date: "۱۳۹۹/۰۴/۲۵",
-        description:
-            "لورم ایپسوم متن ساختگی با تولید سادگی نامفهوم از صنعت چاپ و با استفاده از طراحان گرافیک است.",
-    },
-    {
-        name: "جین اسمیت",
-        date: "۱۳۹۹/۰۴/۲۶",
-        description: "نُلا ویته الیت لیبرو آ، آ فارِترا آوگوه.",
-    },
-    {
-        name: "مایک جانسون",
-        date: "۱۳۹۹/۰۴/۲۷",
-        description:
-            "دوئیس مولیس، است نُن کُمُدو لُکتوس، نیسی ارات پورتیتور لیگولا.",
-    },
-];
+import {useEffect, useState} from "react";
+import {SHOW_LOAN_REQUEST_NAVGAN} from "@/core/data/apiRoutes";
+import useLoading from "@/lib/app/hooks/useLoading";
+import useRequest from "@/lib/app/hooks/useRequest";
+import moment from "jalali-moment";
+import RequestCard from "@/components/dashboard/navgan/followUp-loan/RequestCard";
 
 const LoanFollowUpComponent = () => {
-    const t = useTranslations();
-    const {token} = useUser();
-
-    const [expanded, setExpanded] = useState([]);
-
-    const handleExpandClick = (index) => {
-        setExpanded((prevExpanded) => {
-            const newExpanded = [...prevExpanded];
-            newExpanded[index] = !newExpanded[index];
-            return newExpanded;
-        });
-    };
+    const requestServer = useRequest();
+    const {setLoadingPage} = useLoading();
+    const [requestsList, setRequestsList] = useState([]);
+    // get form data
+    useEffect(() => {
+        setLoadingPage(true)
+        requestServer(SHOW_LOAN_REQUEST_NAVGAN, "get", {auth: true, notification: false})
+            .then(function ({data}) {
+                const items = data.data;
+                const formattedData = items.map((item, index) => ({
+                    id: item.id,
+                    latest_history_created_at: moment(item.latest_history_created_at).locale("fa").format("HH:mm | YYYY/MM/DD"),
+                    state_id: item.state_id,
+                    loan_state: item.loan_state,
+                }));
+                setRequestsList(formattedData);
+                setLoadingPage(false)
+            })
+            .catch(function (error) {
+            })
+    }, []);
 
     return (
         <DashboardLayouts>
@@ -77,42 +48,8 @@ const LoanFollowUpComponent = () => {
                     rowSpacing={2}
                     sx={{alignItems: "start", justifyContent: "center"}}
                 >
-                    {data.map((item, index) => (
-                        <Grid item xs={12} md={6} lg={4} key={index}>
-                            <Card sx={{width: "100%"}}>
-                                <CardHeader
-                                    avatar={
-                                        <Avatar
-                                            sx={{bgcolor: "primary.main"}}
-                                            aria-label="recipe"
-                                        ></Avatar>
-                                    }
-                                    title={item.name}
-                                    subheader={item.date}
-                                />
-                                <CardContent>
-                                    <Typography variant="body2" color="text.secondary">
-                                        متن تست
-                                    </Typography>
-                                </CardContent>
-                                <CardActions disableSpacing>
-                                    <ExpandMore
-                                        expand={expanded[index]}
-                                        onClick={() => handleExpandClick(index)}
-                                        aria-expanded={expanded[index]}
-                                        aria-label="show more"
-                                    >
-                                        <ExpandMoreIcon/>
-                                    </ExpandMore>
-                                </CardActions>
-                                <Collapse in={expanded[index]} timeout="auto" unmountOnExit>
-                                    <CardContent>
-                                        <Typography paragraph>اطلاعات تکمیلی:</Typography>
-                                        <Typography paragraph>{item.description}</Typography>
-                                    </CardContent>
-                                </Collapse>
-                            </Card>
-                        </Grid>
+                    {requestsList.map((item, index) => (
+                        <RequestCard item={item} key={item.id}/>
                     ))}
                 </Grid>
             </Stack>
diff --git a/src/components/dashboard/refahi/add-request-loan/forms/AddForm.jsx b/src/components/dashboard/refahi/add-request-loan/forms/AddForm.jsx
index 773cbe8..06a40fc 100644
--- a/src/components/dashboard/refahi/add-request-loan/forms/AddForm.jsx
+++ b/src/components/dashboard/refahi/add-request-loan/forms/AddForm.jsx
@@ -69,7 +69,7 @@ const AddFormComponent = () => {
         shenasname_image: Yup.mixed().required(t("LoanRequest.error_message_shenasname_image")),
         payan_khedmat_image: Yup.mixed().required(t("LoanRequest.error_message_payan_khedmat_image")),
     });
-    const handleSubmit = async (values, props) => {
+    const handleSubmit = (values, props) => {
         const formData = new FormData();
         formData.append("name", values.name);
         formData.append("phone_number", values.phone_number);
diff --git a/src/components/dashboard/refahi/edit-request-loan/forms/EditForm.jsx b/src/components/dashboard/refahi/edit-request-loan/forms/EditForm.jsx
index 501c47f..9ea22c2 100644
--- a/src/components/dashboard/refahi/edit-request-loan/forms/EditForm.jsx
+++ b/src/components/dashboard/refahi/edit-request-loan/forms/EditForm.jsx
@@ -85,7 +85,7 @@ const EditFormComponent = () => {
         payan_khedmat_image: Yup.mixed().required(t("LoanRequest.error_message_payan_khedmat_image")),
     });
 
-    const handleSubmit = async (values, props) => {
+    const handleSubmit = (values, props) => {
         const formData = new FormData();
         formData.append("name", values.name);
         formData.append("phone_number", values.phone_number);
diff --git a/src/components/login/SendToken.jsx b/src/components/login/SendToken.jsx
index c3e30be..517a5db 100644
--- a/src/components/login/SendToken.jsx
+++ b/src/components/login/SendToken.jsx
@@ -34,7 +34,7 @@ const SendTokenComponent = ({
         ),
     });
 
-    const handleSubmit = async (values, props) => {
+    const handleSubmit = (values, props) => {
         requestServer(LOGIN, "post", {
             auth: false, data: {
                 phone_number: values.phone_number,
@@ -130,6 +130,7 @@ const SendTokenComponent = ({
                                                 timer={timer}
                                                 setTimer={setTimer}
                                                 PhoneNumber={PhoneNumber}
+                                                disabled={props.isSubmitting}
                                             />
                                         </Stack>
                                     </StyledForm>
diff --git a/src/components/login/SendUserData.jsx b/src/components/login/SendUserData.jsx
index 1e8adee..6743799 100644
--- a/src/components/login/SendUserData.jsx
+++ b/src/components/login/SendUserData.jsx
@@ -33,7 +33,7 @@ const SendUserDataComponent = ({
         phone_number: Yup.string().required(t("LoginPage.error_message_phone_number")),
     });
 
-    const handleSubmit = async (values, props) => {
+    const handleSubmit = (values, props) => {
         requestServer(SEND_OTP_TOKEN, "post", {
             auth: false, data: {
                 phone_number: values.phone_number,
@@ -101,7 +101,7 @@ const SendUserDataComponent = ({
                                                     <LinkRouting href={"/register"}>
                                                         <Button
                                                             fullWidth
-                                                            type="submit"
+                                                            type="button"
                                                             variant="outlined"
                                                             size="large"
                                                             endIcon={<PersonAddIcon/>}
diff --git a/src/components/register/RequestOtp.jsx b/src/components/register/RequestOtp.jsx
index fe2db0d..a24aa4f 100644
--- a/src/components/register/RequestOtp.jsx
+++ b/src/components/register/RequestOtp.jsx
@@ -34,7 +34,7 @@ const RequestOtpComponent = ({
         ),
     });
 
-    const handleSubmit = async (values, props) => {
+    const handleSubmit = (values, props) => {
         requestServer(SEND_OTP_TOKEN, "post", {
             auth: false, data: {
                 phone_number: values.phone_number,
diff --git a/src/components/register/navy/UserRegister.jsx b/src/components/register/navy/UserRegister.jsx
index fe5fdd3..09346cc 100644
--- a/src/components/register/navy/UserRegister.jsx
+++ b/src/components/register/navy/UserRegister.jsx
@@ -42,7 +42,7 @@ const UserRegisterComponent = ({
         navgan_id: Yup.string().required(t("RegisterPage.error_message_navgan_id")),
     });
 
-    const handleSubmit = async (values, props) => {
+    const handleSubmit = (values, props) => {
         requestServer(REGISTER, "post", {
             auth: false, data: {
                 type_id: values.type_id,
diff --git a/src/components/register/welfare-services/UserRegister.jsx b/src/components/register/welfare-services/UserRegister.jsx
index 0dec59f..a043a53 100644
--- a/src/components/register/welfare-services/UserRegister.jsx
+++ b/src/components/register/welfare-services/UserRegister.jsx
@@ -40,7 +40,7 @@ const UserRegisterComponent = ({
         ),
     });
 
-    const handleSubmit = async (values, props) => {
+    const handleSubmit = (values, props) => {
         requestServer(REGISTER, "post", {
             auth: false, data: {
                 type_id: values.type_id,
@@ -125,6 +125,7 @@ const UserRegisterComponent = ({
                                                 timer={timer}
                                                 setTimer={setTimer}
                                                 PhoneNumber={PhoneNumber}
+                                                disabled={props.isSubmitting}
                                             />
                                             <Divider>
                                                 <Chip label={t("RegisterPage.complete_information")}/>
diff --git a/src/core/components/ResendToken.jsx b/src/core/components/ResendToken.jsx
index dab6161..906581c 100644
--- a/src/core/components/ResendToken.jsx
+++ b/src/core/components/ResendToken.jsx
@@ -4,12 +4,13 @@ import {Button} from "@mui/material";
 import axios from "axios";
 import {useTranslations} from "next-intl";
 import {useEffect} from "react";
-import {SEND_OTP_TOKEN} from "../data/apiRoutes";
+import {LOGIN, SEND_OTP_TOKEN} from "../data/apiRoutes";
+import useRequest from "@/lib/app/hooks/useRequest";
 
-const ResendToken = ({initialTimerValue, timer, setTimer, PhoneNumber}) => {
+const ResendToken = ({initialTimerValue, timer, setTimer, PhoneNumber, disabled}) => {
     const t = useTranslations();
     const {directionApp} = useDirection();
-
+    const requestServer = useRequest();
     // Countdown Timer
     useEffect(() => {
         let interval;
@@ -26,21 +27,17 @@ const ResendToken = ({initialTimerValue, timer, setTimer, PhoneNumber}) => {
     // End Countdown Timer
 
     // Handle Resend Token
-    const handleResendClick = async () => {
-        // work on it
+    const handleResendClick = () => {
         if (timer != 0) return;
-        Notifications(t, undefined);
-        await axios
-            .post(SEND_OTP_TOKEN, {
+        requestServer(SEND_OTP_TOKEN, "post", {
+            auth: false, data: {
                 phone_number: PhoneNumber,
-            })
+            }
+        })
             .then(function (response) {
-                Notifications(t, response);
                 setTimer(initialTimerValue);
-            })
-            .catch(function (error) {
-                Notifications(t, error.response);
-            });
+            }).catch(function (error) {
+        });
     };
     // End Handle Resend Token
 
@@ -60,6 +57,7 @@ const ResendToken = ({initialTimerValue, timer, setTimer, PhoneNumber}) => {
                 <Button
                     color="success"
                     sx={{width: "120px", alignSelf: "center", mt: 0}}
+                    disabled={disabled}
                     onClick={handleResendClick}
                 >
                     {t("resend_code")}
diff --git a/src/core/data/apiRoutes.js b/src/core/data/apiRoutes.js
index 26c6128..91d7c5e 100644
--- a/src/core/data/apiRoutes.js
+++ b/src/core/data/apiRoutes.js
@@ -7,6 +7,7 @@ export const SEND_OTP_TOKEN = BASE_URL + "/otp";
 export const REGISTER = BASE_URL + "/register";
 export const USER_INFO = BASE_URL + "/profile/info";
 export const SEND_LOAN_REQUEST_NAVGAN = BASE_URL + "/navgan/loan/store";
+export const SHOW_LOAN_REQUEST_NAVGAN = BASE_URL + "/navgan/loan/index"
 export const SHOW_LOAN_REQUEST_WELFARE = BASE_URL + "/refahi/loan/index";
 export const SEND_LOAN_REQUEST_WELFARE = BASE_URL + "/refahi/loan/store";
 export const UPDATE_LOAN_REQUEST_WELFARE = BASE_URL + "/refahi/loan/update/";