fix: merge syntax errors

src/types/index.ts

@@ -354,16 +354,17 @@ export interface TerminalConfig {
 export interface TabContextTab {
   id: number;
   type:
-  | "home"
-  | "terminal"
-  | "ssh_manager"
-  | "server"
-  | "admin"
-  | "file_manager"
-  | "user_profile"
-  | "rdp"
-  | "vnc";
-  | "docker";
+    | "home"
+    | "terminal"
+    | "ssh_manager"
+    | "server"
+    | "admin"
+    | "file_manager"
+    | "user_profile"
+    | "rdp"
+    | "vnc"
+    | "tunnel"
+    | "docker";
   title: string;
   hostConfig?: SSHHost;
   terminalRef?: any;

src/ui/desktop/DesktopApp.tsx

@@ -157,7 +157,7 @@ function AppContent() {
     currentTabData?.type === "server" ||
     currentTabData?.type === "file_manager" ||
     currentTabData?.type === "rdp" ||
-    currentTabData?.type === "vnc";
+    currentTabData?.type === "vnc" ||
     currentTabData?.type === "tunnel" ||
     currentTabData?.type === "docker";
   const showHome = currentTabData?.type === "home";

src/ui/desktop/navigation/AppView.tsx

@@ -2,7 +2,10 @@ import React, { useEffect, useRef, useState, useMemo } from "react";
 import { Terminal } from "@/ui/desktop/apps/terminal/Terminal.tsx";
 import { ServerStats as ServerView } from "@/ui/desktop/apps/server-stats/ServerStats.tsx";
 import { FileManager } from "@/ui/desktop/apps/file-manager/FileManager.tsx";
-import { GuacamoleDisplay, type GuacamoleConnectionConfig } from "@/ui/desktop/apps/guacamole/GuacamoleDisplay.tsx";
+import {
+  GuacamoleDisplay,
+  type GuacamoleConnectionConfig,
+} from "@/ui/desktop/apps/guacamole/GuacamoleDisplay.tsx";
 import { TunnelManager } from "@/ui/desktop/apps/tunnel/TunnelManager.tsx";
 import { DockerManager } from "@/ui/desktop/apps/docker/DockerManager.tsx";
 import { useTabs } from "@/ui/desktop/navigation/tabs/TabContext.tsx";
@@ -63,7 +66,7 @@ export function AppView({
           tab.type === "server" ||
           tab.type === "file_manager" ||
           tab.type === "rdp" ||
-          tab.type === "vnc", ||
+          tab.type === "vnc" ||
           tab.type === "tunnel" ||
           tab.type === "docker",
       ),

src/ui/desktop/navigation/tabs/Tab.tsx

@@ -124,7 +124,7 @@ export function Tab({
     tabType === "file_manager" ||
     tabType === "user_profile" ||
     tabType === "rdp" ||
-    tabType === "vnc"
+    tabType === "vnc" ||
     tabType === "tunnel" ||
     tabType === "docker"
   ) {
@@ -141,18 +141,15 @@ export function Tab({
         ? t("nav.serverStats")
         : isFileManager
           ? t("nav.fileManager")
-          : isUserProfile
-            ? t("nav.userProfile")
-            : isRemoteDesktop
-              ? tabType.toUpperCase()
-              : t("nav.terminal"));
           : isTunnel
             ? t("nav.tunnels")
             : isDocker
               ? t("nav.docker")
               : isUserProfile
                 ? t("nav.userProfile")
-                : t("nav.terminal"));
+                : isRemoteDesktop
+                  ? tabType.toUpperCase()
+                  : t("nav.terminal"));
 
     const { base, suffix } = splitTitle(displayTitle);