From bdc044368ebb45c37f8c666cae1e06846d88f5a0 Mon Sep 17 00:00:00 2001
From: James Grugett <jahooma@gmail.com>
Date: Fri, 29 Jul 2022 16:52:35 -0700
Subject: [PATCH] Add popstate listener to improve home navigation

---
 web/pages/home.tsx | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/web/pages/home.tsx b/web/pages/home.tsx
index 61003895..ab915ae3 100644
--- a/web/pages/home.tsx
+++ b/web/pages/home.tsx
@@ -81,11 +81,18 @@ const useContractPage = () => {
         if (!username || !contractSlug) setContract(undefined)
         else {
           // Show contract if route is to a contract: '/[username]/[contractSlug]'.
-          getContractFromSlug(contractSlug).then(setContract)
+          getContractFromSlug(contractSlug).then((contract) => {
+            const path = location.pathname.split('/').slice(1)
+            const [_username, contractSlug] = path
+            // Make sure we're still on the same contract.
+            if (contract?.slug === contractSlug) setContract(contract)
+          })
         }
       }
     }
 
+    addEventListener('popstate', updateContract)
+
     const { pushState, replaceState } = window.history
 
     window.history.pushState = function () {
@@ -101,6 +108,7 @@ const useContractPage = () => {
     }
 
     return () => {
+      removeEventListener('popstate', updateContract)
       window.history.pushState = pushState
       window.history.replaceState = replaceState
     }