fix(#1701): merge with develop

src/features/MatchPage/index.tsx

@@ -61,6 +61,9 @@ const MatchPageComponent = () => {
   // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [profile, profileType])
 
+  const playFromScout = profile?.has_video && !profile?.live
+  const playFromOTT = !profile?.has_video && (profile?.live || profile?.storage)
+
   // TODO Добавить попап 'Данный матч ещё не начался'
   if (!isStarted && profile?.live === false) {
     const sportName = history.location.pathname.split('/')[1]
@@ -78,8 +81,8 @@ const MatchPageComponent = () => {
           <Wrapper>
             {playFromOTT && (
               <LiveMatch
-                events={events}
-                profile={profile}
+                // events={events}
+                // profile={profile}
                 tournamentData={tournamentData}
               />
             )}
@@ -90,7 +93,6 @@ const MatchPageComponent = () => {
                 tournamentData={tournamentData}
               />
             )}
-            <LiveMatch />
           </Wrapper>
         </SubscriptionGuard>
       </Main>

src/features/MatchSidePlaylists/components/MatchPlaylists/index.tsx

@@ -54,7 +54,7 @@ export const MatchPlaylists = ({
             <PlayButton
               duration={playlist.duration}
               active={isEqual(playlist, selectedMathPlaylist)}
-              disabled={playlist.id !== FULL_GAME_KEY && isEmpty(playlist.data)}
+              disabled={playlist.id !== FULL_GAME_KEY && isEmpty(playlist.episodes)}
               onClick={() => onSelect?.(playlist)}
             >
               <T9n t={playlist.lexic} />

src/features/MultiSourcePlayer/components/ProgressBar/hooks.tsx

@@ -12,6 +12,8 @@ export type Props = {
   duration: number,
   loadedProgress: number,
   onPlayedProgressChange: (progress: number, seeking: boolean) => void,
+  onTouchEnd?: () => any,
+  onTouchStart?: () => any,
   playedProgress: number,
 }
 

src/features/MultiSourcePlayer/components/ProgressBar/index.tsx

@@ -1,8 +1,8 @@
 import { useSlider } from 'features/StreamPlayer/hooks/useSlider'
 import { TimeTooltip } from 'features/StreamPlayer/components/TimeTooltip'
 import { Scrubber } from 'features/StreamPlayer/components/ProgressBar/styled'
+import { Chapters } from 'features/StreamPlayer/components/Chapters'
 
-import { Chapters } from '../Chapters'
 import type { Props } from './hooks'
 import { useProgressBar } from './hooks'
 import { ProgressBarList } from './styled'

src/features/StreamPlayer/styled.tsx

@@ -119,7 +119,7 @@ export const PlayerWrapper = styled.div<PlayStopProps>`
 `
 
 type LoaderWrapperProps = {
-  buffering: boolean,
+  buffering?: boolean,
 }
 
 export const LoaderWrapper = styled.div<LoaderWrapperProps>`