Merge pull request #509 from persistenceOne/redirect-fix

redirect fix with window
persistenceOne · Jan 15, 2024 · bd3cee9 · bd3cee9
2 parents 3223853 + 4029602
commit bd3cee9
Showing 1 changed file with 8 additions and 12 deletions.
diff --git a/src/App.js b/src/App.js
@@ -1,6 +1,7 @@
 import React, { useEffect, useState } from "react";
 import {
   HashRouter,
+  Redirect,
   Route,
   Switch,
   useHistory,
@@ -80,12 +81,13 @@ const Main = () => {
   address = loginInfo && loginInfo.address;
   const page = location.pathname;
 
-  if (page === "/dashboard/wallet") {
-    console.log(page, "page-1");
-    history.push("/#/dashboard/wallet");
-  } else if (page === "/dashboard/staking") {
-    history.push("/#/dashboard/staking");
-  }
+  useEffect(() => {
+    if (window.location.pathname === "/dashboard/wallet") {
+      window.location.replace("/#/dashboard/wallet");
+    } else if (window.location.pathname === "/dashboard/staking") {
+      window.location.replace("/#/dashboard/staking");
+    }
+  }, []);
 
   useEffect(() => {
     const fetchApi = async () => {
@@ -174,12 +176,6 @@ const Main = () => {
       )}
       <HashRouter>
         <Switch>
-          <Route path="/dashboard/wallet">
-            <Redirect to="/#/dashboard/wallet" />
-          </Route>
-          <Route path="/dashboard/staking">
-            <Redirect to="/#/dashboard/staking" />
-          </Route>
           <Route
             key="/"
             exact