user onboarding

2 files changed, 14 insertions, 14 deletions

diff --git a/src/routes/(app)/settings/profile/+page.svelte b/src/routes/(app)/settings/profile/+page.svelte
index bee50d39..ec9855d0 100644
--- a/src/routes/(app)/settings/profile/+page.svelte
+++ b/src/routes/(app)/settings/profile/+page.svelte
@@ -3,16 +3,18 @@
   import { avatar, banner as bannerStore } from "$lib/store";
   import { t } from "$lib/translations";
   import { page } from "$app/stores";
+  import PasswordInput from "$comp/PasswordInput.svelte";
 
   let { data } = $props();
   let { user } = $derived(data);
   let { id } = user;
-  let { about, banner, picture, display, username } =
-    $state(user);
+  let { about, banner, picture, display, username } = $state(user);
 
   let avatarFile,
     avatarInput = $state(),
     bannerFile,
+    password = $state(),
+    revealPassword = $state(),
     bannerInput = $state();
 
   let selectAvatar = () => avatarInput.click();
@@ -64,6 +66,16 @@
   </div>
 </div>
 
+<input type="hidden" name="confirm" bind:value={password} />
+
+<div>
+  <label for="password" class="block font-bold block mb-1"
+    >{$t("user.settings.newPassword")}</label
+  >
+
+  <PasswordInput bind:value={password} placeholder="(Leave blank to keep unchanged)" />
+</div>
+
 <div>
   <label for="display" class="font-bold mb-1 block"
     >{$t("user.settings.displayName")}</label
diff --git a/src/routes/(app)/settings/security/+page.svelte b/src/routes/(app)/settings/security/+page.svelte
index ea1bf1f9..8c38bca1 100644
--- a/src/routes/(app)/settings/security/+page.svelte
+++ b/src/routes/(app)/settings/security/+page.svelte
@@ -4,7 +4,6 @@
   import { t } from "$lib/translations";
   import Pin from "$comp/Pin.svelte";
   import Qr from "$comp/Qr.svelte";
-  import PasswordInput from "$comp/PasswordInput.svelte";
   import { copy, post, success, fail } from "$lib/utils";
   import { save, pin as current } from "$lib/store";
   import { invalidate } from "$app/navigation";
@@ -21,9 +20,7 @@
     newNsec = $state(),
     nsec = $state(),
     otp = $state(),
-    password = $state(),
     pin = $state(""),
-    revealPassword = $state(),
     revealSeed,
     revealNsec = $state(),
     token = $state(""),
@@ -157,15 +154,6 @@
 </script>
 
 <input type="hidden" name="newpin" value={disablingPin ? "delete" : pin} />
-<input type="hidden" name="confirm" bind:value={password} />
-
-<div>
-  <label for="password" class="block font-bold block mb-1"
-    >{$t("user.settings.newPassword")}</label
-  >
-
-  <PasswordInput bind:value={password} />
-</div>
 
 <div>
   <span class="font-bold mb-1"