From 80c74fa36a1eef8ec99402dd470341bd20645837 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Ctan-nhu=E2=80=9D?= <“tan@harness.io”>
Date: Wed, 20 Sep 2023 04:11:29 -0700
Subject: [PATCH] Fix infinite setState causing app is broken when swiching
 space <> no space

---
 web/src/components/SpaceSelector/SpaceSelector.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/src/components/SpaceSelector/SpaceSelector.tsx b/web/src/components/SpaceSelector/SpaceSelector.tsx
index d538d44bb..a8bcc5275 100644
--- a/web/src/components/SpaceSelector/SpaceSelector.tsx
+++ b/web/src/components/SpaceSelector/SpaceSelector.tsx
@@ -72,7 +72,7 @@ export const SpaceSelector: React.FC<SpaceSelectorProps> = ({ onSelect }) => {
   useEffect(() => {
     if (space && !selectedSpace && data) {
       selectSpace(data, false)
-    } else if (!space && selectSpace && data) {
+    } else if (!space && selectSpace && data && selectedSpace?.id !== -1) {
       selectSpace(
         {
           created: 0,
@@ -88,7 +88,7 @@ export const SpaceSelector: React.FC<SpaceSelectorProps> = ({ onSelect }) => {
         false
       )
     }
-  }, [space, selectedSpace, data, onSelect, selectSpace])
+  }, [space, selectedSpace, data, onSelect, selectSpace, getString])
 
   useEffect(() => {
     if (response?.status === 403) {