Merge branch 'master' into close-pinned-plugin

Author: joeizang

libs/remix-ui/top-bar/src/lib/remix-ui-topbar.tsx

@@ -129,6 +129,27 @@ export function RemixUiTopbar () {
     }
   }, [global.fs.browser.workspaces, global.fs.browser.workspaces.length])
 
+  useEffect(() => {
+    plugin.on('theme', 'themeChanged', (theme) => {
+      setCurrentTheme(theme)
+    })
+    return () => {
+      plugin.off('theme', 'themeChanged')
+    }
+  }, [])
+
+  useEffect(() => {
+    async function loadCurrentTheme() {
+      try {
+        const ct = await plugin.call('theme', 'currentTheme')
+        setCurrentTheme(ct)
+      } catch (error) {
+        console.error("Error fetching current theme:", error)
+      }
+    }
+    loadCurrentTheme()
+  }, []);
+
   const subItems = useMemo(() => {
     return [
       { label: 'Rename', onClick: renameCurrentWorkspace, icon: 'far fa-edit' },
@@ -301,20 +322,6 @@ export function RemixUiTopbar () {
     )
   }
 
-  const getCurrentTheme = async () => {
-    const theme = await plugin.call('theme', 'currentTheme')
-    return theme
-  }
-
-  useEffect(() => {
-    plugin.on('theme', 'themeChanged', (theme) => {
-      setCurrentTheme(theme)
-    })
-    return () => {
-      plugin.off('theme', 'themeChanged')
-    }
-  }, [])
-
   const renameModalMessage = (workspaceName?: string) => {
     return (
       <div className='d-flex flex-column'>
@@ -349,8 +356,7 @@ export function RemixUiTopbar () {
     )
   }
 
-  const checkIfLightTheme = (themeName: string) =>
-    themeName.includes('dark') || themeName.includes('black') || themeName.includes('hackerOwl') ? false : true
+  const checkIfLightTheme = (themeName: string) => themeName.includes('dark') ? false : true
 
   const IsGitRepoDropDownMenuItem = (props: { isGitRepo: boolean, mName: string}) => {
     return (
@@ -562,8 +568,6 @@ export function RemixUiTopbar () {
                 fontSize: '0.8rem'
               }}
               onClick={async () => {
-                const theme = await getCurrentTheme()
-                setCurrentTheme(theme)
                 setShowTheme(!showTheme)
               }}
             >