From 05c5e13c6386e229ad4e53171af8bcf9ffc086f8 Mon Sep 17 00:00:00 2001
From: AmirHossein Mahmoodi <amir.mahmoodi74@gmail.com>
Date: Sat, 7 Oct 2023 15:03:57 +0330
Subject: [PATCH] CFE-22 fixed bug project

---
 src/layouts/MuiLayout.jsx     | 15 ++++++---------
 src/lib/app/contexts/user.jsx |  6 ------
 src/pages/_app.jsx            | 30 +++++++++++++++---------------
 3 files changed, 21 insertions(+), 30 deletions(-)

diff --git a/src/layouts/MuiLayout.jsx b/src/layouts/MuiLayout.jsx
index 6dcd3ed..eba3449 100644
--- a/src/layouts/MuiLayout.jsx
+++ b/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`,
                             },
diff --git a/src/lib/app/contexts/user.jsx b/src/lib/app/contexts/user.jsx
index 0d7adeb..899ac1b 100644
--- a/src/lib/app/contexts/user.jsx
+++ b/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]);
 
diff --git a/src/pages/_app.jsx b/src/pages/_app.jsx
index fe249a6..c5fad77 100644
--- a/src/pages/_app.jsx
+++ b/src/pages/_app.jsx
@@ -12,22 +12,22 @@ import {SocketProvider} from "@/lib/app/contexts/socket";
 const App = ({Component, pageProps}) => {
 
     return (<>
-        <SocketProvider>
-            <UserProvider>
-                <LanguageProvider>
-                    <NextIntlProvider locale={pageProps.locale} messages={pageProps.messages || {}}>
-                        <MuiLayout isBot={pageProps.isBot}>
-                            {pageProps.messages ? <TitlePage text={pageProps.title}/> : ''}
-                            <LoadingProvider>
-                                <AppLayout isBot={pageProps.isBot}>
+        <UserProvider>
+            <LanguageProvider>
+                <NextIntlProvider locale={pageProps.locale} messages={pageProps.messages || {}}>
+                    <MuiLayout isBot={pageProps.isBot}>
+                        {pageProps.messages ? <TitlePage text={pageProps.title}/> : ''}
+                        <LoadingProvider>
+                            <AppLayout isBot={pageProps.isBot}>
+                                <SocketProvider>
                                     <Component {...pageProps} />
-                                </AppLayout>
-                            </LoadingProvider>
-                        </MuiLayout>
-                    </NextIntlProvider>
-                </LanguageProvider>
-            </UserProvider>
-        </SocketProvider>
+                                </SocketProvider>
+                            </AppLayout>
+                        </LoadingProvider>
+                    </MuiLayout>
+                </NextIntlProvider>
+            </LanguageProvider>
+        </UserProvider>
     </>)
 };