From db72b571f8fb909087fa896c22a882db881aeb00 Mon Sep 17 00:00:00 2001
From: Amir Ekbatanifard <amiref007@gmail.com>
Date: Tue, 26 Nov 2024 15:23:18 +0330
Subject: [PATCH] fix: path change issue

---
 packages/extension-ui/src/Popup/index.tsx | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/extension-ui/src/Popup/index.tsx b/packages/extension-ui/src/Popup/index.tsx
index 932feb6d3..661b41f50 100644
--- a/packages/extension-ui/src/Popup/index.tsx
+++ b/packages/extension-ui/src/Popup/index.tsx
@@ -64,7 +64,7 @@ export default function Popup (): React.ReactElement {
   const genesisHashOptionsCtx = useGenesisHashOptions();
   const workerRef = useRef<Worker | undefined>(undefined);
 
-  useLocation();// just to trigger component to fix forgot pass issue
+  const { pathname } = useLocation(); // also to trigger component to fix forgot pass issue
 
   const [accountCtx, setAccountCtx] = useState<AccountsContext>({ accounts: [], hierarchy: [] });
   const [userAddedChainCtx, setUserAddedChainCtx] = useState<UserAddedChains>({});
@@ -112,8 +112,10 @@ export default function Popup (): React.ReactElement {
       _onAction('/metadata');
     } else if (signRequests.length) {
       _onAction('/signing');
+    } else if (['/authorize', '/metadata', '/signing'].includes(pathname)) {
+      _onAction('/');
     }
-  }, [_onAction, authRequests, authRequests?.length, metaRequests, metaRequests?.length, signRequests, signRequests?.length]);
+  }, [_onAction, authRequests, authRequests?.length, metaRequests, metaRequests?.length, pathname, signRequests, signRequests?.length]);
 
   useEffect(() => {
     workerRef.current = new Worker(new URL('../../../extension-polkagate/src/util/workers/sharedWorker.js', import.meta.url));