rename account route

11 files changed, 47 insertions, 31 deletions

diff --git a/src/components/Account.svelte b/src/components/Account.svelte
index 86eb0f74..04ff97ae 100644
--- a/src/components/Account.svelte
+++ b/src/components/Account.svelte
@@ -65,6 +65,13 @@
     e.preventDefault();
     setAccount(e, "/payments");
   };
+
+  let goSettings = (e) => {
+    e.preventDefault();
+    e.stopPropagation();
+    document.cookie = `aid=${id}; path=/; max-age=86400`;
+    goto(`/account/${id}`);
+  };
 </script>
 
 <div
@@ -81,7 +88,7 @@
       href={`/account/${id}`}
       class="font-bold text-lg opacity-60 hover:opacity-100 transition-opacity flex items-center gap-2 shrink-0"
       aria-label="Account settings"
-      onclick={(e) => e.stopPropagation()}
+      onclick={goSettings}
     >
       {#if isArk}
         <img
diff --git a/src/components/Payments.svelte b/src/components/Payments.svelte
index 16033959..d27a59c1 100644
--- a/src/components/Payments.svelte
+++ b/src/components/Payments.svelte
@@ -92,9 +92,6 @@
               ></iconify-icon>
             {:else if p.type === types.ecash}
               <img src="/images/cash.png" class="w-12" alt="Ecash" />
-            {:else if p.type === types.reconcile}
-              <iconify-icon noobserver icon="ph:scales-bold" width="32"
-              ></iconify-icon>
             {:else if p.type === types.bitcoin}
               <iconify-icon noobserver icon="logos:bitcoin" class="text-3xl"
               ></iconify-icon>
diff --git a/src/lib/utils.ts b/src/lib/utils.ts
index 897b0f5a..45afb90b 100644
--- a/src/lib/utils.ts
+++ b/src/lib/utils.ts
@@ -414,7 +414,6 @@ export const types = {
 	internal: "internal",
 	fund: "fund",
 	ecash: "ecash",
-	reconcile: "reconcile",
 	bolt12: "bolt12",
 };
 
diff --git a/src/routes/(app)/[username]/(profile)/+page.svelte b/src/routes/(app)/[username]/(profile)/+page.svelte
index 2016af1f..e999a731 100644
--- a/src/routes/(app)/[username]/(profile)/+page.svelte
+++ b/src/routes/(app)/[username]/(profile)/+page.svelte
@@ -68,6 +68,18 @@
       {#each accounts as account}
         <Account {user} {rate} {account} />
       {/each}
+      <div class="flex justify-end">
+        <a href="/account/new" class="contents">
+          <button
+            class="btn btn-circle btn-accent !w-14 !h-14 !rounded-full"
+            aria-label={$t("accounts.addAccount")}
+            title={$t("accounts.addAccount")}
+          >
+            <iconify-icon noobserver icon="ph:plus-bold" width="28"
+            ></iconify-icon>
+          </button>
+        </a>
+      </div>
     </div>
 
     {#if locked}
diff --git a/src/routes/(app)/account/[id]/+page.svelte b/src/routes/(app)/account/[id]/+page.svelte
index d3204a10..a8970ca7 100644
--- a/src/routes/(app)/account/[id]/+page.svelte
+++ b/src/routes/(app)/account/[id]/+page.svelte
@@ -51,7 +51,7 @@
   </h1>
 
   <div class="container w-full mx-auto text-lg px-4 max-w-xl space-y-2">
-    <form class="space-y-5" method="POST">
+    <form class="space-y-5" method="POST" use:enhance>
       <div class="space-y-1">
         <label for="name" class="font-bold block">{$t("accounts.name")}</label>
         <label
diff --git a/src/routes/(app)/account/import/+page.svelte b/src/routes/(app)/account/import/+page.svelte
index 8275d694..7b6857e5 100644
--- a/src/routes/(app)/account/import/+page.svelte
+++ b/src/routes/(app)/account/import/+page.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { run, preventDefault } from 'svelte/legacy';
+  import { run, preventDefault } from "svelte/legacy";
 
   import { goto } from "$app/navigation";
   import { mnemonic } from "$lib/store";
@@ -9,7 +9,9 @@
   import { validateMnemonic } from "@scure/bip39";
   import { wordlist } from "@scure/bip39/wordlists/english.js";
 
-  let el = $state(), pasted = $state(), text = $state();
+  let el = $state(),
+    pasted = $state(),
+    text = $state();
 
   let paste = async () => {
     text = await navigator.clipboard.readText();
@@ -44,20 +46,21 @@
         class="w-full p-4 border rounded-xl h-48 text-xl"
         bind:value={text}
         autocapitalize="none"
-></textarea>
-      <button
-        bind:this={el}
-        type="submit"
-        class="flex bg-black text-white border rounded-2xl px-6 py-5 w-full font-bold gap-2 justify-center"
-      >
-        <iconify-icon
-          noobserver
-          icon="ph:paper-plane-right-bold"
-          width="32"
-          class="my-auto invert"
-        ></iconify-icon>
-        <div class="my-auto">{$t("user.send.next")}</div>
-      </button>
+      ></textarea>
+      <div class="flex gap-2">
+        <a href={`/account/bitcoin`} class="contents">
+          <button type="button" class="btn !w-auto grow">
+            {$t("accounts.back")}
+          </button>
+        </a>
+        <button
+          bind:this={el}
+          type="submit"
+          class="btn btn-accent !w-auto grow"
+        >
+          <div class="my-auto">{$t("accounts.next")}</div>
+        </button>
+      </div>
     </form>
   </div>
 </div>
diff --git a/src/routes/(app)/account/savings/+page.svelte b/src/routes/(app)/account/new/+page.svelte
index 3e26fd3e..03076b63 100644
--- a/src/routes/(app)/account/savings/+page.svelte
+++ b/src/routes/(app)/account/new/+page.svelte
@@ -3,7 +3,7 @@
 </script>
 
 <div class="space-y-5">
-  <h1 class="text-center text-3xl font-semibold">Choose wallet type</h1>
+  <h1 class="text-center text-3xl font-semibold">Choose account type</h1>
 
   <div class="container w-full mx-auto text-lg px-4 max-w-xl space-y-5">
     <a href="/account/bitcoin" class="block">
@@ -12,8 +12,7 @@
         <div>
           <div class="text-xl">Bitcoin (On-chain)</div>
           <div class="text-secondary">
-            Standard Bitcoin wallet secured by a 12-word seed phrase. Full
-            control over your UTXOs.
+            Self-custodial Bitcoin wallet secured by a 12-word seed phrase
           </div>
         </div>
       </div>
@@ -28,8 +27,7 @@
         <div>
           <div class="text-xl">Ark (Off-chain)</div>
           <div class="text-secondary">
-            Fast, private transactions using virtual UTXOs. Lower fees with
-            instant settlement.
+            Experimental layer 2 wallet offering low fees and fast settlement
           </div>
         </div>
       </div>
diff --git a/src/routes/(app)/account/pass/+page.svelte b/src/routes/(app)/account/pass/+page.svelte
index 3b7c6fec..7c57679a 100644
--- a/src/routes/(app)/account/pass/+page.svelte
+++ b/src/routes/(app)/account/pass/+page.svelte
@@ -28,7 +28,7 @@
   let name = $t("accounts.savings");
 
   onMount(() => {
-    if (!$mnemonic) goto("/account/savings");
+    if (!$mnemonic) goto("/account/new");
   });
 
   let submit = async () => {
diff --git a/src/routes/(app)/account/seed/+page.svelte b/src/routes/(app)/account/seed/+page.svelte
index 04077009..3779929b 100644
--- a/src/routes/(app)/account/seed/+page.svelte
+++ b/src/routes/(app)/account/seed/+page.svelte
@@ -40,7 +40,7 @@
     </button>
 
     <div class="flex gap-2">
-      <a href={`/account/savings`} class="contents">
+      <a href={`/account/bitcoin`} class="contents">
         <button type="button" class="btn !w-auto grow">
           {$t("accounts.back")}
         </button>
diff --git a/src/routes/(app)/account/setup/+page.svelte b/src/routes/(app)/account/setup/+page.svelte
index 237df0bb..3109c10b 100644
--- a/src/routes/(app)/account/setup/+page.svelte
+++ b/src/routes/(app)/account/setup/+page.svelte
@@ -17,7 +17,7 @@
         </div>
       </div>
     </a>
-    <a href="/account/savings" class="block">
+    <a href="/account/new" class="block">
       <div class="shadow p-8 rounded-xl flex gap-4 hover:bg-primary">
         <img src="/images/keys.png" class="w-20 my-auto" alt="Savings account" />
         <div>
diff --git a/src/routes/(app)/settings/security/+page.svelte b/src/routes/(app)/settings/security/+page.svelte
index 77723230..73e293cd 100644
--- a/src/routes/(app)/settings/security/+page.svelte
+++ b/src/routes/(app)/settings/security/+page.svelte
@@ -233,7 +233,7 @@
 </div>
 
 <div>
-  <a href={`/account/savings`} class="contents">
+  <a href={`/account/new`} class="contents">
     <button class="btn btn-lg w-full rounded-2xl whitespace-nowrap">
       <iconify-icon noobserver icon="ph:plus-circle-bold" width="32"
       ></iconify-icon>