Merge branch 'dev' into feature/heartbeat

# Conflicts:
#	src/app/App.svelte
#	src/app/store.svelte.ts
#	src/app/store.test.ts
#	src/features/workspaces/ui/WorkspaceCard.test.ts

1 files changed, 14 insertions, 14 deletions

diff --git a/src/app/resolve-ws-url.ts b/src/app/resolve-ws-url.ts
index a264606..1c6e259 100644
--- a/src/app/resolve-ws-url.ts
+++ b/src/app/resolve-ws-url.ts
@@ -1,27 +1,27 @@
 export interface WsUrlEnv {
-	readonly VITE_WS_URL?: string;
-	readonly VITE_WS_PORT?: string;
+  readonly VITE_WS_URL?: string;
+  readonly VITE_WS_PORT?: string;
 }
 
 export interface WsUrlLocation {
-	readonly protocol: string;
-	readonly hostname: string;
+  readonly protocol: string;
+  readonly hostname: string;
 }
 
 const DEFAULT_PORT = "24205";
 const DEFAULT_FALLBACK = "ws://localhost:24205";
 
 export function resolveWsUrl(env: WsUrlEnv, location?: WsUrlLocation): string {
-	if (env.VITE_WS_URL !== undefined && env.VITE_WS_URL !== "") {
-		return env.VITE_WS_URL;
-	}
+  if (env.VITE_WS_URL !== undefined && env.VITE_WS_URL !== "") {
+    return env.VITE_WS_URL;
+  }
 
-	if (location === undefined) {
-		return DEFAULT_FALLBACK;
-	}
+  if (location === undefined) {
+    return DEFAULT_FALLBACK;
+  }
 
-	const wsProtocol = location.protocol === "https:" ? "wss" : "ws";
-	const port =
-		env.VITE_WS_PORT !== undefined && env.VITE_WS_PORT !== "" ? env.VITE_WS_PORT : DEFAULT_PORT;
-	return `${wsProtocol}://${location.hostname}:${port}`;
+  const wsProtocol = location.protocol === "https:" ? "wss" : "ws";
+  const port =
+    env.VITE_WS_PORT !== undefined && env.VITE_WS_PORT !== "" ? env.VITE_WS_PORT : DEFAULT_PORT;
+  return `${wsProtocol}://${location.hostname}:${port}`;
 }