diff --git a/src/core/components/NetworkComponent.jsx b/src/core/components/NetworkComponent.jsx
index 22d4620..3e8ad37 100644
--- a/src/core/components/NetworkComponent.jsx
+++ b/src/core/components/NetworkComponent.jsx
@@ -11,6 +11,7 @@ const NetworkComponent = () => {
const t = useTranslations()
useEffect(() => {
+ console.log(network.online)
if (network.online) {
toast.update(networkToastId.current, {
type: toast.TYPE.SUCCESS,
@@ -23,6 +24,8 @@ const NetworkComponent = () => {
return
}
networkToastId.current = toast.warn(t('offline_message'), {
+ containerId: 'connection',
+ draggable: false,
autoClose: false, closeButton: false, closeOnClick: false, icon:
})
}, [network.online]);
diff --git a/src/core/utils/errorHandler.js b/src/core/utils/errorHandler.js
index 2c12ab2..e380e84 100644
--- a/src/core/utils/errorHandler.js
+++ b/src/core/utils/errorHandler.js
@@ -59,7 +59,7 @@ const errorValidation = (pushToastList, response, t, notification) => {
const errorsArray = response.data.errors
errorsMap.map((item, index) => {
- Notifications(pushToastList, "error", t, errorsArray[item][0], response.data.message);
+ Notifications(pushToastList, "error", t, response.status, errorsArray[item][0]);
})
}
}
\ No newline at end of file
diff --git a/src/layouts/AppLayout.jsx b/src/layouts/AppLayout.jsx
index 5bb1d23..61984f6 100644
--- a/src/layouts/AppLayout.jsx
+++ b/src/layouts/AppLayout.jsx
@@ -53,6 +53,11 @@ function AppLayout({children, isBot}) {
containerId="validation"
position={directionApp === "ltr" ? "top-left" : "top-right"}
rtl={directionApp === 'rtl'}/>
+
{children}
>
diff --git a/src/lib/app/contexts/socket.jsx b/src/lib/app/contexts/socket.jsx
index 363faca..a95bccf 100644
--- a/src/lib/app/contexts/socket.jsx
+++ b/src/lib/app/contexts/socket.jsx
@@ -2,7 +2,7 @@ import {createContext, useEffect, useMemo, useRef, useState} from "react";
import {io} from "socket.io-client";
import useUser from "@/lib/app/hooks/useUser";
import {useTranslations} from "next-intl";
-import {toast, ToastContainer} from "react-toastify";
+import {toast} from "react-toastify";
import PowerIcon from "@mui/icons-material/Power";
import PowerOffIcon from "@mui/icons-material/PowerOff";
import useDirection from "@/lib/app/hooks/useDirection";
@@ -17,7 +17,7 @@ export const SocketProvider = ({children}) => {
const {directionApp} = useDirection();
const socket = useMemo(() => io(process.env.NEXT_PUBLIC_SERVER_SOCKET_URL, {
autoConnect: false,
- transports: ['websocket'],
+ // transports: ['websocket'],
auth: {
token: ""
}
@@ -60,7 +60,7 @@ export const SocketProvider = ({children}) => {
return
}
socketToastId.current = toast.warn(t('socket_is_not_connect_message'), {
- containerId: 'socket',
+ containerId: 'connection',
draggable: false,
autoClose: false, closeButton: false, closeOnClick: false, icon:
})
@@ -69,10 +69,6 @@ export const SocketProvider = ({children}) => {
return (
-
{children}
)