nostr signin

3 files changed, 7 insertions, 16 deletions

diff --git a/src/routes/(app)/+layout.svelte b/src/routes/(app)/+layout.svelte
index 31238a87..e179005f 100644
--- a/src/routes/(app)/+layout.svelte
+++ b/src/routes/(app)/+layout.svelte
@@ -8,6 +8,7 @@
     request,
     ndef,
     passwordPrompt,
+    signaturePrompt,
     password,
     pin,
     theme as themeStore,
@@ -16,6 +17,7 @@
   import { browser } from "$app/environment";
   import LoadingSplash from "$comp/LoadingSplash.svelte";
   import AppHeader from "$comp/AppHeader.svelte";
+  import Nostr from "$comp/Nostr.svelte";
   import Password from "$comp/Password.svelte";
   import { getCookie, warning } from "$lib/utils";
   import { t, locale, loading } from "$lib/translations";
@@ -89,6 +91,10 @@
   <Password {user} />
 {/if}
 
+{#if browser && $signaturePrompt}
+  <Nostr event={$signaturePrompt} />
+{/if}
+
 <svelte:head>
   {#if subject}
     <title>coinos - {subject.username}</title>
diff --git a/src/routes/(app)/settings/+layout.svelte b/src/routes/(app)/settings/+layout.svelte
index 134b8933..85e5b0e6 100644
--- a/src/routes/(app)/settings/+layout.svelte
+++ b/src/routes/(app)/settings/+layout.svelte
@@ -12,7 +12,7 @@
   import { avatar, banner, password, pin, save } from "$lib/store";
   import { upload } from "$lib/upload";
   import { page } from "$app/stores";
-  import { sign, send, reEncryptEntropy, setNsec } from "$lib/nostr";
+  import { sign, send, setNsec } from "$lib/nostr";
   import { invalidateAll } from "$app/navigation";
 
   let { children, data, form } = $props();
@@ -59,18 +59,6 @@
         data.set("pubkey", user.pubkey);
       }
 
-      if (data.get("password")) {
-        try {
-          data.set(
-            "cipher",
-            await reEncryptEntropy(prev, data.get("password")),
-          );
-        } catch (e) {
-          console.log("Failed to encrypt keys with new password");
-          throw e;
-        }
-      }
-
       if ($avatar) {
         try {
           let { hash } = JSON.parse(
diff --git a/src/routes/(app)/settings/security/+page.svelte b/src/routes/(app)/settings/security/+page.svelte
index 3a427546..5d4b492f 100644
--- a/src/routes/(app)/settings/security/+page.svelte
+++ b/src/routes/(app)/settings/security/+page.svelte
@@ -1,6 +1,5 @@
 <script>
   import { getContext } from "svelte";
-  import { getMnemonic } from "$lib/nostr";
   import { tick } from "svelte";
   import { t } from "$lib/translations";
   import Pin from "$comp/Pin.svelte";
@@ -19,7 +18,6 @@
   let confirming2fa = $state(),
     disabling2fa = $state(),
     importing = $state(),
-    mnemonic = $state(),
     newNsec = $state(),
     nsec = $state(),
     otp = $state(),
@@ -50,7 +48,6 @@
 
   let toggleSeed = async () => {
     try {
-      mnemonic = await getMnemonic(user);
       revealSeed = !revealSeed;
     } catch (e) {
       console.log(e);