From b5da16b4f0b2e2ec01b977d6023d467ef0f8027e Mon Sep 17 00:00:00 2001
From: user <thisemail@doesnotexist.com>
Date: Sat, 28 Mar 2026 19:32:58 +0200
Subject: [PATCH] -___-

---
 apps/frontend/src/lib/core/constants.ts       |  2 +-
 apps/main/src/lib/core/constants.ts           |  4 ++--
 .../src/routes/(main)/account/+page.svelte    | 20 +++++++++----------
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/apps/frontend/src/lib/core/constants.ts b/apps/frontend/src/lib/core/constants.ts
index 830e460..c267a69 100644
--- a/apps/frontend/src/lib/core/constants.ts
+++ b/apps/frontend/src/lib/core/constants.ts
@@ -1,7 +1,7 @@
 import { env } from "$env/dynamic/public";
 
 export const WS_SCRCPY_URL =
-    env.PUBLIC_WS_SCRCPY_SVC_URL ?? "https://iotam-ws-scrcpy.snapyra.com";
+    env?.PUBLIC_WS_SCRCPY_SVC_URL ?? "https://iotam-ws-scrcpy.snapyra.com";
 
 export const TRANSITION_COLORS = "transition-colors duration-150 ease-in-out";
 export const TRANSITION_ALL = "transition-all duration-150 ease-in-out";
diff --git a/apps/main/src/lib/core/constants.ts b/apps/main/src/lib/core/constants.ts
index 38ccb08..0e1e2c9 100644
--- a/apps/main/src/lib/core/constants.ts
+++ b/apps/main/src/lib/core/constants.ts
@@ -48,9 +48,9 @@ export const secondaryNavTree = [
 ] as AppSidebarItem[];
 
 export const FRONTEND_URL =
-    env.PUBLIC_FRONTEND_URL ?? "https://iotam-frontend.snapyra.com";
+    env?.PUBLIC_FRONTEND_URL ?? "https://iotam-frontend.snapyra.com";
 export const WS_SCRCPY_URL =
-    env.PUBLIC_WS_SCRCPY_SVC_URL ?? "https://iotam-ws-scrcpy.snapyra.com";
+    env?.PUBLIC_WS_SCRCPY_SVC_URL ?? "https://iotam-ws-scrcpy.snapyra.com";
 
 export const COMPANY_NAME = "SaaS Template";
 export const WEBSITE_URL = "https://company.com";
diff --git a/apps/main/src/routes/(main)/account/+page.svelte b/apps/main/src/routes/(main)/account/+page.svelte
index 698c87d..d824253 100644
--- a/apps/main/src/routes/(main)/account/+page.svelte
+++ b/apps/main/src/routes/(main)/account/+page.svelte
@@ -20,17 +20,17 @@
 
     let { data }: { data: PageData } = $props();
 
-    const user = $state(data.user!);
+    const user = $derived(data.user!);
 
     // Separate form state for profile and password
-    let profileData = $state({
-        name: user.name ?? "",
-        username: user.username ?? "",
-    });
+    let profileData = $state({ name: "", username: "" });
+    let passwordData = $state({ password: "", confirmPassword: "" });
 
-    let passwordData = $state({
-        password: "",
-        confirmPassword: "",
+    $effect(() => {
+        profileData = {
+            name: user.name ?? "",
+            username: user.username ?? "",
+        };
     });
 
     // Handle profile form submission (name, username)
@@ -185,9 +185,7 @@
     <Card.Root>
         <Card.Header>
             <Card.Title>Password Settings</Card.Title>
-            <Card.Description>
-                Update your account password.
-            </Card.Description>
+            <Card.Description>Update your account password.</Card.Description>
         </Card.Header>
         <Card.Content>
             <form onsubmit={handlePasswordSubmit} class="space-y-4">