From 50f23a08072cca12067fc8cf0bf0184af9c7c00b Mon Sep 17 00:00:00 2001
From: Gabe Kangas <gabek@real-ity.com>
Date: Wed, 2 Nov 2022 00:01:21 -0700
Subject: [PATCH] Changes to troubleshoot #2291

---
 web/components/stores/ClientConfigStore.tsx | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/web/components/stores/ClientConfigStore.tsx b/web/components/stores/ClientConfigStore.tsx
index e29ad88870..45ce813231 100644
--- a/web/components/stores/ClientConfigStore.tsx
+++ b/web/components/stores/ClientConfigStore.tsx
@@ -149,7 +149,7 @@ export const visibleChatMessagesSelector = selector<ChatMessage[]>({
 });
 
 export const ClientConfigStore: FC = () => {
-  const [appState, appStateSend, appStateService] = useMachine(appStateModel);
+  const [, appStateSend, appStateService] = useMachine(appStateModel);
   const [currentUser, setCurrentUser] = useRecoilState(currentUserAtom);
   const setChatAuthenticated = useSetRecoilState<boolean>(chatAuthenticatedAtom);
   const [clientConfig, setClientConfig] = useRecoilState<ClientConfig>(clientConfigStateAtom);
@@ -178,6 +178,10 @@ export const ClientConfigStore: FC = () => {
   };
 
   const updateClientConfig = async () => {
+    if (hasLoadedConfig) {
+      return;
+    }
+
     try {
       const config = await ClientConfigService.getConfig();
       setClientConfig(config);
@@ -193,6 +197,10 @@ export const ClientConfigStore: FC = () => {
   };
 
   const updateServerStatus = async () => {
+    if (hasLoadedStatus) {
+      return;
+    }
+
     try {
       const status = await ServerStatusService.getStatus();
       setServerStatus(status);
@@ -216,7 +224,6 @@ export const ClientConfigStore: FC = () => {
       );
       console.error(`serverStatusState -> getStatus() ERROR: \n${error}`);
     }
-    return null;
   };
 
   const handleUserRegistration = async (optionalDisplayName?: string) => {
@@ -377,7 +384,11 @@ export const ClientConfigStore: FC = () => {
     serverStatusRefreshPoll = setInterval(() => {
       updateServerStatus();
     }, SERVER_STATUS_POLL_DURATION);
-  }, [appState]);
+
+    return () => {
+      clearInterval(serverStatusRefreshPoll);
+    };
+  }, []);
 
   useEffect(() => {
     if (!accessToken) {
@@ -400,7 +411,7 @@ export const ClientConfigStore: FC = () => {
 
       setAppState(metadata);
     });
-  });
+  }, []);
 
   return null;
 };