src/components/Ads/hooks.tsx

@@ -9,9 +9,9 @@ import { isMobileDevice, querieKeys } from 'config'
 import { getAds } from 'requests'
 
 import { isMatchPage } from 'helpers/isMatchPage'
+import { useLang } from 'features/LexicsStore/hooks/useLang'
 import { useAuthStore } from 'features/AuthStore'
 
-import { useLexicsStore } from 'features/LexicsStore'
 import {
   DeviceType,
   PageType,
@@ -31,7 +31,7 @@ export const useAds = ({
   tournamentId,
 }: Props) => {
   const [ads, setAds] = useRecoilState(adsStore)
-  const { lang } = useLexicsStore()
+  const { lang } = useLang()
   const { user } = useAuthStore()
 
   useQuery({

src/features/AuthStore/hooks/useAuth.tsx

@@ -111,12 +111,10 @@ export const useAuth = () => {
         token && await fetchUserInfo()
         return Promise.resolve()
       }
-      await fetchUserInfo()
       return Promise.resolve()
     }
 
     storeUser(loadedUser)
-    await fetchUserInfo()
     markUserLoaded()
     return loadedUser
     // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -169,9 +167,8 @@ export const useAuth = () => {
     setPage(history.location.pathname)
 
     userManager.signinRedirectCallback()
-      .then(async (loadedUser) => {
+      .then((loadedUser) => {
         storeUser(loadedUser)
-        await fetchUserInfo()
 
         if (refreshToken) writeRefreshToken(refreshToken)
 
@@ -300,6 +297,10 @@ export const useAuth = () => {
     } catch (error) {}
   }, [changeLang])
 
+  useEffect(() => {
+    readToken() && fetchUserInfo()
+  }, [fetchUserInfo, user])
+
   // временно отрубили возможность смотреть матчи вирт. юзерам
   // в связи с переездом бэка
   useEffect(() => {

src/features/MatchCard/CardFrontside/hooks.tsx

@@ -21,16 +21,11 @@ export const useCardPreview = ({
   ), [preview, previewURL])
 
   useEffect(() => {
-    const controller = new AbortController()
-    const { signal } = controller;
-
     (async () => {
       if (!currentPreviewURL) return
 
       try {
-        const image = await fetch(String(currentPreviewURL), {
+        const image = await fetch(String(currentPreviewURL))
-          signal,
-        })
           .then(async (result) => ({
             blob: await result.blob(),
             status: result.status,
@@ -45,10 +40,8 @@ export const useCardPreview = ({
       }
     })()
 
-    return () => {
+    return () => URL.revokeObjectURL(previewImage)
-      URL.revokeObjectURL(previewImage)
+
-      controller.abort()
-    }
   // добавление previewImage в зависимость вызывает бесконечный цикл
   // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [currentPreviewURL])

src/features/MatchesSlider/index.tsx

@@ -37,48 +37,45 @@ export const MatchesSlider = ({ cardSize, matches }: MatchesSliderProps) => {
   } = useMatchesSlider(matches)
 
   const scrollToMatchByIndex = (index: number) => {
-    if (slidesRef.current) {
+    const match = slidesRef.current!.querySelectorAll('li')[index]
-      const match = slidesRef.current.querySelectorAll('li')[index]
+    const offsetLeftCount = match.offsetLeft
-      const offsetLeftCount = match.offsetLeft
+
-
+    const offsetLeft = offsetLeftCount - PADDING_PARENT
-      const offsetLeft = offsetLeftCount - PADDING_PARENT
+
-
+    setTimeout(() => {
-      setTimeout(() => {
+      slidesRef.current!.scrollBy({
-        slidesRef.current?.scrollBy({
+        // @ts-ignore
-          // @ts-ignore
+        behavior: 'instant',
-          behavior: 'instant',
+        left: offsetLeft,
-          left: offsetLeft,
+      })
-        })
+    }, 0)
-      }, 0)
-    }
   }
 
   // скролл к лайв матчам или сегодняшней дате
   useEffect(() => {
-    if (slidesRef.current) {
+    const matchIndexLive = matches.findIndex(({ live }) => live)
-      const matchIndexLive = matches.findIndex(({ live }) => live)
+    if (matchIndexLive !== -1) {
-      if (matchIndexLive !== -1) {
+      scrollToMatchByIndex(matchIndexLive)
-        scrollToMatchByIndex(matchIndexLive)
+      return
-        return
-      }
-
-      const matchIndex = matches.findIndex((item) => new Date() <= item.date)
-      if (matchIndex !== -1) {
-        scrollToMatchByIndex(matchIndex)
-        return
-      }
-
-      const slidesRefClientWidth = slidesRef.current.clientWidth
-      const slidesRefScrollWidth = slidesRef.current.scrollWidth
-
-      setTimeout(() => {
-        slidesRef.current?.scrollBy({
-        // @ts-ignore
-          behavior: 'instant',
-          left: slidesRefScrollWidth - slidesRefClientWidth + PADDING_PARENT,
-        })
-      }, 0)
     }
+
+    const matchIndex = matches.findIndex((item) => new Date() <= item.date)
+    if (matchIndex !== -1) {
+      scrollToMatchByIndex(matchIndex)
+      return
+    }
+
+    const slidesRefClientWidth = slidesRef.current!.clientWidth
+    const slidesRefScrollWidth = slidesRef.current!.scrollWidth
+
+    setTimeout(() => {
+      slidesRef.current!.scrollBy({
+      // @ts-ignore
+        behavior: 'instant',
+        left: slidesRefScrollWidth - slidesRefClientWidth + PADDING_PARENT,
+      })
+    }, 0)
+
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [])
 

src/features/MatchesTimeline/hooks.tsx

@@ -54,13 +54,10 @@ export const useTimeline = () => {
   ), [user])
 
   useEffect(() => {
-    const controller = new AbortController()
-    const { signal } = controller;
-
     (async () => {
       setIsTimelineFetching(true)
       try {
-        const timelineFetched = await getTimelineMatches({ signal })
+        const timelineFetched = await getTimelineMatches()
         setTimeline(timelineFetched)
         const convertedMatches = timelineFetched.online_upcoming[0].matches
         const preparedMatches = prepareMatchesDto(convertedMatches)
@@ -84,7 +81,6 @@ export const useTimeline = () => {
         setIsTimelineFetching(false)
       }
     })()
-    return () => controller.abort()
   // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [])
 

src/requests/getMatches/getTimelineMatches.tsx

@@ -17,15 +17,7 @@ export type MatchesTimeline = {
   promo: Array<TimelineTournamentDto>,
 }
 
-type getTimelineMatchesProps = {
+export const getTimelineMatches = (sportId?: number): Promise<MatchesTimeline> => {
-  signal?: AbortSignal,
-  sportId?: number,
-}
-
-export const getTimelineMatches = ({
-  signal,
-  sportId,
-}: getTimelineMatchesProps): Promise<MatchesTimeline> => {
   const getTimezoneOffset = () => {
     const offset = new Date().getTimezoneOffset()
     if (offset === 0) return offset
@@ -44,7 +36,6 @@ export const getTimelineMatches = ({
   }
 
   return callApi({
-    abortSignal: signal,
     config,
     url: url.href,
   })