From 3c668861df81da46af3b684ea8e97eb64ed982b0 Mon Sep 17 00:00:00 2001
From: Navan Chauhan <navanchauhan@gmail.com>
Date: Sun, 27 Apr 2025 21:32:35 -0600
Subject: fix menu item changing but not content

---
 client/src/App.js | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

(limited to 'client/src/App.js')

diff --git a/client/src/App.js b/client/src/App.js
index 7d84cb0..5134310 100644
--- a/client/src/App.js
+++ b/client/src/App.js
@@ -1,5 +1,5 @@
 import React, { useState, createContext } from 'react';
-import { Routes, Route, Navigate, Link} from 'react-router-dom';
+import { Routes, Route, Navigate, Link, useLocation } from 'react-router-dom';
 import MarketDataPage from './MarketDataPage';
 import BidsPage from './BidsPage';
 import SubmitBidPage from './SubmitBidPage';
@@ -24,6 +24,7 @@ export const MARKET_FULL_NAMES = {
 
 function App() {
   const [selectedMarket, setSelectedMarket] = useState('ISONE');
+  const location = useLocation();
   return (
     <MarketContext.Provider value={{ selectedMarket, setSelectedMarket }}>
     <div>
@@ -81,17 +82,17 @@ function App() {
                       />
                     </div>
                   </div>
-        <Menu mode="horizontal" defaultSelectedKeys={['market-data']}>
-                <Menu.Item key="market-data">
-                  <Link to="/market-data">Market Data</Link>
-                </Menu.Item>
-                <Menu.Item key="submit-bid">
-                  <Link to="/submit-bid">Submit Bid</Link>
-                </Menu.Item>
-                <Menu.Item key="bids">
-                  <Link to="/bids">My Bids</Link>
-                </Menu.Item>
-              </Menu>
+                  <Menu mode="horizontal" selectedKeys={[location.pathname.split('/')[1] || 'market-data']}>
+                    <Menu.Item key="market-data">
+                      <Link to="/market-data">Market Data</Link>
+                    </Menu.Item>
+                    <Menu.Item key="submit-bid">
+                      <Link to="/submit-bid">Submit Bid</Link>
+                    </Menu.Item>
+                    <Menu.Item key="bids">
+                      <Link to="/bids">My Bids</Link>
+                    </Menu.Item>
+                  </Menu>
       </div>
       <div style={{ backgroundColor: 'var(--color-fill-2)', minHeight: '80vh', display: 'flex', flexDirection: 'column' }}>
       <Routes>
-- 
cgit v1.2.3