Merge pull request #102 from which-ecosystem/feat/modal

Modal improvements

2 files changed, 3 insertions, 7 deletions

diff --git a/src/containers/Page/Page.tsx b/src/containers/Page/Page.tsx
index b7e1938..e60f7da 100644
--- a/src/containers/Page/Page.tsx
+++ b/src/containers/Page/Page.tsx
@@ -10,10 +10,6 @@ import DynoWaiter from './DynoWaiter';
 import Loading from '../../components/Loading/Loading';
 import EmptyState from '../../components/EmptyState/EmptyState';
 
-interface HistoryChange {
-  state?: LocationState | null;
-}
-
 const useStyles = makeStyles(theme => ({
   root: {
     [theme.breakpoints.down('sm')]: {
@@ -32,10 +28,10 @@ const ErrorFallback: React.FC = () => (
 const Page: React.FC = () => {
   const classes = useStyles();
   const theme = useTheme();
-  const history = useHistory();
+  const history = useHistory<LocationState>();
   const isMobile = useMediaQuery(theme.breakpoints.down('sm'));
 
-  useEffect(() => history.listen((update: HistoryChange) => {
+  useEffect(() => history.listen(update => {
     if (!update.state?.background) window.scrollTo(0, 0);
   }), [history]);
 
diff --git a/src/containers/Page/Router.tsx b/src/containers/Page/Router.tsx
index 7c3a418..7c74e9a 100644
--- a/src/containers/Page/Router.tsx
+++ b/src/containers/Page/Router.tsx
@@ -12,7 +12,7 @@ const Home = React.lazy(() => import('../Home/Home'));
 const Notifications = React.lazy(() => import('../Notifications/Notifications'));
 
 export interface LocationState {
-  background?: Location;
+  background: Location;
 }
 
 const Router: React.FC = React.memo(() => {