Fix navigation and stuff

.gitignore

@@ -0,0 +1 @@
+.idea

web/package.json

@@ -21,7 +21,7 @@
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "react-redux": "^7.2.6",
-    "react-router-dom": "^6.0.2",
+    "react-router-dom": "^6.22.1",
     "react-scripts": "5.0.1",
     "react-toastify": "^8.1.0",
     "redux": "^4.1.2",

web/src/components/App/App.js

@@ -2,8 +2,6 @@ import {
   Navigate,
   Route,
   Routes,
-  useLocation,
-  useNavigate,
 } from "react-router-dom";
 import { useDispatch, useSelector } from "react-redux";
 import { memo, useEffect, useState } from "react";
@@ -33,7 +31,6 @@ import {
   ROUTE_WALLET,
 } from "../../constants/routes";
 import { catchError } from "../../utils";
-import { setCurrentRoute } from "../../store/actions/routes";
 import {
   fetchCurrentAward,
   fetchMerkleRoot,
@@ -45,22 +42,10 @@ function App() {
   const { network, address } = useWeb3Connection();
 
   const dispatch = useDispatch();
-  const navigate = useNavigate();
   const { error } = useSelector((state) => state.error);
-  const [prevAddress, setPrevAddress] = useState(null);
-  const { username } = useSelector((state) => state.user);
-  const { currentRoute } = useSelector((state) => state.routes);
-  const location = useLocation();
-  const [locationPut, setLocationPut] = useState(false);
   const [merkleRootFetched, setMerkleRootFetched] = useState(false);
 
   useVh();
-  useEffect(() => {
-    if (currentRoute && !locationPut && currentRoute !== location.pathname) {
-      navigate(currentRoute);
-      setLocationPut(true);
-    }
-  }, [currentRoute]);
 
   useEffect(() => {
     console.log("nerwork: " + network.name);
@@ -73,23 +58,8 @@ function App() {
   }, [network]);
 
   useEffect(() => {
-    if (address) {
-      if (prevAddress && address !== prevAddress) {
-        dispatch(reduxCleanup());
-        navigate(ROUTE_INDEX);
-        dispatch(setCurrentRoute(ROUTE_INDEX));
-      } else if (!address && username) {
-        navigate(ROUTE_WALLET);
-      } else {
-        setPrevAddress(address);
-      }
-    }
-  }, [address, prevAddress]);
-
-  useEffect(() => {
-    window.scrollTo(0, 0);
-    dispatch(setCurrentRoute(location.pathname));
-  }, [location]);
+    dispatch(reduxCleanup());
+  }, [address]);
 
   useEffect(() => {
     if (error) {

web/src/components/ConnectWallet/ConnectWallet.js

@@ -1,6 +1,5 @@
 import Button from "../Button/Button";
 import { useWeb3Connection } from "../../hooks/useWeb3Connection";
-//import { getChainData } from '../../utils'
 
 const ConnectWallet = () => {
   const { connect, disconnect, address } = useWeb3Connection();