Resolving conflicts with master

1 files changed, 7 insertions, 6 deletions

diff --git a/modern/src/MainPage.js b/modern/src/MainPage.js
index adb86b25..b6b5044c 100644
--- a/modern/src/MainPage.js
+++ b/modern/src/MainPage.js
@@ -1,15 +1,15 @@
 import React from 'react';
-import { useSelector } from 'react-redux';
 import { isWidthUp, makeStyles, withWidth } from '@material-ui/core';
 import Drawer from '@material-ui/core/Drawer';
 import ContainerDimensions from 'react-container-dimensions';
-import LinearProgress from '@material-ui/core/LinearProgress';
 import DevicesList from './DevicesList';
 import MainToolbar from './MainToolbar';
 import Map from './map/Map';
-import PositionsMap from './map/PositionsMap';
 import SelectedDeviceMap from './map/SelectedDeviceMap';
+import AccuracyMap from './map/AccuracyMap';
 import GeofenceMap from './map/GeofenceMap';
+import CurrentPositionsMap from './map/CurrentPositionsMap';
+import CurrentLocationMap from './map/CurrentLocationMap';
 
 const useStyles = makeStyles(theme => ({
   root: {
@@ -41,10 +41,9 @@ const useStyles = makeStyles(theme => ({
 }));
 
 const MainPage = ({ width }) => {
-  const initialized = useSelector(state => !!state.session.server && !!state.session.user);
   const classes = useStyles();
 
-  return !initialized ? (<LinearProgress />) : (
+  return (
     <div className={classes.root}>
       <MainToolbar />
       <div className={classes.content}>
@@ -57,8 +56,10 @@ const MainPage = ({ width }) => {
         <div className={classes.mapContainer}>
           <ContainerDimensions>
             <Map>
+              <CurrentLocationMap />
               <GeofenceMap />
-              <PositionsMap />
+              <AccuracyMap />
+              <CurrentPositionsMap />
               <SelectedDeviceMap />
             </Map>
           </ContainerDimensions>