.eslintrc

@@ -93,6 +93,7 @@
     "react/prop-types": "off",
     "react/react-in-jsx-scope": "off",
     "react/require-default-props": "off",
-    "semi": "off"
+    "semi": "off",
+    "no-multiple-empty-lines":["error",{ "max":1 }]
   }
 }

src/features/AuthStore/hooks/useAuth.tsx

@@ -36,6 +36,7 @@ import { queryParamStorage } from 'features/QueryParamsStorage'
 import { getUserInfo, UserInfo } from 'requests/getUserInfo'
 import { checkDevice, FailedResponse } from 'requests/checkDevice'
 
+// eslint-disable-next-line
 import { getClientSettings, needCheckNewDeviсe } from '../helpers'
 import { getTokenVirtualUser } from '../../../requests'
 
@@ -179,6 +180,7 @@ export const useAuth = () => {
     })
   }, [logout, userManager])
 
+  // eslint-disable-next-line
   const checkNewDevice = useCallback(async () => {
     const loadedUser = await userManager.getUser()
     if (!loadedUser) return
@@ -188,18 +190,18 @@ export const useAuth = () => {
     })
   }, [reChekNewDevice, userManager])
 
-  useEffect(() => {
+  // useEffect(() => {
-    if (!needCheckNewDeviсe && !user) return undefined
+  //   if (!needCheckNewDeviсe && !user) return undefined
-    const startCheckDevice = setInterval(checkNewDevice, 20000)
+  //   const startCheckDevice = setInterval(checkNewDevice, 20000)
-    isNewDeviceLogin && clearInterval(startCheckDevice)
+  //   isNewDeviceLogin && clearInterval(startCheckDevice)
-    return () => clearInterval(startCheckDevice)
+  //   return () => clearInterval(startCheckDevice)
-
+  //
-    // eslint-disable-next-line react-hooks/exhaustive-deps
+  //   // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [
+  // }, [
-    checkNewDevice,
+  //   checkNewDevice,
-    isNewDeviceLogin,
+  //   isNewDeviceLogin,
-    setIsNewDeviceLogin,
+  //   setIsNewDeviceLogin,
-  ])
+  // ])
 
   useEffect(() => {
     // попытаемся обновить токен используя refresh_token

src/features/MatchPage/store/hooks/useMatchPlaylists.tsx

@@ -14,7 +14,7 @@ import { getMatchPlaylists } from 'requests/getMatchPlaylists'
 import { usePageParams } from 'hooks/usePageParams'
 
 import type { Playlists } from 'features/MatchPage/types'
-import { buildPlaylists } from 'features/MatchPage/helpers/buildPlaylists'
+import { buildPlaylists, FULL_GAME_KEY } from 'features/MatchPage/helpers/buildPlaylists'
 
 import { usePlaylistLexics } from './usePlaylistLexics'
 import { useSelectedPlaylist } from './useSelectedPlaylist'
@@ -65,7 +65,9 @@ export const useMatchPlaylists = (profile: MatchInfo) => {
   }, [fetchLexics, setInitialSeletedPlaylist])
 
   useEffect(() => {
+    if (selectedPlaylist?.id !== FULL_GAME_KEY) return
     setSelectedPlaylist(matchPlaylists?.match[0])
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [
     matchPlaylists?.match,
     profileId,

src/features/UserAccount/components/PersonalInfoForm/hooks/useUserInfo.tsx

@@ -29,7 +29,7 @@ export type Props = {
 }
 
 export const useUserInfo = ({ loader, onSubmit }: Props) => {
-  const { languageList, translate } = useLexicsStore()
+  const { languageList } = useLexicsStore()
   const { userInfo } = useAuthStore()
   const {
     hasChanges,
@@ -95,8 +95,8 @@ export const useUserInfo = ({ loader, onSubmit }: Props) => {
 
   const langOptions = useMemo(() => map(languageList, (language) => ({
     id: language.iso_639_1,
-    name: translate(language.lexic).trim(),
+    name: language.name_national || language.name_en,
-  })), [languageList, translate])
+  })), [languageList])
 
   const selectedlangOption = useMemo(
     () => find(langOptions, { id: lang })?.name ?? lang,

src/requests/getLanguages.tsx

@@ -11,6 +11,7 @@ export type ReferenceLanguage = {
   iso_639_1: string,
   lexic: number,
   name_en: string,
+  name_national: string | null,
   name_ru: string,
   short_name: string,
   ts: number,