From 83da550a8d080bf553486c16247d5815de0b212d Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Sun, 29 Aug 2021 15:21:41 -0700
Subject: Fix settings navigation (fix #897)

---
 modern/src/GeofencesPage.js                | 4 +++-
 modern/src/reports/ReportLayout.js         | 4 +---
 modern/src/settings/OptionsLayout/index.js | 5 +++--
 3 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'modern')

diff --git a/modern/src/GeofencesPage.js b/modern/src/GeofencesPage.js
index 71219c16..31a99fa9 100644
--- a/modern/src/GeofencesPage.js
+++ b/modern/src/GeofencesPage.js
@@ -11,6 +11,7 @@ import GeofenceEditMap from './map/GeofenceEditMap';
 import GeofencesList from './GeofencesList';
 
 import t from './common/localization';
+import { useHistory } from 'react-router-dom';
 
 const useStyles = makeStyles((theme) => ({
   root: {
@@ -49,6 +50,7 @@ const useStyles = makeStyles((theme) => ({
 
 const GeofencesPage = ({ width }) => {
   const classes = useStyles();
+  const history = useHistory();
 
   return (
     <div className={classes.root}>
@@ -59,7 +61,7 @@ const GeofencesPage = ({ width }) => {
           classes={{ paper: classes.drawerPaper }}
         >
           <div className={classes.drawerHeader}>
-            <IconButton component="a" href="/">
+            <IconButton onClick={() => history.goBack()}>
               <ArrowBackIcon />
             </IconButton>
             <Typography variant="h6" color="inherit" noWrap>
diff --git a/modern/src/reports/ReportLayout.js b/modern/src/reports/ReportLayout.js
index c231cd80..69487f28 100644
--- a/modern/src/reports/ReportLayout.js
+++ b/modern/src/reports/ReportLayout.js
@@ -100,9 +100,7 @@ const ReportLayout = ({ children, filter }) => {
           classes={{ root: classes.drawerContainer, paper: classes.drawer }}
         >
           <div className={classes.drawerHeader}>
-            <IconButton
-              onClick={() => history.push('/')}
-            >
+            <IconButton onClick={() => history.push('/')}>
               <ArrowBackIcon />
             </IconButton>
             <Typography variant="h6" color="inherit" noWrap>
diff --git a/modern/src/settings/OptionsLayout/index.js b/modern/src/settings/OptionsLayout/index.js
index 4a42e583..625148d0 100644
--- a/modern/src/settings/OptionsLayout/index.js
+++ b/modern/src/settings/OptionsLayout/index.js
@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { useLocation } from 'react-router-dom';
+import { useHistory, useLocation } from 'react-router-dom';
 import {
   Typography,
   Divider,
@@ -53,6 +53,7 @@ const useStyles = makeStyles((theme) => ({
 const OptionsLayout = ({ children }) => {
   const classes = useStyles();
   const location = useLocation();
+  const history = useHistory();
   const [openDrawer, setOpenDrawer] = useState(false);
   const [optionTitle, setOptionTitle] = useState();
   const routes = useRoutes();
@@ -86,7 +87,7 @@ const OptionsLayout = ({ children }) => {
           classes={{ root: classes.drawerContainer, paper: classes.drawer }}
         >
           <div className={classes.drawerHeader}>
-            <IconButton component="a" href="/">
+            <IconButton onClick={() => history.push('/')}>
               <ArrowBackIcon />
             </IconButton>
             <Typography variant="h6" color="inherit" noWrap>
-- 
cgit v1.2.3