diff --git a/package-lock.json b/package-lock.json index 5652fa87..1013ec04 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3,6 +3,7 @@ "version": "0.1.0", "lockfileVersion": 1, "requires": true, +<<<<<<< HEAD <<<<<<< HEAD "packages": { "": { @@ -33658,6 +33659,8 @@ }, ======= >>>>>>> 2304396 (fix(2703): fixes on match profile) +======= +>>>>>>> 56a24928 (move commit https://gitlab.instatfootball.tv/frontend/spa_instat_tv/-/commit/c265b6e2efb219770ed9eb2742d5269f49fe0a0a#035444824e3ed8a923e579f9c51caa99dc0d5eaa) "dependencies": { "@babel/code-frame": { "version": "7.16.0", diff --git a/src/features/StreamPlayer/hooks/index.tsx b/src/features/StreamPlayer/hooks/index.tsx index e65615e3..b7293218 100644 --- a/src/features/StreamPlayer/hooks/index.tsx +++ b/src/features/StreamPlayer/hooks/index.tsx @@ -20,6 +20,7 @@ import { useLiveMatch } from 'features/MatchPage/components/LiveMatch/hooks' import type { Chapters } from 'features/StreamPlayer/types' +import { useLexicsStore } from 'features/LexicsStore' import { REWIND_SECONDS } from '../config' import { useHlsPlayer } from './useHlsPlayer' import { useFullscreen } from './useFullscreen' @@ -79,6 +80,8 @@ export const useVideoPlayer = ({ const { onPlaylistSelect, selectedPlaylist } = useLiveMatch() + const { lang } = useLexicsStore() + const { url } = chapters[0] ?? { url: '' } const numberOfChapters = size(chapters) const { hls, videoRef } = useHlsPlayer(url, resumeFrom) @@ -374,6 +377,10 @@ export const useVideoPlayer = ({ } }, [ready, videoRef]) + const warningText = lang === 'es' + ? 'La transmisión en vivo no está disponible temporalmente en dispositivos iOS' + : 'Live streaming is temporarily unavailable on iOS devices' + return { activeChapterIndex, allPlayedProgress: playedProgress + getActiveChapter().startMs, @@ -410,6 +417,7 @@ export const useVideoPlayer = ({ togglePlaying, url, videoRef, + warningText, wrapperRef, ...useControlsVisibility(isFullscreen, playing), ...useVolume(), diff --git a/src/features/StreamPlayer/index.tsx b/src/features/StreamPlayer/index.tsx index 29ef0ed0..d8e2c7c3 100644 --- a/src/features/StreamPlayer/index.tsx +++ b/src/features/StreamPlayer/index.tsx @@ -1,12 +1,10 @@ +import { isIOS, isMobileDevice } from 'config/userAgent' + import { Loader } from 'features/Loader' import { VideoPlayer } from 'features/VideoPlayer' import { useMatchPageStore } from 'features/MatchPage/store' import { Name } from 'features/Name' -import { WaterMark } from 'components/WaterMark' - -import { isMobileDevice } from 'config/userAgent' - import { REWIND_SECONDS } from './config' import { @@ -18,10 +16,11 @@ import { Forward, ControlsGradient, TeamsDetailsWrapper, + WarningIosText, + WarningIosWrapper, } from './styled' import type { Props } from './hooks' import { useVideoPlayer } from './hooks' -import { useAuthStore } from '../AuthStore' import { Controls } from './components/Controls' import RewindMobile from './components/RewindMobile' @@ -30,7 +29,6 @@ import RewindMobile from './components/RewindMobile' */ export const StreamPlayer = (props: Props) => { const { profile } = useMatchPageStore() - const { user } = useAuthStore() const { activeChapterIndex, @@ -78,6 +76,7 @@ export const StreamPlayer = (props: Props) => { videoRef, volume, volumeInPercent, + warningText, wrapperRef, } = useVideoPlayer(props) return ( @@ -94,11 +93,19 @@ export const StreamPlayer = (props: Props) => { - {(profile?.tournament.id === 1136 || profile?.tournament.id === 131) - && playing - && ( - - )} + {isIOS + ? ( + + + {warningText} + + + ) + : ( + + + + )}