fix: migration loading indicator (janhq#1913)

gitzhang · Feb 3, 2024 · 6ea7d8f · 6ea7d8f
1 parent afa80b9
commit 6ea7d8f
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/web/containers/Providers/index.tsx b/web/containers/Providers/index.tsx
@@ -21,6 +21,8 @@ import {
 
 import Umami from '@/utils/umami'
 
+import Loader from '../Loader'
+
 import KeyListener from './KeyListener'
 
 import { extensionManager } from '@/extension'
@@ -30,18 +32,21 @@ const Providers = (props: PropsWithChildren) => {
 
   const [setupCore, setSetupCore] = useState(false)
   const [activated, setActivated] = useState(false)
+  const [settingUp, setSettingUp] = useState(false)
 
   async function setupExtensions() {
     // Register all active extensions
     await extensionManager.registerActive()
 
     setTimeout(async () => {
       if (!isCoreExtensionInstalled()) {
-        setupBaseExtensions()
+        setSettingUp(true)
+        await setupBaseExtensions()
         return
       }
 
       extensionManager.load()
+      setSettingUp(false)
       setActivated(true)
     }, 500)
   }
@@ -71,6 +76,7 @@ const Providers = (props: PropsWithChildren) => {
     <JotaiWrapper>
       <ThemeWrapper>
         <Umami />
+        {settingUp && <Loader description="Preparing Update..." />}
         {setupCore && activated && (
           <KeyListener>
             <FeatureToggleWrapper>