Merge branch 'develop' into 'feature/debug_forms'

# Conflicts:
#   src/components/dashboard/machinary-office/TableRowActions.jsx
#   src/components/dashboard/passenger-boss/TableRowActions.jsx
#   src/components/dashboard/passenger-office/TableRowActions.jsx
#   src/components/dashboard/province-manager/TableRowActions.jsx
#   src/components/dashboard/transportation-assistance/TableRowActions.jsx

src/components/dashboard/change-password/index.jsx

@@ -20,7 +20,7 @@ const DashboardChangePasswordComponent = () => {
     const {directionApp} = useDirection();
 
     const handleSubmit = (values, {setSubmitting, resetForm}) => {
-        Notifications(directionApp, t);
+        Notifications(t);
         axios
             .post(
                 CHANGE_PASSWORD,
@@ -35,12 +35,12 @@ const DashboardChangePasswordComponent = () => {
             )
             .then((response) => {
                 toast.dismiss(pendingToast); // Dismiss the pending toast notification
-                Notifications(directionApp, t, response);
+                Notifications(t, response);
                 resetForm();
             })
             .catch((error) => {
                 toast.dismiss(pendingToast); // Dismiss the pending toast notification
-                Notifications(directionApp, t, error.response);
+                Notifications(t, error.response);
             })
             .finally(() => {
                 setSubmitting(false); // Set `setSubmitting` to false after the API request completes

src/components/dashboard/edit-profile/index.jsx

@@ -20,7 +20,7 @@ const DashboardEditProfile = () => {
     const {directionApp} = useDirection();
 
     const editAvatar = async (avatar) => {
-        Notifications(directionApp, t);
+        Notifications(t);
         try {
             const formData = new FormData();
 
@@ -37,7 +37,7 @@ const DashboardEditProfile = () => {
                 },
             });
         } catch (error) {
-            Notifications(directionApp, t, error.response);
+            Notifications(t, error.response);
             throw error;
         }
     };
@@ -55,13 +55,13 @@ const DashboardEditProfile = () => {
         //       });
         //     })
         //     .then((response) => {
-        //       Notifications(directionApp, t, response);
+        //       Notifications( t, response);
         //       getUser((data) => {
         //         changeUser(data);
         //       });
         //     })
         //     .catch((error) => {
-        //       Notifications(directionApp, t, error.response);
+        //       Notifications( t, error.response);
         //     })
         //     .finally(() => {
         //       setSubmitting(false);
@@ -75,13 +75,13 @@ const DashboardEditProfile = () => {
         //       },
         //     })
         //     .then((response) => {
-        //       Notifications(directionApp, t, response);
+        //       Notifications( t, response);
         //       getUser((data) => {
         //         changeUser(data);
         //       });
         //     })
         //     .catch((error) => {
-        //       Notifications(directionApp, t, error.response);
+        //       Notifications( t, error.response);
         //     })
         //     .finally(() => {
         //       setSubmitting(false);

src/components/first/index.jsx

@@ -2,9 +2,10 @@ import {NextLinkComposed} from "@/core/components/LinkRouting";
 import CenterLayout from "@/layouts/CenterLayout";
 import FullPageLayout from "@/layouts/FullPageLayout";
 import useUser from "@/lib/app/hooks/useUser";
-import {Button, Typography} from "@mui/material";
+import {Button, Stack, Typography} from "@mui/material";
 import {useTranslations} from "next-intl";
 import SvgDashboard from "@/core/components/svgs/SvgDashboard";
+import process from "next/dist/build/webpack/loaders/resolve-url-loader/lib/postcss";
 
 const FirstComponent = () => {
     const t = useTranslations();
@@ -40,6 +41,14 @@ const FirstComponent = () => {
                     </Button>
                 )}
             </CenterLayout>
+            <Stack direction="row" alignItems="center" justifyContent="center">
+                <Typography variant={"caption"}
+                            sx={{
+                                color: 'primary.main',
+                                fontFamily: 'Arial',
+                                fontWeight: 'bold'
+                            }}>v{process.env.NEXT_PUBLIC_API_VERSION}</Typography>
+            </Stack>
         </FullPageLayout>
     );
 };

src/components/login-expert/index.jsx

@@ -1,5 +1,4 @@
 import LinkRouting from "@/core/components/LinkRouting";
-import Notifications from "@/core/components/notifications";
 import PasswordField from "@/core/components/PasswordField";
 import StyledForm from "@/core/components/StyledForm";
 import {GET_USER_TOKEN} from "@/core/data/apiRoutes";
@@ -8,38 +7,39 @@ import FullPageLayout from "@/layouts/FullPageLayout";
 import useUser from "@/lib/app/hooks/useUser";
 import LoginIcon from "@mui/icons-material/Login";
 import {Box, Button, Container, Paper, Stack, TextField, Typography,} from "@mui/material";
-import axios from "axios";
 import {Field, Formik} from "formik";
 import {useTranslations} from "next-intl";
 import {useSearchParams} from "next/navigation";
 import * as Yup from "yup";
 import useDirection from "@/lib/app/hooks/useDirection";
 import SvgLogin from "@/core/components/svgs/SvgLogin";
+import useRequest from "@/lib/app/hooks/useRequest";
 
 const LoginComponent = () => {
     const t = useTranslations();
     const {directionApp} = useDirection();  // should delete because we don't have direction anymore
     const {setToken} = useUser(); // pass token to set token
+    const requestServer = useRequest()
 
     // getting url query
     const searchParams = useSearchParams();
     const backUrlDecodedPath = searchParams.get("back_url");
 
     //formik properties
-    const handleSubmit = async (values, props) => {
-        Notifications(directionApp, t);
-        await axios
-            .post(GET_USER_TOKEN, {
+    const handleSubmit = (values, props) => {
+        requestServer(GET_USER_TOKEN, 'post', {
+            data: {
                 username: values.username,
                 password: values.password,
-            })
-            .then(function (response) {
-                setToken(response.data.token);
-            })
-            .catch(function (error) {
-                Notifications(directionApp, t, error.response);
-                props.setSubmitting(false);
-            });
+            },
+            success: {
+                notification: {show: false}
+            }
+        }).then((response) => {
+            setToken(response.data.token)
+        }).catch(() => {
+            props.setSubmitting(false)
+        })
     };
     const initialValues = {
         username: "",
@@ -120,7 +120,7 @@ const LoginComponent = () => {
                                                     fullWidth
                                                     size="medium"
                                                     endIcon={<LoginIcon/>}
-                                                    disabled={props.isSubmitting ? true : false}
+                                                    disabled={props.isSubmitting}
                                                 >
                                                     {t("LoginPage.button_submit")}
                                                 </Button>