CFE-22 fixed bug project

src/layouts/MuiLayout.jsx

@@ -22,26 +22,23 @@ const MuiLayout = ({children, isBot}) => {
                 <ThemeProvider theme={theme}>
                     <GlobalStyles
                         styles={{
-                            "*:not(.MuiTableContainer-root)::-webkit-scrollbar": {
-                                display: "none",
-                            },
                             "*::-webkit-scrollbar": {
                                 height: "8px",
                             },
+                            "*:not(.MuiTableContainer-root)::-webkit-scrollbar": {
+                                display: "none",
+                            },
                             "*::-webkit-scrollbar-thumb": {
                                 background: `${theme.palette.primary.light}80`,
                                 borderRadius: "3px",
                             },
-                            "*:not(.MuiTableContainer-root)": {
-                                scrollbarWidth: "thin",
-                                scrollbarColor: "transparent transparent",
-                            },
-
                             "*": {
                                 scrollbarWidth: "thin",
                                 scrollbarColor: `${theme.palette.primary.light}80 transparent`,
                             },
-
+                            "*:not(.MuiTableContainer-root)": {
+                                scrollbarWidth: "none",
+                            },
                             "*::-moz-scrollbar-thumb": {
                                 backgroundColor: `${theme.palette.primary.light}80`,
                             },

src/lib/app/contexts/user.jsx

@@ -2,7 +2,6 @@ import {GET_USER_ROUTE} from "@/core/data/apiRoutes";
 import axios from "axios";
 import {createContext, useCallback, useEffect, useReducer} from "react";
 import {errorRequest, errorResponse, errorSetting} from "@/core/utils/errorHandler";
-import useSocket from "@/lib/app/hooks/useSocket";
 
 const initialUser = {
     isAuth: false,
@@ -40,7 +39,6 @@ const reducer = (state, action) => {
 export const UserContext = createContext();
 
 export const UserProvider = ({children}) => {
-    const socket = useSocket()
     const [state, dispatch] = useReducer(reducer, initialUser);
 
     const clearUser = useCallback(() => {
@@ -102,16 +100,12 @@ export const UserProvider = ({children}) => {
             clearUser();
             changeAuthState(false);
             changeLanguageState(false);
-
-            socket.auth.token = ""
             return;
         }
         getUser((data) => {
             changeUser(data);
             changeAuthState(true);
             changeLanguageState(true);
-
-            socket.auth.token = data.telephone_id
         });
     }, [state.token]);
 

src/pages/_app.jsx

@@ -12,7 +12,6 @@ import {SocketProvider} from "@/lib/app/contexts/socket";
 const App = ({Component, pageProps}) => {
 
     return (<>
-        <SocketProvider>
         <UserProvider>
             <LanguageProvider>
                 <NextIntlProvider locale={pageProps.locale} messages={pageProps.messages || {}}>
@@ -20,14 +19,15 @@ const App = ({Component, pageProps}) => {
                         {pageProps.messages ? <TitlePage text={pageProps.title}/> : ''}
                         <LoadingProvider>
                             <AppLayout isBot={pageProps.isBot}>
+                                <SocketProvider>
                                     <Component {...pageProps} />
+                                </SocketProvider>
                             </AppLayout>
                         </LoadingProvider>
                     </MuiLayout>
                 </NextIntlProvider>
             </LanguageProvider>
         </UserProvider>
-        </SocketProvider>
     </>)
 };