From 0be39c225f7164e951ab2c633c15b7cab9e8f074 Mon Sep 17 00:00:00 2001
From: BrunoQuaresma <bruno_nonato_quaresma@hotmail.com>
Date: Thu, 1 Jun 2023 20:04:03 +0000
Subject: [PATCH] fix(site): proxy menu not showing latency

---
 site/src/components/Navbar/NavbarView.tsx | 13 ++++++-------
 site/src/contexts/useProxyLatency.ts      |  7 ++++---
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/site/src/components/Navbar/NavbarView.tsx b/site/src/components/Navbar/NavbarView.tsx
index 490ce1b7b4059..f5e7bdbefb0c2 100644
--- a/site/src/components/Navbar/NavbarView.tsx
+++ b/site/src/components/Navbar/NavbarView.tsx
@@ -192,8 +192,11 @@ const ProxyMenu: FC<{ proxyContextValue: ProxyContextValue }> = ({
   const refreshLatencies = proxyContextValue.refetchProxyLatencies
   const closeMenu = () => setIsOpen(false)
   const navigate = useNavigate()
+  const latencies = proxyContextValue.proxyLatencies
+  const isLoadingLatencies = Object.keys(latencies).length === 0
+  const isLoading = proxyContextValue.isLoading || isLoadingLatencies
 
-  if (!proxyContextValue.isFetched) {
+  if (isLoading) {
     return (
       <Skeleton
         width="160px"
@@ -230,9 +233,7 @@ const ProxyMenu: FC<{ proxyContextValue: ProxyContextValue }> = ({
             {selectedProxy.display_name}
             <ProxyStatusLatency
               proxy={selectedProxy}
-              latency={
-                proxyContextValue.proxyLatencies?.[selectedProxy.id]?.latencyMS
-              }
+              latency={latencies?.[selectedProxy.id]?.latencyMS}
             />
           </Box>
         ) : (
@@ -278,9 +279,7 @@ const ProxyMenu: FC<{ proxyContextValue: ProxyContextValue }> = ({
               {proxy.display_name}
               <ProxyStatusLatency
                 proxy={proxy}
-                latency={
-                  proxyContextValue.proxyLatencies?.[proxy.id]?.latencyMS
-                }
+                latency={latencies?.[proxy.id]?.latencyMS}
               />
             </Box>
           </MenuItem>
diff --git a/site/src/contexts/useProxyLatency.ts b/site/src/contexts/useProxyLatency.ts
index 1bbfbf9ec1f37..b3d41540ef506 100644
--- a/site/src/contexts/useProxyLatency.ts
+++ b/site/src/contexts/useProxyLatency.ts
@@ -24,9 +24,10 @@ const proxyLatenciesReducer = (
   state: Record<string, ProxyLatencyReport>,
   action: ProxyLatencyAction,
 ): Record<string, ProxyLatencyReport> => {
-  // Just overwrite any existing latency.
-  state[action.proxyID] = action.report
-  return state
+  return {
+    ...state,
+    [action.proxyID]: action.report,
+  }
 }
 
 export const useProxyLatency = (