From cd9c35b3015534b390ff5dbf0ee804d357bfeaae Mon Sep 17 00:00:00 2001 From: Andrei Dekterev Date: Tue, 21 Feb 2023 19:43:41 +0700 Subject: [PATCH 1/3] fix(#289): fix switch playlist for hls matches --- .eslintrc | 3 ++- src/features/MatchPage/store/hooks/useMatchPlaylists.tsx | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.eslintrc b/.eslintrc index b5087be4..48fef2e1 100644 --- a/.eslintrc +++ b/.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 }] } } diff --git a/src/features/MatchPage/store/hooks/useMatchPlaylists.tsx b/src/features/MatchPage/store/hooks/useMatchPlaylists.tsx index 36bfefe6..fa545333 100644 --- a/src/features/MatchPage/store/hooks/useMatchPlaylists.tsx +++ b/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, -- 2.30.2 From f2f883de626684921d6793081c05c749f87a5360 Mon Sep 17 00:00:00 2001 From: Ruslan Khayrullin Date: Tue, 21 Feb 2023 16:46:27 +0500 Subject: [PATCH 2/3] feat(in-315): use national lang name --- .../components/PersonalInfoForm/hooks/useUserInfo.tsx | 6 +++--- src/requests/getLanguages.tsx | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/features/UserAccount/components/PersonalInfoForm/hooks/useUserInfo.tsx b/src/features/UserAccount/components/PersonalInfoForm/hooks/useUserInfo.tsx index de9662c4..90c1a8a1 100644 --- a/src/features/UserAccount/components/PersonalInfoForm/hooks/useUserInfo.tsx +++ b/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(), - })), [languageList, translate]) + name: language.name_national || language.name_en, + })), [languageList]) const selectedlangOption = useMemo( () => find(langOptions, { id: lang })?.name ?? lang, diff --git a/src/requests/getLanguages.tsx b/src/requests/getLanguages.tsx index 9cfd8cff..b35fd9cc 100644 --- a/src/requests/getLanguages.tsx +++ b/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, -- 2.30.2 From ffbca0cf2f80b54f454af2b1642caa444857453a Mon Sep 17 00:00:00 2001 From: "andrey.dekterev" Date: Wed, 22 Feb 2023 12:32:08 +0000 Subject: [PATCH 3/3] revert eb4a368ad12c90944915d971d82ac9aa25cc3289 revert Revert "fix(#274): off check new device option" This reverts commit 6dad0f375840d17ddb206a3c8879ebd576deb959. --- src/features/AuthStore/hooks/useAuth.tsx | 26 +++++++++++++----------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/src/features/AuthStore/hooks/useAuth.tsx b/src/features/AuthStore/hooks/useAuth.tsx index aa91df65..4d0a4542 100644 --- a/src/features/AuthStore/hooks/useAuth.tsx +++ b/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(() => { - if (!needCheckNewDeviсe && !user) return undefined - const startCheckDevice = setInterval(checkNewDevice, 20000) - isNewDeviceLogin && clearInterval(startCheckDevice) - return () => clearInterval(startCheckDevice) - - // eslint-disable-next-line react-hooks/exhaustive-deps - }, [ - checkNewDevice, - isNewDeviceLogin, - setIsNewDeviceLogin, - ]) + // useEffect(() => { + // if (!needCheckNewDeviсe && !user) return undefined + // const startCheckDevice = setInterval(checkNewDevice, 20000) + // isNewDeviceLogin && clearInterval(startCheckDevice) + // return () => clearInterval(startCheckDevice) + // + // // eslint-disable-next-line react-hooks/exhaustive-deps + // }, [ + // checkNewDevice, + // isNewDeviceLogin, + // setIsNewDeviceLogin, + // ]) useEffect(() => { // попытаемся обновить токен используя refresh_token -- 2.30.2