From ccacbb2a01aeddd3a1e6fee38cf594d3422f45eb Mon Sep 17 00:00:00 2001
From: Armen <35077035+Armen9393@users.noreply.github.com>
Date: Fri, 21 Aug 2020 12:04:06 +0300
Subject: [PATCH] fix(ott-300): moved fav store to abouve (#92)

---
 src/features/App/AuthenticatedApp.tsx | 41 ++++++++++++++-------------
 src/features/MatchPage/index.tsx      | 10 ++-----
 src/features/PlayerPage/index.tsx     |  7 ++---
 src/features/TeamPage/index.tsx       |  7 ++---
 src/features/TournamentPage/index.tsx |  7 ++---
 5 files changed, 34 insertions(+), 38 deletions(-)

diff --git a/src/features/App/AuthenticatedApp.tsx b/src/features/App/AuthenticatedApp.tsx
index 58ee7fd6..42003df4 100644
--- a/src/features/App/AuthenticatedApp.tsx
+++ b/src/features/App/AuthenticatedApp.tsx
@@ -22,6 +22,7 @@ import {
   HeaderFiltersStore,
 } from 'features/HeaderFilters'
 import { UserFavorites } from 'features/UserFavorites'
+import { UserFavoritesStore } from 'features/UserFavorites/store'
 
 export const AuthenticatedApp = () => {
   useLexicsConfig(indexLexics)
@@ -36,28 +37,30 @@ export const AuthenticatedApp = () => {
         </Route>
 
         <HeaderFiltersStore>
-          <MainWrapper>
-            <UserFavorites />
-            <Header />
-            <Route exact path={PAGES.home}>
-              <HomePage />
-            </Route>
+          <UserFavoritesStore>
+            <MainWrapper>
+              <UserFavorites />
+              <Header />
+              <Route exact path={PAGES.home}>
+                <HomePage />
+              </Route>
 
-            <Route path={`/:sportName${PAGES.tournament}/:pageId`}>
-              <TournamentPage />
-            </Route>
+              <Route path={`/:sportName${PAGES.tournament}/:pageId`}>
+                <TournamentPage />
+              </Route>
 
-            <Route path={`/:sportName${PAGES.team}/:pageId`}>
-              <TeamPage />
-            </Route>
-            <Route path={`/:sportName${PAGES.player}/:pageId`}>
-              <PlayerPage />
-            </Route>
-            <Route path={`/:sportName${PAGES.match}/:pageId`}>
-              <MatchPage />
-            </Route>
+              <Route path={`/:sportName${PAGES.team}/:pageId`}>
+                <TeamPage />
+              </Route>
+              <Route path={`/:sportName${PAGES.player}/:pageId`}>
+                <PlayerPage />
+              </Route>
+              <Route path={`/:sportName${PAGES.match}/:pageId`}>
+                <MatchPage />
+              </Route>
 
-          </MainWrapper>
+            </MainWrapper>
+          </UserFavoritesStore>
         </HeaderFiltersStore>
         <Redirect to={PAGES.home} />
       </Switch>
diff --git a/src/features/MatchPage/index.tsx b/src/features/MatchPage/index.tsx
index f3f9b1a2..919190e9 100644
--- a/src/features/MatchPage/index.tsx
+++ b/src/features/MatchPage/index.tsx
@@ -1,7 +1,5 @@
 import React from 'react'
 
-import { UserFavoritesStore } from 'features/UserFavorites/store'
-
 import { MatchProfileCard } from './MatchProfileCard'
 
 import {
@@ -9,9 +7,7 @@ import {
 } from './styled'
 
 export const MatchPage = () => (
-  <UserFavoritesStore>
-    <MainWrapper>
-      <MatchProfileCard />
-    </MainWrapper>
-  </UserFavoritesStore>
+  <MainWrapper>
+    <MatchProfileCard />
+  </MainWrapper>
 )
diff --git a/src/features/PlayerPage/index.tsx b/src/features/PlayerPage/index.tsx
index 7b509b49..9cdb76d1 100644
--- a/src/features/PlayerPage/index.tsx
+++ b/src/features/PlayerPage/index.tsx
@@ -1,9 +1,8 @@
-import React from 'react'
+import React, { Fragment } from 'react'
 
 import { ProfileTypes } from 'config'
 import { UserFavorites } from 'features/UserFavorites'
 import { ProfileCard } from 'features/ProfileCard'
-import { UserFavoritesStore } from 'features/UserFavorites/store'
 
 import { usePlayerPage } from './hooks'
 
@@ -14,13 +13,13 @@ export const PlayerPage = () => {
   } = usePlayerPage()
 
   return (
-    <UserFavoritesStore>
+    <Fragment>
       <UserFavorites />
       <ProfileCard
         profileType={ProfileTypes.PLAYERS}
         name={name}
         infoItems={infoItems}
       />
-    </UserFavoritesStore>
+    </Fragment>
   )
 }
diff --git a/src/features/TeamPage/index.tsx b/src/features/TeamPage/index.tsx
index 2dd31553..ae095dab 100644
--- a/src/features/TeamPage/index.tsx
+++ b/src/features/TeamPage/index.tsx
@@ -1,10 +1,9 @@
-import React from 'react'
+import React, { Fragment } from 'react'
 
 import { ProfileTypes } from 'config'
 
 import { UserFavorites } from 'features/UserFavorites'
 import { ProfileCard } from 'features/ProfileCard'
-import { UserFavoritesStore } from 'features/UserFavorites/store'
 import { Matches } from 'features/Matches'
 
 import { useTeamPage } from './hooks'
@@ -17,7 +16,7 @@ export const TeamPage = () => {
   } = useTeamPage()
 
   return (
-    <UserFavoritesStore>
+    <Fragment>
       <UserFavorites />
       <Content>
         <ProfileCard
@@ -27,6 +26,6 @@ export const TeamPage = () => {
         />
         <Matches />
       </Content>
-    </UserFavoritesStore>
+    </Fragment>
   )
 }
diff --git a/src/features/TournamentPage/index.tsx b/src/features/TournamentPage/index.tsx
index d4b82c22..ddee08ae 100644
--- a/src/features/TournamentPage/index.tsx
+++ b/src/features/TournamentPage/index.tsx
@@ -1,11 +1,10 @@
-import React from 'react'
+import React, { Fragment } from 'react'
 
 import { ProfileTypes } from 'config'
 
 import { UserFavorites } from 'features/UserFavorites'
 import { ProfileCard } from 'features/ProfileCard'
 import { Matches } from 'features/Matches'
-import { UserFavoritesStore } from 'features/UserFavorites/store'
 
 import { useTournamentPage } from './hooks'
 import { Content } from './styled'
@@ -17,7 +16,7 @@ export const TournamentPage = () => {
   } = useTournamentPage()
 
   return (
-    <UserFavoritesStore>
+    <Fragment>
       <UserFavorites />
       <Content>
         <ProfileCard
@@ -27,6 +26,6 @@ export const TournamentPage = () => {
         />
         <Matches />
       </Content>
-    </UserFavoritesStore>
+    </Fragment>
   )
 }