cleanup

tari-project · Jan 20, 2025 · da7d016 · da7d016
1 parent 2b7ec1d
commit da7d016
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
     "version": "0.8.44",
     "type": "module",
     "scripts": {
-        "dev": "vite dev --profile --mode development",
+        "dev": "vite dev --mode development",
         "build": "tsc && vite build",
         "preview": "vite preview",
         "tauri": "tauri",

diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
@@ -158,7 +158,6 @@ async fn setup_inner(
     state: tauri::State<'_, UniverseAppState>,
     app: tauri::AppHandle,
 ) -> Result<(), anyhow::Error> {
-    info!(target: LOG_TARGET, "SETUP_INNER");
     app.emit(
         "setup_message",
         SetupStatusEvent {

diff --git a/src/App/App.tsx b/src/App/App.tsx
@@ -41,7 +41,8 @@ export default function App() {
             canvasElement.style.opacity = isShuttingDown || isSettingUp ? '0' : '1';
         }
     }, [isShuttingDown, isSettingUp]);
-    console.debug(`isSettingUp= ${isSettingUp}`);
+
+    const showSetup = isSettingUp && !isShuttingDown && isAppReady;
 
     return (
         <ThemeProvider>
@@ -56,26 +57,26 @@ export default function App() {
                 <MotionConfig reducedMotion="user">
                     <FloatingElements />
                     <AnimatePresence mode="popLayout">
-                        {!isAppReady ? (
+                        {!isAppReady && (
                             <AppContentContainer key="splashscreen" initial="hidden">
                                 <Splashscreen />
                             </AppContentContainer>
-                        ) : null}
-                        {isSettingUp && isAppReady ? (
+                        )}
+                        {showSetup ? (
                             <AppContentContainer key="setup" initial="hidden">
                                 <Setup />
                             </AppContentContainer>
                         ) : null}
-                        {!isShuttingDown && !isSettingUp && isAppReady ? (
+                        {!isShuttingDown && !isSettingUp && isAppReady && (
                             <AppContentContainer key="main" initial="dashboardInitial">
                                 <MainView />
                             </AppContentContainer>
-                        ) : null}
-                        {isShuttingDown ? (
+                        )}
+                        {isShuttingDown && isAppReady && (
                             <AppContentContainer key="shutdown" initial="hidden">
                                 <ShuttingDownScreen />
                             </AppContentContainer>
-                        ) : null}
+                        )}
                     </AnimatePresence>
                 </MotionConfig>
             </LazyMotion>