From 15119479028a3f72dbcbfdface5dc22eba88740e Mon Sep 17 00:00:00 2001
From: Andrei Dekterev <avdekterev@gmail.com>
Date: Fri, 12 Aug 2022 12:01:32 +0400
Subject: [PATCH] fix(#2638): remove scroe from header and move datepicker

---
 src/features/HeaderFilters/components/DateFilter/styled.tsx | 3 +--
 src/features/HeaderFilters/components/DatePicker/styled.tsx | 2 +-
 src/features/MatchPage/components/FinishedMatch/index.tsx   | 2 --
 src/features/MatchPage/components/LiveMatch/index.tsx       | 4 ----
 src/features/MatchPage/index.tsx                            | 6 +-----
 src/features/MultiSourcePlayer/hooks/index.tsx              | 2 --
 6 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/src/features/HeaderFilters/components/DateFilter/styled.tsx b/src/features/HeaderFilters/components/DateFilter/styled.tsx
index df2ac7a8..cd3fad07 100644
--- a/src/features/HeaderFilters/components/DateFilter/styled.tsx
+++ b/src/features/HeaderFilters/components/DateFilter/styled.tsx
@@ -73,11 +73,10 @@ type DateButtonProps = {
 export const DateButton = styled(BaseButton)<DateButtonProps>`
   position: absolute;
   top: 0.2rem;
-  right: 3.6rem;
+  right: 4.6rem;
   width: 1.3rem;
   height: 1.26rem;
   color: ${({ theme: { colors } }) => colors.dateButton};
-  margin-left: 10px;
 
   ${isMobileDevice
     ? css`
diff --git a/src/features/HeaderFilters/components/DatePicker/styled.tsx b/src/features/HeaderFilters/components/DatePicker/styled.tsx
index fa6f1f2b..acbf0268 100644
--- a/src/features/HeaderFilters/components/DatePicker/styled.tsx
+++ b/src/features/HeaderFilters/components/DatePicker/styled.tsx
@@ -6,7 +6,7 @@ import { BaseButton } from '../DateFilter/styled'
 export const Wrapper = styled.div`
   position: absolute;
   top: 3.5rem;
-  right: 11rem;
+  right: 12rem;
   z-index: 10;
   ${isMobileDevice
     ? css`
diff --git a/src/features/MatchPage/components/FinishedMatch/index.tsx b/src/features/MatchPage/components/FinishedMatch/index.tsx
index 16189585..f8190c7f 100644
--- a/src/features/MatchPage/components/FinishedMatch/index.tsx
+++ b/src/features/MatchPage/components/FinishedMatch/index.tsx
@@ -10,8 +10,6 @@ import type { MatchInfo } from 'requests/getMatchInfo'
 import { MatchSidePlaylists } from 'features/MatchSidePlaylists'
 import { MultiSourcePlayer } from 'features/MultiSourcePlayer'
 
-import { isMobileDevice } from 'config/userAgent'
-
 import { SettingsPopup } from '../SettingsPopup'
 
 import { useFinishedMatch } from './hooks'
diff --git a/src/features/MatchPage/components/LiveMatch/index.tsx b/src/features/MatchPage/components/LiveMatch/index.tsx
index cc65f5ba..26cf6789 100644
--- a/src/features/MatchPage/components/LiveMatch/index.tsx
+++ b/src/features/MatchPage/components/LiveMatch/index.tsx
@@ -17,14 +17,10 @@ import { MatchDescription } from '../MatchDescription'
 import { MatchProfileCardMobile } from '../MatchProfileCardMobile'
 
 type Props = {
-  // events: Events,
-  // profile: MatchInfo,
   tournamentData: TournamentData,
 }
 
 export const LiveMatch = ({
-  // events,
-  // profile,
   tournamentData,
 }: Props) => {
   const {
diff --git a/src/features/MatchPage/index.tsx b/src/features/MatchPage/index.tsx
index 6b1c1d42..58f8bdeb 100644
--- a/src/features/MatchPage/index.tsx
+++ b/src/features/MatchPage/index.tsx
@@ -11,7 +11,6 @@ import {
 
 import { FavoritesActions } from 'requests'
 
-import { isMobileDevice } from 'config/userAgent'
 import { ProfileTypes } from 'config'
 
 import { usePageLogger } from 'hooks/usePageLogger'
@@ -19,7 +18,6 @@ import { usePageParams } from 'hooks/usePageParams'
 import { MatchPageStore } from './store'
 
 import { SubscriptionGuard } from './components/SubscriptionGuard'
-import { MatchProfileCard } from './components/MatchProfileCard'
 import { LiveMatch } from './components/LiveMatch'
 import { useMatchProfile } from './hooks/useMatchProfile'
 import { Wrapper } from './styled'
@@ -73,9 +71,7 @@ const MatchPageComponent = () => {
 
   return (
     <PageWrapper>
-      <ProfileHeader color='#2B2A28' height={4.5}>
-        {isMobileDevice ? null : <MatchProfileCard profile={profile} />}
-      </ProfileHeader>
+      <ProfileHeader color='#2B2A28' height={4.5} />
       <Main>
         <UserFavorites />
         <SubscriptionGuard>
diff --git a/src/features/MultiSourcePlayer/hooks/index.tsx b/src/features/MultiSourcePlayer/hooks/index.tsx
index cc3a015c..fb9cfa2d 100644
--- a/src/features/MultiSourcePlayer/hooks/index.tsx
+++ b/src/features/MultiSourcePlayer/hooks/index.tsx
@@ -16,8 +16,6 @@ import { useEventListener, useObjectState } from 'hooks'
 
 import { MatchInfo } from 'requests'
 
-import { MatchInfo } from 'requests'
-
 import { useProgressChangeHandler } from './useProgressChangeHandler'
 import { usePlayingHandlers } from './usePlayingHandlers'
 import { useVideoQuality } from './useVideoQuality'