From 1f63848ca9fb01336f04b41434de1cc06a5b3d93 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Tue, 10 Sep 2024 20:39:47 -0700
Subject: move routes

---
 src/routes/(app)/settings/[...tab]/+page.server.ts |  34 +++
 src/routes/(app)/settings/[...tab]/+page.svelte    | 257 +++++++++++++++++
 src/routes/(app)/settings/[...tab]/_account.svelte | 190 ++++++++++++
 src/routes/(app)/settings/[...tab]/_pos.svelte     | 238 +++++++++++++++
 .../(app)/settings/[...tab]/_security.svelte       | 321 +++++++++++++++++++++
 src/routes/(app)/settings/[...tab]/_shopify.svelte |  92 ++++++
 6 files changed, 1132 insertions(+)
 create mode 100644 src/routes/(app)/settings/[...tab]/+page.server.ts
 create mode 100644 src/routes/(app)/settings/[...tab]/+page.svelte
 create mode 100644 src/routes/(app)/settings/[...tab]/_account.svelte
 create mode 100644 src/routes/(app)/settings/[...tab]/_pos.svelte
 create mode 100644 src/routes/(app)/settings/[...tab]/_security.svelte
 create mode 100644 src/routes/(app)/settings/[...tab]/_shopify.svelte

(limited to 'src/routes/(app)/settings')

