From e51acb47d5b82f75126277239baaab52dbce3b72 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Thu, 8 Feb 2024 10:57:09 -0800
Subject: import toggle

---
 .../[username]/settings/[...tab]/+page.server.js   |  1 -
 .../[username]/settings/[...tab]/+page.svelte      |  8 +++++--
 .../[username]/settings/[...tab]/_security.svelte  | 28 ++++++++++------------
 3 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/src/routes/(app)/[username]/settings/[...tab]/+page.server.js b/src/routes/(app)/[username]/settings/[...tab]/+page.server.js
index 23d2ba9b..a2044767 100644
--- a/src/routes/(app)/[username]/settings/[...tab]/+page.server.js
+++ b/src/routes/(app)/[username]/settings/[...tab]/+page.server.js
@@ -19,7 +19,6 @@ export const actions = {
       form.autowithdraw = form.autowithdraw === "on";
     }
 
-      console.log("FORM", form.reserve)
     let user = { ...(await get("/me", auth(cookies))), ...form };
 
     try {
diff --git a/src/routes/(app)/[username]/settings/[...tab]/+page.svelte b/src/routes/(app)/[username]/settings/[...tab]/+page.svelte
index 819d4e80..f31f8cbb 100644
--- a/src/routes/(app)/[username]/settings/[...tab]/+page.svelte
+++ b/src/routes/(app)/[username]/settings/[...tab]/+page.svelte
@@ -12,7 +12,7 @@
   import { avatar, banner, password, pin } from "$lib/store";
   import { upload } from "$lib/upload";
   import { page } from "$app/stores";
-    import { sign, send, reEncryptEntropy, setNsec } from "$lib/nostr";
+  import { sign, send, reEncryptEntropy, setNsec } from "$lib/nostr";
   import { invalidateAll } from "$app/navigation";
 
   import Account from "./_account.svelte";
@@ -77,7 +77,11 @@
       submitting = true;
       let data = new FormData(formElement);
 
-      if (data.get("newNsec")) setNsec(user, data.get("newNsec"))
+      if (data.get("newNsec")) {
+          await setNsec(user, data.get("newNsec"));
+        data.set("nsec", user.nsec);
+        data.set("pubkey", user.pubkey);
+      }
 
       if (data.get("password")) {
         try {
diff --git a/src/routes/(app)/[username]/settings/[...tab]/_security.svelte b/src/routes/(app)/[username]/settings/[...tab]/_security.svelte
index c57b5262..7a1eeac9 100644
--- a/src/routes/(app)/[username]/settings/[...tab]/_security.svelte
+++ b/src/routes/(app)/[username]/settings/[...tab]/_security.svelte
@@ -31,14 +31,16 @@
     settingPin,
     verify;
 
-  let importNsec = () => {
-    importing = true;
+  let toggleImporting = () => {
+    revealNsec = false;
+    importing = !importing;
   };
 
   let toggleNsec = async () => {
     try {
       nsec = await getNsec(user);
       revealNsec = !revealNsec;
+      importing = false;
     } catch (e) {
       console.log(e);
     }
@@ -309,29 +311,25 @@
 
   <div class="flex">
     <button type="button" class="primary" on:click={toggleNsec}>
-      <Icon icon="warning" style="mr-1 w-6 my-auto" />
-      {revealNsec
-        ? $t("user.settings.hideNsec")
-        : $t("user.settings.revealNsec")}
+      {#if revealNsec}
+        <Icon icon="eye-off" style="mr-1 w-6 my-auto" />
+        {$t("user.settings.hideNsec")}
+      {:else}
+        <Icon icon="warning" style="mr-1 w-6 my-auto" />
+        {$t("user.settings.revealNsec")}
+      {/if}
     </button>
 
-    <button type="button" class="primary" on:click={importNsec}>
+    <button type="button" class="primary" on:click={toggleImporting}>
       <Icon icon="save" style="mr-1 w-6 my-auto" />
       {$t("user.settings.import")}
     </button>
   </div>
 
   {#if importing}
-    <input
-      name="newNsec"
-      bind:value={newNsec}
-      placeholder="nsec..."
-    />
+    <input name="newNsec" bind:value={newNsec} placeholder="nsec..." />
   {/if}
 
-  <input type="hidden" name="nsec" bind:value={user.nsec} />
-  <input type="hidden" name="pubkey" bind:value={user.pubkey} />
-
   {#if revealNsec}
     <div class="text-lg break-all">
       {nsec}
-- 
cgit v1.2.3