From f30a29c12d5eb630d7b3a8a57f63775584106c45 Mon Sep 17 00:00:00 2001
From: ali9821 <aliazarian790@gmail.com>
Date: Sat, 20 Jan 2024 15:42:12 +0330
Subject: [PATCH] Apply routing fixes in browser

---
 package.json                            | 3 ++-
 packages/extension/src/ui/AppRoutes.tsx | 3 ++-
 packages/extension/src/ui/index.tsx     | 6 +++---
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index b39d1c1ea..f6ffb2ae4 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,8 @@
     "patch-package": "^6.4.7",
     "prettier": ">=2",
     "prettier-plugin-import-sort": "^0.0.7",
-    "ts-node": "^10.8.1"
+    "ts-node": "^10.8.1",
+    "@chakra-ui/cli": "^latest" 
   },
   "resolutions": {
     "@babel/preset-react": "7.17.12",
diff --git a/packages/extension/src/ui/AppRoutes.tsx b/packages/extension/src/ui/AppRoutes.tsx
index 93bce01c0..2f19222a6 100644
--- a/packages/extension/src/ui/AppRoutes.tsx
+++ b/packages/extension/src/ui/AppRoutes.tsx
@@ -1,8 +1,9 @@
-import { Route, Routes, RoutesConfig } from "@argent/stack-router"
+import { Route, RoutesConfig } from "@argent/stack-router"
 import { chakra } from "@chakra-ui/react"
 import { FC, ReactNode, isValidElement, useMemo } from "react"
 // import { Outlet, Route, Routes } from "react-router-dom" // reinstate in case of issues with @argent/stack-router
 import { Outlet, useLocation } from "react-router-dom"
+import {Routes} from "react-router-dom" // import Routes from react-router-dom
 
 import { useAppState } from "./app.state"
 import { ResponsiveBox } from "./components/Responsive"
diff --git a/packages/extension/src/ui/index.tsx b/packages/extension/src/ui/index.tsx
index 9835f8a55..117f93797 100644
--- a/packages/extension/src/ui/index.tsx
+++ b/packages/extension/src/ui/index.tsx
@@ -1,6 +1,6 @@
 import { StrictMode } from "react"
 import { createRoot } from "react-dom/client"
-import { BrowserRouter } from "react-router-dom"
+import { BrowserRouter, HashRouter } from "react-router-dom"
 
 import { initUiExtensionCloseListener } from "../shared/analytics"
 import {
@@ -33,8 +33,8 @@ const root = createRoot(container)
 
 root.render(
   <StrictMode>
-    <BrowserRouter>
+    <HashRouter>
       <App />
-    </BrowserRouter>
+    </HashRouter>
   </StrictMode>,
 )