diff --git a/src/routes/(app)/settings/[...tab]/+page.server.ts b/src/routes/(app)/settings/[...tab]/+page.server.ts
new file mode 100644
index 00000000..42639b38
--- /dev/null
+++ b/src/routes/(app)/settings/[...tab]/+page.server.ts
@@ -0,0 +1,34 @@
+import { fail, redirect } from "@sveltejs/kit";
+import { fd, auth, get, post } from "$lib/utils";
+
+export function load({ cookies, params, url }) {
+  if (url.pathname.endsWith("settings"))
+    redirect(307, url.pathname + "/account");
+  params.cookies = cookies.getAll();
+  return { cookies: cookies.getAll(), tab: params.tab };
+}
+
+export const actions = {
+  default: async ({ cookies, request }) => {
+    let form = await fd(request);
+
+    if (form.tab === "pos") {
+      form.notify = form.notify === "on";
+      form.nip5 = form.nip5 === "on";
+      form.prompt = form.prompt === "on";
+      form.autowithdraw = form.autowithdraw === "on";
+    }
+
+    let user = { ...(await get("/me", auth(cookies))), ...form };
+
+    try {
+      ({ user } = await post(`/user`, user, auth(cookies)));
+    } catch (e: any) {
+      return fail(400, { message: e.message });
+    }
+
+    if (user.language) cookies.set("lang", user.language, { path: "/" });
+
+    return { user, success: true };
+  },
+};
diff --git a/src/routes/(app)/settings/[...tab]/+page.svelte b/src/routes/(app)/settings/[...tab]/+page.svelte
new file mode 100644
index 00000000..c495a5cc
--- /dev/null
+++ b/src/routes/(app)/settings/[...tab]/+page.svelte
@@ -0,0 +1,257 @@
+<script>
+  import { browser } from "$app/environment";
+  import { onMount, tick } from "svelte";
+  import { fly } from "svelte/transition";
+  import { applyAction, deserialize } from "$app/forms";
+
+  import Icon from "$comp/Icon.svelte";
+  import Spinner from "$comp/Spinner.svelte";
+  import Pin from "$comp/Pin.svelte";
+  import { loading, t } from "$lib/translations";
+  import { fail, auth, post, sleep, warning, success } from "$lib/utils";
+  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 { invalidateAll } from "$app/navigation";
+
+  import Account from "./_account.svelte";
+  import Pos from "./_pos.svelte";
+  import Security from "./_security.svelte";
+  import Shopify from "./_shopify.svelte";
+
+  import { PUBLIC_COINOS_URL } from "$env/static/public";
+
+  export let data;
+  export let form;
+
+  let submit;
+  let formElement;
+
+  let { user, token, rates, tab, cookies } = data;
+  let prev;
+
+  $: update(data);
+  let update = () => {
+    ({ user, token, rates, tab } = data);
+    prev = { ...user };
+  };
+
+  $: form?.user && ({ user } = form);
+
+  $: form?.success && throttledSuccess();
+
+  let justUpdated;
+  let throttledSuccess = () => {
+    if (!justUpdated) {
+      justUpdated = true;
+      success($t("user.settings.saved"), false);
+      setTimeout(() => (justUpdated = false), 5000);
+    }
+  };
+
+  $: form?.message && fail(form.message);
+
+  $: if (form?.message?.startsWith("Pin")) {
+    fail("Wrong pin, try again");
+    $pin = "";
+  }
+
+  let tabs = [
+    { name: "account", key: "ACCOUNT", comp: Account },
+    { name: "pos", key: "POINT_OF_SALE", comp: Pos },
+    { name: "security", key: "SECURITY", comp: Security },
+    { name: "shopify", key: "SHOPIFY", comp: Shopify },
+  ];
+
+  $: ({ comp } = tabs.find((t) => t.name === tab));
+
+  let { address, id, username } = user;
+  let submitting;
+
+  $: if (!$loading && $page.url.searchParams.get("verified"))
+    success($t("user.settings.verified"));
+
+  async function handleSubmit() {
+    try {
+      submitting = true;
+      let data = new FormData(formElement);
+
+      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 {
+          data.set(
+            "cipher",
+            await reEncryptEntropy(user, data.get("password"))
+          );
+        } catch (e) {
+          console.log("Failed to encrypt keys with new password");
+          throw e;
+        }
+      }
+
+      if ($avatar) {
+        try {
+          let { hash } = JSON.parse(
+            await upload($avatar.file, $avatar.type, $avatar.progress, token)
+          );
+
+          data.set("profile", hash);
+
+          await fetch(`/api/public/${hash}.webp`, {
+            cache: "reload",
+            mode: "no-cors",
+          });
+        } catch (e) {
+          console.log("problem upsubmitting avatar", e);
+        }
+      }
+
+      if ($banner) {
+        try {
+          let { hash } = JSON.parse(
+            await upload($banner.file, $banner.type, $banner.progress, token)
+          );
+
+          data.set("banner", hash);
+
+          await fetch(`/api/public/${hash}.webp`, {
+            cache: "reload",
+            mode: "no-cors",
+          });
+        } catch (e) {
+          console.log("problem upsubmitting banner", e);
+        }
+      }
+
+      if (["username", "address", "profile"].some((a) => user[a] !== prev[a])) {
+        let event = {
+          pubkey: user.pubkey,
+          created_at: Math.floor(Date.now() / 1000),
+          kind: 0,
+          content: JSON.stringify({
+            name: user.username,
+            about: user.address,
+            picture: `${PUBLIC_COINOS_URL}/public/${user.profile}.webp`,
+          }),
+          tags: [],
+        };
+
+        try {
+          await sign({ event, user });
+          await send(event);
+        } catch (e) {
+          warning("Nostr profile could not be updated");
+        }
+      }
+
+      if (user.email !== prev.email) {
+        try {
+          cookies.get = function (n) {
+            return this.find((c) => c.name === n).value;
+          };
+
+          user.verified = false;
+
+          await post(
+            "/api/request",
+            { id: user.id, email: user.email },
+            auth(cookies)
+          );
+
+          warning($t("user.settings.verifying"), false);
+        } catch (e) {
+          fail(e.message);
+          console.log(e);
+        }
+      }
+
+      const response = await fetch(formElement.action, {
+        method: "POST",
+        body: data,
+      });
+
+      const result = deserialize(await response.text());
+
+      if (result.type === "success") {
+        await invalidateAll();
+        if (data.get("password")) $password = data.get("password");
+      }
+
+      applyAction(result);
+    } catch (e) {
+      console.log(e);
+      fail("Something went wrong");
+    }
+
+    submitting = false;
+  }
+</script>
+
+{#if user.haspin && $pin?.length !== 6}
+  <Pin />
+{/if}
+
+<form
+  method="POST"
+  class="mb-[154px] settings"
+  on:submit|preventDefault={handleSubmit}
+  bind:this={formElement}
+>
+  <input type="hidden" name="pin" value={$pin} />
+  <input type="hidden" name="tab" value={tab} />
+
+  <div class="mt-24 mb-20 px-3 md:px-0 w-full md:w-[400px] mx-auto space-y-8">
+    <div class="header">
+      <h1 class="text-center text-3xl md:text-4xl font-semibold mb-10">
+        {$t("user.settings.header")}
+      </h1>
+
+      <div
+        class="font-bold flex justify-around items-center border-b pb-3 text-secondary"
+      >
+        {#each tabs.filter((t) => t.name !== "shopify") as { name, key }}
+          <a href={`/settings/${name}`}>
+            <button
+              type="button"
+              class="hover:opacity-80"
+              class:text-black={tab === name ||
+                (tab === "shopify" && name === "pos")}
+              >{$t(`user.settings.${key}`)}</button
+            >
+          </a>
+        {/each}
+      </div>
+    </div>
+
+    <svelte:component this={comp} {user} {rates} {submit} />
+  </div>
+
+  <div
+    class="z-10 fixed bottom-0 bg-white shadow border-t w-full flex justify-center items-center py-3"
+  >
+    <button
+      bind:this={submit}
+      type="submit"
+      class="border-2 border-black rounded-xl font-semibold mx-auto py-3 w-40 hover:opacity-80"
+      class:bg-black={submitting}
+    >
+      {#if submitting}
+        <Spinner />
+      {:else}
+        <div class="my-auto">{$t("user.settings.saveSettings")}</div>
+      {/if}
+    </button>
+  </div>
+</form>
+
+<style>
+  .settings {
+    view-transition-name: settings;
+  }
+</style>
diff --git a/src/routes/(app)/settings/[...tab]/_account.svelte b/src/routes/(app)/settings/[...tab]/_account.svelte
new file mode 100644
index 00000000..8e3323c7
--- /dev/null
+++ b/src/routes/(app)/settings/[...tab]/_account.svelte
@@ -0,0 +1,190 @@
+<script>
+  import { tick } from "svelte";
+  import { avatar, banner } from "$lib/store";
+  import Icon from "$comp/Icon.svelte";
+  import { t } from "$lib/translations";
+  import { page } from "$app/stores";
+
+  export let user, rates, submit;
+
+  let { id } = user;
+
+  let avatarFile, avatarInput, bannerFile, bannerInput;
+
+  let selectAvatar = () => avatarInput.click();
+  let selectBanner = () => bannerInput.click();
+
+  let percent;
+  let progress = async (event) => {
+    percent = Math.round((event.loaded / event.total) * 100);
+  };
+
+  let tooLarge = {};
+
+  let handleFile = async ({ target }, type) => {
+    tooLarge[type] = false;
+    let file = target.files[0];
+    if (!file) return;
+
+    if (file.size > 10000000) return (tooLarge[type] = true);
+
+    if (type === "profile") {
+      $avatar = { id, file, type, progress };
+    } else if (type === "banner") {
+      $banner = { id, file, type, progress };
+    }
+
+    var reader = new FileReader();
+    reader.onload = async (e) => {
+      if (type === "profile") {
+        $avatar.src = e.target.result;
+      } else if (type === "banner") {
+        $banner.src = e.target.result;
+      }
+    };
+
+    reader.readAsDataURL(file);
+  };
+
+  if (!user.display) user.display = user.username;
+
+  $: url = `${$page.url.host}/${user.username}`;
+  $: full = `${$page.url.protocol}//${url}`;
+  $: addr = `${user.username}@${$page.url.host}`;
+</script>
+
+<div>
+  <label for="username" class="font-bold mb-1 block"
+    >{$t("user.settings.username")}</label
+  >
+  <div class="flex mb-2">
+    <input
+      type="text"
+      name="username"
+      bind:value={user.username}
+      class="w-auto min-w-0 pr-1 grow"
+    />
+  </div>
+</div>
+
+<div>
+  <label for="display" class="font-bold mb-1 block"
+    >{$t("user.settings.displayName")}</label
+  >
+  <input type="text" name="display" bind:value={user.display} />
+</div>
+
+<div class="space-y-1 relative">
+  <label for="email" class="font-bold block">{$t("user.settings.email")}</label>
+  <p class="text-secondary">
+    {$t("user.settings.emailDescription")}
+  </p>
+
+  <div class="relative">
+    <input type="text" name="email" bind:value={user.email} />
+    {#if user.verified}
+      <Icon icon="check" style="absolute right-5 top-3 w-8" />
+    {:else if user.email}
+      <Icon icon="orangeclock" style="absolute right-5 top-3 w-8" />
+    {/if}
+  </div>
+</div>
+
+<div>
+  <span class="font-bold">{$t("user.settings.profileImage")}</span>
+
+  <div class="flex">
+    {#if $avatar || user.profile}
+      <div
+        class="relative rounded-full overflow-hidden text-center w-20 h-20 my-auto hover:opacity-80 cursor-pointer"
+        on:click={selectAvatar}
+        on:keydown={selectAvatar}
+      >
+        <img
+          src={$avatar?.src || `/api/public/${user.profile}.webp`}
+          class="absolute w-full h-full object-cover object-center visible overflow-hidden"
+          alt={user.username}
+        />
+      </div>
+    {:else}
+      <div
+        class="rounded-full border-4 border-white p-4 bg-gradient-to-r from-primary to-gradient w-24 my-auto hover:opacity-80 cursor-pointer"
+        on:click={selectAvatar}
+        on:keydown={selectAvatar}
+      >
+        <Icon icon="logo-symbol-white" style="mx-auto" />
+      </div>
+    {/if}
+    <div class="ml-2 p-2">
+      <!-- found missing translation -->
+      <button
+        type="button"
+        class="border rounded-2xl font-bold w-24 text-center px-0 py-2 hover:opacity-80"
+        on:click={selectAvatar}
+        on:keydown={selectAvatar}>{$t("user.settings.select")}</button
+      >
+      <input
+        type="file"
+        class="hidden"
+        bind:this={avatarInput}
+        on:change={(e) => handleFile(e, "profile")}
+      />
+    </div>
+  </div>
+
+  {#if tooLarge["avatar"]}
+    <div class="text-red-600">Max file size 10MB</div>
+  {/if}
+</div>
+
+<div>
+  <div class="flex justify-between items-center">
+    <span class="font-bold">{$t("user.settings.bannerImage")}</span>
+  </div>
+
+  {#if $banner || user.banner}
+    <img
+      src={$banner ? $banner.src : `/api/public/${user.banner}.webp`}
+      class="w-full object-cover object-center visible overflow-hidden h-48 mb-4 hover:opacity-80"
+      on:click={selectBanner}
+      on:keydown={selectBanner}
+      alt="Banner"
+    />
+  {:else}
+    <div
+      class="bg-gradient-to-r from-primary to-gradient w-full h-48 mb-4 cursor-pointer hover:opacity-80"
+      on:click={selectBanner}
+      on:keydown={selectBanner}
+      alt="Banner"
+    />
+  {/if}
+
+  <button
+    type="button"
+    class="border rounded-2xl font-bold w-24 text-center px-0 py-2 hover:opacity-80"
+    on:click={selectBanner}
+    on:keydown={selectBanner}>{$t("user.settings.select")}</button
+  >
+  <input
+    type="file"
+    class="hidden"
+    bind:this={bannerInput}
+    on:change={(e) => handleFile(e, "banner")}
+  />
+
+  {#if tooLarge["banner"]}
+    <div class="text-red-600">Max file size 10MB</div>
+  {/if}
+</div>
+
+<div>
+  <label for="address" class="font-bold mb-1 block"
+    >{$t("user.settings.about")}</label
+  >
+  <textarea
+    type="text"
+    name="address"
+    bind:value={user.address}
+    placeholder={$t("user.settings.aboutPlaceholder")}
+  />
+</div>
diff --git a/src/routes/(app)/settings/[...tab]/_pos.svelte b/src/routes/(app)/settings/[...tab]/_pos.svelte
new file mode 100644
index 00000000..6a1c92a1
--- /dev/null
+++ b/src/routes/(app)/settings/[...tab]/_pos.svelte
@@ -0,0 +1,238 @@
+<script>
+  import { tick } from "svelte";
+  import Icon from "$comp/Icon.svelte";
+  import Numpad from "$comp/Numpad.svelte";
+  import LocaleSelector from "$comp/LocaleSelector.svelte";
+  import Toggle from "$comp/Toggle.svelte";
+  import { locale, t } from "$lib/translations";
+  import { success, fail } from "$lib/utils";
+  import { page } from "$app/stores";
+
+  export let user, rates, submit;
+
+  let { currency } = user;
+  let rate = rates[currency];
+
+  let fiats = Object.keys(rates).sort((a,b) => a.localeCompare(b));
+  $: user.language = $locale;
+  let keypress = (e) => e.key === "Enter" && (e.preventDefault() || el.click());
+
+  let editingReserve, editingThreshold, doneReserve, doneThreshold;
+  let doneEditing = () => {
+    editingReserve = false;
+    editingThreshold = false;
+  };
+
+  let editReserve = async () => {
+    editingReserve = true;
+    await tick();
+    reserveEl.focus();
+  };
+
+  let editThreshold = async () => {
+    editingThreshold = true;
+    await tick();
+    thresholdEl.focus();
+  };
+
+  if (!user.threshold) user.threshold = 1000000;
+  if (!user.reserve) user.reserve = 100000;
+  let reserveEl, thresholdEl;
+</script>
+
+<div>
+  <label for="language" class="font-bold block mb-1"
+    >{$t("user.settings.locale")}</label
+  >
+  <LocaleSelector style="select-styles block py-3 w-full" />
+</div>
+
+<div>
+  <label for="currency" class="font-bold block mb-1"
+    >{$t("user.settings.localCurrency")}</label
+  >
+  <select
+    name="currency"
+    class="select-styles block py-3 w-full"
+    value={user.currency}
+  >
+    {#each fiats as fiat}
+      <option value={fiat}>{fiat}</option>
+    {/each}
+  </select>
+</div>
+
+<div>
+  <label for="memoPrompt" class="font-bold mb-1 block"
+    >{$t("user.settings.memoPrompt")}</label
+  >
+  <textarea
+    name="memoPrompt"
+    placeholder={$t("user.settings.memoPromptPlaceholder")}
+    bind:value={user.memoPrompt}
+  />
+</div>
+
+<div>
+  <div class="flex justify-between items-center">
+    <span class="font-bold">{$t("user.settings.notifications")}</span>
+    <Toggle id="notify" bind:value={user.notify} />
+  </div>
+  <p class="text-secondary mt-1 w-9/12">
+    {$t("user.settings.notificationsDesc")}
+  </p>
+</div>
+
+<div>
+  <div class="flex justify-between items-center">
+    <span class="font-bold">{$t("user.settings.tipPrompt")}</span>
+    <Toggle id="prompt" bind:value={user.prompt} />
+  </div>
+  <p class="text-secondary mt-1 w-9/12">
+    {$t("user.settings.tipPromptDescription")}
+  </p>
+</div>
+
+<div>
+  <div class="flex justify-between items-center">
+    <span class="font-bold">{$t("user.settings.publishNip5")}</span>
+    <Toggle id="nip5" bind:value={user.nip5} />
+  </div>
+  <p class="text-secondary mt-1 w-9/12">
+    {$t("user.settings.nip5a")}
+    <span class="font-bold">{user.username}@{$page.url.host}</span>
+    {$t("user.settings.nip5b")}
+  </p>
+</div>
+
+<div>
+  <div class="flex justify-between items-center">
+    <span class="font-bold">{$t("user.settings.autoWithdraw")}</span>
+    <Toggle id="autowithdraw" bind:value={user.autowithdraw} />
+  </div>
+  <p class="text-secondary mt-1 w-9/12">
+    {$t("user.settings.autoWithdrawDescription")}
+  </p>
+</div>
+
+{#if user.autowithdraw}
+  <div class="mb-2">
+    <label for="display" class="font-bold mb-1 block"
+      >{$t("user.settings.destination")}</label
+    >
+    <textarea
+      name="destination"
+      placeholder={$t("user.settings.destinationPlaceholder")}
+      on:keypress={keypress}
+      class="w-full p-4 border rounded-xl h-48"
+      bind:value={user.destination}
+    />
+  </div>
+
+  <div>
+    <label for="display" class="font-bold mb-1 block"
+      >{$t("user.settings.threshold")}</label
+    >
+    <button type="button" class="flex w-full" on:click={editThreshold}>
+      <div class="p-4 border rounded-2xl rounded-r-none border-r-0 bg-primary">
+        ⚡️
+      </div>
+      <div
+        class="border-l-0 rounded-l-none pl-2 w-full p-4 border rounded-2xl text-left"
+      >
+        {user.threshold}
+      </div>
+      <input type="hidden" name="threshold" bind:value={user.threshold} />
+    </button>
+    <p class="text-secondary mt-1">
+      {$t("user.settings.thresholdDesc")}
+    </p>
+  </div>
+
+  <div>
+    <label for="display" class="font-bold mb-1 block"
+      >{$t("user.settings.reserve")}</label
+    >
+    <button type="button" class="flex w-full" on:click={editReserve}>
+      <div class="p-4 border rounded-2xl rounded-r-none border-r-0 bg-primary">
+        ⚡️
+      </div>
+      <div
+        class="border-l-0 rounded-l-none pl-2 w-full p-4 border rounded-2xl text-left"
+      >
+        {user.reserve}
+      </div>
+      <input type="hidden" name="reserve" bind:value={user.reserve} />
+    </button>
+    <p class="text-secondary mt-1">
+      {$t("user.settings.reserveDesc")}
+    </p>
+  </div>
+{/if}
+
+{#if editingThreshold}
+  <div
+    class="fixed inset-0 bg-gray-600 bg-opacity-50 overflow-y-auto h-full w-full z-50"
+  >
+    <div
+      class="relative top-40 mx-auto p-5 border shadow-lg rounded-md bg-white space-y-5 w-lg max-w-lg"
+    >
+      <h1 class="text-center text-2xl font-semibold">
+        {$t("user.settings.threshold")}
+      </h1>
+      <Numpad
+        bind:amount={user.threshold}
+        bind:currency
+        bind:rate
+        bind:submit={doneReserve}
+        bind:element={thresholdEl}
+      />
+
+      <button
+        bind:this={doneReserve}
+        type="button"
+        on:click={doneEditing}
+        class="p-4 bg-black text-white rounded-2xl text-lg font-semibold w-full"
+        >Ok</button
+      >
+    </div>
+  </div>
+{/if}
+
+{#if editingReserve}
+  <div
+    class="fixed inset-0 bg-gray-600 bg-opacity-50 overflow-y-auto h-full w-full z-50"
+  >
+    <div
+      class="relative top-40 mx-auto p-5 border shadow-lg rounded-md bg-white space-y-5 w-lg max-w-lg text-center"
+    >
+      <h1 class="text-2xl font-semibold">
+        {$t("user.settings.reserve")}
+      </h1>
+      <Numpad
+        bind:amount={user.reserve}
+        bind:currency
+        bind:rate
+        bind:submit={doneReserve}
+        bind:element={reserveEl}
+      />
+      <button
+        bind:this={doneReserve}
+        type="button"
+        on:click={doneEditing}
+        class="p-4 bg-black text-white rounded-2xl text-lg font-semibold w-full"
+        >Ok</button
+      >
+    </div>
+  </div>
+{/if}
+
+<a href="./shopify">
+  <button
+    type="button"
+    class="flex rounded-full border py-2 px-4 font-bold hover:opacity-80 w-full gap-2 my-5 justify-center"
+  >
+    <img src="/icons/shopify.svg" class="w-8" />
+    <div class="my-auto">{$t("user.settings.shopify")}</div>
+  </button>
+</a>
diff --git a/src/routes/(app)/settings/[...tab]/_security.svelte b/src/routes/(app)/settings/[...tab]/_security.svelte
new file mode 100644
index 00000000..6b44f830
--- /dev/null
+++ b/src/routes/(app)/settings/[...tab]/_security.svelte
@@ -0,0 +1,321 @@
+<script>
+  import { getMnemonic, getNsec } from "$lib/nostr";
+  import { tick } from "svelte";
+  import { t } from "$lib/translations";
+  import Pin from "$comp/Pin.svelte";
+  import Icon from "$comp/Icon.svelte";
+  import Qr from "$comp/Qr.svelte";
+  import { copy, post, success, fail } from "$lib/utils";
+  import { pin as current } from "$lib/store";
+  import { invalidate } from "$app/navigation";
+  import { page } from "$app/stores";
+
+  export let user, rates, submit;
+
+  let confirming2fa,
+    disabling2fa,
+    importing,
+    locked,
+    mnemonic,
+    newNsec,
+    nsec,
+    old,
+    otp,
+    password,
+    pin,
+    revealPassword,
+    revealSeed,
+    revealNsec,
+    token = "",
+    setting2fa,
+    settingPin,
+    verify;
+
+  let toggleImporting = () => {
+    revealNsec = false;
+    importing = !importing;
+  };
+
+  let toggleNsec = async () => {
+    try {
+      nsec = await getNsec(user);
+      revealNsec = !revealNsec;
+      importing = false;
+    } catch (e) {
+      console.log(e);
+    }
+  };
+
+  let togglePassword = () => (revealPassword = !revealPassword);
+  let toggleSeed = async () => {
+    try {
+      mnemonic = await getMnemonic(user);
+      revealSeed = !revealSeed;
+    } catch (e) {
+      console.log(e);
+    }
+  };
+
+  $: verifying = pin?.length > 5;
+  $: verify && checkPin(pin);
+  let checkPin = async () => {
+    old = $current;
+
+    try {
+      if (pin.length > 5 && pin === verify) {
+        user.haspin = true;
+        $current = pin;
+        pin = "";
+        verify = "";
+        submit.click();
+        settingPin = false;
+        verifying = false;
+      } else {
+        fail("Pin mismatch, try again");
+        pin = "";
+        verify = "";
+        verifying = false;
+        settingPin = true;
+      }
+    } catch (e) {
+      console.log(e);
+      fail("Problem setting PIN");
+    }
+  };
+
+  let reset = () => {
+    token = "";
+    return true;
+  };
+
+  let disablingPin = false;
+
+  let togglePin = async () => {
+    if (user.haspin) {
+      try {
+        disablingPin = true;
+        await tick();
+        submit.click();
+      } catch (e) {
+        console.log(e);
+        fail("Failed to disable pin");
+      }
+    } else {
+      settingPin = true;
+      disablingPin = false;
+    }
+  };
+
+  let startEnabling2fa = async () => {
+    reset();
+    try {
+      if (!otp) otp = await post("/otpsecret", { pin: $current });
+    } catch (e) {
+      console.log(e);
+    }
+
+    setting2fa = true;
+  };
+
+  let startDisabling2fa = () => (disabling2fa = true);
+  let startConfirming2fa = () => (confirming2fa = true);
+  let cancel = () => {
+    pin = null;
+    token = null;
+    verifying = false;
+    settingPin = false;
+    setting2fa = false;
+    confirming2fa = false;
+    disabling2fa = false;
+  };
+
+  $: enable2fa(token);
+  let enable2fa = async (twoFa) => {
+    try {
+      if (setting2fa && token.length === 6) {
+        await post("/enable2fa", { token });
+        success("2FA enabled");
+        user.twofa = 1;
+        cancel();
+      }
+    } catch (e) {
+      fail("Failed to enable 2FA, try again");
+    }
+  };
+
+  $: disable2fa(token);
+  let disable2fa = async () => {
+    try {
+      if (disabling2fa && token.length === 6) {
+        await post("/disable2fa", { token });
+        success("2FA disabled");
+        delete user.twofa;
+        disabling2fa = false;
+      }
+    } catch (e) {
+      console.log(e);
+      fail("Failed to disable 2FA, try again");
+    }
+  };
+</script>
+
+<input type="hidden" name="newpin" value={disablingPin ? "delete" : pin} />
+<input type="hidden" name="confirm" bind:value={password} />
+
+<div class="relative mb-5">
+  <label for="password" class="block font-bold block mb-1"
+    >{$t("user.settings.newPassword")}</label
+  >
+  {#if revealPassword}
+    <input name="password" type="text" bind:value={password} />
+  {:else}
+    <input name="password" type="password" bind:value={password} />
+  {/if}
+  <button
+    type="button"
+    on:click={togglePassword}
+    on:keydown={togglePassword}
+    class="absolute right-5 top-11"
+  >
+    <Icon icon={revealPassword ? "eye" : "eye-off"} />
+  </button>
+</div>
+
+<div>
+  <span class="font-bold mb-1"
+    >{verifying
+      ? $t("user.settings.verifyPIN")
+      : $t("user.settings.securityPIN")}</span
+  >
+  <p class="text-secondary mb-1">
+    {$t("user.settings.securityPINDescription")}
+  </p>
+  {#if verifying}
+    <Pin bind:value={verify} {cancel} notify={false} />
+  {:else if settingPin}
+    <Pin
+      bind:value={pin}
+      title={$t("user.settings.setPIN")}
+      {cancel}
+      notify={false}
+    />
+  {:else}
+    <button type="button" class="primary" on:click={togglePin}
+      ><Icon icon="lock" style="mr-1" />
+      {user.haspin
+        ? $t("user.settings.disablePIN")
+        : $t("user.settings.enablePIN")}</button
+    >
+  {/if}
+</div>
+
+<div>
+  <span class="font-bold mb-1">{$t("user.settings.twofa")}</span>
+  <p class="text-secondary mb-4">
+    {$t("user.settings.twofaDescription")}
+  </p>
+
+  {#if setting2fa}
+    <a href={otp.uri}>
+      <Qr src={otp.qr} />
+    </a>
+
+    <div class="text-center my-4">
+      {$t("user.settings.accountId")}<br />
+      <b>{otp.secret}</b>
+    </div>
+
+    <button type="button" class="primary" on:click={startConfirming2fa}>
+      <Icon icon="numpad" style="w-8 mr-1" />
+      <div class="my-auto">Confirm</div>
+    </button>
+  {:else if user.twofa}
+    <button type="button" class="primary" on:click={startDisabling2fa}>
+      <Icon icon="mobile" style="w-8 mr-1" />
+      <div class="my-auto">{$t("user.settings.twofaDisable")}</div>
+    </button>
+  {:else}
+    <button type="button" class="primary" on:click={startEnabling2fa}>
+      <Icon icon="mobile" style="w-8 mr-1" />
+      <div class="my-auto">{$t("user.settings.twofaSetup")}</div>
+    </button>
+  {/if}
+
+  {#if confirming2fa || disabling2fa}
+    <Pin
+      bind:value={token}
+      title="Enter 2FA Code"
+      {cancel}
+      persist={false}
+      notify={false}
+    />
+  {/if}
+</div>
+
+<!-- <div> -->
+<!--   <label for="seedphrase" class="font-bold" -->
+<!--     >{$t("user.settings.seedPhrase")}</label -->
+<!--   > -->
+<!--  -->
+<!--   <p class="text-secondary mb-1"> -->
+<!--     {$t("user.settings.seedDescription")} -->
+<!--   </p> -->
+<!--  -->
+<!--   <button type="button" class="primary" on:click={toggleSeed}> -->
+<!--     <Icon icon="warning" style="mr-1 w-6 my-auto" /> -->
+<!--     {revealSeed ? $t("user.settings.hideSeed") : $t("user.settings.revealSeed")} -->
+<!--   </button> -->
+<!--  -->
+<!--   {#if revealSeed} -->
+<!--     <div class="text-lg"> -->
+<!--       {mnemonic} -->
+<!--     </div> -->
+<!--  -->
+<!--     <button type="button" class="primary" on:click={() => copy(mnemonic)}> -->
+<!--       <Icon icon="copy" style="mr-1 w-6 my-auto" /> -->
+<!--       Copy -->
+<!--     </button> -->
+<!--   {/if} -->
+<!-- </div> -->
+
+<div>
+  <label for="seedphrase" class="font-bold"
+    >{$t("user.settings.nostrKeys")}</label
+  >
+
+  <p class="text-secondary mb-1">
+    {$t("user.settings.nostrDescription")}
+  </p>
+
+  <div class="flex">
+    <button type="button" class="primary" on:click={toggleNsec}>
+      {#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={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..." />
+  {/if}
+
+  {#if revealNsec}
+    <div class="text-lg break-all">
+      {nsec}
+    </div>
+
+    <button type="button" class="primary" on:click={() => copy(nsec)}>
+      <Icon icon="copy" style="mr-1 w-6 my-auto" />
+      Copy
+    </button>
+  {/if}
+</div>
diff --git a/src/routes/(app)/settings/[...tab]/_shopify.svelte b/src/routes/(app)/settings/[...tab]/_shopify.svelte
new file mode 100644
index 00000000..0266fa9c
--- /dev/null
+++ b/src/routes/(app)/settings/[...tab]/_shopify.svelte
@@ -0,0 +1,92 @@
+<script>
+  import { t } from "$lib/translations";
+  import Icon from "$comp/Icon.svelte";
+  import { page } from "$app/stores";
+
+  export let user;
+  $: paymentsUrl =
+    user.shopifyStore &&
+    "https://admin.shopify.com/store/" +
+      user.shopifyStore +
+      "/settings/payments";
+  $: checkoutUrl =
+    user.shopifyStore &&
+    "https://admin.shopify.com/store/" +
+      user.shopifyStore +
+      "/settings/checkout";
+  $: appsUrl =
+    user.shopifyStore &&
+    "https://admin.shopify.com/store/" +
+      user.shopifyStore +
+      "/settings/apps/development";
+
+  let script = `<script src="${$page.url.protocol}//${$page.url.host}/${user.username}/shopify.js"><\/script>`;
+</script>
+
+<div>
+  <label for="shopifyStore" class="font-bold mb-1 block">Store ID</label>
+  <div class="flex mb-2">
+    <div
+      class="text-gray-600 p-4 my-auto bg-gray-100 border rounded-l-2xl border-r-0 pr-1"
+    >
+      admin.shopify.com/store/
+    </div>
+    <input
+      type="text"
+      name="shopifyStore"
+      bind:value={user.shopifyStore}
+      class="border-l-0 rounded-l-none w-auto min-w-0 pl-1 grow"
+    />
+  </div>
+  <p class="text-secondary my-2">
+    Add Bitcoin under <a
+      class:active={!!paymentsUrl}
+      href={paymentsUrl || undefined}>Payments > Manual payment methods</a
+    > with a description like "Pay with Bitcoin".
+  </p>
+</div>
+
+<div>
+  <label for="display" class="font-bold mb-1 block">Additional scripts</label>
+  <p class="text-secondary my-2">
+    Copy this into <a class:active={!!paymentsUrl} href={checkoutUrl}
+      >Checkout -> Additional scripts</a
+    >
+  </p>
+  <textarea rows={5} type="text" name="shopifyScripts" readonly
+    >{script}</textarea
+  >
+</div>
+
+<div>
+  <label for="shopifyToken" class="font-bold mb-1 block"
+    >Admin API token <span class="font-normal">(Optional)</span></label
+  >
+  <p class="text-secondary my-2">
+    Coinos can automatically mark orders as Paid if you provide an API token.
+    <input
+      class="my-4"
+      type="text"
+      name="shopifyToken"
+      bind:value={user.shopifyToken}
+    />
+  </p>
+  <p class="text-secondary my-2">
+    Create a new app in <a class:active={!!appsUrl} href={appsUrl || undefined}
+      >Apps > App Development</a
+    >
+  </p>
+
+  <p class="text-secondary my-2">
+    Edit the Admin API scopes to enable <code class="text-black"
+      >write_orders</code
+    > permission then install the app into your store and copy the Admin API access
+    token here.
+  </p>
+</div>
+
+<style>
+  .active {
+    @apply text-blue-500;
+  }
+</style>
-- 
cgit v1.2.3


From 2114156be3f89a2ef4c5bd13fd6d7a51d8fbc135 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Thu, 12 Sep 2024 15:23:45 -0700
Subject: self custodial send

---
 .env.production                                    |   1 +
 bun.lockb                                          | Bin 158882 -> 161519 bytes
 package.json                                       |   3 +-
 src/components/Account.svelte                      |  17 ++-
 src/components/LandingHeader.svelte                |  16 +--
 src/components/Request.svelte                      |  39 ------
 src/lib/invoice.ts                                 |   7 +-
 src/lib/store.ts                                   |   1 +
 src/lib/utils.ts                                   |  41 ++++++-
 src/locales/en.json                                |   1 +
 src/routes/(app)/+error.svelte                     |  38 ++++++
 src/routes/(app)/+layout.svelte                    |   6 -
 src/routes/(app)/[username]/(profile)/+page.svelte |  42 ++++---
 src/routes/(app)/[username]/+layout.server.ts      |   1 -
 src/routes/(app)/account/setup/step2/+page.svelte  |  28 ++++-
 src/routes/(app)/invoice/+page.server.ts           |   4 +-
 src/routes/(app)/invoice/[id]/+layout.server.ts    |   7 +-
 src/routes/(app)/invoice/[id]/+page.svelte         |   4 +-
 src/routes/(app)/logout/+page.server.ts            |   1 +
 .../(app)/payments/[...page]/+page.server.ts       |   3 +-
 src/routes/(app)/qr/[text]/+page.svelte            |   4 -
 .../(app)/send/bitcoin/[address]/+page.server.ts   |   7 ++
 .../(app)/send/bitcoin/[address]/+page.svelte      |   4 +-
 .../[amount]/[...feeRate]/+page.server.ts          |  27 +++-
 .../[address]/[amount]/[...feeRate]/+page.svelte   | 136 ++++++++++++++++++++-
 src/routes/(app)/send/ecash/+page.svelte           |   6 -
 src/routes/(app)/sent/+page.server.ts              |   3 +-
 src/routes/(app)/settings/[...tab]/+page.svelte    |   2 +-
 src/routes/(static)/+layout.svelte                 |   2 +-
 src/routes/(static)/login/+page.svelte             |   2 +-
 src/routes/(static)/register/+page.svelte          |   2 +-
 src/routes/(static)/support/+page.svelte           |   9 +-
 src/routes/+error.svelte                           |   1 -
 33 files changed, 325 insertions(+), 140 deletions(-)
 delete mode 100644 src/components/Request.svelte
 create mode 100644 src/routes/(app)/+error.svelte
 create mode 100644 src/routes/(app)/send/bitcoin/[address]/+page.server.ts

(limited to 'src/routes/(app)/settings')

diff --git a/.env.production b/.env.production
index 1ae57c17..8b72abf4 100644
--- a/.env.production
+++ b/.env.production
@@ -6,3 +6,4 @@ PUBLIC_LIQUID_EXPLORER=https://liquid.network
 PUBLIC_DOMAIN=coinos.io
 PUBLIC_COINOS_PUBKEY=ba80990666ef0b6f4ba5059347beb13242921e54669e680064ca755256a1e3a6
 PUBLIC_COINOS_RELAY=wss://relay.coinos.io
+PUBLIC_COINOS_NETWORK=regtest
diff --git a/bun.lockb b/bun.lockb
index df7d1899..97e0841d 100755
Binary files a/bun.lockb and b/bun.lockb differ
diff --git a/package.json b/package.json
index 848db710..2ed4c699 100644
--- a/package.json
+++ b/package.json
@@ -7,8 +7,9 @@
     "@capacitor/cli": "^6.0.0",
     "@capacitor/core": "^6.0.0",
     "@capacitor/ios": "^6.1.2",
-    "@scure/base": "^1.1.1",
+    "@scure/base": "^1.1.8",
     "@scure/bip39": "^1.2.1",
+    "@scure/btc-signer": "^1.3.2",
     "@sveltejs/adapter-node": "^2.0.0",
     "@sveltejs/kit": "^2.5.22",
     "@sveltejs/vite-plugin-svelte": "^3.0.0",
diff --git a/src/components/Account.svelte b/src/components/Account.svelte
index eb1b0bac..f83068b5 100644
--- a/src/components/Account.svelte
+++ b/src/components/Account.svelte
@@ -1,4 +1,5 @@
 <script>
+  import { account as acc } from "$lib/store";
   import Icon from "$comp/Icon.svelte";
   import Balance from "$comp/Balance.svelte";
   import { t } from "$lib/translations";
@@ -6,19 +7,17 @@
   export let user, rate, account;
   let { seed, balance, id } = account;
   $: type = seed ? "Savings" : "Cash";
+
+  let setAccount = () => 
+    document.cookie = `account=${id}; path=/; max-age=86400`;
 </script>
 
-<a href={`/payments`} class="block">
+<a href={`/payments`} class="block" on:click={setAccount}>
   <div class="border rounded-xl shadow p-4 space-y-5">
-    <div class="flex justify-center lg:justify-start">
-      <Balance {balance} {user} {rate} />
-      <div class="ml-auto text-right">
-        <div>{type} account</div>
-      </div>
-    </div>
+    <Balance {balance} {user} {rate} />
 
     <div class="flex flex-wrap gap-3 justify-center w-full text-xl">
-      <a href={`/send`} class="contents grow">
+      <a href={`/send`} class="contents grow" on:click={setAccount}>
         <button
           type="button"
           class="rounded-2xl border py-5 px-6 font-bold hover:opacity-80 flex bg-primary grow"
@@ -30,7 +29,7 @@
         </button>
       </a>
 
-      <a href={`/invoice`} class="contents">
+      <a href={`/invoice?account=${id}`} class="contents" on:click={setAccount}>
         <button
           class="rounded-2xl border py-5 px-6 font-bold hover:opacity-80 flex bg-primary grow"
         >
diff --git a/src/components/LandingHeader.svelte b/src/components/LandingHeader.svelte
index 92de7bcd..72913999 100644
--- a/src/components/LandingHeader.svelte
+++ b/src/components/LandingHeader.svelte
@@ -19,22 +19,22 @@
 </script>
 
 <header
-  class="w-full md:w-5/6 py-5 mx-auto fixed md:sticky z-10 top-0 bg-white/90"
+  class="w-full lg:w-5/6 py-5 mx-auto fixed sticky z-10 top-0 bg-white/90"
   bind:this={header}
 >
-  <nav class="block md:flex justify-between items-center">
+  <nav class="block lg:flex justify-between items-center">
     <div
-      class="flex justify-start md:justify-center items-center md:space-x-10"
+      class="flex justify-start lg:justify-center items-center lg:space-x-10"
     >
       <a href="/" on:click={() => scroll(header)}>
-        <Icon icon="logo" style="hidden md:block mb-5 xl:mb-0" />
-        <Icon icon="logo" style="block md:hidden ml-5 w-48" />
+        <Icon icon="logo" style="hidden lg:block mb-5 xl:mb-0" />
+        <Icon icon="logo" style="block lg:hidden ml-5 w-48" />
       </a>
     </div>
 
     <!-- desktop nav -->
     <div
-      class="hidden space-x-10 md:flex justify-center items-center font-bold"
+      class="hidden space-x-10 lg:flex justify-center items-center font-bold"
     >
       {#if $page.url.pathname === "/"}
         <button class="hover:opacity-80" on:click={() => scroll(howItWorks)}
@@ -76,13 +76,13 @@
 
     <!-- mobile nav -->
     <button
-      class="block md:hidden absolute top-[34.5px] right-10 z"
+      class="block lg:hidden absolute top-[34.5px] right-10 z"
       on:click={() => (showMobileMenu = !showMobileMenu)}
       ><Icon icon={!showMobileMenu ? "menu" : "close"} />
     </button>
 
     <div
-      class="container w-full px-10 md:hidden absolute top-0 {showMobileMenu
+      class="container w-full px-10 lg:hidden absolute top-0 {showMobileMenu
         ? 'right-0'
         : 'right-[-100%]'} transition-all ease-in-out duration-300 h-[100vh] w-full bg-white"
     >
diff --git a/src/components/Request.svelte b/src/components/Request.svelte
deleted file mode 100644
index 297b7438..00000000
--- a/src/components/Request.svelte
+++ /dev/null
@@ -1,39 +0,0 @@
-<script>
-  import { t } from "$lib/translations";
-  import { fly } from "svelte/transition";
-
-  import Avatar from "$comp/Avatar.svelte";
-  import Icon from "$comp/Icon.svelte";
-
-  import { request, requestRedirect } from "$lib/store";
-  import { page } from "$app/stores";
-
-  export let user;
-
-  $requestRedirect = $page.url.pathname;
-</script>
-
-{#if $request}
-  <div class="fixed bottom-0 border-t w-full p-4 bg-white z-50" in:fly>
-    <div class="flex flex-wrap md:flex-nowrap max-w-xl mx-auto gap-2">
-      <div class="my-auto mx-auto">
-        <div class="flex">
-          <Avatar user={$request.requester} size={12} />
-          <h1 class="my-auto">
-            <b>{$request.requester.username}</b>
-            {$t("payments.readyToPay")}
-          </h1>
-        </div>
-      </div>
-      <div class="mx-auto my-auto flex gap-2">
-        <a href={`/receive/${$request.id}`}>
-          <button
-            class="rounded-full border py-2 px-4 font-bold hover:opacity-80 w-32"
-          >
-            {$t("payments.invoice")}
-          </button>
-        </a>
-      </div>
-    </div>
-  </div>
-{/if}
diff --git a/src/lib/invoice.ts b/src/lib/invoice.ts
index 3c885346..0ab0a9af 100644
--- a/src/lib/invoice.ts
+++ b/src/lib/invoice.ts
@@ -1,13 +1,14 @@
-import { auth, get, post } from "$lib/utils";
+import { auth, get, post, setAccount } from "$lib/utils";
 import { redirect } from "@sveltejs/kit";
 
-export default async ({ cookies, request }) => {
+export default async ({ cookies, request, url }) => {
   let form = await request.formData();
 
   let rates = await get("/rates");
   let amount = parseInt(form.get("amount"));
 
   let invoice = {
+    account,
     amount,
     items: JSON.parse(form.get("items")),
     memo: form.get("memo"),
@@ -16,7 +17,7 @@ export default async ({ cookies, request }) => {
     type: form.get("type"),
     prompt: form.get("prompt") === "true",
     rate: parseFloat(form.get("rate")) || rates[form.get("currency")],
-    id: undefined
+    id: undefined,
   };
 
   let user = { username: form.get("username"), currency: form.get("currency") };
diff --git a/src/lib/store.ts b/src/lib/store.ts
index 3c1ff321..42b41127 100644
--- a/src/lib/store.ts
+++ b/src/lib/store.ts
@@ -38,6 +38,7 @@ let persistLocal = (key, defaultValue: any = undefined) => {
   return s;
 };
 
+export let account = writable();
 export let amountPrompt = persistLocal("amountPrompt");
 export let avatar = writable();
 export let banner = writable();
diff --git a/src/lib/utils.ts b/src/lib/utils.ts
index 69e0f949..c20a7d29 100644
--- a/src/lib/utils.ts
+++ b/src/lib/utils.ts
@@ -1,7 +1,7 @@
 import { browser } from "$app/environment";
 import { toast } from "@zerodevx/svelte-toast";
 import { goto } from "$app/navigation";
-import { PUBLIC_COINOS_URL } from "$env/static/public";
+import { PUBLIC_COINOS_NETWORK, PUBLIC_COINOS_URL } from "$env/static/public";
 import { page } from "$app/stores";
 import { get as getStore } from "svelte/store";
 
@@ -41,7 +41,11 @@ export let get = (url: string, headers = {}) => {
     });
 };
 
-export let post = async (url: string, body: object, headers: HeadersInit | undefined = undefined) => {
+export let post = async (
+  url: string,
+  body: object,
+  headers: HeadersInit | undefined = undefined
+) => {
   headers = {
     "content-type": "application/json",
     accept: "application/json",
@@ -242,7 +246,11 @@ export let select = (el: HTMLInputElement): any =>
 export let sleep = (n: number): Promise<void> =>
   new Promise((r) => setTimeout(r, n));
 
-export let wait = async (f: () => boolean | Promise<boolean>, n: number = 100, s: number = 300): Promise<boolean> => {
+export let wait = async (
+  f: () => boolean | Promise<boolean>,
+  n: number = 100,
+  s: number = 300
+): Promise<boolean> => {
   let i = 0;
   while (!(await f()) && i < s) {
     await sleep(n);
@@ -327,3 +335,30 @@ export function setCookie(name: string, value: string, seconds: number): void {
   const expires = "expires=" + now.toUTCString();
   document.cookie = name + "=" + value + ";" + expires + ";path=/";
 }
+
+export let network = {
+  bitcoin: {
+    bech32: "bc",
+    pubKeyHash: 0x00,
+    scriptHash: 0x05,
+    wif: 0x80,
+  },
+  regtest: {
+    bech32: "bcrt",
+    pubKeyHash: 0x6f,
+    scriptHash: 0xc4,
+    wif: 0xef,
+  },
+}[PUBLIC_COINOS_NETWORK];
+
+export let versions = {
+  bitcoin: {
+    private: 0x0488ade4,
+    public: 0x0488b21e,
+  },
+  regtest: {
+    private: 0x04358394,
+    public: 0x043587cf,
+  },
+}[PUBLIC_COINOS_NETWORK];
+
diff --git a/src/locales/en.json b/src/locales/en.json
index b1bbe1c4..fd2807b4 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -299,6 +299,7 @@
 		}
 	},
 	"payments": {
+    "enterWalletPass": "Please enter your wallet password",
 		"legacyVersion": "Legacy version",
 		"newVersion": "New version",
 		"income": "Income",
diff --git a/src/routes/(app)/+error.svelte b/src/routes/(app)/+error.svelte
new file mode 100644
index 00000000..6ce7979c
--- /dev/null
+++ b/src/routes/(app)/+error.svelte
@@ -0,0 +1,38 @@
+<script>
+  import { back } from "$lib/utils";
+  import Icon from "$comp/Icon.svelte";
+  import { page } from "$app/stores";
+
+  export let data;
+  let { user } = data;
+
+  let link = user ? `/${user.username}` : "/";
+</script>
+
+<div class="container px-4 max-w-xl mx-auto mt-10 space-y-5">
+  <div class="w-full flex">
+    <a href="/" class="mx-auto">
+      <Icon icon="logo" />
+    </a>
+  </div>
+
+  <div class="flex justify-center items-center">
+    <div class="shadow-xl rounded-3xl px-10 pt-5 pb-10 space-y-5 w-full mx-5">
+      <div class="relative">
+        <h1 class="text-2xl md:text-3xl font-semibold text-center">Error</h1>
+      </div>
+      <p class="text-secondary text-center">Something went wrong</p>
+      <p class="text-secondary text-center">{$page.error.message}</p>
+
+      <div class="flex justify-center py-24">
+        <a href={link}>
+          <button
+            class="bg-black text-white border rounded-full px-8 py-4 font-bold hover:opacity-80 text-xl"
+          >
+            Back
+          </button>
+        </a>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/src/routes/(app)/+layout.svelte b/src/routes/(app)/+layout.svelte
index 0ff4816d..05ca0d0c 100644
--- a/src/routes/(app)/+layout.svelte
+++ b/src/routes/(app)/+layout.svelte
@@ -17,7 +17,6 @@
   import AppHeader from "$comp/AppHeader.svelte";
   import Invoice from "$comp/Invoice.svelte";
   import Password from "$comp/Password.svelte";
-  import Request from "$comp/Request.svelte";
   import { getCookie, warning, protectedRoutes } from "$lib/utils";
   import { t, locale, loading } from "$lib/translations";
   import { goto, onNavigate } from "$app/navigation";
@@ -36,7 +35,6 @@
   });
 
   let { generate, rate, user, subject, token, rates } = data;
-  console.log("SUB", subject)
 
   $: update(data);
   let update = (data) => {
@@ -127,10 +125,6 @@
   <Invoice {user} />
 {/if}
 
-{#if $request}
-  <Request {user} />
-{/if}
-
 <style>
   @keyframes fade-in {
     from {
diff --git a/src/routes/(app)/[username]/(profile)/+page.svelte b/src/routes/(app)/[username]/(profile)/+page.svelte
index 9e5babd2..98b77fc9 100644
--- a/src/routes/(app)/[username]/(profile)/+page.svelte
+++ b/src/routes/(app)/[username]/(profile)/+page.svelte
@@ -40,30 +40,32 @@
       <Account {user} {rate} {account} />
     {/each}
 
-    <button
-      class="rounded-2xl border py-5 px-6 font-bold hover:opacity-80 flex bg-black text-white"
-    >
-      <a href={`/account/setup`}>
-        <div class="mx-auto flex gap-2">
-          <Icon icon="plus" style="w-8 mx-auto invert" />
-          <div class="my-auto text-xl whitespace-nowrap">Add account</div>
-        </div>
-      </a>
-    </button>
-
-    {#if $installPrompt}
+    <div class="flex justify-center gap-2">
       <button
-        class="rounded-2xl border py-5 px-6 font-bold hover:opacity-80 flex bg-black text-white grow basis-full fixed bottom-16 xl:hidden"
-        on:click={install}
+        class="rounded-2xl border py-5 px-6 font-bold hover:opacity-80 flex bg-black text-white w-full justify-center"
       >
-        <div class="mx-auto flex gap-2">
-          <Icon icon="save" style="w-8 mx-auto invert" />
-          <div class="my-auto text-xl whitespace-nowrap">
-            {$t("user.install")}
+        <a href={`/account/setup`}>
+          <div class="mx-auto flex gap-2">
+            <Icon icon="plus" style="w-8 mx-auto invert" />
+            <div class="my-auto text-xl whitespace-nowrap">Add account</div>
           </div>
-        </div>
+        </a>
       </button>
-    {/if}
+
+      {#if $installPrompt}
+        <button
+          class="rounded-2xl border py-5 px-6 font-bold hover:opacity-80 flex bg-black text-white xl:hidden w-full justify-center"
+          on:click={install}
+        >
+          <div class="mx-auto flex gap-2">
+            <Icon icon="save" style="w-8 mx-auto invert" />
+            <div class="my-auto text-xl whitespace-nowrap">
+              {$t("user.install")}
+            </div>
+          </div>
+        </button>
+      {/if}
+    </div>
   {/if}
 
   <Items {items} {subject} {user} {total} {currency} {rate} />
diff --git a/src/routes/(app)/[username]/+layout.server.ts b/src/routes/(app)/[username]/+layout.server.ts
index c340544d..9a520036 100644
--- a/src/routes/(app)/[username]/+layout.server.ts
+++ b/src/routes/(app)/[username]/+layout.server.ts
@@ -13,7 +13,6 @@ export let load = async ({
     let subject = await get(`/users/${username}`);
     let { user } = await parent();
     if (!user) user = subject;
-    console.log("SUBJECT", subject)
 
     let expires = new Date();
     expires.setSeconds(expires.getSeconds() + 380 * 24 * 60 * 60);
diff --git a/src/routes/(app)/account/setup/step2/+page.svelte b/src/routes/(app)/account/setup/step2/+page.svelte
index 8169ce06..221e545e 100644
--- a/src/routes/(app)/account/setup/step2/+page.svelte
+++ b/src/routes/(app)/account/setup/step2/+page.svelte
@@ -1,28 +1,44 @@
 <script lang="ts">
-  import { focus } from "$lib/utils";
   import { t } from "$lib/translations";
   import { mnemonic } from "$lib/store";
   import Icon from "$comp/Icon.svelte";
-  import { encrypt, decrypt } from "nostr-tools/nip49";
-  import { mnemonicToEntropy, entropyToMnemonic } from "@scure/bip39";
+  import { encrypt } from "nostr-tools/nip49";
+  import {
+    mnemonicToSeed,
+    mnemonicToEntropy,
+    entropyToMnemonic,
+  } from "@scure/bip39";
   import { wordlist } from "@scure/bip39/wordlists/english";
-  import { fail, post } from "$lib/utils";
+  import { focus, versions, fail, post } from "$lib/utils";
   import { goto } from "$app/navigation";
+  import { HDKey } from "@scure/bip32";
 
   export let data;
+
   let { user } = data;
 
   let password;
 
   let submit = async () => {
     let seed = await encrypt(mnemonicToEntropy($mnemonic, wordlist), password);
+    let master = HDKey.fromMasterSeed(
+      await mnemonicToSeed($mnemonic),
+      versions
+    );
+    let child = master.derive("m/84'/0'/0'");
+    let pubkey = child.publicExtendedKey;
+    let fingerprint = child.fingerprint.toString(16).padStart(8, "0");
+
+    let receiving = child.deriveChild(0);
     try {
-      await post("/api/accounts", { seed });
+      await post("/api/accounts", { fingerprint, pubkey, seed });
       goto(`/${user.username}`);
     } catch (e) {
       console.log(e);
       fail("Something went wrong");
     }
+
+    $mnemonic = "";
   };
 </script>
 
@@ -41,7 +57,7 @@
       than your login password. We can't reset it if you lose it.
     </p>
 
-      <input use:focus type="text" placeholder="Password" bind:value={password} />
+    <input use:focus type="text" placeholder="Password" bind:value={password} />
 
     <button
       class="bg-black text-white w-full px-5 py-6 text-xl rounded-2xl font-bold"
diff --git a/src/routes/(app)/invoice/+page.server.ts b/src/routes/(app)/invoice/+page.server.ts
index 83127457..05851430 100644
--- a/src/routes/(app)/invoice/+page.server.ts
+++ b/src/routes/(app)/invoice/+page.server.ts
@@ -2,8 +2,8 @@ import { auth, post } from "$lib/utils";
 import { error, redirect } from "@sveltejs/kit";
 import type { Invoice } from "$lib/types";
 
-export let load = async ({ cookies, params, parent }) => {
-  let { account } = params;
+export let load = async ({ cookies, parent }) => {
+  let account = cookies.get("account");
   let { subject, user, rates } = await parent();
 
   let invoice: Invoice = {
diff --git a/src/routes/(app)/invoice/[id]/+layout.server.ts b/src/routes/(app)/invoice/[id]/+layout.server.ts
index e7144b15..71f53e09 100644
--- a/src/routes/(app)/invoice/[id]/+layout.server.ts
+++ b/src/routes/(app)/invoice/[id]/+layout.server.ts
@@ -1,4 +1,4 @@
-import Qr from "qrcode-base64";
+import * as Qr from "qrcode-base64";
 import { get } from "$lib/utils";
 import { redirect } from "@sveltejs/kit";
 
@@ -26,11 +26,10 @@ export async function load({ depends, params, url, parent }) {
     (!amount && (pending || received)) ||
     (amount > 0 && (pending >= amount || received >= amount));
   if (paid && !url.pathname.endsWith("paid")) {
-    redirect( 307, `/invoice/${id}/paid` + (options ? "?options=true" : "")
-    );
+    redirect(307, `/invoice/${id}/paid` + (options ? "?options=true" : ""));
   }
 
-  let src = Qr.drawImg(invoice.text || "", { size: 340 });
+  let src = Qr.drawImg(invoice.text || "", { size: 500 });
 
   return { id, invoice, subject, src };
 }
diff --git a/src/routes/(app)/invoice/[id]/+page.svelte b/src/routes/(app)/invoice/[id]/+page.svelte
index c4810889..36f5d261 100644
--- a/src/routes/(app)/invoice/[id]/+page.svelte
+++ b/src/routes/(app)/invoice/[id]/+page.svelte
@@ -136,14 +136,14 @@
       >
         <img
           {src}
-          class="mx-auto z-10 shadow-inner rounded-2xl"
+          class="mx-auto z-10 rounded-2xl w-[260px] rounded-2xl"
           bind:this={qr}
           alt={txt}
         />
       </a>
     </div>
   {:else}
-    <div class="break-all pb-5 text-lg text-center">
+    <div class="break-all pb-5 text-center text-secondary">
       {txt}
     </div>
   {/if}
diff --git a/src/routes/(app)/logout/+page.server.ts b/src/routes/(app)/logout/+page.server.ts
index ab5df7b9..9c2a029c 100644
--- a/src/routes/(app)/logout/+page.server.ts
+++ b/src/routes/(app)/logout/+page.server.ts
@@ -7,6 +7,7 @@ const opts = {
 
 export async function load({ cookies }) {
   let lang = cookies.get("lang");
+  cookies.set("account", "", opts);
   cookies.set("lang", "", opts);
   cookies.set("username", "", opts);
   cookies.set("token", "", opts);
diff --git a/src/routes/(app)/payments/[...page]/+page.server.ts b/src/routes/(app)/payments/[...page]/+page.server.ts
index c2cd5683..e781022e 100644
--- a/src/routes/(app)/payments/[...page]/+page.server.ts
+++ b/src/routes/(app)/payments/[...page]/+page.server.ts
@@ -5,6 +5,7 @@ let limit = 25;
 export async function load({ cookies, depends, params }) {
   depends("app:payments");
 
+  let account = cookies.get("account");
   let parts = params.page.split("/");
 
   let start, end, page;
@@ -16,7 +17,7 @@ export async function load({ cookies, depends, params }) {
   let offset = (page - 1) * limit;
   if (!start) start = Date.now() / 1000 - 24 * 60 * 60;
 
-  let url = `/payments?account=${params.account}&start=${
+  let url = `/payments?account=${account}&start=${
     start * 1000
   }&limit=${limit}&offset=${offset}`;
   if (end) url += `&end=${end * 1000}`;
diff --git a/src/routes/(app)/qr/[text]/+page.svelte b/src/routes/(app)/qr/[text]/+page.svelte
index c9562582..8b6d48ab 100644
--- a/src/routes/(app)/qr/[text]/+page.svelte
+++ b/src/routes/(app)/qr/[text]/+page.svelte
@@ -6,10 +6,6 @@
   let { src, text } = data;
 </script>
 
-<button class="ml-5 md:ml-20 mt-5 md:mt-10 hover:opacity-80" on:click={back}>
-  <Icon icon="arrow-left" style="w-10" />
-</button>
-
 <div class="container px-4 max-w-4xl mx-auto space-y-5">
   <div class="flex justify-center items-center">
     <div
diff --git a/src/routes/(app)/send/bitcoin/[address]/+page.server.ts b/src/routes/(app)/send/bitcoin/[address]/+page.server.ts
new file mode 100644
index 00000000..3e56e15a
--- /dev/null
+++ b/src/routes/(app)/send/bitcoin/[address]/+page.server.ts
@@ -0,0 +1,7 @@
+import { auth, get } from "$lib/utils";
+
+export async function load({ cookies }) {
+  let account = cookies.get("account");
+  let { balance } = await get(`/account/${account}`, auth(cookies));
+  return { balance };
+}
diff --git a/src/routes/(app)/send/bitcoin/[address]/+page.svelte b/src/routes/(app)/send/bitcoin/[address]/+page.svelte
index 838c5c04..b656dc06 100644
--- a/src/routes/(app)/send/bitcoin/[address]/+page.svelte
+++ b/src/routes/(app)/send/bitcoin/[address]/+page.svelte
@@ -8,9 +8,9 @@
 
   export let data;
 
-  let { rates, user } = data;
+  let { balance, rates, user } = data;
   let { address } = $page.params;
-  let { balance, currency, username } = user;
+  let { currency, username } = user;
 
   let amount = 0;
   let submit, fiat;
diff --git a/src/routes/(app)/send/bitcoin/[address]/[amount]/[...feeRate]/+page.server.ts b/src/routes/(app)/send/bitcoin/[address]/[amount]/[...feeRate]/+page.server.ts
index 7efe6e49..33e96595 100644
--- a/src/routes/(app)/send/bitcoin/[address]/[amount]/[...feeRate]/+page.server.ts
+++ b/src/routes/(app)/send/bitcoin/[address]/[amount]/[...feeRate]/+page.server.ts
@@ -1,17 +1,31 @@
 import { fail, redirect } from "@sveltejs/kit";
-import { auth, post, fd } from "$lib/utils";
+import { auth, get, post, fd } from "$lib/utils";
 
 export async function load({ params: { address, amount, feeRate }, cookies }) {
+  let account = cookies.get("account");
+
   try {
-    let { fee, fees, ourfee, hex } = await post(
+    let { fee, fees, inputs, ourfee, hex } = await post(
       "/bitcoin/fee",
-      { address, amount, feeRate },
+      { address, amount, feeRate, account },
       auth(cookies)
     );
 
-    return { amount, address, fee, fees, feeRate, ourfee, hex };
+    account = await get(`/account/${account}`, auth(cookies));
+
+    return {
+      account,
+      amount,
+      address,
+      fee,
+      fees,
+      feeRate,
+      ourfee,
+      hex,
+      inputs,
+    };
   } catch (e: any) {
-    return { amount, address, feeRate, message: e.message };
+    return { account, amount, address, feeRate, message: e.message };
   }
 }
 
@@ -22,7 +36,8 @@ export const actions = {
     request,
   }) => {
     try {
-      await post("/bitcoin/send", await fd(request), auth(cookies));
+      let body = await fd(request);
+      await post("/bitcoin/send", body, auth(cookies));
     } catch (e: any) {
       console.log("problem sending bitcoin", e);
       return fail(400, { address, amount, feeRate, message: e.message });
diff --git a/src/routes/(app)/send/bitcoin/[address]/[amount]/[...feeRate]/+page.svelte b/src/routes/(app)/send/bitcoin/[address]/[amount]/[...feeRate]/+page.svelte
index 84506e6b..1267a992 100644
--- a/src/routes/(app)/send/bitcoin/[address]/[amount]/[...feeRate]/+page.svelte
+++ b/src/routes/(app)/send/bitcoin/[address]/[amount]/[...feeRate]/+page.svelte
@@ -1,20 +1,84 @@
 <script>
+  import { tick } from "svelte";
   import { t } from "$lib/translations";
   import { enhance } from "$app/forms";
   import Toggle from "$comp/Toggle.svelte";
   import Icon from "$comp/Icon.svelte";
   import Spinner from "$comp/Spinner.svelte";
   import { page } from "$app/stores";
-  import { fiat as toFiat, f, focus, s, sat, closest } from "$lib/utils";
+  import { fiat as toFiat, f, focus, s, sat, closest, network } from "$lib/utils";
   import { pin } from "$lib/store";
   import { goto, invalidate } from "$app/navigation";
   import { rate } from "$lib/store";
+  import { applyAction } from "$app/forms";
+  import { hex as hexUtil } from "@scure/base";
+  import * as btc from "@scure/btc-signer";
+  import { decrypt } from "nostr-tools/nip49";
+  import { HDKey } from "@scure/bip32";
+  import { entropyToMnemonic, mnemonicToSeed } from "@scure/bip39";
+  import { wordlist } from "@scure/bip39/wordlists/english";
 
   export let data;
   export let form;
 
-  let { amount, address, message, fee, fees, feeRate, ourfee, rates, hex } =
-    data;
+  let { encode, decode } = hexUtil;
+  let revealPassword = false;
+  let passwordPrompt;
+  let password;
+  let cancel = () => (passwordPrompt = false);
+  let signed;
+
+  let togglePassword = () => (passwordPrompt = !passwordPrompt);
+  let handler = ({ cancel }) => {
+    if (account.seed && !signed) cancel(), togglePassword();
+    return async ({ result }) => {
+      if (result.type === "redirect") {
+        goto(result.location);
+      } else {
+        await applyAction(result);
+      }
+    };
+  };
+
+  let signTx = async () => {
+    let entropy = await decrypt(account.seed, password);
+    let mnemonic = entropyToMnemonic(entropy, wordlist);
+    let seed = await mnemonicToSeed(mnemonic);
+    let master = HDKey.fromMasterSeed(seed, network);
+    let child = master.derive("m/84'/0'/0'");
+
+    let tx = btc.Transaction.fromRaw(decode(hex));
+
+    for (let [i, input] of tx.inputs.entries()) {
+      let { nonWitnessUtxo, path } = inputs[i];
+      tx.updateInput(i, { nonWitnessUtxo });
+      let key = child.derive(path);
+      let { privateKey, publicKey } = key;
+      let address = btc.getAddress("wpkh", privateKey, network);
+      tx.signIdx(privateKey, i);
+    }
+    tx.finalize();
+    hex = tx.hex;
+    signed = true;
+    await tick();
+    submit.click();
+  };
+
+  let toggle = () => (submitting = !submitting);
+
+  let {
+    account,
+    amount,
+    address,
+    message,
+    fee,
+    fees,
+    feeRate,
+    ourfee,
+    rates,
+    hex,
+    inputs,
+  } = data;
 
   $: reload(data);
   let reload = () => {
@@ -115,10 +179,12 @@
       </div>
     {/if}
 
-    <form method="POST" use:enhance on:submit={() => (submitting = true)}>
+    <form method="POST" use:enhance={handler}>
       <input name="pin" value={$pin} type="hidden" />
       <input name="hex" value={hex} type="hidden" />
       <input name="rate" value={$rate} type="hidden" />
+      <input name="account" value={account.id} type="hidden" />
+      <input name="signed" value={signed} type="hidden" />
 
       <div class="flex justify-center gap-2">
         <button
@@ -139,6 +205,68 @@
   {/if}
 </div>
 
+{#if passwordPrompt}
+  <div
+    class="fixed inset-0 bg-gray-600 bg-opacity-50 overflow-y-auto h-full w-full z-20"
+  >
+    <div
+      class="relative top-1/3 mx-auto p-5 border w-96 shadow-lg rounded-md bg-white space-y-5"
+    >
+      <h1 class="text-center text-2xl font-semibold">
+        {$t("payments.enterWalletPass")}
+      </h1>
+      <form on:submit|preventDefault={signTx}>
+        <div class="relative mb-5">
+          {#if revealPassword}
+            <input
+              name="password"
+              type="text"
+              required
+              class="bg-primary"
+              bind:value={password}
+              autocapitalize="none"
+              use:focus
+            />
+          {:else}
+            <input
+              name="password"
+              type="password"
+              required
+              class="bg-primary"
+              bind:value={password}
+              autocapitalize="none"
+              use:focus
+            />
+          {/if}
+          <button
+            type="button"
+            on:click={() => (revealPassword = !revealPassword)}
+            class="absolute right-5 top-6"
+          >
+            <Icon icon={revealPassword ? "eye" : "eye-off"} />
+          </button>
+        </div>
+        <div class="w-full flex">
+          <button
+            type="button"
+            class="border-2 border-black rounded-xl font-semibold mx-auto py-3 w-40 hover:opacity-80 mx-auto"
+            on:click={cancel}
+            on:keydown={cancel}
+          >
+            <div class="my-auto">Cancel</div>
+          </button>
+          <button
+            type="submit"
+            class="border-2 border-black rounded-xl font-semibold mx-auto py-3 w-40 hover:opacity-80 mx-auto"
+          >
+            <div class="my-auto">Submit</div>
+          </button>
+        </div>
+      </form>
+    </div>
+  </div>
+{/if}
+
 <style>
   .no-transition {
     view-transition-name: fee;
diff --git a/src/routes/(app)/send/ecash/+page.svelte b/src/routes/(app)/send/ecash/+page.svelte
index 15c7c5d3..615c068a 100644
--- a/src/routes/(app)/send/ecash/+page.svelte
+++ b/src/routes/(app)/send/ecash/+page.svelte
@@ -29,12 +29,6 @@
   let toggle = () => (submitting = !submitting);
 </script>
 
-<a href="/send">
-  <button type="button" class="ml-5 md:ml-20 mt-5 md:mt-10 hover:opacity-80">
-    <Icon icon="arrow-left" style="w-10" />
-  </button>
-</a>
-
 <div class="container px-4 max-w-xl mx-auto space-y-5 text-center">
   <h1 class="text-3xl md:text-4xl font-semibold mb-2">
     {$t("payments.createEcash")}
diff --git a/src/routes/(app)/sent/+page.server.ts b/src/routes/(app)/sent/+page.server.ts
index 62a4d9b4..4cf580ee 100644
--- a/src/routes/(app)/sent/+page.server.ts
+++ b/src/routes/(app)/sent/+page.server.ts
@@ -1,6 +1,7 @@
 import { get, auth } from "$lib/utils";
 
 export let load = async ({ cookies }) => {
-  let { payments } = await get("/payments", auth(cookies));
+  let account = cookies.get("account");
+  let { payments } = await get(`/payments?account=${account}`, auth(cookies));
   return { payments };
 };
diff --git a/src/routes/(app)/settings/[...tab]/+page.svelte b/src/routes/(app)/settings/[...tab]/+page.svelte
index c495a5cc..7f4dc87e 100644
--- a/src/routes/(app)/settings/[...tab]/+page.svelte
+++ b/src/routes/(app)/settings/[...tab]/+page.svelte
@@ -206,7 +206,7 @@
   <input type="hidden" name="pin" value={$pin} />
   <input type="hidden" name="tab" value={tab} />
 
-  <div class="mt-24 mb-20 px-3 md:px-0 w-full md:w-[400px] mx-auto space-y-8">
+  <div class="mt-24 mb-20 px-3 md:px-0 w-full md:max-w-lg mx-auto space-y-8">
     <div class="header">
       <h1 class="text-center text-3xl md:text-4xl font-semibold mb-10">
         {$t("user.settings.header")}
diff --git a/src/routes/(static)/+layout.svelte b/src/routes/(static)/+layout.svelte
index 4b350bd0..8b14fd38 100644
--- a/src/routes/(static)/+layout.svelte
+++ b/src/routes/(static)/+layout.svelte
@@ -9,7 +9,7 @@
 
 <SvelteToast options={{ reversed: true, intro: { y: 192 } }} />
 <LandingHeader {user} />
-<main class="container flex px-4 md:px-40 mx-auto min-h-[600px] py-28">
+<main class="container flex px-4 md:px-40 mx-auto min-h-[600px]">
   <slot />
 </main>
 <Footer />
diff --git a/src/routes/(static)/login/+page.svelte b/src/routes/(static)/login/+page.svelte
index 84e1ea89..df7db5e6 100644
--- a/src/routes/(static)/login/+page.svelte
+++ b/src/routes/(static)/login/+page.svelte
@@ -76,7 +76,7 @@
   <Pin bind:value={token} title="Enter 2FA Code" {cancel} notify={false} />
 {/if}
 
-<div class="mx-auto md:shadow-xl rounded-3xl max-w-xl w-full md:w-[480px] md:p-8">
+<div class="mx-auto md:shadow-xl rounded-3xl max-w-xl w-full md:w-[480px] md:p-8 mb-20">
   <h1 class="text-2xl font-bold text-center">{$t("login.signIn")}</h1>
 
   {#if form?.error}
diff --git a/src/routes/(static)/register/+page.svelte b/src/routes/(static)/register/+page.svelte
index b6a4c44e..3491bd5d 100644
--- a/src/routes/(static)/register/+page.svelte
+++ b/src/routes/(static)/register/+page.svelte
@@ -155,7 +155,7 @@
 {/if}
 
 <div
-  class="mx-auto md:shadow-xl rounded-3xl max-w-xl w-full md:w-[480px] md:p-8 space-y-5"
+  class="mx-auto md:shadow-xl rounded-3xl max-w-xl w-full md:w-[480px] md:p-8 space-y-5 mb-20"
 >
   <h1 class="text-2xl font-bold text-center">{$t("login.createAccount")}</h1>
   <input
diff --git a/src/routes/(static)/support/+page.svelte b/src/routes/(static)/support/+page.svelte
index 20e41280..6b32124e 100644
--- a/src/routes/(static)/support/+page.svelte
+++ b/src/routes/(static)/support/+page.svelte
@@ -53,11 +53,9 @@
   ></script></svelte:head
 >
 
-<div
-  class="container max-w-lg mx-auto mt-20 space-y-8 shadow-xl rounded-3xl p-10"
->
+<div class="container max-w-lg mx-auto space-y-8 p-4 pb-20">
   {#if sent}
-    <h1 class="text-center text-3xl md:text-4xl font-semibold">Thank you!</h1>
+    <h1 class="text-center text-3xl lg:text-4xl font-semibold">Thank you!</h1>
     <div class="text-center text-lg text-secondary">
       Someone will be in touch shortly.
     </div>
@@ -88,7 +86,6 @@
           >{$t("user.support.accountName")}</label
         >
         <input
-          class="bg-primary"
           type="text"
           name="account"
           required
@@ -101,7 +98,6 @@
           >{$t("user.support.email")}</label
         >
         <input
-          class="bg-primary"
           type="email"
           name="email"
           bind:value={email}
@@ -115,7 +111,6 @@
         >
         <textarea
           rows={5}
-          class="bg-primary"
           type="text"
           name="message"
           bind:value={message}
diff --git a/src/routes/+error.svelte b/src/routes/+error.svelte
index 6ce7979c..faa7d738 100644
--- a/src/routes/+error.svelte
+++ b/src/routes/+error.svelte
@@ -1,5 +1,4 @@
 <script>
-  import { back } from "$lib/utils";
   import Icon from "$comp/Icon.svelte";
   import { page } from "$app/stores";
 
-- 
cgit v1.2.3


From 11b981a1a58d96460d599726fe90565caa06b706 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Fri, 13 Sep 2024 12:18:28 -0700
Subject: remove transitions

---
 src/lib/parse.ts                                   |  7 ----
 src/routes/(app)/+layout.svelte                    | 47 ---------------------
 src/routes/(app)/[username]/+layout.svelte         | 48 ----------------------
 src/routes/(app)/invoice/[id]/+layout.server.ts    |  1 +
 src/routes/(app)/invoice/[id]/paid/+page.svelte    |  2 +-
 .../(app)/send/bitcoin/[address]/+page.svelte      |  6 ---
 .../[address]/[amount]/[...feeRate]/+page.svelte   | 10 +----
 src/routes/(app)/send/invoice/[id]/+page.server.ts |  2 +-
 src/routes/(app)/send/invoice/[id]/+page.svelte    |  4 --
 src/routes/(app)/settings/[...tab]/+page.svelte    |  6 ---
 10 files changed, 4 insertions(+), 129 deletions(-)

(limited to 'src/routes/(app)/settings')

diff --git a/src/lib/parse.ts b/src/lib/parse.ts
index 6995f207..5bf5ffb0 100644
--- a/src/lib/parse.ts
+++ b/src/lib/parse.ts
@@ -45,16 +45,9 @@ export default async (t, host) => {
 
   // bitcoin
   if (validate(t) || isLiquid(t)) {
-    try {
-      ({ id, user } = await get(`/invoice/${t}`));
-    } catch (e) {
       let r = `/send/bitcoin/${t}`;
       if (amount) r += "/" + amount;
       redirect(307, r);
-    }
-
-    if (user) redirect(307, `/pay/${user.username}`);
-    else if (id) redirect(307, `/send/${id}`);
   }
 
   if (t.startsWith("cashu")) {
diff --git a/src/routes/(app)/+layout.svelte b/src/routes/(app)/+layout.svelte
index 05ca0d0c..db14b046 100644
--- a/src/routes/(app)/+layout.svelte
+++ b/src/routes/(app)/+layout.svelte
@@ -23,17 +23,6 @@
 
   export let data;
 
-  onNavigate((navigation) => {
-    if (!document.startViewTransition) return;
-
-    return new Promise((resolve) => {
-      document.startViewTransition(async () => {
-        resolve();
-        await navigation.complete;
-      });
-    });
-  });
-
   let { generate, rate, user, subject, token, rates } = data;
 
   $: update(data);
@@ -124,39 +113,3 @@
 {#if $invoice}
   <Invoice {user} />
 {/if}
-
-<style>
-  @keyframes fade-in {
-    from {
-      opacity: 0;
-    }
-  }
-
-  @keyframes fade-out {
-    to {
-      opacity: 0;
-    }
-  }
-
-  @keyframes slide-from-right {
-    from {
-      transform: translateX(60px);
-    }
-  }
-
-  @keyframes slide-to-left {
-    to {
-      transform: translateX(-60px);
-    }
-  }
-
-  :root::view-transition-old(root) {
-    animation: 280ms cubic-bezier(0.4, 0, 1, 1) both fade-out,
-      180ms cubic-bezier(0.4, 0, 0.2, 1) both slide-to-left;
-  }
-
-  :root::view-transition-new(root) {
-    animation: 280ms cubic-bezier(0, 0, 0.2, 1) 80ms both fade-in,
-      180ms cubic-bezier(0.4, 0, 0.2, 1) both slide-from-right;
-  }
-</style>
diff --git a/src/routes/(app)/[username]/+layout.svelte b/src/routes/(app)/[username]/+layout.svelte
index 98569f59..ce152831 100644
--- a/src/routes/(app)/[username]/+layout.svelte
+++ b/src/routes/(app)/[username]/+layout.svelte
@@ -1,17 +1,5 @@
 <script>
-  import { onNavigate } from "$app/navigation";
   export let data;
-
-  onNavigate((navigation) => {
-    if (!document.startViewTransition) return;
-
-    return new Promise((resolve) => {
-      document.startViewTransition(async () => {
-        resolve();
-        await navigation.complete;
-      });
-    });
-  });
 </script>
 
 <div class="content">
@@ -19,39 +7,3 @@
 </div>
 
 <slot name="fixed" />
-
-<style>
-  @keyframes fade-in {
-    from {
-      opacity: 0;
-    }
-  }
-
-  @keyframes fade-out {
-    to {
-      opacity: 0;
-    }
-  }
-
-  @keyframes slide-from-right {
-    from {
-      transform: translateX(60px);
-    }
-  }
-
-  @keyframes slide-to-left {
-    to {
-      transform: translateX(-60px);
-    }
-  }
-
-  :root::view-transition-old(root) {
-    animation: 280ms cubic-bezier(0.4, 0, 1, 1) both fade-out,
-      180ms cubic-bezier(0.4, 0, 0.2, 1) both slide-to-left;
-  }
-
-  :root::view-transition-new(root) {
-    animation: 280ms cubic-bezier(0, 0, 0.2, 1) 80ms both fade-in,
-      180ms cubic-bezier(0.4, 0, 0.2, 1) both slide-from-right;
-  }
-</style>
diff --git a/src/routes/(app)/invoice/[id]/+layout.server.ts b/src/routes/(app)/invoice/[id]/+layout.server.ts
index 71f53e09..a00515a0 100644
--- a/src/routes/(app)/invoice/[id]/+layout.server.ts
+++ b/src/routes/(app)/invoice/[id]/+layout.server.ts
@@ -16,6 +16,7 @@ export async function load({ depends, params, url, parent }) {
     !(url.pathname.includes("tip") || url.pathname.includes("memo")) &&
     !options
   ) {
+    console.log("YO")
     redirect(307, `/send/invoice/${id}`);
   }
 
diff --git a/src/routes/(app)/invoice/[id]/paid/+page.svelte b/src/routes/(app)/invoice/[id]/paid/+page.svelte
index df05f12b..80d5fe6e 100644
--- a/src/routes/(app)/invoice/[id]/paid/+page.svelte
+++ b/src/routes/(app)/invoice/[id]/paid/+page.svelte
@@ -76,7 +76,7 @@
   {/if}
 </div>
 
-<a href={`/receive`}>
+<a href={`/`}>
   <div class="opacity-0 w-screen h-screen fixed top-0 left-0 z-50" />
 </a>
 
diff --git a/src/routes/(app)/send/bitcoin/[address]/+page.svelte b/src/routes/(app)/send/bitcoin/[address]/+page.svelte
index b656dc06..6b938c38 100644
--- a/src/routes/(app)/send/bitcoin/[address]/+page.svelte
+++ b/src/routes/(app)/send/bitcoin/[address]/+page.svelte
@@ -24,12 +24,6 @@
   };
 </script>
 
-<a href="/send">
-  <button type="button" class="ml-5 md:ml-20 mt-5 md:mt-10 hover:opacity-80">
-    <Icon icon="arrow-left" style="w-10" />
-  </button>
-</a>
-
 <div class="container px-4 max-w-xl mx-auto space-y-5 text-center">
   <h1 class="text-3xl md:text-4xl font-semibold mb-2">{$t("payments.send")}</h1>
 
diff --git a/src/routes/(app)/send/bitcoin/[address]/[amount]/[...feeRate]/+page.svelte b/src/routes/(app)/send/bitcoin/[address]/[amount]/[...feeRate]/+page.svelte
index 1267a992..0630948c 100644
--- a/src/routes/(app)/send/bitcoin/[address]/[amount]/[...feeRate]/+page.svelte
+++ b/src/routes/(app)/send/bitcoin/[address]/[amount]/[...feeRate]/+page.svelte
@@ -55,6 +55,7 @@
       let key = child.derive(path);
       let { privateKey, publicKey } = key;
       let address = btc.getAddress("wpkh", privateKey, network);
+      console.log("ADDR", address)
       tx.signIdx(privateKey, i);
     }
     tx.finalize();
@@ -112,15 +113,6 @@
   let goBack = () => goto(`/send/bitcoin/${address}`);
 </script>
 
-<button
-  type="button"
-  class="ml-5 md:ml-20 mt-5 md:mt-10 hover:opacity-80"
-  data-sveltekit-preload-data="false"
-  on:click={goBack}
->
-  <Icon icon="arrow-left" style="w-10" />
-</button>
-
 <div
   class="container px-4 max-w-xl mx-auto space-y-5 text-center no-transition"
 >
diff --git a/src/routes/(app)/send/invoice/[id]/+page.server.ts b/src/routes/(app)/send/invoice/[id]/+page.server.ts
index fa7d28dd..c31bcd7b 100644
--- a/src/routes/(app)/send/invoice/[id]/+page.server.ts
+++ b/src/routes/(app)/send/invoice/[id]/+page.server.ts
@@ -12,7 +12,7 @@ export async function load({ params: { id }, parent }) {
   if (invoice.memoPrompt && invoice.memo === null)
     redirect(307, `/invoice/${id}/memo`);
 
-  if (invoice.user.username === user?.username)
+  if (invoice.account === user?.id)
     error(500, { message: "Cannot send to self" });
 
   if (!user) redirect(307, `/invoice/${id}`);
diff --git a/src/routes/(app)/send/invoice/[id]/+page.svelte b/src/routes/(app)/send/invoice/[id]/+page.svelte
index 75e4e75a..4348e473 100644
--- a/src/routes/(app)/send/invoice/[id]/+page.svelte
+++ b/src/routes/(app)/send/invoice/[id]/+page.svelte
@@ -93,10 +93,6 @@
   // });
 </script>
 
-<button class="ml-5 md:ml-20 mt-5 md:mt-10 hover:opacity-80" on:click={back}>
-  <Icon icon="arrow-left" style="w-10" />
-</button>
-
 {#if form?.message}
   <div class="text-red-600 text-center">
     {form.message}
diff --git a/src/routes/(app)/settings/[...tab]/+page.svelte b/src/routes/(app)/settings/[...tab]/+page.svelte
index 7f4dc87e..df66dbd0 100644
--- a/src/routes/(app)/settings/[...tab]/+page.svelte
+++ b/src/routes/(app)/settings/[...tab]/+page.svelte
@@ -249,9 +249,3 @@
     </button>
   </div>
 </form>
-
-<style>
-  .settings {
-    view-transition-name: settings;
-  }
-</style>
-- 
cgit v1.2.3


From b0fe475ac2e6549369d08afdc082968638a2e52c Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Tue, 17 Sep 2024 14:05:25 -0700
Subject: account settings

---
 src/components/Account.svelte                   | 12 ++++++++++--
 src/routes/(app)/account/[id]/+page.server.ts   | 19 +++++++++++++++++++
 src/routes/(app)/account/[id]/+page.svelte      | 21 +++++++++++++++++++++
 src/routes/(app)/settings/[...tab]/+page.svelte |  2 +-
 4 files changed, 51 insertions(+), 3 deletions(-)
 create mode 100644 src/routes/(app)/account/[id]/+page.server.ts
 create mode 100644 src/routes/(app)/account/[id]/+page.svelte

(limited to 'src/routes/(app)/settings')

diff --git a/src/components/Account.svelte b/src/components/Account.svelte
index d52c4f52..a8573c37 100644
--- a/src/components/Account.svelte
+++ b/src/components/Account.svelte
@@ -5,7 +5,7 @@
   import { t } from "$lib/translations";
 
   export let user, rate, account;
-  let { seed, balance, id } = account;
+  let { name, seed, balance, id } = account;
   $: type = seed ? "Savings" : "Cash";
 
   $: refresh(account);
@@ -17,7 +17,15 @@
 
 <a href={`/payments`} class="block" on:click={setAccount}>
   <div class="border rounded-xl shadow p-4 space-y-5">
-    <Balance {balance} {user} {rate} />
+    <div class="flex">
+      <Balance {balance} {user} {rate} />
+      <a href={`/account/${id}`} class="contents">
+        <button class="ml-auto flex gap-1 mb-auto">
+          <div class="my-auto text-secondary">{name}</div>
+          <Icon icon="settings" style="w-8 my-auto" />
+        </button>
+      </a>
+    </div>
 
     <div class="flex flex-wrap gap-3 justify-center w-full text-xl">
       <a href={`/send`} class="contents grow" on:click={setAccount}>
diff --git a/src/routes/(app)/account/[id]/+page.server.ts b/src/routes/(app)/account/[id]/+page.server.ts
new file mode 100644
index 00000000..7d1c503a
--- /dev/null
+++ b/src/routes/(app)/account/[id]/+page.server.ts
@@ -0,0 +1,19 @@
+import { error, redirect } from "@sveltejs/kit";
+import { auth, post, fd } from "$lib/utils";
+
+export const actions = {
+  default: async ({ cookies, params, request }) => {
+    let { id } = params;
+    let body = await fd(request);
+    let username = cookies.get("username");
+
+    try {
+      await post(`/account/${id}`, body, auth(cookies));
+    } catch (e: any) {
+      console.log(e);
+      error(400, { message: e.message });
+    }
+
+    redirect(303, `/${username}`);
+  },
+};
diff --git a/src/routes/(app)/account/[id]/+page.svelte b/src/routes/(app)/account/[id]/+page.svelte
new file mode 100644
index 00000000..152e8dfc
--- /dev/null
+++ b/src/routes/(app)/account/[id]/+page.svelte
@@ -0,0 +1,21 @@
+<script>
+  import { enhance } from "$app/forms";
+  import { t } from "$lib/translations";
+  import Icon from "$comp/Icon.svelte";
+  let name;
+</script>
+
+<div class="space-y-5">
+  <h1 class="text-center text-3xl font-semibold">Account settings</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">
+      <div>
+        <label for="display" class="font-bold mb-1 block">Account name</label>
+        <input type="text" name="name" bind:value={name} />
+      </div>
+
+      <button type="submit">Save</button>
+    </form>
+  </div>
+</div>
diff --git a/src/routes/(app)/settings/[...tab]/+page.svelte b/src/routes/(app)/settings/[...tab]/+page.svelte
index df66dbd0..f59806d1 100644
--- a/src/routes/(app)/settings/[...tab]/+page.svelte
+++ b/src/routes/(app)/settings/[...tab]/+page.svelte
@@ -137,7 +137,7 @@
           content: JSON.stringify({
             name: user.username,
             about: user.address,
-            picture: `${PUBLIC_COINOS_URL}/public/${user.profile}.webp`,
+            picture: `${$page.url.origin}/public/${user.profile}.webp`,
           }),
           tags: [],
         };
-- 
cgit v1.2.3


From 11b5a6469158c0dcdafe19e0b6dfcd0abee8df2d Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Tue, 24 Sep 2024 20:02:05 -0700
Subject: styles

---
 src/components/Account.svelte                      |  8 ++++----
 src/components/AppHeader.svelte                    | 10 +++++-----
 src/locales/en.json                                |  6 +++---
 .../(app)/[username]/(profile)/+layout.svelte      |  2 +-
 src/routes/(app)/[username]/receive/+page.svelte   |  2 +-
 src/routes/(app)/invoice/[id]/+page.svelte         |  2 +-
 src/routes/(app)/receive/[...token]/+page.svelte   | 12 +++++------
 src/routes/(app)/send/[...text]/+page.svelte       |  4 ++--
 src/routes/(app)/settings/[...tab]/_pos.svelte     | 23 ----------------------
 9 files changed, 23 insertions(+), 46 deletions(-)

(limited to 'src/routes/(app)/settings')

diff --git a/src/components/Account.svelte b/src/components/Account.svelte
index d4a89556..458f67c6 100644
--- a/src/components/Account.svelte
+++ b/src/components/Account.svelte
@@ -14,7 +14,7 @@
 </script>
 
 <a href={`/payments`} class="block" on:click={setAccount}>
-  <div class="p-8 space-y-5 bg-primary rounded-2xl border">
+  <div class="py-4 px-2 space-y-5 bg-primary rounded-2xl border">
     <div class="flex">
       <Balance {balance} {user} {rate} />
       {#if seed}
@@ -26,10 +26,10 @@
       {/if}
     </div>
 
-    <div class="flex flex-wrap gap-1 justify-center w-full text-xl">
+    <div class="flex gap-1 justify-center w-full text-xl">
       <a href={`/invoice`} class="contents" on:click={setAccount}>
         <button
-          class="rounded-2xl border py-5 px-6 hover:opacity-80 flex grow bg-white"
+          class="rounded-2xl border py-5 px-4 hover:opacity-80 flex grow bg-white"
         >
           <div class="mx-auto flex gap-2">
             <Icon icon="receive" style="w-8" />
@@ -40,7 +40,7 @@
 
       <a href={`/scan`} class="contents" on:click={setAccount}>
         <button
-          class="rounded-2xl border py-5 px-6 hover:opacity-80 flex shrink bg-white"
+          class="rounded-2xl border py-5 px-4 hover:opacity-80 flex shrink bg-white"
         >
           <div class="mx-auto flex gap-2">
             <Icon icon="camera" style="w-8" />
diff --git a/src/components/AppHeader.svelte b/src/components/AppHeader.svelte
index b777e0b5..cc521e93 100644
--- a/src/components/AppHeader.svelte
+++ b/src/components/AppHeader.svelte
@@ -19,11 +19,11 @@
       },
       { key: "nav.support", icon: "support", href: `/support` },
       { key: "nav.map", icon: "map", href: `/map` },
-      {
-        key: "nav.messages",
-        icon: "message",
-        href: `/messages`,
-      },
+      // {
+      //   key: "nav.messages",
+      //   icon: "message",
+      //   href: `/messages`,
+      // },
       { key: "nav.merch", icon: "shop", href: `https://coinosmerch.com` },
       { key: "nav.signOut", icon: "logout", href: `/logout` },
     ];
diff --git a/src/locales/en.json b/src/locales/en.json
index 1d875536..35a75db2 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -167,7 +167,7 @@
 		"messages": "Messages",
 		"funds": "Funds",
 		"map": "Map",
-		"merch": "Swag",
+		"merch": "Shop",
 		"profile": "Profile",
 		"startInSeconds": "Start in Seconds",
 		"account": "Account",
@@ -333,8 +333,8 @@
 		"mint": "Mint",
 		"ecash": "Ecash",
 		"memo": "Notes",
-		"voucherText": "Enter an ecash or lnurlw code",
-		"createEcash": "Mint e-cash",
+		"voucherText": "Enter an ecash token or lnurlw code",
+		"createEcash": "Mint ecash",
 		"tips": "Tips",
 		"options": "options",
 		"bump": "Bump fee",
diff --git a/src/routes/(app)/[username]/(profile)/+layout.svelte b/src/routes/(app)/[username]/(profile)/+layout.svelte
index 111fdeb6..7046b7cd 100644
--- a/src/routes/(app)/[username]/(profile)/+layout.svelte
+++ b/src/routes/(app)/[username]/(profile)/+layout.svelte
@@ -82,7 +82,7 @@
 <div class="container mx-auto w-full px-4 flex flex-wrap lg:flex-nowrap">
   <div class="hidden lg:block lg:w-[280px] xl:w-[360px]" />
   <div
-    class="w-full lg:w-[280px] xl:w-[360px] lg:absolute space-y-5 left-20 mx-auto mb-5"
+    class="w-full lg:w-[280px] xl:w-[360px] lg:absolute space-y-2 left-20 mx-auto"
   >
     <button type="button" on:click={toggleDetails} class="flex text-3xl font-bold text-center mx-auto justify-center gap-2">
         <div class="my-auto break-words">{display || username}</div>
diff --git a/src/routes/(app)/[username]/receive/+page.svelte b/src/routes/(app)/[username]/receive/+page.svelte
index 9977cc76..11587211 100644
--- a/src/routes/(app)/[username]/receive/+page.svelte
+++ b/src/routes/(app)/[username]/receive/+page.svelte
@@ -275,7 +275,7 @@
             class="hover:bg-primary flex gap-1 sm:gap-2 py-3 px-2 sm:px-5 justify-center"
           >
             <img src="/images/cash.png" class="w-8 my-auto" />
-            <div class="my-auto text-lg">E-cash</div>
+            <div class="my-auto text-lg">Ecash</div>
           </button>
         </a>
       {/if}
diff --git a/src/routes/(app)/invoice/[id]/+page.svelte b/src/routes/(app)/invoice/[id]/+page.svelte
index 580456cd..5ef9e5e5 100644
--- a/src/routes/(app)/invoice/[id]/+page.svelte
+++ b/src/routes/(app)/invoice/[id]/+page.svelte
@@ -276,7 +276,7 @@
             class="hover:bg-primary flex gap-1 sm:gap-2 py-3 px-2 sm:px-5 justify-center"
           >
             <img src="/images/cash.png" class="w-8 my-auto" />
-            <div class="my-auto text-lg">E-cash</div>
+            <div class="my-auto text-lg">Ecash</div>
           </button>
         </a>
       {/if}
diff --git a/src/routes/(app)/receive/[...token]/+page.svelte b/src/routes/(app)/receive/[...token]/+page.svelte
index 7ff93fa9..988c1e6c 100644
--- a/src/routes/(app)/receive/[...token]/+page.svelte
+++ b/src/routes/(app)/receive/[...token]/+page.svelte
@@ -31,7 +31,7 @@
 
 <div class="container px-4 max-w-lg mx-auto space-y-5 mt-20">
   <h1 class="px-3 md:px-0 text-center text-3xl md:text-4xl font-semibold">
-    {$t("payments.voucher")}
+    {$t("user.dashboard.receive")}
   </h1>
 
   <form method="POST" use:enhance class="space-y-2 text-xl">
@@ -51,7 +51,7 @@
         name="text"
         placeholder={$t("payments.voucherText")}
         on:keypress={keypress}
-        class="w-full p-4 border rounded-xl h-48 text-xl"
+        class="w-full p-4 border rounded-xl h-32 text-xl"
         bind:value={text}
         on:paste={() => (pasted = true)}
         autocapitalize="none"
@@ -62,19 +62,19 @@
       <a href="/scan" class="w-full">
         <button
           type="button"
-          class="flex border rounded-2xl px-6 py-5 font-bold hover:opacity-80 w-full bg-primary justify-center"
+          class="flex border rounded-2xl px-5 py-4 hover:opacity-80 w-full justify-center gap-1"
         >
-          <Icon icon="camera" style="mr-2 w-6 my-auto" />
+          <Icon icon="camera" style="w-8 my-auto" />
           <div class="my-auto">{$t("user.send.scan")}</div>
         </button>
       </a>
 
       <button
         type="button"
-        class="flex border rounded-2xl px-6 py-5 font-bold hover:opacity-80 w-full bg-primary justify-center"
+        class="flex border rounded-2xl px-5 py-4 hover:opacity-80 w-full justify-center gap-1"
         on:click={paste}
       >
-        <Icon icon="paste" style="mr-2 w-6 my-auto" />
+        <Icon icon="paste" style="w-8 my-auto" />
         <div class="my-auto">{$t("user.send.paste")}</div>
       </button>
     </div>
diff --git a/src/routes/(app)/send/[...text]/+page.svelte b/src/routes/(app)/send/[...text]/+page.svelte
index be7fc664..faa4a766 100644
--- a/src/routes/(app)/send/[...text]/+page.svelte
+++ b/src/routes/(app)/send/[...text]/+page.svelte
@@ -63,7 +63,7 @@
       <a href="/scan" class="w-full">
         <button
           type="button"
-          class="flex border rounded-2xl px-6 py-5 font-bold hover:opacity-80 w-full bg-primary justify-center gap-2"
+          class="flex border rounded-2xl px-5 py-4 hover:opacity-80 w-full justify-center gap-2"
         >
           <Icon icon="camera" style="w-8 my-auto" />
           <div class="my-auto">{$t("user.send.scan")}</div>
@@ -72,7 +72,7 @@
 
       <button
         type="button"
-        class="flex border rounded-2xl px-6 py-5 font-bold hover:opacity-80 w-full bg-primary justify-center gap-2"
+        class="flex border rounded-2xl px-5 py-4 hover:opacity-80 w-full justify-center gap-2"
         on:click={paste}
       >
         <Icon icon="paste" style="w-8 my-auto" />
diff --git a/src/routes/(app)/settings/[...tab]/_pos.svelte b/src/routes/(app)/settings/[...tab]/_pos.svelte
index 6a1c92a1..dcfcbe44 100644
--- a/src/routes/(app)/settings/[...tab]/_pos.svelte
+++ b/src/routes/(app)/settings/[...tab]/_pos.svelte
@@ -62,17 +62,6 @@
   </select>
 </div>
 
-<div>
-  <label for="memoPrompt" class="font-bold mb-1 block"
-    >{$t("user.settings.memoPrompt")}</label
-  >
-  <textarea
-    name="memoPrompt"
-    placeholder={$t("user.settings.memoPromptPlaceholder")}
-    bind:value={user.memoPrompt}
-  />
-</div>
-
 <div>
   <div class="flex justify-between items-center">
     <span class="font-bold">{$t("user.settings.notifications")}</span>
@@ -93,18 +82,6 @@
   </p>
 </div>
 
-<div>
-  <div class="flex justify-between items-center">
-    <span class="font-bold">{$t("user.settings.publishNip5")}</span>
-    <Toggle id="nip5" bind:value={user.nip5} />
-  </div>
-  <p class="text-secondary mt-1 w-9/12">
-    {$t("user.settings.nip5a")}
-    <span class="font-bold">{user.username}@{$page.url.host}</span>
-    {$t("user.settings.nip5b")}
-  </p>
-</div>
-
 <div>
   <div class="flex justify-between items-center">
     <span class="font-bold">{$t("user.settings.autoWithdraw")}</span>
-- 
cgit v1.2.3