From 0e018b44c1f79786659e13ba28bf2f55738d658f Mon Sep 17 00:00:00 2001
From: Mohammad Amin Khashkhashi Moghaddam <amin@pyth.network>
Date: Thu, 20 Jul 2023 13:06:49 +0200
Subject: [PATCH] Reset currentProposalPubkey when it is removed from the url
 (#967)

---
 .../components/tabs/Proposals.tsx                | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/governance/xc_admin/packages/xc_admin_frontend/components/tabs/Proposals.tsx b/governance/xc_admin/packages/xc_admin_frontend/components/tabs/Proposals.tsx
index 8ceebf4a..8c61e3d4 100644
--- a/governance/xc_admin/packages/xc_admin_frontend/components/tabs/Proposals.tsx
+++ b/governance/xc_admin/packages/xc_admin_frontend/components/tabs/Proposals.tsx
@@ -790,6 +790,8 @@ const Proposals = () => {
   useEffect(() => {
     if (router.query.proposal) {
       setCurrentProposalPubkey(router.query.proposal as string)
+    } else {
+      setCurrentProposalPubkey(undefined)
     }
   }, [router.query.proposal])
 
@@ -828,7 +830,15 @@ const Proposals = () => {
         }
       }
     }
-  }, [currentProposalPubkey, multisigProposals, cluster])
+  }, [
+    switchProposalType,
+    priceFeedMultisigProposals,
+    proposalType,
+    upgradeMultisigProposals,
+    currentProposalPubkey,
+    multisigProposals,
+    cluster,
+  ])
 
   useEffect(() => {
     // filter price feed multisig proposals by status
@@ -857,8 +867,8 @@ const Proposals = () => {
       <div className="container min-h-[50vh]">
         {router.query.proposal === undefined ? (
           <>
-            <div className="flex flex-col md:flex-row justify-between">
-              <div className="mb-4 md:mb-0 items-center flex">
+            <div className="flex flex-col justify-between md:flex-row">
+              <div className="mb-4 flex items-center md:mb-0">
                 <ClusterSwitch />
               </div>
               <div className="flex space-x-2">