From c5ef18aec5de023732eb6b86f768f206462fea93 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Wed, 4 Sep 2024 18:59:30 -0700
Subject: wip

---
 src/components/About.svelte                        |    5 +-
 src/components/Account.svelte                      |   53 +
 src/components/Balance.svelte                      |    6 +-
 src/components/Items.svelte                        |  209 ++
 src/lib/english.ts                                 | 2048 --------------------
 src/lib/nostr.ts                                   |    2 +-
 src/lib/store.ts                                   |    1 +
 src/locales/en.json                                |    4 +-
 .../(app)/[username]/(profile)/+layout.svelte      |   66 +-
 src/routes/(app)/[username]/(profile)/+page.svelte |  282 +--
 .../(app)/[username]/account/setup/+page.svelte    |   64 +
 .../[username]/account/setup/step2/+page.svelte    |   46 +
 12 files changed, 440 insertions(+), 2346 deletions(-)
 create mode 100644 src/components/Account.svelte
 create mode 100644 src/components/Items.svelte
 delete mode 100644 src/lib/english.ts
 create mode 100644 src/routes/(app)/[username]/account/setup/+page.svelte
 create mode 100644 src/routes/(app)/[username]/account/setup/step2/+page.svelte

(limited to 'src')

diff --git a/src/components/About.svelte b/src/components/About.svelte
index 1e60db72..01ff4c7c 100644
--- a/src/components/About.svelte
+++ b/src/components/About.svelte
@@ -91,14 +91,15 @@
       {@html $t("about.locations.description")}
     </p>
     <!-- <LocationsMap {locations} /> -->
+
     <a href="/map">
       <div class="relative">
         <img src="/map.png" class="mx-auto" />
 
         <button
-          class="bg-black text-white border rounded-full px-6 py-2 font-bold hover:opacity-80 absolute left-1/2 top-1/2 text-2xl"
+          class="bg-black text-white border border-4 rounded-full px-6 py-2 font-bold hover:bg-secondary absolute left-1/2 top-1/2 transform -translate-x-1/2 -translate-y-1/2 text-2xl"
         >
-          View map
+          {$t("about.locations.viewMap")}
         </button>
       </div>
     </a>
diff --git a/src/components/Account.svelte b/src/components/Account.svelte
new file mode 100644
index 00000000..5286c4d3
--- /dev/null
+++ b/src/components/Account.svelte
@@ -0,0 +1,53 @@
+<script>
+  import Icon from "$comp/Icon.svelte";
+  import Balance from "$comp/Balance.svelte";
+  import { t } from "$lib/translations";
+
+  export let user, rate, account;
+  let { balance, setup, type } = account;
+</script>
+
+<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-secondary">{type}</div>
+  </div>
+
+  <div class="flex flex-wrap gap-3 justify-center w-full text-xl">
+    {#if setup}
+      <a href={`/send`} class="contents grow">
+        <button
+          type="button"
+          class="rounded-2xl border py-5 px-6 font-bold hover:opacity-80 flex bg-primary grow"
+        >
+          <div class="mx-auto flex gap-2">
+            <Icon icon="send" style="w-8" />
+            <div class="my-auto">{$t("user.dashboard.send")}</div>
+          </div>
+        </button>
+      </a>
+
+      <a href={`/${user.username}/receive`} class="contents">
+        <button
+          class="rounded-2xl border py-5 px-6 font-bold hover:opacity-80 flex bg-primary grow"
+        >
+          <div class="mx-auto flex gap-2">
+            <Icon icon="receive" style="w-8" />
+            <div class="my-auto">{$t("user.dashboard.receive")}</div>
+          </div>
+        </button>
+      </a>
+    {:else}
+      <a href={`/${user.username}/account/setup`} class="contents">
+        <button
+          class="rounded-2xl border py-5 px-6 font-bold hover:opacity-80 flex bg-primary grow"
+        >
+          <div class="mx-auto flex gap-2">
+            <Icon icon="settings" style="w-8" />
+            <div class="my-auto">{$t("user.dashboard.setup")}</div>
+          </div>
+        </button>
+      </a>
+    {/if}
+  </div>
+</div>
diff --git a/src/components/Balance.svelte b/src/components/Balance.svelte
index 4d5ac6bd..51c56555 100644
--- a/src/components/Balance.svelte
+++ b/src/components/Balance.svelte
@@ -6,7 +6,7 @@
   import { t } from "$lib/translations";
 
   let show;
-  export let user, rate;
+  export let user, rate, balance;
 </script>
 
 {#if show && user.haspin && $pin?.length !== 6}
@@ -27,12 +27,12 @@
       {#if isNaN(rate)}
         <div class="text-gray-200">&mdash;</div>
       {:else}
-        {f((user.balance * rate) / sats, user.currency)}
+        {f((balance * rate) / sats, user.currency)}
       {/if}
     </div>
 
     <div class="text-secondary text-2xl">
-      ⚡️{s(user.balance)}
+      ⚡️{s(balance)}
     </div>
   {/if}
 </div>
diff --git a/src/components/Items.svelte b/src/components/Items.svelte
new file mode 100644
index 00000000..f449215c
--- /dev/null
+++ b/src/components/Items.svelte
@@ -0,0 +1,209 @@
+<script>
+  import { btc, f, sat, post } from "$lib/utils";
+  import { browser } from "$app/environment";
+  import { goto, invalidate } from "$app/navigation";
+  import { fade } from "svelte/transition";
+  import { cubicIn } from "svelte/easing";
+  import { flip } from "svelte/animate";
+  import {
+    dndzone,
+    SHADOW_ITEM_MARKER_PROPERTY_NAME,
+    SOURCES,
+    TRIGGERS,
+  } from "svelte-dnd-action";
+  import DeleteItem from "$comp/DeleteItem.svelte";
+  import Icon from "$comp/Icon.svelte";
+
+  export let subject, user, items, total, rate, currency;
+
+  let flipDurationMs = 200;
+  let dropTargetStyle = {};
+
+  let dragDisabled =
+    subject?.id !== user?.id || (browser && window.innerWidth < 768);
+
+  let deleting;
+  let del = (item) => {
+    deleting = item;
+  };
+
+  function handleConsider(e) {
+    const {
+      items: newItems,
+      info: { source, trigger },
+    } = e.detail;
+    items = newItems;
+    if (source === SOURCES.KEYBOARD && trigger === TRIGGERS.DRAG_STOPPED)
+      reset();
+  }
+
+  async function handleFinalize(e) {
+    const {
+      items: newItems,
+      info: { source },
+    } = e.detail;
+    items = newItems;
+    if (source === SOURCES.POINTER) reset();
+
+    if (subject?.id === user?.id) {
+      await post("/api/items/sort", { items });
+      invalidate("app:items");
+    }
+  }
+
+  function startDrag(e) {
+    e.preventDefault();
+    dragDisabled = false;
+  }
+
+  function handleKeyDown(e) {
+    if ((e.key === "Enter" || e.key === " ") && dragDisabled)
+      dragDisabled = false;
+  }
+
+  $: if (total > 0 && browser) {
+    let payButton = document.querySelector("#payButton");
+    if (payButton) payButton.addEventListener("click", checkout);
+  }
+
+  let checkout = async () => {
+    let invoice = {
+      type: "lightning",
+      amount: btc(total, rate),
+      currency,
+      items: items.filter((i) => i.quantity > 0),
+      prompt: subject.prompt,
+      memoPrompt: subject.memoPrompt,
+      rate,
+    };
+
+    let { id } = await post(`/${subject.username}/invoice`, {
+      invoice,
+      user: { username: subject.username },
+    });
+
+    if (invoice.memoPrompt) {
+      return goto(`/${subject.username}/invoice/${id}/memo`);
+    }
+    goto(`/${subject.username}/invoice/${id}`);
+  };
+
+  let reset = () =>
+    (dragDisabled =
+      user?.username !== subject?.username || window.innerWidth < 768);
+</script>
+
+<svelte:window on:resize={reset} />
+
+{#if deleting}
+  <DeleteItem bind:item={deleting} />
+{/if}
+
+{#if items.length}
+  <h2 class="text-2xl font-bold">Select items</h2>
+{/if}
+<div
+  class="grid sm:grid-cols-2 gap-4 pb-20"
+  use:dndzone={{ items, flipDurationMs, dropTargetStyle, dragDisabled }}
+  on:consider={handleConsider}
+  on:finalize={handleFinalize}
+>
+  {#each items as i (i.id)}
+    <button
+      type="button"
+      class="w-full text-center cursor-pointer hover:opacity-80 mb-auto"
+      on:click={() => i.quantity++}
+    >
+      <div class="relative w-full h-64 overflow-hidden rounded-xl">
+        {#if i[SHADOW_ITEM_MARKER_PROPERTY_NAME]}
+          <div
+            in:fade={{ duration: 200, easing: cubicIn }}
+            class="custom-shadow-item"
+          />
+        {:else if i.image}
+          <img
+            src={`/api/public/${i.image}.webp`}
+            alt={i.name}
+            class="mx-auto object-cover h-full w-full"
+          />
+        {:else}
+          <div
+            class="bg-gradient-to-r from-primary to-gradient mb-4 cursor-pointer hover:opacity-80 w-full h-full"
+            alt="Banner"
+          />
+        {/if}
+        {#if user?.username === subject.username}
+          <div class="flex gap-2 justify-center absolute top-2 right-2">
+            <button type="button" on:click|stopPropagation={() => {}}>
+              <a href={`/${user.username}/items/${i.id}`}>
+                <button
+                  class="bg-black rounded-full w-12 h-12 bg-opacity-40 hover:bg-opacity-100"
+                >
+                  <Icon icon="edit" style="w-8 mx-auto invert" />
+                </button>
+              </a>
+            </button>
+            <button
+              class="bg-black rounded-full w-12 h-12 bg-opacity-40 hover:bg-opacity-100"
+              on:click|stopPropagation={() => del(i)}
+            >
+              <Icon icon="trash" style="w-8 mx-auto invert" />
+            </button>
+            <button
+              type="button"
+              on:click|stopPropagation={() => {}}
+              class="sm:hidden"
+              on:mousedown={startDrag}
+              on:touchstart={startDrag}
+              on:keydown={handleKeyDown}
+            >
+              <a href={`/${user.username}/items/${i.id}`}>
+                <button
+                  class="bg-black rounded-full w-12 h-12 bg-opacity-40 hover:bg-opacity-100"
+                >
+                  <Icon icon="move" style="w-8 mx-auto invert" />
+                </button>
+              </a>
+            </button>
+          </div>
+        {/if}
+      </div>
+      <div class="bg-white rounded-xl py-2">
+        <div class="flex text-left gap-2">
+          <div class="overflow-hidden space-y-1">
+            <div class="text-2xl break-words">{i.name}</div>
+            <div class="flex gap-2">
+              <div class="font-semibold text-lg">
+                {f(i.price, currency)}
+              </div>
+              <div class="text-secondary my-auto">
+                {sat(btc(i.price, rate))}
+              </div>
+            </div>
+          </div>
+          <div class="flex gap-1 ml-auto mb-auto justify-around tabular-nums">
+            {#if i.quantity}
+              <button
+                type="button"
+                on:click|stopPropagation={() => i.quantity > 0 && i.quantity--}
+              >
+                <Icon icon="minus" style="w-10 min-w-10" />
+              </button>
+            {/if}
+            <div class="text-2xl my-auto text-center">
+              {#if i.quantity}{i.quantity}{:else}&mdash;{/if}
+            </div>
+            {#if i.quantity}
+              <button
+                type="button"
+                on:click|stopPropagation={() => i.quantity++}
+              >
+                <Icon icon="plus" style="w-10 min-w-10" />
+              </button>
+            {/if}
+          </div>
+        </div>
+      </div>
+    </button>
+  {/each}
+</div>
diff --git a/src/lib/english.ts b/src/lib/english.ts
deleted file mode 100644
index 52a0da82..00000000
--- a/src/lib/english.ts
+++ /dev/null
@@ -1,2048 +0,0 @@
-export default `abandon
-ability
-able
-about
-above
-absent
-absorb
-abstract
-absurd
-abuse
-access
-accident
-account
-accuse
-achieve
-acid
-acoustic
-acquire
-across
-act
-action
-actor
-actress
-actual
-adapt
-add
-addict
-address
-adjust
-admit
-adult
-advance
-advice
-aerobic
-affair
-afford
-afraid
-again
-age
-agent
-agree
-ahead
-aim
-air
-airport
-aisle
-alarm
-album
-alcohol
-alert
-alien
-all
-alley
-allow
-almost
-alone
-alpha
-already
-also
-alter
-always
-amateur
-amazing
-among
-amount
-amused
-analyst
-anchor
-ancient
-anger
-angle
-angry
-animal
-ankle
-announce
-annual
-another
-answer
-antenna
-antique
-anxiety
-any
-apart
-apology
-appear
-apple
-approve
-april
-arch
-arctic
-area
-arena
-argue
-arm
-armed
-armor
-army
-around
-arrange
-arrest
-arrive
-arrow
-art
-artefact
-artist
-artwork
-ask
-aspect
-assault
-asset
-assist
-assume
-asthma
-athlete
-atom
-attack
-attend
-attitude
-attract
-auction
-audit
-august
-aunt
-author
-auto
-autumn
-average
-avocado
-avoid
-awake
-aware
-away
-awesome
-awful
-awkward
-axis
-baby
-bachelor
-bacon
-badge
-bag
-balance
-balcony
-ball
-bamboo
-banana
-banner
-bar
-barely
-bargain
-barrel
-base
-basic
-basket
-battle
-beach
-bean
-beauty
-because
-become
-beef
-before
-begin
-behave
-behind
-believe
-below
-belt
-bench
-benefit
-best
-betray
-better
-between
-beyond
-bicycle
-bid
-bike
-bind
-biology
-bird
-birth
-bitter
-black
-blade
-blame
-blanket
-blast
-bleak
-bless
-blind
-blood
-blossom
-blouse
-blue
-blur
-blush
-board
-boat
-body
-boil
-bomb
-bone
-bonus
-book
-boost
-border
-boring
-borrow
-boss
-bottom
-bounce
-box
-boy
-bracket
-brain
-brand
-brass
-brave
-bread
-breeze
-brick
-bridge
-brief
-bright
-bring
-brisk
-broccoli
-broken
-bronze
-broom
-brother
-brown
-brush
-bubble
-buddy
-budget
-buffalo
-build
-bulb
-bulk
-bullet
-bundle
-bunker
-burden
-burger
-burst
-bus
-business
-busy
-butter
-buyer
-buzz
-cabbage
-cabin
-cable
-cactus
-cage
-cake
-call
-calm
-camera
-camp
-can
-canal
-cancel
-candy
-cannon
-canoe
-canvas
-canyon
-capable
-capital
-captain
-car
-carbon
-card
-cargo
-carpet
-carry
-cart
-case
-cash
-casino
-castle
-casual
-cat
-catalog
-catch
-category
-cattle
-caught
-cause
-caution
-cave
-ceiling
-celery
-cement
-census
-century
-cereal
-certain
-chair
-chalk
-champion
-change
-chaos
-chapter
-charge
-chase
-chat
-cheap
-check
-cheese
-chef
-cherry
-chest
-chicken
-chief
-child
-chimney
-choice
-choose
-chronic
-chuckle
-chunk
-churn
-cigar
-cinnamon
-circle
-citizen
-city
-civil
-claim
-clap
-clarify
-claw
-clay
-clean
-clerk
-clever
-click
-client
-cliff
-climb
-clinic
-clip
-clock
-clog
-close
-cloth
-cloud
-clown
-club
-clump
-cluster
-clutch
-coach
-coast
-coconut
-code
-coffee
-coil
-coin
-collect
-color
-column
-combine
-come
-comfort
-comic
-common
-company
-concert
-conduct
-confirm
-congress
-connect
-consider
-control
-convince
-cook
-cool
-copper
-copy
-coral
-core
-corn
-correct
-cost
-cotton
-couch
-country
-couple
-course
-cousin
-cover
-coyote
-crack
-cradle
-craft
-cram
-crane
-crash
-crater
-crawl
-crazy
-cream
-credit
-creek
-crew
-cricket
-crime
-crisp
-critic
-crop
-cross
-crouch
-crowd
-crucial
-cruel
-cruise
-crumble
-crunch
-crush
-cry
-crystal
-cube
-culture
-cup
-cupboard
-curious
-current
-curtain
-curve
-cushion
-custom
-cute
-cycle
-dad
-damage
-damp
-dance
-danger
-daring
-dash
-daughter
-dawn
-day
-deal
-debate
-debris
-decade
-december
-decide
-decline
-decorate
-decrease
-deer
-defense
-define
-defy
-degree
-delay
-deliver
-demand
-demise
-denial
-dentist
-deny
-depart
-depend
-deposit
-depth
-deputy
-derive
-describe
-desert
-design
-desk
-despair
-destroy
-detail
-detect
-develop
-device
-devote
-diagram
-dial
-diamond
-diary
-dice
-diesel
-diet
-differ
-digital
-dignity
-dilemma
-dinner
-dinosaur
-direct
-dirt
-disagree
-discover
-disease
-dish
-dismiss
-disorder
-display
-distance
-divert
-divide
-divorce
-dizzy
-doctor
-document
-dog
-doll
-dolphin
-domain
-donate
-donkey
-donor
-door
-dose
-double
-dove
-draft
-dragon
-drama
-drastic
-draw
-dream
-dress
-drift
-drill
-drink
-drip
-drive
-drop
-drum
-dry
-duck
-dumb
-dune
-during
-dust
-dutch
-duty
-dwarf
-dynamic
-eager
-eagle
-early
-earn
-earth
-easily
-east
-easy
-echo
-ecology
-economy
-edge
-edit
-educate
-effort
-egg
-eight
-either
-elbow
-elder
-electric
-elegant
-element
-elephant
-elevator
-elite
-else
-embark
-embody
-embrace
-emerge
-emotion
-employ
-empower
-empty
-enable
-enact
-end
-endless
-endorse
-enemy
-energy
-enforce
-engage
-engine
-enhance
-enjoy
-enlist
-enough
-enrich
-enroll
-ensure
-enter
-entire
-entry
-envelope
-episode
-equal
-equip
-era
-erase
-erode
-erosion
-error
-erupt
-escape
-essay
-essence
-estate
-eternal
-ethics
-evidence
-evil
-evoke
-evolve
-exact
-example
-excess
-exchange
-excite
-exclude
-excuse
-execute
-exercise
-exhaust
-exhibit
-exile
-exist
-exit
-exotic
-expand
-expect
-expire
-explain
-expose
-express
-extend
-extra
-eye
-eyebrow
-fabric
-face
-faculty
-fade
-faint
-faith
-fall
-false
-fame
-family
-famous
-fan
-fancy
-fantasy
-farm
-fashion
-fat
-fatal
-father
-fatigue
-fault
-favorite
-feature
-february
-federal
-fee
-feed
-feel
-female
-fence
-festival
-fetch
-fever
-few
-fiber
-fiction
-field
-figure
-file
-film
-filter
-final
-find
-fine
-finger
-finish
-fire
-firm
-first
-fiscal
-fish
-fit
-fitness
-fix
-flag
-flame
-flash
-flat
-flavor
-flee
-flight
-flip
-float
-flock
-floor
-flower
-fluid
-flush
-fly
-foam
-focus
-fog
-foil
-fold
-follow
-food
-foot
-force
-forest
-forget
-fork
-fortune
-forum
-forward
-fossil
-foster
-found
-fox
-fragile
-frame
-frequent
-fresh
-friend
-fringe
-frog
-front
-frost
-frown
-frozen
-fruit
-fuel
-fun
-funny
-furnace
-fury
-future
-gadget
-gain
-galaxy
-gallery
-game
-gap
-garage
-garbage
-garden
-garlic
-garment
-gas
-gasp
-gate
-gather
-gauge
-gaze
-general
-genius
-genre
-gentle
-genuine
-gesture
-ghost
-giant
-gift
-giggle
-ginger
-giraffe
-girl
-give
-glad
-glance
-glare
-glass
-glide
-glimpse
-globe
-gloom
-glory
-glove
-glow
-glue
-goat
-goddess
-gold
-good
-goose
-gorilla
-gospel
-gossip
-govern
-gown
-grab
-grace
-grain
-grant
-grape
-grass
-gravity
-great
-green
-grid
-grief
-grit
-grocery
-group
-grow
-grunt
-guard
-guess
-guide
-guilt
-guitar
-gun
-gym
-habit
-hair
-half
-hammer
-hamster
-hand
-happy
-harbor
-hard
-harsh
-harvest
-hat
-have
-hawk
-hazard
-head
-health
-heart
-heavy
-hedgehog
-height
-hello
-helmet
-help
-hen
-hero
-hidden
-high
-hill
-hint
-hip
-hire
-history
-hobby
-hockey
-hold
-hole
-holiday
-hollow
-home
-honey
-hood
-hope
-horn
-horror
-horse
-hospital
-host
-hotel
-hour
-hover
-hub
-huge
-human
-humble
-humor
-hundred
-hungry
-hunt
-hurdle
-hurry
-hurt
-husband
-hybrid
-ice
-icon
-idea
-identify
-idle
-ignore
-ill
-illegal
-illness
-image
-imitate
-immense
-immune
-impact
-impose
-improve
-impulse
-inch
-include
-income
-increase
-index
-indicate
-indoor
-industry
-infant
-inflict
-inform
-inhale
-inherit
-initial
-inject
-injury
-inmate
-inner
-innocent
-input
-inquiry
-insane
-insect
-inside
-inspire
-install
-intact
-interest
-into
-invest
-invite
-involve
-iron
-island
-isolate
-issue
-item
-ivory
-jacket
-jaguar
-jar
-jazz
-jealous
-jeans
-jelly
-jewel
-job
-join
-joke
-journey
-joy
-judge
-juice
-jump
-jungle
-junior
-junk
-just
-kangaroo
-keen
-keep
-ketchup
-key
-kick
-kid
-kidney
-kind
-kingdom
-kiss
-kit
-kitchen
-kite
-kitten
-kiwi
-knee
-knife
-knock
-know
-lab
-label
-labor
-ladder
-lady
-lake
-lamp
-language
-laptop
-large
-later
-latin
-laugh
-laundry
-lava
-law
-lawn
-lawsuit
-layer
-lazy
-leader
-leaf
-learn
-leave
-lecture
-left
-leg
-legal
-legend
-leisure
-lemon
-lend
-length
-lens
-leopard
-lesson
-letter
-level
-liar
-liberty
-library
-license
-life
-lift
-light
-like
-limb
-limit
-link
-lion
-liquid
-list
-little
-live
-lizard
-load
-loan
-lobster
-local
-lock
-logic
-lonely
-long
-loop
-lottery
-loud
-lounge
-love
-loyal
-lucky
-luggage
-lumber
-lunar
-lunch
-luxury
-lyrics
-machine
-mad
-magic
-magnet
-maid
-mail
-main
-major
-make
-mammal
-man
-manage
-mandate
-mango
-mansion
-manual
-maple
-marble
-march
-margin
-marine
-market
-marriage
-mask
-mass
-master
-match
-material
-math
-matrix
-matter
-maximum
-maze
-meadow
-mean
-measure
-meat
-mechanic
-medal
-media
-melody
-melt
-member
-memory
-mention
-menu
-mercy
-merge
-merit
-merry
-mesh
-message
-metal
-method
-middle
-midnight
-milk
-million
-mimic
-mind
-minimum
-minor
-minute
-miracle
-mirror
-misery
-miss
-mistake
-mix
-mixed
-mixture
-mobile
-model
-modify
-mom
-moment
-monitor
-monkey
-monster
-month
-moon
-moral
-more
-morning
-mosquito
-mother
-motion
-motor
-mountain
-mouse
-move
-movie
-much
-muffin
-mule
-multiply
-muscle
-museum
-mushroom
-music
-must
-mutual
-myself
-mystery
-myth
-naive
-name
-napkin
-narrow
-nasty
-nation
-nature
-near
-neck
-need
-negative
-neglect
-neither
-nephew
-nerve
-nest
-net
-network
-neutral
-never
-news
-next
-nice
-night
-noble
-noise
-nominee
-noodle
-normal
-north
-nose
-notable
-note
-nothing
-notice
-novel
-now
-nuclear
-number
-nurse
-nut
-oak
-obey
-object
-oblige
-obscure
-observe
-obtain
-obvious
-occur
-ocean
-october
-odor
-off
-offer
-office
-often
-oil
-okay
-old
-olive
-olympic
-omit
-once
-one
-onion
-online
-only
-open
-opera
-opinion
-oppose
-option
-orange
-orbit
-orchard
-order
-ordinary
-organ
-orient
-original
-orphan
-ostrich
-other
-outdoor
-outer
-output
-outside
-oval
-oven
-over
-own
-owner
-oxygen
-oyster
-ozone
-pact
-paddle
-page
-pair
-palace
-palm
-panda
-panel
-panic
-panther
-paper
-parade
-parent
-park
-parrot
-party
-pass
-patch
-path
-patient
-patrol
-pattern
-pause
-pave
-payment
-peace
-peanut
-pear
-peasant
-pelican
-pen
-penalty
-pencil
-people
-pepper
-perfect
-permit
-person
-pet
-phone
-photo
-phrase
-physical
-piano
-picnic
-picture
-piece
-pig
-pigeon
-pill
-pilot
-pink
-pioneer
-pipe
-pistol
-pitch
-pizza
-place
-planet
-plastic
-plate
-play
-please
-pledge
-pluck
-plug
-plunge
-poem
-poet
-point
-polar
-pole
-police
-pond
-pony
-pool
-popular
-portion
-position
-possible
-post
-potato
-pottery
-poverty
-powder
-power
-practice
-praise
-predict
-prefer
-prepare
-present
-pretty
-prevent
-price
-pride
-primary
-print
-priority
-prison
-private
-prize
-problem
-process
-produce
-profit
-program
-project
-promote
-proof
-property
-prosper
-protect
-proud
-provide
-public
-pudding
-pull
-pulp
-pulse
-pumpkin
-punch
-pupil
-puppy
-purchase
-purity
-purpose
-purse
-push
-put
-puzzle
-pyramid
-quality
-quantum
-quarter
-question
-quick
-quit
-quiz
-quote
-rabbit
-raccoon
-race
-rack
-radar
-radio
-rail
-rain
-raise
-rally
-ramp
-ranch
-random
-range
-rapid
-rare
-rate
-rather
-raven
-raw
-razor
-ready
-real
-reason
-rebel
-rebuild
-recall
-receive
-recipe
-record
-recycle
-reduce
-reflect
-reform
-refuse
-region
-regret
-regular
-reject
-relax
-release
-relief
-rely
-remain
-remember
-remind
-remove
-render
-renew
-rent
-reopen
-repair
-repeat
-replace
-report
-require
-rescue
-resemble
-resist
-resource
-response
-result
-retire
-retreat
-return
-reunion
-reveal
-review
-reward
-rhythm
-rib
-ribbon
-rice
-rich
-ride
-ridge
-rifle
-right
-rigid
-ring
-riot
-ripple
-risk
-ritual
-rival
-river
-road
-roast
-robot
-robust
-rocket
-romance
-roof
-rookie
-room
-rose
-rotate
-rough
-round
-route
-royal
-rubber
-rude
-rug
-rule
-run
-runway
-rural
-sad
-saddle
-sadness
-safe
-sail
-salad
-salmon
-salon
-salt
-salute
-same
-sample
-sand
-satisfy
-satoshi
-sauce
-sausage
-save
-say
-scale
-scan
-scare
-scatter
-scene
-scheme
-school
-science
-scissors
-scorpion
-scout
-scrap
-screen
-script
-scrub
-sea
-search
-season
-seat
-second
-secret
-section
-security
-seed
-seek
-segment
-select
-sell
-seminar
-senior
-sense
-sentence
-series
-service
-session
-settle
-setup
-seven
-shadow
-shaft
-shallow
-share
-shed
-shell
-sheriff
-shield
-shift
-shine
-ship
-shiver
-shock
-shoe
-shoot
-shop
-short
-shoulder
-shove
-shrimp
-shrug
-shuffle
-shy
-sibling
-sick
-side
-siege
-sight
-sign
-silent
-silk
-silly
-silver
-similar
-simple
-since
-sing
-siren
-sister
-situate
-six
-size
-skate
-sketch
-ski
-skill
-skin
-skirt
-skull
-slab
-slam
-sleep
-slender
-slice
-slide
-slight
-slim
-slogan
-slot
-slow
-slush
-small
-smart
-smile
-smoke
-smooth
-snack
-snake
-snap
-sniff
-snow
-soap
-soccer
-social
-sock
-soda
-soft
-solar
-soldier
-solid
-solution
-solve
-someone
-song
-soon
-sorry
-sort
-soul
-sound
-soup
-source
-south
-space
-spare
-spatial
-spawn
-speak
-special
-speed
-spell
-spend
-sphere
-spice
-spider
-spike
-spin
-spirit
-split
-spoil
-sponsor
-spoon
-sport
-spot
-spray
-spread
-spring
-spy
-square
-squeeze
-squirrel
-stable
-stadium
-staff
-stage
-stairs
-stamp
-stand
-start
-state
-stay
-steak
-steel
-stem
-step
-stereo
-stick
-still
-sting
-stock
-stomach
-stone
-stool
-story
-stove
-strategy
-street
-strike
-strong
-struggle
-student
-stuff
-stumble
-style
-subject
-submit
-subway
-success
-such
-sudden
-suffer
-sugar
-suggest
-suit
-summer
-sun
-sunny
-sunset
-super
-supply
-supreme
-sure
-surface
-surge
-surprise
-surround
-survey
-suspect
-sustain
-swallow
-swamp
-swap
-swarm
-swear
-sweet
-swift
-swim
-swing
-switch
-sword
-symbol
-symptom
-syrup
-system
-table
-tackle
-tag
-tail
-talent
-talk
-tank
-tape
-target
-task
-taste
-tattoo
-taxi
-teach
-team
-tell
-ten
-tenant
-tennis
-tent
-term
-test
-text
-thank
-that
-theme
-then
-theory
-there
-they
-thing
-this
-thought
-three
-thrive
-throw
-thumb
-thunder
-ticket
-tide
-tiger
-tilt
-timber
-time
-tiny
-tip
-tired
-tissue
-title
-toast
-tobacco
-today
-toddler
-toe
-together
-toilet
-token
-tomato
-tomorrow
-tone
-tongue
-tonight
-tool
-tooth
-top
-topic
-topple
-torch
-tornado
-tortoise
-toss
-total
-tourist
-toward
-tower
-town
-toy
-track
-trade
-traffic
-tragic
-train
-transfer
-trap
-trash
-travel
-tray
-treat
-tree
-trend
-trial
-tribe
-trick
-trigger
-trim
-trip
-trophy
-trouble
-truck
-true
-truly
-trumpet
-trust
-truth
-try
-tube
-tuition
-tumble
-tuna
-tunnel
-turkey
-turn
-turtle
-twelve
-twenty
-twice
-twin
-twist
-two
-type
-typical
-ugly
-umbrella
-unable
-unaware
-uncle
-uncover
-under
-undo
-unfair
-unfold
-unhappy
-uniform
-unique
-unit
-universe
-unknown
-unlock
-until
-unusual
-unveil
-update
-upgrade
-uphold
-upon
-upper
-upset
-urban
-urge
-usage
-use
-used
-useful
-useless
-usual
-utility
-vacant
-vacuum
-vague
-valid
-valley
-valve
-van
-vanish
-vapor
-various
-vast
-vault
-vehicle
-velvet
-vendor
-venture
-venue
-verb
-verify
-version
-very
-vessel
-veteran
-viable
-vibrant
-vicious
-victory
-video
-view
-village
-vintage
-violin
-virtual
-virus
-visa
-visit
-visual
-vital
-vivid
-vocal
-voice
-void
-volcano
-volume
-vote
-voyage
-wage
-wagon
-wait
-walk
-wall
-walnut
-want
-warfare
-warm
-warrior
-wash
-wasp
-waste
-water
-wave
-way
-wealth
-weapon
-wear
-weasel
-weather
-web
-wedding
-weekend
-weird
-welcome
-west
-wet
-whale
-what
-wheat
-wheel
-when
-where
-whip
-whisper
-wide
-width
-wife
-wild
-will
-win
-window
-wine
-wing
-wink
-winner
-winter
-wire
-wisdom
-wise
-wish
-witness
-wolf
-woman
-wonder
-wood
-wool
-word
-work
-world
-worry
-worth
-wrap
-wreck
-wrestle
-wrist
-write
-wrong
-yard
-year
-yellow
-you
-young
-youth
-zebra
-zero
-zone
-zoo`.split("\n");
diff --git a/src/lib/nostr.ts b/src/lib/nostr.ts
index 1a02114d..bd2e65fe 100644
--- a/src/lib/nostr.ts
+++ b/src/lib/nostr.ts
@@ -18,8 +18,8 @@ import {
 } from "nostr-tools/nip49";
 
 import { mnemonicToEntropy, entropyToMnemonic } from "@scure/bip39";
-import wordlist from "$lib/english";
 import { bech32m } from "@scure/base";
+  import { wordlist } from "@scure/bip39/wordlists/english";
 
 import { generateSeedWords, privateKeyFromSeedWords } from "nostr-tools/nip06";
 
diff --git a/src/lib/store.ts b/src/lib/store.ts
index 7609a67c..3c1ff321 100644
--- a/src/lib/store.ts
+++ b/src/lib/store.ts
@@ -48,6 +48,7 @@ export let invoice = writable();
 export let last = writable();
 export let loginRedirect = writable();
 export let decrypted = persistLocal("decrypted", {});
+export let mnemonic = persistSession("mnemonic");
 export let newPayment = persistLocal("newPayment");
 export let password = writable<string | undefined>();
 export let passwordPrompt = writable();
diff --git a/src/locales/en.json b/src/locales/en.json
index 29929c6b..ad42b8cc 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -19,6 +19,7 @@
 			}
 		},
 		"locations": {
+      "viewMap": "View map",
 			"header": "Locations",
 			"description": "Over 500 businesses worldwide are accepting bitcoin with Coinos. We hope that yours will be next!"
 		}
@@ -155,6 +156,7 @@
 		"subheader": "Latest Updates"
 	},
 	"user": {
+    "url": "Public URL",
 		"install": "Install app",
 		"moreDetails": "Profile details",
 		"noMessages": "You have not sent or received any messages",
@@ -182,6 +184,7 @@
 		"this": "This",
 		"lightningAddress": "Lightning address",
 		"dashboard": {
+      "setup": "Setup self-custody",
 			"payNow": "Pay now",
 			"checkout": "Checkout",
 			"go": "Go",
@@ -325,7 +328,6 @@
 		"voucher": "Payment code",
 		"qr": "QR",
 		"copy": "Copy",
-		"copyPr": "Copy pay request",
 		"amountPrompt": "Always prompt for amount",
 		"shareLink": "Share link",
 		"copyLink": "Copy link",
diff --git a/src/routes/(app)/[username]/(profile)/+layout.svelte b/src/routes/(app)/[username]/(profile)/+layout.svelte
index c4750581..2caf9b30 100644
--- a/src/routes/(app)/[username]/(profile)/+layout.svelte
+++ b/src/routes/(app)/[username]/(profile)/+layout.svelte
@@ -84,11 +84,10 @@
   <div
     class="w-full lg:w-[280px] xl:w-[360px] lg:absolute space-y-5 left-20 mx-auto mb-5"
   >
-    <div
-      class="flex text-3xl font-bold text-center mx-auto justify-center gap-2"
-    >
-      <div class="my-auto break-words w-full">{display || username}</div>
-    </div>
+    <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>
+        <Icon icon="qr" style="w-8 invert my-auto" />
+    </button>
 
     {#if subject.address}
       <div
@@ -112,68 +111,51 @@
           <span class="text-secondary">{$t("user.followers")}</span></a
         >
       </div>
-
-      <button
-        type="button"
-        on:click={toggleDetails}
-        class="flex text-base text-secondary mx-auto"
-      >
-        <div class="mt-1">
-          {$t("user.moreDetails")}
-        </div>
-        <div
-          class:-rotate-90={showDetails}
-          class:rotate-180={!showDetails}
-          class="my-auto"
-        >
-          <Icon icon="chevron-left" style="w-6 mr-2" />
-        </div>
-      </button>
     </div>
 
     {#if showDetails}
-      <div class="text-xl space-y-5">
+      <div class="space-y-5 pb-20">
         <div>
-          <div class="font-bold">{$t("user.profilePage")}</div>
+          <div class="text-secondary">{$t("user.lightningAddress")}</div>
           <div class="flex gap-4">
-            <div class="break-all grow text-secondary">
-              {profile}
+            <div class="break-all grow text-xl">
+              {lnaddr}
             </div>
             <div class="flex mb-auto gap-1">
-              <button class="my-auto" on:click={() => copy(profile)}
+              <button class="my-auto" on:click={() => copy(lnaddr)}
                 ><Icon icon="copy" style="max-w-max w-8 min-w-[32px]" /></button
               >
-              <a
-                href={`/qr/${encodeURIComponent(
-                  `${$page.url.protocol}//${profile}`
-                )}`}
-                class="my-auto"
-              >
+              <a href={`/qr/${encodeURIComponent(lnaddr)}`} class="my-auto">
                 <Icon icon="qr" style="invert max-w-max min-w-[32px]" />
               </a>
             </div>
           </div>
         </div>
         <div>
-          <div class="font-bold">{$t("user.lightningAddress")}</div>
+          <div class="text-secondary">{$t("user.url")}</div>
           <div class="flex gap-4">
-            <div class="break-all grow text-secondary">
-              {lnaddr}
+            <div class="break-all grow text-xl">
+              {profile}
             </div>
             <div class="flex mb-auto gap-1">
-              <button class="my-auto" on:click={() => copy(lnaddr)}
+              <button class="my-auto" on:click={() => copy(profile)}
                 ><Icon icon="copy" style="max-w-max w-8 min-w-[32px]" /></button
               >
-              <a href={`/qr/${encodeURIComponent(lnaddr)}`} class="my-auto">
+              <a
+                href={`/qr/${encodeURIComponent(
+                  `${$page.url.protocol}//${profile}`
+                )}`}
+                class="my-auto"
+              >
                 <Icon icon="qr" style="invert max-w-max min-w-[32px]" />
               </a>
             </div>
           </div>
         </div>
         <div>
-          <div class="font-bold">{$t("user.nostrPubkey")}</div>
+          <div class="text-secondary">{$t("user.nostrPubkey")}</div>
           <div class="flex gap-4">
-            <div class="break-all grow text-secondary">
+            <div class="break-all grow text-xl">
               {npub}
             </div>
             <div class="flex my-auto gap-1">
@@ -188,9 +170,9 @@
         </div>
         {#if user.id === subject.id}
           <div>
-            <div class="font-bold">{$t("user.nwc")}</div>
+            <div class="text-secondary">{$t("user.nwc")}</div>
             <div class="flex gap-4">
-              <div class="break-all grow text-secondary">
+              <div class="break-all grow text-xl">
                 {nwc}
               </div>
               <div class="flex my-auto gap-1">
diff --git a/src/routes/(app)/[username]/(profile)/+page.svelte b/src/routes/(app)/[username]/(profile)/+page.svelte
index 32e6807a..afb4e58c 100644
--- a/src/routes/(app)/[username]/(profile)/+page.svelte
+++ b/src/routes/(app)/[username]/(profile)/+page.svelte
@@ -1,283 +1,67 @@
 <script>
-  import { browser } from "$app/environment";
-  import { goto, invalidate } from "$app/navigation";
-  import { btc, f, sat, post } from "$lib/utils";
+  import { btc, f, sat } from "$lib/utils";
   import Icon from "$comp/Icon.svelte";
+  import Account from "$comp/Account.svelte";
   import Balance from "$comp/Balance.svelte";
-  import DeleteItem from "$comp/DeleteItem.svelte";
+  import Items from "$comp/Items.svelte";
   import { t } from "$lib/translations";
-  import { fade } from "svelte/transition";
-  import { cubicIn } from "svelte/easing";
-  import { flip } from "svelte/animate";
   import { installPrompt } from "$lib/store";
 
-  import {
-    dndzone,
-    SHADOW_ITEM_MARKER_PROPERTY_NAME,
-    SOURCES,
-    TRIGGERS,
-  } from "svelte-dnd-action";
-
   export let data;
 
-  let flipDurationMs = 200;
-  let dropTargetStyle = {};
-
   let { subject, user, items, rates } = data;
   $: ({ currency } = subject);
   $: rate = rates[currency];
-  $: refresh(data);
-  let refresh = (d) => ({ items, subject, user, rates } = d);
-  let dragDisabled =
-    subject?.id !== user?.id || (browser && window.innerWidth < 768);
-
-  let deleting;
   $: total = items.reduce((a, b) => a + b.price * b.quantity, 0);
-  let del = (item) => {
-    deleting = item;
-  };
-
-  function handleConsider(e) {
-    const {
-      items: newItems,
-      info: { source, trigger },
-    } = e.detail;
-    items = newItems;
-    if (source === SOURCES.KEYBOARD && trigger === TRIGGERS.DRAG_STOPPED)
-      reset();
-  }
 
-  async function handleFinalize(e) {
-    const {
-      items: newItems,
-      info: { source },
-    } = e.detail;
-    items = newItems;
-    if (source === SOURCES.POINTER) reset();
-
-    if (subject?.id === user?.id) {
-      await post("/api/items/sort", { items });
-      invalidate("app:items");
-    }
-  }
-
-  function startDrag(e) {
-    e.preventDefault();
-    dragDisabled = false;
-  }
-
-  function handleKeyDown(e) {
-    if ((e.key === "Enter" || e.key === " ") && dragDisabled)
-      dragDisabled = false;
-  }
-
-  $: if (total > 0 && browser) {
-    let payButton = document.querySelector("#payButton");
-    if (payButton) payButton.addEventListener("click", checkout);
-  }
-
-  let checkout = async () => {
-    let invoice = {
-      type: "lightning",
-      amount: btc(total, rate),
-      currency,
-      items: items.filter((i) => i.quantity > 0),
-      prompt: subject.prompt,
-      memoPrompt: subject.memoPrompt,
-      rate,
-    };
-
-    let { id } = await post(`/${subject.username}/invoice`, {
-      invoice,
-      user: { username: subject.username },
-    });
-
-    if (invoice.memoPrompt) {
-      return goto(`/${subject.username}/invoice/${id}/memo`);
-    }
-    goto(`/${subject.username}/invoice/${id}`);
-  };
-
-  let reset = () =>
-    (dragDisabled =
-      user?.username !== subject?.username || window.innerWidth < 768);
+  let refresh = (d) => ({ items, subject, user, rates } = d);
+  $: refresh(data);
 
   let install = async () => {
     if (!$installPrompt) return;
     await $installPrompt.prompt();
     $installPrompt = null;
   };
-</script>
 
-<svelte:window on:resize={reset} />
+  user.savings = 0;
 
-{#if deleting}
-  <DeleteItem bind:item={deleting} />
+  let accounts = [
+    { balance: user.balance, setup: true, type: "Cash" },
+    { balance: user.savings, setup: false, type: "Savings" },
+  ];
+</script>
+
+{#if !user.balance}
+  <div class="mb-8">
+    <p class="text-secondary text-lg">
+      {$t("user.welcome")}
+    </p>
+  </div>
 {/if}
 
 <div class="space-y-5">
   {#if user?.id === subject.id}
-    <div class="flex justify-center lg:justify-start">
-      <Balance {user} {rate} />
-    </div>
-
-    {#if !user.balance}
-      <div class="mb-8">
-        <p class="text-secondary text-lg">
-          {$t("user.welcome")}
-        </p>
-      </div>
-    {/if}
-
-    <div class="flex flex-wrap gap-3 justify-center w-full text-xl">
-      <a href={`/send`} class="contents grow">
-        <button
-          type="button"
-          class="rounded-2xl border py-5 px-6 font-bold hover:opacity-80 flex bg-primary grow"
-        >
-          <div class="mx-auto flex gap-2">
-            <Icon icon="send" style="w-8" />
-            <div class="my-auto">{$t("user.dashboard.send")}</div>
-          </div>
-        </button>
-      </a>
-
-      <a href={`/${user.username}/receive`} class="contents">
-        <button
-          class="rounded-2xl border py-5 px-6 font-bold hover:opacity-80 flex bg-primary grow"
-        >
-          <div class="mx-auto flex gap-2">
-            <Icon icon="receive" style="w-8" />
-            <div class="my-auto">{$t("user.dashboard.receive")}</div>
-          </div>
-        </button>
-      </a>
-
-      {#if $installPrompt}
-        <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}
-        >
-          <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}
+    {#each accounts as account}
+      <Account {user} {rate} {account} />
+    {/each}
 
-  {#if items.length}
-    <h2 class="text-2xl font-bold">Select items</h2>
-  {/if}
-  <div
-    class="grid sm:grid-cols-2 gap-4 pb-20"
-    use:dndzone={{ items, flipDurationMs, dropTargetStyle, dragDisabled }}
-    on:consider={handleConsider}
-    on:finalize={handleFinalize}
-  >
-    {#each items as i (i.id)}
+    {#if $installPrompt}
       <button
-        type="button"
-        class="w-full text-center cursor-pointer hover:opacity-80 mb-auto"
-        on:click={() => i.quantity++}
+        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}
       >
-        <div class="relative w-full h-64 overflow-hidden rounded-xl">
-          {#if i[SHADOW_ITEM_MARKER_PROPERTY_NAME]}
-            <div
-              in:fade={{ duration: 200, easing: cubicIn }}
-              class="custom-shadow-item"
-            />
-          {:else if i.image}
-            <img
-              src={`/api/public/${i.image}.webp`}
-              alt={i.name}
-              class="mx-auto object-cover h-full w-full"
-            />
-          {:else}
-            <div
-              class="bg-gradient-to-r from-primary to-gradient mb-4 cursor-pointer hover:opacity-80 w-full h-full"
-              alt="Banner"
-            />
-          {/if}
-          {#if user?.username === subject.username}
-            <div class="flex gap-2 justify-center absolute top-2 right-2">
-              <button type="button" on:click|stopPropagation={() => {}}>
-                <a href={`/${user.username}/items/${i.id}`}>
-                  <button
-                    class="bg-black rounded-full w-12 h-12 bg-opacity-40 hover:bg-opacity-100"
-                  >
-                    <Icon icon="edit" style="w-8 mx-auto invert" />
-                  </button>
-                </a>
-              </button>
-              <button
-                class="bg-black rounded-full w-12 h-12 bg-opacity-40 hover:bg-opacity-100"
-                on:click|stopPropagation={() => del(i)}
-              >
-                <Icon icon="trash" style="w-8 mx-auto invert" />
-              </button>
-              <button
-                type="button"
-                on:click|stopPropagation={() => {}}
-                class="sm:hidden"
-                on:mousedown={startDrag}
-                on:touchstart={startDrag}
-                on:keydown={handleKeyDown}
-              >
-                <a href={`/${user.username}/items/${i.id}`}>
-                  <button
-                    class="bg-black rounded-full w-12 h-12 bg-opacity-40 hover:bg-opacity-100"
-                  >
-                    <Icon icon="move" style="w-8 mx-auto invert" />
-                  </button>
-                </a>
-              </button>
-            </div>
-          {/if}
-        </div>
-        <div class="bg-white rounded-xl py-2">
-          <div class="flex text-left gap-2">
-            <div class="overflow-hidden space-y-1">
-              <div class="text-2xl break-words">{i.name}</div>
-              <div class="flex gap-2">
-                <div class="font-semibold text-lg">
-                  {f(i.price, currency)}
-                </div>
-                <div class="text-secondary my-auto">
-                  {sat(btc(i.price, rate))}
-                </div>
-              </div>
-            </div>
-            <div class="flex gap-1 ml-auto mb-auto justify-around tabular-nums">
-              {#if i.quantity}
-                <button
-                  type="button"
-                  on:click|stopPropagation={() =>
-                    i.quantity > 0 && i.quantity--}
-                >
-                  <Icon icon="minus" style="w-10 min-w-10" />
-                </button>
-              {/if}
-              <div class="text-2xl my-auto text-center">
-                {#if i.quantity}{i.quantity}{:else}&mdash;{/if}
-              </div>
-              {#if i.quantity}
-                <button
-                  type="button"
-                  on:click|stopPropagation={() => i.quantity++}
-                >
-                  <Icon icon="plus" style="w-10 min-w-10" />
-                </button>
-              {/if}
-            </div>
+        <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>
-    {/each}
-  </div>
+    {/if}
+  {/if}
+
+  <Items {items} {subject} {user} {total} {currency} {rate} />
+
   <div
     class="fixed inset-x-0 mx-auto flex bottom-16"
     class:static={!items.length}
diff --git a/src/routes/(app)/[username]/account/setup/+page.svelte b/src/routes/(app)/[username]/account/setup/+page.svelte
new file mode 100644
index 00000000..5c2102c7
--- /dev/null
+++ b/src/routes/(app)/[username]/account/setup/+page.svelte
@@ -0,0 +1,64 @@
+<script>
+  import { copy } from "$lib/utils";
+  import { t } from "$lib/translations";
+  import Icon from "$comp/Icon.svelte";
+  import { mnemonic } from "$lib/store";
+  import { generateMnemonic } from "@scure/bip39";
+  import { wordlist } from "@scure/bip39/wordlists/english";
+
+  export let data;
+  let { user } = data;
+
+  let reveal;
+
+  let toggleSeed = async () => {
+    try {
+      $mnemonic = await generateMnemonic(wordlist);
+      reveal = !reveal;
+    } catch (e) {
+      console.log(e);
+    }
+  };
+</script>
+
+<div class="space-y-5">
+  <h1 class="text-center text-3xl font-semibold">Account setup</h1>
+  <h2 class="text-center text-2xl text-secondary">Step 1</h2>
+
+  <div class="container w-full mx-auto text-lg px-4 max-w-xl space-y-5">
+    <p class="text-secondary mb-1">
+      The keys to your savings account are derived from a seed phrase. When
+      you're ready, write it down and keep it safe.
+    </p>
+
+    <p class="text-secondary mb-1">
+      Whoever knows these words can withdraw funds from the account. We can't
+      help you recover them if you lose them.
+    </p>
+
+    {#if reveal}
+      <div class="text-2xl border p-4 text-center rounded-2xl">
+        {$mnemonic}
+      </div>
+
+      <div>
+        <a href={`/${user.username}/account/setup/step2`} class="contents">
+          <button
+            type="button"
+            class="bg-black text-white w-full px-5 py-6 text-xl rounded-2xl font-bold"
+            on:click={toggleSeed}
+          >
+            I've written down my seed phrase
+          </button>
+        </a>
+      </div>
+    {:else}
+      <div class="flex justify-center">
+        <button type="button" class="primary" on:click={toggleSeed}>
+          <Icon icon="warning" style="mr-2 w-6 my-auto" />
+          {$t("user.settings.revealSeed")}
+        </button>
+      </div>
+    {/if}
+  </div>
+</div>
diff --git a/src/routes/(app)/[username]/account/setup/step2/+page.svelte b/src/routes/(app)/[username]/account/setup/step2/+page.svelte
new file mode 100644
index 00000000..3b403295
--- /dev/null
+++ b/src/routes/(app)/[username]/account/setup/step2/+page.svelte
@@ -0,0 +1,46 @@
+<script lang="ts">
+  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 { wordlist } from "@scure/bip39/wordlists/english";
+
+  export let data;
+  let { user } = data;
+
+  let password;
+
+  let submit = async () => {
+    console.log($mnemonic);
+    let t = await encrypt(mnemonicToEntropy($mnemonic, wordlist), password);
+
+    let m = await decrypt(t, password);
+    console.log(entropyToMnemonic(m, wordlist));
+  };
+</script>
+
+<div class="space-y-5">
+  <div>
+    <h1 class="text-center text-3xl font-semibold">Account setup</h1>
+    <h2 class="text-center text-2xl text-secondary">Step 2</h2>
+  </div>
+
+  <form
+    on:submit|preventDefault={submit}
+    class="container w-full mx-auto text-lg px-4 max-w-xl space-y-5"
+  >
+    <p class="text-secondary mb-1">
+      Add an additional password to your seed phrase. It should be different
+      than your login password. We can't reset it if you lose it.
+    </p>
+
+    <input 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"
+    >
+      Submit
+    </button>
+  </form>
+</div>
-- 
cgit v1.2.3


From 1b7cc6d64fb2ee3340a18d0924c4b64afabbc1e1 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Fri, 6 Sep 2024 09:32:53 -0700
Subject: per account payment pages

---
 src/components/Account.svelte                      |  87 +++---
 src/components/Numpad.svelte                       |   2 +-
 src/lib/types.ts                                   |   1 +
 src/routes/(app)/[username]/(profile)/+page.svelte |   4 +-
 .../payments/[...page]/+page.server.ts             |  26 ++
 .../[...account]/payments/[...page]/+page.svelte   | 315 +++++++++++++++++++++
 .../[...account]/payments/[...page]/+server.ts     |  18 ++
 .../receive/[...param]/+page.server.ts             |  22 ++
 .../[...account]/receive/[...param]/+page.svelte   | 116 ++++++++
 .../(app)/[username]/account/setup/+page.svelte    |   4 +-
 .../[username]/account/setup/step2/+page.svelte    |  15 +-
 .../(app)/[username]/invoice/[id]/+page.svelte     |  89 +++---
 .../[username]/payments/[...page]/+page.server.ts  |  26 --
 .../[username]/payments/[...page]/+page.svelte     | 315 ---------------------
 .../(app)/[username]/payments/[...page]/+server.ts |  18 --
 .../[username]/receive/[...param]/+page.server.ts  |  20 --
 .../[username]/receive/[...param]/+page.svelte     | 116 --------
 17 files changed, 594 insertions(+), 600 deletions(-)
 create mode 100644 src/routes/(app)/[username]/[...account]/payments/[...page]/+page.server.ts
 create mode 100644 src/routes/(app)/[username]/[...account]/payments/[...page]/+page.svelte
 create mode 100644 src/routes/(app)/[username]/[...account]/payments/[...page]/+server.ts
 create mode 100644 src/routes/(app)/[username]/[...account]/receive/[...param]/+page.server.ts
 create mode 100644 src/routes/(app)/[username]/[...account]/receive/[...param]/+page.svelte
 delete mode 100644 src/routes/(app)/[username]/payments/[...page]/+page.server.ts
 delete mode 100644 src/routes/(app)/[username]/payments/[...page]/+page.svelte
 delete mode 100644 src/routes/(app)/[username]/payments/[...page]/+server.ts
 delete mode 100644 src/routes/(app)/[username]/receive/[...param]/+page.server.ts
 delete mode 100644 src/routes/(app)/[username]/receive/[...param]/+page.svelte

(limited to 'src')

diff --git a/src/components/Account.svelte b/src/components/Account.svelte
index 5286c4d3..a781e809 100644
--- a/src/components/Account.svelte
+++ b/src/components/Account.svelte
@@ -4,50 +4,55 @@
   import { t } from "$lib/translations";
 
   export let user, rate, account;
-  let { balance, setup, type } = account;
+  let { balance, setup, type, id } = account;
 </script>
 
-<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-secondary">{type}</div>
-  </div>
+<a href={`/${user.username}/${id}/payments`.replace(/undefined\//, "")}>
+  <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-secondary">{type}</div>
+    </div>
 
-  <div class="flex flex-wrap gap-3 justify-center w-full text-xl">
-    {#if setup}
-      <a href={`/send`} class="contents grow">
-        <button
-          type="button"
-          class="rounded-2xl border py-5 px-6 font-bold hover:opacity-80 flex bg-primary grow"
-        >
-          <div class="mx-auto flex gap-2">
-            <Icon icon="send" style="w-8" />
-            <div class="my-auto">{$t("user.dashboard.send")}</div>
-          </div>
-        </button>
-      </a>
+    <div class="flex flex-wrap gap-3 justify-center w-full text-xl">
+      {#if setup}
+        <a href={`/send`} class="contents grow">
+          <button
+            type="button"
+            class="rounded-2xl border py-5 px-6 font-bold hover:opacity-80 flex bg-primary grow"
+          >
+            <div class="mx-auto flex gap-2">
+              <Icon icon="send" style="w-8" />
+              <div class="my-auto">{$t("user.dashboard.send")}</div>
+            </div>
+          </button>
+        </a>
 
-      <a href={`/${user.username}/receive`} class="contents">
-        <button
-          class="rounded-2xl border py-5 px-6 font-bold hover:opacity-80 flex bg-primary grow"
-        >
-          <div class="mx-auto flex gap-2">
-            <Icon icon="receive" style="w-8" />
-            <div class="my-auto">{$t("user.dashboard.receive")}</div>
-          </div>
-        </button>
-      </a>
-    {:else}
-      <a href={`/${user.username}/account/setup`} class="contents">
-        <button
-          class="rounded-2xl border py-5 px-6 font-bold hover:opacity-80 flex bg-primary grow"
+        <a
+          href={`/${user.username}/${id}/receive`.replace(/undefined\//, "")}
+          class="contents"
         >
-          <div class="mx-auto flex gap-2">
-            <Icon icon="settings" style="w-8" />
-            <div class="my-auto">{$t("user.dashboard.setup")}</div>
-          </div>
-        </button>
-      </a>
-    {/if}
+          <button
+            class="rounded-2xl border py-5 px-6 font-bold hover:opacity-80 flex bg-primary grow"
+          >
+            <div class="mx-auto flex gap-2">
+              <Icon icon="receive" style="w-8" />
+              <div class="my-auto">{$t("user.dashboard.receive")}</div>
+            </div>
+          </button>
+        </a>
+      {:else}
+        <a href={`/${user.username}/account/setup`} class="contents">
+          <button
+            class="rounded-2xl border py-5 px-6 font-bold hover:opacity-80 flex bg-primary grow"
+          >
+            <div class="mx-auto flex gap-2">
+              <Icon icon="settings" style="w-8" />
+              <div class="my-auto">{$t("user.dashboard.setup")}</div>
+            </div>
+          </button>
+        </a>
+      {/if}
+    </div>
   </div>
-</div>
+</a>
diff --git a/src/components/Numpad.svelte b/src/components/Numpad.svelte
index 88b5b899..78322ff5 100644
--- a/src/components/Numpad.svelte
+++ b/src/components/Numpad.svelte
@@ -1,7 +1,7 @@
 <script>
   import Left from "$comp/Left.svelte";
   import Icon from "$comp/Icon.svelte";
-  import { f, s, focus, post, warning, sat, sats } from "$lib/utils";
+  import { f, s, focus, warning, sat, sats } from "$lib/utils";
   import { t } from "$lib/translations";
 
   export let amount,
diff --git a/src/lib/types.ts b/src/lib/types.ts
index 33f78c85..666ea1fb 100644
--- a/src/lib/types.ts
+++ b/src/lib/types.ts
@@ -14,6 +14,7 @@ export interface User {
 }
 
 export interface Invoice {
+  account: string;
   id?: string;
   memoPrompt?: boolean;
   memo?: string;
diff --git a/src/routes/(app)/[username]/(profile)/+page.svelte b/src/routes/(app)/[username]/(profile)/+page.svelte
index afb4e58c..7c0de9d8 100644
--- a/src/routes/(app)/[username]/(profile)/+page.svelte
+++ b/src/routes/(app)/[username]/(profile)/+page.svelte
@@ -23,11 +23,11 @@
     $installPrompt = null;
   };
 
-  user.savings = 0;
+  if (user) user.savings = 0;
 
   let accounts = [
     { balance: user.balance, setup: true, type: "Cash" },
-    { balance: user.savings, setup: false, type: "Savings" },
+    { id: "pubtest", balance: user.savings, setup: !!user.seed, type: "Savings" },
   ];
 </script>
 
diff --git a/src/routes/(app)/[username]/[...account]/payments/[...page]/+page.server.ts b/src/routes/(app)/[username]/[...account]/payments/[...page]/+page.server.ts
new file mode 100644
index 00000000..070349f8
--- /dev/null
+++ b/src/routes/(app)/[username]/[...account]/payments/[...page]/+page.server.ts
@@ -0,0 +1,26 @@
+import { get, auth } from "$lib/utils";
+
+let limit = 25;
+
+export async function load({ cookies, depends, params }) {
+  depends("app:payments");
+
+  let parts = params.page.split("/");
+
+  let start, end, page;
+  if (parts.length === 1) [page] = parts;
+  if (parts.length === 2) [start, page] = parts;
+  if (parts.length === 3) [start, end, page] = parts;
+  if (!parseInt(page)) page = 1;
+
+  let offset = (page - 1) * limit;
+  if (!start) start = Date.now() / 1000 - 24 * 60 * 60;
+
+  let url = `/payments?start=${start * 1000}&limit=${limit}&offset=${offset}`;
+  if (end) url += `&end=${end * 1000}`;
+
+  let { count, payments, incoming, outgoing } = await get(url, auth(cookies));
+  let pages = new Array(Math.ceil(count / limit));
+
+  return { payments, page, pages, start, end, incoming, outgoing };
+}
diff --git a/src/routes/(app)/[username]/[...account]/payments/[...page]/+page.svelte b/src/routes/(app)/[username]/[...account]/payments/[...page]/+page.svelte
new file mode 100644
index 00000000..1efdc2ec
--- /dev/null
+++ b/src/routes/(app)/[username]/[...account]/payments/[...page]/+page.svelte
@@ -0,0 +1,315 @@
+<script>
+  import Avatar from "$comp/Avatar.svelte";
+  import Icon from "$comp/Icon.svelte";
+  import { onMount } from "svelte";
+  import { format } from "date-fns";
+  import { newPayment } from "$lib/store";
+  import { t } from "$lib/translations";
+  import { get, f, s, sat, sats, types } from "$lib/utils";
+  import { page } from "$app/stores";
+  import { differenceInDays, getUnixTime, sub } from "date-fns";
+  import { goto, invalidate } from "$app/navigation";
+
+  export let data;
+
+  let { start, end, user, rates, payments } = data;
+
+  let change = ({ target: { value } }) => goto(value);
+  let link = (p) => {
+    if (p.pot) return `/pot/${p.pot}`;
+    if (p.with) return "/" + p.with.username;
+    return `/p/${p.id}`;
+  };
+
+  $: presets = [
+    {
+      title: $t("payments.day"),
+      start: sub(new Date(), { days: 1 }),
+      end: null,
+    },
+    {
+      title: $t("payments.week"),
+      start: sub(new Date(), { days: 7 }),
+      end: null,
+    },
+    {
+      title: $t("payments.month"),
+      start: sub(new Date(), { months: 1 }),
+      end: null,
+    },
+    {
+      title: $t("payments.all"),
+      start: sub(new Date(), { years: 5 }),
+      end: null,
+    },
+  ];
+
+  $: selection = start
+    ? presets.findIndex(
+        (p) => Math.abs(differenceInDays(new Date(start * 1000), p.start)) < 1
+      )
+    : 0;
+
+  let p,
+    incoming,
+    outgoing,
+    pages = [];
+  $: data &&
+    ({ page: p, pages, start, end, incoming, outgoing, payments } = data);
+
+  $: $page && ($newPayment = false);
+  $: $newPayment && invalidate(`/users/${user.username}`);
+
+  $: path = $page.params.page
+    ? $page.url.pathname.substring(0, $page.url.pathname.lastIndexOf("/"))
+    : $page.url.pathname;
+
+  let csv = async () => {
+    let url = `/${user.username}/payments`;
+    if (start) url += `/${start}`;
+    if (end) url += `/${end}`;
+
+    let { payments } = await get(url);
+
+    payments = payments.map((p) => ({
+      ...p,
+      created: new Date(p.created),
+      total: p.amount + (p.tip || 0),
+      platform_fee: p.ourfee,
+      amount_fiat: f((p.amount * p.rate) / sats, p.currency),
+      fee_fiat: p.fee ? f((p.fee * p.rate) / sats, p.currency) : null,
+      platform_fee_fiat: p.ourfee ? f((p.ourfee * p.rate) / sats, p.currency) : null,
+      tip_fiat: p.tip ? f((p.tip * p.rate) / sats, p.currency) : null,
+      total_fiat: f(((p.amount + (p.tip || 0)) * p.rate) / sats, p.currency),
+    }));
+
+    let keys = [
+      "type",
+      "id",
+      "created",
+      "rate",
+      "currency",
+      "amount",
+      "tip",
+      "total",
+      "fee",
+      "platform_fee",
+      "amount_fiat",
+      "tip_fiat",
+      "total_fiat",
+      "fee_fiat",
+      "platform_fee_fiat",
+    ];
+
+    let csv =
+      keys.map((k) => `"${k}"`).join(",") +
+      "\n" +
+      payments
+        .map((r) => keys.map((k) => `"${r[k] || ""}"`).join(","))
+        .join("\n");
+
+    let filename = "payments.csv";
+    let blob = new Blob([csv], { type: "text/csv;charset=utf-8;" });
+    if (navigator.msSaveBlob) {
+      navigator.msSaveBlob(blob, filename);
+    } else {
+      let link = document.createElement("a");
+      if (link.download !== undefined) {
+        let url = URL.createObjectURL(blob);
+        link.setAttribute("href", url);
+        link.setAttribute("download", filename);
+        link.style.visibility = "hidden";
+        document.body.appendChild(link);
+        link.click();
+        document.body.removeChild(link);
+      }
+    }
+  };
+</script>
+
+<div class="mt-24 mb-20 payments">
+  <h1 class="px-3 md:px-0 text-center text-3xl md:text-4xl font-semibold mb-10">
+    {$t("payments.header")}
+  </h1>
+
+  <div class="container w-full mx-auto text-lg px-4 max-w-xl space-y-5">
+    <div class="flex text-md text-secondary relative">
+      <div class="mx-auto flex justify-center w-full gap-1">
+        {#each presets as { start, end, title }, i}
+          <a
+            class:active={selection === i}
+            href={`/${user.username}/payments/${getUnixTime(start) + "/"}1`}
+          >
+            <button
+              class="text-sm md:text-lg rounded-full border py-2 px-4 hover:opacity-80 min-w-[72px]"
+            >
+              <div class="my-auto">{title}</div>
+            </button>
+          </a>
+        {/each}
+      </div>
+    </div>
+
+    <div class="flex flex-wrap justify-center mb-8">
+      {#if pages.length > 1}
+        {#each pages as _, i}
+          <a
+            class="mr-1 last:mr-0"
+            href={`${path}/${i + 1}`}
+            class:active={parseInt(p) === i + 1}
+          >
+            <div
+              class="border py-2 rounded-full border-2 w-12 h-12 hover:opacity-80 text-center"
+            >
+              {i + 1}
+            </div>
+          </a>
+        {/each}
+      {/if}
+    </div>
+
+    <div class="text-base">
+      {#each payments as p}
+        <a href={`/payment/${p.id}`}>
+          <div class="grid grid-cols-12 border-b h-24 hover:bg-gray-100 px-4">
+            <div class="whitespace-nowrap my-auto col-span-3">
+              <div class="font-bold" class:text-red-800={p.amount < 0}>
+                {f(Math.abs(p.amount) * (p.rate / sats), p.currency)}
+                {#if p.tip}
+                  <span class="text-sm text-secondary">
+                    +{Math.round((p.tip / Math.abs(p.amount)) * 100)}%
+                  </span>
+                {/if}
+              </div>
+
+              <div class="text-secondary">
+                {sat(Math.abs(p.amount) + (p.tip || 0))}
+              </div>
+            </div>
+
+            <div
+              class="flex my-auto col-span-5 truncate text-ellipsis overflow-hidden mx-auto"
+            >
+              {#if p.type === types.pot}
+                <a href={`/pot/${p.memo}`}>
+                  <div class="text-secondary flex">
+                    <div class="my-auto mr-1">
+                      <img src="/images/moneypot.png" class="w-12" alt="Pot" />
+                    </div>
+
+                    <div class="my-auto">Pot</div>
+                  </div>
+                </a>
+              {:else if p.with}
+                <div class="flex">
+                  <div class="my-auto">
+                    <Avatar user={p.with} size={12} disabled={true} />
+                  </div>
+                  <div class="my-auto ml-1 text-secondary">
+                    {p.with.username}
+                  </div>
+                </div>
+              {:else}
+                <div class="text-secondary flex">
+                  {#if [types.ecash, types.lightning].includes(p.type)}
+                    <div class="text-3xl">⚡️</div>
+                  {:else if p.type === types.bitcoin}
+                    <div class="my-auto mr-1">
+                      <img
+                        src="/images/bitcoin.svg"
+                        class="w-12 border-4 border-transparent"
+                        alt="Bitcoin"
+                      />
+                    </div>
+                  {:else if p.type === types.liquid}
+                    <div class="my-auto mr-1">
+                      <img
+                        src="/images/liquid.svg"
+                        class="w-12 border-4 border-transparent"
+                        alt="Liquid"
+                      />
+                    </div>
+                  {/if}
+
+                  <div class="my-auto">
+                    {p.amount > 0
+                      ? p.confirmed
+                        ? "Received"
+                        : "Pending"
+                      : "Sent"}
+                  </div>
+                </div>
+              {/if}
+            </div>
+
+            <div class="text-secondary text-right text-sm my-auto col-span-3">
+              <div>
+                {format(new Date(p.created), "h:mm aaa")}
+              </div>
+              <div>
+                {format(new Date(p.created), "MMM d, yy")}
+              </div>
+            </div>
+          </div>
+        </a>
+      {:else}
+        <p class="text-secondary text-lg text-center">{$t("payments.empty")}</p>
+      {/each}
+    </div>
+
+    <div class="grid grid-cols-3 w-full text-center text-lg">
+      {#each Object.keys(incoming) as c}
+        <span class="text-base text-secondary text-left"></span>
+        <!-- <span class="text-base text-secondary" -->
+        <!--   >{$t("payments.subtotal")}</span -->
+        <!-- > -->
+        <span class="text-base text-secondary">
+          {#if tipsIn || tipsOut}{$t("payments.tips")}{/if}
+        </span>
+        <span class="text-base text-secondary"
+          >{$t("payments.total")}</span
+        >
+
+        {@const totalIn = incoming[c]?.fiat || 0}
+        {@const tipsIn = incoming[c]?.fiatTips || 0}
+        {@const subtotalIn = totalIn - tipsIn}
+
+        {@const totalOut = -outgoing[c]?.fiat || 0}
+        {@const tipsOut = outgoing[c]?.fiatTips || 0}
+        {@const subtotalOut = totalOut - tipsOut}
+
+        <span class="text-left text-base text-secondary"
+          >{$t("payments.income")}</span
+        >
+        <!-- <span><b>{subtotalIn ? f(subtotalIn, c) : "-"}</b></span> -->
+        <span><b>{tipsIn ? f(tipsIn, c) : "-"}</b></span>
+        <span><b>{totalIn ? f(totalIn, c) : "-"}</b></span>
+
+        <span class="text-left text-base text-secondary"
+          >{$t("payments.expenditure")}</span
+        >
+        <!-- <span><b>{subtotalOut ? f(subtotalOut, c) : "-"}</b></span> -->
+        <span><b>{tipsOut ? f(tipsOut, c) : "-"}</b></span>
+        <span><b>{totalOut ? f(totalOut, c) : "-"}</b></span>
+      {/each}
+    </div>
+
+    <button
+      class="ml-auto rounded-full border py-2 px-4 w-36 hover:opacity-80 flex mx-auto"
+      on:click={csv}
+    >
+      <Icon icon="save" style="opacity-50 mr-2 my-auto" />
+      <div class="my-auto">{$t("payments.export")}</div>
+    </button>
+  </div>
+</div>
+
+<style>
+  .active * {
+    @apply bg-black text-white border-black;
+  }
+
+  .payments {
+    view-transition-name: payments;
+  }
+</style>
diff --git a/src/routes/(app)/[username]/[...account]/payments/[...page]/+server.ts b/src/routes/(app)/[username]/[...account]/payments/[...page]/+server.ts
new file mode 100644
index 00000000..a81faaf3
--- /dev/null
+++ b/src/routes/(app)/[username]/[...account]/payments/[...page]/+server.ts
@@ -0,0 +1,18 @@
+import { get, auth } from "$lib/utils";
+import { json } from "@sveltejs/kit";
+
+export async function GET({ cookies, params }) {
+  let parts = params.page.split("/");
+
+  let start, end;
+  if (parts.length === 1) [start] = parts;
+  if (parts.length === 2) [start, end] = parts;
+
+  if (!start) start = Date.now() / 1000 - 24 * 60 * 60;
+
+  let url = `/payments?start=${start * 1000}`;
+  if (end) url += `&end=${end * 1000}`;
+
+  let { payments } = await get(url, auth(cookies));
+  return json({ payments });
+}
diff --git a/src/routes/(app)/[username]/[...account]/receive/[...param]/+page.server.ts b/src/routes/(app)/[username]/[...account]/receive/[...param]/+page.server.ts
new file mode 100644
index 00000000..13eb1381
--- /dev/null
+++ b/src/routes/(app)/[username]/[...account]/receive/[...param]/+page.server.ts
@@ -0,0 +1,22 @@
+import { redirect } from "@sveltejs/kit";
+import { auth, post } from "$lib/utils";
+import type { Invoice } from "$lib/types";
+
+export let load = async ({ cookies, params, parent }) => {
+  let { account } = params;
+  let {subject, user, rates } = await parent();
+
+  let invoice: Invoice = {
+    account,
+    type: account ? "bitcoin": "lightning",
+    rate: rates[user?.currency || subject?.currency],
+  };
+
+  if(!user) user = subject;
+  invoice = await post("/invoice", { invoice, account, user }, auth(cookies));
+  let { id } = invoice;
+
+  if (invoice.memoPrompt && !invoice.memo) {
+    redirect(307, `/${user.username}/invoice/${id}/memo`);
+  } else redirect(307, `/${user.username}/invoice/${id}`);
+};
diff --git a/src/routes/(app)/[username]/[...account]/receive/[...param]/+page.svelte b/src/routes/(app)/[username]/[...account]/receive/[...param]/+page.svelte
new file mode 100644
index 00000000..f9267105
--- /dev/null
+++ b/src/routes/(app)/[username]/[...account]/receive/[...param]/+page.svelte
@@ -0,0 +1,116 @@
+<script>
+  import { page } from "$app/stores";
+  import { fly } from "svelte/transition";
+  import { enhance } from "$app/forms";
+  import { tick } from "svelte";
+  import { browser } from "$app/environment";
+  import { t } from "$lib/translations";
+  import AppHeader from "$comp/AppHeader.svelte";
+  import Avatar from "$comp/Avatar.svelte";
+  import Icon from "$comp/Icon.svelte";
+  import Spinner from "$comp/Spinner.svelte";
+  import { back, fail, focus } from "$lib/utils";
+
+  export let data;
+  export let form;
+  data.subject = data.user;
+
+  let { contacts } = data;
+  let w;
+
+  let el, text;
+
+  let keypress = (e) => e.key === "Enter" && (e.preventDefault() || el.click());
+
+  let paste = async () => {
+    text = await navigator.clipboard.readText();
+  };
+</script>
+
+<svelte:window bind:innerWidth={w} />
+
+<AppHeader {data} />
+<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.send")}
+  </h1>
+
+  <form method="POST" use:enhance class="space-y-2 text-xl">
+    {#if form?.error}
+      <div class="mb-5">
+        <div class="text-red-600">
+          {$t("error.unrecognizedInput")}
+        </div>
+      </div>
+    {/if}
+
+    <div class="mb-2">
+      <textarea
+        use:focus
+        name="text"
+        placeholder={$t("user.send.placeholder")}
+        on:keypress={keypress}
+        class="w-full p-4 border rounded-xl h-48 text-xl"
+        bind:value={text}
+        autocapitalize="none"
+      />
+    </div>
+
+    <div class="flex gap-2">
+      <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"
+        >
+          <Icon icon="camera" style="mr-2 w-6 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"
+        on:click={paste}
+      >
+        <Icon icon="paste" style="mr-2 w-6 my-auto" />
+        <div class="my-auto">{$t("user.send.paste")}</div>
+      </button>
+    </div>
+
+    <button
+      bind:this={el}
+      type="submit"
+      class="bg-black text-white border rounded-2xl px-6 py-5 w-full font-bold"
+    >
+      {$t("user.send.next")}
+    </button>
+  </form>
+
+  {#if contacts.length}
+    <div class="space-y-5">
+      <h1 class="px-3 md:px-0 text-2xl font-semibold mt-10">
+        {$t("user.send.contacts")}
+      </h1>
+      <div>
+        {#each contacts as c}
+          <a href={`/pay/${c.username}`}>
+            <div
+              class="border-b p-2 last:border-b-0 hover:bg-gray-100 rounded-2xl"
+            >
+              <div class="flex">
+                <div>
+                  <div class="flex">
+                    <Avatar user={c} size={20} disabled={true} />
+                    <div class="my-auto text-left">
+                      <p class="ml-1 text-lg break-words">{c.username}</p>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </a>
+        {/each}
+      </div>
+    </div>
+  {/if}
+</div>
diff --git a/src/routes/(app)/[username]/account/setup/+page.svelte b/src/routes/(app)/[username]/account/setup/+page.svelte
index 5c2102c7..9636ff2a 100644
--- a/src/routes/(app)/[username]/account/setup/+page.svelte
+++ b/src/routes/(app)/[username]/account/setup/+page.svelte
@@ -32,8 +32,8 @@
     </p>
 
     <p class="text-secondary mb-1">
-      Whoever knows these words can withdraw funds from the account. We can't
-      help you recover them if you lose them.
+      Whoever knows these words in the correct order can withdraw funds from the account. We can't
+      recover them if you lose them.
     </p>
 
     {#if reveal}
diff --git a/src/routes/(app)/[username]/account/setup/step2/+page.svelte b/src/routes/(app)/[username]/account/setup/step2/+page.svelte
index 3b403295..d8f44e16 100644
--- a/src/routes/(app)/[username]/account/setup/step2/+page.svelte
+++ b/src/routes/(app)/[username]/account/setup/step2/+page.svelte
@@ -5,6 +5,8 @@
   import { encrypt, decrypt } from "nostr-tools/nip49";
   import { mnemonicToEntropy, entropyToMnemonic } from "@scure/bip39";
   import { wordlist } from "@scure/bip39/wordlists/english";
+  import { fail, post } from "$lib/utils";
+  import { goto } from "$app/navigation";
 
   export let data;
   let { user } = data;
@@ -12,11 +14,14 @@
   let password;
 
   let submit = async () => {
-    console.log($mnemonic);
-    let t = await encrypt(mnemonicToEntropy($mnemonic, wordlist), password);
-
-    let m = await decrypt(t, password);
-    console.log(entropyToMnemonic(m, wordlist));
+    user.seed = await encrypt(mnemonicToEntropy($mnemonic, wordlist), password);
+    try {
+      await post("/api/user", user);
+      goto(`/${user.username}`);
+    } catch (e) {
+      console.log(e);
+      fail("Something went wrong");
+    }
   };
 </script>
 
diff --git a/src/routes/(app)/[username]/invoice/[id]/+page.svelte b/src/routes/(app)/[username]/invoice/[id]/+page.svelte
index 28bfe27b..24e75fa5 100644
--- a/src/routes/(app)/[username]/invoice/[id]/+page.svelte
+++ b/src/routes/(app)/[username]/invoice/[id]/+page.svelte
@@ -28,7 +28,6 @@
 
   export let data;
 
-  let ndef;
   let showOptions;
 
   let reading = async ({ message, serialNumber }) => {
@@ -41,6 +40,7 @@
   $: refresh(data);
   let { invoice, id, subject, user, src } = data;
   let {
+    account,
     amount,
     hash,
     type,
@@ -56,6 +56,7 @@
   let refresh = async (data) => {
     ({ invoice, id, user, src } = data);
     ({
+      account,
       amount,
       hash,
       type,
@@ -66,21 +67,6 @@
     } = invoice);
 
     tipPercent = (tip / amount) * 100;
-
-    // if (browser && window.NDEFReader) {
-    // 	try {
-    // 		ndef = new NDEFReader();
-    // 		await ndef.scan();
-    //
-    // 		ndef.removeEventListener('readingerror', readingerror);
-    // 		ndef.removeEventListener('reading', reading);
-    //
-    // 		ndef.addEventListener('readingerror', readingerror);
-    // 		ndef.addEventListener('reading', reading);
-    // 	} catch (e) {
-    // 		console.log(e);
-    // 	}
-    // }
   };
 
   $: amountFiat = parseFloat(((amount * rate) / sats).toFixed(2));
@@ -100,13 +86,6 @@
     }
   });
 
-  onDestroy(() => {
-    if (ndef) {
-      ndef.removeEventListener("readingerror", readingerror);
-      ndef.removeEventListener("reading", reading);
-    }
-  });
-
   $: link = [types.bitcoin, types.liquid].includes(type)
     ? text
     : `lightning:${text}`;
@@ -257,39 +236,41 @@
     </div>
   </div>
 
-  <div class="flex justify-around text-secondary">
-    <button
-      class="hover:bg-primary my-auto flex gap-1 sm:gap-2 py-3 px-2 sm:px-5 w-full justify-center"
-      class:bg-primary={type === types.bitcoin}
-      class:text-black={type === types.bitcoin}
-      on:click={() => setType(types.bitcoin)}
-    >
-      <img src="/images/bitcoin.svg" class="w-8" alt="Bitcoin" />
-      <div class="my-auto text-lg">Bitcoin</div>
-    </button>
+  {#if !account}
+    <div class="flex justify-around text-secondary">
+      <button
+        class="hover:bg-primary my-auto flex gap-1 sm:gap-2 py-3 px-2 sm:px-5 w-full justify-center"
+        class:bg-primary={type === types.bitcoin}
+        class:text-black={type === types.bitcoin}
+        on:click={() => setType(types.bitcoin)}
+      >
+        <img src="/images/bitcoin.svg" class="w-8" alt="Bitcoin" />
+        <div class="my-auto text-lg">Bitcoin</div>
+      </button>
 
-    <button
-      class="hover:bg-primary my-auto flex gap-1 sm:gap-2 py-3 px-2 sm:px-5 w-full justify-center"
-      class:bg-primary={type === types.liquid}
-      class:text-black={type === types.liquid}
-      on:click={() => setType(types.liquid)}
-    >
-      <img src="/images/liquid.svg" class="w-8" alt="Liquid" />
-      <div class="my-auto text-lg">Liquid</div>
-    </button>
+      <button
+        class="hover:bg-primary my-auto flex gap-1 sm:gap-2 py-3 px-2 sm:px-5 w-full justify-center"
+        class:bg-primary={type === types.liquid}
+        class:text-black={type === types.liquid}
+        on:click={() => setType(types.liquid)}
+      >
+        <img src="/images/liquid.svg" class="w-8" alt="Liquid" />
+        <div class="my-auto text-lg">Liquid</div>
+      </button>
 
-    <button
-      class="hover:bg-primary flex gap-1 sm:gap-2 py-3 px-2 sm:px-5 w-full justify-center"
-      class:bg-primary={type === types.lightning}
-      class:text-black={type === types.lightning}
-      on:click={() => setType(types.lightning)}
-    >
-      <div class="bg-white rounded-full w-8 h-8 text-center flex">
-        <div class="m-auto">⚡️</div>
-      </div>
-      <div class="my-auto text-lg">Lightning</div>
-    </button>
-  </div>
+      <button
+        class="hover:bg-primary flex gap-1 sm:gap-2 py-3 px-2 sm:px-5 w-full justify-center"
+        class:bg-primary={type === types.lightning}
+        class:text-black={type === types.lightning}
+        on:click={() => setType(types.lightning)}
+      >
+        <div class="bg-white rounded-full w-8 h-8 text-center flex">
+          <div class="m-auto">⚡️</div>
+        </div>
+        <div class="my-auto text-lg">Lightning</div>
+      </button>
+    </div>
+  {/if}
 
   {#if type === types.liquid}
     <div class="flex justify-center">
diff --git a/src/routes/(app)/[username]/payments/[...page]/+page.server.ts b/src/routes/(app)/[username]/payments/[...page]/+page.server.ts
deleted file mode 100644
index 070349f8..00000000
--- a/src/routes/(app)/[username]/payments/[...page]/+page.server.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { get, auth } from "$lib/utils";
-
-let limit = 25;
-
-export async function load({ cookies, depends, params }) {
-  depends("app:payments");
-
-  let parts = params.page.split("/");
-
-  let start, end, page;
-  if (parts.length === 1) [page] = parts;
-  if (parts.length === 2) [start, page] = parts;
-  if (parts.length === 3) [start, end, page] = parts;
-  if (!parseInt(page)) page = 1;
-
-  let offset = (page - 1) * limit;
-  if (!start) start = Date.now() / 1000 - 24 * 60 * 60;
-
-  let url = `/payments?start=${start * 1000}&limit=${limit}&offset=${offset}`;
-  if (end) url += `&end=${end * 1000}`;
-
-  let { count, payments, incoming, outgoing } = await get(url, auth(cookies));
-  let pages = new Array(Math.ceil(count / limit));
-
-  return { payments, page, pages, start, end, incoming, outgoing };
-}
diff --git a/src/routes/(app)/[username]/payments/[...page]/+page.svelte b/src/routes/(app)/[username]/payments/[...page]/+page.svelte
deleted file mode 100644
index 1efdc2ec..00000000
--- a/src/routes/(app)/[username]/payments/[...page]/+page.svelte
+++ /dev/null
@@ -1,315 +0,0 @@
-<script>
-  import Avatar from "$comp/Avatar.svelte";
-  import Icon from "$comp/Icon.svelte";
-  import { onMount } from "svelte";
-  import { format } from "date-fns";
-  import { newPayment } from "$lib/store";
-  import { t } from "$lib/translations";
-  import { get, f, s, sat, sats, types } from "$lib/utils";
-  import { page } from "$app/stores";
-  import { differenceInDays, getUnixTime, sub } from "date-fns";
-  import { goto, invalidate } from "$app/navigation";
-
-  export let data;
-
-  let { start, end, user, rates, payments } = data;
-
-  let change = ({ target: { value } }) => goto(value);
-  let link = (p) => {
-    if (p.pot) return `/pot/${p.pot}`;
-    if (p.with) return "/" + p.with.username;
-    return `/p/${p.id}`;
-  };
-
-  $: presets = [
-    {
-      title: $t("payments.day"),
-      start: sub(new Date(), { days: 1 }),
-      end: null,
-    },
-    {
-      title: $t("payments.week"),
-      start: sub(new Date(), { days: 7 }),
-      end: null,
-    },
-    {
-      title: $t("payments.month"),
-      start: sub(new Date(), { months: 1 }),
-      end: null,
-    },
-    {
-      title: $t("payments.all"),
-      start: sub(new Date(), { years: 5 }),
-      end: null,
-    },
-  ];
-
-  $: selection = start
-    ? presets.findIndex(
-        (p) => Math.abs(differenceInDays(new Date(start * 1000), p.start)) < 1
-      )
-    : 0;
-
-  let p,
-    incoming,
-    outgoing,
-    pages = [];
-  $: data &&
-    ({ page: p, pages, start, end, incoming, outgoing, payments } = data);
-
-  $: $page && ($newPayment = false);
-  $: $newPayment && invalidate(`/users/${user.username}`);
-
-  $: path = $page.params.page
-    ? $page.url.pathname.substring(0, $page.url.pathname.lastIndexOf("/"))
-    : $page.url.pathname;
-
-  let csv = async () => {
-    let url = `/${user.username}/payments`;
-    if (start) url += `/${start}`;
-    if (end) url += `/${end}`;
-
-    let { payments } = await get(url);
-
-    payments = payments.map((p) => ({
-      ...p,
-      created: new Date(p.created),
-      total: p.amount + (p.tip || 0),
-      platform_fee: p.ourfee,
-      amount_fiat: f((p.amount * p.rate) / sats, p.currency),
-      fee_fiat: p.fee ? f((p.fee * p.rate) / sats, p.currency) : null,
-      platform_fee_fiat: p.ourfee ? f((p.ourfee * p.rate) / sats, p.currency) : null,
-      tip_fiat: p.tip ? f((p.tip * p.rate) / sats, p.currency) : null,
-      total_fiat: f(((p.amount + (p.tip || 0)) * p.rate) / sats, p.currency),
-    }));
-
-    let keys = [
-      "type",
-      "id",
-      "created",
-      "rate",
-      "currency",
-      "amount",
-      "tip",
-      "total",
-      "fee",
-      "platform_fee",
-      "amount_fiat",
-      "tip_fiat",
-      "total_fiat",
-      "fee_fiat",
-      "platform_fee_fiat",
-    ];
-
-    let csv =
-      keys.map((k) => `"${k}"`).join(",") +
-      "\n" +
-      payments
-        .map((r) => keys.map((k) => `"${r[k] || ""}"`).join(","))
-        .join("\n");
-
-    let filename = "payments.csv";
-    let blob = new Blob([csv], { type: "text/csv;charset=utf-8;" });
-    if (navigator.msSaveBlob) {
-      navigator.msSaveBlob(blob, filename);
-    } else {
-      let link = document.createElement("a");
-      if (link.download !== undefined) {
-        let url = URL.createObjectURL(blob);
-        link.setAttribute("href", url);
-        link.setAttribute("download", filename);
-        link.style.visibility = "hidden";
-        document.body.appendChild(link);
-        link.click();
-        document.body.removeChild(link);
-      }
-    }
-  };
-</script>
-
-<div class="mt-24 mb-20 payments">
-  <h1 class="px-3 md:px-0 text-center text-3xl md:text-4xl font-semibold mb-10">
-    {$t("payments.header")}
-  </h1>
-
-  <div class="container w-full mx-auto text-lg px-4 max-w-xl space-y-5">
-    <div class="flex text-md text-secondary relative">
-      <div class="mx-auto flex justify-center w-full gap-1">
-        {#each presets as { start, end, title }, i}
-          <a
-            class:active={selection === i}
-            href={`/${user.username}/payments/${getUnixTime(start) + "/"}1`}
-          >
-            <button
-              class="text-sm md:text-lg rounded-full border py-2 px-4 hover:opacity-80 min-w-[72px]"
-            >
-              <div class="my-auto">{title}</div>
-            </button>
-          </a>
-        {/each}
-      </div>
-    </div>
-
-    <div class="flex flex-wrap justify-center mb-8">
-      {#if pages.length > 1}
-        {#each pages as _, i}
-          <a
-            class="mr-1 last:mr-0"
-            href={`${path}/${i + 1}`}
-            class:active={parseInt(p) === i + 1}
-          >
-            <div
-              class="border py-2 rounded-full border-2 w-12 h-12 hover:opacity-80 text-center"
-            >
-              {i + 1}
-            </div>
-          </a>
-        {/each}
-      {/if}
-    </div>
-
-    <div class="text-base">
-      {#each payments as p}
-        <a href={`/payment/${p.id}`}>
-          <div class="grid grid-cols-12 border-b h-24 hover:bg-gray-100 px-4">
-            <div class="whitespace-nowrap my-auto col-span-3">
-              <div class="font-bold" class:text-red-800={p.amount < 0}>
-                {f(Math.abs(p.amount) * (p.rate / sats), p.currency)}
-                {#if p.tip}
-                  <span class="text-sm text-secondary">
-                    +{Math.round((p.tip / Math.abs(p.amount)) * 100)}%
-                  </span>
-                {/if}
-              </div>
-
-              <div class="text-secondary">
-                {sat(Math.abs(p.amount) + (p.tip || 0))}
-              </div>
-            </div>
-
-            <div
-              class="flex my-auto col-span-5 truncate text-ellipsis overflow-hidden mx-auto"
-            >
-              {#if p.type === types.pot}
-                <a href={`/pot/${p.memo}`}>
-                  <div class="text-secondary flex">
-                    <div class="my-auto mr-1">
-                      <img src="/images/moneypot.png" class="w-12" alt="Pot" />
-                    </div>
-
-                    <div class="my-auto">Pot</div>
-                  </div>
-                </a>
-              {:else if p.with}
-                <div class="flex">
-                  <div class="my-auto">
-                    <Avatar user={p.with} size={12} disabled={true} />
-                  </div>
-                  <div class="my-auto ml-1 text-secondary">
-                    {p.with.username}
-                  </div>
-                </div>
-              {:else}
-                <div class="text-secondary flex">
-                  {#if [types.ecash, types.lightning].includes(p.type)}
-                    <div class="text-3xl">⚡️</div>
-                  {:else if p.type === types.bitcoin}
-                    <div class="my-auto mr-1">
-                      <img
-                        src="/images/bitcoin.svg"
-                        class="w-12 border-4 border-transparent"
-                        alt="Bitcoin"
-                      />
-                    </div>
-                  {:else if p.type === types.liquid}
-                    <div class="my-auto mr-1">
-                      <img
-                        src="/images/liquid.svg"
-                        class="w-12 border-4 border-transparent"
-                        alt="Liquid"
-                      />
-                    </div>
-                  {/if}
-
-                  <div class="my-auto">
-                    {p.amount > 0
-                      ? p.confirmed
-                        ? "Received"
-                        : "Pending"
-                      : "Sent"}
-                  </div>
-                </div>
-              {/if}
-            </div>
-
-            <div class="text-secondary text-right text-sm my-auto col-span-3">
-              <div>
-                {format(new Date(p.created), "h:mm aaa")}
-              </div>
-              <div>
-                {format(new Date(p.created), "MMM d, yy")}
-              </div>
-            </div>
-          </div>
-        </a>
-      {:else}
-        <p class="text-secondary text-lg text-center">{$t("payments.empty")}</p>
-      {/each}
-    </div>
-
-    <div class="grid grid-cols-3 w-full text-center text-lg">
-      {#each Object.keys(incoming) as c}
-        <span class="text-base text-secondary text-left"></span>
-        <!-- <span class="text-base text-secondary" -->
-        <!--   >{$t("payments.subtotal")}</span -->
-        <!-- > -->
-        <span class="text-base text-secondary">
-          {#if tipsIn || tipsOut}{$t("payments.tips")}{/if}
-        </span>
-        <span class="text-base text-secondary"
-          >{$t("payments.total")}</span
-        >
-
-        {@const totalIn = incoming[c]?.fiat || 0}
-        {@const tipsIn = incoming[c]?.fiatTips || 0}
-        {@const subtotalIn = totalIn - tipsIn}
-
-        {@const totalOut = -outgoing[c]?.fiat || 0}
-        {@const tipsOut = outgoing[c]?.fiatTips || 0}
-        {@const subtotalOut = totalOut - tipsOut}
-
-        <span class="text-left text-base text-secondary"
-          >{$t("payments.income")}</span
-        >
-        <!-- <span><b>{subtotalIn ? f(subtotalIn, c) : "-"}</b></span> -->
-        <span><b>{tipsIn ? f(tipsIn, c) : "-"}</b></span>
-        <span><b>{totalIn ? f(totalIn, c) : "-"}</b></span>
-
-        <span class="text-left text-base text-secondary"
-          >{$t("payments.expenditure")}</span
-        >
-        <!-- <span><b>{subtotalOut ? f(subtotalOut, c) : "-"}</b></span> -->
-        <span><b>{tipsOut ? f(tipsOut, c) : "-"}</b></span>
-        <span><b>{totalOut ? f(totalOut, c) : "-"}</b></span>
-      {/each}
-    </div>
-
-    <button
-      class="ml-auto rounded-full border py-2 px-4 w-36 hover:opacity-80 flex mx-auto"
-      on:click={csv}
-    >
-      <Icon icon="save" style="opacity-50 mr-2 my-auto" />
-      <div class="my-auto">{$t("payments.export")}</div>
-    </button>
-  </div>
-</div>
-
-<style>
-  .active * {
-    @apply bg-black text-white border-black;
-  }
-
-  .payments {
-    view-transition-name: payments;
-  }
-</style>
diff --git a/src/routes/(app)/[username]/payments/[...page]/+server.ts b/src/routes/(app)/[username]/payments/[...page]/+server.ts
deleted file mode 100644
index a81faaf3..00000000
--- a/src/routes/(app)/[username]/payments/[...page]/+server.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { get, auth } from "$lib/utils";
-import { json } from "@sveltejs/kit";
-
-export async function GET({ cookies, params }) {
-  let parts = params.page.split("/");
-
-  let start, end;
-  if (parts.length === 1) [start] = parts;
-  if (parts.length === 2) [start, end] = parts;
-
-  if (!start) start = Date.now() / 1000 - 24 * 60 * 60;
-
-  let url = `/payments?start=${start * 1000}`;
-  if (end) url += `&end=${end * 1000}`;
-
-  let { payments } = await get(url, auth(cookies));
-  return json({ payments });
-}
diff --git a/src/routes/(app)/[username]/receive/[...param]/+page.server.ts b/src/routes/(app)/[username]/receive/[...param]/+page.server.ts
deleted file mode 100644
index 502678a9..00000000
--- a/src/routes/(app)/[username]/receive/[...param]/+page.server.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { redirect } from "@sveltejs/kit";
-import { auth, post } from "$lib/utils";
-import type { Invoice } from "$lib/types";
-
-export let load = async ({ cookies, parent }) => {
-  let {subject, user, rates } = await parent();
-
-  let invoice: Invoice = {
-    type: "lightning",
-    rate: rates[user?.currency || subject?.currency],
-  };
-
-  if(!user) user = subject;
-  invoice = await post("/invoice", { invoice, user }, auth(cookies));
-  let { id } = invoice;
-
-  if (invoice.memoPrompt && !invoice.memo) {
-    redirect(307, `/${user.username}/invoice/${id}/memo`);
-  } else redirect(307, `/${user.username}/invoice/${id}`);
-};
diff --git a/src/routes/(app)/[username]/receive/[...param]/+page.svelte b/src/routes/(app)/[username]/receive/[...param]/+page.svelte
deleted file mode 100644
index f9267105..00000000
--- a/src/routes/(app)/[username]/receive/[...param]/+page.svelte
+++ /dev/null
@@ -1,116 +0,0 @@
-<script>
-  import { page } from "$app/stores";
-  import { fly } from "svelte/transition";
-  import { enhance } from "$app/forms";
-  import { tick } from "svelte";
-  import { browser } from "$app/environment";
-  import { t } from "$lib/translations";
-  import AppHeader from "$comp/AppHeader.svelte";
-  import Avatar from "$comp/Avatar.svelte";
-  import Icon from "$comp/Icon.svelte";
-  import Spinner from "$comp/Spinner.svelte";
-  import { back, fail, focus } from "$lib/utils";
-
-  export let data;
-  export let form;
-  data.subject = data.user;
-
-  let { contacts } = data;
-  let w;
-
-  let el, text;
-
-  let keypress = (e) => e.key === "Enter" && (e.preventDefault() || el.click());
-
-  let paste = async () => {
-    text = await navigator.clipboard.readText();
-  };
-</script>
-
-<svelte:window bind:innerWidth={w} />
-
-<AppHeader {data} />
-<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.send")}
-  </h1>
-
-  <form method="POST" use:enhance class="space-y-2 text-xl">
-    {#if form?.error}
-      <div class="mb-5">
-        <div class="text-red-600">
-          {$t("error.unrecognizedInput")}
-        </div>
-      </div>
-    {/if}
-
-    <div class="mb-2">
-      <textarea
-        use:focus
-        name="text"
-        placeholder={$t("user.send.placeholder")}
-        on:keypress={keypress}
-        class="w-full p-4 border rounded-xl h-48 text-xl"
-        bind:value={text}
-        autocapitalize="none"
-      />
-    </div>
-
-    <div class="flex gap-2">
-      <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"
-        >
-          <Icon icon="camera" style="mr-2 w-6 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"
-        on:click={paste}
-      >
-        <Icon icon="paste" style="mr-2 w-6 my-auto" />
-        <div class="my-auto">{$t("user.send.paste")}</div>
-      </button>
-    </div>
-
-    <button
-      bind:this={el}
-      type="submit"
-      class="bg-black text-white border rounded-2xl px-6 py-5 w-full font-bold"
-    >
-      {$t("user.send.next")}
-    </button>
-  </form>
-
-  {#if contacts.length}
-    <div class="space-y-5">
-      <h1 class="px-3 md:px-0 text-2xl font-semibold mt-10">
-        {$t("user.send.contacts")}
-      </h1>
-      <div>
-        {#each contacts as c}
-          <a href={`/pay/${c.username}`}>
-            <div
-              class="border-b p-2 last:border-b-0 hover:bg-gray-100 rounded-2xl"
-            >
-              <div class="flex">
-                <div>
-                  <div class="flex">
-                    <Avatar user={c} size={20} disabled={true} />
-                    <div class="my-auto text-left">
-                      <p class="ml-1 text-lg break-words">{c.username}</p>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </a>
-        {/each}
-      </div>
-    </div>
-  {/if}
-</div>
-- 
cgit v1.2.3


From d492c071bb6f2818b012b29ae007a98ad98562cf Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Sat, 7 Sep 2024 07:14:17 -0700
Subject: pass account param to payments endpoint

---
 .../(app)/[username]/[...account]/payments/[...page]/+page.server.ts  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/routes/(app)/[username]/[...account]/payments/[...page]/+page.server.ts b/src/routes/(app)/[username]/[...account]/payments/[...page]/+page.server.ts
index 070349f8..c2cd5683 100644
--- a/src/routes/(app)/[username]/[...account]/payments/[...page]/+page.server.ts
+++ b/src/routes/(app)/[username]/[...account]/payments/[...page]/+page.server.ts
@@ -16,7 +16,9 @@ export async function load({ cookies, depends, params }) {
   let offset = (page - 1) * limit;
   if (!start) start = Date.now() / 1000 - 24 * 60 * 60;
 
-  let url = `/payments?start=${start * 1000}&limit=${limit}&offset=${offset}`;
+  let url = `/payments?account=${params.account}&start=${
+    start * 1000
+  }&limit=${limit}&offset=${offset}`;
   if (end) url += `&end=${end * 1000}`;
 
   let { count, payments, incoming, outgoing } = await get(url, auth(cookies));
-- 
cgit v1.2.3


From 6e48c584605bec5623c12c470d04d07303983801 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Mon, 9 Sep 2024 15:54:22 -0700
Subject: accounts

---
 src/components/Account.svelte                      | 66 ++++++++---------
 .../(app)/[username]/(profile)/+page.server.ts     |  5 +-
 src/routes/(app)/[username]/(profile)/+page.svelte | 20 ++++--
 src/routes/(app)/[username]/+layout.svelte         |  2 +
 .../receive/[...param]/+page.server.ts             | 17 +++--
 .../[username]/account/setup/step2/+page.svelte    |  7 +-
 .../(app)/[username]/invoice/[id]/+page.svelte     | 82 +++++++++++-----------
 7 files changed, 103 insertions(+), 96 deletions(-)

(limited to 'src')

diff --git a/src/components/Account.svelte b/src/components/Account.svelte
index a781e809..a9b3d6ba 100644
--- a/src/components/Account.svelte
+++ b/src/components/Account.svelte
@@ -4,55 +4,45 @@
   import { t } from "$lib/translations";
 
   export let user, rate, account;
-  let { balance, setup, type, id } = account;
+  let { seed, balance, id } = account;
+  $: type = seed ? "Savings":"Cash";
 </script>
 
 <a href={`/${user.username}/${id}/payments`.replace(/undefined\//, "")}>
   <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-secondary">{type}</div>
+      <div class="ml-auto text-right">
+        <div>{type} account</div>
+      </div>
     </div>
 
     <div class="flex flex-wrap gap-3 justify-center w-full text-xl">
-      {#if setup}
-        <a href={`/send`} class="contents grow">
-          <button
-            type="button"
-            class="rounded-2xl border py-5 px-6 font-bold hover:opacity-80 flex bg-primary grow"
-          >
-            <div class="mx-auto flex gap-2">
-              <Icon icon="send" style="w-8" />
-              <div class="my-auto">{$t("user.dashboard.send")}</div>
-            </div>
-          </button>
-        </a>
+      <a href={`/send`} class="contents grow">
+        <button
+          type="button"
+          class="rounded-2xl border py-5 px-6 font-bold hover:opacity-80 flex bg-primary grow"
+        >
+          <div class="mx-auto flex gap-2">
+            <Icon icon="send" style="w-8" />
+            <div class="my-auto">{$t("user.dashboard.send")}</div>
+          </div>
+        </button>
+      </a>
 
-        <a
-          href={`/${user.username}/${id}/receive`.replace(/undefined\//, "")}
-          class="contents"
+      <a
+        href={`/${user.username}/${id}/receive`.replace(/undefined\//, "")}
+        class="contents"
+      >
+        <button
+          class="rounded-2xl border py-5 px-6 font-bold hover:opacity-80 flex bg-primary grow"
         >
-          <button
-            class="rounded-2xl border py-5 px-6 font-bold hover:opacity-80 flex bg-primary grow"
-          >
-            <div class="mx-auto flex gap-2">
-              <Icon icon="receive" style="w-8" />
-              <div class="my-auto">{$t("user.dashboard.receive")}</div>
-            </div>
-          </button>
-        </a>
-      {:else}
-        <a href={`/${user.username}/account/setup`} class="contents">
-          <button
-            class="rounded-2xl border py-5 px-6 font-bold hover:opacity-80 flex bg-primary grow"
-          >
-            <div class="mx-auto flex gap-2">
-              <Icon icon="settings" style="w-8" />
-              <div class="my-auto">{$t("user.dashboard.setup")}</div>
-            </div>
-          </button>
-        </a>
-      {/if}
+          <div class="mx-auto flex gap-2">
+            <Icon icon="receive" style="w-8" />
+            <div class="my-auto">{$t("user.dashboard.receive")}</div>
+          </div>
+        </button>
+      </a>
     </div>
   </div>
 </a>
diff --git a/src/routes/(app)/[username]/(profile)/+page.server.ts b/src/routes/(app)/[username]/(profile)/+page.server.ts
index 59eb44d5..9c9be68a 100644
--- a/src/routes/(app)/[username]/(profile)/+page.server.ts
+++ b/src/routes/(app)/[username]/(profile)/+page.server.ts
@@ -4,8 +4,11 @@ export async function load({ cookies, depends, parent }) {
   depends("app:items");
 
   let { subject } = await parent();
+
+  let accounts = await get("/accounts", auth(cookies));
+
   let items = await get(`/${subject.id}/items`, auth(cookies));
   items.map((i) => (i.quantity = 0));
 
-  return { items };
+  return { accounts, items };
 }
diff --git a/src/routes/(app)/[username]/(profile)/+page.svelte b/src/routes/(app)/[username]/(profile)/+page.svelte
index 7c0de9d8..25244c6d 100644
--- a/src/routes/(app)/[username]/(profile)/+page.svelte
+++ b/src/routes/(app)/[username]/(profile)/+page.svelte
@@ -9,7 +9,7 @@
 
   export let data;
 
-  let { subject, user, items, rates } = data;
+  let { accounts, subject, user, items, rates } = data;
   $: ({ currency } = subject);
   $: rate = rates[currency];
   $: total = items.reduce((a, b) => a + b.price * b.quantity, 0);
@@ -24,11 +24,6 @@
   };
 
   if (user) user.savings = 0;
-
-  let accounts = [
-    { balance: user.balance, setup: true, type: "Cash" },
-    { id: "pubtest", balance: user.savings, setup: !!user.seed, type: "Savings" },
-  ];
 </script>
 
 {#if !user.balance}
@@ -39,12 +34,23 @@
   </div>
 {/if}
 
-<div class="space-y-5">
+<div class="space-y-2">
   {#if user?.id === subject.id}
     {#each accounts as account}
       <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={`/${user.username}/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}
       <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"
diff --git a/src/routes/(app)/[username]/+layout.svelte b/src/routes/(app)/[username]/+layout.svelte
index dd29e3aa..cd517fa9 100644
--- a/src/routes/(app)/[username]/+layout.svelte
+++ b/src/routes/(app)/[username]/+layout.svelte
@@ -20,6 +20,8 @@
   <slot />
 </div>
 
+<slot name="fixed" />
+
 <style>
   @keyframes fade-in {
     from {
diff --git a/src/routes/(app)/[username]/[...account]/receive/[...param]/+page.server.ts b/src/routes/(app)/[username]/[...account]/receive/[...param]/+page.server.ts
index 13eb1381..d9614a1c 100644
--- a/src/routes/(app)/[username]/[...account]/receive/[...param]/+page.server.ts
+++ b/src/routes/(app)/[username]/[...account]/receive/[...param]/+page.server.ts
@@ -1,19 +1,26 @@
-import { redirect } from "@sveltejs/kit";
+import { error, redirect } from "@sveltejs/kit";
 import { auth, post } from "$lib/utils";
 import type { Invoice } from "$lib/types";
 
 export let load = async ({ cookies, params, parent }) => {
   let { account } = params;
-  let {subject, user, rates } = await parent();
+  let { subject, user, rates } = await parent();
 
   let invoice: Invoice = {
     account,
-    type: account ? "bitcoin": "lightning",
+    type: account ? "bitcoin" : "lightning",
     rate: rates[user?.currency || subject?.currency],
   };
 
-  if(!user) user = subject;
-  invoice = await post("/invoice", { invoice, account, user }, auth(cookies));
+  if (!user) user = subject;
+
+  try {
+    invoice = await post("/invoice", { invoice, account, user }, auth(cookies));
+  } catch (e) {
+    console.log(e);
+    error(500, "Failed to generate invoice");
+    }
+
   let { id } = invoice;
 
   if (invoice.memoPrompt && !invoice.memo) {
diff --git a/src/routes/(app)/[username]/account/setup/step2/+page.svelte b/src/routes/(app)/[username]/account/setup/step2/+page.svelte
index d8f44e16..8169ce06 100644
--- a/src/routes/(app)/[username]/account/setup/step2/+page.svelte
+++ b/src/routes/(app)/[username]/account/setup/step2/+page.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+  import { focus } from "$lib/utils";
   import { t } from "$lib/translations";
   import { mnemonic } from "$lib/store";
   import Icon from "$comp/Icon.svelte";
@@ -14,9 +15,9 @@
   let password;
 
   let submit = async () => {
-    user.seed = await encrypt(mnemonicToEntropy($mnemonic, wordlist), password);
+    let seed = await encrypt(mnemonicToEntropy($mnemonic, wordlist), password);
     try {
-      await post("/api/user", user);
+      await post("/api/accounts", { seed });
       goto(`/${user.username}`);
     } catch (e) {
       console.log(e);
@@ -40,7 +41,7 @@
       than your login password. We can't reset it if you lose it.
     </p>
 
-    <input 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)/[username]/invoice/[id]/+page.svelte b/src/routes/(app)/[username]/invoice/[id]/+page.svelte
index 24e75fa5..1f2bbb51 100644
--- a/src/routes/(app)/[username]/invoice/[id]/+page.svelte
+++ b/src/routes/(app)/[username]/invoice/[id]/+page.svelte
@@ -296,48 +296,46 @@
   {/if}
 </div>
 
-{#if settingAmount}
-  <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-12 border w-96 shadow-lg rounded-md bg-white space-y-5"
-    >
-      <form submit={setAmount}>
-        <Numpad
-          bind:amount={newAmount}
-          bind:currency
-          bind:rate
-          bind:fiat
-          bind:submit
-        />
-        <div class="w-full flex flex-wrap gap-2">
-          <button
-            type="submit"
-            on:click={setAmount}
-            class="border-2 border-black rounded-xl font-semibold mx-auto py-3 w-40 hover:opacity-80 mx-auto bg-black text-white w-full"
-          >
-            <div class="my-auto">Ok</div>
-          </button>
-          <button
-            bind:this={submit}
-            type="button"
-            class="border-2 border-black rounded-xl font-semibold mx-auto py-3 w-40 hover:opacity-80 mx-auto w-full"
-            on:click={toggleAmount}
-            on:keydown={toggleAmount}
-          >
-            <div class="my-auto">Cancel</div>
-          </button>
-        </div>
-      </form>
-
-      <div class="flex justify-between items-center">
-        <span class="font-bold">{$t("payments.amountPrompt")}</span>
-        <Toggle id="notify" bind:value={$amountPrompt} />
-      </div>
-    </div>
-  </div>
-{/if}
+  <!-- <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-12 border w-96 shadow-lg rounded-md bg-white space-y-5" -->
+  <!--   > -->
+  <!--     <form submit={setAmount}> -->
+  <!--       <Numpad -->
+  <!--         bind:amount={newAmount} -->
+  <!--         bind:currency -->
+  <!--         bind:rate -->
+  <!--         bind:fiat -->
+  <!--         bind:submit -->
+  <!--       /> -->
+  <!--       <div class="w-full flex flex-wrap gap-2"> -->
+  <!--         <button -->
+  <!--           type="submit" -->
+  <!--           on:click={setAmount} -->
+  <!--           class="border-2 border-black rounded-xl font-semibold mx-auto py-3 w-40 hover:opacity-80 mx-auto bg-black text-white w-full" -->
+  <!--         > -->
+  <!--           <div class="my-auto">Ok</div> -->
+  <!--         </button> -->
+  <!--         <button -->
+  <!--           bind:this={submit} -->
+  <!--           type="button" -->
+  <!--           class="border-2 border-black rounded-xl font-semibold mx-auto py-3 w-40 hover:opacity-80 mx-auto w-full" -->
+  <!--           on:click={toggleAmount} -->
+  <!--           on:keydown={toggleAmount} -->
+  <!--         > -->
+  <!--           <div class="my-auto">Cancel</div> -->
+  <!--         </button> -->
+  <!--       </div> -->
+  <!--     </form> -->
+  <!--  -->
+  <!--     <div class="flex justify-between items-center"> -->
+  <!--       <span class="font-bold">{$t("payments.amountPrompt")}</span> -->
+  <!--       <Toggle id="notify" bind:value={$amountPrompt} /> -->
+  <!--     </div> -->
+  <!--   </div> -->
+  <!-- </div> -->
 
 <style>
   .invoice {
-- 
cgit v1.2.3


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/components/Account.svelte                      |   9 +-
 src/components/AppHeader.svelte                    |  25 +-
 src/components/Invoice.svelte                      |   2 +-
 src/components/Items.svelte                        |  51 ++-
 src/components/LandingHeader.svelte                |   6 +-
 src/components/LocationsMap.svelte                 |  12 +-
 src/components/Request.svelte                      |   2 +-
 src/lib/invoice.ts                                 |   6 +-
 src/locales/en.json                                |   2 +
 src/routes/(app)/+error.svelte                     |  38 ---
 src/routes/(app)/+layout.server.ts                 |  24 +-
 src/routes/(app)/+layout.svelte                    |   3 +
 .../(app)/[username]/(profile)/+layout.svelte      |   2 +-
 src/routes/(app)/[username]/(profile)/+page.svelte |  18 +-
 src/routes/(app)/[username]/+layout.server.ts      |  12 +-
 src/routes/(app)/[username]/+layout.svelte         |   2 -
 .../payments/[...page]/+page.server.ts             |  28 --
 .../[...account]/payments/[...page]/+page.svelte   | 315 ------------------
 .../[...account]/payments/[...page]/+server.ts     |  18 --
 .../receive/[...param]/+page.server.ts             |  29 --
 .../[...account]/receive/[...param]/+page.svelte   | 116 -------
 .../(app)/[username]/account/setup/+page.svelte    |  64 ----
 .../[username]/account/setup/step2/+page.svelte    |  52 ---
 .../(app)/[username]/address/+page.server.ts       |   9 -
 src/routes/(app)/[username]/address/+page.svelte   |   0
 .../(app)/[username]/card/[serial]/+page.server.ts |  16 -
 .../(app)/[username]/card/[serial]/+page.svelte    |  36 ---
 src/routes/(app)/[username]/customers/+page.svelte |   0
 src/routes/(app)/[username]/funds/+page.server.ts  |   0
 src/routes/(app)/[username]/funds/+page.svelte     |  52 ---
 src/routes/(app)/[username]/generate/+page.svelte  |  60 ----
 src/routes/(app)/[username]/generate/+server.ts    |  12 -
 src/routes/(app)/[username]/invoice/+server.ts     |   7 -
 .../[username]/invoice/[id]/+layout.server.ts      |  39 ---
 .../(app)/[username]/invoice/[id]/+layout.svelte   |   1 -
 .../(app)/[username]/invoice/[id]/+page.server.ts  |   5 -
 .../(app)/[username]/invoice/[id]/+page.svelte     | 344 --------------------
 .../[username]/invoice/[id]/memo/+page.server.ts   |  13 -
 .../[username]/invoice/[id]/memo/+page.svelte      |  95 ------
 .../[username]/invoice/[id]/paid/+page.svelte      |  85 -----
 .../[username]/invoice/[id]/tip/+page.server.ts    |  12 -
 .../(app)/[username]/invoice/[id]/tip/+page.svelte | 209 ------------
 .../(app)/[username]/invoice/sent/+page.svelte     |  11 -
 .../(app)/[username]/items/[id]/+page.server.ts    |  21 --
 .../(app)/[username]/items/[id]/+page.svelte       |  18 --
 .../(app)/[username]/items/create/+page.server.ts  |  16 -
 .../(app)/[username]/items/create/+page.svelte     |  19 --
 src/routes/(app)/[username]/map/+page.server.ts    |  12 -
 src/routes/(app)/[username]/map/+page.svelte       |   8 -
 .../(app)/[username]/messages/+page.server.ts      |  42 ---
 src/routes/(app)/[username]/messages/+page.svelte  |  92 ------
 .../messages/[recipient]/+page.server.ts           |  24 --
 .../[username]/messages/[recipient]/+page.svelte   | 191 -----------
 src/routes/(app)/[username]/reset/+server.ts       |  10 -
 .../[username]/settings/[...tab]/+page.server.ts   |  34 --
 .../[username]/settings/[...tab]/+page.svelte      | 257 ---------------
 .../[username]/settings/[...tab]/_account.svelte   | 190 -----------
 .../(app)/[username]/settings/[...tab]/_pos.svelte | 238 --------------
 .../[username]/settings/[...tab]/_security.svelte  | 321 -------------------
 .../[username]/settings/[...tab]/_shopify.svelte   |  92 ------
 .../(app)/[username]/verify/[code]/+page.server.ts |  14 -
 .../(app)/[username]/verify/[code]/+page.svelte    |  35 --
 src/routes/(app)/account/setup/+page.svelte        |  64 ++++
 src/routes/(app)/account/setup/step2/+page.svelte  |  52 +++
 src/routes/(app)/admin/+page.svelte                |   2 +-
 .../(app)/ecash/[id]/[...version]/+layout.svelte   |   1 -
 src/routes/(app)/fund/[id]/+page.server.ts         |   2 +-
 src/routes/(app)/fund/[id]/sweep/+page.svelte      |   2 +-
 src/routes/(app)/generate/+page.svelte             |  60 ++++
 src/routes/(app)/generate/+server.ts               |  12 +
 src/routes/(app)/invoice/+page.server.ts           |  29 ++
 src/routes/(app)/invoice/+page.svelte              |   0
 src/routes/(app)/invoice/+server.ts                |   7 +
 src/routes/(app)/invoice/[id]/+layout.server.ts    |  36 +++
 src/routes/(app)/invoice/[id]/+layout.svelte       |   1 +
 src/routes/(app)/invoice/[id]/+page.server.ts      |   5 +
 src/routes/(app)/invoice/[id]/+page.svelte         | 351 +++++++++++++++++++++
 src/routes/(app)/invoice/[id]/memo/+page.server.ts |  13 +
 src/routes/(app)/invoice/[id]/memo/+page.svelte    |  95 ++++++
 src/routes/(app)/invoice/[id]/paid/+page.svelte    |  85 +++++
 src/routes/(app)/invoice/[id]/tip/+page.server.ts  |  12 +
 src/routes/(app)/invoice/[id]/tip/+page.svelte     | 209 ++++++++++++
 src/routes/(app)/invoice/sent/+page.svelte         |  11 +
 src/routes/(app)/items/[id]/+page.server.ts        |  21 ++
 src/routes/(app)/items/[id]/+page.svelte           |  18 ++
 src/routes/(app)/items/create/+page.server.ts      |  16 +
 src/routes/(app)/items/create/+page.svelte         |  19 ++
 src/routes/(app)/ln/[lnurl]/+page.server.ts        |   2 +-
 src/routes/(app)/ln/withdrawal/sent/+page.svelte   |   2 +-
 src/routes/(app)/login/+page.server.ts             |  29 --
 src/routes/(app)/login/+page.svelte                | 188 -----------
 src/routes/(app)/messages/+page.server.ts          |  42 +++
 src/routes/(app)/messages/+page.svelte             |  92 ++++++
 .../(app)/messages/[recipient]/+page.server.ts     |  24 ++
 src/routes/(app)/messages/[recipient]/+page.svelte | 191 +++++++++++
 .../pay/[username]/[...amount]/+page.server.ts     |   2 +-
 .../(app)/pay/[username]/[...amount]/+page.svelte  |   5 +-
 src/routes/(app)/payment/[id]/+page.svelte         |   2 +-
 .../(app)/payments/[...page]/+page.server.ts       |  28 ++
 src/routes/(app)/payments/[...page]/+page.svelte   | 315 ++++++++++++++++++
 src/routes/(app)/payments/[...page]/+server.ts     |  18 ++
 src/routes/(app)/receive/[...token]/+page.svelte   |   2 -
 src/routes/(app)/register/+page.server.ts          |  41 ---
 src/routes/(app)/register/+page.svelte             | 314 ------------------
 src/routes/(app)/send/[...text]/+page.svelte       |   2 -
 src/routes/(app)/send/invoice/[id]/+page.server.ts |   6 +-
 src/routes/(app)/send/invoice/[id]/+page.svelte    |   4 +-
 src/routes/(app)/sent/+page.svelte                 |   2 +-
 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 ++++++
 src/routes/(app)/support/+page.svelte              | 139 --------
 src/routes/(app)/support/+server.ts                |   9 -
 src/routes/(app)/verify/[code]/+page.server.ts     |  14 +
 src/routes/(app)/verify/[code]/+page.svelte        |  35 ++
 src/routes/(static)/+layout.svelte                 |   2 +-
 src/routes/(static)/login/+page.server.ts          |  29 ++
 src/routes/(static)/login/+page.svelte             | 171 ++++++++++
 src/routes/(static)/register/+page.server.ts       |  41 +++
 src/routes/(static)/register/+page.svelte          | 292 +++++++++++++++++
 src/routes/(static)/support/+page.svelte           | 134 ++++++++
 src/routes/(static)/support/+server.ts             |   9 +
 src/routes/+error.svelte                           |  38 +++
 src/routes/start/+server.ts                        |   2 +-
 127 files changed, 3855 insertions(+), 4102 deletions(-)
 delete mode 100644 src/routes/(app)/+error.svelte
 delete mode 100644 src/routes/(app)/[username]/[...account]/payments/[...page]/+page.server.ts
 delete mode 100644 src/routes/(app)/[username]/[...account]/payments/[...page]/+page.svelte
 delete mode 100644 src/routes/(app)/[username]/[...account]/payments/[...page]/+server.ts
 delete mode 100644 src/routes/(app)/[username]/[...account]/receive/[...param]/+page.server.ts
 delete mode 100644 src/routes/(app)/[username]/[...account]/receive/[...param]/+page.svelte
 delete mode 100644 src/routes/(app)/[username]/account/setup/+page.svelte
 delete mode 100644 src/routes/(app)/[username]/account/setup/step2/+page.svelte
 delete mode 100644 src/routes/(app)/[username]/address/+page.server.ts
 delete mode 100644 src/routes/(app)/[username]/address/+page.svelte
 delete mode 100644 src/routes/(app)/[username]/card/[serial]/+page.server.ts
 delete mode 100644 src/routes/(app)/[username]/card/[serial]/+page.svelte
 delete mode 100644 src/routes/(app)/[username]/customers/+page.svelte
 delete mode 100644 src/routes/(app)/[username]/funds/+page.server.ts
 delete mode 100644 src/routes/(app)/[username]/funds/+page.svelte
 delete mode 100644 src/routes/(app)/[username]/generate/+page.svelte
 delete mode 100644 src/routes/(app)/[username]/generate/+server.ts
 delete mode 100644 src/routes/(app)/[username]/invoice/+server.ts
 delete mode 100644 src/routes/(app)/[username]/invoice/[id]/+layout.server.ts
 delete mode 100644 src/routes/(app)/[username]/invoice/[id]/+layout.svelte
 delete mode 100644 src/routes/(app)/[username]/invoice/[id]/+page.server.ts
 delete mode 100644 src/routes/(app)/[username]/invoice/[id]/+page.svelte
 delete mode 100644 src/routes/(app)/[username]/invoice/[id]/memo/+page.server.ts
 delete mode 100644 src/routes/(app)/[username]/invoice/[id]/memo/+page.svelte
 delete mode 100644 src/routes/(app)/[username]/invoice/[id]/paid/+page.svelte
 delete mode 100644 src/routes/(app)/[username]/invoice/[id]/tip/+page.server.ts
 delete mode 100644 src/routes/(app)/[username]/invoice/[id]/tip/+page.svelte
 delete mode 100644 src/routes/(app)/[username]/invoice/sent/+page.svelte
 delete mode 100644 src/routes/(app)/[username]/items/[id]/+page.server.ts
 delete mode 100644 src/routes/(app)/[username]/items/[id]/+page.svelte
 delete mode 100644 src/routes/(app)/[username]/items/create/+page.server.ts
 delete mode 100644 src/routes/(app)/[username]/items/create/+page.svelte
 delete mode 100644 src/routes/(app)/[username]/map/+page.server.ts
 delete mode 100644 src/routes/(app)/[username]/map/+page.svelte
 delete mode 100644 src/routes/(app)/[username]/messages/+page.server.ts
 delete mode 100644 src/routes/(app)/[username]/messages/+page.svelte
 delete mode 100644 src/routes/(app)/[username]/messages/[recipient]/+page.server.ts
 delete mode 100644 src/routes/(app)/[username]/messages/[recipient]/+page.svelte
 delete mode 100644 src/routes/(app)/[username]/reset/+server.ts
 delete mode 100644 src/routes/(app)/[username]/settings/[...tab]/+page.server.ts
 delete mode 100644 src/routes/(app)/[username]/settings/[...tab]/+page.svelte
 delete mode 100644 src/routes/(app)/[username]/settings/[...tab]/_account.svelte
 delete mode 100644 src/routes/(app)/[username]/settings/[...tab]/_pos.svelte
 delete mode 100644 src/routes/(app)/[username]/settings/[...tab]/_security.svelte
 delete mode 100644 src/routes/(app)/[username]/settings/[...tab]/_shopify.svelte
 delete mode 100644 src/routes/(app)/[username]/verify/[code]/+page.server.ts
 delete mode 100644 src/routes/(app)/[username]/verify/[code]/+page.svelte
 create mode 100644 src/routes/(app)/account/setup/+page.svelte
 create mode 100644 src/routes/(app)/account/setup/step2/+page.svelte
 create mode 100644 src/routes/(app)/generate/+page.svelte
 create mode 100644 src/routes/(app)/generate/+server.ts
 create mode 100644 src/routes/(app)/invoice/+page.server.ts
 create mode 100644 src/routes/(app)/invoice/+page.svelte
 create mode 100644 src/routes/(app)/invoice/+server.ts
 create mode 100644 src/routes/(app)/invoice/[id]/+layout.server.ts
 create mode 100644 src/routes/(app)/invoice/[id]/+layout.svelte
 create mode 100644 src/routes/(app)/invoice/[id]/+page.server.ts
 create mode 100644 src/routes/(app)/invoice/[id]/+page.svelte
 create mode 100644 src/routes/(app)/invoice/[id]/memo/+page.server.ts
 create mode 100644 src/routes/(app)/invoice/[id]/memo/+page.svelte
 create mode 100644 src/routes/(app)/invoice/[id]/paid/+page.svelte
 create mode 100644 src/routes/(app)/invoice/[id]/tip/+page.server.ts
 create mode 100644 src/routes/(app)/invoice/[id]/tip/+page.svelte
 create mode 100644 src/routes/(app)/invoice/sent/+page.svelte
 create mode 100644 src/routes/(app)/items/[id]/+page.server.ts
 create mode 100644 src/routes/(app)/items/[id]/+page.svelte
 create mode 100644 src/routes/(app)/items/create/+page.server.ts
 create mode 100644 src/routes/(app)/items/create/+page.svelte
 delete mode 100644 src/routes/(app)/login/+page.server.ts
 delete mode 100644 src/routes/(app)/login/+page.svelte
 create mode 100644 src/routes/(app)/messages/+page.server.ts
 create mode 100644 src/routes/(app)/messages/+page.svelte
 create mode 100644 src/routes/(app)/messages/[recipient]/+page.server.ts
 create mode 100644 src/routes/(app)/messages/[recipient]/+page.svelte
 create mode 100644 src/routes/(app)/payments/[...page]/+page.server.ts
 create mode 100644 src/routes/(app)/payments/[...page]/+page.svelte
 create mode 100644 src/routes/(app)/payments/[...page]/+server.ts
 delete mode 100644 src/routes/(app)/register/+page.server.ts
 delete mode 100644 src/routes/(app)/register/+page.svelte
 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
 delete mode 100644 src/routes/(app)/support/+page.svelte
 delete mode 100644 src/routes/(app)/support/+server.ts
 create mode 100644 src/routes/(app)/verify/[code]/+page.server.ts
 create mode 100644 src/routes/(app)/verify/[code]/+page.svelte
 create mode 100644 src/routes/(static)/login/+page.server.ts
 create mode 100644 src/routes/(static)/login/+page.svelte
 create mode 100644 src/routes/(static)/register/+page.server.ts
 create mode 100644 src/routes/(static)/register/+page.svelte
 create mode 100644 src/routes/(static)/support/+page.svelte
 create mode 100644 src/routes/(static)/support/+server.ts
 create mode 100644 src/routes/+error.svelte

(limited to 'src')

diff --git a/src/components/Account.svelte b/src/components/Account.svelte
index a9b3d6ba..eb1b0bac 100644
--- a/src/components/Account.svelte
+++ b/src/components/Account.svelte
@@ -5,10 +5,10 @@
 
   export let user, rate, account;
   let { seed, balance, id } = account;
-  $: type = seed ? "Savings":"Cash";
+  $: type = seed ? "Savings" : "Cash";
 </script>
 
-<a href={`/${user.username}/${id}/payments`.replace(/undefined\//, "")}>
+<a href={`/payments`} class="block">
   <div class="border rounded-xl shadow p-4 space-y-5">
     <div class="flex justify-center lg:justify-start">
       <Balance {balance} {user} {rate} />
@@ -30,10 +30,7 @@
         </button>
       </a>
 
-      <a
-        href={`/${user.username}/${id}/receive`.replace(/undefined\//, "")}
-        class="contents"
-      >
+      <a href={`/invoice`} class="contents">
         <button
           class="rounded-2xl border py-5 px-6 font-bold hover:opacity-80 flex bg-primary grow"
         >
diff --git a/src/components/AppHeader.svelte b/src/components/AppHeader.svelte
index 3b0303a8..b777e0b5 100644
--- a/src/components/AppHeader.svelte
+++ b/src/components/AppHeader.svelte
@@ -7,11 +7,7 @@
   import { loading, t } from "$lib/translations";
   import { page } from "$app/stores";
 
-  export let data;
-
-  let { subject, user } = data;
-  $: update(data);
-  let update = (data) => ({ subject, user } = data);
+  export let user, subject;
 
   let menuButtons;
   $: if (user)
@@ -19,14 +15,14 @@
       {
         key: "nav.settings",
         icon: "settings",
-        href: `/${user.username}/settings`,
+        href: `/settings`,
       },
       { key: "nav.support", icon: "support", href: `/support` },
-      { key: "nav.map", icon: "map", href: `/${user.username}/map` },
+      { key: "nav.map", icon: "map", href: `/map` },
       {
         key: "nav.messages",
         icon: "message",
-        href: `/${user.username}/messages`,
+        href: `/messages`,
       },
       { key: "nav.merch", icon: "shop", href: `https://coinosmerch.com` },
       { key: "nav.signOut", icon: "logout", href: `/logout` },
@@ -60,19 +56,19 @@
             ><Icon icon="home" style="mx-auto w-6 sm:w-8" />
           </button>
         </a>
-        <a href={`/${user.username}/receive`}>
+        <a href={`/invoice`}>
           <button
             class="bg-white p-2 rounded-full w-12 h-12 sm:w-16 sm:h-16 drop-shadow-xl border border-black/10 {$page
-              .url.pathname === `/${user.username}/receive`
+              .url.pathname.includes('invoice')
               ? 'opacity-100'
               : 'opacity-70 hover:opacity-80'}"
             ><Icon icon="receive" style="mx-auto w-6 sm:w-8" />
           </button>
         </a>
-        <a href={`/${user.username}/payments`}>
+        <a href={`/payments`}>
           <button
             class="bg-white p-2 rounded-full w-12 h-12 sm:w-16 sm:h-16 drop-shadow-xl border border-black/10 {$page
-              .url.pathname === `/${user.username}/payments`
+              .url.pathname === `/payments`
               ? 'opacity-100'
               : 'opacity-70 hover:opacity-80'} relative"
             ><Icon icon="clock" style="mx-auto w-6 sm:w-8" />
@@ -102,9 +98,8 @@
         <div class="relative">
           <OutClick on:outclick={() => (showMenu = false)}>
             <button
-              class="bg-white p-2 rounded-full w-12 h-12 sm:w-16 sm:h-16 drop-shadow-xl border border-black/10 {$page
-                .url.pathname === `/${user.username}` ||
-              $page.url.pathname === `/${user.username}/settings` ||
+              class="bg-white p-2 rounded-full w-12 h-12 sm:w-16 sm:h-16 drop-shadow-xl border border-black/10 {
+              $page.url.pathname === `/settings` ||
               $page.url.pathname === `/support`
                 ? 'opacity-100'
                 : `opacity-70 hover:opacity-80 ${
diff --git a/src/components/Invoice.svelte b/src/components/Invoice.svelte
index ba436649..563a2fee 100644
--- a/src/components/Invoice.svelte
+++ b/src/components/Invoice.svelte
@@ -27,7 +27,7 @@
         </div>
       </div>
       <div class="mx-auto my-auto flex gap-2">
-        <a href={`/${invoice.user.username}/invoice/${$invoice.id}/tip`}>
+        <a href={`/invoice/${$invoice.id}/tip`}>
           <button
             class="rounded-full border py-2 px-4 font-bold hover:opacity-80 w-32"
           >
diff --git a/src/components/Items.svelte b/src/components/Items.svelte
index f449215c..f991e114 100644
--- a/src/components/Items.svelte
+++ b/src/components/Items.svelte
@@ -1,4 +1,5 @@
 <script>
+  import { t } from "$lib/translations";
   import { btc, f, sat, post } from "$lib/utils";
   import { browser } from "$app/environment";
   import { goto, invalidate } from "$app/navigation";
@@ -14,7 +15,7 @@
   import DeleteItem from "$comp/DeleteItem.svelte";
   import Icon from "$comp/Icon.svelte";
 
-  export let subject, user, items, total, rate, currency;
+  export let subject, user, items, rate, currency;
 
   let flipDurationMs = 200;
   let dropTargetStyle = {};
@@ -27,6 +28,8 @@
     deleting = item;
   };
 
+  $: total = items.reduce((a, b) => a + b.price * b.quantity, 0);
+
   function handleConsider(e) {
     const {
       items: newItems,
@@ -77,15 +80,15 @@
       rate,
     };
 
-    let { id } = await post(`/${subject.username}/invoice`, {
+    let { id } = await post(`/invoice`, {
       invoice,
       user: { username: subject.username },
     });
 
     if (invoice.memoPrompt) {
-      return goto(`/${subject.username}/invoice/${id}/memo`);
+      return goto(`/invoice/${id}/memo`);
     }
-    goto(`/${subject.username}/invoice/${id}`);
+    goto(`/invoice/${id}`);
   };
 
   let reset = () =>
@@ -135,7 +138,7 @@
         {#if user?.username === subject.username}
           <div class="flex gap-2 justify-center absolute top-2 right-2">
             <button type="button" on:click|stopPropagation={() => {}}>
-              <a href={`/${user.username}/items/${i.id}`}>
+              <a href={`/items/${i.id}`}>
                 <button
                   class="bg-black rounded-full w-12 h-12 bg-opacity-40 hover:bg-opacity-100"
                 >
@@ -157,7 +160,7 @@
               on:touchstart={startDrag}
               on:keydown={handleKeyDown}
             >
-              <a href={`/${user.username}/items/${i.id}`}>
+              <a href={`/items/${i.id}`}>
                 <button
                   class="bg-black rounded-full w-12 h-12 bg-opacity-40 hover:bg-opacity-100"
                 >
@@ -207,3 +210,39 @@
     </button>
   {/each}
 </div>
+
+<div
+  class="fixed inset-x-0 mx-auto flex bottom-16"
+  class:static={!items.length}
+>
+  {#if total > 0}
+    <button
+      class="rounded-2xl py-5 px-6 font-bold hover:bg-neutral-700 flex bg-black text-white mx-auto"
+      on:click={checkout}
+    >
+      <div class="mx-auto flex">
+        <div class="my-auto text-2xl">
+          {$t("user.dashboard.checkout")}
+          {f(total, currency)}
+          <span class="text-base">
+            {sat(btc(total, rate), currency)}
+          </span>
+        </div>
+      </div>
+    </button>
+  {/if}
+</div>
+
+<style>
+  .custom-shadow-item {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    visibility: visible;
+    background: #333;
+    opacity: 0.5;
+    margin: 0;
+  }
+</style>
diff --git a/src/components/LandingHeader.svelte b/src/components/LandingHeader.svelte
index d1094a1d..92de7bcd 100644
--- a/src/components/LandingHeader.svelte
+++ b/src/components/LandingHeader.svelte
@@ -19,10 +19,10 @@
 </script>
 
 <header
-  class="w-full lg:w-5/6 py-5 mx-auto fixed md:sticky z-10 top-0 bg-white/90"
+  class="w-full md:w-5/6 py-5 mx-auto fixed md:sticky z-10 top-0 bg-white/90"
   bind:this={header}
 >
-  <nav class="block xl:flex flex-wrap justify-between items-center">
+  <nav class="block md:flex justify-between items-center">
     <div
       class="flex justify-start md:justify-center items-center md:space-x-10"
     >
@@ -34,7 +34,7 @@
 
     <!-- desktop nav -->
     <div
-      class="hidden space-x-10 md:flex flex-wrap justify-center items-center font-bold"
+      class="hidden space-x-10 md:flex justify-center items-center font-bold"
     >
       {#if $page.url.pathname === "/"}
         <button class="hover:opacity-80" on:click={() => scroll(howItWorks)}
diff --git a/src/components/LocationsMap.svelte b/src/components/LocationsMap.svelte
index 79ea4bf3..bd51b125 100644
--- a/src/components/LocationsMap.svelte
+++ b/src/components/LocationsMap.svelte
@@ -3,7 +3,7 @@
   import { browser } from "$app/environment";
   import Icon from "$comp/Icon.svelte";
   import Popup from "$comp/Popup.svelte";
-  import { shuffleArray } from "$lib/utils";
+  import { back, shuffleArray } from "$lib/utils";
 
   import "maplibre-gl/dist/maplibre-gl.css";
 
@@ -220,8 +220,16 @@
     class="mx-auto h-full w-full z-0"
     bind:this={mapContainer}
   />
+    <div class="absolute flex top-2 left-2 gap-2">
+      <button
+        class="rounded-full border-2 border-black bg-white w-10 h-10"
+        on:click={back}
+      >
+          <Icon icon="arrow-left" style="w-4 m-auto" />
+      </button>
+    </div>
   <div class="relative">
-    <div class="flex absolute flex top-2 right-2 gap-2">
+    <div class="absolute flex top-2 right-2 gap-2">
       <button
         class="rounded-full border-2 border-black bg-white w-10 h-10"
         on:click={toggle}
diff --git a/src/components/Request.svelte b/src/components/Request.svelte
index c085f9e2..297b7438 100644
--- a/src/components/Request.svelte
+++ b/src/components/Request.svelte
@@ -26,7 +26,7 @@
         </div>
       </div>
       <div class="mx-auto my-auto flex gap-2">
-        <a href={`/${user.username}/receive/${$request.id}`}>
+        <a href={`/receive/${$request.id}`}>
           <button
             class="rounded-full border py-2 px-4 font-bold hover:opacity-80 w-32"
           >
diff --git a/src/lib/invoice.ts b/src/lib/invoice.ts
index 7897dadc..3c885346 100644
--- a/src/lib/invoice.ts
+++ b/src/lib/invoice.ts
@@ -25,9 +25,9 @@ export default async ({ cookies, request }) => {
   let { id } = invoice;
 
   if (invoice.prompt && invoice.tip === null)
-    redirect(307, `/${user.username}/invoice/${id}/tip`);
+    redirect(307, `/invoice/${id}/tip`);
 
   if (invoice.memoPrompt && !invoice.memo) {
-    redirect(307, `/${user.username}/invoice/${id}/memo`);
-  } else redirect(307, `/${user.username}/invoice/${id}`);
+    redirect(307, `/invoice/${id}/memo`);
+  } else redirect(307, `/invoice/${id}`);
 };
diff --git a/src/locales/en.json b/src/locales/en.json
index ad42b8cc..b1bbe1c4 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -132,7 +132,9 @@
 		"haveAccount": "Already have an account?",
 		"noAccount": "Don't have an account?",
 		"register": "Register",
+		"createAccount": "Create account",
 		"signIn": "Sign In",
+		"signUp": "Sign Up",
 		"failed": "Login failed"
 	},
 	"nav": {
diff --git a/src/routes/(app)/+error.svelte b/src/routes/(app)/+error.svelte
deleted file mode 100644
index 6ce7979c..00000000
--- a/src/routes/(app)/+error.svelte
+++ /dev/null
@@ -1,38 +0,0 @@
-<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.server.ts b/src/routes/(app)/+layout.server.ts
index 655a9425..a0e30f31 100644
--- a/src/routes/(app)/+layout.server.ts
+++ b/src/routes/(app)/+layout.server.ts
@@ -1,8 +1,9 @@
-import { redirect } from "@sveltejs/kit";
-  import { get, auth, protectedRoutes } from "$lib/utils";
+import { error, redirect } from "@sveltejs/kit";
+import { get, auth, protectedRoutes } from "$lib/utils";
 
 export async function load({ cookies, request, url, params }) {
   let { pathname } = url;
+  let { username } = params;
   let token = cookies.get("token");
   let rate,
     rates = { USD: 1 };
@@ -14,6 +15,18 @@ export async function load({ cookies, request, url, params }) {
     } catch (e) {}
   }
 
+  let subject;
+  if (username) {
+    try {
+      subject = await get(`/users/${username}`);
+    } catch (e) {
+      error(500, "Unable to retrieve user account data");
+    }
+  }
+
+  if (!subject) subject = user;
+  if (!user) user = subject;
+
   if (user?.needsMigration) {
     redirect(307, `/migrate`);
   }
@@ -26,10 +39,7 @@ export async function load({ cookies, request, url, params }) {
     redirect(307, `/${user.username}`);
   }
 
-  if (
-    protectedRoutes.find((p) => pathname.match(p)) &&
-    (!user || user.username !== params.username)
-  ) {
+  if ( protectedRoutes.find((p) => pathname.match(p)) && (!user)) {
     redirect(307, "/login");
   }
 
@@ -44,5 +54,5 @@ export async function load({ cookies, request, url, params }) {
     console.log(e);
   }
 
-  return { user, token, rate, rates };
+  return { user, token, rate, rates, subject };
 }
diff --git a/src/routes/(app)/+layout.svelte b/src/routes/(app)/+layout.svelte
index 8d4e2940..0ff4816d 100644
--- a/src/routes/(app)/+layout.svelte
+++ b/src/routes/(app)/+layout.svelte
@@ -14,6 +14,7 @@
   import { page } from "$app/stores";
   import { browser } from "$app/environment";
   import LoadingSplash from "$comp/LoadingSplash.svelte";
+  import AppHeader from "$comp/AppHeader.svelte";
   import Invoice from "$comp/Invoice.svelte";
   import Password from "$comp/Password.svelte";
   import Request from "$comp/Request.svelte";
@@ -35,6 +36,7 @@
   });
 
   let { generate, rate, user, subject, token, rates } = data;
+  console.log("SUB", subject)
 
   $: update(data);
   let update = (data) => {
@@ -115,6 +117,7 @@
 <SvelteToast options={{ reversed: true, intro: { y: 192 } }} />
 
 <main class="pb-20">
+  <AppHeader {user} {subject} />
   {#if !$loading}
     <slot />
   {/if}
diff --git a/src/routes/(app)/[username]/(profile)/+layout.svelte b/src/routes/(app)/[username]/(profile)/+layout.svelte
index 2caf9b30..111fdeb6 100644
--- a/src/routes/(app)/[username]/(profile)/+layout.svelte
+++ b/src/routes/(app)/[username]/(profile)/+layout.svelte
@@ -219,7 +219,7 @@
 
       {#if user && user.username !== subject.username && subject.pubkey}
         <a
-          href={`/${user.username}/messages/${subject.username}`}
+          href={`/messages/${subject.username}`}
           class="contents"
         >
           <button
diff --git a/src/routes/(app)/[username]/(profile)/+page.svelte b/src/routes/(app)/[username]/(profile)/+page.svelte
index 25244c6d..9e5babd2 100644
--- a/src/routes/(app)/[username]/(profile)/+page.svelte
+++ b/src/routes/(app)/[username]/(profile)/+page.svelte
@@ -26,16 +26,16 @@
   if (user) user.savings = 0;
 </script>
 
-{#if !user.balance}
-  <div class="mb-8">
-    <p class="text-secondary text-lg">
-      {$t("user.welcome")}
-    </p>
-  </div>
-{/if}
-
 <div class="space-y-2">
   {#if user?.id === subject.id}
+    {#if !user.balance}
+      <div class="mb-8">
+        <p class="text-secondary text-lg">
+          {$t("user.welcome")}
+        </p>
+      </div>
+    {/if}
+
     {#each accounts as account}
       <Account {user} {rate} {account} />
     {/each}
@@ -43,7 +43,7 @@
     <button
       class="rounded-2xl border py-5 px-6 font-bold hover:opacity-80 flex bg-black text-white"
     >
-      <a href={`/${user.username}/account/setup`}>
+      <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>
diff --git a/src/routes/(app)/[username]/+layout.server.ts b/src/routes/(app)/[username]/+layout.server.ts
index 11e6d45c..c340544d 100644
--- a/src/routes/(app)/[username]/+layout.server.ts
+++ b/src/routes/(app)/[username]/+layout.server.ts
@@ -1,17 +1,25 @@
 import { get } from "$lib/utils";
 import { error } from "@sveltejs/kit";
 
-export let load = async ({ cookies, depends, params: { username } }) => {
+export let load = async ({
+  cookies,
+  depends,
+  params: { username },
+  parent,
+}) => {
   depends("app:user");
 
   try {
     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);
     cookies.set("username", username, { path: "/", expires });
 
-    return { subject };
+    return { subject, user };
   } catch (e) {
     error(500, "Unable to retrieve user account data");
   }
diff --git a/src/routes/(app)/[username]/+layout.svelte b/src/routes/(app)/[username]/+layout.svelte
index cd517fa9..98569f59 100644
--- a/src/routes/(app)/[username]/+layout.svelte
+++ b/src/routes/(app)/[username]/+layout.svelte
@@ -1,5 +1,4 @@
 <script>
-  import AppHeader from "$comp/AppHeader.svelte";
   import { onNavigate } from "$app/navigation";
   export let data;
 
@@ -15,7 +14,6 @@
   });
 </script>
 
-<AppHeader {data} />
 <div class="content">
   <slot />
 </div>
diff --git a/src/routes/(app)/[username]/[...account]/payments/[...page]/+page.server.ts b/src/routes/(app)/[username]/[...account]/payments/[...page]/+page.server.ts
deleted file mode 100644
index c2cd5683..00000000
--- a/src/routes/(app)/[username]/[...account]/payments/[...page]/+page.server.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { get, auth } from "$lib/utils";
-
-let limit = 25;
-
-export async function load({ cookies, depends, params }) {
-  depends("app:payments");
-
-  let parts = params.page.split("/");
-
-  let start, end, page;
-  if (parts.length === 1) [page] = parts;
-  if (parts.length === 2) [start, page] = parts;
-  if (parts.length === 3) [start, end, page] = parts;
-  if (!parseInt(page)) page = 1;
-
-  let offset = (page - 1) * limit;
-  if (!start) start = Date.now() / 1000 - 24 * 60 * 60;
-
-  let url = `/payments?account=${params.account}&start=${
-    start * 1000
-  }&limit=${limit}&offset=${offset}`;
-  if (end) url += `&end=${end * 1000}`;
-
-  let { count, payments, incoming, outgoing } = await get(url, auth(cookies));
-  let pages = new Array(Math.ceil(count / limit));
-
-  return { payments, page, pages, start, end, incoming, outgoing };
-}
diff --git a/src/routes/(app)/[username]/[...account]/payments/[...page]/+page.svelte b/src/routes/(app)/[username]/[...account]/payments/[...page]/+page.svelte
deleted file mode 100644
index 1efdc2ec..00000000
--- a/src/routes/(app)/[username]/[...account]/payments/[...page]/+page.svelte
+++ /dev/null
@@ -1,315 +0,0 @@
-<script>
-  import Avatar from "$comp/Avatar.svelte";
-  import Icon from "$comp/Icon.svelte";
-  import { onMount } from "svelte";
-  import { format } from "date-fns";
-  import { newPayment } from "$lib/store";
-  import { t } from "$lib/translations";
-  import { get, f, s, sat, sats, types } from "$lib/utils";
-  import { page } from "$app/stores";
-  import { differenceInDays, getUnixTime, sub } from "date-fns";
-  import { goto, invalidate } from "$app/navigation";
-
-  export let data;
-
-  let { start, end, user, rates, payments } = data;
-
-  let change = ({ target: { value } }) => goto(value);
-  let link = (p) => {
-    if (p.pot) return `/pot/${p.pot}`;
-    if (p.with) return "/" + p.with.username;
-    return `/p/${p.id}`;
-  };
-
-  $: presets = [
-    {
-      title: $t("payments.day"),
-      start: sub(new Date(), { days: 1 }),
-      end: null,
-    },
-    {
-      title: $t("payments.week"),
-      start: sub(new Date(), { days: 7 }),
-      end: null,
-    },
-    {
-      title: $t("payments.month"),
-      start: sub(new Date(), { months: 1 }),
-      end: null,
-    },
-    {
-      title: $t("payments.all"),
-      start: sub(new Date(), { years: 5 }),
-      end: null,
-    },
-  ];
-
-  $: selection = start
-    ? presets.findIndex(
-        (p) => Math.abs(differenceInDays(new Date(start * 1000), p.start)) < 1
-      )
-    : 0;
-
-  let p,
-    incoming,
-    outgoing,
-    pages = [];
-  $: data &&
-    ({ page: p, pages, start, end, incoming, outgoing, payments } = data);
-
-  $: $page && ($newPayment = false);
-  $: $newPayment && invalidate(`/users/${user.username}`);
-
-  $: path = $page.params.page
-    ? $page.url.pathname.substring(0, $page.url.pathname.lastIndexOf("/"))
-    : $page.url.pathname;
-
-  let csv = async () => {
-    let url = `/${user.username}/payments`;
-    if (start) url += `/${start}`;
-    if (end) url += `/${end}`;
-
-    let { payments } = await get(url);
-
-    payments = payments.map((p) => ({
-      ...p,
-      created: new Date(p.created),
-      total: p.amount + (p.tip || 0),
-      platform_fee: p.ourfee,
-      amount_fiat: f((p.amount * p.rate) / sats, p.currency),
-      fee_fiat: p.fee ? f((p.fee * p.rate) / sats, p.currency) : null,
-      platform_fee_fiat: p.ourfee ? f((p.ourfee * p.rate) / sats, p.currency) : null,
-      tip_fiat: p.tip ? f((p.tip * p.rate) / sats, p.currency) : null,
-      total_fiat: f(((p.amount + (p.tip || 0)) * p.rate) / sats, p.currency),
-    }));
-
-    let keys = [
-      "type",
-      "id",
-      "created",
-      "rate",
-      "currency",
-      "amount",
-      "tip",
-      "total",
-      "fee",
-      "platform_fee",
-      "amount_fiat",
-      "tip_fiat",
-      "total_fiat",
-      "fee_fiat",
-      "platform_fee_fiat",
-    ];
-
-    let csv =
-      keys.map((k) => `"${k}"`).join(",") +
-      "\n" +
-      payments
-        .map((r) => keys.map((k) => `"${r[k] || ""}"`).join(","))
-        .join("\n");
-
-    let filename = "payments.csv";
-    let blob = new Blob([csv], { type: "text/csv;charset=utf-8;" });
-    if (navigator.msSaveBlob) {
-      navigator.msSaveBlob(blob, filename);
-    } else {
-      let link = document.createElement("a");
-      if (link.download !== undefined) {
-        let url = URL.createObjectURL(blob);
-        link.setAttribute("href", url);
-        link.setAttribute("download", filename);
-        link.style.visibility = "hidden";
-        document.body.appendChild(link);
-        link.click();
-        document.body.removeChild(link);
-      }
-    }
-  };
-</script>
-
-<div class="mt-24 mb-20 payments">
-  <h1 class="px-3 md:px-0 text-center text-3xl md:text-4xl font-semibold mb-10">
-    {$t("payments.header")}
-  </h1>
-
-  <div class="container w-full mx-auto text-lg px-4 max-w-xl space-y-5">
-    <div class="flex text-md text-secondary relative">
-      <div class="mx-auto flex justify-center w-full gap-1">
-        {#each presets as { start, end, title }, i}
-          <a
-            class:active={selection === i}
-            href={`/${user.username}/payments/${getUnixTime(start) + "/"}1`}
-          >
-            <button
-              class="text-sm md:text-lg rounded-full border py-2 px-4 hover:opacity-80 min-w-[72px]"
-            >
-              <div class="my-auto">{title}</div>
-            </button>
-          </a>
-        {/each}
-      </div>
-    </div>
-
-    <div class="flex flex-wrap justify-center mb-8">
-      {#if pages.length > 1}
-        {#each pages as _, i}
-          <a
-            class="mr-1 last:mr-0"
-            href={`${path}/${i + 1}`}
-            class:active={parseInt(p) === i + 1}
-          >
-            <div
-              class="border py-2 rounded-full border-2 w-12 h-12 hover:opacity-80 text-center"
-            >
-              {i + 1}
-            </div>
-          </a>
-        {/each}
-      {/if}
-    </div>
-
-    <div class="text-base">
-      {#each payments as p}
-        <a href={`/payment/${p.id}`}>
-          <div class="grid grid-cols-12 border-b h-24 hover:bg-gray-100 px-4">
-            <div class="whitespace-nowrap my-auto col-span-3">
-              <div class="font-bold" class:text-red-800={p.amount < 0}>
-                {f(Math.abs(p.amount) * (p.rate / sats), p.currency)}
-                {#if p.tip}
-                  <span class="text-sm text-secondary">
-                    +{Math.round((p.tip / Math.abs(p.amount)) * 100)}%
-                  </span>
-                {/if}
-              </div>
-
-              <div class="text-secondary">
-                {sat(Math.abs(p.amount) + (p.tip || 0))}
-              </div>
-            </div>
-
-            <div
-              class="flex my-auto col-span-5 truncate text-ellipsis overflow-hidden mx-auto"
-            >
-              {#if p.type === types.pot}
-                <a href={`/pot/${p.memo}`}>
-                  <div class="text-secondary flex">
-                    <div class="my-auto mr-1">
-                      <img src="/images/moneypot.png" class="w-12" alt="Pot" />
-                    </div>
-
-                    <div class="my-auto">Pot</div>
-                  </div>
-                </a>
-              {:else if p.with}
-                <div class="flex">
-                  <div class="my-auto">
-                    <Avatar user={p.with} size={12} disabled={true} />
-                  </div>
-                  <div class="my-auto ml-1 text-secondary">
-                    {p.with.username}
-                  </div>
-                </div>
-              {:else}
-                <div class="text-secondary flex">
-                  {#if [types.ecash, types.lightning].includes(p.type)}
-                    <div class="text-3xl">⚡️</div>
-                  {:else if p.type === types.bitcoin}
-                    <div class="my-auto mr-1">
-                      <img
-                        src="/images/bitcoin.svg"
-                        class="w-12 border-4 border-transparent"
-                        alt="Bitcoin"
-                      />
-                    </div>
-                  {:else if p.type === types.liquid}
-                    <div class="my-auto mr-1">
-                      <img
-                        src="/images/liquid.svg"
-                        class="w-12 border-4 border-transparent"
-                        alt="Liquid"
-                      />
-                    </div>
-                  {/if}
-
-                  <div class="my-auto">
-                    {p.amount > 0
-                      ? p.confirmed
-                        ? "Received"
-                        : "Pending"
-                      : "Sent"}
-                  </div>
-                </div>
-              {/if}
-            </div>
-
-            <div class="text-secondary text-right text-sm my-auto col-span-3">
-              <div>
-                {format(new Date(p.created), "h:mm aaa")}
-              </div>
-              <div>
-                {format(new Date(p.created), "MMM d, yy")}
-              </div>
-            </div>
-          </div>
-        </a>
-      {:else}
-        <p class="text-secondary text-lg text-center">{$t("payments.empty")}</p>
-      {/each}
-    </div>
-
-    <div class="grid grid-cols-3 w-full text-center text-lg">
-      {#each Object.keys(incoming) as c}
-        <span class="text-base text-secondary text-left"></span>
-        <!-- <span class="text-base text-secondary" -->
-        <!--   >{$t("payments.subtotal")}</span -->
-        <!-- > -->
-        <span class="text-base text-secondary">
-          {#if tipsIn || tipsOut}{$t("payments.tips")}{/if}
-        </span>
-        <span class="text-base text-secondary"
-          >{$t("payments.total")}</span
-        >
-
-        {@const totalIn = incoming[c]?.fiat || 0}
-        {@const tipsIn = incoming[c]?.fiatTips || 0}
-        {@const subtotalIn = totalIn - tipsIn}
-
-        {@const totalOut = -outgoing[c]?.fiat || 0}
-        {@const tipsOut = outgoing[c]?.fiatTips || 0}
-        {@const subtotalOut = totalOut - tipsOut}
-
-        <span class="text-left text-base text-secondary"
-          >{$t("payments.income")}</span
-        >
-        <!-- <span><b>{subtotalIn ? f(subtotalIn, c) : "-"}</b></span> -->
-        <span><b>{tipsIn ? f(tipsIn, c) : "-"}</b></span>
-        <span><b>{totalIn ? f(totalIn, c) : "-"}</b></span>
-
-        <span class="text-left text-base text-secondary"
-          >{$t("payments.expenditure")}</span
-        >
-        <!-- <span><b>{subtotalOut ? f(subtotalOut, c) : "-"}</b></span> -->
-        <span><b>{tipsOut ? f(tipsOut, c) : "-"}</b></span>
-        <span><b>{totalOut ? f(totalOut, c) : "-"}</b></span>
-      {/each}
-    </div>
-
-    <button
-      class="ml-auto rounded-full border py-2 px-4 w-36 hover:opacity-80 flex mx-auto"
-      on:click={csv}
-    >
-      <Icon icon="save" style="opacity-50 mr-2 my-auto" />
-      <div class="my-auto">{$t("payments.export")}</div>
-    </button>
-  </div>
-</div>
-
-<style>
-  .active * {
-    @apply bg-black text-white border-black;
-  }
-
-  .payments {
-    view-transition-name: payments;
-  }
-</style>
diff --git a/src/routes/(app)/[username]/[...account]/payments/[...page]/+server.ts b/src/routes/(app)/[username]/[...account]/payments/[...page]/+server.ts
deleted file mode 100644
index a81faaf3..00000000
--- a/src/routes/(app)/[username]/[...account]/payments/[...page]/+server.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { get, auth } from "$lib/utils";
-import { json } from "@sveltejs/kit";
-
-export async function GET({ cookies, params }) {
-  let parts = params.page.split("/");
-
-  let start, end;
-  if (parts.length === 1) [start] = parts;
-  if (parts.length === 2) [start, end] = parts;
-
-  if (!start) start = Date.now() / 1000 - 24 * 60 * 60;
-
-  let url = `/payments?start=${start * 1000}`;
-  if (end) url += `&end=${end * 1000}`;
-
-  let { payments } = await get(url, auth(cookies));
-  return json({ payments });
-}
diff --git a/src/routes/(app)/[username]/[...account]/receive/[...param]/+page.server.ts b/src/routes/(app)/[username]/[...account]/receive/[...param]/+page.server.ts
deleted file mode 100644
index d9614a1c..00000000
--- a/src/routes/(app)/[username]/[...account]/receive/[...param]/+page.server.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { error, redirect } from "@sveltejs/kit";
-import { auth, post } from "$lib/utils";
-import type { Invoice } from "$lib/types";
-
-export let load = async ({ cookies, params, parent }) => {
-  let { account } = params;
-  let { subject, user, rates } = await parent();
-
-  let invoice: Invoice = {
-    account,
-    type: account ? "bitcoin" : "lightning",
-    rate: rates[user?.currency || subject?.currency],
-  };
-
-  if (!user) user = subject;
-
-  try {
-    invoice = await post("/invoice", { invoice, account, user }, auth(cookies));
-  } catch (e) {
-    console.log(e);
-    error(500, "Failed to generate invoice");
-    }
-
-  let { id } = invoice;
-
-  if (invoice.memoPrompt && !invoice.memo) {
-    redirect(307, `/${user.username}/invoice/${id}/memo`);
-  } else redirect(307, `/${user.username}/invoice/${id}`);
-};
diff --git a/src/routes/(app)/[username]/[...account]/receive/[...param]/+page.svelte b/src/routes/(app)/[username]/[...account]/receive/[...param]/+page.svelte
deleted file mode 100644
index f9267105..00000000
--- a/src/routes/(app)/[username]/[...account]/receive/[...param]/+page.svelte
+++ /dev/null
@@ -1,116 +0,0 @@
-<script>
-  import { page } from "$app/stores";
-  import { fly } from "svelte/transition";
-  import { enhance } from "$app/forms";
-  import { tick } from "svelte";
-  import { browser } from "$app/environment";
-  import { t } from "$lib/translations";
-  import AppHeader from "$comp/AppHeader.svelte";
-  import Avatar from "$comp/Avatar.svelte";
-  import Icon from "$comp/Icon.svelte";
-  import Spinner from "$comp/Spinner.svelte";
-  import { back, fail, focus } from "$lib/utils";
-
-  export let data;
-  export let form;
-  data.subject = data.user;
-
-  let { contacts } = data;
-  let w;
-
-  let el, text;
-
-  let keypress = (e) => e.key === "Enter" && (e.preventDefault() || el.click());
-
-  let paste = async () => {
-    text = await navigator.clipboard.readText();
-  };
-</script>
-
-<svelte:window bind:innerWidth={w} />
-
-<AppHeader {data} />
-<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.send")}
-  </h1>
-
-  <form method="POST" use:enhance class="space-y-2 text-xl">
-    {#if form?.error}
-      <div class="mb-5">
-        <div class="text-red-600">
-          {$t("error.unrecognizedInput")}
-        </div>
-      </div>
-    {/if}
-
-    <div class="mb-2">
-      <textarea
-        use:focus
-        name="text"
-        placeholder={$t("user.send.placeholder")}
-        on:keypress={keypress}
-        class="w-full p-4 border rounded-xl h-48 text-xl"
-        bind:value={text}
-        autocapitalize="none"
-      />
-    </div>
-
-    <div class="flex gap-2">
-      <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"
-        >
-          <Icon icon="camera" style="mr-2 w-6 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"
-        on:click={paste}
-      >
-        <Icon icon="paste" style="mr-2 w-6 my-auto" />
-        <div class="my-auto">{$t("user.send.paste")}</div>
-      </button>
-    </div>
-
-    <button
-      bind:this={el}
-      type="submit"
-      class="bg-black text-white border rounded-2xl px-6 py-5 w-full font-bold"
-    >
-      {$t("user.send.next")}
-    </button>
-  </form>
-
-  {#if contacts.length}
-    <div class="space-y-5">
-      <h1 class="px-3 md:px-0 text-2xl font-semibold mt-10">
-        {$t("user.send.contacts")}
-      </h1>
-      <div>
-        {#each contacts as c}
-          <a href={`/pay/${c.username}`}>
-            <div
-              class="border-b p-2 last:border-b-0 hover:bg-gray-100 rounded-2xl"
-            >
-              <div class="flex">
-                <div>
-                  <div class="flex">
-                    <Avatar user={c} size={20} disabled={true} />
-                    <div class="my-auto text-left">
-                      <p class="ml-1 text-lg break-words">{c.username}</p>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </a>
-        {/each}
-      </div>
-    </div>
-  {/if}
-</div>
diff --git a/src/routes/(app)/[username]/account/setup/+page.svelte b/src/routes/(app)/[username]/account/setup/+page.svelte
deleted file mode 100644
index 9636ff2a..00000000
--- a/src/routes/(app)/[username]/account/setup/+page.svelte
+++ /dev/null
@@ -1,64 +0,0 @@
-<script>
-  import { copy } from "$lib/utils";
-  import { t } from "$lib/translations";
-  import Icon from "$comp/Icon.svelte";
-  import { mnemonic } from "$lib/store";
-  import { generateMnemonic } from "@scure/bip39";
-  import { wordlist } from "@scure/bip39/wordlists/english";
-
-  export let data;
-  let { user } = data;
-
-  let reveal;
-
-  let toggleSeed = async () => {
-    try {
-      $mnemonic = await generateMnemonic(wordlist);
-      reveal = !reveal;
-    } catch (e) {
-      console.log(e);
-    }
-  };
-</script>
-
-<div class="space-y-5">
-  <h1 class="text-center text-3xl font-semibold">Account setup</h1>
-  <h2 class="text-center text-2xl text-secondary">Step 1</h2>
-
-  <div class="container w-full mx-auto text-lg px-4 max-w-xl space-y-5">
-    <p class="text-secondary mb-1">
-      The keys to your savings account are derived from a seed phrase. When
-      you're ready, write it down and keep it safe.
-    </p>
-
-    <p class="text-secondary mb-1">
-      Whoever knows these words in the correct order can withdraw funds from the account. We can't
-      recover them if you lose them.
-    </p>
-
-    {#if reveal}
-      <div class="text-2xl border p-4 text-center rounded-2xl">
-        {$mnemonic}
-      </div>
-
-      <div>
-        <a href={`/${user.username}/account/setup/step2`} class="contents">
-          <button
-            type="button"
-            class="bg-black text-white w-full px-5 py-6 text-xl rounded-2xl font-bold"
-            on:click={toggleSeed}
-          >
-            I've written down my seed phrase
-          </button>
-        </a>
-      </div>
-    {:else}
-      <div class="flex justify-center">
-        <button type="button" class="primary" on:click={toggleSeed}>
-          <Icon icon="warning" style="mr-2 w-6 my-auto" />
-          {$t("user.settings.revealSeed")}
-        </button>
-      </div>
-    {/if}
-  </div>
-</div>
diff --git a/src/routes/(app)/[username]/account/setup/step2/+page.svelte b/src/routes/(app)/[username]/account/setup/step2/+page.svelte
deleted file mode 100644
index 8169ce06..00000000
--- a/src/routes/(app)/[username]/account/setup/step2/+page.svelte
+++ /dev/null
@@ -1,52 +0,0 @@
-<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 { wordlist } from "@scure/bip39/wordlists/english";
-  import { fail, post } from "$lib/utils";
-  import { goto } from "$app/navigation";
-
-  export let data;
-  let { user } = data;
-
-  let password;
-
-  let submit = async () => {
-    let seed = await encrypt(mnemonicToEntropy($mnemonic, wordlist), password);
-    try {
-      await post("/api/accounts", { seed });
-      goto(`/${user.username}`);
-    } catch (e) {
-      console.log(e);
-      fail("Something went wrong");
-    }
-  };
-</script>
-
-<div class="space-y-5">
-  <div>
-    <h1 class="text-center text-3xl font-semibold">Account setup</h1>
-    <h2 class="text-center text-2xl text-secondary">Step 2</h2>
-  </div>
-
-  <form
-    on:submit|preventDefault={submit}
-    class="container w-full mx-auto text-lg px-4 max-w-xl space-y-5"
-  >
-    <p class="text-secondary mb-1">
-      Add an additional password to your seed phrase. It should be different
-      than your login password. We can't reset it if you lose it.
-    </p>
-
-      <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"
-    >
-      Submit
-    </button>
-  </form>
-</div>
diff --git a/src/routes/(app)/[username]/address/+page.server.ts b/src/routes/(app)/[username]/address/+page.server.ts
deleted file mode 100644
index 2f7841ab..00000000
--- a/src/routes/(app)/[username]/address/+page.server.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { auth, post } from "$lib/utils";
-import { redirect } from "@sveltejs/kit";
-
-export async function load({ cookies, parent }) {
-  let user = (await parent()).subject;
-  let invoice = { type: "bitcoin" };
-  let { id } = await post(`/invoice`, { invoice, user }, auth(cookies));
-  redirect(307, `/${user.username}/invoice/${id}`);
-}
diff --git a/src/routes/(app)/[username]/address/+page.svelte b/src/routes/(app)/[username]/address/+page.svelte
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/routes/(app)/[username]/card/[serial]/+page.server.ts b/src/routes/(app)/[username]/card/[serial]/+page.server.ts
deleted file mode 100644
index 945eee30..00000000
--- a/src/routes/(app)/[username]/card/[serial]/+page.server.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { auth, get } from "$lib/utils";
-import { redirect } from "@sveltejs/kit";
-
-export let load = async ({ cookies, params }) => {
-  let { serial } = params;
-  let fund;
-  try {
-    fund = await get(`/fund/${serial}`, auth(cookies));
-  } catch (e) {
-    console.log(e);
-  }
-
-  if (fund) redirect(307, `/fund/${serial}`);
-
-  return params;
-};
diff --git a/src/routes/(app)/[username]/card/[serial]/+page.svelte b/src/routes/(app)/[username]/card/[serial]/+page.svelte
deleted file mode 100644
index 1d11ebee..00000000
--- a/src/routes/(app)/[username]/card/[serial]/+page.svelte
+++ /dev/null
@@ -1,36 +0,0 @@
-<script>
-  import Card from "$comp/Card.svelte";
-  import Icon from "$comp/Icon.svelte";
-  export let data;
-  let { serial } = data;
-  let balance = 0;
-</script>
-
-<div class="space-y-5">
-  <div class="relative flex justify-center gap-2">
-    <h1 class="text-2xl md:text-3xl font-semibold my-auto">Card {serial}</h1>
-  </div>
-  <div class="flex justify-center">
-    <a href={`/send/pot/${serial}`}>
-      <button
-        class="rounded-full border py-3 px-6 font-bold hover:opacity-80 flex w-60 bg-black text-white justify-center gap-2"
-      >
-        <svg
-          xmlns="http://www.w3.org/2000/svg"
-          class="invert text-black peer-placeholder-shown:text-gray-300 h-6 w-6 my-auto"
-          fill="none"
-          viewBox="0 0 24 24"
-          stroke="currentColor"
-        >
-          <path
-            stroke-linecap="round"
-            stroke-linejoin="round"
-            stroke-width="2"
-            d="M3 10h18M7 15h1m4 0h1m-7 4h12a3 3 0 003-3V8a3 3 0 00-3-3H6a3 3 0 00-3 3v8a3 3 0 003 3z"
-          />
-        </svg>
-        <div class="my-auto">Add Funds</div>
-      </button>
-    </a>
-  </div>
-</div>
diff --git a/src/routes/(app)/[username]/customers/+page.svelte b/src/routes/(app)/[username]/customers/+page.svelte
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/routes/(app)/[username]/funds/+page.server.ts b/src/routes/(app)/[username]/funds/+page.server.ts
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/routes/(app)/[username]/funds/+page.svelte b/src/routes/(app)/[username]/funds/+page.svelte
deleted file mode 100644
index 25686e86..00000000
--- a/src/routes/(app)/[username]/funds/+page.svelte
+++ /dev/null
@@ -1,52 +0,0 @@
-<script>
-  import Avatar from "$comp/Avatar.svelte";
-  import Icon from "$comp/Icon.svelte";
-  import { t } from "$lib/translations";
-
-  export let data;
-
-  let { funds } = data;
-</script>
-
-<div class="mt-24 mb-20">
-  <h1 class="px-3 md:px-0 text-center text-3xl md:text-4xl font-semibold mb-10">
-    Funds
-  </h1>
-
-  <div class="container w-full mx-auto text-lg px-4 max-w-xl space-y-5">
-    <div class="text-base">
-      <div class="grid grid-cols-3 border-b h-24 hover:bg-gray-100 px-4">
-        <div class="whitespace-nowrap my-auto">
-          <div class="text-secondary" />
-        </div>
-
-        <div class="flex my-auto">
-          <div class="text-secondary flex">
-            <div class="my-auto mr-1">
-              <img src="/images/moneypot.png" class="w-12" alt="Pot" />
-            </div>
-
-            <div class="my-auto">Pot</div>
-          </div>
-        </div>
-
-        <div class="text-secondary text-right text-sm my-auto">
-          <div />
-        </div>
-      </div>
-    </div>
-
-    <button
-      class="ml-auto rounded-full border py-2 px-4 w-36 hover:opacity-80 flex mx-auto"
-    >
-      <Icon icon="plus" style="opacity-50 mr-2 my-auto" />
-      <div class="my-auto">{$t("payments.create")}</div>
-    </button>
-  </div>
-</div>
-
-<style>
-  .active * {
-    @apply bg-black text-white border-black;
-  }
-</style>
diff --git a/src/routes/(app)/[username]/generate/+page.svelte b/src/routes/(app)/[username]/generate/+page.svelte
deleted file mode 100644
index 767b7545..00000000
--- a/src/routes/(app)/[username]/generate/+page.svelte
+++ /dev/null
@@ -1,60 +0,0 @@
-<script>
-  import { fail, post, wait } from "$lib/utils";
-  import { onMount } from "svelte";
-  import { goto, invalidate } from "$app/navigation";
-  import Pin from "$comp/Pin.svelte";
-  import Spinner from "$comp/Spinner.svelte";
-  import { loginRedirect, pin, password } from "$lib/store";
-  import { generate } from "$lib/nostr";
-  import { browser } from "$app/environment";
-
-  export let data;
-  let { user } = data;
-
-  let loaded;
-  let gen = async () => {
-    if (!browser) return;
-
-    if (user.pubkey) {
-      goto($loginRedirect || `/${user.username}`, { invalidateAll: true });
-      return;
-    }
-
-    try {
-      await generate(user);
-    } catch (e) {
-      console.log("error generating", e);
-    }
-
-    try {
-      user.pin = $pin;
-      await post(`/${user.username}/generate`, user);
-      goto($loginRedirect || `/${user.username}`, { invalidateAll: true });
-    } catch (e) {
-      $pin = "";
-      if (e.message?.startsWith("Pin")) {
-        fail("Wrong pin, try again");
-      } else {
-        fail("Failed to generate keys");
-        goto("/");
-      }
-    }
-  };
-
-  onMount(() => browser && setTimeout(() => (loaded = true) && gen(), 50));
-
-  $: $pin?.length === 6 && gen(user);
-</script>
-
-{#if loaded && user?.haspin && $pin?.length !== 6}
-  <Pin />
-{/if}
-
-<div class="container px-4 text-center mx-auto">
-  <h1 class="text-3xl md:text-4xl font-bold mb-6">
-    Generating new account keys
-  </h1>
-  <div class="flex w-full py-5 max-w-[200px] mx-auto bg-black rounded-2xl">
-    <Spinner />
-  </div>
-</div>
diff --git a/src/routes/(app)/[username]/generate/+server.ts b/src/routes/(app)/[username]/generate/+server.ts
deleted file mode 100644
index 5a442982..00000000
--- a/src/routes/(app)/[username]/generate/+server.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { auth, post } from "$lib/utils";
-import { error, json } from "@sveltejs/kit";
-
-export async function POST({ cookies, request }) {
-  try {
-    let body = await request.json();
-    return json(await post(`/user`, body, auth(cookies)));
-  } catch (e: any) {
-    console.log(e);
-    error(500, e.message);
-  }
-}
diff --git a/src/routes/(app)/[username]/invoice/+server.ts b/src/routes/(app)/[username]/invoice/+server.ts
deleted file mode 100644
index 5e3d0300..00000000
--- a/src/routes/(app)/[username]/invoice/+server.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { auth, post } from "$lib/utils";
-import { json } from "@sveltejs/kit";
-
-export let POST = async ({ cookies: c, request: r }) => {
-  let j = await r.json();
-  return json(await post("/invoice", j, auth(c)));
-};
diff --git a/src/routes/(app)/[username]/invoice/[id]/+layout.server.ts b/src/routes/(app)/[username]/invoice/[id]/+layout.server.ts
deleted file mode 100644
index 41554c9f..00000000
--- a/src/routes/(app)/[username]/invoice/[id]/+layout.server.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import Qr from "qrcode-base64";
-import { get } from "$lib/utils";
-import { redirect } from "@sveltejs/kit";
-
-export async function load({ depends, params, url, parent }) {
-  depends("app:invoice");
-
-  let { subject, user } = await parent();
-  let { id } = params;
-  let invoice = await get(`/invoice/${id}`);
-  let options = !!url.searchParams.get("options");
-
-  if (
-    user &&
-    invoice.uid !== user.id &&
-    !(url.pathname.includes("tip") || url.pathname.includes("memo")) &&
-    !options
-  ) {
-    redirect(307, `/send/invoice/${id}`);
-  }
-
-  let { amount, pending, received } = invoice;
-  amount = parseInt(amount);
-
-  let paid =
-    (!amount && (pending || received)) ||
-    (amount > 0 && (pending >= amount || received >= amount));
-  if (paid && !url.pathname.endsWith("paid")) {
-    redirect(
-      307,
-      `/${params.username}/invoice/${id}/paid` +
-        (options ? "?options=true" : "")
-    );
-  }
-
-  let src = Qr.drawImg(invoice.text || "", { size: 340 });
-
-  return { id, invoice, subject, src };
-}
diff --git a/src/routes/(app)/[username]/invoice/[id]/+layout.svelte b/src/routes/(app)/[username]/invoice/[id]/+layout.svelte
deleted file mode 100644
index 4fa864ce..00000000
--- a/src/routes/(app)/[username]/invoice/[id]/+layout.svelte
+++ /dev/null
@@ -1 +0,0 @@
-<slot />
diff --git a/src/routes/(app)/[username]/invoice/[id]/+page.server.ts b/src/routes/(app)/[username]/invoice/[id]/+page.server.ts
deleted file mode 100644
index a57efa64..00000000
--- a/src/routes/(app)/[username]/invoice/[id]/+page.server.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import invoice from "$lib/invoice";
-
-export const actions = {
-  default: invoice,
-};
diff --git a/src/routes/(app)/[username]/invoice/[id]/+page.svelte b/src/routes/(app)/[username]/invoice/[id]/+page.svelte
deleted file mode 100644
index 1f2bbb51..00000000
--- a/src/routes/(app)/[username]/invoice/[id]/+page.svelte
+++ /dev/null
@@ -1,344 +0,0 @@
-<script>
-  import { enhance } from "$app/forms";
-  import { send } from "$lib/socket";
-  import {
-    btc,
-    post,
-    back,
-    copy,
-    f,
-    get,
-    types,
-    sat,
-    reverseFormat,
-    s,
-    sats,
-  } from "$lib/utils";
-  import { tick, onMount, onDestroy } from "svelte";
-  import { browser } from "$app/environment";
-  import { last, showQr, amountPrompt } from "$lib/store";
-  import Avatar from "$comp/Avatar.svelte";
-  import Icon from "$comp/Icon.svelte";
-  import Heart from "$comp/Heart.svelte";
-  import Image from "$comp/Image.svelte";
-  import Numpad from "$comp/Numpad.svelte";
-  import { t } from "$lib/translations";
-  import { goto, invalidate } from "$app/navigation";
-  import Toggle from "$comp/Toggle.svelte";
-
-  export let data;
-
-  let showOptions;
-
-  let reading = async ({ message, serialNumber }) => {
-    let name = serialNumber.replace(/:/g, "-");
-    let result = await post(`/fund/${name}/withdraw`, { amount, hash, name });
-  };
-
-  let readingerror = (e) => console.log("nfc error", e);
-
-  $: refresh(data);
-  let { invoice, id, subject, user, src } = data;
-  let {
-    account,
-    amount,
-    hash,
-    type,
-    rate,
-    text,
-    tip,
-    user: { username, currency },
-  } = invoice;
-
-  let qr;
-  let tipPercent = 0;
-
-  let refresh = async (data) => {
-    ({ invoice, id, user, src } = data);
-    ({
-      account,
-      amount,
-      hash,
-      type,
-      rate,
-      text,
-      tip,
-      user: { username, currency },
-    } = invoice);
-
-    tipPercent = (tip / amount) * 100;
-  };
-
-  $: amountFiat = parseFloat(((amount * rate) / sats).toFixed(2));
-  $: tipAmount = ((tip * rate) / sats).toFixed(2);
-
-  let subbed;
-
-  onMount(async () => {
-    if (browser) {
-      last.subscribe((v) => {
-        if (!v || subbed) return;
-        subbed = true;
-        send("subscribe", invoice);
-      });
-
-      if ($amountPrompt && !tip) toggleAmount();
-    }
-  });
-
-  $: link = [types.bitcoin, types.liquid].includes(type)
-    ? text
-    : `lightning:${text}`;
-  $: txt = [types.bitcoin, types.liquid].includes(type) ? hash : text;
-
-  let setType = async (type) => {
-    invoice.type = type;
-    ({ id } = await post(`/${username}/invoice`, {
-      invoice,
-      user: { username, currency },
-    }));
-
-    goto(`./${id}?options=true`, { invalidateAll: true, noScroll: true });
-  };
-
-  let setAmount = async () => {
-    if (typeof $amountPrompt === "undefined") $amountPrompt = true;
-    settingAmount = false;
-    amount = newAmount;
-    invoice.amount = newAmount;
-    invoice.tip = 0;
-    ({ id } = await post(`/${username}/invoice`, {
-      invoice,
-      user: { username, currency },
-    }));
-
-    let url = `./${id}`;
-    if (subject?.prompt) url += "/tip";
-    else url += "?options=true";
-
-    goto(url, { invalidateAll: true, noScroll: true });
-  };
-
-  let newAmount;
-  let settingAmount;
-  let toggleAmount = () => (settingAmount = !settingAmount);
-  let fiat;
-  let submit;
-</script>
-
-<div class="invoice container mx-auto max-w-xl px-4 space-y-2">
-  {#if $showQr}
-    <div>
-      <a
-        href={[types.bitcoin, types.liquid].includes(invoice.type)
-          ? invoice.text
-          : "lightning:" + invoice.text}
-      >
-        <img
-          {src}
-          class="mx-auto z-10 shadow-inner rounded-2xl"
-          bind:this={qr}
-          alt={txt}
-        />
-      </a>
-    </div>
-  {:else}
-    <div class="break-all pb-5 text-lg text-center">
-      {txt}
-    </div>
-  {/if}
-
-  {#each invoice.items as i}
-    <div class="grid grid-cols-12 text-xl">
-      <div class="col-span-1 my-auto">{i.quantity}</div>
-      <div class="mr-auto grow col-span-7 my-auto">
-        {i.name}
-      </div>
-      <div class="col-span-2 font-semibold text-right my-auto">
-        {f(i.price * i.quantity, currency)}
-      </div>
-      <div class="col-span-2 text-secondary text-right text-lg my-auto">
-        {sat(btc(i.price * i.quantity, rate))}
-      </div>
-    </div>
-  {/each}
-
-  {#if amount > 0}
-    <div class="text-center font-bold text-2xl">
-      <div>
-        {f(amountFiat, currency)}
-
-        {#if tip}
-          <span class="text-sm">
-            +{f(tip * (rate / sats), currency)}
-          </span>
-        {/if}
-      </div>
-      <div>
-        <span class="text-secondary font-normal text-xl"
-          >⚡️{`${s(amount)}`}</span
-        >
-
-        {#if tip}
-          <span class="text-sm text-secondary font-normal">
-            +⚡️{s(tip)}
-          </span>
-        {/if}
-      </div>
-    </div>
-  {/if}
-
-  <div class="text-secondary space-y-2 text-xl">
-    <button
-      type="button"
-      class="flex gap-2 text-center break-all rounded-2xl hover:opacity-80 py-5 px-6 w-full mx-auto justify-center border whitespace-nowrap mb-2"
-      on:click={() => copy(txt)}
-    >
-      <Icon icon="copy" style="w-8 my-auto" />
-      <div class="my-auto">
-        {$t("payments.copy")}
-      </div>
-    </button>
-
-    {#if user?.id === invoice?.user?.id}
-      <button
-        class="w-full flex justify-center rounded-2xl border py-5 px-6 hover:opacity-80"
-        on:click={toggleAmount}
-      >
-        <Icon icon="edit" style="mr-1 w-8" />
-        <div class="my-auto">{$t("payments.setAmount")}</div>
-      </button>
-    {:else}
-      <a href={link} class="w-full">
-        <button
-          class="w-full flex justify-center rounded-2xl border py-5 px-6 hover:opacity-80"
-        >
-          <Icon icon="mobile" style="mr-1 w-8" />
-          <div class="my-auto">{$t("payments.openLink")}</div>
-        </button>
-      </a>
-    {/if}
-
-    <div class="w-full flex justify-center gap-2 flex-wrap">
-      <button
-        class="w-full flex justify-center rounded-2xl border py-5 px-6 hover:opacity-80"
-        on:click={() => ($showQr = !$showQr)}
-      >
-        {#if $showQr}
-          <Icon icon="text" style="w-6 mr-2 my-auto" />
-        {:else}
-          <Icon icon="qr" style="w-8 mr-1 invert my-auto" />
-        {/if}
-        <div class="my-auto">
-          {$showQr ? $t("payments.showText") : $t("payments.showQr")}
-        </div></button
-      >
-    </div>
-  </div>
-
-  {#if !account}
-    <div class="flex justify-around text-secondary">
-      <button
-        class="hover:bg-primary my-auto flex gap-1 sm:gap-2 py-3 px-2 sm:px-5 w-full justify-center"
-        class:bg-primary={type === types.bitcoin}
-        class:text-black={type === types.bitcoin}
-        on:click={() => setType(types.bitcoin)}
-      >
-        <img src="/images/bitcoin.svg" class="w-8" alt="Bitcoin" />
-        <div class="my-auto text-lg">Bitcoin</div>
-      </button>
-
-      <button
-        class="hover:bg-primary my-auto flex gap-1 sm:gap-2 py-3 px-2 sm:px-5 w-full justify-center"
-        class:bg-primary={type === types.liquid}
-        class:text-black={type === types.liquid}
-        on:click={() => setType(types.liquid)}
-      >
-        <img src="/images/liquid.svg" class="w-8" alt="Liquid" />
-        <div class="my-auto text-lg">Liquid</div>
-      </button>
-
-      <button
-        class="hover:bg-primary flex gap-1 sm:gap-2 py-3 px-2 sm:px-5 w-full justify-center"
-        class:bg-primary={type === types.lightning}
-        class:text-black={type === types.lightning}
-        on:click={() => setType(types.lightning)}
-      >
-        <div class="bg-white rounded-full w-8 h-8 text-center flex">
-          <div class="m-auto">⚡️</div>
-        </div>
-        <div class="my-auto text-lg">Lightning</div>
-      </button>
-    </div>
-  {/if}
-
-  {#if type === types.liquid}
-    <div class="flex justify-center">
-      <div class="my-auto text-xl text-center text-secondary">
-        {$t("payments.onlyLbtc")}
-        <span class="text-teal-500 font-bold">L-BTC</span>,
-        {$t("payments.dontDeposit")}
-      </div>
-    </div>
-  {/if}
-
-  {#if user?.id === invoice?.user?.id}
-    <a href={`/receive`} class="block">
-      <button
-        class="flex gap-2 text-center break-all rounded-2xl hover:opacity-80 py-5 px-6 w-full mx-auto justify-center border text-xl whitespace-nowrap text-secondary"
-      >
-        <Icon icon="voucher" style="w-8 my-auto" />
-        <div class="my-auto">
-          {$t("payments.redeemVoucher")}
-        </div></button
-      >
-    </a>
-  {/if}
-</div>
-
-  <!-- <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-12 border w-96 shadow-lg rounded-md bg-white space-y-5" -->
-  <!--   > -->
-  <!--     <form submit={setAmount}> -->
-  <!--       <Numpad -->
-  <!--         bind:amount={newAmount} -->
-  <!--         bind:currency -->
-  <!--         bind:rate -->
-  <!--         bind:fiat -->
-  <!--         bind:submit -->
-  <!--       /> -->
-  <!--       <div class="w-full flex flex-wrap gap-2"> -->
-  <!--         <button -->
-  <!--           type="submit" -->
-  <!--           on:click={setAmount} -->
-  <!--           class="border-2 border-black rounded-xl font-semibold mx-auto py-3 w-40 hover:opacity-80 mx-auto bg-black text-white w-full" -->
-  <!--         > -->
-  <!--           <div class="my-auto">Ok</div> -->
-  <!--         </button> -->
-  <!--         <button -->
-  <!--           bind:this={submit} -->
-  <!--           type="button" -->
-  <!--           class="border-2 border-black rounded-xl font-semibold mx-auto py-3 w-40 hover:opacity-80 mx-auto w-full" -->
-  <!--           on:click={toggleAmount} -->
-  <!--           on:keydown={toggleAmount} -->
-  <!--         > -->
-  <!--           <div class="my-auto">Cancel</div> -->
-  <!--         </button> -->
-  <!--       </div> -->
-  <!--     </form> -->
-  <!--  -->
-  <!--     <div class="flex justify-between items-center"> -->
-  <!--       <span class="font-bold">{$t("payments.amountPrompt")}</span> -->
-  <!--       <Toggle id="notify" bind:value={$amountPrompt} /> -->
-  <!--     </div> -->
-  <!--   </div> -->
-  <!-- </div> -->
-
-<style>
-  .invoice {
-    view-transition-name: invoice;
-  }
-</style>
diff --git a/src/routes/(app)/[username]/invoice/[id]/memo/+page.server.ts b/src/routes/(app)/[username]/invoice/[id]/memo/+page.server.ts
deleted file mode 100644
index 58d56018..00000000
--- a/src/routes/(app)/[username]/invoice/[id]/memo/+page.server.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import invoice from "$lib/invoice";
-import { redirect } from "@sveltejs/kit";
-
-export async function load({ parent, params }) {
-  let { invoice } = await parent();
-  if (!invoice.amount) {
-    redirect(307, `/${params.username}/invoice/${invoice.id}`);
-  }
-}
-
-export const actions = {
-  default: invoice,
-};
diff --git a/src/routes/(app)/[username]/invoice/[id]/memo/+page.svelte b/src/routes/(app)/[username]/invoice/[id]/memo/+page.svelte
deleted file mode 100644
index 4d23ff19..00000000
--- a/src/routes/(app)/[username]/invoice/[id]/memo/+page.svelte
+++ /dev/null
@@ -1,95 +0,0 @@
-<script>
-  import { onMount } from "svelte";
-  import { browser } from "$app/environment";
-  import { invoice as inv, request } from "$lib/store";
-  import {
-    copy,
-    select,
-    f,
-    sat,
-    get,
-    reverseFormat,
-    s,
-    sats,
-  } from "$lib/utils";
-  import Icon from "$comp/Icon.svelte";
-  import { t } from "$lib/translations";
-  import { enhance } from "$app/forms";
-
-  let submitting;
-  let submit;
-
-  export let data;
-  $: refresh(data);
-  let { invoice, id, user, rates } = data;
-  let {
-    amount,
-    hash,
-    items,
-    memoPrompt,
-    type,
-    rate,
-    received,
-    prompt,
-    text,
-    tip,
-    user: { username, currency },
-  } = invoice;
-
-  invoice.memo = user?.username;
-
-  let refresh = (data) => {
-    $inv = null;
-
-    ({ invoice, id } = data);
-    ({
-      amount,
-      hash,
-      items,
-      memoPrompt,
-      type,
-      received,
-      prompt,
-      text,
-      tip,
-      user: { username },
-    } = invoice);
-  };
-</script>
-
-<form
-  method="POST"
-  use:enhance
-  class:invisible={submitting}
-  class="container px-4 max-w-lg mx-auto space-y-5"
->
-  <input type="hidden" name="amount" value={amount} />
-  <input type="hidden" name="tip" value={tip} />
-  <input type="hidden" name="username" value={username} />
-  <input type="hidden" name="rate" value={invoice.rate} />
-  <input type="hidden" name="memoPrompt" value={invoice.memoPrompt} />
-  <input type="hidden" name="prompt" value={invoice.prompt} />
-  <input type="hidden" name="type" value={type} />
-  <input type="hidden" name="hash" value={hash} />
-  <input type="hidden" name="items" value={JSON.stringify(items)} />
-
-  <h1 class="text-4xl font-semibold text-center">{$t("invoice.addMemo")}</h1>
-  <div class="space-y-2">
-    <input
-      use:select
-      name="memo"
-      class="w-full p-4 border rounded-xl text-xl"
-      bind:value={invoice.memo}
-      autocapitalize="none"
-    />
-    <div class="text-secondary">{invoice.memoPrompt}</div>
-  </div>
-
-  <button
-    type="submit"
-    bind:this={submit}
-    class="bg-black text-white border rounded-2xl px-6 py-5 w-full font-bold"
-  >
-    {$t("payments.next")}
-  </button>
-</form>
diff --git a/src/routes/(app)/[username]/invoice/[id]/paid/+page.svelte b/src/routes/(app)/[username]/invoice/[id]/paid/+page.svelte
deleted file mode 100644
index 700ac972..00000000
--- a/src/routes/(app)/[username]/invoice/[id]/paid/+page.svelte
+++ /dev/null
@@ -1,85 +0,0 @@
-<script>
-  import { scale } from "svelte/transition";
-  import Icon from "$comp/Icon.svelte";
-  import { toast } from "@zerodevx/svelte-toast";
-  import { browser } from "$app/environment";
-  import { t } from "$lib/translations";
-  import { fiat, f, s, sat, sats } from "$lib/utils";
-
-  export let data;
-  let amount, currency, rate, received, pending, tip, user, id;
-  $: update(data);
-  let update = (data) => {
-    ({ amount, currency, rate, received, pending, tip, user, id } =
-      data.invoice);
-  };
-
-  toast.pop(0);
-</script>
-
-<div class="container px-4 text-center mx-auto">
-  {#if received}
-    <div
-      class="flex w-full py-5 max-w-[200px] mx-auto"
-      in:scale={{ start: 0.5 }}
-    >
-      <Icon icon="check" style="mx-auto" />
-    </div>
-
-    <h1 class="text-3xl md:text-4xl font-bold mb-6">
-      {$t("invoice.paymentSuccessful")}
-    </h1>
-
-    <h2 class="text-2xl md:text-3xl font-semibold">
-      {f(fiat(received - tip, rate), currency)}
-      {#if tip}
-        <span class="text-lg">
-          + {f(fiat(tip, rate), currency)}
-        </span>
-      {/if}
-    </h2>
-    <h3 class="text-secondary md:text-lg mb-6 mt-1">
-      ⚡️{s(received - tip)}
-
-      {#if tip}
-        <span class="text-lg">
-          + ⚡️{s(tip)}
-        </span>
-      {/if}
-    </h3>
-  {/if}
-
-  {#if pending}
-    <div
-      class="flex w-full py-5 max-w-[200px] mx-auto"
-      in:scale={{ start: 0.5 }}
-    >
-      <Icon icon="orangeclock" style="mx-auto" />
-    </div>
-
-    <h1 class="text-3xl md:text-4xl font-bold mb-6">Payment detected</h1>
-    <h2 class="text-2xl md:text-3xl font-semibold">
-      {f(fiat(pending - tip, rate), currency)}
-      {#if tip}
-        + {f(fiat(tip, rate), currency)}
-      {/if}
-    </h2>
-
-    <h3 class="text-secondary md:text-lg mb-6 mt-1">
-      ⚡️{s(pending - tip)}
-      {#if tip}
-        <span class="text-lg">
-          + ⚡️{s(tip)}
-        </span>
-      {/if}
-    </h3>
-  {/if}
-</div>
-
-<a href={`/${user.username}/receive`}>
-  <div class="opacity-0 w-screen h-screen fixed top-0 left-0 z-50" />
-</a>
-
-<div class="fixed bottom-10 w-full text-center">
-  {$t("payments.tapAnywhere")}
-</div>
diff --git a/src/routes/(app)/[username]/invoice/[id]/tip/+page.server.ts b/src/routes/(app)/[username]/invoice/[id]/tip/+page.server.ts
deleted file mode 100644
index b81e2364..00000000
--- a/src/routes/(app)/[username]/invoice/[id]/tip/+page.server.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import invoice from "$lib/invoice";
-import { redirect } from "@sveltejs/kit";
-
-export async function load({ parent, params }) {
-  let { invoice } = await parent();
-  if (!invoice.amount)
-    redirect(307, `/${params.username}/invoice/${invoice.id}`);
-}
-
-export const actions = {
-  default: invoice,
-};
diff --git a/src/routes/(app)/[username]/invoice/[id]/tip/+page.svelte b/src/routes/(app)/[username]/invoice/[id]/tip/+page.svelte
deleted file mode 100644
index 35b24bf1..00000000
--- a/src/routes/(app)/[username]/invoice/[id]/tip/+page.svelte
+++ /dev/null
@@ -1,209 +0,0 @@
-<script>
-  import { onMount } from "svelte";
-  import { browser } from "$app/environment";
-  import { invoice as inv, request } from "$lib/store";
-  import { copy, focus, f, sat, get, reverseFormat, s, sats } from "$lib/utils";
-  import Icon from "$comp/Icon.svelte";
-  import Slider from "$comp/Slider.svelte";
-  import { goto } from "$app/navigation";
-  import { t } from "$lib/translations";
-  import { enhance } from "$app/forms";
-  import { tick } from "svelte";
-
-  const tipAmounts = ["No", "10%", "15%", "20%"];
-  let showCustomAmount;
-
-  let customInput;
-  let customTipAmount;
-
-  let apply = async () => {
-    if (customTipAmount > 0) {
-      tipPercent = (customTipAmount / amountFiat) * 100;
-      showCustomAmount = false;
-    }
-  };
-
-  let active = (amount) =>
-    !customTipAmount && Math.round(tipPercent) === parseInt(amount.slice(0, 2));
-
-  const handleCustomTipAmount = (e) => {
-    tipPercent = 0;
-    customTipAmount = e.target.value;
-  };
-
-  let timeout;
-  const handleSlide = (e) => {
-    customTipAmount = "";
-    if (customInput) {
-      customInput.value = "";
-    }
-    tipPercent = e.target.value;
-  };
-
-  let submitting;
-  const handleTipButtonClick = async (amount) => {
-    submitting = true;
-    if (amount === "No") {
-      tipPercent = 0;
-    } else {
-      tipPercent = parseInt(amount.slice(0, 2));
-    }
-
-    await tick();
-    submit.click();
-  };
-
-  let submit;
-
-  export let data;
-  $: refresh(data);
-  let { invoice, id, user, rates } = data;
-  let {
-    amount,
-    hash,
-    items,
-    type,
-    rate,
-    received,
-    prompt,
-    text,
-    tip,
-    user: { username, currency },
-  } = invoice;
-
-  let qr;
-  let tipPercent = 0;
-
-  let fullscreen;
-
-  let refresh = (data) => {
-    $inv = null;
-
-    ({ invoice, id } = data);
-    ({
-      amount,
-      hash,
-      items,
-      type,
-      received,
-      prompt,
-      text,
-      tip,
-      user: { username },
-    } = invoice);
-
-    tipPercent = (tip / amount) * 100;
-  };
-
-  $: currency = user?.currency || invoice.currency;
-  $: rate = invoice.rate * (rates[currency] / rates[invoice.currency]);
-
-  $: tip = Math.round((amount / 100) * tipPercent);
-
-  $: amountFiat = parseFloat(((amount * rate) / sats).toFixed(2));
-
-  $: tipAmount = ((tip * rate) / sats).toFixed(2);
-
-  $: invoiceAmountFiatFormatted = f(amountFiat, currency);
-
-  onMount(() => ($request = undefined));
-</script>
-
-<div class="container px-4 max-w-lg text-center mx-auto">
-  <form method="POST" use:enhance class:invisible={submitting}>
-    <input type="hidden" name="amount" value={amount} />
-    <input type="hidden" name="tip" value={tip} />
-    <input type="hidden" name="username" value={username} />
-    <input type="hidden" name="rate" value={invoice.rate} />
-    <input type="hidden" name="prompt" value="false" />
-    <input type="hidden" name="type" value={type} />
-    <input type="hidden" name="hash" value={hash} />
-    <input type="hidden" name="items" value={JSON.stringify(items)} />
-
-    {#if invoice.memoPrompt}
-      <input type="hidden" name="memoPrompt" value={invoice.memoPrompt} />
-    {/if}
-
-    <h1 class="text-4xl font-semibold my-8">{$t("invoice.addTipq")}</h1>
-    {#if !showCustomAmount}
-      <div class="my-2 text-xl">{Math.round(tipPercent)}%</div>
-
-      <Slider handle={handleSlide} bind:value={tipPercent} />
-
-      <div class="flex mb-8 text-lg">
-        <div>
-          <span class="mr-1">
-            {f(amountFiat, currency)}
-            <span class="font-semibold">+{f(tipAmount, currency)}</span>
-          </span>
-        </div>
-
-        <div class="ml-auto text-lg">
-          {sat(amount)}
-          <span class="font-semibold">+{sat(tip)}</span>
-        </div>
-      </div>
-
-      {#if tip}
-        <div>
-          <button type="button" on:click={() => submit.click()}>Next</button>
-          <button type="button" on:click={() => (tipPercent = 0)}>Reset</button>
-        </div>
-      {:else}
-        {#each tipAmounts as amount}
-          <button
-            type="button"
-            class:active={active(amount, tipPercent)}
-            on:click={() => handleTipButtonClick(amount)}>{amount}</button
-          >
-        {/each}
-      {/if}
-
-      <div>
-        <button type="button" on:click={() => (showCustomAmount = true)}
-          >Custom</button
-        >
-      </div>
-    {/if}
-
-    <button type="submit" bind:this={submit} />
-  </form>
-
-  {#if showCustomAmount}
-    <form on:submit|preventDefault={apply}>
-      <div class="relative">
-        <span
-          class="absolute top-[18px] left-5 font-semibold {!customTipAmount
-            ? 'opacity-50'
-            : 'opacity-100'}">$</span
-        >
-        <input
-          bind:this={customInput}
-          type="number"
-          step="0.01"
-          on:input={(e) => handleCustomTipAmount(e)}
-          class="pl-10"
-          placeholder="Custom amount"
-          use:focus
-        />
-        <button
-          type="submit"
-          class="w-full mt-2 bg-black text-white font-semibold py-3 px-7 rounded-2xl {!customTipAmount
-            ? 'opacity-50'
-            : 'opacity-100 hover:opacity-80'}"
-          disabled={!customTipAmount}>Apply</button
-        >
-      </div>
-    </form>
-  {/if}
-</div>
-
-<style>
-  .active {
-    @apply !bg-black !text-white;
-  }
-
-  .container button[type="button"] {
-    @apply w-full mt-2 bg-primary text-black hover:bg-black hover:text-white font-semibold py-5 px-7 rounded-2xl;
-  }
-</style>
diff --git a/src/routes/(app)/[username]/invoice/sent/+page.svelte b/src/routes/(app)/[username]/invoice/sent/+page.svelte
deleted file mode 100644
index b95bc85e..00000000
--- a/src/routes/(app)/[username]/invoice/sent/+page.svelte
+++ /dev/null
@@ -1,11 +0,0 @@
-<script>
-  import Avatar from "$comp/Avatar.svelte";
-  import Icon from "$comp/Icon.svelte";
-  import { request } from "$lib/store";
-</script>
-
-Invoice sent to
-<div class="flex">
-  <Avatar user={$request.requester} size={12} />
-  <h1 class="my-auto"><b>{$request.requester.username}</b> is ready to pay</h1>
-</div>
diff --git a/src/routes/(app)/[username]/items/[id]/+page.server.ts b/src/routes/(app)/[username]/items/[id]/+page.server.ts
deleted file mode 100644
index 67cebd93..00000000
--- a/src/routes/(app)/[username]/items/[id]/+page.server.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { fd, auth, get, post } from "$lib/utils";
-import { fail, redirect } from "@sveltejs/kit";
-
-export let load = async ({ params: { id } }) => {
-  let item = await get(`/items/${id}`);
-  return { item };
-};
-
-export const actions = {
-  default: async ({ cookies, request, url }) => {
-    let form = await fd(request);
-    try {
-      await post(`/items`, form, auth(cookies));
-    } catch (e: any) {
-      return fail(400, { message: e.message });
-    }
-
-    let success = `/${url.pathname.split("/")[1]}`;
-    redirect(307, success);
-  },
-};
diff --git a/src/routes/(app)/[username]/items/[id]/+page.svelte b/src/routes/(app)/[username]/items/[id]/+page.svelte
deleted file mode 100644
index 65720350..00000000
--- a/src/routes/(app)/[username]/items/[id]/+page.svelte
+++ /dev/null
@@ -1,18 +0,0 @@
-<script>
-  import { t } from "$lib/translations";
-  import ItemForm from "$comp/ItemForm.svelte";
-  import { fail } from "$lib/utils";
-
-  export let data;
-  export let form;
-
-  $: form?.message && fail(form.message);
-  let { item, user } = data;
-</script>
-
-<div class="container max-w-xl mx-auto px-4">
-  <h1 class="px-3 md:px-0 text-center text-3xl md:text-4xl font-semibold mb-10">
-    {$t("items.edit")}
-  </h1>
-  <ItemForm {item} {user} />
-</div>
diff --git a/src/routes/(app)/[username]/items/create/+page.server.ts b/src/routes/(app)/[username]/items/create/+page.server.ts
deleted file mode 100644
index 2e006a3e..00000000
--- a/src/routes/(app)/[username]/items/create/+page.server.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { fail, redirect } from "@sveltejs/kit";
-import { fd, auth, post } from "$lib/utils";
-
-export const actions = {
-  default: async ({ cookies, request, url }) => {
-    let form = await fd(request);
-    try {
-      await post("/items", form, auth(cookies));
-    } catch (e: any) {
-      return fail(400, { message: e.message });
-    }
-
-    let success = `/${url.pathname.split("/")[1]}`;
-    redirect(307, success);
-  },
-};
diff --git a/src/routes/(app)/[username]/items/create/+page.svelte b/src/routes/(app)/[username]/items/create/+page.svelte
deleted file mode 100644
index b82889c9..00000000
--- a/src/routes/(app)/[username]/items/create/+page.svelte
+++ /dev/null
@@ -1,19 +0,0 @@
-<script>
-  import { t } from "$lib/translations";
-  import ItemForm from "$comp/ItemForm.svelte";
-  import { fail } from "$lib/utils";
-
-  export let data;
-  export let form;
-
-  $: form?.message && fail(form.message);
-  let { user } = data;
-  let item = {};
-</script>
-
-<div class="container max-w-xl mx-auto px-4">
-  <h1 class="px-3 md:px-0 text-center text-3xl md:text-4xl font-semibold mb-10">
-    {$t("items.add")}
-  </h1>
-  <ItemForm {item} {user} />
-</div>
diff --git a/src/routes/(app)/[username]/map/+page.server.ts b/src/routes/(app)/[username]/map/+page.server.ts
deleted file mode 100644
index 616d28f6..00000000
--- a/src/routes/(app)/[username]/map/+page.server.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { get } from "$lib/utils";
-
-// export const prerender = true;
-export let load = async () => {
-  let data = { locations: [] };
-
-  try {
-    data = await get("/locations");
-  } catch (e) {}
-
-  return data;
-};
diff --git a/src/routes/(app)/[username]/map/+page.svelte b/src/routes/(app)/[username]/map/+page.svelte
deleted file mode 100644
index bfa115e4..00000000
--- a/src/routes/(app)/[username]/map/+page.svelte
+++ /dev/null
@@ -1,8 +0,0 @@
-<script>
-  import LocationsMap from "$comp/LocationsMap.svelte";
-  export let data;
-
-  let { locations } = data;
-</script>
-
-<LocationsMap {locations} />
diff --git a/src/routes/(app)/[username]/messages/+page.server.ts b/src/routes/(app)/[username]/messages/+page.server.ts
deleted file mode 100644
index 94659621..00000000
--- a/src/routes/(app)/[username]/messages/+page.server.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import { get } from "$lib/utils";
-import { redirect } from "@sveltejs/kit";
-
-interface Message {
-  created_at: number;
-}
-
-interface Note {
-  created_at: number;
-  seen: number;
-}
-
-export async function load({ params, parent, }) {
-  let { user } = await parent();
-  if (user.username !== params.username) redirect(307, `/${params.username}`);
-  let { since = 0 } = params;
-
-  let messages = [],
-    notes = [];
-
-  if (user?.pubkey) {
-    let { pubkey } = user;
-    try {
-      messages = await get(`/${pubkey}/${since}/messages`);
-      messages = messages.sort((a: Message, b: Message) => b.created_at - a.created_at);
-    } catch (e) {
-      console.log(`failed to fetch nostr messages`, e);
-    }
-
-    try {
-      notes = await get(`/${pubkey}/notes`);
-    } catch (e) {
-      console.log(`failed to fetch nostr notes for ${pubkey}`, e);
-    }
-
-    notes.map((e: Note) => {
-      e.seen = e.created_at;
-    });
-  }
-
-  return { messages, notes };
-}
diff --git a/src/routes/(app)/[username]/messages/+page.svelte b/src/routes/(app)/[username]/messages/+page.svelte
deleted file mode 100644
index 4738ea2c..00000000
--- a/src/routes/(app)/[username]/messages/+page.svelte
+++ /dev/null
@@ -1,92 +0,0 @@
-<script>
-  import { t } from "$lib/translations";
-  import Avatar from "$comp/Avatar.svelte";
-  import { event as e, password } from "$lib/store";
-  import { browser } from "$app/environment";
-  import { decrypt } from "$lib/nostr";
-
-  export let data;
-
-  let { messages, notes, invoices, sent, received, subject, user, rates } =
-    data;
-  $: refresh(data);
-  let refresh = (d) =>
-    ({ messages, notes, invoices, sent, received, subject, user, rates } = d);
-
-  let keys = new Set();
-  let latest = [];
-  let ready;
-
-  e.subscribe(async (event) => {
-    if (!(browser && event && ready)) return;
-    if (
-      event.recipient?.id === user.id &&
-      !~latest.findIndex((m) => m.id === event.id)
-    ) {
-      event.content = await decrypt({ event, user });
-
-      let i = latest.findIndex((m) => m.pubkey === event.pubkey);
-      let popped;
-      if (~i) popped = latest.splice(i, 1);
-      else popped = latest.pop();
-
-      latest.unshift(event);
-      latest = latest;
-    }
-  });
-
-  $: initialize($password);
-  let initialize = async (p) => {
-    let i = 0;
-    ready = false;
-    if (!(browser && user)) return;
-    while (i < messages.length) {
-      let event = messages[i];
-      i++;
-
-      if (!(event.author && event.recipient)) continue;
-
-      let k =
-        event.author.id === user.id
-          ? event.recipient?.pubkey
-          : event.author.pubkey;
-
-      if (!keys.has(k)) {
-        keys.add(k);
-        event.content = await decrypt({ event, user });
-        if (event.content) latest.push(event);
-      }
-    }
-
-    latest = latest;
-    ready = true;
-  };
-</script>
-
-<div class="container w-full mx-auto text-lg px-4 max-w-xl space-y-5">
-  <h1 class="px-3 md:px-0 text-center text-3xl md:text-4xl font-semibold mb-10">
-    {$t("user.messages")}
-  </h1>
-  {#if latest.length && user?.id === subject.id}
-    <div class="relative">
-      {#each latest as { content, pubkey, author, recipient }}
-        {@const user = author.id === user.id ? recipient : author}
-        <a href={`/${subject.username}/messages/${user.username}`}>
-          <div class="flex hover:bg-gray-100 p-4 rounded-2xl">
-            <div class="my-auto">
-              <Avatar {user} size={"20"} disabled={true} />
-            </div>
-            <div class="my-auto truncate">
-              <div class="my-auto ml-1 text-lg font-bold">{user.username}</div>
-              <div class="my-auto ml-1 text-secondary text-lg truncate">
-                {content}
-              </div>
-            </div>
-          </div>
-        </a>
-      {/each}
-    </div>
-  {:else}
-    <div class="text-center">{$t("user.noMessages")}</div>
-  {/if}
-</div>
diff --git a/src/routes/(app)/[username]/messages/[recipient]/+page.server.ts b/src/routes/(app)/[username]/messages/[recipient]/+page.server.ts
deleted file mode 100644
index 6be9f6ec..00000000
--- a/src/routes/(app)/[username]/messages/[recipient]/+page.server.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { get } from "$lib/utils";
-import type { Message } from "$lib/types";
-
-export async function load({ params, parent }) {
-  let { user } = await parent();
-  let { since = 0 } = params;
-
-  let messages: Message[] = [];
-  let recipient = await get(`/users/${params.recipient}`);
-
-  try {
-    messages = await get(`/${user.pubkey}/${since}/messages`);
-
-    messages = messages
-      .filter(
-        (m: Message) => m.recipient?.id === recipient.id || m.author?.id === recipient.id
-      )
-      .sort((a, b) => a.created_at - b.created_at);
-  } catch (e) {
-    console.log(`failed to fetch nostr messages`, e);
-  }
-
-  return { messages, recipient, user };
-}
diff --git a/src/routes/(app)/[username]/messages/[recipient]/+page.svelte b/src/routes/(app)/[username]/messages/[recipient]/+page.svelte
deleted file mode 100644
index 98638389..00000000
--- a/src/routes/(app)/[username]/messages/[recipient]/+page.svelte
+++ /dev/null
@@ -1,191 +0,0 @@
-<script>
-  import { cubicInOut } from "svelte/easing";
-  import { browser } from "$app/environment";
-  import { t } from "$lib/translations";
-  import { format } from "date-fns";
-  import { scale, fade, fly } from "svelte/transition";
-  import { enhance } from "$app/forms";
-  import Avatar from "$comp/Avatar.svelte";
-  import Icon from "$comp/Icon.svelte";
-  import { back, fail, focus } from "$lib/utils";
-  import { sign, send, encrypt, decrypt } from "$lib/nostr";
-  import { event as e, password } from "$lib/store";
-  import { tick, onMount } from "svelte";
-  import { getEventHash } from "nostr-tools";
-
-  export let data;
-
-  function fadeScale(
-    node,
-    { delay = 0, duration = 200, easing = (x) => x, baseScale = 0 }
-  ) {
-    const o = +getComputedStyle(node).opacity;
-    const m = getComputedStyle(node).transform.match(/scale\(([0-9.]+)\)/);
-    const s = m ? m[1] : 1;
-    const is = 1 - baseScale;
-
-    return {
-      delay,
-      duration,
-      css: (t) => {
-        const eased = easing(t);
-        return `opacity: ${eased * o}; transform: scale(${
-          eased * s * is + baseScale
-        })`;
-      },
-    };
-  }
-
-  let { messages, recipient, user } = data;
-  let input, pane;
-
-  $: initialize($password);
-  let initialize = async (p) => {
-    await Promise.all(
-      messages.map(
-        async (event) => (event.message = await decrypt({ event, user }))
-      )
-    );
-
-    messages = messages;
-    tick().then(() => pane && (pane.scrollTop = pane.scrollHeight));
-  };
-
-  e.subscribe(async (event) => {
-    let found = ~messages.findIndex((m) => m.id === event?.id);
-    if (event?.recipient.id === user.id && !found) {
-      event.message = await decrypt({ event, user });
-      messages.push(event);
-      messages = messages;
-      tick().then(() => pane && (pane.scrollTop = pane.scrollHeight));
-    }
-  });
-
-  let sent, submitting, message;
-  let submit = async () => {
-    submitting = true;
-
-    let event = {
-      pubkey: user.pubkey,
-      created_at: Math.floor(Date.now() / 1000),
-      kind: 4,
-      tags: [["p", recipient.pubkey]],
-    };
-
-    event.message = message;
-
-    message = "";
-
-    event.author = user;
-    event.recipient = recipient;
-
-    messages.push(event);
-    messages = messages;
-    tick().then(() => pane && (pane.scrollTop = pane.scrollHeight));
-
-    try {
-      event.content = await encrypt({
-        message: event.message,
-        recipient: recipient.pubkey,
-        user,
-      });
-      event.id = getEventHash(event);
-      await sign({ event, user });
-      await send(event);
-
-      sent = true;
-    } catch (e) {
-      console.log(e);
-      fail("Failed to send message");
-    }
-
-    message = "";
-    submitting = false;
-  };
-
-  let keydown = (e) => {
-    if (e.key === "Enter") {
-      e.preventDefault();
-      submit();
-    }
-  };
-</script>
-
-<div class="container max-w-xl mx-auto px-4 space-y-5">
-  <button
-    type="button"
-    class="hover:opacity-80"
-    data-sveltekit-preload-data="false"
-    on:click={back}
-  >
-    <Icon icon="arrow-left" style="w-10" />
-  </button>
-
-  <div
-    class="h-[50vh] max-h-[50vh] overflow-y-scroll scrollbar-thin scrollbar-thumb-[#F2F6FC] scrollbar-track-white pr-8"
-    bind:this={pane}
-  >
-    {#each messages as { id, author, message, created_at, pubkey }}
-      {@const ours = pubkey === user.pubkey}
-      {@const theirs = !ours}
-
-      {#if message}
-        <div
-          class="flex gap-2"
-          class:flex-row-reverse={theirs}
-          class:justify-end={theirs}
-          in:fadeScale={{
-            easing: cubicInOut,
-            baseScale: 0.5,
-          }}
-        >
-          <div
-            class="rounded-2xl px-4 py-2 max-w-[300px] mb-1 text-lg"
-            class:ours
-            class:theirs
-            :key={id}
-          >
-            {message}
-          </div>
-          <div class="mt-auto">
-            <Avatar user={author} size={"12"} />
-          </div>
-        </div>
-        <div class="text-sm text-gray-400 mb-6" class:text-right={ours}>
-          {format(new Date(created_at * 1000), "MMM d")},
-          {format(new Date(created_at * 1000), "h:mm aa")}
-        </div>
-      {/if}
-    {/each}
-  </div>
-
-  <form
-    method="POST"
-    class="w-full border rounded-xl outline-none gap-4 flex p-0 pr-2"
-    on:submit|preventDefault={submit}
-  >
-    <input type="hidden" name="requester_id" value={user.id} />
-    <input type="hidden" name="recipient" value={recipient.username} />
-
-    <div
-      use:focus
-      contenteditable
-      class="grow break-all py-4 outline-none mt-0 pl-4"
-      bind:innerHTML={message}
-      on:keydown={keydown}
-    />
-    <button type="submit" class="my-auto shrink-0">
-      <Icon icon="send" style="w-8" />
-    </button>
-  </form>
-</div>
-
-<style>
-  .ours {
-    @apply bg-gradient-to-r from-[#F2F6FC] to-[#E1E3FF] text-black rounded-br-none ml-auto;
-  }
-
-  .theirs {
-    @apply bg-gray-100 text-black rounded-bl-none;
-  }
-</style>
diff --git a/src/routes/(app)/[username]/reset/+server.ts b/src/routes/(app)/[username]/reset/+server.ts
deleted file mode 100644
index f7dba02c..00000000
--- a/src/routes/(app)/[username]/reset/+server.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { json } from "@sveltejs/kit";
-import { auth, post } from "$lib/utils";
-
-export async function POST({ cookies, request, params }) {
-  let { username } = params;
-  let r = await request.json();
-  let { password } = r;
-  let result = await post("/reset", { password, username }, auth(cookies));
-  return json(result);
-}
diff --git a/src/routes/(app)/[username]/settings/[...tab]/+page.server.ts b/src/routes/(app)/[username]/settings/[...tab]/+page.server.ts
deleted file mode 100644
index 42639b38..00000000
--- a/src/routes/(app)/[username]/settings/[...tab]/+page.server.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-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)/[username]/settings/[...tab]/+page.svelte b/src/routes/(app)/[username]/settings/[...tab]/+page.svelte
deleted file mode 100644
index 12980291..00000000
--- a/src/routes/(app)/[username]/settings/[...tab]/+page.svelte
+++ /dev/null
@@ -1,257 +0,0 @@
-<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={`/${user.username}/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)/[username]/settings/[...tab]/_account.svelte b/src/routes/(app)/[username]/settings/[...tab]/_account.svelte
deleted file mode 100644
index 8e3323c7..00000000
--- a/src/routes/(app)/[username]/settings/[...tab]/_account.svelte
+++ /dev/null
@@ -1,190 +0,0 @@
-<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)/[username]/settings/[...tab]/_pos.svelte b/src/routes/(app)/[username]/settings/[...tab]/_pos.svelte
deleted file mode 100644
index 6a1c92a1..00000000
--- a/src/routes/(app)/[username]/settings/[...tab]/_pos.svelte
+++ /dev/null
@@ -1,238 +0,0 @@
-<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)/[username]/settings/[...tab]/_security.svelte b/src/routes/(app)/[username]/settings/[...tab]/_security.svelte
deleted file mode 100644
index 6b44f830..00000000
--- a/src/routes/(app)/[username]/settings/[...tab]/_security.svelte
+++ /dev/null
@@ -1,321 +0,0 @@
-<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)/[username]/settings/[...tab]/_shopify.svelte b/src/routes/(app)/[username]/settings/[...tab]/_shopify.svelte
deleted file mode 100644
index 0266fa9c..00000000
--- a/src/routes/(app)/[username]/settings/[...tab]/_shopify.svelte
+++ /dev/null
@@ -1,92 +0,0 @@
-<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>
diff --git a/src/routes/(app)/[username]/verify/[code]/+page.server.ts b/src/routes/(app)/[username]/verify/[code]/+page.server.ts
deleted file mode 100644
index fec1a85c..00000000
--- a/src/routes/(app)/[username]/verify/[code]/+page.server.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { get } from "$lib/utils";
-import { redirect } from "@sveltejs/kit";
-
-export let load = async ({ params: { code } }) => {
-  let user;
-  try {
-    user = await get(`/verify/${code}`);
-  } catch (e) {
-    console.log(e);
-    return { error: "Verification failed" };
-  }
-
-  redirect(307, `/${user.username}/settings/account?verified=true`);
-};
diff --git a/src/routes/(app)/[username]/verify/[code]/+page.svelte b/src/routes/(app)/[username]/verify/[code]/+page.svelte
deleted file mode 100644
index 1e099dae..00000000
--- a/src/routes/(app)/[username]/verify/[code]/+page.svelte
+++ /dev/null
@@ -1,35 +0,0 @@
-<script>
-  import { scale } from "svelte/transition";
-  import Icon from "$comp/Icon.svelte";
-  import { t } from "$lib/translations";
-
-  export let data;
-  let { user, error } = data;
-</script>
-
-<div class="container px-4 text-center mx-auto">
-  {#if error}
-    <h1 class="text-3xl md:text-4xl font-bold mb-6">
-      Email verification failed
-    </h1>
-  {:else if user.verified}
-    <div
-      class="flex w-full py-5 max-w-[200px] mx-auto"
-      in:scale={{ start: 0.5 }}
-    >
-      <Icon icon="check" style="mx-auto" />
-    </div>
-
-    <h1 class="text-3xl md:text-4xl font-bold mb-6">
-      Email verified successfully!
-    </h1>
-  {/if}
-</div>
-
-<a href={`/${user.username}`}>
-  <div class="opacity-0 w-screen h-screen fixed top-0 left-0 z-50" />
-</a>
-
-<div class="fixed bottom-10 w-full text-center">
-  {$t("payments.tapAnywhere")}
-</div>
diff --git a/src/routes/(app)/account/setup/+page.svelte b/src/routes/(app)/account/setup/+page.svelte
new file mode 100644
index 00000000..5a15316a
--- /dev/null
+++ b/src/routes/(app)/account/setup/+page.svelte
@@ -0,0 +1,64 @@
+<script>
+  import { copy } from "$lib/utils";
+  import { t } from "$lib/translations";
+  import Icon from "$comp/Icon.svelte";
+  import { mnemonic } from "$lib/store";
+  import { generateMnemonic } from "@scure/bip39";
+  import { wordlist } from "@scure/bip39/wordlists/english";
+
+  export let data;
+  let { user } = data;
+
+  let reveal;
+
+  let toggleSeed = async () => {
+    try {
+      $mnemonic = await generateMnemonic(wordlist);
+      reveal = !reveal;
+    } catch (e) {
+      console.log(e);
+    }
+  };
+</script>
+
+<div class="space-y-5">
+  <h1 class="text-center text-3xl font-semibold">Account setup</h1>
+  <h2 class="text-center text-2xl text-secondary">Step 1</h2>
+
+  <div class="container w-full mx-auto text-lg px-4 max-w-xl space-y-5">
+    <p class="text-secondary mb-1">
+      The keys to your savings account are derived from a seed phrase. When
+      you're ready, write it down and keep it safe.
+    </p>
+
+    <p class="text-secondary mb-1">
+      Whoever knows these words in the correct order can withdraw funds from the account. We can't
+      recover them if you lose them.
+    </p>
+
+    {#if reveal}
+      <div class="text-2xl border p-4 text-center rounded-2xl">
+        {$mnemonic}
+      </div>
+
+      <div>
+        <a href={`/account/setup/step2`} class="contents">
+          <button
+            type="button"
+            class="bg-black text-white w-full px-5 py-6 text-xl rounded-2xl font-bold"
+            on:click={toggleSeed}
+          >
+            I've written down my seed phrase
+          </button>
+        </a>
+      </div>
+    {:else}
+      <div class="flex justify-center">
+        <button type="button" class="primary" on:click={toggleSeed}>
+          <Icon icon="warning" style="mr-2 w-6 my-auto" />
+          {$t("user.settings.revealSeed")}
+        </button>
+      </div>
+    {/if}
+  </div>
+</div>
diff --git a/src/routes/(app)/account/setup/step2/+page.svelte b/src/routes/(app)/account/setup/step2/+page.svelte
new file mode 100644
index 00000000..8169ce06
--- /dev/null
+++ b/src/routes/(app)/account/setup/step2/+page.svelte
@@ -0,0 +1,52 @@
+<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 { wordlist } from "@scure/bip39/wordlists/english";
+  import { fail, post } from "$lib/utils";
+  import { goto } from "$app/navigation";
+
+  export let data;
+  let { user } = data;
+
+  let password;
+
+  let submit = async () => {
+    let seed = await encrypt(mnemonicToEntropy($mnemonic, wordlist), password);
+    try {
+      await post("/api/accounts", { seed });
+      goto(`/${user.username}`);
+    } catch (e) {
+      console.log(e);
+      fail("Something went wrong");
+    }
+  };
+</script>
+
+<div class="space-y-5">
+  <div>
+    <h1 class="text-center text-3xl font-semibold">Account setup</h1>
+    <h2 class="text-center text-2xl text-secondary">Step 2</h2>
+  </div>
+
+  <form
+    on:submit|preventDefault={submit}
+    class="container w-full mx-auto text-lg px-4 max-w-xl space-y-5"
+  >
+    <p class="text-secondary mb-1">
+      Add an additional password to your seed phrase. It should be different
+      than your login password. We can't reset it if you lose it.
+    </p>
+
+      <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"
+    >
+      Submit
+    </button>
+  </form>
+</div>
diff --git a/src/routes/(app)/admin/+page.svelte b/src/routes/(app)/admin/+page.svelte
index c61a2e45..214bf5b3 100644
--- a/src/routes/(app)/admin/+page.svelte
+++ b/src/routes/(app)/admin/+page.svelte
@@ -1,7 +1,7 @@
 <script>
   import { post } from "$lib/utils";
   export let data;
-  let reset = (username) => post(`/${username}/reset`, { password });
+  let reset = (username) => post(`/reset`, { password });
   let { users } = data;
   let password;
 </script>
diff --git a/src/routes/(app)/ecash/[id]/[...version]/+layout.svelte b/src/routes/(app)/ecash/[id]/[...version]/+layout.svelte
index 679fbe76..89de4b58 100644
--- a/src/routes/(app)/ecash/[id]/[...version]/+layout.svelte
+++ b/src/routes/(app)/ecash/[id]/[...version]/+layout.svelte
@@ -1,5 +1,4 @@
 <script>
-  import AppHeader from "$comp/AppHeader.svelte";
   import { copy, sats, f, s } from "$lib/utils";
   import { t } from "$lib/translations";
   import Icon from "$comp/Icon.svelte";
diff --git a/src/routes/(app)/fund/[id]/+page.server.ts b/src/routes/(app)/fund/[id]/+page.server.ts
index e553b1b4..6fd3af68 100644
--- a/src/routes/(app)/fund/[id]/+page.server.ts
+++ b/src/routes/(app)/fund/[id]/+page.server.ts
@@ -15,7 +15,7 @@ export const actions = {
 
     if (user) {
       await post("/redeem", params, auth(cookies));
-      redirect(307, `/${user.username}/payments`);
+      redirect(307, `/payments`);
     }
 
     redirect(307, "/register");
diff --git a/src/routes/(app)/fund/[id]/sweep/+page.svelte b/src/routes/(app)/fund/[id]/sweep/+page.svelte
index 4a48edf8..e142f00d 100644
--- a/src/routes/(app)/fund/[id]/sweep/+page.svelte
+++ b/src/routes/(app)/fund/[id]/sweep/+page.svelte
@@ -32,7 +32,7 @@
   </h3>
 </div>
 
-<a href={`/${user.username}/payments`}>
+<a href={`/payments`}>
   <div class="opacity-0 w-screen h-screen fixed top-0 left-0 z-50" />
 </a>
 
diff --git a/src/routes/(app)/generate/+page.svelte b/src/routes/(app)/generate/+page.svelte
new file mode 100644
index 00000000..49d75dc6
--- /dev/null
+++ b/src/routes/(app)/generate/+page.svelte
@@ -0,0 +1,60 @@
+<script>
+  import { fail, post, wait } from "$lib/utils";
+  import { onMount } from "svelte";
+  import { goto, invalidate } from "$app/navigation";
+  import Pin from "$comp/Pin.svelte";
+  import Spinner from "$comp/Spinner.svelte";
+  import { loginRedirect, pin, password } from "$lib/store";
+  import { generate } from "$lib/nostr";
+  import { browser } from "$app/environment";
+
+  export let data;
+  let { user } = data;
+
+  let loaded;
+  let gen = async () => {
+    if (!browser) return;
+
+    if (user.pubkey) {
+      goto($loginRedirect || `/${user.username}`, { invalidateAll: true });
+      return;
+    }
+
+    try {
+      await generate(user);
+    } catch (e) {
+      console.log("error generating", e);
+    }
+
+    try {
+      user.pin = $pin;
+      await post(`/generate`, user);
+      goto($loginRedirect || `/${user.username}`, { invalidateAll: true });
+    } catch (e) {
+      $pin = "";
+      if (e.message?.startsWith("Pin")) {
+        fail("Wrong pin, try again");
+      } else {
+        fail("Failed to generate keys");
+        goto("/");
+      }
+    }
+  };
+
+  onMount(() => browser && setTimeout(() => (loaded = true) && gen(), 50));
+
+  $: $pin?.length === 6 && gen(user);
+</script>
+
+{#if loaded && user?.haspin && $pin?.length !== 6}
+  <Pin />
+{/if}
+
+<div class="container px-4 text-center mx-auto">
+  <h1 class="text-3xl md:text-4xl font-bold mb-6">
+    Generating new account keys
+  </h1>
+  <div class="flex w-full py-5 max-w-[200px] mx-auto bg-black rounded-2xl">
+    <Spinner />
+  </div>
+</div>
diff --git a/src/routes/(app)/generate/+server.ts b/src/routes/(app)/generate/+server.ts
new file mode 100644
index 00000000..5a442982
--- /dev/null
+++ b/src/routes/(app)/generate/+server.ts
@@ -0,0 +1,12 @@
+import { auth, post } from "$lib/utils";
+import { error, json } from "@sveltejs/kit";
+
+export async function POST({ cookies, request }) {
+  try {
+    let body = await request.json();
+    return json(await post(`/user`, body, auth(cookies)));
+  } catch (e: any) {
+    console.log(e);
+    error(500, e.message);
+  }
+}
diff --git a/src/routes/(app)/invoice/+page.server.ts b/src/routes/(app)/invoice/+page.server.ts
new file mode 100644
index 00000000..83127457
--- /dev/null
+++ b/src/routes/(app)/invoice/+page.server.ts
@@ -0,0 +1,29 @@
+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;
+  let { subject, user, rates } = await parent();
+
+  let invoice: Invoice = {
+    account,
+    type: account ? "bitcoin" : "lightning",
+    rate: rates[user?.currency || subject?.currency],
+  };
+
+  if (!user) user = subject;
+
+  try {
+    invoice = await post("/invoice", { invoice, account, user }, auth(cookies));
+  } catch (e) {
+    console.log(e);
+    error(500, "Failed to generate invoice");
+    }
+
+  let { id } = invoice;
+
+  if (invoice.memoPrompt && !invoice.memo) {
+    redirect(307, `/invoice/${id}/memo`);
+  } else redirect(307, `/invoice/${id}`);
+};
diff --git a/src/routes/(app)/invoice/+page.svelte b/src/routes/(app)/invoice/+page.svelte
new file mode 100644
index 00000000..e69de29b
diff --git a/src/routes/(app)/invoice/+server.ts b/src/routes/(app)/invoice/+server.ts
new file mode 100644
index 00000000..5e3d0300
--- /dev/null
+++ b/src/routes/(app)/invoice/+server.ts
@@ -0,0 +1,7 @@
+import { auth, post } from "$lib/utils";
+import { json } from "@sveltejs/kit";
+
+export let POST = async ({ cookies: c, request: r }) => {
+  let j = await r.json();
+  return json(await post("/invoice", j, auth(c)));
+};
diff --git a/src/routes/(app)/invoice/[id]/+layout.server.ts b/src/routes/(app)/invoice/[id]/+layout.server.ts
new file mode 100644
index 00000000..e7144b15
--- /dev/null
+++ b/src/routes/(app)/invoice/[id]/+layout.server.ts
@@ -0,0 +1,36 @@
+import Qr from "qrcode-base64";
+import { get } from "$lib/utils";
+import { redirect } from "@sveltejs/kit";
+
+export async function load({ depends, params, url, parent }) {
+  depends("app:invoice");
+
+  let { subject, user } = await parent();
+  let { id } = params;
+  let invoice = await get(`/invoice/${id}`);
+  let options = !!url.searchParams.get("options");
+
+  if (
+    user &&
+    invoice.uid !== user.id &&
+    !(url.pathname.includes("tip") || url.pathname.includes("memo")) &&
+    !options
+  ) {
+    redirect(307, `/send/invoice/${id}`);
+  }
+
+  let { amount, pending, received } = invoice;
+  amount = parseInt(amount);
+
+  let paid =
+    (!amount && (pending || received)) ||
+    (amount > 0 && (pending >= amount || received >= amount));
+  if (paid && !url.pathname.endsWith("paid")) {
+    redirect( 307, `/invoice/${id}/paid` + (options ? "?options=true" : "")
+    );
+  }
+
+  let src = Qr.drawImg(invoice.text || "", { size: 340 });
+
+  return { id, invoice, subject, src };
+}
diff --git a/src/routes/(app)/invoice/[id]/+layout.svelte b/src/routes/(app)/invoice/[id]/+layout.svelte
new file mode 100644
index 00000000..4fa864ce
--- /dev/null
+++ b/src/routes/(app)/invoice/[id]/+layout.svelte
@@ -0,0 +1 @@
+<slot />
diff --git a/src/routes/(app)/invoice/[id]/+page.server.ts b/src/routes/(app)/invoice/[id]/+page.server.ts
new file mode 100644
index 00000000..a57efa64
--- /dev/null
+++ b/src/routes/(app)/invoice/[id]/+page.server.ts
@@ -0,0 +1,5 @@
+import invoice from "$lib/invoice";
+
+export const actions = {
+  default: invoice,
+};
diff --git a/src/routes/(app)/invoice/[id]/+page.svelte b/src/routes/(app)/invoice/[id]/+page.svelte
new file mode 100644
index 00000000..c4810889
--- /dev/null
+++ b/src/routes/(app)/invoice/[id]/+page.svelte
@@ -0,0 +1,351 @@
+<script>
+  import { enhance } from "$app/forms";
+  import { send } from "$lib/socket";
+  import {
+    btc,
+    post,
+    back,
+    copy,
+    f,
+    get,
+    types,
+    sat,
+    reverseFormat,
+    s,
+    sats,
+  } from "$lib/utils";
+  import { tick, onMount, onDestroy } from "svelte";
+  import { browser } from "$app/environment";
+  import { last, showQr, amountPrompt } from "$lib/store";
+  import Avatar from "$comp/Avatar.svelte";
+  import Icon from "$comp/Icon.svelte";
+  import Heart from "$comp/Heart.svelte";
+  import Image from "$comp/Image.svelte";
+  import Numpad from "$comp/Numpad.svelte";
+  import { t } from "$lib/translations";
+  import { goto, invalidate } from "$app/navigation";
+  import Toggle from "$comp/Toggle.svelte";
+
+  export let data;
+
+  let showOptions;
+
+  let reading = async ({ message, serialNumber }) => {
+    let name = serialNumber.replace(/:/g, "-");
+    let result = await post(`/fund/${name}/withdraw`, { amount, hash, name });
+  };
+
+  let readingerror = (e) => console.log("nfc error", e);
+
+  $: refresh(data);
+  let { invoice, id, subject, user, src } = data;
+  let {
+    account,
+    amount,
+    hash,
+    type,
+    rate,
+    text,
+    tip,
+    user: { username, currency },
+  } = invoice;
+
+  let qr;
+  let tipPercent = 0;
+
+  let refresh = async (data) => {
+    ({ invoice, id, user, src } = data);
+    ({
+      account,
+      amount,
+      hash,
+      type,
+      rate,
+      text,
+      tip,
+      user: { username, currency },
+    } = invoice);
+
+    tipPercent = (tip / amount) * 100;
+  };
+
+  $: amountFiat = parseFloat(((amount * rate) / sats).toFixed(2));
+  $: tipAmount = ((tip * rate) / sats).toFixed(2);
+
+  let subbed;
+
+  onMount(async () => {
+    if (browser) {
+      last.subscribe((v) => {
+        if (!v || subbed) return;
+        subbed = true;
+        send("subscribe", invoice);
+      });
+
+      if ($amountPrompt && !tip) toggleAmount();
+    }
+  });
+
+  $: link = [types.bitcoin, types.liquid].includes(type)
+    ? text
+    : `lightning:${text}`;
+  $: txt = [types.bitcoin, types.liquid].includes(type) ? hash : text;
+
+  let setType = async (type) => {
+    invoice.type = type;
+    ({ id } = await post(`/invoice`, {
+      invoice,
+      user: { username, currency },
+    }));
+
+    goto(`./${id}?options=true`, { invalidateAll: true, noScroll: true });
+  };
+
+  let setAmount = async () => {
+    if (typeof $amountPrompt === "undefined") $amountPrompt = true;
+    settingAmount = false;
+    amount = newAmount;
+    invoice.amount = newAmount;
+    invoice.tip = 0;
+    ({ id } = await post(`/invoice`, {
+      invoice,
+      user: { username, currency },
+    }));
+
+    let url = `./${id}`;
+    if (subject?.prompt) url += "/tip";
+    else url += "?options=true";
+
+    goto(url, { invalidateAll: true, noScroll: true });
+  };
+
+  let newAmount;
+  let settingAmount;
+  let toggleAmount = () => (settingAmount = !settingAmount);
+  let fiat;
+  let submit;
+</script>
+
+<div class="invoice container mx-auto max-w-xl px-4 space-y-2">
+  {#if $showQr}
+    <div>
+      <a
+        href={[types.bitcoin, types.liquid].includes(invoice.type)
+          ? invoice.text
+          : "lightning:" + invoice.text}
+      >
+        <img
+          {src}
+          class="mx-auto z-10 shadow-inner rounded-2xl"
+          bind:this={qr}
+          alt={txt}
+        />
+      </a>
+    </div>
+  {:else}
+    <div class="break-all pb-5 text-lg text-center">
+      {txt}
+    </div>
+  {/if}
+
+  {#each invoice.items as i}
+    <div class="grid grid-cols-12 text-xl">
+      <div class="col-span-1 my-auto">{i.quantity}</div>
+      <div class="mr-auto grow col-span-7 my-auto">
+        {i.name}
+      </div>
+      <div class="col-span-2 font-semibold text-right my-auto">
+        {f(i.price * i.quantity, currency)}
+      </div>
+      <div class="col-span-2 text-secondary text-right text-lg my-auto">
+        {sat(btc(i.price * i.quantity, rate))}
+      </div>
+    </div>
+  {/each}
+
+  {#if amount > 0}
+    <div class="text-center font-bold text-2xl">
+      <div>
+        {f(amountFiat, currency)}
+
+        {#if tip}
+          <span class="text-sm">
+            +{f(tip * (rate / sats), currency)}
+          </span>
+        {/if}
+      </div>
+      <div>
+        <span class="text-secondary font-normal text-xl"
+          >⚡️{`${s(amount)}`}</span
+        >
+
+        {#if tip}
+          <span class="text-sm text-secondary font-normal">
+            +⚡️{s(tip)}
+          </span>
+        {/if}
+      </div>
+    </div>
+  {/if}
+
+  <div class="text-secondary space-y-2 text-xl">
+    <button
+      type="button"
+      class="flex gap-2 text-center break-all rounded-2xl hover:opacity-80 py-5 px-6 w-full mx-auto justify-center border whitespace-nowrap mb-2"
+      on:click={() => copy(txt)}
+    >
+      <Icon icon="copy" style="w-8 my-auto" />
+      <div class="my-auto">
+        {$t("payments.copy")}
+      </div>
+    </button>
+
+    {#if user?.id === invoice?.user?.id}
+      <button
+        class="w-full flex justify-center rounded-2xl border py-5 px-6 hover:opacity-80"
+        on:click={toggleAmount}
+      >
+        <Icon icon="edit" style="mr-1 w-8" />
+        <div class="my-auto">{$t("payments.setAmount")}</div>
+      </button>
+    {:else}
+      <a href={link} class="w-full">
+        <button
+          class="w-full flex justify-center rounded-2xl border py-5 px-6 hover:opacity-80"
+        >
+          <Icon icon="mobile" style="mr-1 w-8" />
+          <div class="my-auto">{$t("payments.openLink")}</div>
+        </button>
+      </a>
+    {/if}
+
+    <div class="w-full flex justify-center gap-2 flex-wrap">
+      <button
+        class="w-full flex justify-center rounded-2xl border py-5 px-6 hover:opacity-80"
+        on:click={() => ($showQr = !$showQr)}
+      >
+        {#if $showQr}
+          <Icon icon="text" style="w-6 mr-2 my-auto" />
+        {:else}
+          <Icon icon="qr" style="w-8 mr-1 invert my-auto" />
+        {/if}
+        <div class="my-auto">
+          {$showQr ? $t("payments.showText") : $t("payments.showQr")}
+        </div></button
+      >
+    </div>
+  </div>
+
+  {#if !account}
+    <div class="flex justify-around text-secondary">
+      <button
+        class="hover:bg-primary my-auto flex gap-1 sm:gap-2 py-3 px-2 sm:px-5 w-full justify-center"
+        class:bg-primary={type === types.bitcoin}
+        class:text-black={type === types.bitcoin}
+        on:click={() => setType(types.bitcoin)}
+      >
+        <img src="/images/bitcoin.svg" class="w-8" alt="Bitcoin" />
+        <div class="my-auto text-lg">Bitcoin</div>
+      </button>
+
+      <button
+        class="hover:bg-primary my-auto flex gap-1 sm:gap-2 py-3 px-2 sm:px-5 w-full justify-center"
+        class:bg-primary={type === types.liquid}
+        class:text-black={type === types.liquid}
+        on:click={() => setType(types.liquid)}
+      >
+        <img src="/images/liquid.svg" class="w-8" alt="Liquid" />
+        <div class="my-auto text-lg">Liquid</div>
+      </button>
+
+      <button
+        class="hover:bg-primary flex gap-1 sm:gap-2 py-3 px-2 sm:px-5 w-full justify-center"
+        class:bg-primary={type === types.lightning}
+        class:text-black={type === types.lightning}
+        on:click={() => setType(types.lightning)}
+      >
+        <div class="bg-white rounded-full w-8 h-8 text-center flex">
+          <div class="m-auto">⚡️</div>
+        </div>
+        <div class="my-auto text-lg">Lightning</div>
+      </button>
+    </div>
+  {/if}
+
+  {#if type === types.liquid}
+    <div class="flex justify-center">
+      <div class="my-auto text-xl text-center text-secondary">
+        {$t("payments.onlyLbtc")}
+        <span class="text-teal-500 font-bold">L-BTC</span>,
+        {$t("payments.dontDeposit")}
+      </div>
+    </div>
+  {/if}
+
+  {#if user?.id === invoice?.user?.id}
+    <a href={`/receive`} class="block">
+      <button
+        class="flex gap-2 text-center break-all rounded-2xl hover:opacity-80 py-5 px-6 w-full mx-auto justify-center border text-xl whitespace-nowrap text-secondary"
+      >
+        <Icon icon="voucher" style="w-8 my-auto" />
+        <div class="my-auto">
+          {$t("payments.redeemVoucher")}
+        </div></button
+      >
+    </a>
+  {/if}
+</div>
+
+{#if settingAmount}
+  <div
+    class="fixed inset-0 bg-gray-600 bg-opacity-50 overflow-y-auto h-full w-full z-50"
+  >
+    <div
+      class="relative mx-auto p-12 border w-96 shadow-lg rounded-md bg-white space-y-5 top-10"
+    >
+      <form submit={setAmount}>
+        <Numpad
+          bind:amount={newAmount}
+          bind:currency
+          bind:rate
+          bind:fiat
+          bind:submit
+        />
+        <div class="w-full flex flex-wrap gap-2">
+          <button
+            type="submit"
+            on:click={setAmount}
+            class="border-2 border-black rounded-xl font-semibold mx-auto py-3 w-40 hover:opacity-80 mx-auto bg-black text-white w-full"
+          >
+            <div class="my-auto">Ok</div>
+          </button>
+          <button
+            bind:this={submit}
+            type="button"
+            class="border-2 border-black rounded-xl font-semibold mx-auto py-3 w-40 hover:opacity-80 mx-auto w-full"
+            on:click={toggleAmount}
+            on:keydown={toggleAmount}
+          >
+            <div class="my-auto">Cancel</div>
+          </button>
+        </div>
+      </form>
+
+      <div class="flex justify-between items-center">
+        <span class="font-bold">{$t("payments.amountPrompt")}</span>
+        <Toggle id="notify" bind:value={$amountPrompt} />
+      </div>
+    </div>
+  </div>
+{/if}
+
+<style>
+  .invoice {
+    view-transition-name: invoice;
+  }
+
+  .clip-qr {
+    @apply overflow-hidden;
+    clip-path: inset(5%);
+  }
+</style>
diff --git a/src/routes/(app)/invoice/[id]/memo/+page.server.ts b/src/routes/(app)/invoice/[id]/memo/+page.server.ts
new file mode 100644
index 00000000..24dec1af
--- /dev/null
+++ b/src/routes/(app)/invoice/[id]/memo/+page.server.ts
@@ -0,0 +1,13 @@
+import invoice from "$lib/invoice";
+import { redirect } from "@sveltejs/kit";
+
+export async function load({ parent, params }) {
+  let { invoice } = await parent();
+  if (!invoice.amount) {
+    redirect(307, `/invoice/${invoice.id}`);
+  }
+}
+
+export const actions = {
+  default: invoice,
+};
diff --git a/src/routes/(app)/invoice/[id]/memo/+page.svelte b/src/routes/(app)/invoice/[id]/memo/+page.svelte
new file mode 100644
index 00000000..4d23ff19
--- /dev/null
+++ b/src/routes/(app)/invoice/[id]/memo/+page.svelte
@@ -0,0 +1,95 @@
+<script>
+  import { onMount } from "svelte";
+  import { browser } from "$app/environment";
+  import { invoice as inv, request } from "$lib/store";
+  import {
+    copy,
+    select,
+    f,
+    sat,
+    get,
+    reverseFormat,
+    s,
+    sats,
+  } from "$lib/utils";
+  import Icon from "$comp/Icon.svelte";
+  import { t } from "$lib/translations";
+  import { enhance } from "$app/forms";
+
+  let submitting;
+  let submit;
+
+  export let data;
+  $: refresh(data);
+  let { invoice, id, user, rates } = data;
+  let {
+    amount,
+    hash,
+    items,
+    memoPrompt,
+    type,
+    rate,
+    received,
+    prompt,
+    text,
+    tip,
+    user: { username, currency },
+  } = invoice;
+
+  invoice.memo = user?.username;
+
+  let refresh = (data) => {
+    $inv = null;
+
+    ({ invoice, id } = data);
+    ({
+      amount,
+      hash,
+      items,
+      memoPrompt,
+      type,
+      received,
+      prompt,
+      text,
+      tip,
+      user: { username },
+    } = invoice);
+  };
+</script>
+
+<form
+  method="POST"
+  use:enhance
+  class:invisible={submitting}
+  class="container px-4 max-w-lg mx-auto space-y-5"
+>
+  <input type="hidden" name="amount" value={amount} />
+  <input type="hidden" name="tip" value={tip} />
+  <input type="hidden" name="username" value={username} />
+  <input type="hidden" name="rate" value={invoice.rate} />
+  <input type="hidden" name="memoPrompt" value={invoice.memoPrompt} />
+  <input type="hidden" name="prompt" value={invoice.prompt} />
+  <input type="hidden" name="type" value={type} />
+  <input type="hidden" name="hash" value={hash} />
+  <input type="hidden" name="items" value={JSON.stringify(items)} />
+
+  <h1 class="text-4xl font-semibold text-center">{$t("invoice.addMemo")}</h1>
+  <div class="space-y-2">
+    <input
+      use:select
+      name="memo"
+      class="w-full p-4 border rounded-xl text-xl"
+      bind:value={invoice.memo}
+      autocapitalize="none"
+    />
+    <div class="text-secondary">{invoice.memoPrompt}</div>
+  </div>
+
+  <button
+    type="submit"
+    bind:this={submit}
+    class="bg-black text-white border rounded-2xl px-6 py-5 w-full font-bold"
+  >
+    {$t("payments.next")}
+  </button>
+</form>
diff --git a/src/routes/(app)/invoice/[id]/paid/+page.svelte b/src/routes/(app)/invoice/[id]/paid/+page.svelte
new file mode 100644
index 00000000..df05f12b
--- /dev/null
+++ b/src/routes/(app)/invoice/[id]/paid/+page.svelte
@@ -0,0 +1,85 @@
+<script>
+  import { scale } from "svelte/transition";
+  import Icon from "$comp/Icon.svelte";
+  import { toast } from "@zerodevx/svelte-toast";
+  import { browser } from "$app/environment";
+  import { t } from "$lib/translations";
+  import { fiat, f, s, sat, sats } from "$lib/utils";
+
+  export let data;
+  let amount, currency, rate, received, pending, tip, user, id;
+  $: update(data);
+  let update = (data) => {
+    ({ amount, currency, rate, received, pending, tip, user, id } =
+      data.invoice);
+  };
+
+  toast.pop(0);
+</script>
+
+<div class="container px-4 text-center mx-auto">
+  {#if received}
+    <div
+      class="flex w-full py-5 max-w-[200px] mx-auto"
+      in:scale={{ start: 0.5 }}
+    >
+      <Icon icon="check" style="mx-auto" />
+    </div>
+
+    <h1 class="text-3xl md:text-4xl font-bold mb-6">
+      {$t("invoice.paymentSuccessful")}
+    </h1>
+
+    <h2 class="text-2xl md:text-3xl font-semibold">
+      {f(fiat(received - tip, rate), currency)}
+      {#if tip}
+        <span class="text-lg">
+          + {f(fiat(tip, rate), currency)}
+        </span>
+      {/if}
+    </h2>
+    <h3 class="text-secondary md:text-lg mb-6 mt-1">
+      ⚡️{s(received - tip)}
+
+      {#if tip}
+        <span class="text-lg">
+          + ⚡️{s(tip)}
+        </span>
+      {/if}
+    </h3>
+  {/if}
+
+  {#if pending}
+    <div
+      class="flex w-full py-5 max-w-[200px] mx-auto"
+      in:scale={{ start: 0.5 }}
+    >
+      <Icon icon="orangeclock" style="mx-auto" />
+    </div>
+
+    <h1 class="text-3xl md:text-4xl font-bold mb-6">Payment detected</h1>
+    <h2 class="text-2xl md:text-3xl font-semibold">
+      {f(fiat(pending - tip, rate), currency)}
+      {#if tip}
+        + {f(fiat(tip, rate), currency)}
+      {/if}
+    </h2>
+
+    <h3 class="text-secondary md:text-lg mb-6 mt-1">
+      ⚡️{s(pending - tip)}
+      {#if tip}
+        <span class="text-lg">
+          + ⚡️{s(tip)}
+        </span>
+      {/if}
+    </h3>
+  {/if}
+</div>
+
+<a href={`/receive`}>
+  <div class="opacity-0 w-screen h-screen fixed top-0 left-0 z-50" />
+</a>
+
+<div class="fixed bottom-10 w-full text-center">
+  {$t("payments.tapAnywhere")}
+</div>
diff --git a/src/routes/(app)/invoice/[id]/tip/+page.server.ts b/src/routes/(app)/invoice/[id]/tip/+page.server.ts
new file mode 100644
index 00000000..8417de91
--- /dev/null
+++ b/src/routes/(app)/invoice/[id]/tip/+page.server.ts
@@ -0,0 +1,12 @@
+import invoice from "$lib/invoice";
+import { redirect } from "@sveltejs/kit";
+
+export async function load({ parent, params }) {
+  let { invoice } = await parent();
+  if (!invoice.amount)
+    redirect(307, `/invoice/${invoice.id}`);
+}
+
+export const actions = {
+  default: invoice,
+};
diff --git a/src/routes/(app)/invoice/[id]/tip/+page.svelte b/src/routes/(app)/invoice/[id]/tip/+page.svelte
new file mode 100644
index 00000000..35b24bf1
--- /dev/null
+++ b/src/routes/(app)/invoice/[id]/tip/+page.svelte
@@ -0,0 +1,209 @@
+<script>
+  import { onMount } from "svelte";
+  import { browser } from "$app/environment";
+  import { invoice as inv, request } from "$lib/store";
+  import { copy, focus, f, sat, get, reverseFormat, s, sats } from "$lib/utils";
+  import Icon from "$comp/Icon.svelte";
+  import Slider from "$comp/Slider.svelte";
+  import { goto } from "$app/navigation";
+  import { t } from "$lib/translations";
+  import { enhance } from "$app/forms";
+  import { tick } from "svelte";
+
+  const tipAmounts = ["No", "10%", "15%", "20%"];
+  let showCustomAmount;
+
+  let customInput;
+  let customTipAmount;
+
+  let apply = async () => {
+    if (customTipAmount > 0) {
+      tipPercent = (customTipAmount / amountFiat) * 100;
+      showCustomAmount = false;
+    }
+  };
+
+  let active = (amount) =>
+    !customTipAmount && Math.round(tipPercent) === parseInt(amount.slice(0, 2));
+
+  const handleCustomTipAmount = (e) => {
+    tipPercent = 0;
+    customTipAmount = e.target.value;
+  };
+
+  let timeout;
+  const handleSlide = (e) => {
+    customTipAmount = "";
+    if (customInput) {
+      customInput.value = "";
+    }
+    tipPercent = e.target.value;
+  };
+
+  let submitting;
+  const handleTipButtonClick = async (amount) => {
+    submitting = true;
+    if (amount === "No") {
+      tipPercent = 0;
+    } else {
+      tipPercent = parseInt(amount.slice(0, 2));
+    }
+
+    await tick();
+    submit.click();
+  };
+
+  let submit;
+
+  export let data;
+  $: refresh(data);
+  let { invoice, id, user, rates } = data;
+  let {
+    amount,
+    hash,
+    items,
+    type,
+    rate,
+    received,
+    prompt,
+    text,
+    tip,
+    user: { username, currency },
+  } = invoice;
+
+  let qr;
+  let tipPercent = 0;
+
+  let fullscreen;
+
+  let refresh = (data) => {
+    $inv = null;
+
+    ({ invoice, id } = data);
+    ({
+      amount,
+      hash,
+      items,
+      type,
+      received,
+      prompt,
+      text,
+      tip,
+      user: { username },
+    } = invoice);
+
+    tipPercent = (tip / amount) * 100;
+  };
+
+  $: currency = user?.currency || invoice.currency;
+  $: rate = invoice.rate * (rates[currency] / rates[invoice.currency]);
+
+  $: tip = Math.round((amount / 100) * tipPercent);
+
+  $: amountFiat = parseFloat(((amount * rate) / sats).toFixed(2));
+
+  $: tipAmount = ((tip * rate) / sats).toFixed(2);
+
+  $: invoiceAmountFiatFormatted = f(amountFiat, currency);
+
+  onMount(() => ($request = undefined));
+</script>
+
+<div class="container px-4 max-w-lg text-center mx-auto">
+  <form method="POST" use:enhance class:invisible={submitting}>
+    <input type="hidden" name="amount" value={amount} />
+    <input type="hidden" name="tip" value={tip} />
+    <input type="hidden" name="username" value={username} />
+    <input type="hidden" name="rate" value={invoice.rate} />
+    <input type="hidden" name="prompt" value="false" />
+    <input type="hidden" name="type" value={type} />
+    <input type="hidden" name="hash" value={hash} />
+    <input type="hidden" name="items" value={JSON.stringify(items)} />
+
+    {#if invoice.memoPrompt}
+      <input type="hidden" name="memoPrompt" value={invoice.memoPrompt} />
+    {/if}
+
+    <h1 class="text-4xl font-semibold my-8">{$t("invoice.addTipq")}</h1>
+    {#if !showCustomAmount}
+      <div class="my-2 text-xl">{Math.round(tipPercent)}%</div>
+
+      <Slider handle={handleSlide} bind:value={tipPercent} />
+
+      <div class="flex mb-8 text-lg">
+        <div>
+          <span class="mr-1">
+            {f(amountFiat, currency)}
+            <span class="font-semibold">+{f(tipAmount, currency)}</span>
+          </span>
+        </div>
+
+        <div class="ml-auto text-lg">
+          {sat(amount)}
+          <span class="font-semibold">+{sat(tip)}</span>
+        </div>
+      </div>
+
+      {#if tip}
+        <div>
+          <button type="button" on:click={() => submit.click()}>Next</button>
+          <button type="button" on:click={() => (tipPercent = 0)}>Reset</button>
+        </div>
+      {:else}
+        {#each tipAmounts as amount}
+          <button
+            type="button"
+            class:active={active(amount, tipPercent)}
+            on:click={() => handleTipButtonClick(amount)}>{amount}</button
+          >
+        {/each}
+      {/if}
+
+      <div>
+        <button type="button" on:click={() => (showCustomAmount = true)}
+          >Custom</button
+        >
+      </div>
+    {/if}
+
+    <button type="submit" bind:this={submit} />
+  </form>
+
+  {#if showCustomAmount}
+    <form on:submit|preventDefault={apply}>
+      <div class="relative">
+        <span
+          class="absolute top-[18px] left-5 font-semibold {!customTipAmount
+            ? 'opacity-50'
+            : 'opacity-100'}">$</span
+        >
+        <input
+          bind:this={customInput}
+          type="number"
+          step="0.01"
+          on:input={(e) => handleCustomTipAmount(e)}
+          class="pl-10"
+          placeholder="Custom amount"
+          use:focus
+        />
+        <button
+          type="submit"
+          class="w-full mt-2 bg-black text-white font-semibold py-3 px-7 rounded-2xl {!customTipAmount
+            ? 'opacity-50'
+            : 'opacity-100 hover:opacity-80'}"
+          disabled={!customTipAmount}>Apply</button
+        >
+      </div>
+    </form>
+  {/if}
+</div>
+
+<style>
+  .active {
+    @apply !bg-black !text-white;
+  }
+
+  .container button[type="button"] {
+    @apply w-full mt-2 bg-primary text-black hover:bg-black hover:text-white font-semibold py-5 px-7 rounded-2xl;
+  }
+</style>
diff --git a/src/routes/(app)/invoice/sent/+page.svelte b/src/routes/(app)/invoice/sent/+page.svelte
new file mode 100644
index 00000000..b95bc85e
--- /dev/null
+++ b/src/routes/(app)/invoice/sent/+page.svelte
@@ -0,0 +1,11 @@
+<script>
+  import Avatar from "$comp/Avatar.svelte";
+  import Icon from "$comp/Icon.svelte";
+  import { request } from "$lib/store";
+</script>
+
+Invoice sent to
+<div class="flex">
+  <Avatar user={$request.requester} size={12} />
+  <h1 class="my-auto"><b>{$request.requester.username}</b> is ready to pay</h1>
+</div>
diff --git a/src/routes/(app)/items/[id]/+page.server.ts b/src/routes/(app)/items/[id]/+page.server.ts
new file mode 100644
index 00000000..67cebd93
--- /dev/null
+++ b/src/routes/(app)/items/[id]/+page.server.ts
@@ -0,0 +1,21 @@
+import { fd, auth, get, post } from "$lib/utils";
+import { fail, redirect } from "@sveltejs/kit";
+
+export let load = async ({ params: { id } }) => {
+  let item = await get(`/items/${id}`);
+  return { item };
+};
+
+export const actions = {
+  default: async ({ cookies, request, url }) => {
+    let form = await fd(request);
+    try {
+      await post(`/items`, form, auth(cookies));
+    } catch (e: any) {
+      return fail(400, { message: e.message });
+    }
+
+    let success = `/${url.pathname.split("/")[1]}`;
+    redirect(307, success);
+  },
+};
diff --git a/src/routes/(app)/items/[id]/+page.svelte b/src/routes/(app)/items/[id]/+page.svelte
new file mode 100644
index 00000000..65720350
--- /dev/null
+++ b/src/routes/(app)/items/[id]/+page.svelte
@@ -0,0 +1,18 @@
+<script>
+  import { t } from "$lib/translations";
+  import ItemForm from "$comp/ItemForm.svelte";
+  import { fail } from "$lib/utils";
+
+  export let data;
+  export let form;
+
+  $: form?.message && fail(form.message);
+  let { item, user } = data;
+</script>
+
+<div class="container max-w-xl mx-auto px-4">
+  <h1 class="px-3 md:px-0 text-center text-3xl md:text-4xl font-semibold mb-10">
+    {$t("items.edit")}
+  </h1>
+  <ItemForm {item} {user} />
+</div>
diff --git a/src/routes/(app)/items/create/+page.server.ts b/src/routes/(app)/items/create/+page.server.ts
new file mode 100644
index 00000000..2e006a3e
--- /dev/null
+++ b/src/routes/(app)/items/create/+page.server.ts
@@ -0,0 +1,16 @@
+import { fail, redirect } from "@sveltejs/kit";
+import { fd, auth, post } from "$lib/utils";
+
+export const actions = {
+  default: async ({ cookies, request, url }) => {
+    let form = await fd(request);
+    try {
+      await post("/items", form, auth(cookies));
+    } catch (e: any) {
+      return fail(400, { message: e.message });
+    }
+
+    let success = `/${url.pathname.split("/")[1]}`;
+    redirect(307, success);
+  },
+};
diff --git a/src/routes/(app)/items/create/+page.svelte b/src/routes/(app)/items/create/+page.svelte
new file mode 100644
index 00000000..b82889c9
--- /dev/null
+++ b/src/routes/(app)/items/create/+page.svelte
@@ -0,0 +1,19 @@
+<script>
+  import { t } from "$lib/translations";
+  import ItemForm from "$comp/ItemForm.svelte";
+  import { fail } from "$lib/utils";
+
+  export let data;
+  export let form;
+
+  $: form?.message && fail(form.message);
+  let { user } = data;
+  let item = {};
+</script>
+
+<div class="container max-w-xl mx-auto px-4">
+  <h1 class="px-3 md:px-0 text-center text-3xl md:text-4xl font-semibold mb-10">
+    {$t("items.add")}
+  </h1>
+  <ItemForm {item} {user} />
+</div>
diff --git a/src/routes/(app)/ln/[lnurl]/+page.server.ts b/src/routes/(app)/ln/[lnurl]/+page.server.ts
index d1b1b86e..c078ae8e 100644
--- a/src/routes/(app)/ln/[lnurl]/+page.server.ts
+++ b/src/routes/(app)/ln/[lnurl]/+page.server.ts
@@ -70,6 +70,6 @@ export const actions = {
     let c = callback.includes("?") ? "&" : "?";
     await fetch(`${callback}${c}k1=${k1}&pr=${pr}`).then((r) => r.json());
 
-    redirect(307, `/${username}/payments`);
+    redirect(307, `/payments`);
   },
 };
diff --git a/src/routes/(app)/ln/withdrawal/sent/+page.svelte b/src/routes/(app)/ln/withdrawal/sent/+page.svelte
index c1a2bdb2..90814960 100644
--- a/src/routes/(app)/ln/withdrawal/sent/+page.svelte
+++ b/src/routes/(app)/ln/withdrawal/sent/+page.svelte
@@ -19,7 +19,7 @@
   <h1 class="text-3xl md:text-4xl font-bold mb-6">Request Sent!</h1>
 </div>
 
-<a href={`/${user.username}/payments`}>
+<a href={`/payments`}>
   <div class="opacity-0 w-screen h-screen fixed top-0 left-0 z-50" />
 </a>
 
diff --git a/src/routes/(app)/login/+page.server.ts b/src/routes/(app)/login/+page.server.ts
deleted file mode 100644
index fd7fec8c..00000000
--- a/src/routes/(app)/login/+page.server.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { fail, redirect } from "@sveltejs/kit";
-import { login, fd } from "$lib/utils";
-
-export const load = async ({ parent }) => {
-  let { user } = await parent();
-  if (user?.pubkey) redirect(307, `/${user.username}`);
-};
-
-export const actions = {
-  default: async ({ cookies, request }) => {
-    let form = await fd(request);
-    let { username, password, token, loginRedirect } = form;
-    let user = { username, password, token };
-
-    if (loginRedirect === "undefined") loginRedirect = undefined;
-
-    try {
-      await login(
-        user,
-        cookies,
-        request.headers.get("cf-connecting-ip")
-      );
-    } catch (e: any) {
-      return fail(400, { error: "Login failed", message: e.message, ...form });
-    }
-
-    redirect(307, loginRedirect || `/${user.username}`);
-  },
-};
diff --git a/src/routes/(app)/login/+page.svelte b/src/routes/(app)/login/+page.svelte
deleted file mode 100644
index 61ea23b7..00000000
--- a/src/routes/(app)/login/+page.svelte
+++ /dev/null
@@ -1,188 +0,0 @@
-<script>
-  import { onMount } from "svelte";
-  import { applyAction, deserialize } from "$app/forms";
-  import { tick } from "svelte";
-  import { fly } from "svelte/transition";
-  import { enhance } from "$app/forms";
-  import Pin from "$comp/Pin.svelte";
-  import Icon from "$comp/Icon.svelte";
-  import Spinner from "$comp/Spinner.svelte";
-  import { focus, fail } from "$lib/utils";
-  import { password, pin, loginRedirect } from "$lib/store";
-  import { t } from "$lib/translations";
-  import { page } from "$app/stores";
-  import { generate } from "$lib/nostr";
-  import { invalidateAll } from "$app/navigation";
-
-  onMount(() => {
-    $pin = undefined;
-    localStorage.clear();
-    sessionStorage.clear();
-
-    let lang = $page.url.searchParams.get("lang");
-    if (lang) document.cookie = `lang=${lang} ;`;
-  });
-
-  export let form;
-
-  let token, formElement;
-  let code = [];
-  let redirect;
-
-  $password = undefined;
-
-  $: need2fa = form?.message === "2fa";
-  let cancel = () => (need2fa = false);
-  $: if (form?.message === "2fa" && form.token === token) token = "";
-
-  let username, email, btn;
-
-  $: update(form);
-  let update = (form) => form && ({ username, password: $password } = form);
-
-  $: token && token?.length === 6 && tick().then(() => btn.click());
-
-  let revealPassword = false;
-
-  let loading;
-  async function handleSubmit(e) {
-    loading = true;
-
-    let data = new FormData(this);
-    let user = Object.fromEntries(data);
-    await generate(user);
-
-    for (let k in user) {
-      data.set(k, user[k]);
-    }
-
-    const response = await fetch("/login", {
-      method: "POST",
-      body: data,
-    });
-
-    const result = deserialize(await response.text());
-
-    if (result.type === "success") {
-      await invalidateAll();
-    }
-
-    applyAction(result);
-    loading = false;
-  }
-</script>
-
-{#if need2fa}
-  <Pin bind:value={token} title="Enter 2FA Code" {cancel} notify={false} />
-{/if}
-
-<div class="pt-10">
-  <div class="w-[243px] mx-auto mb-10">
-    <a href="/">
-      <Icon icon="logo" />
-    </a>
-  </div>
-
-  <div class="flex justify-center items-center">
-    <div
-      class="shadow-xl rounded-3xl p-10 pb-12 space-y-5 w-full mx-5 md:mx-0 md:w-[400px]"
-    >
-      <h1 class="text-2xl font-bold text-center">{$t("login.signIn")}</h1>
-
-      {#if form?.error}
-        <div class="text-red-600 text-center" in:fly>
-          {form.error}
-        </div>
-      {/if}
-
-      <form
-        class="space-y-5"
-        on:submit|preventDefault={handleSubmit}
-        method="POST"
-      >
-        <input
-          type="hidden"
-          name="loginRedirect"
-          value={$loginRedirect || $page.url.searchParams.get("redirect")}
-        />
-        <input type="hidden" name="token" value={token} />
-
-        <div>
-          <label for="username" class="font-semibold"
-            >{$t("login.username")}</label
-          >
-          <input
-            name="username"
-            type="text"
-            required
-            class="bg-primary"
-            bind:value={username}
-            use:focus
-            autocapitalize="none"
-          />
-        </div>
-
-        <div class="relative">
-          <label for="password" class="block font-semibold"
-            >{$t("login.password")}</label
-          >
-          {#if revealPassword}
-            <input
-              name="password"
-              type="text"
-              required
-              class="bg-primary"
-              bind:value={$password}
-              autocapitalize="none"
-            />
-          {:else}
-            <input
-              name="password"
-              type="password"
-              required
-              class="bg-primary"
-              bind:value={$password}
-              autocapitalize="none"
-            />
-          {/if}
-          <button
-            type="button"
-            on:click={() => (revealPassword = !revealPassword)}
-            class="absolute right-5 top-10"
-          >
-            <Icon icon={revealPassword ? "eye" : "eye-off"} />
-          </button>
-        </div>
-
-        <div class="flex justify-end items-center">
-          <a href="/forgot" class="underline underline-offset-4 text-black"
-            >{$t("login.forgotUserOrPassword")}</a
-          >
-        </div>
-
-        <button
-          type="submit"
-          class="bg-black text-white w-full rounded-2xl p-4 font-semibold hover:opacity-80"
-          disabled={loading}
-          bind:this={btn}
-        >
-          {#if loading}
-            <Spinner />
-          {:else}
-            {$t("login.signIn")}
-          {/if}
-        </button>
-      </form>
-
-      <p class="text-secondary text-center font-medium">
-        {$t("login.noAccount")}
-        <a
-          href={"/register"}
-          class="block md:inline text-black underline underline-offset-4 hover:opacity-80"
-        >
-          {$t("login.register")}
-        </a>
-      </p>
-    </div>
-  </div>
-</div>
diff --git a/src/routes/(app)/messages/+page.server.ts b/src/routes/(app)/messages/+page.server.ts
new file mode 100644
index 00000000..94659621
--- /dev/null
+++ b/src/routes/(app)/messages/+page.server.ts
@@ -0,0 +1,42 @@
+import { get } from "$lib/utils";
+import { redirect } from "@sveltejs/kit";
+
+interface Message {
+  created_at: number;
+}
+
+interface Note {
+  created_at: number;
+  seen: number;
+}
+
+export async function load({ params, parent, }) {
+  let { user } = await parent();
+  if (user.username !== params.username) redirect(307, `/${params.username}`);
+  let { since = 0 } = params;
+
+  let messages = [],
+    notes = [];
+
+  if (user?.pubkey) {
+    let { pubkey } = user;
+    try {
+      messages = await get(`/${pubkey}/${since}/messages`);
+      messages = messages.sort((a: Message, b: Message) => b.created_at - a.created_at);
+    } catch (e) {
+      console.log(`failed to fetch nostr messages`, e);
+    }
+
+    try {
+      notes = await get(`/${pubkey}/notes`);
+    } catch (e) {
+      console.log(`failed to fetch nostr notes for ${pubkey}`, e);
+    }
+
+    notes.map((e: Note) => {
+      e.seen = e.created_at;
+    });
+  }
+
+  return { messages, notes };
+}
diff --git a/src/routes/(app)/messages/+page.svelte b/src/routes/(app)/messages/+page.svelte
new file mode 100644
index 00000000..547a1f21
--- /dev/null
+++ b/src/routes/(app)/messages/+page.svelte
@@ -0,0 +1,92 @@
+<script>
+  import { t } from "$lib/translations";
+  import Avatar from "$comp/Avatar.svelte";
+  import { event as e, password } from "$lib/store";
+  import { browser } from "$app/environment";
+  import { decrypt } from "$lib/nostr";
+
+  export let data;
+
+  let { messages, notes, invoices, sent, received, subject, user, rates } =
+    data;
+  $: refresh(data);
+  let refresh = (d) =>
+    ({ messages, notes, invoices, sent, received, subject, user, rates } = d);
+
+  let keys = new Set();
+  let latest = [];
+  let ready;
+
+  e.subscribe(async (event) => {
+    if (!(browser && event && ready)) return;
+    if (
+      event.recipient?.id === user.id &&
+      !~latest.findIndex((m) => m.id === event.id)
+    ) {
+      event.content = await decrypt({ event, user });
+
+      let i = latest.findIndex((m) => m.pubkey === event.pubkey);
+      let popped;
+      if (~i) popped = latest.splice(i, 1);
+      else popped = latest.pop();
+
+      latest.unshift(event);
+      latest = latest;
+    }
+  });
+
+  $: initialize($password);
+  let initialize = async (p) => {
+    let i = 0;
+    ready = false;
+    if (!(browser && user)) return;
+    while (i < messages.length) {
+      let event = messages[i];
+      i++;
+
+      if (!(event.author && event.recipient)) continue;
+
+      let k =
+        event.author.id === user.id
+          ? event.recipient?.pubkey
+          : event.author.pubkey;
+
+      if (!keys.has(k)) {
+        keys.add(k);
+        event.content = await decrypt({ event, user });
+        if (event.content) latest.push(event);
+      }
+    }
+
+    latest = latest;
+    ready = true;
+  };
+</script>
+
+<div class="container w-full mx-auto text-lg px-4 max-w-xl space-y-5">
+  <h1 class="px-3 md:px-0 text-center text-3xl md:text-4xl font-semibold mb-10">
+    {$t("user.messages")}
+  </h1>
+  {#if latest.length && user?.id === subject.id}
+    <div class="relative">
+      {#each latest as { content, pubkey, author, recipient }}
+        {@const user = author.id === user.id ? recipient : author}
+        <a href={`/messages/${user.username}`}>
+          <div class="flex hover:bg-gray-100 p-4 rounded-2xl">
+            <div class="my-auto">
+              <Avatar {user} size={"20"} disabled={true} />
+            </div>
+            <div class="my-auto truncate">
+              <div class="my-auto ml-1 text-lg font-bold">{user.username}</div>
+              <div class="my-auto ml-1 text-secondary text-lg truncate">
+                {content}
+              </div>
+            </div>
+          </div>
+        </a>
+      {/each}
+    </div>
+  {:else}
+    <div class="text-center">{$t("user.noMessages")}</div>
+  {/if}
+</div>
diff --git a/src/routes/(app)/messages/[recipient]/+page.server.ts b/src/routes/(app)/messages/[recipient]/+page.server.ts
new file mode 100644
index 00000000..6be9f6ec
--- /dev/null
+++ b/src/routes/(app)/messages/[recipient]/+page.server.ts
@@ -0,0 +1,24 @@
+import { get } from "$lib/utils";
+import type { Message } from "$lib/types";
+
+export async function load({ params, parent }) {
+  let { user } = await parent();
+  let { since = 0 } = params;
+
+  let messages: Message[] = [];
+  let recipient = await get(`/users/${params.recipient}`);
+
+  try {
+    messages = await get(`/${user.pubkey}/${since}/messages`);
+
+    messages = messages
+      .filter(
+        (m: Message) => m.recipient?.id === recipient.id || m.author?.id === recipient.id
+      )
+      .sort((a, b) => a.created_at - b.created_at);
+  } catch (e) {
+    console.log(`failed to fetch nostr messages`, e);
+  }
+
+  return { messages, recipient, user };
+}
diff --git a/src/routes/(app)/messages/[recipient]/+page.svelte b/src/routes/(app)/messages/[recipient]/+page.svelte
new file mode 100644
index 00000000..98638389
--- /dev/null
+++ b/src/routes/(app)/messages/[recipient]/+page.svelte
@@ -0,0 +1,191 @@
+<script>
+  import { cubicInOut } from "svelte/easing";
+  import { browser } from "$app/environment";
+  import { t } from "$lib/translations";
+  import { format } from "date-fns";
+  import { scale, fade, fly } from "svelte/transition";
+  import { enhance } from "$app/forms";
+  import Avatar from "$comp/Avatar.svelte";
+  import Icon from "$comp/Icon.svelte";
+  import { back, fail, focus } from "$lib/utils";
+  import { sign, send, encrypt, decrypt } from "$lib/nostr";
+  import { event as e, password } from "$lib/store";
+  import { tick, onMount } from "svelte";
+  import { getEventHash } from "nostr-tools";
+
+  export let data;
+
+  function fadeScale(
+    node,
+    { delay = 0, duration = 200, easing = (x) => x, baseScale = 0 }
+  ) {
+    const o = +getComputedStyle(node).opacity;
+    const m = getComputedStyle(node).transform.match(/scale\(([0-9.]+)\)/);
+    const s = m ? m[1] : 1;
+    const is = 1 - baseScale;
+
+    return {
+      delay,
+      duration,
+      css: (t) => {
+        const eased = easing(t);
+        return `opacity: ${eased * o}; transform: scale(${
+          eased * s * is + baseScale
+        })`;
+      },
+    };
+  }
+
+  let { messages, recipient, user } = data;
+  let input, pane;
+
+  $: initialize($password);
+  let initialize = async (p) => {
+    await Promise.all(
+      messages.map(
+        async (event) => (event.message = await decrypt({ event, user }))
+      )
+    );
+
+    messages = messages;
+    tick().then(() => pane && (pane.scrollTop = pane.scrollHeight));
+  };
+
+  e.subscribe(async (event) => {
+    let found = ~messages.findIndex((m) => m.id === event?.id);
+    if (event?.recipient.id === user.id && !found) {
+      event.message = await decrypt({ event, user });
+      messages.push(event);
+      messages = messages;
+      tick().then(() => pane && (pane.scrollTop = pane.scrollHeight));
+    }
+  });
+
+  let sent, submitting, message;
+  let submit = async () => {
+    submitting = true;
+
+    let event = {
+      pubkey: user.pubkey,
+      created_at: Math.floor(Date.now() / 1000),
+      kind: 4,
+      tags: [["p", recipient.pubkey]],
+    };
+
+    event.message = message;
+
+    message = "";
+
+    event.author = user;
+    event.recipient = recipient;
+
+    messages.push(event);
+    messages = messages;
+    tick().then(() => pane && (pane.scrollTop = pane.scrollHeight));
+
+    try {
+      event.content = await encrypt({
+        message: event.message,
+        recipient: recipient.pubkey,
+        user,
+      });
+      event.id = getEventHash(event);
+      await sign({ event, user });
+      await send(event);
+
+      sent = true;
+    } catch (e) {
+      console.log(e);
+      fail("Failed to send message");
+    }
+
+    message = "";
+    submitting = false;
+  };
+
+  let keydown = (e) => {
+    if (e.key === "Enter") {
+      e.preventDefault();
+      submit();
+    }
+  };
+</script>
+
+<div class="container max-w-xl mx-auto px-4 space-y-5">
+  <button
+    type="button"
+    class="hover:opacity-80"
+    data-sveltekit-preload-data="false"
+    on:click={back}
+  >
+    <Icon icon="arrow-left" style="w-10" />
+  </button>
+
+  <div
+    class="h-[50vh] max-h-[50vh] overflow-y-scroll scrollbar-thin scrollbar-thumb-[#F2F6FC] scrollbar-track-white pr-8"
+    bind:this={pane}
+  >
+    {#each messages as { id, author, message, created_at, pubkey }}
+      {@const ours = pubkey === user.pubkey}
+      {@const theirs = !ours}
+
+      {#if message}
+        <div
+          class="flex gap-2"
+          class:flex-row-reverse={theirs}
+          class:justify-end={theirs}
+          in:fadeScale={{
+            easing: cubicInOut,
+            baseScale: 0.5,
+          }}
+        >
+          <div
+            class="rounded-2xl px-4 py-2 max-w-[300px] mb-1 text-lg"
+            class:ours
+            class:theirs
+            :key={id}
+          >
+            {message}
+          </div>
+          <div class="mt-auto">
+            <Avatar user={author} size={"12"} />
+          </div>
+        </div>
+        <div class="text-sm text-gray-400 mb-6" class:text-right={ours}>
+          {format(new Date(created_at * 1000), "MMM d")},
+          {format(new Date(created_at * 1000), "h:mm aa")}
+        </div>
+      {/if}
+    {/each}
+  </div>
+
+  <form
+    method="POST"
+    class="w-full border rounded-xl outline-none gap-4 flex p-0 pr-2"
+    on:submit|preventDefault={submit}
+  >
+    <input type="hidden" name="requester_id" value={user.id} />
+    <input type="hidden" name="recipient" value={recipient.username} />
+
+    <div
+      use:focus
+      contenteditable
+      class="grow break-all py-4 outline-none mt-0 pl-4"
+      bind:innerHTML={message}
+      on:keydown={keydown}
+    />
+    <button type="submit" class="my-auto shrink-0">
+      <Icon icon="send" style="w-8" />
+    </button>
+  </form>
+</div>
+
+<style>
+  .ours {
+    @apply bg-gradient-to-r from-[#F2F6FC] to-[#E1E3FF] text-black rounded-br-none ml-auto;
+  }
+
+  .theirs {
+    @apply bg-gray-100 text-black rounded-bl-none;
+  }
+</style>
diff --git a/src/routes/(app)/pay/[username]/[...amount]/+page.server.ts b/src/routes/(app)/pay/[username]/[...amount]/+page.server.ts
index e9a0ec9e..7ccc23b0 100644
--- a/src/routes/(app)/pay/[username]/[...amount]/+page.server.ts
+++ b/src/routes/(app)/pay/[username]/[...amount]/+page.server.ts
@@ -29,7 +29,7 @@ export async function load({ cookies, params, parent }) {
       auth(cookies)
     );
 
-    redirect(307, `/${username}/invoice/${id}`);
+    redirect(307, `/invoice/${id}`);
   }
 
   return { amount, rate, subject };
diff --git a/src/routes/(app)/pay/[username]/[...amount]/+page.svelte b/src/routes/(app)/pay/[username]/[...amount]/+page.svelte
index 1652952a..f45218ea 100644
--- a/src/routes/(app)/pay/[username]/[...amount]/+page.svelte
+++ b/src/routes/(app)/pay/[username]/[...amount]/+page.svelte
@@ -3,7 +3,6 @@
   import { goto } from "$app/navigation";
   import { pin } from "$lib/store";
   import { enhance } from "$app/forms";
-  import AppHeader from "$comp/AppHeader.svelte";
   import Avatar from "$comp/Avatar.svelte";
   import Icon from "$comp/Icon.svelte";
   import Numpad from "$comp/Numpad.svelte";
@@ -33,7 +32,7 @@
     rate = fiat ? (sats * amountFiat) / amount : r;
 
     let id;
-    ({ id, hash } = await post(`/${subject.username}/invoice`, {
+    ({ id, hash } = await post(`/invoice`, {
       invoice: {
         amount,
         rate: rates[subject.currency],
@@ -56,8 +55,6 @@
   };
 </script>
 
-<AppHeader {data} />
-
 {#if form?.message}
   <div class="text-red-600 text-center">
     {form.message}
diff --git a/src/routes/(app)/payment/[id]/+page.svelte b/src/routes/(app)/payment/[id]/+page.svelte
index ea07be14..9a278049 100644
--- a/src/routes/(app)/payment/[id]/+page.svelte
+++ b/src/routes/(app)/payment/[id]/+page.svelte
@@ -96,7 +96,7 @@
   });
 </script>
 
-<a href={`/${username}/payments`}>
+<a href={`/payments`}>
   <button class="ml-5 md:ml-20 mt-5 md:mt-10 hover:opacity-80">
     <Icon icon="arrow-left" style="w-10" />
   </button>
diff --git a/src/routes/(app)/payments/[...page]/+page.server.ts b/src/routes/(app)/payments/[...page]/+page.server.ts
new file mode 100644
index 00000000..c2cd5683
--- /dev/null
+++ b/src/routes/(app)/payments/[...page]/+page.server.ts
@@ -0,0 +1,28 @@
+import { get, auth } from "$lib/utils";
+
+let limit = 25;
+
+export async function load({ cookies, depends, params }) {
+  depends("app:payments");
+
+  let parts = params.page.split("/");
+
+  let start, end, page;
+  if (parts.length === 1) [page] = parts;
+  if (parts.length === 2) [start, page] = parts;
+  if (parts.length === 3) [start, end, page] = parts;
+  if (!parseInt(page)) page = 1;
+
+  let offset = (page - 1) * limit;
+  if (!start) start = Date.now() / 1000 - 24 * 60 * 60;
+
+  let url = `/payments?account=${params.account}&start=${
+    start * 1000
+  }&limit=${limit}&offset=${offset}`;
+  if (end) url += `&end=${end * 1000}`;
+
+  let { count, payments, incoming, outgoing } = await get(url, auth(cookies));
+  let pages = new Array(Math.ceil(count / limit));
+
+  return { payments, page, pages, start, end, incoming, outgoing };
+}
diff --git a/src/routes/(app)/payments/[...page]/+page.svelte b/src/routes/(app)/payments/[...page]/+page.svelte
new file mode 100644
index 00000000..b7ea7b6e
--- /dev/null
+++ b/src/routes/(app)/payments/[...page]/+page.svelte
@@ -0,0 +1,315 @@
+<script>
+  import Avatar from "$comp/Avatar.svelte";
+  import Icon from "$comp/Icon.svelte";
+  import { onMount } from "svelte";
+  import { format } from "date-fns";
+  import { newPayment } from "$lib/store";
+  import { t } from "$lib/translations";
+  import { get, f, s, sat, sats, types } from "$lib/utils";
+  import { page } from "$app/stores";
+  import { differenceInDays, getUnixTime, sub } from "date-fns";
+  import { goto, invalidate } from "$app/navigation";
+
+  export let data;
+
+  let { start, end, user, rates, payments } = data;
+
+  let change = ({ target: { value } }) => goto(value);
+  let link = (p) => {
+    if (p.pot) return `/pot/${p.pot}`;
+    if (p.with) return "/" + p.with.username;
+    return `/p/${p.id}`;
+  };
+
+  $: presets = [
+    {
+      title: $t("payments.day"),
+      start: sub(new Date(), { days: 1 }),
+      end: null,
+    },
+    {
+      title: $t("payments.week"),
+      start: sub(new Date(), { days: 7 }),
+      end: null,
+    },
+    {
+      title: $t("payments.month"),
+      start: sub(new Date(), { months: 1 }),
+      end: null,
+    },
+    {
+      title: $t("payments.all"),
+      start: sub(new Date(), { years: 5 }),
+      end: null,
+    },
+  ];
+
+  $: selection = start
+    ? presets.findIndex(
+        (p) => Math.abs(differenceInDays(new Date(start * 1000), p.start)) < 1
+      )
+    : 0;
+
+  let p,
+    incoming,
+    outgoing,
+    pages = [];
+  $: data &&
+    ({ page: p, pages, start, end, incoming, outgoing, payments } = data);
+
+  $: $page && ($newPayment = false);
+  $: $newPayment && invalidate(`/users/${user.username}`);
+
+  $: path = $page.params.page
+    ? $page.url.pathname.substring(0, $page.url.pathname.lastIndexOf("/"))
+    : $page.url.pathname;
+
+  let csv = async () => {
+    let url = `/payments`;
+    if (start) url += `/${start}`;
+    if (end) url += `/${end}`;
+
+    let { payments } = await get(url);
+
+    payments = payments.map((p) => ({
+      ...p,
+      created: new Date(p.created),
+      total: p.amount + (p.tip || 0),
+      platform_fee: p.ourfee,
+      amount_fiat: f((p.amount * p.rate) / sats, p.currency),
+      fee_fiat: p.fee ? f((p.fee * p.rate) / sats, p.currency) : null,
+      platform_fee_fiat: p.ourfee ? f((p.ourfee * p.rate) / sats, p.currency) : null,
+      tip_fiat: p.tip ? f((p.tip * p.rate) / sats, p.currency) : null,
+      total_fiat: f(((p.amount + (p.tip || 0)) * p.rate) / sats, p.currency),
+    }));
+
+    let keys = [
+      "type",
+      "id",
+      "created",
+      "rate",
+      "currency",
+      "amount",
+      "tip",
+      "total",
+      "fee",
+      "platform_fee",
+      "amount_fiat",
+      "tip_fiat",
+      "total_fiat",
+      "fee_fiat",
+      "platform_fee_fiat",
+    ];
+
+    let csv =
+      keys.map((k) => `"${k}"`).join(",") +
+      "\n" +
+      payments
+        .map((r) => keys.map((k) => `"${r[k] || ""}"`).join(","))
+        .join("\n");
+
+    let filename = "payments.csv";
+    let blob = new Blob([csv], { type: "text/csv;charset=utf-8;" });
+    if (navigator.msSaveBlob) {
+      navigator.msSaveBlob(blob, filename);
+    } else {
+      let link = document.createElement("a");
+      if (link.download !== undefined) {
+        let url = URL.createObjectURL(blob);
+        link.setAttribute("href", url);
+        link.setAttribute("download", filename);
+        link.style.visibility = "hidden";
+        document.body.appendChild(link);
+        link.click();
+        document.body.removeChild(link);
+      }
+    }
+  };
+</script>
+
+<div class="mt-24 mb-20 payments">
+  <h1 class="px-3 md:px-0 text-center text-3xl md:text-4xl font-semibold mb-10">
+    {$t("payments.header")}
+  </h1>
+
+  <div class="container w-full mx-auto text-lg px-4 max-w-xl space-y-5">
+    <div class="flex text-md text-secondary relative">
+      <div class="mx-auto flex justify-center w-full gap-1">
+        {#each presets as { start, end, title }, i}
+          <a
+            class:active={selection === i}
+            href={`/payments/${getUnixTime(start) + "/"}1`}
+          >
+            <button
+              class="text-sm md:text-lg rounded-full border py-2 px-4 hover:opacity-80 min-w-[72px]"
+            >
+              <div class="my-auto">{title}</div>
+            </button>
+          </a>
+        {/each}
+      </div>
+    </div>
+
+    <div class="flex flex-wrap justify-center mb-8">
+      {#if pages.length > 1}
+        {#each pages as _, i}
+          <a
+            class="mr-1 last:mr-0"
+            href={`${path}/${i + 1}`}
+            class:active={parseInt(p) === i + 1}
+          >
+            <div
+              class="border py-2 rounded-full border-2 w-12 h-12 hover:opacity-80 text-center"
+            >
+              {i + 1}
+            </div>
+          </a>
+        {/each}
+      {/if}
+    </div>
+
+    <div class="text-base">
+      {#each payments as p}
+        <a href={`/payment/${p.id}`}>
+          <div class="grid grid-cols-12 border-b h-24 hover:bg-gray-100 px-4">
+            <div class="whitespace-nowrap my-auto col-span-3">
+              <div class="font-bold" class:text-red-800={p.amount < 0}>
+                {f(Math.abs(p.amount) * (p.rate / sats), p.currency)}
+                {#if p.tip}
+                  <span class="text-sm text-secondary">
+                    +{Math.round((p.tip / Math.abs(p.amount)) * 100)}%
+                  </span>
+                {/if}
+              </div>
+
+              <div class="text-secondary">
+                {sat(Math.abs(p.amount) + (p.tip || 0))}
+              </div>
+            </div>
+
+            <div
+              class="flex my-auto col-span-5 truncate text-ellipsis overflow-hidden mx-auto"
+            >
+              {#if p.type === types.pot}
+                <a href={`/pot/${p.memo}`}>
+                  <div class="text-secondary flex">
+                    <div class="my-auto mr-1">
+                      <img src="/images/moneypot.png" class="w-12" alt="Pot" />
+                    </div>
+
+                    <div class="my-auto">Pot</div>
+                  </div>
+                </a>
+              {:else if p.with}
+                <div class="flex">
+                  <div class="my-auto">
+                    <Avatar user={p.with} size={12} disabled={true} />
+                  </div>
+                  <div class="my-auto ml-1 text-secondary">
+                    {p.with.username}
+                  </div>
+                </div>
+              {:else}
+                <div class="text-secondary flex">
+                  {#if [types.ecash, types.lightning].includes(p.type)}
+                    <div class="text-3xl">⚡️</div>
+                  {:else if p.type === types.bitcoin}
+                    <div class="my-auto mr-1">
+                      <img
+                        src="/images/bitcoin.svg"
+                        class="w-12 border-4 border-transparent"
+                        alt="Bitcoin"
+                      />
+                    </div>
+                  {:else if p.type === types.liquid}
+                    <div class="my-auto mr-1">
+                      <img
+                        src="/images/liquid.svg"
+                        class="w-12 border-4 border-transparent"
+                        alt="Liquid"
+                      />
+                    </div>
+                  {/if}
+
+                  <div class="my-auto">
+                    {p.amount > 0
+                      ? p.confirmed
+                        ? "Received"
+                        : "Pending"
+                      : "Sent"}
+                  </div>
+                </div>
+              {/if}
+            </div>
+
+            <div class="text-secondary text-right text-sm my-auto col-span-3">
+              <div>
+                {format(new Date(p.created), "h:mm aaa")}
+              </div>
+              <div>
+                {format(new Date(p.created), "MMM d, yy")}
+              </div>
+            </div>
+          </div>
+        </a>
+      {:else}
+        <p class="text-secondary text-lg text-center">{$t("payments.empty")}</p>
+      {/each}
+    </div>
+
+    <div class="grid grid-cols-3 w-full text-center text-lg">
+      {#each Object.keys(incoming) as c}
+        <span class="text-base text-secondary text-left"></span>
+        <!-- <span class="text-base text-secondary" -->
+        <!--   >{$t("payments.subtotal")}</span -->
+        <!-- > -->
+        <span class="text-base text-secondary">
+          {#if tipsIn || tipsOut}{$t("payments.tips")}{/if}
+        </span>
+        <span class="text-base text-secondary"
+          >{$t("payments.total")}</span
+        >
+
+        {@const totalIn = incoming[c]?.fiat || 0}
+        {@const tipsIn = incoming[c]?.fiatTips || 0}
+        {@const subtotalIn = totalIn - tipsIn}
+
+        {@const totalOut = -outgoing[c]?.fiat || 0}
+        {@const tipsOut = outgoing[c]?.fiatTips || 0}
+        {@const subtotalOut = totalOut - tipsOut}
+
+        <span class="text-left text-base text-secondary"
+          >{$t("payments.income")}</span
+        >
+        <!-- <span><b>{subtotalIn ? f(subtotalIn, c) : "-"}</b></span> -->
+        <span><b>{tipsIn ? f(tipsIn, c) : "-"}</b></span>
+        <span><b>{totalIn ? f(totalIn, c) : "-"}</b></span>
+
+        <span class="text-left text-base text-secondary"
+          >{$t("payments.expenditure")}</span
+        >
+        <!-- <span><b>{subtotalOut ? f(subtotalOut, c) : "-"}</b></span> -->
+        <span><b>{tipsOut ? f(tipsOut, c) : "-"}</b></span>
+        <span><b>{totalOut ? f(totalOut, c) : "-"}</b></span>
+      {/each}
+    </div>
+
+    <button
+      class="ml-auto rounded-full border py-2 px-4 w-36 hover:opacity-80 flex mx-auto"
+      on:click={csv}
+    >
+      <Icon icon="save" style="opacity-50 mr-2 my-auto" />
+      <div class="my-auto">{$t("payments.export")}</div>
+    </button>
+  </div>
+</div>
+
+<style>
+  .active * {
+    @apply bg-black text-white border-black;
+  }
+
+  .payments {
+    view-transition-name: payments;
+  }
+</style>
diff --git a/src/routes/(app)/payments/[...page]/+server.ts b/src/routes/(app)/payments/[...page]/+server.ts
new file mode 100644
index 00000000..a81faaf3
--- /dev/null
+++ b/src/routes/(app)/payments/[...page]/+server.ts
@@ -0,0 +1,18 @@
+import { get, auth } from "$lib/utils";
+import { json } from "@sveltejs/kit";
+
+export async function GET({ cookies, params }) {
+  let parts = params.page.split("/");
+
+  let start, end;
+  if (parts.length === 1) [start] = parts;
+  if (parts.length === 2) [start, end] = parts;
+
+  if (!start) start = Date.now() / 1000 - 24 * 60 * 60;
+
+  let url = `/payments?start=${start * 1000}`;
+  if (end) url += `&end=${end * 1000}`;
+
+  let { payments } = await get(url, auth(cookies));
+  return json({ payments });
+}
diff --git a/src/routes/(app)/receive/[...token]/+page.svelte b/src/routes/(app)/receive/[...token]/+page.svelte
index 2fd4b879..7ff93fa9 100644
--- a/src/routes/(app)/receive/[...token]/+page.svelte
+++ b/src/routes/(app)/receive/[...token]/+page.svelte
@@ -5,7 +5,6 @@
   import { tick } from "svelte";
   import { browser } from "$app/environment";
   import { t } from "$lib/translations";
-  import AppHeader from "$comp/AppHeader.svelte";
   import Avatar from "$comp/Avatar.svelte";
   import Icon from "$comp/Icon.svelte";
   import Spinner from "$comp/Spinner.svelte";
@@ -30,7 +29,6 @@
 
 <svelte:window bind:innerWidth={w} />
 
-<AppHeader {data} />
 <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")}
diff --git a/src/routes/(app)/register/+page.server.ts b/src/routes/(app)/register/+page.server.ts
deleted file mode 100644
index 731530c4..00000000
--- a/src/routes/(app)/register/+page.server.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import { fail, redirect } from "@sveltejs/kit";
-import { fd, post, login } from "$lib/utils";
-
-export const load = async ({ parent }) => {
-  let { user } = await parent();
-  if (user) redirect(307, `/${user.username}`);
-
-  let index = Math.floor(Math.random() * 64) + 1;
-
-  return { index };
-};
-
-export const actions = {
-  default: async ({ cookies, request }) => {
-    let ip = request.headers.get("cf-connecting-ip");
-
-    let form = await fd(request);
-    let { profile, username, password, cipher, salt, pubkey, loginRedirect } =
-      form;
-    let user = { profile, username, password, cipher, salt, pubkey };
-    let error;
-
-    if (loginRedirect === "undefined") loginRedirect = undefined;
-    
-    try {
-      await post("/register", { user }, { "cf-connecting-ip": ip });
-    } catch (e: any) {
-      error = e.message;
-    }
-
-    try {
-      await login(user, cookies, ip);
-      error = null;
-    } catch (e: any) {
-      error ||= e.message;
-    }
-
-    if (error) return fail(400, { error });
-    redirect(307, loginRedirect || `/${user.username}`);
-  },
-};
diff --git a/src/routes/(app)/register/+page.svelte b/src/routes/(app)/register/+page.svelte
deleted file mode 100644
index 0a761228..00000000
--- a/src/routes/(app)/register/+page.svelte
+++ /dev/null
@@ -1,314 +0,0 @@
-<script>
-  import punks from "$lib/punks";
-  import { upload } from "$lib/upload";
-  import { afterNavigate, invalidateAll } from "$app/navigation";
-  import { applyAction, deserialize } from "$app/forms";
-  import { tick } from "svelte";
-  import { fly } from "svelte/transition";
-  import { enhance } from "$app/forms";
-
-  import Pin from "$comp/Pin.svelte";
-  import Icon from "$comp/Icon.svelte";
-  import Spinner from "$comp/Spinner.svelte";
-
-  import { focus, fail } from "$lib/utils";
-  import { avatar, password, loginRedirect } from "$lib/store";
-  import { t } from "$lib/translations";
-  import { page } from "$app/stores";
-  import { generate } from "$lib/nostr";
-  import {
-    NumberDictionary,
-    uniqueNamesGenerator,
-    colors,
-    adjectives,
-    animals,
-  } from "unique-names-generator";
-
-  export let form;
-  export let data;
-
-  $: data && ($avatar = undefined);
-  let username;
-  let { index } = data;
-
-  let cleared;
-  let clear = () => {
-    if (!cleared) {
-      cleared = true;
-      username = "";
-      $password = "";
-      revealPassword = false;
-    }
-  };
-
-  let refresh = async () => {
-    username = uniqueNamesGenerator({
-      dictionaries: [animals, NumberDictionary.generate({ min: 10, max: 99 })],
-      length: 2,
-      separator: "",
-    });
-
-    $password = uniqueNamesGenerator({
-      dictionaries: [colors, NumberDictionary.generate({ min: 100, max: 999 })],
-      length: 2,
-      separator: "",
-    });
-
-    revealPassword = true;
-  };
-
-  afterNavigate(async () => {
-    try {
-      await invalidateAll();
-    } catch (e) {
-      console.log(e);
-    }
-  });
-
-  let token, formElement;
-  let code = [];
-  let redirect;
-
-  $: need2fa = form?.message === "2fa";
-  let cancel = () => (need2fa = false);
-  $: if (form?.message === "2fa" && form.token === token) token = "";
-
-  let email, btn;
-
-  $: update(form);
-  let update = (form) => form && ({ username, password: $password } = form);
-
-  $: token && token?.length === 6 && tick().then(() => btn.click());
-
-  let revealPassword;
-
-  let loading;
-  async function handleSubmit(e) {
-    loading = true;
-
-    let data = new FormData(this);
-    let user = Object.fromEntries(data);
-    await generate(user);
-
-    for (let k in user) {
-      data.set(k, user[k]);
-    }
-
-    data.set("profile", punks[index]);
-    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 uploading avatar", e);
-      }
-    }
-
-    const response = await fetch("/register", {
-      method: "POST",
-      body: data,
-    });
-
-    const result = deserialize(await response.text());
-
-    if (result.type === "success") {
-      await invalidateAll();
-    }
-
-    applyAction(result);
-    loading = false;
-  }
-
-  let avatarInput;
-  $: src = `/api/public/${punks[index]}.webp`;
-  let decr = () => (index = index <= 0 ? 63 : index - 1);
-  let incr = () => (index = index >= 63 ? 0 : index + 1);
-  let selectAvatar = () => avatarInput.click();
-
-  let progress;
-  let handleFile = async ({ target }) => {
-    let type = "profile";
-    let file = target.files[0];
-    if (!file) return;
-
-    if (file.size > 10000000) form.error = "File too large";
-    $avatar = { file, type, progress };
-
-    var reader = new FileReader();
-    reader.onload = async (e) => {
-      src = e.target.result;
-    };
-
-    reader.readAsDataURL(file);
-  };
-</script>
-
-{#if need2fa}
-  <Pin bind:value={token} title="Enter 2FA Code" {cancel} notify={false} />
-{/if}
-
-<div class="pt-4">
-  <div class="w-[243px] mx-auto">
-    <a href="/">
-      <Icon icon="logo" />
-    </a>
-  </div>
-
-  <div class="flex justify-center items-center">
-    <div
-      class="shadow-xl rounded-3xl p-4 pt-0 space-y-5 w-full mx-5 md:mx-0 md:w-[400px]"
-    >
-      <input
-        type="file"
-        class="hidden"
-        bind:this={avatarInput}
-        on:change={(e) => handleFile(e, "profile")}
-      />
-
-      <div class="relative">
-        <button
-          class="absolute w-8 h-12 left-12 bg-white rounded top-12"
-          on:click={decr}
-        >
-          <Icon icon="chevron-left" style="w-8 " />
-        </button>
-        <button
-          class="block relative w-32 mx-auto"
-          on:click={selectAvatar}
-        >
-          <button
-            class="w-32 h-32 rounded-full border-4 border-white overflow-hidden flex mx-auto relative"
-          >
-            <img
-              {src}
-              class="w-full h-full object-cover object-center overflow-hidden"
-              alt={username}
-            />
-          </button>
-          <button
-            class="absolute bg-white rounded-full p-2 mx-auto right-0 bottom-0 z-10 bg-opacity-80"
-          >
-            <Icon icon="upload" style="w-8" />
-          </button>
-        </button>
-        <button
-          class="absolute w-8 h-12 right-12 bg-white rounded top-12"
-          on:click={incr}
-        >
-          <Icon icon="chevron-left" style="w-8 rotate-180" />
-        </button>
-      </div>
-
-      {#if form?.error}
-        <div class="text-red-600 text-center" in:fly>
-          {form.error}
-        </div>
-      {/if}
-
-      <form
-        class="space-y-5"
-        on:submit|preventDefault={handleSubmit}
-        method="POST"
-      >
-        <input
-          type="hidden"
-          name="loginRedirect"
-          value={$loginRedirect || $page.url.searchParams.get("redirect")}
-        />
-        <input type="hidden" name="token" value={token} />
-
-        <div class="relative">
-          <label for="username" class="font-semibold"
-            >{$t("login.username")}</label
-          >
-          <input
-            use:focus
-            name="username"
-            type="text"
-            required
-            class="bg-primary"
-            bind:value={username}
-            on:focus={clear}
-            autocapitalize="none"
-          />
-          <button
-            tabindex="-1"
-            type="button"
-            on:click={refresh}
-            class="absolute right-0 top-4"
-          >
-            <Icon icon="random" style="w-10 m-4" />
-          </button>
-        </div>
-
-        <div class="relative">
-          <label for="password" class="block font-semibold"
-            >{$t("login.password")}</label
-          >
-          {#if revealPassword}
-            <input
-              name="password"
-              type="text"
-              required
-              class="bg-primary"
-              bind:value={$password}
-              autocapitalize="none"
-            />
-          {:else}
-            <input
-              name="password"
-              type="password"
-              required
-              class="bg-primary"
-              bind:value={$password}
-              autocapitalize="none"
-              on:focus={clear}
-            />
-          {/if}
-          <button
-            type="button"
-            tabindex="-1"
-            on:click={() => (revealPassword = !revealPassword)}
-            class="absolute right-0 top-4"
-          >
-            <Icon icon={revealPassword ? "eye" : "eye-off"} style="m-6" />
-          </button>
-        </div>
-
-        <p class="text-secondary text-sm">
-          {$t("login.passwordRecommendation")}
-        </p>
-
-        <button
-          type="submit"
-          class="bg-black text-white w-full rounded-2xl p-4 font-semibold hover:opacity-80"
-          disabled={loading}
-          bind:this={btn}
-        >
-          {#if loading}
-            <Spinner />
-          {:else}
-            {$t("login.register")}
-          {/if}
-        </button>
-      </form>
-
-      <p class="text-secondary text-center font-medium">
-        {$t("login.haveAccount")}
-        <a
-          href={"/login"}
-          class="block md:inline text-black underline underline-offset-4 hover:opacity-80"
-        >
-          {$t("login.signIn")}
-        </a>
-      </p>
-    </div>
-  </div>
-</div>
diff --git a/src/routes/(app)/send/[...text]/+page.svelte b/src/routes/(app)/send/[...text]/+page.svelte
index 780f70c1..d1b6cc23 100644
--- a/src/routes/(app)/send/[...text]/+page.svelte
+++ b/src/routes/(app)/send/[...text]/+page.svelte
@@ -5,7 +5,6 @@
   import { tick } from "svelte";
   import { browser } from "$app/environment";
   import { t } from "$lib/translations";
-  import AppHeader from "$comp/AppHeader.svelte";
   import Avatar from "$comp/Avatar.svelte";
   import Icon from "$comp/Icon.svelte";
   import Spinner from "$comp/Spinner.svelte";
@@ -31,7 +30,6 @@
 
 <svelte:window bind:innerWidth={w} />
 
-<AppHeader {data} />
 <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.send")}
diff --git a/src/routes/(app)/send/invoice/[id]/+page.server.ts b/src/routes/(app)/send/invoice/[id]/+page.server.ts
index ed0198cf..fa7d28dd 100644
--- a/src/routes/(app)/send/invoice/[id]/+page.server.ts
+++ b/src/routes/(app)/send/invoice/[id]/+page.server.ts
@@ -7,15 +7,15 @@ export async function load({ params: { id }, parent }) {
   let invoice = await get(`/invoice/${id}`);
 
   if (invoice.prompt && invoice.tip === null)
-    redirect(307, `/${invoice.user.username}/invoice/${id}/tip`);
+    redirect(307, `/invoice/${id}/tip`);
 
   if (invoice.memoPrompt && invoice.memo === null)
-    redirect(307, `/${invoice.user.username}/invoice/${id}/memo`);
+    redirect(307, `/invoice/${id}/memo`);
 
   if (invoice.user.username === user?.username)
     error(500, { message: "Cannot send to self" });
 
-  if (!user) redirect(307, `/${invoice.user.username}/invoice/${id}`);
+  if (!user) redirect(307, `/invoice/${id}`);
 
   return { invoice, rates, user };
 }
diff --git a/src/routes/(app)/send/invoice/[id]/+page.svelte b/src/routes/(app)/send/invoice/[id]/+page.svelte
index 81a2c521..75e4e75a 100644
--- a/src/routes/(app)/send/invoice/[id]/+page.svelte
+++ b/src/routes/(app)/send/invoice/[id]/+page.svelte
@@ -52,7 +52,7 @@
   let toggle = () => (submitting = !submitting);
 
   let external = async () => {
-    let { id } = await post(`/${recipient.username}/invoice`, {
+    let { id } = await post(`/invoice`, {
       invoice: {
         ...invoice,
         type: "lightning",
@@ -62,7 +62,7 @@
       user: { username: recipient.username },
     });
 
-    goto(`/${recipient.username}/invoice/${id}?options=true`, {
+    goto(`/invoice/${id}?options=true`, {
       invalidateAll: true,
     });
   };
diff --git a/src/routes/(app)/sent/+page.svelte b/src/routes/(app)/sent/+page.svelte
index 136bd395..12e13c41 100644
--- a/src/routes/(app)/sent/+page.svelte
+++ b/src/routes/(app)/sent/+page.svelte
@@ -43,7 +43,7 @@
   </h3>
 </div>
 
-<a href={`/${username}/payments`} use:focus>
+<a href={`/payments`} use:focus>
   <div class="opacity-0 w-screen h-screen fixed top-0 left-0 z-50" />
 </a>
 
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>
diff --git a/src/routes/(app)/support/+page.svelte b/src/routes/(app)/support/+page.svelte
deleted file mode 100644
index ad31ad1a..00000000
--- a/src/routes/(app)/support/+page.svelte
+++ /dev/null
@@ -1,139 +0,0 @@
-<script>
-  import { onDestroy } from "svelte";
-  import { fail, success, post } from "$lib/utils";
-  import { scale } from "svelte/transition";
-  import AppHeader from "$comp/AppHeader.svelte";
-  import Icon from "$comp/Icon.svelte";
-  import { t } from "$lib/translations";
-
-  export let data;
-
-  let { user } = data;
-  $: if (user) {
-    data.subject = { ...user };
-  }
-
-  let email;
-  let message;
-  let sent;
-  let recaptchaSiteKey = "6LfCd8YkAAAAANmVJgzN3SQY3n3fv1RhiS5PgMYM";
-
-  let submit = (e) => {
-    e.preventDefault();
-    grecaptcha.ready(() => {
-      grecaptcha.execute(recaptchaSiteKey, { action: "submit" }).then((token) =>
-        post("/support", { username: user?.username, email, message, token })
-          .then(() => (sent = true))
-          .catch(() => fail("problem submitting"))
-      );
-    });
-  };
-
-  onDestroy(() => {
-    const nodeBadge = document.querySelector(".grecaptcha-badge");
-    if (nodeBadge) {
-      document.body.removeChild(nodeBadge.parentNode);
-    }
-
-    const scriptSelector =
-      "script[src='https://www.google.com/recaptcha/api.js?render=" +
-      recaptchaSiteKey +
-      "']";
-    const script = document.querySelector(scriptSelector);
-    if (script) {
-      script.remove();
-    }
-  });
-</script>
-
-<svelte:head
-  ><script
-    src="https://www.google.com/recaptcha/api.js?render=6LfCd8YkAAAAANmVJgzN3SQY3n3fv1RhiS5PgMYM"
-  ></script></svelte:head
->
-
-{#if user}
-  <AppHeader {data} />
-{/if}
-
-<div class="container px-4 max-w-lg mx-auto mt-20 space-y-8">
-  {#if sent}
-    <h1 class="text-center text-3xl md:text-4xl font-semibold">Thank you!</h1>
-    <div class="text-center text-lg text-secondary">
-      Someone will be in touch shortly.
-    </div>
-
-    <div>
-      <a href={user ? `/${user.username}` : "/"}>
-        <button
-          class="rounded-full border py-2 px-5 font-bold hover:opacity-80 w-full bg-black text-white"
-          >Ok</button
-        >
-      </a>
-    </div>
-  {:else}
-    <h1 class="text-center text-3xl md:text-4xl font-semibold mb-8">
-      {$t("user.support.header")}
-    </h1>
-
-    <p class="text-secondary text-lg">
-      Fill out this form or email us directly at <a
-        class="underline"
-        href="mailto:support@coinos.io">support@coinos.io</a
-      > and we'll do our best to get back to you in a timely manner.
-    </p>
-
-    <form on:submit={submit}>
-      <div class="mb-4">
-        <label for="account" class="font-semibold"
-          >{$t("user.support.accountName")}</label
-        >
-        <input
-          class="bg-primary"
-          type="text"
-          name="account"
-          required
-          value={user?.username || ""}
-        />
-      </div>
-
-      <div class="mb-4">
-        <label for="email" class="font-semibold"
-          >{$t("user.support.email")}</label
-        >
-        <input
-          class="bg-primary"
-          type="email"
-          name="email"
-          bind:value={email}
-          required
-        />
-      </div>
-
-      <div class="mb-4">
-        <label for="message" class="font-semibold"
-          >{$t("user.support.message")}</label
-        >
-        <textarea
-          rows={5}
-          class="bg-primary"
-          type="text"
-          name="message"
-          bind:value={message}
-          required
-        />
-      </div>
-
-      <button
-        type="submit"
-        disabled={!email || !message}
-        class="g-recaptcha {!email || !message
-          ? 'opacity-50'
-          : 'opacity-100'} bg-black text-white font-bold rounded-xl py-3 w-full mx-auto {email &&
-        message
-          ? 'hover:opacity-80'
-          : ''}">{$t("user.support.send")}</button
-      >
-    </form>
-  {/if}
-</div>
diff --git a/src/routes/(app)/support/+server.ts b/src/routes/(app)/support/+server.ts
deleted file mode 100644
index e9a16cfc..00000000
--- a/src/routes/(app)/support/+server.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { json } from "@sveltejs/kit";
-import { auth, post } from "$lib/utils";
-
-export const prerender = false;
-
-export async function POST({ cookies, request }) {
-  let result = await post("/email", await request.json(), auth(cookies));
-  return json(result);
-}
diff --git a/src/routes/(app)/verify/[code]/+page.server.ts b/src/routes/(app)/verify/[code]/+page.server.ts
new file mode 100644
index 00000000..66ef39ad
--- /dev/null
+++ b/src/routes/(app)/verify/[code]/+page.server.ts
@@ -0,0 +1,14 @@
+import { get } from "$lib/utils";
+import { redirect } from "@sveltejs/kit";
+
+export let load = async ({ params: { code } }) => {
+  let user;
+  try {
+    user = await get(`/verify/${code}`);
+  } catch (e) {
+    console.log(e);
+    return { error: "Verification failed" };
+  }
+
+  redirect(307, `/settings/account?verified=true`);
+};
diff --git a/src/routes/(app)/verify/[code]/+page.svelte b/src/routes/(app)/verify/[code]/+page.svelte
new file mode 100644
index 00000000..1e099dae
--- /dev/null
+++ b/src/routes/(app)/verify/[code]/+page.svelte
@@ -0,0 +1,35 @@
+<script>
+  import { scale } from "svelte/transition";
+  import Icon from "$comp/Icon.svelte";
+  import { t } from "$lib/translations";
+
+  export let data;
+  let { user, error } = data;
+</script>
+
+<div class="container px-4 text-center mx-auto">
+  {#if error}
+    <h1 class="text-3xl md:text-4xl font-bold mb-6">
+      Email verification failed
+    </h1>
+  {:else if user.verified}
+    <div
+      class="flex w-full py-5 max-w-[200px] mx-auto"
+      in:scale={{ start: 0.5 }}
+    >
+      <Icon icon="check" style="mx-auto" />
+    </div>
+
+    <h1 class="text-3xl md:text-4xl font-bold mb-6">
+      Email verified successfully!
+    </h1>
+  {/if}
+</div>
+
+<a href={`/${user.username}`}>
+  <div class="opacity-0 w-screen h-screen fixed top-0 left-0 z-50" />
+</a>
+
+<div class="fixed bottom-10 w-full text-center">
+  {$t("payments.tapAnywhere")}
+</div>
diff --git a/src/routes/(static)/+layout.svelte b/src/routes/(static)/+layout.svelte
index 13073d5a..4b350bd0 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-10 md:px-40 mx-auto min-h-[600px] pb-20">
+<main class="container flex px-4 md:px-40 mx-auto min-h-[600px] py-28">
   <slot />
 </main>
 <Footer />
diff --git a/src/routes/(static)/login/+page.server.ts b/src/routes/(static)/login/+page.server.ts
new file mode 100644
index 00000000..fd7fec8c
--- /dev/null
+++ b/src/routes/(static)/login/+page.server.ts
@@ -0,0 +1,29 @@
+import { fail, redirect } from "@sveltejs/kit";
+import { login, fd } from "$lib/utils";
+
+export const load = async ({ parent }) => {
+  let { user } = await parent();
+  if (user?.pubkey) redirect(307, `/${user.username}`);
+};
+
+export const actions = {
+  default: async ({ cookies, request }) => {
+    let form = await fd(request);
+    let { username, password, token, loginRedirect } = form;
+    let user = { username, password, token };
+
+    if (loginRedirect === "undefined") loginRedirect = undefined;
+
+    try {
+      await login(
+        user,
+        cookies,
+        request.headers.get("cf-connecting-ip")
+      );
+    } catch (e: any) {
+      return fail(400, { error: "Login failed", message: e.message, ...form });
+    }
+
+    redirect(307, loginRedirect || `/${user.username}`);
+  },
+};
diff --git a/src/routes/(static)/login/+page.svelte b/src/routes/(static)/login/+page.svelte
new file mode 100644
index 00000000..84e1ea89
--- /dev/null
+++ b/src/routes/(static)/login/+page.svelte
@@ -0,0 +1,171 @@
+<script>
+  import { onMount } from "svelte";
+  import { applyAction, deserialize } from "$app/forms";
+  import { tick } from "svelte";
+  import { fly } from "svelte/transition";
+  import { enhance } from "$app/forms";
+  import Pin from "$comp/Pin.svelte";
+  import Icon from "$comp/Icon.svelte";
+  import Spinner from "$comp/Spinner.svelte";
+  import { focus, fail } from "$lib/utils";
+  import { password, pin, loginRedirect } from "$lib/store";
+  import { t } from "$lib/translations";
+  import { page } from "$app/stores";
+  import { generate } from "$lib/nostr";
+  import { invalidateAll } from "$app/navigation";
+
+  onMount(() => {
+    $pin = undefined;
+    localStorage.clear();
+    sessionStorage.clear();
+
+    let lang = $page.url.searchParams.get("lang");
+    if (lang) document.cookie = `lang=${lang} ;`;
+  });
+
+  export let form;
+
+  let token, formElement;
+  let code = [];
+  let redirect;
+
+  $password = undefined;
+
+  $: need2fa = form?.message === "2fa";
+  let cancel = () => (need2fa = false);
+  $: if (form?.message === "2fa" && form.token === token) token = "";
+
+  let username, email, btn;
+
+  $: update(form);
+  let update = (form) => form && ({ username, password: $password } = form);
+
+  $: token && token?.length === 6 && tick().then(() => btn.click());
+
+  let revealPassword = false;
+
+  let loading;
+  async function handleSubmit(e) {
+    loading = true;
+
+    let data = new FormData(this);
+    let user = Object.fromEntries(data);
+    await generate(user);
+
+    for (let k in user) {
+      data.set(k, user[k]);
+    }
+
+    const response = await fetch("/login", {
+      method: "POST",
+      body: data,
+    });
+
+    const result = deserialize(await response.text());
+
+    if (result.type === "success") {
+      await invalidateAll();
+    }
+
+    applyAction(result);
+    loading = false;
+  }
+</script>
+
+{#if need2fa}
+  <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">
+  <h1 class="text-2xl font-bold text-center">{$t("login.signIn")}</h1>
+
+  {#if form?.error}
+    <div class="text-red-600 text-center" in:fly>
+      {form.error}
+    </div>
+  {/if}
+
+  <form class="space-y-5" on:submit|preventDefault={handleSubmit} method="POST">
+    <input
+      type="hidden"
+      name="loginRedirect"
+      value={$loginRedirect || $page.url.searchParams.get("redirect")}
+    />
+    <input type="hidden" name="token" value={token} />
+
+    <div>
+      <label for="username" class="font-semibold">{$t("login.username")}</label>
+      <input
+        name="username"
+        type="text"
+        required
+        class="bg-primary"
+        bind:value={username}
+        use:focus
+        autocapitalize="none"
+      />
+    </div>
+
+    <div class="relative">
+      <label for="password" class="block font-semibold"
+        >{$t("login.password")}</label
+      >
+      {#if revealPassword}
+        <input
+          name="password"
+          type="text"
+          required
+          class="bg-primary"
+          bind:value={$password}
+          autocapitalize="none"
+        />
+      {:else}
+        <input
+          name="password"
+          type="password"
+          required
+          class="bg-primary"
+          bind:value={$password}
+          autocapitalize="none"
+        />
+      {/if}
+      <button
+        type="button"
+        on:click={() => (revealPassword = !revealPassword)}
+        class="absolute right-5 top-10"
+      >
+        <Icon icon={revealPassword ? "eye" : "eye-off"} />
+      </button>
+    </div>
+
+    <div class="flex justify-end items-center">
+      <a href="/forgot" class="underline underline-offset-4 text-black"
+        >{$t("login.forgotUserOrPassword")}</a
+      >
+    </div>
+
+    <button
+      type="submit"
+      class="bg-black text-white w-full rounded-2xl p-4 font-semibold hover:opacity-80"
+      disabled={loading}
+      bind:this={btn}
+    >
+      {#if loading}
+        <Spinner />
+      {:else}
+        {$t("login.signIn")}
+      {/if}
+    </button>
+
+
+  <p class="text-secondary text-center font-medium">
+    {$t("login.noAccount")}
+    <a
+      href={"/register"}
+      class="block md:inline text-black underline underline-offset-4 hover:opacity-80"
+    >
+      {$t("login.register")}
+    </a>
+  </p>
+  </form>
+</div>
diff --git a/src/routes/(static)/register/+page.server.ts b/src/routes/(static)/register/+page.server.ts
new file mode 100644
index 00000000..731530c4
--- /dev/null
+++ b/src/routes/(static)/register/+page.server.ts
@@ -0,0 +1,41 @@
+import { fail, redirect } from "@sveltejs/kit";
+import { fd, post, login } from "$lib/utils";
+
+export const load = async ({ parent }) => {
+  let { user } = await parent();
+  if (user) redirect(307, `/${user.username}`);
+
+  let index = Math.floor(Math.random() * 64) + 1;
+
+  return { index };
+};
+
+export const actions = {
+  default: async ({ cookies, request }) => {
+    let ip = request.headers.get("cf-connecting-ip");
+
+    let form = await fd(request);
+    let { profile, username, password, cipher, salt, pubkey, loginRedirect } =
+      form;
+    let user = { profile, username, password, cipher, salt, pubkey };
+    let error;
+
+    if (loginRedirect === "undefined") loginRedirect = undefined;
+    
+    try {
+      await post("/register", { user }, { "cf-connecting-ip": ip });
+    } catch (e: any) {
+      error = e.message;
+    }
+
+    try {
+      await login(user, cookies, ip);
+      error = null;
+    } catch (e: any) {
+      error ||= e.message;
+    }
+
+    if (error) return fail(400, { error });
+    redirect(307, loginRedirect || `/${user.username}`);
+  },
+};
diff --git a/src/routes/(static)/register/+page.svelte b/src/routes/(static)/register/+page.svelte
new file mode 100644
index 00000000..b6a4c44e
--- /dev/null
+++ b/src/routes/(static)/register/+page.svelte
@@ -0,0 +1,292 @@
+<script>
+  import punks from "$lib/punks";
+  import { upload } from "$lib/upload";
+  import { afterNavigate, invalidateAll } from "$app/navigation";
+  import { applyAction, deserialize } from "$app/forms";
+  import { tick } from "svelte";
+  import { fly } from "svelte/transition";
+  import { enhance } from "$app/forms";
+
+  import Pin from "$comp/Pin.svelte";
+  import Icon from "$comp/Icon.svelte";
+  import Spinner from "$comp/Spinner.svelte";
+
+  import { focus, fail } from "$lib/utils";
+  import { avatar, password, loginRedirect } from "$lib/store";
+  import { t } from "$lib/translations";
+  import { page } from "$app/stores";
+  import { generate } from "$lib/nostr";
+  import {
+    NumberDictionary,
+    uniqueNamesGenerator,
+    colors,
+    adjectives,
+    animals,
+  } from "unique-names-generator";
+
+  export let form;
+  export let data;
+
+  $: data && ($avatar = undefined);
+  let username;
+  let { index } = data;
+
+  let cleared;
+  let clear = () => {
+    if (!cleared) {
+      cleared = true;
+      username = "";
+      $password = "";
+      revealPassword = false;
+    }
+  };
+
+  let refresh = async () => {
+    username = uniqueNamesGenerator({
+      dictionaries: [animals, NumberDictionary.generate({ min: 10, max: 99 })],
+      length: 2,
+      separator: "",
+    });
+
+    $password = uniqueNamesGenerator({
+      dictionaries: [colors, NumberDictionary.generate({ min: 100, max: 999 })],
+      length: 2,
+      separator: "",
+    });
+
+    revealPassword = true;
+  };
+
+  afterNavigate(async () => {
+    try {
+      await invalidateAll();
+    } catch (e) {
+      console.log(e);
+    }
+  });
+
+  let token, formElement;
+  let code = [];
+  let redirect;
+
+  $: need2fa = form?.message === "2fa";
+  let cancel = () => (need2fa = false);
+  $: if (form?.message === "2fa" && form.token === token) token = "";
+
+  let email, btn;
+
+  $: update(form);
+  let update = (form) => form && ({ username, password: $password } = form);
+
+  $: token && token?.length === 6 && tick().then(() => btn.click());
+
+  let revealPassword;
+
+  let loading;
+  async function handleSubmit(e) {
+    loading = true;
+
+    let data = new FormData(this);
+    let user = Object.fromEntries(data);
+    await generate(user);
+
+    for (let k in user) {
+      data.set(k, user[k]);
+    }
+
+    data.set("profile", punks[index]);
+    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 uploading avatar", e);
+      }
+    }
+
+    const response = await fetch("/register", {
+      method: "POST",
+      body: data,
+    });
+
+    const result = deserialize(await response.text());
+
+    if (result.type === "success") {
+      await invalidateAll();
+    }
+
+    applyAction(result);
+    loading = false;
+  }
+
+  let avatarInput;
+  $: src = `/api/public/${punks[index]}.webp`;
+  let decr = () => (index = index <= 0 ? 63 : index - 1);
+  let incr = () => (index = index >= 63 ? 0 : index + 1);
+  let selectAvatar = () => avatarInput.click();
+
+  let progress;
+  let handleFile = async ({ target }) => {
+    let type = "profile";
+    let file = target.files[0];
+    if (!file) return;
+
+    if (file.size > 10000000) form.error = "File too large";
+    $avatar = { file, type, progress };
+
+    var reader = new FileReader();
+    reader.onload = async (e) => {
+      src = e.target.result;
+    };
+
+    reader.readAsDataURL(file);
+  };
+</script>
+
+{#if need2fa}
+  <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 space-y-5"
+>
+  <h1 class="text-2xl font-bold text-center">{$t("login.createAccount")}</h1>
+  <input
+    type="file"
+    class="hidden"
+    bind:this={avatarInput}
+    on:change={(e) => handleFile(e, "profile")}
+  />
+
+  <div class="relative">
+    <button
+      class="absolute w-8 h-12 left-12 bg-white rounded top-12"
+      on:click={decr}
+    >
+      <Icon icon="chevron-left" style="w-8 " />
+    </button>
+    <button class="block relative w-32 mx-auto" on:click={selectAvatar}>
+      <button
+        class="w-32 h-32 rounded-full border-4 border-white overflow-hidden flex mx-auto relative"
+      >
+        <img
+          {src}
+          class="w-full h-full object-cover object-center overflow-hidden"
+          alt={username}
+        />
+      </button>
+      <button
+        class="absolute bg-white rounded-full p-2 mx-auto right-0 bottom-0 z-10 bg-opacity-80"
+      >
+        <Icon icon="upload" style="w-8" />
+      </button>
+    </button>
+    <button
+      class="absolute w-8 h-12 right-12 bg-white rounded top-12"
+      on:click={incr}
+    >
+      <Icon icon="chevron-left" style="w-8 rotate-180" />
+    </button>
+  </div>
+
+  {#if form?.error}
+    <div class="text-red-600 text-center" in:fly>
+      {form.error}
+    </div>
+  {/if}
+
+  <form class="space-y-5" on:submit|preventDefault={handleSubmit} method="POST">
+    <input
+      type="hidden"
+      name="loginRedirect"
+      value={$loginRedirect || $page.url.searchParams.get("redirect")}
+    />
+    <input type="hidden" name="token" value={token} />
+
+    <div class="relative">
+      <label for="username" class="font-semibold">{$t("login.username")}</label>
+      <input
+        use:focus
+        name="username"
+        type="text"
+        required
+        class="bg-primary"
+        bind:value={username}
+        on:focus={clear}
+        autocapitalize="none"
+      />
+      <button
+        tabindex="-1"
+        type="button"
+        on:click={refresh}
+        class="absolute right-0 top-4"
+      >
+        <Icon icon="random" style="w-10 m-4" />
+      </button>
+    </div>
+
+    <div class="relative">
+      <label for="password" class="block font-semibold"
+        >{$t("login.password")}</label
+      >
+      {#if revealPassword}
+        <input
+          name="password"
+          type="text"
+          required
+          class="bg-primary"
+          bind:value={$password}
+          autocapitalize="none"
+        />
+      {:else}
+        <input
+          name="password"
+          type="password"
+          required
+          class="bg-primary"
+          bind:value={$password}
+          autocapitalize="none"
+          on:focus={clear}
+        />
+      {/if}
+      <button
+        type="button"
+        tabindex="-1"
+        on:click={() => (revealPassword = !revealPassword)}
+        class="absolute right-0 top-4"
+      >
+        <Icon icon={revealPassword ? "eye" : "eye-off"} style="m-6" />
+      </button>
+    </div>
+
+    <button
+      type="submit"
+      class="bg-black text-white w-full rounded-2xl p-4 font-semibold hover:opacity-80"
+      disabled={loading}
+      bind:this={btn}
+    >
+      {#if loading}
+        <Spinner />
+      {:else}
+        {$t("login.register")}
+      {/if}
+    </button>
+
+    <p class="text-secondary text-center font-medium">
+      {$t("login.haveAccount")}
+      <a
+        href={"/login"}
+        class="block md:inline text-black underline underline-offset-4 hover:opacity-80"
+      >
+        {$t("login.signIn")}
+      </a>
+    </p>
+  </form>
+</div>
diff --git a/src/routes/(static)/support/+page.svelte b/src/routes/(static)/support/+page.svelte
new file mode 100644
index 00000000..20e41280
--- /dev/null
+++ b/src/routes/(static)/support/+page.svelte
@@ -0,0 +1,134 @@
+<script>
+  import { browser } from "$app/environment";
+  import { onDestroy } from "svelte";
+  import { fail, success, post } from "$lib/utils";
+  import { scale } from "svelte/transition";
+  import Icon from "$comp/Icon.svelte";
+  import { t } from "$lib/translations";
+
+  export let data;
+
+  let { user } = data;
+  $: if (user) {
+    data.subject = { ...user };
+  }
+
+  let email;
+  let message;
+  let sent;
+  let recaptchaSiteKey = "6LfCd8YkAAAAANmVJgzN3SQY3n3fv1RhiS5PgMYM";
+
+  let submit = (e) => {
+    e.preventDefault();
+    grecaptcha.ready(() => {
+      grecaptcha.execute(recaptchaSiteKey, { action: "submit" }).then((token) =>
+        post("/support", { username: user?.username, email, message, token })
+          .then(() => (sent = true))
+          .catch(() => fail("problem submitting"))
+      );
+    });
+  };
+
+  onDestroy(() => {
+    if (!browser) return;
+    const nodeBadge = document.querySelector(".grecaptcha-badge");
+    if (nodeBadge) {
+      document.body.removeChild(nodeBadge.parentNode);
+    }
+
+    const scriptSelector =
+      "script[src='https://www.google.com/recaptcha/api.js?render=" +
+      recaptchaSiteKey +
+      "']";
+    const script = document.querySelector(scriptSelector);
+    if (script) {
+      script.remove();
+    }
+  });
+</script>
+
+<svelte:head
+  ><script
+    src="https://www.google.com/recaptcha/api.js?render=6LfCd8YkAAAAANmVJgzN3SQY3n3fv1RhiS5PgMYM"
+  ></script></svelte:head
+>
+
+<div
+  class="container max-w-lg mx-auto mt-20 space-y-8 shadow-xl rounded-3xl p-10"
+>
+  {#if sent}
+    <h1 class="text-center text-3xl md:text-4xl font-semibold">Thank you!</h1>
+    <div class="text-center text-lg text-secondary">
+      Someone will be in touch shortly.
+    </div>
+
+    <div>
+      <a href={user ? `/${user.username}` : "/"}>
+        <button
+          class="rounded-full border py-2 px-5 font-bold hover:opacity-80 w-full bg-black text-white"
+          >Ok</button
+        >
+      </a>
+    </div>
+  {:else}
+    <h1 class="text-center text-3xl md:text-4xl font-semibold mb-8">
+      {$t("user.support.header")}
+    </h1>
+
+    <p class="text-secondary text-lg">
+      Fill out this form or email us directly at <a
+        class="underline"
+        href="mailto:support@coinos.io">support@coinos.io</a
+      > and we'll do our best to get back to you in a timely manner.
+    </p>
+
+    <form on:submit={submit}>
+      <div class="mb-4">
+        <label for="account" class="font-semibold"
+          >{$t("user.support.accountName")}</label
+        >
+        <input
+          class="bg-primary"
+          type="text"
+          name="account"
+          required
+          value={user?.username || ""}
+        />
+      </div>
+
+      <div class="mb-4">
+        <label for="email" class="font-semibold"
+          >{$t("user.support.email")}</label
+        >
+        <input
+          class="bg-primary"
+          type="email"
+          name="email"
+          bind:value={email}
+          required
+        />
+      </div>
+
+      <div class="mb-4">
+        <label for="message" class="font-semibold"
+          >{$t("user.support.message")}</label
+        >
+        <textarea
+          rows={5}
+          class="bg-primary"
+          type="text"
+          name="message"
+          bind:value={message}
+          required
+        />
+      </div>
+
+      <button
+        type="submit"
+        disabled={!email || !message}
+        class="g-recaptcha bg-black text-white font-bold rounded-xl py-3 w-full mx-auto hover:opacity-80"
+        >{$t("user.support.send")}</button
+      >
+    </form>
+  {/if}
+</div>
diff --git a/src/routes/(static)/support/+server.ts b/src/routes/(static)/support/+server.ts
new file mode 100644
index 00000000..e9a16cfc
--- /dev/null
+++ b/src/routes/(static)/support/+server.ts
@@ -0,0 +1,9 @@
+import { json } from "@sveltejs/kit";
+import { auth, post } from "$lib/utils";
+
+export const prerender = false;
+
+export async function POST({ cookies, request }) {
+  let result = await post("/email", await request.json(), auth(cookies));
+  return json(result);
+}
diff --git a/src/routes/+error.svelte b/src/routes/+error.svelte
new file mode 100644
index 00000000..6ce7979c
--- /dev/null
+++ b/src/routes/+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/start/+server.ts b/src/routes/start/+server.ts
index 44561d40..2a1d88c3 100644
--- a/src/routes/start/+server.ts
+++ b/src/routes/start/+server.ts
@@ -3,7 +3,7 @@ import { redirect } from "@sveltejs/kit";
 export async function GET({ cookies }) {
   let username = cookies.get("username");
   if (username) {
-    redirect(307, `/${username}/receive`);
+    redirect(307, `/invoice`);
   }
 
   redirect(307, "/");
-- 
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')

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 149b0ec0471232d8f583d8a126d1d0d7f50a19d5 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Thu, 12 Sep 2024 15:34:31 -0700
Subject: get account from cookie

---
 src/lib/invoice.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/lib/invoice.ts b/src/lib/invoice.ts
index 0ab0a9af..9745c27b 100644
--- a/src/lib/invoice.ts
+++ b/src/lib/invoice.ts
@@ -1,7 +1,8 @@
-import { auth, get, post, setAccount } from "$lib/utils";
+import { auth, get, post } from "$lib/utils";
 import { redirect } from "@sveltejs/kit";
 
-export default async ({ cookies, request, url }) => {
+export default async ({ cookies, request }) => {
+  let account = cookies.get("account");
   let form = await request.formData();
 
   let rates = await get("/rates");
-- 
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')

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 6890311faca2bed1b8d22dbd88b8925f382eedd2 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Fri, 13 Sep 2024 23:18:58 -0700
Subject: fix some redirects

---
 src/components/Account.svelte                              |  3 +++
 src/components/Items.svelte                                |  4 +---
 src/routes/(app)/+layout.server.ts                         |  1 +
 src/routes/(app)/[username]/(profile)/+page.server.ts      |  1 +
 src/routes/(app)/[username]/(profile)/+page.svelte         | 14 +++++++-------
 src/routes/(app)/invoice/[id]/paid/+page.svelte            |  2 +-
 .../bitcoin/[address]/[amount]/[...feeRate]/+page.svelte   | 12 ++++++++++--
 src/routes/(app)/sent/+page.svelte                         |  2 +-
 8 files changed, 25 insertions(+), 14 deletions(-)

(limited to 'src')

diff --git a/src/components/Account.svelte b/src/components/Account.svelte
index f83068b5..ab24f56a 100644
--- a/src/components/Account.svelte
+++ b/src/components/Account.svelte
@@ -8,6 +8,9 @@
   let { seed, balance, id } = account;
   $: type = seed ? "Savings" : "Cash";
 
+  $: refresh(account);
+    let refresh = (a) => ({ seed, balance, id } = a)
+
   let setAccount = () => 
     document.cookie = `account=${id}; path=/; max-age=86400`;
 </script>
diff --git a/src/components/Items.svelte b/src/components/Items.svelte
index f991e114..47966d8e 100644
--- a/src/components/Items.svelte
+++ b/src/components/Items.svelte
@@ -15,7 +15,7 @@
   import DeleteItem from "$comp/DeleteItem.svelte";
   import Icon from "$comp/Icon.svelte";
 
-  export let subject, user, items, rate, currency;
+    export let subject, user, items, rate, currency, total;
 
   let flipDurationMs = 200;
   let dropTargetStyle = {};
@@ -28,8 +28,6 @@
     deleting = item;
   };
 
-  $: total = items.reduce((a, b) => a + b.price * b.quantity, 0);
-
   function handleConsider(e) {
     const {
       items: newItems,
diff --git a/src/routes/(app)/+layout.server.ts b/src/routes/(app)/+layout.server.ts
index a0e30f31..e4105fb8 100644
--- a/src/routes/(app)/+layout.server.ts
+++ b/src/routes/(app)/+layout.server.ts
@@ -44,6 +44,7 @@ export async function load({ cookies, request, url, params }) {
   }
 
   if (user && !user.pubkey && !pathname.includes("generate")) {
+    console.log("user missing pubkey", user)
     redirect(303, `/${user.username}/generate`);
   }
 
diff --git a/src/routes/(app)/[username]/(profile)/+page.server.ts b/src/routes/(app)/[username]/(profile)/+page.server.ts
index 9c9be68a..ed4ee58c 100644
--- a/src/routes/(app)/[username]/(profile)/+page.server.ts
+++ b/src/routes/(app)/[username]/(profile)/+page.server.ts
@@ -1,6 +1,7 @@
 import { auth, get } from "$lib/utils";
 
 export async function load({ cookies, depends, parent }) {
+  depends("app:payments");
   depends("app:items");
 
   let { subject } = await parent();
diff --git a/src/routes/(app)/[username]/(profile)/+page.svelte b/src/routes/(app)/[username]/(profile)/+page.svelte
index 98b77fc9..03fbc454 100644
--- a/src/routes/(app)/[username]/(profile)/+page.svelte
+++ b/src/routes/(app)/[username]/(profile)/+page.svelte
@@ -14,7 +14,7 @@
   $: rate = rates[currency];
   $: total = items.reduce((a, b) => a + b.price * b.quantity, 0);
 
-  let refresh = (d) => ({ items, subject, user, rates } = d);
+  let refresh = (d) => ({ accounts, items, subject, user, rates } = d);
   $: refresh(data);
 
   let install = async () => {
@@ -41,16 +41,16 @@
     {/each}
 
     <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 w-full justify-center"
-      >
-        <a href={`/account/setup`}>
+      <a href={`/account/setup`} class="contents">
+        <button
+          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="plus" style="w-8 mx-auto invert" />
             <div class="my-auto text-xl whitespace-nowrap">Add account</div>
           </div>
-        </a>
-      </button>
+        </button>
+      </a>
 
       {#if $installPrompt}
         <button
diff --git a/src/routes/(app)/invoice/[id]/paid/+page.svelte b/src/routes/(app)/invoice/[id]/paid/+page.svelte
index 80d5fe6e..e4279e48 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={`/`}>
+<a href={`/${user.username}`}>
   <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]/[amount]/[...feeRate]/+page.svelte b/src/routes/(app)/send/bitcoin/[address]/[amount]/[...feeRate]/+page.svelte
index 0630948c..f6c6980d 100644
--- a/src/routes/(app)/send/bitcoin/[address]/[amount]/[...feeRate]/+page.svelte
+++ b/src/routes/(app)/send/bitcoin/[address]/[amount]/[...feeRate]/+page.svelte
@@ -6,7 +6,15 @@
   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, network } 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";
@@ -36,6 +44,7 @@
         goto(result.location);
       } else {
         await applyAction(result);
+        invalidate("app:payments");
       }
     };
   };
@@ -55,7 +64,6 @@
       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();
diff --git a/src/routes/(app)/sent/+page.svelte b/src/routes/(app)/sent/+page.svelte
index 12e13c41..7d67ac03 100644
--- a/src/routes/(app)/sent/+page.svelte
+++ b/src/routes/(app)/sent/+page.svelte
@@ -43,7 +43,7 @@
   </h3>
 </div>
 
-<a href={`/payments`} use:focus>
+<a href={`/${username}`} use:focus>
   <div class="opacity-0 w-screen h-screen fixed top-0 left-0 z-50" />
 </a>
 
-- 
cgit v1.2.3


From 8e990dae9fb39af9deb05a544fad688dcda8e2e8 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Sat, 14 Sep 2024 10:53:04 -0700
Subject: cash accounts

---
 src/routes/(app)/account/cash/+page.svelte  |  29 ++++++++++++
 src/routes/(app)/account/self/+page.svelte  |  59 ++++++++++++++++++++++++
 src/routes/(app)/account/setup/+page.svelte |  69 ++++++++--------------------
 static/images/cash.png                      | Bin 0 -> 64896 bytes
 static/images/keys.png                      | Bin 0 -> 100051 bytes
 static/images/minibits.png                  | Bin 0 -> 7605 bytes
 6 files changed, 106 insertions(+), 51 deletions(-)
 create mode 100644 src/routes/(app)/account/cash/+page.svelte
 create mode 100644 src/routes/(app)/account/self/+page.svelte
 create mode 100644 static/images/cash.png
 create mode 100644 static/images/keys.png
 create mode 100644 static/images/minibits.png

(limited to 'src')

diff --git a/src/routes/(app)/account/cash/+page.svelte b/src/routes/(app)/account/cash/+page.svelte
new file mode 100644
index 00000000..de0092a4
--- /dev/null
+++ b/src/routes/(app)/account/cash/+page.svelte
@@ -0,0 +1,29 @@
+<script>
+  import { t } from "$lib/translations";
+</script>
+
+<div class="space-y-5">
+  <h1 class="text-center text-3xl font-semibold">Choose your custodian</h1>
+
+  <div class="container w-full mx-auto text-lg px-4 max-w-xl space-y-5">
+    <a href="/account/cash">
+    <div class="shadow p-8 rounded-xl flex gap-4">
+      <img src="/icons/logo-symbol.svg" class="w-20" />
+      <div>
+      <div class="text-xl">Coinos</div>
+      <div class="text-secondary">
+        https://mint.coinos.io
+      </div>
+      </div>
+    </div>
+    <div class="shadow p-8 rounded-xl flex gap-4">
+      <img src="/images/minibits.png" class="w-20" />
+      <div>
+      <div class="text-xl">Minibits</div>
+      <div class="text-secondary">
+        https://mint.minibits.cash/bitcoin
+      </div>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/src/routes/(app)/account/self/+page.svelte b/src/routes/(app)/account/self/+page.svelte
new file mode 100644
index 00000000..833def87
--- /dev/null
+++ b/src/routes/(app)/account/self/+page.svelte
@@ -0,0 +1,59 @@
+<script>
+  import { copy } from "$lib/utils";
+  import { t } from "$lib/translations";
+  import Icon from "$comp/Icon.svelte";
+  import { mnemonic } from "$lib/store";
+  import { generateMnemonic } from "@scure/bip39";
+  import { wordlist } from "@scure/bip39/wordlists/english";
+
+  export let data;
+  let { user } = data;
+
+  let reveal;
+
+  let toggleSeed = async () => {
+    try {
+      $mnemonic = await generateMnemonic(wordlist);
+      reveal = !reveal;
+    } catch (e) {
+      console.log(e);
+    }
+  };
+</script>
+
+<div class="space-y-5">
+  <h1 class="text-center text-3xl font-semibold">Account setup</h1>
+  <h2 class="text-center text-2xl text-secondary">Step 1</h2>
+
+  <div class="container w-full mx-auto text-lg px-4 max-w-xl space-y-5">
+    <p class="text-secondary mb-1">
+      Whoever knows these words in the correct order can withdraw funds from the account. We can't
+      recover them if you lose them.
+    </p>
+
+    {#if reveal}
+      <div class="text-2xl border p-4 text-center rounded-2xl">
+        {$mnemonic}
+      </div>
+
+      <div>
+        <a href={`/account/setup/step2`} class="contents">
+          <button
+            type="button"
+            class="bg-black text-white w-full px-5 py-6 text-xl rounded-2xl font-bold"
+            on:click={toggleSeed}
+          >
+            I've written down my seed phrase
+          </button>
+        </a>
+      </div>
+    {:else}
+      <div class="flex justify-center">
+        <button type="button" class="primary" on:click={toggleSeed}>
+          <Icon icon="warning" style="mr-2 w-6 my-auto" />
+          {$t("user.settings.revealSeed")}
+        </button>
+      </div>
+    {/if}
+  </div>
+</div>
diff --git a/src/routes/(app)/account/setup/+page.svelte b/src/routes/(app)/account/setup/+page.svelte
index 5a15316a..f19c4c96 100644
--- a/src/routes/(app)/account/setup/+page.svelte
+++ b/src/routes/(app)/account/setup/+page.svelte
@@ -1,64 +1,31 @@
 <script>
-  import { copy } from "$lib/utils";
   import { t } from "$lib/translations";
-  import Icon from "$comp/Icon.svelte";
-  import { mnemonic } from "$lib/store";
-  import { generateMnemonic } from "@scure/bip39";
-  import { wordlist } from "@scure/bip39/wordlists/english";
-
-  export let data;
-  let { user } = data;
-
-  let reveal;
-
-  let toggleSeed = async () => {
-    try {
-      $mnemonic = await generateMnemonic(wordlist);
-      reveal = !reveal;
-    } catch (e) {
-      console.log(e);
-    }
-  };
 </script>
 
 <div class="space-y-5">
-  <h1 class="text-center text-3xl font-semibold">Account setup</h1>
-  <h2 class="text-center text-2xl text-secondary">Step 1</h2>
+  <h1 class="text-center text-3xl font-semibold">Choose account type</h1>
 
   <div class="container w-full mx-auto text-lg px-4 max-w-xl space-y-5">
-    <p class="text-secondary mb-1">
-      The keys to your savings account are derived from a seed phrase. When
-      you're ready, write it down and keep it safe.
-    </p>
-
-    <p class="text-secondary mb-1">
-      Whoever knows these words in the correct order can withdraw funds from the account. We can't
-      recover them if you lose them.
-    </p>
-
-    {#if reveal}
-      <div class="text-2xl border p-4 text-center rounded-2xl">
-        {$mnemonic}
+    <a href="/account/cash">
+    <div class="shadow p-8 rounded-xl flex gap-4">
+      <img src="/images/cash.png" class="w-20" />
+      <div>
+      <div class="text-xl">Cash</div>
+      <div class="text-secondary">
+        Your balance is held with a custodian. Payments are faster and
+        cheaper.
       </div>
-
+      </div>
+    </div>
+    <div class="shadow p-8 rounded-xl flex gap-4">
+      <img src="/images/keys.png" class="w-20" />
       <div>
-        <a href={`/account/setup/step2`} class="contents">
-          <button
-            type="button"
-            class="bg-black text-white w-full px-5 py-6 text-xl rounded-2xl font-bold"
-            on:click={toggleSeed}
-          >
-            I've written down my seed phrase
-          </button>
-        </a>
+      <div class="text-xl">Savings</div>
+      <div class="text-secondary">
+        You hold the keys to the account and are responsible for safeguarding
+        them.
       </div>
-    {:else}
-      <div class="flex justify-center">
-        <button type="button" class="primary" on:click={toggleSeed}>
-          <Icon icon="warning" style="mr-2 w-6 my-auto" />
-          {$t("user.settings.revealSeed")}
-        </button>
       </div>
-    {/if}
+    </div>
   </div>
 </div>
diff --git a/static/images/cash.png b/static/images/cash.png
new file mode 100644
index 00000000..2f1063dd
Binary files /dev/null and b/static/images/cash.png differ
diff --git a/static/images/keys.png b/static/images/keys.png
new file mode 100644
index 00000000..aef443d2
Binary files /dev/null and b/static/images/keys.png differ
diff --git a/static/images/minibits.png b/static/images/minibits.png
new file mode 100644
index 00000000..307ed7c8
Binary files /dev/null and b/static/images/minibits.png differ
-- 
cgit v1.2.3


From 081538cc6a6c49c8b2eb34d682c880e40876d99b Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Mon, 16 Sep 2024 06:11:45 -0700
Subject: account setup

---
 src/components/Account.svelte                     |  6 +-
 src/components/Items.svelte                       |  2 +-
 src/lib/parse.ts                                  |  6 +-
 src/routes/(app)/+layout.server.ts                |  4 +-
 src/routes/(app)/account/cash/+page.svelte        | 46 +++++++-----
 src/routes/(app)/account/mints/+page.svelte       |  1 +
 src/routes/(app)/account/pass/+page.svelte        | 87 +++++++++++++++++++++++
 src/routes/(app)/account/savings/+page.svelte     | 31 ++++++++
 src/routes/(app)/account/seed/+page.svelte        | 85 ++++++++++++++++++++++
 src/routes/(app)/account/self/+page.svelte        | 59 ---------------
 src/routes/(app)/account/setup/+page.svelte       | 41 ++++++-----
 src/routes/(app)/account/setup/step2/+page.svelte | 68 ------------------
 12 files changed, 262 insertions(+), 174 deletions(-)
 create mode 100644 src/routes/(app)/account/mints/+page.svelte
 create mode 100644 src/routes/(app)/account/pass/+page.svelte
 create mode 100644 src/routes/(app)/account/savings/+page.svelte
 create mode 100644 src/routes/(app)/account/seed/+page.svelte
 delete mode 100644 src/routes/(app)/account/self/+page.svelte
 delete mode 100644 src/routes/(app)/account/setup/step2/+page.svelte

(limited to 'src')

diff --git a/src/components/Account.svelte b/src/components/Account.svelte
index ab24f56a..d52c4f52 100644
--- a/src/components/Account.svelte
+++ b/src/components/Account.svelte
@@ -9,10 +9,10 @@
   $: type = seed ? "Savings" : "Cash";
 
   $: refresh(account);
-    let refresh = (a) => ({ seed, balance, id } = a)
+  let refresh = (a) => ({ seed, balance, id } = a);
 
-  let setAccount = () => 
-    document.cookie = `account=${id}; path=/; max-age=86400`;
+  let setAccount = () =>
+    (document.cookie = `account=${id}; path=/; max-age=86400`);
 </script>
 
 <a href={`/payments`} class="block" on:click={setAccount}>
diff --git a/src/components/Items.svelte b/src/components/Items.svelte
index 47966d8e..2916721d 100644
--- a/src/components/Items.svelte
+++ b/src/components/Items.svelte
@@ -15,7 +15,7 @@
   import DeleteItem from "$comp/DeleteItem.svelte";
   import Icon from "$comp/Icon.svelte";
 
-    export let subject, user, items, rate, currency, total;
+  export let subject, user, items, rate, currency, total;
 
   let flipDurationMs = 200;
   let dropTargetStyle = {};
diff --git a/src/lib/parse.ts b/src/lib/parse.ts
index 5bf5ffb0..781c7087 100644
--- a/src/lib/parse.ts
+++ b/src/lib/parse.ts
@@ -45,9 +45,9 @@ export default async (t, host) => {
 
   // bitcoin
   if (validate(t) || isLiquid(t)) {
-      let r = `/send/bitcoin/${t}`;
-      if (amount) r += "/" + amount;
-      redirect(307, r);
+    let r = `/send/bitcoin/${t}`;
+    if (amount) r += "/" + amount;
+    redirect(307, r);
   }
 
   if (t.startsWith("cashu")) {
diff --git a/src/routes/(app)/+layout.server.ts b/src/routes/(app)/+layout.server.ts
index e4105fb8..0901cb5d 100644
--- a/src/routes/(app)/+layout.server.ts
+++ b/src/routes/(app)/+layout.server.ts
@@ -39,12 +39,12 @@ export async function load({ cookies, request, url, params }) {
     redirect(307, `/${user.username}`);
   }
 
-  if ( protectedRoutes.find((p) => pathname.match(p)) && (!user)) {
+  if (protectedRoutes.find((p) => pathname.match(p)) && !user) {
     redirect(307, "/login");
   }
 
   if (user && !user.pubkey && !pathname.includes("generate")) {
-    console.log("user missing pubkey", user)
+    console.log("user missing pubkey", user);
     redirect(303, `/${user.username}/generate`);
   }
 
diff --git a/src/routes/(app)/account/cash/+page.svelte b/src/routes/(app)/account/cash/+page.svelte
index de0092a4..b0e2e757 100644
--- a/src/routes/(app)/account/cash/+page.svelte
+++ b/src/routes/(app)/account/cash/+page.svelte
@@ -1,29 +1,37 @@
 <script>
   import { t } from "$lib/translations";
+  import Icon from "$comp/Icon.svelte";
 </script>
 
 <div class="space-y-5">
   <h1 class="text-center text-3xl font-semibold">Choose your custodian</h1>
 
-  <div class="container w-full mx-auto text-lg px-4 max-w-xl space-y-5">
-    <a href="/account/cash">
-    <div class="shadow p-8 rounded-xl flex gap-4">
-      <img src="/icons/logo-symbol.svg" class="w-20" />
-      <div>
-      <div class="text-xl">Coinos</div>
-      <div class="text-secondary">
-        https://mint.coinos.io
-      </div>
-      </div>
-    </div>
-    <div class="shadow p-8 rounded-xl flex gap-4">
-      <img src="/images/minibits.png" class="w-20" />
-      <div>
-      <div class="text-xl">Minibits</div>
-      <div class="text-secondary">
-        https://mint.minibits.cash/bitcoin
-      </div>
-      </div>
+  <div class="container w-full mx-auto text-lg px-4 max-w-xl space-y-2">
+    <div class="space-y-5">
+      <a href="/account/cash" class="block">
+        <div class="shadow p-8 rounded-xl flex gap-4 hover:bg-primary">
+          <img src="/icons/logo-symbol.svg" class="w-20" />
+          <div>
+            <div class="text-xl">Coinos</div>
+            <div class="text-secondary">https://mint.coinos.io</div>
+          </div>
+        </div>
+      </a>
+      <a href="/account/cash" class="block">
+        <div class="shadow p-8 rounded-xl flex gap-4 hover:bg-primary">
+          <img src="/images/minibits.png" class="w-20" />
+          <div>
+            <div class="text-xl">Minibits</div>
+            <div class="text-secondary">https://mint.minibits.cash/bitcoin</div>
+          </div>
+        </div>
+      </a>
     </div>
+    <!-- <a href="/account/mints" class="block"> -->
+    <!--   <div class="p-4 border rounded-xl flex justify-center gap-2"> -->
+    <!--     <Icon icon="plus" style="w-8 my-auto" /> -->
+    <!--     <div class="text-xl my-auto">More</div> -->
+    <!--   </div> -->
+    <!-- </a> -->
   </div>
 </div>
diff --git a/src/routes/(app)/account/mints/+page.svelte b/src/routes/(app)/account/mints/+page.svelte
new file mode 100644
index 00000000..1080269e
--- /dev/null
+++ b/src/routes/(app)/account/mints/+page.svelte
@@ -0,0 +1 @@
+mints
diff --git a/src/routes/(app)/account/pass/+page.svelte b/src/routes/(app)/account/pass/+page.svelte
new file mode 100644
index 00000000..b6c7f339
--- /dev/null
+++ b/src/routes/(app)/account/pass/+page.svelte
@@ -0,0 +1,87 @@
+<script lang="ts">
+  import { onMount } from "svelte";
+  import { t } from "$lib/translations";
+  import { mnemonic } from "$lib/store";
+  import Icon from "$comp/Icon.svelte";
+  import { encrypt } from "nostr-tools/nip49";
+  import {
+    mnemonicToSeed,
+    mnemonicToEntropy,
+    entropyToMnemonic,
+  } from "@scure/bip39";
+  import { wordlist } from "@scure/bip39/wordlists/english";
+  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 confirm, password;
+
+  onMount(() => {
+      if (!$mnemonic) goto("/account/savings");
+  });
+
+  let submit = async () => {
+    if (!password || password !== confirm) {
+      fail("Passwords don't match");
+      return;
+    }
+
+    try {
+      let seed = await encrypt(
+        mnemonicToEntropy($mnemonic, wordlist),
+        password
+      );
+      let master = HDKey.fromMasterSeed(
+        await mnemonicToSeed($mnemonic, password),
+        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);
+      await post("/api/accounts", { fingerprint, pubkey, seed });
+      goto(`/${user.username}`);
+    } catch (e) {
+      console.log(e);
+      fail(e.message);
+    }
+
+    $mnemonic = "";
+  };
+</script>
+
+<div class="space-y-5">
+  <div>
+    <h1 class="text-center text-3xl font-semibold">Account password</h1>
+  </div>
+
+  <form
+    on:submit|preventDefault={submit}
+    class="container w-full mx-auto text-lg px-4 max-w-xl space-y-5"
+  >
+    <p class="text-secondary mb-1">
+      Please add a password to the account. It should be different than your
+      login password. <b class="text-red-700">We won't be able to reset it.</b> You'll
+      need it to make withdrawals.
+    </p>
+
+    <input use:focus type="text" placeholder="Password" bind:value={password} />
+    <input
+      use:focus
+      type="text"
+      placeholder="Confirm password"
+      bind:value={confirm}
+    />
+
+    <button
+      class="bg-black text-white w-full px-5 py-6 text-xl rounded-2xl font-bold"
+    >
+      Submit
+    </button>
+  </form>
+</div>
diff --git a/src/routes/(app)/account/savings/+page.svelte b/src/routes/(app)/account/savings/+page.svelte
new file mode 100644
index 00000000..8d52f997
--- /dev/null
+++ b/src/routes/(app)/account/savings/+page.svelte
@@ -0,0 +1,31 @@
+<script>
+  import { t } from "$lib/translations";
+  import Icon from "$comp/Icon.svelte";
+</script>
+
+<div class="space-y-5">
+  <h1 class="text-center text-3xl font-semibold">Wallet setup</h1>
+
+  <div class="container w-full mx-auto text-lg px-4 max-w-xl space-y-2">
+    <div class="space-y-5">
+      <a href="/account/seed" class="block">
+        <div class="shadow p-8 rounded-xl flex gap-4 hover:bg-primary">
+          <img src="/icons/random.svg" class="w-20" />
+          <div>
+            <div class="text-xl">Create</div>
+            <div class="text-secondary">Generate a new seed phrase in your browser</div>
+          </div>
+        </div>
+      </a>
+      <a href="/account/import" class="block">
+        <div class="shadow p-8 rounded-xl flex gap-4 hover:bg-primary">
+          <img src="/images/keys.png" class="w-20" />
+          <div>
+            <div class="text-xl">Import</div>
+            <div class="text-secondary">Enter an existing seed phrase or wallet key</div>
+          </div>
+        </div>
+      </a>
+    </div>
+  </div>
+</div>
diff --git a/src/routes/(app)/account/seed/+page.svelte b/src/routes/(app)/account/seed/+page.svelte
new file mode 100644
index 00000000..9c19e820
--- /dev/null
+++ b/src/routes/(app)/account/seed/+page.svelte
@@ -0,0 +1,85 @@
+<script>
+  import { browser } from "$app/environment";
+  import { tick, onMount } from "svelte";
+  import { copy } from "$lib/utils";
+  import { t } from "$lib/translations";
+  import Icon from "$comp/Icon.svelte";
+  import { mnemonic } from "$lib/store";
+  import { generateMnemonic } from "@scure/bip39";
+  import { wordlist } from "@scure/bip39/wordlists/english";
+
+  export let data;
+  let { user } = data;
+
+  onMount(async () => {
+    if (!browser) return;
+    await generate();
+  });
+
+  let generate = async () => {
+    $mnemonic = "- - - - - - - - - - - -";
+    await tick();
+    await new Promise((r) => setTimeout(r, 250));
+    $mnemonic = await generateMnemonic(wordlist);
+  };
+</script>
+
+<div class="space-y-5">
+  <h1 class="text-center text-3xl font-semibold">Seed phrase</h1>
+
+  <div class="container w-full mx-auto text-lg px-4 max-w-xl space-y-5">
+    {#if $mnemonic}
+      <div
+        class="text-2xl border p-4 rounded-2xl text-secondary grid grid-rows-6 grid-flow-col gap-2 justify-center gap-x-40"
+      >
+        {#each $mnemonic.split(" ") as w, i}
+          <div>
+            <span class="select-none text-sm text-black">{i + 1}.</span>
+            <span>{@html w === "-" ? "&mdash;" : w}</span>
+          </div>
+        {/each}
+      </div>
+    {/if}
+
+    <div>
+      <button
+        type="button"
+        class="flex gap-2 text-center break-all rounded-2xl hover:opacity-80 py-5 px-6 w-full mx-auto justify-center border whitespace-nowrap mb-2"
+        on:click={generate}
+      >
+        <Icon icon="random" style="w-8 my-auto" />
+        <div class="my-auto">Regenerate</div>
+      </button>
+
+      <button
+        type="button"
+        class="flex gap-2 text-center break-all rounded-2xl hover:opacity-80 py-5 px-6 w-full mx-auto justify-center border whitespace-nowrap mb-2"
+        on:click={() => copy($mnemonic)}
+      >
+        <Icon icon="copy" style="w-8 my-auto" />
+        <div class="my-auto">
+          {$t("payments.copy")}
+        </div>
+      </button>
+    </div>
+
+    <div class="flex gap-2">
+      <a href={`/account/savings`} class="contents">
+        <button
+          type="button"
+          class="bg-black text-white w-full px-5 py-6 text-xl rounded-2xl font-bold"
+        >
+          Back
+        </button>
+      </a>
+      <a href={`/account/pass`} class="contents">
+        <button
+          type="button"
+          class="bg-black text-white w-full px-5 py-6 text-xl rounded-2xl font-bold"
+        >
+          Next
+        </button>
+      </a>
+    </div>
+  </div>
+</div>
diff --git a/src/routes/(app)/account/self/+page.svelte b/src/routes/(app)/account/self/+page.svelte
deleted file mode 100644
index 833def87..00000000
--- a/src/routes/(app)/account/self/+page.svelte
+++ /dev/null
@@ -1,59 +0,0 @@
-<script>
-  import { copy } from "$lib/utils";
-  import { t } from "$lib/translations";
-  import Icon from "$comp/Icon.svelte";
-  import { mnemonic } from "$lib/store";
-  import { generateMnemonic } from "@scure/bip39";
-  import { wordlist } from "@scure/bip39/wordlists/english";
-
-  export let data;
-  let { user } = data;
-
-  let reveal;
-
-  let toggleSeed = async () => {
-    try {
-      $mnemonic = await generateMnemonic(wordlist);
-      reveal = !reveal;
-    } catch (e) {
-      console.log(e);
-    }
-  };
-</script>
-
-<div class="space-y-5">
-  <h1 class="text-center text-3xl font-semibold">Account setup</h1>
-  <h2 class="text-center text-2xl text-secondary">Step 1</h2>
-
-  <div class="container w-full mx-auto text-lg px-4 max-w-xl space-y-5">
-    <p class="text-secondary mb-1">
-      Whoever knows these words in the correct order can withdraw funds from the account. We can't
-      recover them if you lose them.
-    </p>
-
-    {#if reveal}
-      <div class="text-2xl border p-4 text-center rounded-2xl">
-        {$mnemonic}
-      </div>
-
-      <div>
-        <a href={`/account/setup/step2`} class="contents">
-          <button
-            type="button"
-            class="bg-black text-white w-full px-5 py-6 text-xl rounded-2xl font-bold"
-            on:click={toggleSeed}
-          >
-            I've written down my seed phrase
-          </button>
-        </a>
-      </div>
-    {:else}
-      <div class="flex justify-center">
-        <button type="button" class="primary" on:click={toggleSeed}>
-          <Icon icon="warning" style="mr-2 w-6 my-auto" />
-          {$t("user.settings.revealSeed")}
-        </button>
-      </div>
-    {/if}
-  </div>
-</div>
diff --git a/src/routes/(app)/account/setup/+page.svelte b/src/routes/(app)/account/setup/+page.svelte
index f19c4c96..8304c5ed 100644
--- a/src/routes/(app)/account/setup/+page.svelte
+++ b/src/routes/(app)/account/setup/+page.svelte
@@ -6,26 +6,29 @@
   <h1 class="text-center text-3xl font-semibold">Choose account type</h1>
 
   <div class="container w-full mx-auto text-lg px-4 max-w-xl space-y-5">
-    <a href="/account/cash">
-    <div class="shadow p-8 rounded-xl flex gap-4">
-      <img src="/images/cash.png" class="w-20" />
-      <div>
-      <div class="text-xl">Cash</div>
-      <div class="text-secondary">
-        Your balance is held with a custodian. Payments are faster and
-        cheaper.
+    <a href="/account/cash" class="block">
+      <div class="shadow p-8 rounded-xl flex gap-4 hover:bg-primary">
+        <img src="/images/cash.png" class="w-20" />
+        <div>
+          <div class="text-xl">Cash</div>
+          <div class="text-secondary">
+            Your balance is held with a custodian. Payments are fast and
+            free.
+          </div>
+        </div>
       </div>
+    </a>
+    <a href="/account/savings" class="block">
+      <div class="shadow p-8 rounded-xl flex gap-4 hover:bg-primary">
+        <img src="/images/keys.png" class="w-20" />
+        <div>
+          <div class="text-xl">Savings</div>
+          <div class="text-secondary">
+            You hold the keys to the account and are responsible for
+            safeguarding them.
+          </div>
+        </div>
       </div>
-    </div>
-    <div class="shadow p-8 rounded-xl flex gap-4">
-      <img src="/images/keys.png" class="w-20" />
-      <div>
-      <div class="text-xl">Savings</div>
-      <div class="text-secondary">
-        You hold the keys to the account and are responsible for safeguarding
-        them.
-      </div>
-      </div>
-    </div>
+    </a>
   </div>
 </div>
diff --git a/src/routes/(app)/account/setup/step2/+page.svelte b/src/routes/(app)/account/setup/step2/+page.svelte
deleted file mode 100644
index 221e545e..00000000
--- a/src/routes/(app)/account/setup/step2/+page.svelte
+++ /dev/null
@@ -1,68 +0,0 @@
-<script lang="ts">
-  import { t } from "$lib/translations";
-  import { mnemonic } from "$lib/store";
-  import Icon from "$comp/Icon.svelte";
-  import { encrypt } from "nostr-tools/nip49";
-  import {
-    mnemonicToSeed,
-    mnemonicToEntropy,
-    entropyToMnemonic,
-  } from "@scure/bip39";
-  import { wordlist } from "@scure/bip39/wordlists/english";
-  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", { fingerprint, pubkey, seed });
-      goto(`/${user.username}`);
-    } catch (e) {
-      console.log(e);
-      fail("Something went wrong");
-    }
-
-    $mnemonic = "";
-  };
-</script>
-
-<div class="space-y-5">
-  <div>
-    <h1 class="text-center text-3xl font-semibold">Account setup</h1>
-    <h2 class="text-center text-2xl text-secondary">Step 2</h2>
-  </div>
-
-  <form
-    on:submit|preventDefault={submit}
-    class="container w-full mx-auto text-lg px-4 max-w-xl space-y-5"
-  >
-    <p class="text-secondary mb-1">
-      Add an additional password to your seed phrase. It should be different
-      than your login password. We can't reset it if you lose it.
-    </p>
-
-    <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"
-    >
-      Submit
-    </button>
-  </form>
-</div>
-- 
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')

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 f893043b00750ad693fc886eb77184598b9c8317 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Tue, 17 Sep 2024 20:29:53 -0700
Subject: account deletion

---
 bun.lockb                                     | Bin 161519 -> 160735 bytes
 src/components/Account.svelte                 |   2 +-
 src/locales/en.json                           |   2 +-
 src/routes/(app)/account/[id]/+page.server.ts |   8 +++++-
 src/routes/(app)/account/[id]/+page.svelte    |  34 +++++++++++++++++++++++---
 src/routes/(app)/invoice/[id]/+page.svelte    |  19 ++++++--------
 6 files changed, 47 insertions(+), 18 deletions(-)

(limited to 'src')

diff --git a/bun.lockb b/bun.lockb
index 97e0841d..96e1a3c5 100755
Binary files a/bun.lockb and b/bun.lockb differ
diff --git a/src/components/Account.svelte b/src/components/Account.svelte
index a8573c37..6294bc44 100644
--- a/src/components/Account.svelte
+++ b/src/components/Account.svelte
@@ -20,7 +20,7 @@
     <div class="flex">
       <Balance {balance} {user} {rate} />
       <a href={`/account/${id}`} class="contents">
-        <button class="ml-auto flex gap-1 mb-auto">
+        <button class="ml-auto flex gap-1 mb-auto pb-2 pl-2">
           <div class="my-auto text-secondary">{name}</div>
           <Icon icon="settings" style="w-8 my-auto" />
         </button>
diff --git a/src/locales/en.json b/src/locales/en.json
index fd2807b4..ba7ebc87 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -331,7 +331,7 @@
 		"voucher": "Payment code",
 		"qr": "QR",
 		"copy": "Copy",
-		"amountPrompt": "Always prompt for amount",
+		"amountPrompt": "Prompt for amount",
 		"shareLink": "Share link",
 		"copyLink": "Copy link",
 		"copyText": "Copy text",
diff --git a/src/routes/(app)/account/[id]/+page.server.ts b/src/routes/(app)/account/[id]/+page.server.ts
index 7d1c503a..35b5517d 100644
--- a/src/routes/(app)/account/[id]/+page.server.ts
+++ b/src/routes/(app)/account/[id]/+page.server.ts
@@ -1,5 +1,11 @@
 import { error, redirect } from "@sveltejs/kit";
-import { auth, post, fd } from "$lib/utils";
+import { auth, get, post, fd } from "$lib/utils";
+
+
+export let load = async ({ cookies, params }) => {
+  let account = await get(`/account/${params.id}`, auth(cookies));
+  return { account };
+}
 
 export const actions = {
   default: async ({ cookies, params, request }) => {
diff --git a/src/routes/(app)/account/[id]/+page.svelte b/src/routes/(app)/account/[id]/+page.svelte
index 152e8dfc..df121168 100644
--- a/src/routes/(app)/account/[id]/+page.svelte
+++ b/src/routes/(app)/account/[id]/+page.svelte
@@ -1,8 +1,22 @@
 <script>
+  import { goto } from "$app/navigation";
+  import { fail, focus, post } from "$lib/utils";
   import { enhance } from "$app/forms";
   import { t } from "$lib/translations";
   import Icon from "$comp/Icon.svelte";
-  let name;
+
+  export let data;
+  let { account, user } = data;
+  let { id, name } = account;
+
+  let del = async () => {
+    try {
+      await post("/api/account/delete", { id });
+      goto(`/${user.username}`);
+    } catch (e) {
+      fail(e.message);
+    }
+  };
 </script>
 
 <div class="space-y-5">
@@ -12,10 +26,24 @@
     <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} />
+        <input use:focus type="text" name="name" bind:value={name} />
       </div>
 
-      <button type="submit">Save</button>
+      <div class="space-y-2">
+        <button
+          type="submit"
+          class="rounded-2xl border py-3 font-bold mx-auto bg-black text-white px-4 w-full"
+          >Submit</button
+        >
+        <button
+          on:click={del}
+          type="button"
+          class="flex gap-2 rounded-2xl border py-3 font-bold mx-auto px-4 w-full justify-center border-red-600 border-2"
+        >
+          <Icon icon="trash" style="w-8 my-auto" />
+          <div class="my-auto">Delete</div></button
+        >
+      </div>
     </form>
   </div>
 </div>
diff --git a/src/routes/(app)/invoice/[id]/+page.svelte b/src/routes/(app)/invoice/[id]/+page.svelte
index 36f5d261..96ff6406 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 rounded-2xl w-[260px] rounded-2xl"
+          class="mx-auto z-10 max-w-[360px]"
           bind:this={qr}
           alt={txt}
         />
       </a>
     </div>
   {:else}
-    <div class="break-all pb-5 text-center text-secondary">
+    <div class="break-all pb-5 text-center text-secondary text-xl">
       {txt}
     </div>
   {/if}
@@ -188,7 +188,7 @@
     </div>
   {/if}
 
-  <div class="text-secondary space-y-2 text-xl">
+  <div class="text-secondary space-y-2 text-xl pt-2">
     <button
       type="button"
       class="flex gap-2 text-center break-all rounded-2xl hover:opacity-80 py-5 px-6 w-full mx-auto justify-center border whitespace-nowrap mb-2"
@@ -303,7 +303,7 @@
     <div
       class="relative mx-auto p-12 border w-96 shadow-lg rounded-md bg-white space-y-5 top-10"
     >
-      <form submit={setAmount}>
+      <form on:submit|preventDefault={setAmount}>
         <Numpad
           bind:amount={newAmount}
           bind:currency
@@ -313,6 +313,7 @@
         />
         <div class="w-full flex flex-wrap gap-2">
           <button
+            bind:this={submit}
             type="submit"
             on:click={setAmount}
             class="border-2 border-black rounded-xl font-semibold mx-auto py-3 w-40 hover:opacity-80 mx-auto bg-black text-white w-full"
@@ -320,7 +321,6 @@
             <div class="my-auto">Ok</div>
           </button>
           <button
-            bind:this={submit}
             type="button"
             class="border-2 border-black rounded-xl font-semibold mx-auto py-3 w-40 hover:opacity-80 mx-auto w-full"
             on:click={toggleAmount}
@@ -331,8 +331,8 @@
         </div>
       </form>
 
-      <div class="flex justify-between items-center">
-        <span class="font-bold">{$t("payments.amountPrompt")}</span>
+      <div class="flex justify-center gap-3">
+        <div class="text-secondary">{$t("payments.amountPrompt")}</div>
         <Toggle id="notify" bind:value={$amountPrompt} />
       </div>
     </div>
@@ -343,9 +343,4 @@
   .invoice {
     view-transition-name: invoice;
   }
-
-  .clip-qr {
-    @apply overflow-hidden;
-    clip-path: inset(5%);
-  }
 </style>
-- 
cgit v1.2.3


From 072cb81c886d7461a6e1ffce9d658d1463ca6315 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Wed, 18 Sep 2024 21:05:49 -0700
Subject: import page

---
 src/lib/nostr.ts                             |  2 +-
 src/routes/(app)/account/import/+page.svelte | 53 ++++++++++++++++++++++++++++
 src/routes/(app)/account/pass/+page.svelte   |  9 ++---
 3 files changed, 56 insertions(+), 8 deletions(-)
 create mode 100644 src/routes/(app)/account/import/+page.svelte

(limited to 'src')

diff --git a/src/lib/nostr.ts b/src/lib/nostr.ts
index bd2e65fe..62853f09 100644
--- a/src/lib/nostr.ts
+++ b/src/lib/nostr.ts
@@ -19,7 +19,7 @@ import {
 
 import { mnemonicToEntropy, entropyToMnemonic } from "@scure/bip39";
 import { bech32m } from "@scure/base";
-  import { wordlist } from "@scure/bip39/wordlists/english";
+import { wordlist } from "@scure/bip39/wordlists/english";
 
 import { generateSeedWords, privateKeyFromSeedWords } from "nostr-tools/nip06";
 
diff --git a/src/routes/(app)/account/import/+page.svelte b/src/routes/(app)/account/import/+page.svelte
new file mode 100644
index 00000000..1e28f9df
--- /dev/null
+++ b/src/routes/(app)/account/import/+page.svelte
@@ -0,0 +1,53 @@
+<script>
+  import { versions } from "$lib/utils";
+  import { t } from "$lib/translations";
+  import { browser } from "$app/environment";
+  import Icon from "$comp/Icon.svelte";
+  import { validateMnemonic } from "@scure/bip39";
+  import { wordlist } from "@scure/bip39/wordlists/english";
+  import { HDKey } from "@scure/bip32";
+
+  let el, pasted, text;
+
+  let paste = async () => {
+    text = await navigator.clipboard.readText();
+    pasted = true;
+  };
+
+  let submit = () => {
+    let valid = validateMnemonic(text, wordlist);
+    let v2 = HDKey.fromExtendedKey(text, versions);
+
+    console.log(valid);
+    console.log(v2);
+  };
+
+  $: if (browser && pasted && text) form.submit() && (pasted = false);
+</script>
+
+<div class="space-y-5">
+  <h1 class="text-center text-3xl font-semibold">Import</h1>
+
+  <div class="container w-full mx-auto text-lg px-4 max-w-xl space-y-2">
+    <div class="space-y-5">
+      <form on:submit|preventDefault={submit}>
+        <textarea
+          use:focus
+          name="text"
+          placeholder="Enter a seed phrase or extended key"
+          class="w-full p-4 border rounded-xl h-48 text-xl"
+          bind:value={text}
+          autocapitalize="none"
+        />
+        <button
+          bind:this={el}
+          type="submit"
+          class="flex bg-black text-white border rounded-2xl px-6 py-5 w-full font-bold gap-2 justify-center"
+        >
+          <Icon icon="send" style="w-8 my-auto invert" />
+          <div class="my-auto">{$t("user.send.next")}</div>
+        </button>
+      </form>
+    </div>
+  </div>
+</div>
diff --git a/src/routes/(app)/account/pass/+page.svelte b/src/routes/(app)/account/pass/+page.svelte
index b6c7f339..ee29d2c3 100644
--- a/src/routes/(app)/account/pass/+page.svelte
+++ b/src/routes/(app)/account/pass/+page.svelte
@@ -21,7 +21,7 @@
   let confirm, password;
 
   onMount(() => {
-      if (!$mnemonic) goto("/account/savings");
+    if (!$mnemonic) goto("/account/savings");
   });
 
   let submit = async () => {
@@ -71,12 +71,7 @@
     </p>
 
     <input use:focus type="text" placeholder="Password" bind:value={password} />
-    <input
-      use:focus
-      type="text"
-      placeholder="Confirm password"
-      bind:value={confirm}
-    />
+    <input type="text" placeholder="Confirm password" bind:value={confirm} />
 
     <button
       class="bg-black text-white w-full px-5 py-6 text-xl rounded-2xl font-bold"
-- 
cgit v1.2.3


From d4c3d52fdde5fef8f72c1f572f1ce7c70da86b23 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Thu, 19 Sep 2024 15:55:38 -0700
Subject: progress on accounts

---
 src/components/Account.svelte                      |   2 +-
 src/components/Footer.svelte                       |   2 +-
 src/lib/invoice.ts                                 |   4 +-
 src/lib/types.ts                                   |   4 +-
 src/locales/en.json                                |   5 +-
 src/routes/(app)/[username]/receive/+page.svelte   | 343 +++++++++++++++++++++
 src/routes/(app)/account/pass/+page.svelte         |  65 +++-
 src/routes/(app)/account/seed/+page.svelte         |   5 +-
 src/routes/(app)/account/setup/+page.svelte        |   4 +-
 src/routes/(app)/invoice/+page.server.ts           |   7 +-
 src/routes/(app)/invoice/[id]/+layout.server.ts    |  42 +--
 src/routes/(app)/invoice/[id]/+page.svelte         |  56 ++--
 src/routes/(app)/invoice/[id]/tip/+page.server.ts  |   2 +-
 src/routes/(app)/invoice/[id]/tip/+page.svelte     |   3 +
 src/routes/(app)/logout/+page.server.ts            |   2 +-
 src/routes/(app)/send/[...text]/+page.svelte       |   6 +-
 src/routes/(app)/send/ecash/+page.svelte           |  13 +-
 .../(app)/send/lightning/[payreq]/+page.svelte     |  17 +-
 static/icons/cash.svg                              |  12 +
 static/icons/text.svg                              |  19 +-
 20 files changed, 499 insertions(+), 114 deletions(-)
 create mode 100644 src/routes/(app)/[username]/receive/+page.svelte
 create mode 100644 static/icons/cash.svg

(limited to 'src')

diff --git a/src/components/Account.svelte b/src/components/Account.svelte
index 6294bc44..0baeb9a0 100644
--- a/src/components/Account.svelte
+++ b/src/components/Account.svelte
@@ -12,7 +12,7 @@
   let refresh = (a) => ({ seed, balance, id } = a);
 
   let setAccount = () =>
-    (document.cookie = `account=${id}; path=/; max-age=86400`);
+    (document.cookie = `account_id=${id}; path=/; max-age=86400`);
 </script>
 
 <a href={`/payments`} class="block" on:click={setAccount}>
diff --git a/src/components/Footer.svelte b/src/components/Footer.svelte
index d70c013c..067e185e 100644
--- a/src/components/Footer.svelte
+++ b/src/components/Footer.svelte
@@ -4,7 +4,7 @@
   import { t } from "$lib/translations";
 
   const followLinks = [
-    { url: "https://twitter.com/coinoswallet", titleID: "twitter" },
+    { url: "nostr:nprofile1qqst4qyeqenw7zm0fwjsty68h6cnys5jre2xd8ngqpjv5a2j26s78fspz4mhxue69uhhyetvv9ujucm0d9hx7uewd9hsgwx239", titleID: "nostr" },
     { url: "https://t.me/coinoswallet", titleID: "telegram" },
     { url: "https://linktr.ee/coinos.io", titleID: "linktree" },
   ];
diff --git a/src/lib/invoice.ts b/src/lib/invoice.ts
index 9745c27b..0a50b876 100644
--- a/src/lib/invoice.ts
+++ b/src/lib/invoice.ts
@@ -2,14 +2,14 @@ import { auth, get, post } from "$lib/utils";
 import { redirect } from "@sveltejs/kit";
 
 export default async ({ cookies, request }) => {
-  let account = cookies.get("account");
+  let account_id = cookies.get("account_id");
   let form = await request.formData();
 
   let rates = await get("/rates");
   let amount = parseInt(form.get("amount"));
 
   let invoice = {
-    account,
+    account_id,
     amount,
     items: JSON.parse(form.get("items")),
     memo: form.get("memo"),
diff --git a/src/lib/types.ts b/src/lib/types.ts
index 666ea1fb..67a51f62 100644
--- a/src/lib/types.ts
+++ b/src/lib/types.ts
@@ -14,10 +14,10 @@ export interface User {
 }
 
 export interface Invoice {
-  account: string;
+  account_id: string;
   id?: string;
   memoPrompt?: boolean;
   memo?: string;
   rate: number;
-  type: string;
+  type?: string;
 }
diff --git a/src/locales/en.json b/src/locales/en.json
index ba7ebc87..36357ef2 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -62,6 +62,7 @@
 		"support": "Support",
 		"telegram": "Telegram",
 		"twitter": "Twitter",
+		"nostr": "Nostr",
 		"documentation": "Documentation"
 	},
 	"howItWorks": {
@@ -310,7 +311,7 @@
 		"ecash": "Ecash",
 		"memo": "Notes",
 		"voucherText": "Enter an ecash or lnurlw code",
-		"createEcash": "Create ecash",
+		"createEcash": "Mint e-cash",
 		"tips": "Tips",
 		"options": "options",
 		"bump": "Bump fee",
@@ -338,7 +339,7 @@
 		"openLink": "Open wallet",
 		"setAmount": "Set amount",
 		"moreOptions": "More options",
-		"redeemVoucher": "Ecash or LNURLw",
+		"redeemVoucher": "Ecash",
 		"total": "Total",
 		"gainLoss": "Gain/Loss",
 		"presentValue": "Present Value",
diff --git a/src/routes/(app)/[username]/receive/+page.svelte b/src/routes/(app)/[username]/receive/+page.svelte
new file mode 100644
index 00000000..7d7958f1
--- /dev/null
+++ b/src/routes/(app)/[username]/receive/+page.svelte
@@ -0,0 +1,343 @@
+<script>
+  import { send } from "$lib/socket";
+  import {
+    btc,
+    post,
+    back,
+    copy,
+    f,
+    get,
+    types,
+    sat,
+    reverseFormat,
+    s,
+    sats,
+  } from "$lib/utils";
+  import { tick, onMount, onDestroy } from "svelte";
+  import { browser } from "$app/environment";
+  import { last, showQr, amountPrompt } from "$lib/store";
+  import Avatar from "$comp/Avatar.svelte";
+  import Icon from "$comp/Icon.svelte";
+  import Heart from "$comp/Heart.svelte";
+  import Image from "$comp/Image.svelte";
+  import Numpad from "$comp/Numpad.svelte";
+  import { t } from "$lib/translations";
+  import { goto, invalidate } from "$app/navigation";
+  import Toggle from "$comp/Toggle.svelte";
+
+  export let data;
+
+  let showOptions;
+
+  let reading = async ({ message, serialNumber }) => {
+    let name = serialNumber.replace(/:/g, "-");
+    let result = await post(`/fund/${name}/withdraw`, { amount, hash, name });
+  };
+
+  let readingerror = (e) => console.log("nfc error", e);
+
+  $: refresh(data);
+  let { invoice, id, subject, user, src } = data;
+  let {
+    account_id,
+    amount,
+    hash,
+    type,
+    rate,
+    text,
+    tip,
+    user: { username, currency },
+  } = invoice;
+
+  let qr;
+  let tipPercent = 0;
+
+  let refresh = async (data) => {
+    ({ invoice, id, user, src } = data);
+    ({
+      account_id,
+      amount,
+      hash,
+      type,
+      rate,
+      text,
+      tip,
+      user: { username, currency },
+    } = invoice);
+
+    tipPercent = (tip / amount) * 100;
+  };
+
+  $: amountFiat = parseFloat(((amount * rate) / sats).toFixed(2));
+  $: tipAmount = ((tip * rate) / sats).toFixed(2);
+
+  let subbed;
+
+  onMount(async () => {
+    if (browser) {
+      last.subscribe((v) => {
+        if (!v || subbed) return;
+        subbed = true;
+        send("subscribe", invoice);
+      });
+
+      if ($amountPrompt && tip === undefined) toggleAmount();
+    }
+  });
+
+  $: link = [types.bitcoin, types.liquid].includes(type)
+    ? text
+    : `lightning:${text}`;
+  $: txt = [types.bitcoin, types.liquid].includes(type) ? hash : text;
+
+  let setType = async (type) => {
+    invoice.type = type;
+    ({ id } = await post(`/invoice`, {
+      invoice,
+      user: { username, currency },
+    }));
+
+    goto(`./${id}?options=true`, { invalidateAll: true, noScroll: true });
+  };
+
+  let setAmount = async () => {
+    if (typeof $amountPrompt === "undefined") $amountPrompt = true;
+    settingAmount = false;
+    amount = newAmount;
+    invoice.amount = newAmount;
+    invoice.tip = 0;
+    ({ id } = await post(`/invoice`, {
+      invoice,
+      user: { username, currency },
+    }));
+
+    let url = `./${id}`;
+    if (subject?.prompt) url += "/tip";
+    else url += "?options=true";
+
+    goto(url, { invalidateAll: true, noScroll: true });
+  };
+
+  let newAmount;
+  let settingAmount;
+  let toggleAmount = () => (settingAmount = !settingAmount);
+  let fiat;
+  let submit;
+</script>
+
+<div class="invoice container mx-auto max-w-xl px-4 space-y-2">
+  {#if $showQr}
+    <div>
+      <a
+        href={[types.bitcoin, types.liquid].includes(invoice.type)
+          ? invoice.text
+          : "lightning:" + invoice.text}
+      >
+        <img
+          {src}
+          class="mx-auto z-10 max-w-[360px]"
+          bind:this={qr}
+          alt={txt}
+        />
+      </a>
+    </div>
+  {:else}
+    <div class="break-all pb-5 text-center text-secondary text-xl">
+      {txt}
+    </div>
+  {/if}
+
+  {#each invoice.items as i}
+    <div class="grid grid-cols-12 text-xl">
+      <div class="col-span-1 my-auto">{i.quantity}</div>
+      <div class="mr-auto grow col-span-7 my-auto">
+        {i.name}
+      </div>
+      <div class="col-span-2 font-semibold text-right my-auto">
+        {f(i.price * i.quantity, currency)}
+      </div>
+      <div class="col-span-2 text-secondary text-right text-lg my-auto">
+        {sat(btc(i.price * i.quantity, rate))}
+      </div>
+    </div>
+  {/each}
+
+  {#if amount > 0}
+    <div class="text-center font-bold text-2xl">
+      <div>
+        {f(amountFiat, currency)}
+
+        {#if tip}
+          <span class="text-sm">
+            +{f(tip * (rate / sats), currency)}
+          </span>
+        {/if}
+      </div>
+      <div>
+        <span class="text-secondary font-normal text-xl"
+          >⚡️{`${s(amount)}`}</span
+        >
+
+        {#if tip}
+          <span class="text-sm text-secondary font-normal">
+            +⚡️{s(tip)}
+          </span>
+        {/if}
+      </div>
+    </div>
+  {/if}
+
+  <div class="text-secondary space-y-2 text-xl pt-2">
+    <button
+      type="button"
+      class="flex gap-2 text-center break-all rounded-2xl hover:opacity-80 py-5 px-6 w-full mx-auto justify-center border whitespace-nowrap mb-2"
+      on:click={() => copy(txt)}
+    >
+      <Icon icon="copy" style="w-8 my-auto" />
+      <div class="my-auto">
+        {$t("payments.copy")}
+      </div>
+    </button>
+
+    {#if user?.id === invoice?.user?.id}
+      <button
+        class="w-full flex justify-center rounded-2xl border py-5 px-6 hover:opacity-80"
+        on:click={toggleAmount}
+      >
+        <Icon icon="edit" style="mr-1 w-8" />
+        <div class="my-auto">{$t("payments.setAmount")}</div>
+      </button>
+    {:else}
+      <a href={link} class="w-full">
+        <button
+          class="w-full flex justify-center rounded-2xl border py-5 px-6 hover:opacity-80"
+        >
+          <Icon icon="mobile" style="mr-1 w-8" />
+          <div class="my-auto">{$t("payments.openLink")}</div>
+        </button>
+      </a>
+    {/if}
+
+    <div class="w-full flex justify-center gap-2 flex-wrap">
+      <button
+        class="w-full flex justify-center rounded-2xl border py-5 px-6 hover:opacity-80"
+        on:click={() => ($showQr = !$showQr)}
+      >
+        {#if $showQr}
+          <Icon icon="text" style="w-6 mr-2 my-auto" />
+        {:else}
+          <Icon icon="qr" style="w-8 mr-1 invert my-auto" />
+        {/if}
+        <div class="my-auto">
+          {$showQr ? $t("payments.showText") : $t("payments.showQr")}
+        </div></button
+      >
+    </div>
+  </div>
+
+  {#if account_id === user.id}
+    <div class="grid grid-cols-2 justify-around text-secondary">
+      <button
+        class="hover:bg-primary my-auto flex gap-1 sm:gap-2 py-3 px-2 sm:px-5 justify-center"
+        class:bg-primary={type === types.bitcoin}
+        class:text-black={type === types.bitcoin}
+        on:click={() => setType(types.bitcoin)}
+      >
+        <img src="/images/bitcoin.svg" class="w-8" alt="Bitcoin" />
+        <div class="my-auto text-lg">Bitcoin</div>
+      </button>
+
+      <button
+        class="hover:bg-primary my-auto flex gap-1 sm:gap-2 py-3 px-2 sm:px-5 justify-center"
+        class:bg-primary={type === types.liquid}
+        class:text-black={type === types.liquid}
+        on:click={() => setType(types.liquid)}
+      >
+        <img src="/images/liquid.svg" class="w-8" alt="Liquid" />
+        <div class="my-auto text-lg">Liquid</div>
+      </button>
+
+      <button
+        class="hover:bg-primary flex gap-1 sm:gap-2 py-3 px-2 sm:px-5 justify-center"
+        class:bg-primary={type === types.lightning}
+        class:text-black={type === types.lightning}
+        on:click={() => setType(types.lightning)}
+      >
+        <div class="bg-white rounded-full w-8 h-8 text-center flex">
+          <div class="m-auto">⚡️</div>
+        </div>
+        <div class="my-auto text-lg">Lightning</div>
+      </button>
+
+      {#if user?.id === invoice?.user?.id}
+        <a href={`/receive`} class="block contents">
+          <button
+            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>
+          </button>
+        </a>
+      {/if}
+    </div>
+
+    {#if type === types.liquid}
+      <div class="flex justify-center">
+        <div class="my-auto text-xl text-center text-secondary">
+          {$t("payments.onlyLbtc")}
+          <span class="text-teal-500 font-bold">L-BTC</span>,
+          {$t("payments.dontDeposit")}
+        </div>
+      </div>
+    {/if}
+  {/if}
+</div>
+
+{#if settingAmount}
+  <div
+    class="fixed inset-0 bg-gray-600 bg-opacity-50 overflow-y-auto h-full w-full z-50"
+  >
+    <div
+      class="relative mx-auto p-12 border w-96 shadow-lg rounded-md bg-white space-y-5 top-10"
+    >
+      <form on:submit|preventDefault={setAmount}>
+        <Numpad
+          bind:amount={newAmount}
+          bind:currency
+          bind:rate
+          bind:fiat
+          bind:submit
+        />
+        <div class="w-full flex flex-wrap gap-2">
+          <button
+            bind:this={submit}
+            type="submit"
+            on:click={setAmount}
+            class="border-2 border-black rounded-xl font-semibold mx-auto py-3 w-40 hover:opacity-80 mx-auto bg-black text-white w-full"
+          >
+            <div class="my-auto">Ok</div>
+          </button>
+          <button
+            type="button"
+            class="border-2 border-black rounded-xl font-semibold mx-auto py-3 w-40 hover:opacity-80 mx-auto w-full"
+            on:click={toggleAmount}
+            on:keydown={toggleAmount}
+          >
+            <div class="my-auto">Cancel</div>
+          </button>
+        </div>
+      </form>
+
+      <div class="flex justify-center gap-3">
+        <div class="text-secondary">{$t("payments.amountPrompt")}</div>
+        <Toggle id="notify" bind:value={$amountPrompt} />
+      </div>
+    </div>
+  </div>
+{/if}
+
+<style>
+  .invoice {
+    view-transition-name: invoice;
+  }
+</style>
diff --git a/src/routes/(app)/account/pass/+page.svelte b/src/routes/(app)/account/pass/+page.svelte
index ee29d2c3..0eb16072 100644
--- a/src/routes/(app)/account/pass/+page.svelte
+++ b/src/routes/(app)/account/pass/+page.svelte
@@ -18,7 +18,7 @@
 
   let { user } = data;
 
-  let confirm, password;
+  let confirm, password, revealPassword, revealConfirm;
 
   onMount(() => {
     if (!$mnemonic) goto("/account/savings");
@@ -65,13 +65,66 @@
     class="container w-full mx-auto text-lg px-4 max-w-xl space-y-5"
   >
     <p class="text-secondary mb-1">
-      Please add a password to the account. It should be different than your
-      login password. <b class="text-red-700">We won't be able to reset it.</b> You'll
-      need it to make withdrawals.
+      Careful! If you lose this password you won't be able to use the account.
+      We can't recover it for you.
     </p>
 
-    <input use:focus type="text" placeholder="Password" bind:value={password} />
-    <input type="text" placeholder="Confirm password" bind:value={confirm} />
+    <div class="relative">
+      {#if revealPassword}
+        <input
+          name="password"
+          type="text"
+          required
+          bind:value={password}
+          autocapitalize="none"
+        />
+      {:else}
+        <input
+          use:focus
+          name="password"
+          type="password"
+          required
+          bind:value={password}
+          autocapitalize="none"
+        />
+      {/if}
+      <button
+        type="button"
+        on:click={() => (revealPassword = !revealPassword)}
+        class="absolute right-5 -translate-y-1/2 top-1/2"
+      >
+        <Icon icon={revealPassword ? "eye" : "eye-off"} />
+      </button>
+    </div>
+
+    <div class="relative">
+      {#if revealConfirm}
+        <input
+          name="password"
+          type="text"
+          placeholder="Confirm password"
+          required
+          bind:value={confirm}
+          autocapitalize="none"
+        />
+      {:else}
+        <input
+          name="password"
+          type="password"
+          placeholder="Confirm password"
+          required
+          bind:value={confirm}
+          autocapitalize="none"
+        />
+      {/if}
+      <button
+        type="button"
+        on:click={() => (revealConfirm = !revealConfirm)}
+        class="absolute right-5 -translate-y-1/2 top-1/2"
+      >
+        <Icon icon={revealConfirm ? "eye" : "eye-off"} />
+      </button>
+    </div>
 
     <button
       class="bg-black text-white w-full px-5 py-6 text-xl rounded-2xl font-bold"
diff --git a/src/routes/(app)/account/seed/+page.svelte b/src/routes/(app)/account/seed/+page.svelte
index 9c19e820..e922d6be 100644
--- a/src/routes/(app)/account/seed/+page.svelte
+++ b/src/routes/(app)/account/seed/+page.svelte
@@ -17,9 +17,6 @@
   });
 
   let generate = async () => {
-    $mnemonic = "- - - - - - - - - - - -";
-    await tick();
-    await new Promise((r) => setTimeout(r, 250));
     $mnemonic = await generateMnemonic(wordlist);
   };
 </script>
@@ -30,7 +27,7 @@
   <div class="container w-full mx-auto text-lg px-4 max-w-xl space-y-5">
     {#if $mnemonic}
       <div
-        class="text-2xl border p-4 rounded-2xl text-secondary grid grid-rows-6 grid-flow-col gap-2 justify-center gap-x-40"
+        class="text-lg border p-4 rounded-2xl text-secondary grid grid-cols-3 gap-2 justify-center"
       >
         {#each $mnemonic.split(" ") as w, i}
           <div>
diff --git a/src/routes/(app)/account/setup/+page.svelte b/src/routes/(app)/account/setup/+page.svelte
index 8304c5ed..f5a5ac09 100644
--- a/src/routes/(app)/account/setup/+page.svelte
+++ b/src/routes/(app)/account/setup/+page.svelte
@@ -8,7 +8,7 @@
   <div class="container w-full mx-auto text-lg px-4 max-w-xl space-y-5">
     <a href="/account/cash" class="block">
       <div class="shadow p-8 rounded-xl flex gap-4 hover:bg-primary">
-        <img src="/images/cash.png" class="w-20" />
+        <img src="/images/cash.png" class="w-20 my-auto" />
         <div>
           <div class="text-xl">Cash</div>
           <div class="text-secondary">
@@ -20,7 +20,7 @@
     </a>
     <a href="/account/savings" class="block">
       <div class="shadow p-8 rounded-xl flex gap-4 hover:bg-primary">
-        <img src="/images/keys.png" class="w-20" />
+        <img src="/images/keys.png" class="w-20 my-auto" />
         <div>
           <div class="text-xl">Savings</div>
           <div class="text-secondary">
diff --git a/src/routes/(app)/invoice/+page.server.ts b/src/routes/(app)/invoice/+page.server.ts
index 05851430..98bbe8c3 100644
--- a/src/routes/(app)/invoice/+page.server.ts
+++ b/src/routes/(app)/invoice/+page.server.ts
@@ -3,19 +3,18 @@ import { error, redirect } from "@sveltejs/kit";
 import type { Invoice } from "$lib/types";
 
 export let load = async ({ cookies, parent }) => {
-  let account = cookies.get("account");
+  let account_id = cookies.get("account_id");
   let { subject, user, rates } = await parent();
 
   let invoice: Invoice = {
-    account,
-    type: account ? "bitcoin" : "lightning",
+    account_id,
     rate: rates[user?.currency || subject?.currency],
   };
 
   if (!user) user = subject;
 
   try {
-    invoice = await post("/invoice", { invoice, account, user }, auth(cookies));
+    invoice = await post("/invoice", { invoice, account_id, user }, auth(cookies));
   } catch (e) {
     console.log(e);
     error(500, "Failed to generate invoice");
diff --git a/src/routes/(app)/invoice/[id]/+layout.server.ts b/src/routes/(app)/invoice/[id]/+layout.server.ts
index a00515a0..55c44f36 100644
--- a/src/routes/(app)/invoice/[id]/+layout.server.ts
+++ b/src/routes/(app)/invoice/[id]/+layout.server.ts
@@ -7,30 +7,32 @@ export async function load({ depends, params, url, parent }) {
 
   let { subject, user } = await parent();
   let { id } = params;
-  let invoice = await get(`/invoice/${id}`);
-  let options = !!url.searchParams.get("options");
+  let invoice;
 
-  if (
-    user &&
-    invoice.uid !== user.id &&
-    !(url.pathname.includes("tip") || url.pathname.includes("memo")) &&
-    !options
-  ) {
-    console.log("YO")
-    redirect(307, `/send/invoice/${id}`);
-  }
+  if (id) {
+    invoice = await get(`/invoice/${id}`);
+    let options = !!url.searchParams.get("options");
 
-  let { amount, pending, received } = invoice;
-  amount = parseInt(amount);
+    if (
+      user &&
+      invoice.uid !== user.id &&
+      !(url.pathname.includes("tip") || url.pathname.includes("memo")) &&
+      !options
+    ) {
+      redirect(307, `/send/invoice/${id}`);
+    }
 
-  let paid =
-    (!amount && (pending || received)) ||
-    (amount > 0 && (pending >= amount || received >= amount));
-  if (paid && !url.pathname.endsWith("paid")) {
-    redirect(307, `/invoice/${id}/paid` + (options ? "?options=true" : ""));
-  }
+    let { amount, pending, received } = invoice;
+    amount = parseInt(amount);
 
-  let src = Qr.drawImg(invoice.text || "", { size: 500 });
+    let paid =
+      (!amount && (pending || received)) ||
+      (amount > 0 && (pending >= amount || received >= amount));
+    if (paid && !url.pathname.endsWith("paid")) {
+      redirect(307, `/invoice/${id}/paid` + (options ? "?options=true" : ""));
+    }
+  }
 
+  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 96ff6406..321129a8 100644
--- a/src/routes/(app)/invoice/[id]/+page.svelte
+++ b/src/routes/(app)/invoice/[id]/+page.svelte
@@ -40,7 +40,7 @@
   $: refresh(data);
   let { invoice, id, subject, user, src } = data;
   let {
-    account,
+    account_id,
     amount,
     hash,
     type,
@@ -56,7 +56,7 @@
   let refresh = async (data) => {
     ({ invoice, id, user, src } = data);
     ({
-      account,
+      account_id,
       amount,
       hash,
       type,
@@ -82,7 +82,7 @@
         send("subscribe", invoice);
       });
 
-      if ($amountPrompt && !tip) toggleAmount();
+      if ($amountPrompt && tip === null) toggleAmount();
     }
   });
 
@@ -236,10 +236,10 @@
     </div>
   </div>
 
-  {#if !account}
-    <div class="flex justify-around text-secondary">
+  {#if account_id === user.id}
+    <div class="grid grid-cols-2 justify-around text-secondary">
       <button
-        class="hover:bg-primary my-auto flex gap-1 sm:gap-2 py-3 px-2 sm:px-5 w-full justify-center"
+        class="hover:bg-primary my-auto flex gap-1 sm:gap-2 py-3 px-2 sm:px-5 justify-center"
         class:bg-primary={type === types.bitcoin}
         class:text-black={type === types.bitcoin}
         on:click={() => setType(types.bitcoin)}
@@ -249,7 +249,7 @@
       </button>
 
       <button
-        class="hover:bg-primary my-auto flex gap-1 sm:gap-2 py-3 px-2 sm:px-5 w-full justify-center"
+        class="hover:bg-primary my-auto flex gap-1 sm:gap-2 py-3 px-2 sm:px-5 justify-center"
         class:bg-primary={type === types.liquid}
         class:text-black={type === types.liquid}
         on:click={() => setType(types.liquid)}
@@ -259,7 +259,7 @@
       </button>
 
       <button
-        class="hover:bg-primary flex gap-1 sm:gap-2 py-3 px-2 sm:px-5 w-full justify-center"
+        class="hover:bg-primary flex gap-1 sm:gap-2 py-3 px-2 sm:px-5 justify-center"
         class:bg-primary={type === types.lightning}
         class:text-black={type === types.lightning}
         on:click={() => setType(types.lightning)}
@@ -269,30 +269,28 @@
         </div>
         <div class="my-auto text-lg">Lightning</div>
       </button>
-    </div>
-  {/if}
 
-  {#if type === types.liquid}
-    <div class="flex justify-center">
-      <div class="my-auto text-xl text-center text-secondary">
-        {$t("payments.onlyLbtc")}
-        <span class="text-teal-500 font-bold">L-BTC</span>,
-        {$t("payments.dontDeposit")}
-      </div>
+      {#if user?.id === invoice?.user?.id}
+        <a href={`/receive`} class="block contents">
+          <button
+            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>
+          </button>
+        </a>
+      {/if}
     </div>
-  {/if}
 
-  {#if user?.id === invoice?.user?.id}
-    <a href={`/receive`} class="block">
-      <button
-        class="flex gap-2 text-center break-all rounded-2xl hover:opacity-80 py-5 px-6 w-full mx-auto justify-center border text-xl whitespace-nowrap text-secondary"
-      >
-        <Icon icon="voucher" style="w-8 my-auto" />
-        <div class="my-auto">
-          {$t("payments.redeemVoucher")}
-        </div></button
-      >
-    </a>
+    {#if type === types.liquid}
+      <div class="flex justify-center">
+        <div class="my-auto text-xl text-center text-secondary">
+          {$t("payments.onlyLbtc")}
+          <span class="text-teal-500 font-bold">L-BTC</span>,
+          {$t("payments.dontDeposit")}
+        </div>
+      </div>
+    {/if}
   {/if}
 </div>
 
diff --git a/src/routes/(app)/invoice/[id]/tip/+page.server.ts b/src/routes/(app)/invoice/[id]/tip/+page.server.ts
index 8417de91..48ebf970 100644
--- a/src/routes/(app)/invoice/[id]/tip/+page.server.ts
+++ b/src/routes/(app)/invoice/[id]/tip/+page.server.ts
@@ -1,7 +1,7 @@
 import invoice from "$lib/invoice";
 import { redirect } from "@sveltejs/kit";
 
-export async function load({ parent, params }) {
+export async function load({ parent }) {
   let { invoice } = await parent();
   if (!invoice.amount)
     redirect(307, `/invoice/${invoice.id}`);
diff --git a/src/routes/(app)/invoice/[id]/tip/+page.svelte b/src/routes/(app)/invoice/[id]/tip/+page.svelte
index 35b24bf1..e4510693 100644
--- a/src/routes/(app)/invoice/[id]/tip/+page.svelte
+++ b/src/routes/(app)/invoice/[id]/tip/+page.svelte
@@ -59,6 +59,7 @@
   $: refresh(data);
   let { invoice, id, user, rates } = data;
   let {
+    account_id,
     amount,
     hash,
     items,
@@ -81,6 +82,7 @@
 
     ({ invoice, id } = data);
     ({
+      account_id,
       amount,
       hash,
       items,
@@ -111,6 +113,7 @@
 
 <div class="container px-4 max-w-lg text-center mx-auto">
   <form method="POST" use:enhance class:invisible={submitting}>
+    <input type="hidden" name="account_id" value={account_id} />
     <input type="hidden" name="amount" value={amount} />
     <input type="hidden" name="tip" value={tip} />
     <input type="hidden" name="username" value={username} />
diff --git a/src/routes/(app)/logout/+page.server.ts b/src/routes/(app)/logout/+page.server.ts
index 9c2a029c..03dff6a8 100644
--- a/src/routes/(app)/logout/+page.server.ts
+++ b/src/routes/(app)/logout/+page.server.ts
@@ -7,7 +7,7 @@ const opts = {
 
 export async function load({ cookies }) {
   let lang = cookies.get("lang");
-  cookies.set("account", "", opts);
+  cookies.set("account_id", "", opts);
   cookies.set("lang", "", opts);
   cookies.set("username", "", opts);
   cookies.set("token", "", opts);
diff --git a/src/routes/(app)/send/[...text]/+page.svelte b/src/routes/(app)/send/[...text]/+page.svelte
index d1b6cc23..be7fc664 100644
--- a/src/routes/(app)/send/[...text]/+page.svelte
+++ b/src/routes/(app)/send/[...text]/+page.svelte
@@ -18,7 +18,7 @@
 
   let el, text, pasted, w;
 
-  let keypress = (e) => e.key === "Enter" && (e.preventDefault() || el.click());
+  let keypress = (e) => e.key === "Enter" ? (e.preventDefault() || el.click()) : (pasted = false);
 
   let paste = async () => {
     text = await navigator.clipboard.readText();
@@ -52,7 +52,7 @@
         name="text"
         placeholder={$t("user.send.placeholder")}
         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"
@@ -95,7 +95,7 @@
           type="button"
           class="flex border rounded-2xl px-6 py-5 w-full font-bold gap-2 justify-center text-xl bg-primary"
         >
-          <Icon icon="voucher" style="w-8 my-auto" />
+          <img src="/images/cash.png" class="w-8" />
           <div class="my-auto">{$t("payments.createEcash")}</div>
         </button>
       </a>
diff --git a/src/routes/(app)/send/ecash/+page.svelte b/src/routes/(app)/send/ecash/+page.svelte
index 615c068a..ef8e368c 100644
--- a/src/routes/(app)/send/ecash/+page.svelte
+++ b/src/routes/(app)/send/ecash/+page.svelte
@@ -30,18 +30,14 @@
 </script>
 
 <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")}
-  </h1>
-
   <form use:enhance={handler(toggle)} method="POST">
     <Numpad bind:amount bind:fiat {currency} {submit} bind:rate={$rate} />
     <input type="hidden" name="amount" bind:value={amount} />
 
-    <div class="flex justify-center gap-2">
+    <div>
       <button
         type="button"
-        class="hover:opacity-80 bg-black text-white rounded-2xl py-3 px-4 mt-2 border font-bold"
+        class="hover:opacity-80 rounded-2xl py-3 px-4 mt-2 border font-bold w-full max-w-[340px] mx-auto"
         on:click|preventDefault={setMax}
         disabled={submitting}
         on:keydown={setMax}>Max ⚡️{s(balance)}</button
@@ -51,12 +47,13 @@
         use:focus
         bind:this={submit}
         type="submit"
-        class="opacity-100 hover:opacity-80 rounded-2xl border py-3 font-bold mt-2 bg-black text-white px-4 w-24"
+        class="opacity-100 hover:opacity-80 rounded-2xl border py-3 font-bold mt-2 bg-black text-white px-4 w-full flex justify-center gap-2 max-w-[340px] mx-auto"
       >
         {#if submitting}
           <Spinner />
         {:else}
-          {$t("payments.mint")}
+          <img src="/images/cash.png" class="w-8" />
+          <div class="my-auto">{$t("payments.mint")}</div>
         {/if}
       </button>
     </div>
diff --git a/src/routes/(app)/send/lightning/[payreq]/+page.svelte b/src/routes/(app)/send/lightning/[payreq]/+page.svelte
index 57a17e01..74c100f8 100644
--- a/src/routes/(app)/send/lightning/[payreq]/+page.svelte
+++ b/src/routes/(app)/send/lightning/[payreq]/+page.svelte
@@ -58,11 +58,7 @@
   let toggle = () => (show = !show);
 </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-xl mx-auto text-center space-y-5">
+<div class="container px-4 max-w-xl mx-auto text-center space-y-2">
   {#if amount}
     {#if form?.message}
       <div class="text-red-600 text-center">
@@ -81,12 +77,9 @@
       <h3 class="text-secondary text-xl">⚡️{s(amount)}</h3>
     </div>
 
-    <div>
-      <div class="text-lg text-secondary">
-        {$t("payments.to")}
-      </div>
-
-      <p class="text-2xl break-words font-semibold mb-8">{alias}</p>
+    <div class="text-xl">
+      <span class="text-secondary">{$t("payments.to")}</span>
+      <span class="break-words font-semibold">{alias}</span>
     </div>
 
     {#if ourfee}
@@ -109,7 +102,7 @@
       use:enhance
       on:submit={submit}
       action="?/send"
-      class="space-y-5"
+      class="space-y-2"
     >
       <input name="payreq" value={payreq} type="hidden" />
       <input name="amount" value={amount} type="hidden" />
diff --git a/static/icons/cash.svg b/static/icons/cash.svg
new file mode 100644
index 00000000..966c00a5
--- /dev/null
+++ b/static/icons/cash.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" ?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg width="800px" height="800px" viewBox="0 0 30 30" id="Layer_1" version="1.1" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><style type="text/css">
+	.st0{fill:#FD6A7E;}
+	.st1{fill:#17B978;}
+	.st2{fill:#8797EE;}
+	.st3{fill:#41A6F9;}
+	.st4{fill:#37E0FF;}
+	.st5{fill:#2FD9B9;}
+	.st6{fill:#F498BD;}
+	.st7{fill:#FFDF1D;}
+	.st8{fill:#C6C9CC;}
+</style><path class="st1" d="M26,5H4C3.4,5,3,5.4,3,6v12c0,0.6,0.4,1,1,1h22c0.6,0,1-0.4,1-1V6C27,5.4,26.6,5,26,5z M5.5,14  c-0.2,0-0.4,0-0.5,0.1V9.9C5.1,10,5.3,10,5.5,10C6.9,10,8,8.9,8,7.5C8,7.3,8,7.1,7.9,7h14.1C22,7.1,22,7.3,22,7.5  c0,1.4,1.1,2.5,2.5,2.5c0.2,0,0.4,0,0.5-0.1v4.1c-0.1,0-0.3-0.1-0.5-0.1c-1.4,0-2.5,1.1-2.5,2.5c0,0.2,0,0.4,0.1,0.5H7.9  C8,16.9,8,16.7,8,16.5C8,15.1,6.9,14,5.5,14z M12,12c0-1.7,1.3-3,3-3s3,1.3,3,3s-1.3,3-3,3S12,13.7,12,12z M5,22v-1h20v1  c0,0.6-0.4,1-1,1H6C5.4,23,5,22.6,5,22z M7.4,26v-1h15v1c0,0.6-0.4,1-1,1h-13C7.8,27,7.4,26.6,7.4,26z"/></svg>
\ No newline at end of file
diff --git a/static/icons/text.svg b/static/icons/text.svg
index 2bf9998f..a8fe6e04 100644
--- a/static/icons/text.svg
+++ b/static/icons/text.svg
@@ -1,17 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
-<svg width="800px" height="800px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    
-    <title>align-left</title>
-    <desc>Created with Sketch Beta.</desc>
-    <defs>
-
-</defs>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <g id="Icon-Set-Filled" sketch:type="MSLayerGroup" transform="translate(-310.000000, -208.000000)" fill="#000000">
-            <path d="M328,232 L312,232 C310.896,232 310,232.896 310,234 C310,235.104 310.896,236 312,236 L328,236 C329.104,236 330,235.104 330,234 C330,232.896 329.104,232 328,232 L328,232 Z M336,224 L312,224 C310.896,224 310,224.896 310,226 C310,227.104 310.896,228 312,228 L336,228 C337.104,228 338,227.104 338,226 C338,224.896 337.104,224 336,224 L336,224 Z M312,220 L328,220 C329.104,220 330,219.104 330,218 C330,216.896 329.104,216 328,216 L312,216 C310.896,216 310,216.896 310,218 C310,219.104 310.896,220 312,220 L312,220 Z M312,212 L336,212 C337.104,212 338,211.104 338,210 C338,208.896 337.104,208 336,208 L312,208 C310.896,208 310,208.896 310,210 C310,211.104 310.896,212 312,212 L312,212 Z" id="align-left" sketch:type="MSShapeGroup">
-
-</path>
-        </g>
-    </g>
+<?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg width="800px" height="800px" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12 3V21M9 21H15M19 6V3H5V6" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
\ No newline at end of file
-- 
cgit v1.2.3


From 5c86d9eadaa0021928ea39c7d0e875d0c446280f Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Fri, 20 Sep 2024 10:03:22 -0700
Subject: import key

---
 src/routes/(app)/account/import/+page.svelte              | 15 +++++++++------
 src/routes/(app)/account/pass/+page.svelte                |  7 ++++---
 src/routes/(app)/payments/[...page]/+page.server.ts       |  4 ++--
 src/routes/(app)/send/bitcoin/[address]/+page.server.ts   |  4 ++--
 .../[address]/[amount]/[...feeRate]/+page.server.ts       |  8 ++++----
 src/routes/(app)/sent/+page.server.ts                     |  4 ++--
 6 files changed, 23 insertions(+), 19 deletions(-)

(limited to 'src')

diff --git a/src/routes/(app)/account/import/+page.svelte b/src/routes/(app)/account/import/+page.svelte
index 1e28f9df..866c1b1a 100644
--- a/src/routes/(app)/account/import/+page.svelte
+++ b/src/routes/(app)/account/import/+page.svelte
@@ -1,11 +1,12 @@
 <script>
+  import { goto } from "$app/navigation";
+  import { mnemonic } from "$lib/store";
   import { versions } from "$lib/utils";
   import { t } from "$lib/translations";
   import { browser } from "$app/environment";
   import Icon from "$comp/Icon.svelte";
   import { validateMnemonic } from "@scure/bip39";
   import { wordlist } from "@scure/bip39/wordlists/english";
-  import { HDKey } from "@scure/bip32";
 
   let el, pasted, text;
 
@@ -16,10 +17,12 @@
 
   let submit = () => {
     let valid = validateMnemonic(text, wordlist);
-    let v2 = HDKey.fromExtendedKey(text, versions);
-
-    console.log(valid);
-    console.log(v2);
+    if (valid) {
+      $mnemonic = text;
+      goto("/account/pass");
+    } else {
+      fail("Failed to validate seed phrase");
+    }
   };
 
   $: if (browser && pasted && text) form.submit() && (pasted = false);
@@ -34,7 +37,7 @@
         <textarea
           use:focus
           name="text"
-          placeholder="Enter a seed phrase or extended key"
+          placeholder="Enter a seed phrase"
           class="w-full p-4 border rounded-xl h-48 text-xl"
           bind:value={text}
           autocapitalize="none"
diff --git a/src/routes/(app)/account/pass/+page.svelte b/src/routes/(app)/account/pass/+page.svelte
index 0eb16072..cf4e80e6 100644
--- a/src/routes/(app)/account/pass/+page.svelte
+++ b/src/routes/(app)/account/pass/+page.svelte
@@ -19,6 +19,7 @@
   let { user } = data;
 
   let confirm, password, revealPassword, revealConfirm;
+      let type = "bitcoin";
 
   onMount(() => {
     if (!$mnemonic) goto("/account/savings");
@@ -44,7 +45,7 @@
       let fingerprint = child.fingerprint.toString(16).padStart(8, "0");
 
       let receiving = child.deriveChild(0);
-      await post("/api/accounts", { fingerprint, pubkey, seed });
+      await post("/api/accounts", { fingerprint, pubkey, seed, type });
       goto(`/${user.username}`);
     } catch (e) {
       console.log(e);
@@ -65,8 +66,8 @@
     class="container w-full mx-auto text-lg px-4 max-w-xl space-y-5"
   >
     <p class="text-secondary mb-1">
-      Careful! If you lose this password you won't be able to use the account.
-      We can't recover it for you.
+      If you lose this password you won't be able to use the account. We can't
+      recover it for you even if you have the seed phrase.
     </p>
 
     <div class="relative">
diff --git a/src/routes/(app)/payments/[...page]/+page.server.ts b/src/routes/(app)/payments/[...page]/+page.server.ts
index e781022e..311d4435 100644
--- a/src/routes/(app)/payments/[...page]/+page.server.ts
+++ b/src/routes/(app)/payments/[...page]/+page.server.ts
@@ -5,7 +5,7 @@ let limit = 25;
 export async function load({ cookies, depends, params }) {
   depends("app:payments");
 
-  let account = cookies.get("account");
+  let account_id = cookies.get("account_id");
   let parts = params.page.split("/");
 
   let start, end, page;
@@ -17,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=${account}&start=${
+  let url = `/payments?account_id=${account_id}&start=${
     start * 1000
   }&limit=${limit}&offset=${offset}`;
   if (end) url += `&end=${end * 1000}`;
diff --git a/src/routes/(app)/send/bitcoin/[address]/+page.server.ts b/src/routes/(app)/send/bitcoin/[address]/+page.server.ts
index 3e56e15a..d3b71d0a 100644
--- a/src/routes/(app)/send/bitcoin/[address]/+page.server.ts
+++ b/src/routes/(app)/send/bitcoin/[address]/+page.server.ts
@@ -1,7 +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));
+  let account_id = cookies.get("account_id");
+  let { balance } = await get(`/account/${account_id}`, auth(cookies));
   return { balance };
 }
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 33e96595..6aee85b9 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
@@ -2,16 +2,16 @@ import { fail, redirect } from "@sveltejs/kit";
 import { auth, get, post, fd } from "$lib/utils";
 
 export async function load({ params: { address, amount, feeRate }, cookies }) {
-  let account = cookies.get("account");
+  let account_id = cookies.get("account_id");
 
   try {
     let { fee, fees, inputs, ourfee, hex } = await post(
       "/bitcoin/fee",
-      { address, amount, feeRate, account },
+      { address, amount, feeRate, account_id },
       auth(cookies)
     );
 
-    account = await get(`/account/${account}`, auth(cookies));
+    let account = await get(`/account/${account_id}`, auth(cookies));
 
     return {
       account,
@@ -25,7 +25,7 @@ export async function load({ params: { address, amount, feeRate }, cookies }) {
       inputs,
     };
   } catch (e: any) {
-    return { account, amount, address, feeRate, message: e.message };
+    return { amount, address, feeRate, message: e.message };
   }
 }
 
diff --git a/src/routes/(app)/sent/+page.server.ts b/src/routes/(app)/sent/+page.server.ts
index 4cf580ee..9aeda733 100644
--- a/src/routes/(app)/sent/+page.server.ts
+++ b/src/routes/(app)/sent/+page.server.ts
@@ -1,7 +1,7 @@
 import { get, auth } from "$lib/utils";
 
 export let load = async ({ cookies }) => {
-  let account = cookies.get("account");
-  let { payments } = await get(`/payments?account=${account}`, auth(cookies));
+  let account_id = cookies.get("account_id");
+  let { payments } = await get(`/payments?account_id=${account_id}`, auth(cookies));
   return { payments };
 };
-- 
cgit v1.2.3


From fb8510db273f78317a02ca151f7f24a9b8de29ab Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Fri, 20 Sep 2024 10:03:30 -0700
Subject: rename account_id

---
 src/components/Account.svelte                                       | 2 +-
 src/lib/invoice.ts                                                  | 4 ++--
 src/lib/types.ts                                                    | 2 +-
 src/routes/(app)/[username]/receive/+page.svelte                    | 6 +++---
 src/routes/(app)/invoice/+page.server.ts                            | 6 +++---
 src/routes/(app)/invoice/[id]/+page.svelte                          | 6 +++---
 src/routes/(app)/invoice/[id]/tip/+page.svelte                      | 6 +++---
 src/routes/(app)/logout/+page.server.ts                             | 2 +-
 src/routes/(app)/payments/[...page]/+page.server.ts                 | 4 ++--
 src/routes/(app)/send/bitcoin/[address]/+page.server.ts             | 4 ++--
 .../send/bitcoin/[address]/[amount]/[...feeRate]/+page.server.ts    | 6 +++---
 src/routes/(app)/sent/+page.server.ts                               | 4 ++--
 12 files changed, 26 insertions(+), 26 deletions(-)

(limited to 'src')

diff --git a/src/components/Account.svelte b/src/components/Account.svelte
index 0baeb9a0..47deadcd 100644
--- a/src/components/Account.svelte
+++ b/src/components/Account.svelte
@@ -12,7 +12,7 @@
   let refresh = (a) => ({ seed, balance, id } = a);
 
   let setAccount = () =>
-    (document.cookie = `account_id=${id}; path=/; max-age=86400`);
+    (document.cookie = `aid=${id}; path=/; max-age=86400`);
 </script>
 
 <a href={`/payments`} class="block" on:click={setAccount}>
diff --git a/src/lib/invoice.ts b/src/lib/invoice.ts
index 0a50b876..fa2f7786 100644
--- a/src/lib/invoice.ts
+++ b/src/lib/invoice.ts
@@ -2,14 +2,14 @@ import { auth, get, post } from "$lib/utils";
 import { redirect } from "@sveltejs/kit";
 
 export default async ({ cookies, request }) => {
-  let account_id = cookies.get("account_id");
+  let aid = cookies.get("aid");
   let form = await request.formData();
 
   let rates = await get("/rates");
   let amount = parseInt(form.get("amount"));
 
   let invoice = {
-    account_id,
+    aid,
     amount,
     items: JSON.parse(form.get("items")),
     memo: form.get("memo"),
diff --git a/src/lib/types.ts b/src/lib/types.ts
index 67a51f62..827f96aa 100644
--- a/src/lib/types.ts
+++ b/src/lib/types.ts
@@ -14,7 +14,7 @@ export interface User {
 }
 
 export interface Invoice {
-  account_id: string;
+  aid: string;
   id?: string;
   memoPrompt?: boolean;
   memo?: string;
diff --git a/src/routes/(app)/[username]/receive/+page.svelte b/src/routes/(app)/[username]/receive/+page.svelte
index 7d7958f1..9977cc76 100644
--- a/src/routes/(app)/[username]/receive/+page.svelte
+++ b/src/routes/(app)/[username]/receive/+page.svelte
@@ -39,7 +39,7 @@
   $: refresh(data);
   let { invoice, id, subject, user, src } = data;
   let {
-    account_id,
+    aid,
     amount,
     hash,
     type,
@@ -55,7 +55,7 @@
   let refresh = async (data) => {
     ({ invoice, id, user, src } = data);
     ({
-      account_id,
+      aid,
       amount,
       hash,
       type,
@@ -235,7 +235,7 @@
     </div>
   </div>
 
-  {#if account_id === user.id}
+  {#if aid === user.id}
     <div class="grid grid-cols-2 justify-around text-secondary">
       <button
         class="hover:bg-primary my-auto flex gap-1 sm:gap-2 py-3 px-2 sm:px-5 justify-center"
diff --git a/src/routes/(app)/invoice/+page.server.ts b/src/routes/(app)/invoice/+page.server.ts
index 98bbe8c3..7bac3f9b 100644
--- a/src/routes/(app)/invoice/+page.server.ts
+++ b/src/routes/(app)/invoice/+page.server.ts
@@ -3,18 +3,18 @@ import { error, redirect } from "@sveltejs/kit";
 import type { Invoice } from "$lib/types";
 
 export let load = async ({ cookies, parent }) => {
-  let account_id = cookies.get("account_id");
+  let aid = cookies.get("aid");
   let { subject, user, rates } = await parent();
 
   let invoice: Invoice = {
-    account_id,
+    aid,
     rate: rates[user?.currency || subject?.currency],
   };
 
   if (!user) user = subject;
 
   try {
-    invoice = await post("/invoice", { invoice, account_id, user }, auth(cookies));
+    invoice = await post("/invoice", { invoice, aid, user }, auth(cookies));
   } catch (e) {
     console.log(e);
     error(500, "Failed to generate invoice");
diff --git a/src/routes/(app)/invoice/[id]/+page.svelte b/src/routes/(app)/invoice/[id]/+page.svelte
index 321129a8..580456cd 100644
--- a/src/routes/(app)/invoice/[id]/+page.svelte
+++ b/src/routes/(app)/invoice/[id]/+page.svelte
@@ -40,7 +40,7 @@
   $: refresh(data);
   let { invoice, id, subject, user, src } = data;
   let {
-    account_id,
+    aid,
     amount,
     hash,
     type,
@@ -56,7 +56,7 @@
   let refresh = async (data) => {
     ({ invoice, id, user, src } = data);
     ({
-      account_id,
+      aid,
       amount,
       hash,
       type,
@@ -236,7 +236,7 @@
     </div>
   </div>
 
-  {#if account_id === user.id}
+  {#if aid === user.id}
     <div class="grid grid-cols-2 justify-around text-secondary">
       <button
         class="hover:bg-primary my-auto flex gap-1 sm:gap-2 py-3 px-2 sm:px-5 justify-center"
diff --git a/src/routes/(app)/invoice/[id]/tip/+page.svelte b/src/routes/(app)/invoice/[id]/tip/+page.svelte
index e4510693..da2d041e 100644
--- a/src/routes/(app)/invoice/[id]/tip/+page.svelte
+++ b/src/routes/(app)/invoice/[id]/tip/+page.svelte
@@ -59,7 +59,7 @@
   $: refresh(data);
   let { invoice, id, user, rates } = data;
   let {
-    account_id,
+    aid,
     amount,
     hash,
     items,
@@ -82,7 +82,7 @@
 
     ({ invoice, id } = data);
     ({
-      account_id,
+      aid,
       amount,
       hash,
       items,
@@ -113,7 +113,7 @@
 
 <div class="container px-4 max-w-lg text-center mx-auto">
   <form method="POST" use:enhance class:invisible={submitting}>
-    <input type="hidden" name="account_id" value={account_id} />
+    <input type="hidden" name="aid" value={aid} />
     <input type="hidden" name="amount" value={amount} />
     <input type="hidden" name="tip" value={tip} />
     <input type="hidden" name="username" value={username} />
diff --git a/src/routes/(app)/logout/+page.server.ts b/src/routes/(app)/logout/+page.server.ts
index 03dff6a8..374f244a 100644
--- a/src/routes/(app)/logout/+page.server.ts
+++ b/src/routes/(app)/logout/+page.server.ts
@@ -7,7 +7,7 @@ const opts = {
 
 export async function load({ cookies }) {
   let lang = cookies.get("lang");
-  cookies.set("account_id", "", opts);
+  cookies.set("aid", "", 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 311d4435..f1818955 100644
--- a/src/routes/(app)/payments/[...page]/+page.server.ts
+++ b/src/routes/(app)/payments/[...page]/+page.server.ts
@@ -5,7 +5,7 @@ let limit = 25;
 export async function load({ cookies, depends, params }) {
   depends("app:payments");
 
-  let account_id = cookies.get("account_id");
+  let aid = cookies.get("aid");
   let parts = params.page.split("/");
 
   let start, end, page;
@@ -17,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_id=${account_id}&start=${
+  let url = `/payments?aid=${aid}&start=${
     start * 1000
   }&limit=${limit}&offset=${offset}`;
   if (end) url += `&end=${end * 1000}`;
diff --git a/src/routes/(app)/send/bitcoin/[address]/+page.server.ts b/src/routes/(app)/send/bitcoin/[address]/+page.server.ts
index d3b71d0a..a9b72787 100644
--- a/src/routes/(app)/send/bitcoin/[address]/+page.server.ts
+++ b/src/routes/(app)/send/bitcoin/[address]/+page.server.ts
@@ -1,7 +1,7 @@
 import { auth, get } from "$lib/utils";
 
 export async function load({ cookies }) {
-  let account_id = cookies.get("account_id");
-  let { balance } = await get(`/account/${account_id}`, auth(cookies));
+  let aid = cookies.get("aid");
+  let { balance } = await get(`/account/${aid}`, auth(cookies));
   return { balance };
 }
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 6aee85b9..2b8fe37c 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
@@ -2,16 +2,16 @@ import { fail, redirect } from "@sveltejs/kit";
 import { auth, get, post, fd } from "$lib/utils";
 
 export async function load({ params: { address, amount, feeRate }, cookies }) {
-  let account_id = cookies.get("account_id");
+  let aid = cookies.get("aid");
 
   try {
     let { fee, fees, inputs, ourfee, hex } = await post(
       "/bitcoin/fee",
-      { address, amount, feeRate, account_id },
+      { address, amount, feeRate, aid },
       auth(cookies)
     );
 
-    let account = await get(`/account/${account_id}`, auth(cookies));
+    let account = await get(`/account/${aid}`, auth(cookies));
 
     return {
       account,
diff --git a/src/routes/(app)/sent/+page.server.ts b/src/routes/(app)/sent/+page.server.ts
index 9aeda733..a7c24fb8 100644
--- a/src/routes/(app)/sent/+page.server.ts
+++ b/src/routes/(app)/sent/+page.server.ts
@@ -1,7 +1,7 @@
 import { get, auth } from "$lib/utils";
 
 export let load = async ({ cookies }) => {
-  let account_id = cookies.get("account_id");
-  let { payments } = await get(`/payments?account_id=${account_id}`, auth(cookies));
+  let aid = cookies.get("aid");
+  let { payments } = await get(`/payments?aid=${aid}`, auth(cookies));
   return { payments };
 };
-- 
cgit v1.2.3


From 200c5ff1f4e41ed907a1dd4a0337d8ee0a94b8be Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Fri, 20 Sep 2024 15:43:01 -0700
Subject: qr page

---
 src/locales/en.json                        |  3 ++
 src/routes/(app)/account/pass/+page.svelte |  8 ++--
 src/routes/(app)/qr/[text]/+page.svelte    | 27 ++++++--------
 src/routes/(app)/qr/create/+page.svelte    | 60 ++++++++++++++++++++++++++++++
 4 files changed, 79 insertions(+), 19 deletions(-)
 create mode 100644 src/routes/(app)/qr/create/+page.svelte

(limited to 'src')

diff --git a/src/locales/en.json b/src/locales/en.json
index 36357ef2..9752a41d 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -1,4 +1,7 @@
 {
+  "accounts": {
+    "savings": "Savings"
+  },
 	"404": {
 		"404": "404",
 		"pageNotFound": "Page not found."
diff --git a/src/routes/(app)/account/pass/+page.svelte b/src/routes/(app)/account/pass/+page.svelte
index cf4e80e6..f5e956ff 100644
--- a/src/routes/(app)/account/pass/+page.svelte
+++ b/src/routes/(app)/account/pass/+page.svelte
@@ -19,7 +19,8 @@
   let { user } = data;
 
   let confirm, password, revealPassword, revealConfirm;
-      let type = "bitcoin";
+  let type = "bitcoin";
+  let name = $t("accounts.savings");
 
   onMount(() => {
     if (!$mnemonic) goto("/account/savings");
@@ -45,7 +46,7 @@
       let fingerprint = child.fingerprint.toString(16).padStart(8, "0");
 
       let receiving = child.deriveChild(0);
-      await post("/api/accounts", { fingerprint, pubkey, seed, type });
+      await post("/api/accounts", { fingerprint, pubkey, name, seed, type });
       goto(`/${user.username}`);
     } catch (e) {
       console.log(e);
@@ -90,6 +91,7 @@
         />
       {/if}
       <button
+        tabindex="-1"
         type="button"
         on:click={() => (revealPassword = !revealPassword)}
         class="absolute right-5 -translate-y-1/2 top-1/2"
@@ -110,7 +112,6 @@
         />
       {:else}
         <input
-          name="password"
           type="password"
           placeholder="Confirm password"
           required
@@ -120,6 +121,7 @@
       {/if}
       <button
         type="button"
+        tabindex="-1"
         on:click={() => (revealConfirm = !revealConfirm)}
         class="absolute right-5 -translate-y-1/2 top-1/2"
       >
diff --git a/src/routes/(app)/qr/[text]/+page.svelte b/src/routes/(app)/qr/[text]/+page.svelte
index 8b6d48ab..5469c084 100644
--- a/src/routes/(app)/qr/[text]/+page.svelte
+++ b/src/routes/(app)/qr/[text]/+page.svelte
@@ -7,21 +7,16 @@
 </script>
 
 <div class="container px-4 max-w-4xl mx-auto space-y-5">
-  <div class="flex justify-center items-center">
-    <div
-      class="md:shadow-xl rounded-3xl md:px-10 pt-5 pb-10 space-y-5 w-full md:mx-5"
-    >
-      <Qr {src} />
+  <Qr {src} />
 
-      <button
-        type="button"
-        class="flex gap-2 text-center break-all rounded-2xl hover:opacity-80 py-5 px-6 w-full mx-auto justify-center border text-xl hover:bg-slate-100"
-        on:click={() => copy(text)}
-      >
-        <div class="my-auto">
-          {text}
-        </div>
-      </button>
-    </div>
-  </div>
+  <button
+     type="button"
+     class="flex gap-2 text-center break-all rounded-2xl hover:opacity-80 py-5 px-6 w-full mx-auto justify-center border text-xl hover:bg-slate-100"
+     on:click={() => copy(text)}
+     >
+     <Icon icon="copy" style="w-8" />
+     <div class="my-auto">
+       {text}
+     </div>
+  </button>
 </div>
diff --git a/src/routes/(app)/qr/create/+page.svelte b/src/routes/(app)/qr/create/+page.svelte
new file mode 100644
index 00000000..fd99a54b
--- /dev/null
+++ b/src/routes/(app)/qr/create/+page.svelte
@@ -0,0 +1,60 @@
+<script>
+  import { goto } from "$app/navigation";
+  import { browser } from "$app/environment";
+  import { t } from "$lib/translations";
+  import Icon from "$comp/Icon.svelte";
+  let el, text, pasted;
+
+  let keypress = (e) =>
+    e.key === "Enter" ? e.preventDefault() || el.click() : (pasted = false);
+
+  let paste = async () => {
+    text = await navigator.clipboard.readText();
+    pasted = true;
+  };
+
+  let submit = () => goto(`/qr/${encodeURIComponent(text)}`);
+
+  $: if (browser && pasted && text) el.click() && (pasted = false);
+</script>
+
+<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">
+    Create QR
+  </h1>
+
+  <form on:submit|preventDefault={submit} class="space-y-2 text-xl">
+    <div class="mb-2">
+      <textarea
+        use:focus
+        name="text"
+        placeholder="Enter some text or a URL to put in a QR"
+        on:keypress={keypress}
+        class="w-full p-4 border rounded-xl h-32 text-xl"
+        bind:value={text}
+        on:paste={() => (pasted = true)}
+        autocapitalize="none"
+      />
+    </div>
+
+    <div class="flex gap-2">
+      <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"
+        on:click={paste}
+      >
+        <Icon icon="paste" style="w-8 my-auto" />
+        <div class="my-auto">{$t("user.send.paste")}</div>
+      </button>
+
+      <button
+        bind:this={el}
+        type="submit"
+        class="flex bg-black text-white border rounded-2xl px-6 py-5 w-full font-bold gap-2 justify-center"
+      >
+        <Icon icon="send" style="w-8 my-auto invert" />
+        <div class="my-auto">{$t("user.dashboard.go")}</div>
+      </button>
+    </div>
+  </form>
+</div>
-- 
cgit v1.2.3


From 52871e09d9218f3f2fb2ce4bd6e97f5c1fc15480 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Mon, 23 Sep 2024 16:22:10 -0700
Subject: account import

---
 src/components/Account.svelte                      |  6 +-
 src/components/WalletPass.svelte                   | 67 ++++++++++++++++++++++
 src/lib/utils.ts                                   |  1 +
 src/locales/en.json                                | 14 ++++-
 src/routes/(app)/[username]/(profile)/+page.svelte |  4 +-
 src/routes/(app)/account/[id]/+page.svelte         | 52 +++++++++++++++--
 src/routes/(app)/account/import/+page.svelte       | 43 +++++++-------
 src/routes/(app)/account/pass/+page.svelte         | 10 ++--
 src/routes/(app)/account/savings/+page.svelte      | 10 ++--
 src/routes/(app)/invoice/+page.server.ts           |  3 +-
 .../pay/[username]/[...amount]/+page.server.ts     |  5 +-
 src/routes/(app)/payments/[...page]/+page.svelte   |  2 +
 .../[amount]/[...feeRate]/+page.server.ts          |  5 +-
 .../[address]/[amount]/[...feeRate]/+page.svelte   | 61 +-------------------
 src/routes/(app)/send/invoice/[id]/+page.server.ts |  5 +-
 .../(app)/send/lightning/[payreq]/+page.server.ts  |  5 +-
 src/routes/(app)/sent/+page.server.ts              |  7 ---
 src/routes/(app)/sent/+page.svelte                 | 52 -----------------
 src/routes/(app)/sent/[id]/+page.server.ts         |  7 +++
 src/routes/(app)/sent/[id]/+page.svelte            | 49 ++++++++++++++++
 static/icons/balance.svg                           | 29 ++++++++++
 21 files changed, 266 insertions(+), 171 deletions(-)
 create mode 100644 src/components/WalletPass.svelte
 delete mode 100644 src/routes/(app)/sent/+page.server.ts
 delete mode 100644 src/routes/(app)/sent/+page.svelte
 create mode 100644 src/routes/(app)/sent/[id]/+page.server.ts
 create mode 100644 src/routes/(app)/sent/[id]/+page.svelte
 create mode 100644 static/icons/balance.svg

(limited to 'src')

diff --git a/src/components/Account.svelte b/src/components/Account.svelte
index 47deadcd..4bfdc4ac 100644
--- a/src/components/Account.svelte
+++ b/src/components/Account.svelte
@@ -1,5 +1,4 @@
 <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";
@@ -11,8 +10,7 @@
   $: refresh(account);
   let refresh = (a) => ({ seed, balance, id } = a);
 
-  let setAccount = () =>
-    (document.cookie = `aid=${id}; path=/; max-age=86400`);
+  let setAccount = () => (document.cookie = `aid=${id}; path=/; max-age=86400`);
 </script>
 
 <a href={`/payments`} class="block" on:click={setAccount}>
@@ -40,7 +38,7 @@
         </button>
       </a>
 
-      <a href={`/invoice?account=${id}`} class="contents" on:click={setAccount}>
+      <a href={`/invoice`} 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/WalletPass.svelte b/src/components/WalletPass.svelte
new file mode 100644
index 00000000..7793ecc5
--- /dev/null
+++ b/src/components/WalletPass.svelte
@@ -0,0 +1,67 @@
+<script>
+  import { focus } from "$lib/utils";
+  import { t } from "$lib/translations";
+  import Icon from "$comp/Icon.svelte";
+  export let cancel, password, submit;
+  let revealPassword;
+</script>
+
+<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={submit}>
+      <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>
diff --git a/src/lib/utils.ts b/src/lib/utils.ts
index c20a7d29..0997eeb9 100644
--- a/src/lib/utils.ts
+++ b/src/lib/utils.ts
@@ -287,6 +287,7 @@ export let types = {
   internal: "internal",
   fund: "fund",
   ecash: "ecash",
+  reconcile: "reconcile",
 };
 
 export let ease = (t: number): number =>
diff --git a/src/locales/en.json b/src/locales/en.json
index 9752a41d..78ef8de1 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -1,6 +1,18 @@
 {
   "accounts": {
-    "savings": "Savings"
+    "addAccount": "Add account",
+    "create": "Create",
+    "import": "Import",
+    "accountSetup": "Account setup",
+    "enterSeed": "Enter a seed phrase",
+    "passwordMismatch": "Passwords don't match",
+    "generateSeed": "Generate a new seed phrase in your browser",
+    "accountPassword": "Account password",
+    "importSeed": "Enter an existing seed phrase",
+    "passwordWarning": "If you lose this password you won't be able to withdraw funds from the account or restore your seed phrase. We can't recover it for you.",
+    "savings": "Savings",
+    "password": "Password",
+    "confirmPassword": "Confirm password"
   },
 	"404": {
 		"404": "404",
diff --git a/src/routes/(app)/[username]/(profile)/+page.svelte b/src/routes/(app)/[username]/(profile)/+page.svelte
index 03fbc454..2c2ff9a8 100644
--- a/src/routes/(app)/[username]/(profile)/+page.svelte
+++ b/src/routes/(app)/[username]/(profile)/+page.svelte
@@ -41,13 +41,13 @@
     {/each}
 
     <div class="flex justify-center gap-2">
-      <a href={`/account/setup`} class="contents">
+      <a href={`/account/savings`} class="contents">
         <button
           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="plus" style="w-8 mx-auto invert" />
-            <div class="my-auto text-xl whitespace-nowrap">Add account</div>
+            <div class="my-auto text-xl whitespace-nowrap">{$t("accounts.addAccount")}</div>
           </div>
         </button>
       </a>
diff --git a/src/routes/(app)/account/[id]/+page.svelte b/src/routes/(app)/account/[id]/+page.svelte
index df121168..3dcd99b8 100644
--- a/src/routes/(app)/account/[id]/+page.svelte
+++ b/src/routes/(app)/account/[id]/+page.svelte
@@ -1,13 +1,27 @@
 <script>
+  import WalletPass from "$comp/WalletPass.svelte";
   import { goto } from "$app/navigation";
-  import { fail, focus, post } from "$lib/utils";
+  import { copy, fail, focus, post } from "$lib/utils";
   import { enhance } from "$app/forms";
   import { t } from "$lib/translations";
   import Icon from "$comp/Icon.svelte";
+  import { decrypt } from "nostr-tools/nip49";
+  import { entropyToMnemonic, mnemonicToSeed } from "@scure/bip39";
+  import { wordlist } from "@scure/bip39/wordlists/english";
 
   export let data;
   let { account, user } = data;
-  let { id, name } = account;
+  let { id, name, seed } = account;
+  let mnemonic, password;
+  let passwordPrompt;
+  let cancel = () => (passwordPrompt = false);
+  let toggle = () => (passwordPrompt = !passwordPrompt);
+
+  let submit = async () => {
+    toggle();
+    let entropy = await decrypt(seed, password);
+    mnemonic = entropyToMnemonic(entropy, wordlist);
+  };
 
   let del = async () => {
     try {
@@ -35,15 +49,45 @@
           class="rounded-2xl border py-3 font-bold mx-auto bg-black text-white px-4 w-full"
           >Submit</button
         >
+        {#if mnemonic}
+          <div class="p-8">{mnemonic}</div>
+
+          <button
+            on:click={() => copy(mnemonic)}
+            type="button"
+            class="flex gap-2 rounded-2xl border py-3 font-bold mx-auto px-4 w-full justify-center"
+          >
+            <Icon icon="copy" style="w-8 my-auto" />
+            <div class="my-auto">Copy</div></button
+          >
+        {:else if seed}
+          <button
+            on:click={toggle}
+            type="button"
+            class="flex gap-2 rounded-2xl border py-3 font-bold mx-auto px-4 w-full justify-center bg-primary"
+          >
+            <Icon icon="eye" style="w-8 my-auto" />
+            <div class="my-auto">Reveal mnemonic</div></button
+          >
+        {/if}
+
+        {#if seed}
         <button
           on:click={del}
           type="button"
-          class="flex gap-2 rounded-2xl border py-3 font-bold mx-auto px-4 w-full justify-center border-red-600 border-2"
+          class="flex gap-2 rounded-2xl border py-3 font-bold mx-auto px-4 w-full justify-center bg-primary"
         >
           <Icon icon="trash" style="w-8 my-auto" />
-          <div class="my-auto">Delete</div></button
+          <div class="my-auto"><span class="text-red-600">Delete</span> account</div></button
         >
+        {/if}
       </div>
+
+      <div />
     </form>
   </div>
 </div>
+
+{#if passwordPrompt}
+  <WalletPass bind:password bind:cancel bind:submit />
+{/if}
diff --git a/src/routes/(app)/account/import/+page.svelte b/src/routes/(app)/account/import/+page.svelte
index 866c1b1a..a1d6549b 100644
--- a/src/routes/(app)/account/import/+page.svelte
+++ b/src/routes/(app)/account/import/+page.svelte
@@ -1,7 +1,7 @@
 <script>
   import { goto } from "$app/navigation";
   import { mnemonic } from "$lib/store";
-  import { versions } from "$lib/utils";
+  import { fail, focus, versions } from "$lib/utils";
   import { t } from "$lib/translations";
   import { browser } from "$app/environment";
   import Icon from "$comp/Icon.svelte";
@@ -16,6 +16,7 @@
   };
 
   let submit = () => {
+    text = text.replace(/,/g, " ").trim();
     let valid = validateMnemonic(text, wordlist);
     if (valid) {
       $mnemonic = text;
@@ -29,28 +30,26 @@
 </script>
 
 <div class="space-y-5">
-  <h1 class="text-center text-3xl font-semibold">Import</h1>
+  <h1 class="text-center text-3xl font-semibold">{$t("accounts.import")}</h1>
 
   <div class="container w-full mx-auto text-lg px-4 max-w-xl space-y-2">
-    <div class="space-y-5">
-      <form on:submit|preventDefault={submit}>
-        <textarea
-          use:focus
-          name="text"
-          placeholder="Enter a seed phrase"
-          class="w-full p-4 border rounded-xl h-48 text-xl"
-          bind:value={text}
-          autocapitalize="none"
-        />
-        <button
-          bind:this={el}
-          type="submit"
-          class="flex bg-black text-white border rounded-2xl px-6 py-5 w-full font-bold gap-2 justify-center"
-        >
-          <Icon icon="send" style="w-8 my-auto invert" />
-          <div class="my-auto">{$t("user.send.next")}</div>
-        </button>
-      </form>
-    </div>
+    <form on:submit|preventDefault={submit} class="space-y-2">
+      <textarea
+        use:focus
+        name="text"
+        placeholder={$t("accounts.enterSeed")}
+        class="w-full p-4 border rounded-xl h-48 text-xl"
+        bind:value={text}
+        autocapitalize="none"
+      />
+      <button
+        bind:this={el}
+        type="submit"
+        class="flex bg-black text-white border rounded-2xl px-6 py-5 w-full font-bold gap-2 justify-center"
+      >
+        <Icon icon="send" style="w-8 my-auto invert" />
+        <div class="my-auto">{$t("user.send.next")}</div>
+      </button>
+    </form>
   </div>
 </div>
diff --git a/src/routes/(app)/account/pass/+page.svelte b/src/routes/(app)/account/pass/+page.svelte
index f5e956ff..2ce8b168 100644
--- a/src/routes/(app)/account/pass/+page.svelte
+++ b/src/routes/(app)/account/pass/+page.svelte
@@ -28,7 +28,7 @@
 
   let submit = async () => {
     if (!password || password !== confirm) {
-      fail("Passwords don't match");
+      fail($t("accounts.passwordMismatch"));
       return;
     }
 
@@ -59,7 +59,7 @@
 
 <div class="space-y-5">
   <div>
-    <h1 class="text-center text-3xl font-semibold">Account password</h1>
+    <h1 class="text-center text-3xl font-semibold">{$t("accounts.accountPassword")}</h1>
   </div>
 
   <form
@@ -67,8 +67,7 @@
     class="container w-full mx-auto text-lg px-4 max-w-xl space-y-5"
   >
     <p class="text-secondary mb-1">
-      If you lose this password you won't be able to use the account. We can't
-      recover it for you even if you have the seed phrase.
+    {$t("accounts.passwordWarning")}
     </p>
 
     <div class="relative">
@@ -85,6 +84,7 @@
           use:focus
           name="password"
           type="password"
+          placeholder={$t("accounts.password")}
           required
           bind:value={password}
           autocapitalize="none"
@@ -113,7 +113,7 @@
       {:else}
         <input
           type="password"
-          placeholder="Confirm password"
+          placeholder={$t("accounts.confirmPassword")}
           required
           bind:value={confirm}
           autocapitalize="none"
diff --git a/src/routes/(app)/account/savings/+page.svelte b/src/routes/(app)/account/savings/+page.svelte
index 8d52f997..f9c6305c 100644
--- a/src/routes/(app)/account/savings/+page.svelte
+++ b/src/routes/(app)/account/savings/+page.svelte
@@ -4,7 +4,7 @@
 </script>
 
 <div class="space-y-5">
-  <h1 class="text-center text-3xl font-semibold">Wallet setup</h1>
+  <h1 class="text-center text-3xl font-semibold">{$t("accounts.accountSetup")}</h1>
 
   <div class="container w-full mx-auto text-lg px-4 max-w-xl space-y-2">
     <div class="space-y-5">
@@ -12,8 +12,8 @@
         <div class="shadow p-8 rounded-xl flex gap-4 hover:bg-primary">
           <img src="/icons/random.svg" class="w-20" />
           <div>
-            <div class="text-xl">Create</div>
-            <div class="text-secondary">Generate a new seed phrase in your browser</div>
+            <div class="text-xl">{$t("accounts.create")}</div>
+            <div class="text-secondary">{$t("accounts.generateSeed")}</div>
           </div>
         </div>
       </a>
@@ -21,8 +21,8 @@
         <div class="shadow p-8 rounded-xl flex gap-4 hover:bg-primary">
           <img src="/images/keys.png" class="w-20" />
           <div>
-            <div class="text-xl">Import</div>
-            <div class="text-secondary">Enter an existing seed phrase or wallet key</div>
+            <div class="text-xl">{$t("accounts.import")}</div>
+            <div class="text-secondary">{$t("accounts.importSeed")}</div>
           </div>
         </div>
       </a>
diff --git a/src/routes/(app)/invoice/+page.server.ts b/src/routes/(app)/invoice/+page.server.ts
index 7bac3f9b..45389f8c 100644
--- a/src/routes/(app)/invoice/+page.server.ts
+++ b/src/routes/(app)/invoice/+page.server.ts
@@ -4,6 +4,7 @@ import type { Invoice } from "$lib/types";
 
 export let load = async ({ cookies, parent }) => {
   let aid = cookies.get("aid");
+  console.log("AID", aid)
   let { subject, user, rates } = await parent();
 
   let invoice: Invoice = {
@@ -18,7 +19,7 @@ export let load = async ({ cookies, parent }) => {
   } catch (e) {
     console.log(e);
     error(500, "Failed to generate invoice");
-    }
+  }
 
   let { id } = invoice;
 
diff --git a/src/routes/(app)/pay/[username]/[...amount]/+page.server.ts b/src/routes/(app)/pay/[username]/[...amount]/+page.server.ts
index 7ccc23b0..cf8143f0 100644
--- a/src/routes/(app)/pay/[username]/[...amount]/+page.server.ts
+++ b/src/routes/(app)/pay/[username]/[...amount]/+page.server.ts
@@ -37,14 +37,15 @@ export async function load({ cookies, params, parent }) {
 
 export const actions = {
   default: async ({ cookies, request }) => {
+    let p;
     try {
       let body = await fd(request);
-      await post("/payments", body, auth(cookies));
+      p = await post("/payments", body, auth(cookies));
     } catch (e: any) {
       console.log(e);
       return fail(400, { message: e.message });
     }
 
-    redirect(307, "/sent");
+    redirect(307, `/sent/${p.id}`);
   },
 };
diff --git a/src/routes/(app)/payments/[...page]/+page.svelte b/src/routes/(app)/payments/[...page]/+page.svelte
index b7ea7b6e..2ffed537 100644
--- a/src/routes/(app)/payments/[...page]/+page.svelte
+++ b/src/routes/(app)/payments/[...page]/+page.svelte
@@ -213,6 +213,8 @@
                 <div class="text-secondary flex">
                   {#if [types.ecash, types.lightning].includes(p.type)}
                     <div class="text-3xl">⚡️</div>
+                  {:else if p.type === types.reconcile}
+                    <Icon icon="balance" style="w-6 mr-2" />
                   {:else if p.type === types.bitcoin}
                     <div class="my-auto mr-1">
                       <img
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 2b8fe37c..e46a9f56 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
@@ -35,14 +35,15 @@ export const actions = {
     params: { address, amount, feeRate },
     request,
   }) => {
+    let p;
     try {
       let body = await fd(request);
-      await post("/bitcoin/send", body, auth(cookies));
+      p = 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 });
     }
 
-    redirect(307, "/sent");
+    redirect(307, `/sent/${p.id}`);
   },
 };
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 f6c6980d..4da2e04c 100644
--- a/src/routes/(app)/send/bitcoin/[address]/[amount]/[...feeRate]/+page.svelte
+++ b/src/routes/(app)/send/bitcoin/[address]/[amount]/[...feeRate]/+page.svelte
@@ -30,7 +30,6 @@
   export let form;
 
   let { encode, decode } = hexUtil;
-  let revealPassword = false;
   let passwordPrompt;
   let password;
   let cancel = () => (passwordPrompt = false);
@@ -206,65 +205,7 @@
 </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>
+  <WalletPass bind:password bind:cancel />
 {/if}
 
 <style>
diff --git a/src/routes/(app)/send/invoice/[id]/+page.server.ts b/src/routes/(app)/send/invoice/[id]/+page.server.ts
index c31bcd7b..6c89912d 100644
--- a/src/routes/(app)/send/invoice/[id]/+page.server.ts
+++ b/src/routes/(app)/send/invoice/[id]/+page.server.ts
@@ -22,16 +22,17 @@ export async function load({ params: { id }, parent }) {
 
 export const actions = {
   default: async ({ cookies, params: { id }, request }) => {
+    let p;
     try {
       let body = await fd(request);
       body.hash = id;
 
-      await post("/payments", body, auth(cookies));
+      p = await post("/payments", body, auth(cookies));
     } catch (e: any) {
       console.log("payment failed", id, e);
       error(500, e.message);
     }
 
-    redirect(307, "/sent");
+    redirect(307, `/sent/${p.id}`);
   },
 };
diff --git a/src/routes/(app)/send/lightning/[payreq]/+page.server.ts b/src/routes/(app)/send/lightning/[payreq]/+page.server.ts
index ddec2968..3e87fa53 100644
--- a/src/routes/(app)/send/lightning/[payreq]/+page.server.ts
+++ b/src/routes/(app)/send/lightning/[payreq]/+page.server.ts
@@ -9,16 +9,17 @@ export const actions = {
   setAmount: async ({ request }) => fd(request),
 
   send: async ({ cookies, request }) => {
+    let p;
     try {
       let body = await fd(request);
 
-      await post("/payments", body, auth(cookies));
+      p = await post("/payments", body, auth(cookies));
     } catch (e: any) {
       if (e.message.includes("unusable"))
         e.message = "Failed to route payment, try sending a lower amount";
       return fail(400, { message: e.message });
     }
 
-    redirect(307, "/sent");
+    redirect(307, `/sent/${p.id}`);
   },
 };
diff --git a/src/routes/(app)/sent/+page.server.ts b/src/routes/(app)/sent/+page.server.ts
deleted file mode 100644
index a7c24fb8..00000000
--- a/src/routes/(app)/sent/+page.server.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { get, auth } from "$lib/utils";
-
-export let load = async ({ cookies }) => {
-  let aid = cookies.get("aid");
-  let { payments } = await get(`/payments?aid=${aid}`, auth(cookies));
-  return { payments };
-};
diff --git a/src/routes/(app)/sent/+page.svelte b/src/routes/(app)/sent/+page.svelte
deleted file mode 100644
index 7d67ac03..00000000
--- a/src/routes/(app)/sent/+page.svelte
+++ /dev/null
@@ -1,52 +0,0 @@
-<script>
-  import { fiat, f, focus, s, sat, sats } from "$lib/utils";
-  import { scale } from "svelte/transition";
-  import Icon from "$comp/Icon.svelte";
-  import { toast } from "@zerodevx/svelte-toast";
-  import { t } from "$lib/translations";
-
-  export let data;
-  let { payments, user } = data;
-  let { currency, username } = user;
-
-  let payment = payments[0];
-  let { amount, rate, tip } = payment;
-  amount = Math.abs(amount);
-
-  toast.pop(0);
-</script>
-
-<div class="text-center mt-20 md:mt-0">
-  <div
-    class="flex w-full max-w-[200px] mx-auto py-20"
-    in:scale={{ start: 0.5 }}
-  >
-    <Icon icon="check" style="mx-auto" />
-  </div>
-  <h1 class="text-3xl md:text-4xl font-bold mb-6">{$t("payments.sent")}!</h1>
-  <h2 class="text-2xl md:text-3xl font-semibold">
-    {f(fiat(amount, rate), currency)}
-    {#if tip}
-      <span class="text-lg">
-        + {f(fiat(tip, rate), currency)}
-      </span>
-    {/if}
-  </h2>
-  <h3 class="text-secondary md:text-lg mb-6 mt-1">
-    ⚡️{s(amount)}
-
-    {#if tip}
-      <span class="text-lg">
-        + ⚡️{s(tip)}
-      </span>
-    {/if}
-  </h3>
-</div>
-
-<a href={`/${username}`} use:focus>
-  <div class="opacity-0 w-screen h-screen fixed top-0 left-0 z-50" />
-</a>
-
-<div class="fixed bottom-10 w-full text-center">
-  {$t("payments.tapAnywhere")}
-</div>
diff --git a/src/routes/(app)/sent/[id]/+page.server.ts b/src/routes/(app)/sent/[id]/+page.server.ts
new file mode 100644
index 00000000..38d95e4e
--- /dev/null
+++ b/src/routes/(app)/sent/[id]/+page.server.ts
@@ -0,0 +1,7 @@
+import { get, auth } from "$lib/utils";
+
+export let load = async ({ cookies, params }) => {
+  let { id } = params;
+    let p  = await get(`/payments/${id}`, auth(cookies));
+  return p;
+};
diff --git a/src/routes/(app)/sent/[id]/+page.svelte b/src/routes/(app)/sent/[id]/+page.svelte
new file mode 100644
index 00000000..24804974
--- /dev/null
+++ b/src/routes/(app)/sent/[id]/+page.svelte
@@ -0,0 +1,49 @@
+<script>
+  import { fiat, f, focus, s, sat, sats } from "$lib/utils";
+  import { scale } from "svelte/transition";
+  import Icon from "$comp/Icon.svelte";
+  import { toast } from "@zerodevx/svelte-toast";
+  import { t } from "$lib/translations";
+
+  export let data;
+  let { amount, rate, tip, user } = data;
+  let { currency, username } = user;
+  amount = Math.abs(amount);
+
+  toast.pop(0);
+</script>
+
+<div class="text-center mt-20 md:mt-0">
+  <div
+    class="flex w-full max-w-[200px] mx-auto py-20"
+    in:scale={{ start: 0.5 }}
+  >
+    <Icon icon="check" style="mx-auto" />
+  </div>
+  <h1 class="text-3xl md:text-4xl font-bold mb-6">{$t("payments.sent")}!</h1>
+  <h2 class="text-2xl md:text-3xl font-semibold">
+    {f(fiat(amount, rate), currency)}
+    {#if tip}
+      <span class="text-lg">
+        + {f(fiat(tip, rate), currency)}
+      </span>
+    {/if}
+  </h2>
+  <h3 class="text-secondary md:text-lg mb-6 mt-1">
+    ⚡️{s(amount)}
+
+    {#if tip}
+      <span class="text-lg">
+        + ⚡️{s(tip)}
+      </span>
+    {/if}
+  </h3>
+</div>
+
+<a href={`/${username}`} use:focus>
+  <div class="opacity-0 w-screen h-screen fixed top-0 left-0 z-50" />
+</a>
+
+<div class="fixed bottom-10 w-full text-center">
+  {$t("payments.tapAnywhere")}
+</div>
diff --git a/static/icons/balance.svg b/static/icons/balance.svg
new file mode 100644
index 00000000..5c8ccaf6
--- /dev/null
+++ b/static/icons/balance.svg
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg height="800px" width="800px" version="1.1" id="_x32_" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" 
+	 viewBox="0 0 512 512"  xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#000000;}
+</style>
+<g>
+	<path class="st0" d="M512,339.979h-0.447l-78.911-181.464c7.507,2.712,13.862,5.052,18.787,6.901l9.242-24.513
+		c-26.263-9.878-90.312-32.634-160.397-53.254c0-10.817-4.432-20.665-11.522-27.755c-7.075-7.106-16.953-11.499-27.771-11.499
+		c-10.817,0-20.718,4.394-27.786,11.499c-2.333,2.318-4.348,4.939-6.022,7.803C157.761,50.151,92.902,37.357,65.745,32.569
+		l-4.552,25.794c5.749,1.015,13.317,2.416,22.332,4.159L0.454,253.545H0c0.06,0.197,0.129,0.394,0.189,0.591l-0.167,0.386
+		l0.342,0.151c12.817,40.619,50.754,70.078,95.599,70.078c44.852,0,82.79-29.46,95.599-70.078l0.349-0.151l-0.167-0.386
+		c0.061-0.197,0.129-0.394,0.19-0.591h-0.455L110.772,67.961c30.975,6.371,70.479,15.098,111.34,25.445
+		c1.257,8.545,5.265,16.249,11.082,22.028c3.424,3.447,7.53,6.242,12.068,8.227v276.373c-17.734,0-31.543,0-31.543,0
+		s-7.56,47.27-41.588,54.814v24.582h177.692v-24.582c-34.02-7.544-41.588-54.814-41.588-54.814s-13.809,0-31.543,0V123.661
+		c4.53-1.985,8.628-4.78,12.06-8.227c0.963-0.97,1.909-1.984,2.772-3.06c41.732,12.264,81.547,25.369,112.325,35.997
+		l-83.327,191.608h-0.454c0.06,0.204,0.128,0.394,0.197,0.591l-0.174,0.386l0.34,0.151c12.818,40.618,50.754,70.078,95.606,70.078
+		c44.846,0,82.782-29.453,95.599-70.07l0.341-0.159l-0.167-0.386C511.871,340.373,511.947,340.183,512,339.979z M174.343,253.545
+		H17.59L95.97,73.317L174.343,253.545z M275.783,102.481c-1.546,1.538-3.326,2.871-5.296,3.841
+		c-2.825,1.492-6.045,2.311-9.507,2.311c-5.81,0-10.999-2.334-14.824-6.152c-1.068-1.106-2.046-2.28-2.879-3.59
+		c-2.068-3.227-3.249-7.045-3.249-11.211c0-5.818,2.333-11.006,6.128-14.832c0.084-0.076,0.159-0.151,0.243-0.205
+		c3.795-3.674,8.87-5.915,14.582-5.915c5.818,0,11.007,2.332,14.803,6.12c2.537,2.545,4.454,5.712,5.424,9.272
+		c0.469,1.758,0.734,3.621,0.734,5.56C281.941,93.497,279.608,98.678,275.783,102.481z M337.657,339.979l78.38-180.23l78.373,180.23
+		H337.657z"/>
+</g>
+</svg>
\ No newline at end of file
-- 
cgit v1.2.3


From 8aeb0d6d818b823afec1ee7e5749971468842c9c Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Tue, 24 Sep 2024 13:22:31 -0700
Subject: fix signing

---
 src/components/Account.svelte                      |  3 ++-
 src/components/Mnemonic.svelte                     | 14 +++++++++++
 src/components/WalletPass.svelte                   |  6 ++---
 src/lib/parse.ts                                   |  4 +--
 src/locales/en.json                                |  8 ++++++
 src/routes/(app)/[username]/(profile)/+page.svelte | 12 +++------
 src/routes/(app)/account/[id]/+page.svelte         | 19 +++++++-------
 src/routes/(app)/account/pass/+page.svelte         | 29 +++++++++++++++-------
 src/routes/(app)/account/seed/+page.svelte         | 26 ++++++++-----------
 src/routes/(app)/payment/[id]/+page.svelte         | 17 +++++++++++++
 .../(app)/send/bitcoin/[address]/+layout.server.ts | 12 +++++++++
 .../[address]/[amount]/[...feeRate]/+page.svelte   | 20 +++++++++------
 12 files changed, 113 insertions(+), 57 deletions(-)
 create mode 100644 src/components/Mnemonic.svelte
 create mode 100644 src/routes/(app)/send/bitcoin/[address]/+layout.server.ts

(limited to 'src')

diff --git a/src/components/Account.svelte b/src/components/Account.svelte
index 4bfdc4ac..8f72119e 100644
--- a/src/components/Account.svelte
+++ b/src/components/Account.svelte
@@ -10,7 +10,8 @@
   $: refresh(account);
   let refresh = (a) => ({ seed, balance, id } = a);
 
-  let setAccount = () => (document.cookie = `aid=${id}; path=/; max-age=86400`);
+  let setAccount = () => 
+    (document.cookie = `aid=${id}; path=/; max-age=86400`);
 </script>
 
 <a href={`/payments`} class="block" on:click={setAccount}>
diff --git a/src/components/Mnemonic.svelte b/src/components/Mnemonic.svelte
new file mode 100644
index 00000000..5e834aed
--- /dev/null
+++ b/src/components/Mnemonic.svelte
@@ -0,0 +1,14 @@
+<script>
+  export let mnemonic;
+</script>
+
+<div
+  class="text-lg border p-4 rounded-2xl text-secondary grid grid-cols-3 gap-2 justify-center"
+>
+  {#each mnemonic.split(" ") as w, i}
+    <div>
+      <span class="select-none text-sm text-black">{i + 1}.</span>
+      <span>{@html w === "-" ? "&mdash;" : w}</span>
+    </div>
+  {/each}
+</div>
diff --git a/src/components/WalletPass.svelte b/src/components/WalletPass.svelte
index 7793ecc5..69b95107 100644
--- a/src/components/WalletPass.svelte
+++ b/src/components/WalletPass.svelte
@@ -46,10 +46,10 @@
           <Icon icon={revealPassword ? "eye" : "eye-off"} />
         </button>
       </div>
-      <div class="w-full flex">
+      <div class="w-full flex justify-center gap-2">
         <button
           type="button"
-          class="border-2 border-black rounded-xl font-semibold mx-auto py-3 w-40 hover:opacity-80 mx-auto"
+          class="border-2 bg-primary rounded-2xl font-semibold mx-auto py-5 px-6 hover:opacity-80 mx-auto grow"
           on:click={cancel}
           on:keydown={cancel}
         >
@@ -57,7 +57,7 @@
         </button>
         <button
           type="submit"
-          class="border-2 border-black rounded-xl font-semibold mx-auto py-3 w-40 hover:opacity-80 mx-auto"
+          class="rounded-2xl font-semibold mx-auto py-5 px-6 hover:opacity-80 mx-auto grow bg-black text-white"
         >
           <div class="my-auto">Submit</div>
         </button>
diff --git a/src/lib/parse.ts b/src/lib/parse.ts
index 781c7087..0ab3e809 100644
--- a/src/lib/parse.ts
+++ b/src/lib/parse.ts
@@ -10,7 +10,7 @@ export default async (t, host) => {
   if (t.startsWith("http")) redirect(307, t);
   if (t.startsWith(host)) redirect(307, `http://${t}`);
 
-  let amount, id, user;
+  let amount, user;
 
   t = t.trim();
   t.toLowerCase().startsWith("bitcoin:") &&
@@ -37,7 +37,7 @@ export default async (t, host) => {
 
   if (t.toLowerCase().startsWith("ln")) {
     try {
-      ({ id } = await get(`/invoice/${t}`));
+      await get(`/invoice/${t}`);
     } catch (e) {
       redirect(307, `/send/lightning/${t}`);
     }
diff --git a/src/locales/en.json b/src/locales/en.json
index 78ef8de1..f65841d3 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -1,5 +1,13 @@
 {
   "accounts": {
+    "back": "Back",
+    "next": "Next",
+    "seedPhrase": "Seed phrase",
+    "save": "Save",
+    "copy": "Copy",
+    "revealMnemonic": "Reveal seed phrase",
+    "regenerate": "Regenerate",
+    "deleteAccount": "Delete account",
     "addAccount": "Add account",
     "create": "Create",
     "import": "Import",
diff --git a/src/routes/(app)/[username]/(profile)/+page.svelte b/src/routes/(app)/[username]/(profile)/+page.svelte
index 2c2ff9a8..0d85fc56 100644
--- a/src/routes/(app)/[username]/(profile)/+page.svelte
+++ b/src/routes/(app)/[username]/(profile)/+page.svelte
@@ -28,14 +28,6 @@
 
 <div class="space-y-2">
   {#if user?.id === subject.id}
-    {#if !user.balance}
-      <div class="mb-8">
-        <p class="text-secondary text-lg">
-          {$t("user.welcome")}
-        </p>
-      </div>
-    {/if}
-
     {#each accounts as account}
       <Account {user} {rate} {account} />
     {/each}
@@ -47,7 +39,9 @@
         >
           <div class="mx-auto flex gap-2">
             <Icon icon="plus" style="w-8 mx-auto invert" />
-            <div class="my-auto text-xl whitespace-nowrap">{$t("accounts.addAccount")}</div>
+            <div class="my-auto text-xl whitespace-nowrap">
+              {$t("accounts.addAccount")}
+            </div>
           </div>
         </button>
       </a>
diff --git a/src/routes/(app)/account/[id]/+page.svelte b/src/routes/(app)/account/[id]/+page.svelte
index 3dcd99b8..06494dd8 100644
--- a/src/routes/(app)/account/[id]/+page.svelte
+++ b/src/routes/(app)/account/[id]/+page.svelte
@@ -1,4 +1,5 @@
 <script>
+  import Mnemonic from "$comp/Mnemonic.svelte";
   import WalletPass from "$comp/WalletPass.svelte";
   import { goto } from "$app/navigation";
   import { copy, fail, focus, post } from "$lib/utils";
@@ -46,28 +47,28 @@
       <div class="space-y-2">
         <button
           type="submit"
-          class="rounded-2xl border py-3 font-bold mx-auto bg-black text-white px-4 w-full"
-          >Submit</button
+          class="rounded-2xl border py-5 font-bold mx-auto bg-black text-white px-6 w-full"
+          >{$t("accounts.save")}</button
         >
         {#if mnemonic}
-          <div class="p-8">{mnemonic}</div>
+          <Mnemonic {mnemonic} />
 
           <button
             on:click={() => copy(mnemonic)}
             type="button"
-            class="flex gap-2 rounded-2xl border py-3 font-bold mx-auto px-4 w-full justify-center"
+            class="flex gap-2 rounded-2xl border py-5 mx-auto px-6 w-full justify-center"
           >
             <Icon icon="copy" style="w-8 my-auto" />
-            <div class="my-auto">Copy</div></button
+            <div class="my-auto">{$t("accounts.copy")}</div></button
           >
         {:else if seed}
           <button
             on:click={toggle}
             type="button"
-            class="flex gap-2 rounded-2xl border py-3 font-bold mx-auto px-4 w-full justify-center bg-primary"
+            class="flex gap-2 rounded-2xl border py-5 mx-auto px-6 w-full justify-center"
           >
             <Icon icon="eye" style="w-8 my-auto" />
-            <div class="my-auto">Reveal mnemonic</div></button
+            <div class="my-auto">{$t("accounts.revealMnemonic")}</div></button
           >
         {/if}
 
@@ -75,10 +76,10 @@
         <button
           on:click={del}
           type="button"
-          class="flex gap-2 rounded-2xl border py-3 font-bold mx-auto px-4 w-full justify-center bg-primary"
+          class="flex gap-2 rounded-2xl border py-5 mx-auto px-6 w-full justify-center"
         >
           <Icon icon="trash" style="w-8 my-auto" />
-          <div class="my-auto"><span class="text-red-600">Delete</span> account</div></button
+          <div class="my-auto">{$t("accounts.deleteAccount")}</div></button
         >
         {/if}
       </div>
diff --git a/src/routes/(app)/account/pass/+page.svelte b/src/routes/(app)/account/pass/+page.svelte
index 2ce8b168..36992a98 100644
--- a/src/routes/(app)/account/pass/+page.svelte
+++ b/src/routes/(app)/account/pass/+page.svelte
@@ -44,8 +44,6 @@
       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);
       await post("/api/accounts", { fingerprint, pubkey, name, seed, type });
       goto(`/${user.username}`);
     } catch (e) {
@@ -59,7 +57,9 @@
 
 <div class="space-y-5">
   <div>
-    <h1 class="text-center text-3xl font-semibold">{$t("accounts.accountPassword")}</h1>
+    <h1 class="text-center text-3xl font-semibold">
+      {$t("accounts.accountPassword")}
+    </h1>
   </div>
 
   <form
@@ -67,7 +67,7 @@
     class="container w-full mx-auto text-lg px-4 max-w-xl space-y-5"
   >
     <p class="text-secondary mb-1">
-    {$t("accounts.passwordWarning")}
+      {$t("accounts.passwordWarning")}
     </p>
 
     <div class="relative">
@@ -129,10 +129,21 @@
       </button>
     </div>
 
-    <button
-      class="bg-black text-white w-full px-5 py-6 text-xl rounded-2xl font-bold"
-    >
-      Submit
-    </button>
+    <div class="flex gap-2">
+      <a href={`/account/seed`} class="contents">
+        <button
+          type="button"
+          class="bg-primary w-full px-5 py-6 text-xl rounded-2xl font-bold"
+        >
+          {$t("accounts.back")}
+        </button>
+      </a>
+      <button
+        type="submit"
+        class="bg-black text-white w-full px-5 py-6 text-xl rounded-2xl font-bold"
+      >
+        {$t("accounts.next")}
+      </button>
+    </div>
   </form>
 </div>
diff --git a/src/routes/(app)/account/seed/+page.svelte b/src/routes/(app)/account/seed/+page.svelte
index e922d6be..4e55534b 100644
--- a/src/routes/(app)/account/seed/+page.svelte
+++ b/src/routes/(app)/account/seed/+page.svelte
@@ -1,4 +1,5 @@
 <script>
+  import Mnemonic from "$comp/Mnemonic.svelte";
   import { browser } from "$app/environment";
   import { tick, onMount } from "svelte";
   import { copy } from "$lib/utils";
@@ -13,7 +14,7 @@
 
   onMount(async () => {
     if (!browser) return;
-    await generate();
+    if (!$mnemonic) await generate();
   });
 
   let generate = async () => {
@@ -22,20 +23,13 @@
 </script>
 
 <div class="space-y-5">
-  <h1 class="text-center text-3xl font-semibold">Seed phrase</h1>
+  <h1 class="text-center text-3xl font-semibold">
+    {$t("accounts.seedPhrase")}
+  </h1>
 
   <div class="container w-full mx-auto text-lg px-4 max-w-xl space-y-5">
     {#if $mnemonic}
-      <div
-        class="text-lg border p-4 rounded-2xl text-secondary grid grid-cols-3 gap-2 justify-center"
-      >
-        {#each $mnemonic.split(" ") as w, i}
-          <div>
-            <span class="select-none text-sm text-black">{i + 1}.</span>
-            <span>{@html w === "-" ? "&mdash;" : w}</span>
-          </div>
-        {/each}
-      </div>
+      <Mnemonic mnemonic={$mnemonic} />
     {/if}
 
     <div>
@@ -45,7 +39,7 @@
         on:click={generate}
       >
         <Icon icon="random" style="w-8 my-auto" />
-        <div class="my-auto">Regenerate</div>
+        <div class="my-auto">{$t("accounts.regenerate")}</div>
       </button>
 
       <button
@@ -64,9 +58,9 @@
       <a href={`/account/savings`} class="contents">
         <button
           type="button"
-          class="bg-black text-white w-full px-5 py-6 text-xl rounded-2xl font-bold"
+          class="bg-primary w-full px-5 py-6 text-xl rounded-2xl font-bold"
         >
-          Back
+          {$t("accounts.back")}
         </button>
       </a>
       <a href={`/account/pass`} class="contents">
@@ -74,7 +68,7 @@
           type="button"
           class="bg-black text-white w-full px-5 py-6 text-xl rounded-2xl font-bold"
         >
-          Next
+          {$t("accounts.next")}
         </button>
       </a>
     </div>
diff --git a/src/routes/(app)/payment/[id]/+page.svelte b/src/routes/(app)/payment/[id]/+page.svelte
index 9a278049..481d0242 100644
--- a/src/routes/(app)/payment/[id]/+page.svelte
+++ b/src/routes/(app)/payment/[id]/+page.svelte
@@ -34,6 +34,7 @@
       rate,
       type,
       ref,
+      path,
       tip,
       ourfee,
       fee,
@@ -57,6 +58,7 @@
     rate,
     type,
     ref,
+    path,
     tip,
     ourfee,
     fee,
@@ -225,6 +227,21 @@
     </div>
   {/if}
 
+  {#if path}
+    <div>
+      <span class="text-lg text-secondary">Path</span>
+      <div class="flex">
+        <div>{path}</div>
+        <button
+          class="flex font-bold hover:opacity-80 mb-auto my-auto"
+          on:click={() => copy(path)}
+        >
+          <Icon icon="copy" style="ml-2 w-12 my-auto" />
+        </button>
+      </div>
+    </div>
+  {/if}
+
   <div class="flex gap-2">
     {#if user.admin}
       <button
diff --git a/src/routes/(app)/send/bitcoin/[address]/+layout.server.ts b/src/routes/(app)/send/bitcoin/[address]/+layout.server.ts
new file mode 100644
index 00000000..6c22f5f1
--- /dev/null
+++ b/src/routes/(app)/send/bitcoin/[address]/+layout.server.ts
@@ -0,0 +1,12 @@
+import { auth, get } from "$lib/utils";
+import { redirect } from "@sveltejs/kit";
+
+export async function load({ cookies, params }) {
+  let aid = cookies.get("aid");
+  let { address } = params;
+  let { balance } = await get(`/account/${aid}`, auth(cookies));
+  let invoice = await get(`/invoice/${address}`);
+  let recipient = await get(`/user/${invoice.uid}`);
+  if (invoice.aid === invoice.uid) redirect(307, `/send/${recipient.username}`);
+  return { balance };
+}
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 4da2e04c..ba87436f 100644
--- a/src/routes/(app)/send/bitcoin/[address]/[amount]/[...feeRate]/+page.svelte
+++ b/src/routes/(app)/send/bitcoin/[address]/[amount]/[...feeRate]/+page.svelte
@@ -5,6 +5,7 @@
   import Toggle from "$comp/Toggle.svelte";
   import Icon from "$comp/Icon.svelte";
   import Spinner from "$comp/Spinner.svelte";
+  import WalletPass from "$comp/WalletPass.svelte";
   import { page } from "$app/stores";
   import {
     fiat as toFiat,
@@ -21,6 +22,7 @@
   import { applyAction } from "$app/forms";
   import { hex as hexUtil } from "@scure/base";
   import * as btc from "@scure/btc-signer";
+  import { hash160 } from "@scure/btc-signer/utils";
   import { decrypt } from "nostr-tools/nip49";
   import { HDKey } from "@scure/bip32";
   import { entropyToMnemonic, mnemonicToSeed } from "@scure/bip39";
@@ -51,22 +53,24 @@
   let signTx = async () => {
     let entropy = await decrypt(account.seed, password);
     let mnemonic = entropyToMnemonic(entropy, wordlist);
-    let seed = await mnemonicToSeed(mnemonic);
+    let seed = await mnemonicToSeed(mnemonic, password);
     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 { witnessUtxo, path } = inputs[i];
+      witnessUtxo.amount = BigInt(witnessUtxo.amount);
+      witnessUtxo.script = decode(witnessUtxo.script);
       let key = child.derive(path);
-      let { privateKey, publicKey } = key;
-      let address = btc.getAddress("wpkh", privateKey, network);
-      tx.signIdx(privateKey, i);
+      tx.updateInput(i, { witnessUtxo });
+      tx.signIdx(key.privateKey, i);
     }
+
     tx.finalize();
     hex = tx.hex;
+    console.log("HEX", hex);
     signed = true;
     await tick();
     submit.click();
@@ -182,7 +186,7 @@
       <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="aid" value={account.id} type="hidden" />
       <input name="signed" value={signed} type="hidden" />
 
       <div class="flex justify-center gap-2">
@@ -205,7 +209,7 @@
 </div>
 
 {#if passwordPrompt}
-  <WalletPass bind:password bind:cancel />
+  <WalletPass bind:password bind:cancel submit={signTx} />
 {/if}
 
 <style>
-- 
cgit v1.2.3


From 4373f870ad528811a9e0bb1a6749b01d5a7ec051 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Tue, 24 Sep 2024 15:57:04 -0700
Subject: stylin

---
 src/components/Account.svelte                      | 40 +++++++++------
 src/components/WalletPass.svelte                   |  8 ++-
 src/locales/en.json                                |  2 +-
 src/routes/(app)/[username]/(profile)/+page.svelte |  4 +-
 src/routes/(app)/account/[id]/+page.svelte         | 20 ++++----
 src/routes/(app)/account/pass/+page.svelte         |  4 +-
 src/routes/(app)/account/seed/+page.svelte         |  4 +-
 src/routes/(app)/invoice/+page.server.ts           |  1 -
 .../(app)/pay/[username]/[...amount]/+page.svelte  |  2 +-
 src/routes/(app)/payment/[id]/+page.svelte         | 44 ----------------
 src/routes/(app)/payments/[...page]/+page.svelte   | 59 ++++++++++------------
 src/routes/(app)/scan/+page.svelte                 |  4 --
 .../(app)/send/bitcoin/[address]/+layout.server.ts | 19 +++++--
 src/routes/(app)/sent/[id]/+page.svelte            |  2 +-
 14 files changed, 90 insertions(+), 123 deletions(-)

(limited to 'src')

diff --git a/src/components/Account.svelte b/src/components/Account.svelte
index 8f72119e..d4a89556 100644
--- a/src/components/Account.svelte
+++ b/src/components/Account.svelte
@@ -10,42 +10,52 @@
   $: refresh(account);
   let refresh = (a) => ({ seed, balance, id } = a);
 
-  let setAccount = () => 
-    (document.cookie = `aid=${id}; path=/; max-age=86400`);
+  let setAccount = () => (document.cookie = `aid=${id}; path=/; max-age=86400`);
 </script>
 
 <a href={`/payments`} class="block" on:click={setAccount}>
-  <div class="border rounded-xl shadow p-4 space-y-5">
+  <div class="p-8 space-y-5 bg-primary rounded-2xl border">
     <div class="flex">
       <Balance {balance} {user} {rate} />
+      {#if seed}
       <a href={`/account/${id}`} class="contents">
-        <button class="ml-auto flex gap-1 mb-auto pb-2 pl-2">
-          <div class="my-auto text-secondary">{name}</div>
+        <button class="ml-auto flex gap-1 mb-auto pb-4 pl-4">
           <Icon icon="settings" style="w-8 my-auto" />
         </button>
       </a>
+      {/if}
     </div>
 
-    <div class="flex flex-wrap gap-3 justify-center w-full text-xl">
-      <a href={`/send`} class="contents grow" on:click={setAccount}>
+    <div class="flex flex-wrap gap-1 justify-center w-full text-xl">
+      <a href={`/invoice`} class="contents" on:click={setAccount}>
         <button
-          type="button"
-          class="rounded-2xl border py-5 px-6 font-bold hover:opacity-80 flex bg-primary grow"
+          class="rounded-2xl border py-5 px-6 hover:opacity-80 flex grow bg-white"
         >
           <div class="mx-auto flex gap-2">
-            <Icon icon="send" style="w-8" />
-            <div class="my-auto">{$t("user.dashboard.send")}</div>
+            <Icon icon="receive" style="w-8" />
+            <div class="my-auto">{$t("user.dashboard.receive")}</div>
           </div>
         </button>
       </a>
 
-      <a href={`/invoice`} class="contents" on:click={setAccount}>
+      <a href={`/scan`} class="contents" on:click={setAccount}>
         <button
-          class="rounded-2xl border py-5 px-6 font-bold hover:opacity-80 flex bg-primary grow"
+          class="rounded-2xl border py-5 px-6 hover:opacity-80 flex shrink bg-white"
         >
           <div class="mx-auto flex gap-2">
-            <Icon icon="receive" style="w-8" />
-            <div class="my-auto">{$t("user.dashboard.receive")}</div>
+            <Icon icon="camera" style="w-8" />
+          </div>
+        </button>
+      </a>
+
+      <a href={`/send`} class="contents grow" on:click={setAccount}>
+        <button
+          type="button"
+          class="rounded-2xl border py-5 px-6 hover:opacity-80 flex bg-white grow"
+        >
+          <div class="mx-auto flex gap-1">
+            <Icon icon="send" style="w-8" />
+            <div class="my-auto">{$t("user.dashboard.send")}</div>
           </div>
         </button>
       </a>
diff --git a/src/components/WalletPass.svelte b/src/components/WalletPass.svelte
index 69b95107..75c94f34 100644
--- a/src/components/WalletPass.svelte
+++ b/src/components/WalletPass.svelte
@@ -22,7 +22,6 @@
             name="password"
             type="text"
             required
-            class="bg-primary"
             bind:value={password}
             autocapitalize="none"
             use:focus
@@ -32,7 +31,6 @@
             name="password"
             type="password"
             required
-            class="bg-primary"
             bind:value={password}
             autocapitalize="none"
             use:focus
@@ -41,7 +39,7 @@
         <button
           type="button"
           on:click={() => (revealPassword = !revealPassword)}
-          class="absolute right-5 top-6"
+          class="absolute right-5 top-1/2"
         >
           <Icon icon={revealPassword ? "eye" : "eye-off"} />
         </button>
@@ -49,7 +47,7 @@
       <div class="w-full flex justify-center gap-2">
         <button
           type="button"
-          class="border-2 bg-primary rounded-2xl font-semibold mx-auto py-5 px-6 hover:opacity-80 mx-auto grow"
+          class="border rounded-2xl font-semibold mx-auto py-5 px-6 hover:opacity-80 mx-auto grow"
           on:click={cancel}
           on:keydown={cancel}
         >
@@ -57,7 +55,7 @@
         </button>
         <button
           type="submit"
-          class="rounded-2xl font-semibold mx-auto py-5 px-6 hover:opacity-80 mx-auto grow bg-black text-white"
+          class="border rounded-2xl font-semibold mx-auto py-5 px-6 hover:opacity-80 mx-auto grow"
         >
           <div class="my-auto">Submit</div>
         </button>
diff --git a/src/locales/en.json b/src/locales/en.json
index f65841d3..1d875536 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -323,7 +323,7 @@
 		}
 	},
 	"payments": {
-    "enterWalletPass": "Please enter your wallet password",
+    "enterWalletPass": "Wallet password",
 		"legacyVersion": "Legacy version",
 		"newVersion": "New version",
 		"income": "Income",
diff --git a/src/routes/(app)/[username]/(profile)/+page.svelte b/src/routes/(app)/[username]/(profile)/+page.svelte
index 0d85fc56..399a33e9 100644
--- a/src/routes/(app)/[username]/(profile)/+page.svelte
+++ b/src/routes/(app)/[username]/(profile)/+page.svelte
@@ -35,10 +35,10 @@
     <div class="flex justify-center gap-2">
       <a href={`/account/savings`} class="contents">
         <button
-          class="rounded-2xl border py-5 px-6 font-bold hover:opacity-80 flex bg-black text-white w-full justify-center"
+          class="rounded-2xl border py-5 px-6 font-bold hover:opacity-80 flex w-full justify-center"
         >
           <div class="mx-auto flex gap-2">
-            <Icon icon="plus" style="w-8 mx-auto invert" />
+            <Icon icon="plus" style="w-8 mx-auto" />
             <div class="my-auto text-xl whitespace-nowrap">
               {$t("accounts.addAccount")}
             </div>
diff --git a/src/routes/(app)/account/[id]/+page.svelte b/src/routes/(app)/account/[id]/+page.svelte
index 06494dd8..76473a89 100644
--- a/src/routes/(app)/account/[id]/+page.svelte
+++ b/src/routes/(app)/account/[id]/+page.svelte
@@ -39,17 +39,17 @@
 
   <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 use:focus type="text" name="name" bind:value={name} />
-      </div>
-
+      <!-- <div> -->
+      <!--   <label for="display" class="font-bold mb-1 block">Account name</label> -->
+      <!--   <input use:focus type="text" name="name" bind:value={name} /> -->
+      <!-- </div> -->
+      <!--  -->
       <div class="space-y-2">
-        <button
-          type="submit"
-          class="rounded-2xl border py-5 font-bold mx-auto bg-black text-white px-6 w-full"
-          >{$t("accounts.save")}</button
-        >
+        <!-- <button -->
+        <!--   type="submit" -->
+        <!--   class="rounded-2xl border py-5 font-bold mx-auto bg-black text-white px-6 w-full" -->
+        <!--   >{$t("accounts.save")}</button -->
+        <!-- > -->
         {#if mnemonic}
           <Mnemonic {mnemonic} />
 
diff --git a/src/routes/(app)/account/pass/+page.svelte b/src/routes/(app)/account/pass/+page.svelte
index 36992a98..77298cc4 100644
--- a/src/routes/(app)/account/pass/+page.svelte
+++ b/src/routes/(app)/account/pass/+page.svelte
@@ -133,14 +133,14 @@
       <a href={`/account/seed`} class="contents">
         <button
           type="button"
-          class="bg-primary w-full px-5 py-6 text-xl rounded-2xl font-bold"
+          class="border grow px-5 py-6 text-xl rounded-2xl"
         >
           {$t("accounts.back")}
         </button>
       </a>
       <button
         type="submit"
-        class="bg-black text-white w-full px-5 py-6 text-xl rounded-2xl font-bold"
+        class="border grow px-5 py-6 text-xl rounded-2xl"
       >
         {$t("accounts.next")}
       </button>
diff --git a/src/routes/(app)/account/seed/+page.svelte b/src/routes/(app)/account/seed/+page.svelte
index 4e55534b..ec5ab1cf 100644
--- a/src/routes/(app)/account/seed/+page.svelte
+++ b/src/routes/(app)/account/seed/+page.svelte
@@ -58,7 +58,7 @@
       <a href={`/account/savings`} class="contents">
         <button
           type="button"
-          class="bg-primary w-full px-5 py-6 text-xl rounded-2xl font-bold"
+          class="border w-full py-5 px-6 text-xl rounded-2xl"
         >
           {$t("accounts.back")}
         </button>
@@ -66,7 +66,7 @@
       <a href={`/account/pass`} class="contents">
         <button
           type="button"
-          class="bg-black text-white w-full px-5 py-6 text-xl rounded-2xl font-bold"
+          class="border w-full py-5 px-6 text-xl rounded-2xl"
         >
           {$t("accounts.next")}
         </button>
diff --git a/src/routes/(app)/invoice/+page.server.ts b/src/routes/(app)/invoice/+page.server.ts
index 45389f8c..b8a2fe06 100644
--- a/src/routes/(app)/invoice/+page.server.ts
+++ b/src/routes/(app)/invoice/+page.server.ts
@@ -4,7 +4,6 @@ import type { Invoice } from "$lib/types";
 
 export let load = async ({ cookies, parent }) => {
   let aid = cookies.get("aid");
-  console.log("AID", aid)
   let { subject, user, rates } = await parent();
 
   let invoice: Invoice = {
diff --git a/src/routes/(app)/pay/[username]/[...amount]/+page.svelte b/src/routes/(app)/pay/[username]/[...amount]/+page.svelte
index f45218ea..8e3abab4 100644
--- a/src/routes/(app)/pay/[username]/[...amount]/+page.svelte
+++ b/src/routes/(app)/pay/[username]/[...amount]/+page.svelte
@@ -61,7 +61,7 @@
   </div>
 {/if}
 
-<div class="container px-4 mt-20 max-w-xl mx-auto space-y-8">
+<div class="container px-4 mt-20 max-w-xl mx-auto space-y-2">
   <Numpad
     bind:amount={a}
     bind:amountFiat={af}
diff --git a/src/routes/(app)/payment/[id]/+page.svelte b/src/routes/(app)/payment/[id]/+page.svelte
index 481d0242..f7a36717 100644
--- a/src/routes/(app)/payment/[id]/+page.svelte
+++ b/src/routes/(app)/payment/[id]/+page.svelte
@@ -3,7 +3,6 @@
   import { onMount, tick } from "svelte";
   import { t, loading } from "$lib/translations";
   import {
-    back,
     copy,
     f,
     s,
@@ -98,12 +97,6 @@
   });
 </script>
 
-<a href={`/payments`}>
-  <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 mx-auto max-w-lg px-4 space-y-8 break-all text-2xl">
   <h1 class="px-3 md:px-0 text-center text-3xl md:text-4xl font-semibold mb-10">
     {$t(amount < 0 ? "payments.sent" : "payments.received")}
@@ -241,41 +234,4 @@
       </div>
     </div>
   {/if}
-
-  <div class="flex gap-2">
-    {#if user.admin}
-      <button
-        class="rounded-full border py-3 px-6 hover:opacity-80 flex w-full md:w-60"
-        on:click={bump}
-      >
-        <div class="mx-auto flex">
-          <Icon icon="clock" style="my-auto h-6 mr-2" />
-          <div class="my-auto mt-1 text-base">{$t("payments.bump")}</div>
-        </div>
-      </button>
-    {/if}
-
-    {#if user.hasprinter}
-      <button
-        class="rounded-full border py-3 px-6 hover:opacity-80 flex w-full md:w-60"
-        on:click={print}
-      >
-        <div class="mx-auto flex">
-          <Icon icon="printer" style="my-auto h-6 mr-2" />
-          <div class="my-auto mt-1 text-base">{$t("payments.print")}</div>
-        </div>
-      </button>
-    {:else}
-      <a href={`/payment/${id}/plain`}>
-        <button
-          class="rounded-full border py-3 px-6 hover:opacity-80 flex w-full md:w-60"
-        >
-          <div class="mx-auto flex">
-            <Icon icon="printer" style="my-auto h-6 mr-2" />
-            <div class="my-auto mt-1 text-base">{$t("payments.print")}</div>
-          </div>
-        </button>
-      </a>
-    {/if}
-  </div>
 </div>
diff --git a/src/routes/(app)/payments/[...page]/+page.svelte b/src/routes/(app)/payments/[...page]/+page.svelte
index 2ffed537..bfd30f55 100644
--- a/src/routes/(app)/payments/[...page]/+page.svelte
+++ b/src/routes/(app)/payments/[...page]/+page.svelte
@@ -78,7 +78,9 @@
       platform_fee: p.ourfee,
       amount_fiat: f((p.amount * p.rate) / sats, p.currency),
       fee_fiat: p.fee ? f((p.fee * p.rate) / sats, p.currency) : null,
-      platform_fee_fiat: p.ourfee ? f((p.ourfee * p.rate) / sats, p.currency) : null,
+      platform_fee_fiat: p.ourfee
+        ? f((p.ourfee * p.rate) / sats, p.currency)
+        : null,
       tip_fiat: p.tip ? f((p.tip * p.rate) / sats, p.currency) : null,
       total_fiat: f(((p.amount + (p.tip || 0)) * p.rate) / sats, p.currency),
     }));
@@ -127,30 +129,28 @@
   };
 </script>
 
-<div class="mt-24 mb-20 payments">
-  <h1 class="px-3 md:px-0 text-center text-3xl md:text-4xl font-semibold mb-10">
+<div class="mt-24 mb-20 payments space-y-5">
+  <h1 class="px-3 md:px-0 text-center text-3xl md:text-4xl font-semibold">
     {$t("payments.header")}
   </h1>
 
-  <div class="container w-full mx-auto text-lg px-4 max-w-xl space-y-5">
-    <div class="flex text-md text-secondary relative">
-      <div class="mx-auto flex justify-center w-full gap-1">
-        {#each presets as { start, end, title }, i}
-          <a
-            class:active={selection === i}
-            href={`/payments/${getUnixTime(start) + "/"}1`}
+  <div class="container w-full mx-auto text-lg px-4 max-w-xl space-y-2">
+    <div class="mx-auto flex justify-center w-full gap-1">
+      {#each presets as { start, end, title }, i}
+        <a
+          class:active={selection === i}
+          href={`/payments/${getUnixTime(start) + "/"}1`}
+        >
+          <button
+            class="text-sm md:text-lg rounded-full border py-2 px-4 hover:opacity-80 min-w-[72px]"
           >
-            <button
-              class="text-sm md:text-lg rounded-full border py-2 px-4 hover:opacity-80 min-w-[72px]"
-            >
-              <div class="my-auto">{title}</div>
-            </button>
-          </a>
-        {/each}
-      </div>
+            <div class="my-auto">{title}</div>
+          </button>
+        </a>
+      {/each}
     </div>
 
-    <div class="flex flex-wrap justify-center mb-8">
+    <div class="flex flex-wrap justify-center">
       {#if pages.length > 1}
         {#each pages as _, i}
           <a
@@ -261,16 +261,14 @@
 
     <div class="grid grid-cols-3 w-full text-center text-lg">
       {#each Object.keys(incoming) as c}
-        <span class="text-base text-secondary text-left"></span>
+        <span class="text-base text-secondary text-left" />
         <!-- <span class="text-base text-secondary" -->
         <!--   >{$t("payments.subtotal")}</span -->
         <!-- > -->
         <span class="text-base text-secondary">
           {#if tipsIn || tipsOut}{$t("payments.tips")}{/if}
         </span>
-        <span class="text-base text-secondary"
-          >{$t("payments.total")}</span
-        >
+        <span class="text-base text-secondary">{$t("payments.total")}</span>
 
         {@const totalIn = incoming[c]?.fiat || 0}
         {@const tipsIn = incoming[c]?.fiatTips || 0}
@@ -295,15 +293,14 @@
         <span><b>{totalOut ? f(totalOut, c) : "-"}</b></span>
       {/each}
     </div>
-
-    <button
-      class="ml-auto rounded-full border py-2 px-4 w-36 hover:opacity-80 flex mx-auto"
-      on:click={csv}
-    >
-      <Icon icon="save" style="opacity-50 mr-2 my-auto" />
-      <div class="my-auto">{$t("payments.export")}</div>
-    </button>
   </div>
+  <button
+    class="ml-auto rounded-2xl border py-5 px-6 hover:opacity-80 flex mx-auto text-xl gap-2"
+    on:click={csv}
+  >
+    <Icon icon="save" style="my-auto" />
+    <div class="my-auto">{$t("payments.export")}</div>
+  </button>
 </div>
 
 <style>
diff --git a/src/routes/(app)/scan/+page.svelte b/src/routes/(app)/scan/+page.svelte
index e23b9bb8..150a66f4 100644
--- a/src/routes/(app)/scan/+page.svelte
+++ b/src/routes/(app)/scan/+page.svelte
@@ -21,10 +21,6 @@
   onDestroy(() => scanner?.stop());
 </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="flex w-full mb-4 px-4">
   <div class="bg-black mx-auto rounded-3xl">
     <video
diff --git a/src/routes/(app)/send/bitcoin/[address]/+layout.server.ts b/src/routes/(app)/send/bitcoin/[address]/+layout.server.ts
index 6c22f5f1..a6edf8b0 100644
--- a/src/routes/(app)/send/bitcoin/[address]/+layout.server.ts
+++ b/src/routes/(app)/send/bitcoin/[address]/+layout.server.ts
@@ -1,12 +1,23 @@
 import { auth, get } from "$lib/utils";
 import { redirect } from "@sveltejs/kit";
 
-export async function load({ cookies, params }) {
+export async function load({ cookies, params, parent }) {
+  let { user } = await parent();
   let aid = cookies.get("aid");
   let { address } = params;
   let { balance } = await get(`/account/${aid}`, auth(cookies));
-  let invoice = await get(`/invoice/${address}`);
-  let recipient = await get(`/user/${invoice.uid}`);
-  if (invoice.aid === invoice.uid) redirect(307, `/send/${recipient.username}`);
+
+  try {
+    let invoice = await get(`/invoice/${address}`);
+
+    if (invoice) {
+      let recipient = await get(`/users/${invoice.uid}`);
+      if (recipient?.id !== user.id)
+        redirect(307, `/pay/${recipient.username}`);
+    }
+  } catch (e) {
+    // invoice not found
+  }
+
   return { balance };
 }
diff --git a/src/routes/(app)/sent/[id]/+page.svelte b/src/routes/(app)/sent/[id]/+page.svelte
index 24804974..ce2c8d6e 100644
--- a/src/routes/(app)/sent/[id]/+page.svelte
+++ b/src/routes/(app)/sent/[id]/+page.svelte
@@ -15,7 +15,7 @@
 
 <div class="text-center mt-20 md:mt-0">
   <div
-    class="flex w-full max-w-[200px] mx-auto py-20"
+    class="flex w-full max-w-[200px] mx-auto py-4"
     in:scale={{ start: 0.5 }}
   >
     <Icon icon="check" style="mx-auto" />
-- 
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')

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


From 9531ccbdf01b07c392b1b5cb6d8ad4680ee29d2c Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Tue, 24 Sep 2024 20:11:49 -0700
Subject: translations

---
 src/locales/de.json | 43 +++++++++++++++++++++++++++++++++++++------
 src/locales/el.json | 43 +++++++++++++++++++++++++++++++++++++------
 src/locales/es.json | 43 +++++++++++++++++++++++++++++++++++++------
 src/locales/fa.json | 43 +++++++++++++++++++++++++++++++++++++------
 src/locales/fr.json | 43 +++++++++++++++++++++++++++++++++++++------
 src/locales/ja.json | 43 +++++++++++++++++++++++++++++++++++++------
 src/locales/pt.json | 43 +++++++++++++++++++++++++++++++++++++------
 src/locales/ru.json | 43 +++++++++++++++++++++++++++++++++++++------
 src/locales/zh.json | 43 +++++++++++++++++++++++++++++++++++++------
 9 files changed, 333 insertions(+), 54 deletions(-)

(limited to 'src')

diff --git a/src/locales/de.json b/src/locales/de.json
index 906d85bb..8aa46733 100644
--- a/src/locales/de.json
+++ b/src/locales/de.json
@@ -20,7 +20,8 @@
 		},
 		"locations": {
 			"header": "Standorte",
-			"description": "Hier finden Sie einige Unternehmen, welche bereits Zahlungen mit Bitcoin über Coinos akzeptieren. Wir hoffen, dass Ihr Unternehmen das nächste sein wird!"
+			"description": "Hier finden Sie einige Unternehmen, welche bereits Zahlungen mit Bitcoin über Coinos akzeptieren. Wir hoffen, dass Ihr Unternehmen das nächste sein wird!",
+			"viewMap": "Karte anzeigen"
 		}
 	},
 	"error": {
@@ -78,7 +79,8 @@
 		"twitter": "Twitter",
 		"news": "Neuigkeiten",
 		"linktree": "Linktree",
-		"documentation": "Dokumentation"
+		"documentation": "Dokumentation",
+		"nostr": "Nostr"
 	},
 	"howItWorks": {
 		"header": "So funktioniert's",
@@ -149,7 +151,9 @@
 		"forgot": "Passwort vergessen?",
 		"reset": "Passwort zurücksetzen",
 		"submit": "Einreichen",
-		"newPassword": "Neues Kennwort"
+		"newPassword": "Neues Kennwort",
+		"createAccount": "Benutzerkonto erstellen",
+		"signUp": "Melden Sie sich an"
 	},
 	"nav": {
 		"profile": "Profil",
@@ -199,7 +203,8 @@
 			"deposit": "Einzahlung",
 			"voucher": "Beleg",
 			"checkout": "Kasse",
-			"payNow": "Zahlen Sie jetzt"
+			"payNow": "Zahlen Sie jetzt",
+			"setup": "Selbstverwahrung einrichten"
 		},
 		"receive": {
 			"lessThan1BTCWarning": "Bitte geben Sie einen Betrag unter 1 Bitcoin ein.",
@@ -314,7 +319,9 @@
 		"details": "Einzelheiten",
 		"noMessages": "Sie haben noch keine Nachrichten gesendet oder empfangen",
 		"install": "App installieren",
-		"moreDetails": "Links und Details"
+		"moreDetails": "Links und Details",
+		"url": "Öffentliche URL",
+		"nwc": "Nostr-Wallet verbinden"
 	},
 	"payments": {
 		"header": "Transaktionen",
@@ -409,7 +416,8 @@
 		"showText": "Text anzeigen",
 		"showQr": "QR anzeigen",
 		"copyPr": "Lohnanforderung kopieren",
-		"amountPrompt": "Immer nach dem Betrag fragen"
+		"amountPrompt": "Immer nach dem Betrag fragen",
+		"enterWalletPass": "Wallet-Passwort"
 	},
 	"items": {
 		"add": "Artikel hinzufügen",
@@ -418,5 +426,28 @@
 		"price": "Preis",
 		"submit": "Einreichen",
 		"image": "Bild"
+	},
+	"accounts": {
+		"back": "Zurück",
+		"next": "Nächste",
+		"seedPhrase": "Seed-Phrase",
+		"save": "Speichern",
+		"copy": "Kopie",
+		"revealMnemonic": "Seed-Phrase anzeigen",
+		"regenerate": "Regenerieren",
+		"deleteAccount": "Konto löschen",
+		"addAccount": "Konto hinzufügen",
+		"create": "Erstellen",
+		"import": "Import",
+		"accountSetup": "Kontoeinrichtung",
+		"enterSeed": "Geben Sie eine Seed-Phrase ein",
+		"passwordMismatch": "Passwörter stimmen nicht überein",
+		"generateSeed": "Generieren Sie eine neue Seed-Phrase in Ihrem Browser",
+		"accountPassword": "Kontokennwort",
+		"importSeed": "Geben Sie eine vorhandene Seed-Phrase ein",
+		"passwordWarning": "Wenn Sie dieses Passwort verlieren, können Sie weder Geld vom Konto abheben noch Ihre Seed-Phrase wiederherstellen. Wir können es nicht für Sie wiederherstellen.",
+		"savings": "Ersparnisse",
+		"password": "Passwort",
+		"confirmPassword": "Passwort bestätigen"
 	}
 }
diff --git a/src/locales/el.json b/src/locales/el.json
index d876b26b..c2a2296d 100644
--- a/src/locales/el.json
+++ b/src/locales/el.json
@@ -20,7 +20,8 @@
 		},
 		"locations": {
 			"header": "Τοποθεσίες",
-			"description": "Ακολουθούν ορισμένες επιχειρήσεις που δέχονται bitcoin με Coinos. Ελπίζουμε ότι η δική σας θα είναι η επόμενη!"
+			"description": "Ακολουθούν ορισμένες επιχειρήσεις που δέχονται bitcoin με Coinos. Ελπίζουμε ότι η δική σας θα είναι η επόμενη!",
+			"viewMap": "Προβολή χάρτη"
 		}
 	},
 	"error": {
@@ -77,7 +78,8 @@
 		"support": "Υποστήριξη",
 		"telegram": "Telegram",
 		"twitter": "Twitter",
-		"documentation": "Τεκμηρίωση"
+		"documentation": "Τεκμηρίωση",
+		"nostr": "Nostr"
 	},
 	"howItWorks": {
 		"header": "Πως δουλεύει",
@@ -148,7 +150,9 @@
 		"forgot": "Ξεχάσατε τον κωδικό?",
 		"reset": "ΕΠΑΝΑΦΟΡΑ ΚΩΔΙΚΟΥ",
 		"submit": "υποβάλλουν",
-		"newPassword": "Νέος Κωδικός"
+		"newPassword": "Νέος Κωδικός",
+		"createAccount": "Δημιουργία λογαριασμού",
+		"signUp": "Εγγραφείτε"
 	},
 	"nav": {
 		"profile": "Προφίλ",
@@ -201,7 +205,8 @@
 			"voucher": "Κουπόν",
 			"fetchingRate": "ποσοστό ανάκτησης...",
 			"checkout": "Ολοκλήρωση αγοράς",
-			"payNow": "Πλήρωσε τώρα"
+			"payNow": "Πλήρωσε τώρα",
+			"setup": "Ρύθμιση αυτοεπιμέλειας"
 		},
 		"receive": {
 			"lessThan1BTCWarning": "Παρακαλώ εισάγετε ένα ποσό μικρότερο από 1 bitcoin ",
@@ -308,7 +313,9 @@
 		"details": "Λεπτομέριες",
 		"noMessages": "Δεν έχετε στείλει ή λάβει ακόμη μηνύματα",
 		"install": "Εγκαταστήστε την εφαρμογή",
-		"moreDetails": "Σύνδεσμοι και λεπτομέρειες"
+		"moreDetails": "Σύνδεσμοι και λεπτομέρειες",
+		"url": "Δημόσια διεύθυνση URL",
+		"nwc": "Σύνδεση πορτοφολιού Nostr"
 	},
 	"payments": {
 		"amount": "Ποσό",
@@ -400,7 +407,8 @@
 		"showText": "Εμφάνιση κειμένου",
 		"showQr": "Εμφάνιση QR",
 		"copyPr": "Αντιγραφή αιτήματος πληρωμής",
-		"amountPrompt": "Πάντα προτροπή για ποσό"
+		"amountPrompt": "Πάντα προτροπή για ποσό",
+		"enterWalletPass": "Κωδικός πρόσβασης πορτοφολιού"
 	},
 	"items": {
 		"add": "Πρόσθεσε είδος",
@@ -409,5 +417,28 @@
 		"price": "Τιμή",
 		"submit": "υποβάλλουν",
 		"image": "Εικόνα"
+	},
+	"accounts": {
+		"back": "Πίσω",
+		"next": "Επόμενος",
+		"seedPhrase": "Φράση σπόρων",
+		"save": "Εκτός",
+		"copy": "Αντίγραφο",
+		"revealMnemonic": "Αποκαλύψτε τη φράση σπόρων",
+		"regenerate": "Αναγεννηθείς",
+		"deleteAccount": "Διαγραφή λογαριασμού",
+		"addAccount": "Προσθήκη λογαριασμού",
+		"create": "Δημιουργώ",
+		"import": "Εισαγωγή",
+		"accountSetup": "Ρύθμιση λογαριασμού",
+		"enterSeed": "Εισαγάγετε μια αρχική φράση",
+		"passwordMismatch": "Οι κωδικοί πρόσβασης δεν ταιριάζουν",
+		"generateSeed": "Δημιουργήστε μια νέα αρχική φράση στο πρόγραμμα περιήγησής σας",
+		"accountPassword": "Κωδικός πρόσβασης λογαριασμού",
+		"importSeed": "Εισαγάγετε μια υπάρχουσα αρχική φράση",
+		"passwordWarning": "Εάν χάσετε αυτόν τον κωδικό πρόσβασης, δεν θα μπορείτε να κάνετε ανάληψη χρημάτων από τον λογαριασμό ή να επαναφέρετε τη φράση αρχικής σας. Δεν μπορούμε να σας το ανακτήσουμε.",
+		"savings": "Οικονομίες",
+		"password": "Σύνθημα",
+		"confirmPassword": "Επιβεβαίωση κωδικού πρόσβασης"
 	}
 }
diff --git a/src/locales/es.json b/src/locales/es.json
index 9782bf8a..9b5e436f 100644
--- a/src/locales/es.json
+++ b/src/locales/es.json
@@ -20,7 +20,8 @@
 		},
 		"locations": {
 			"header": "Ubicaciones",
-			"description": "Aquí hay algunos negocios que aceptan bitcoin con Coinos. ¡Esperamos que el tuyo sea el siguiente!"
+			"description": "Aquí hay algunos negocios que aceptan bitcoin con Coinos. ¡Esperamos que el tuyo sea el siguiente!",
+			"viewMap": "Ver mapa"
 		}
 	},
 	"error": {
@@ -61,7 +62,8 @@
 		"support": "Soporte",
 		"telegram": "Telegram",
 		"twitter": "Twitter",
-		"documentation": "Documentación"
+		"documentation": "Documentación",
+		"nostr": "Nostálgico"
 	},
 	"howItWorks": {
 		"header": "Cómo Funciona",
@@ -132,7 +134,9 @@
 		"noAccount": "¿No tienes una cuenta?",
 		"register": "Registrarse",
 		"signIn": "Iniciar Sesión",
-		"failed": "Inicio de sesión fallido"
+		"failed": "Inicio de sesión fallido",
+		"createAccount": "Crear una cuenta",
+		"signUp": "Inscribirse"
 	},
 	"nav": {
 		"about": "Acerca de",
@@ -189,7 +193,8 @@
 			"go": "Ir",
 			"dashboard": "Panel",
 			"checkout": "Verificar",
-			"payNow": "Pagar ahora"
+			"payNow": "Pagar ahora",
+			"setup": "Configurar la autocustodia"
 		},
 		"receive": {
 			"lessThan1BTCWarning": "Por favor, introduzca una cantidad menor a 1 bitcoin.",
@@ -291,7 +296,9 @@
 		"details": "Detalles",
 		"noMessages": "Aún no has enviado ni recibido ningún mensaje",
 		"install": "Instalar aplicación",
-		"moreDetails": "Enlaces y detalles"
+		"moreDetails": "Enlaces y detalles",
+		"url": "URL pública",
+		"nwc": "Conexión de billetera Nostr"
 	},
 	"payments": {
 		"networkFee": "Tarifa de Red",
@@ -382,7 +389,8 @@
 		"showText": "Mostrar texto",
 		"showQr": "Mostrar código QR",
 		"copyPr": "Copiar solicitud de pago",
-		"amountPrompt": "Siempre solicite la cantidad"
+		"amountPrompt": "Siempre solicite la cantidad",
+		"enterWalletPass": "Contraseña de la billetera"
 	},
 	"items": {
 		"add": "Añadir artículo",
@@ -391,5 +399,28 @@
 		"price": "Precio",
 		"submit": "Entregar",
 		"image": "Imagen"
+	},
+	"accounts": {
+		"back": "Atrás",
+		"next": "Próximo",
+		"seedPhrase": "Frase semilla",
+		"save": "Ahorrar",
+		"copy": "Copiar",
+		"revealMnemonic": "Revelar frase semilla",
+		"regenerate": "Regenerado",
+		"deleteAccount": "Eliminar cuenta",
+		"addAccount": "Agregar cuenta",
+		"create": "Crear",
+		"import": "Importar",
+		"accountSetup": "Configuración de cuenta",
+		"enterSeed": "Introduzca una frase inicial",
+		"passwordMismatch": "Las contraseñas no coinciden",
+		"generateSeed": "Genera una nueva frase semilla en tu navegador",
+		"accountPassword": "Contraseña de la cuenta",
+		"importSeed": "Introduzca una frase semilla existente",
+		"passwordWarning": "Si pierde esta contraseña, no podrá retirar fondos de la cuenta ni recuperar su frase inicial. No podemos recuperarla por usted.",
+		"savings": "Ahorros",
+		"password": "Contraseña",
+		"confirmPassword": "Confirmar Contraseña"
 	}
 }
diff --git a/src/locales/fa.json b/src/locales/fa.json
index d091c028..b40f581c 100644
--- a/src/locales/fa.json
+++ b/src/locales/fa.json
@@ -20,7 +20,8 @@
 		},
 		"locations": {
 			"header": "مکان ها",
-			"description": "در اینجا چند کسب و کار وجود دارد که بیت کوین را با کوینوس می پذیرند. امیدواریم مال بعدی شما باشد!"
+			"description": "در اینجا چند کسب و کار وجود دارد که بیت کوین را با کوینوس می پذیرند. امیدواریم مال بعدی شما باشد!",
+			"viewMap": "مشاهده نقشه"
 		}
 	},
 	"error": {
@@ -61,7 +62,8 @@
 		"support": "حمایت کردن",
 		"telegram": "تلگرام",
 		"twitter": "توییتر",
-		"documentation": "مستندات"
+		"documentation": "مستندات",
+		"nostr": "Nostr"
 	},
 	"howItWorks": {
 		"header": "چگونه کار می کند",
@@ -132,7 +134,9 @@
 		"noAccount": "حساب کاربری ندارید؟",
 		"register": "ثبت نام",
 		"signIn": "ورود",
-		"failed": "ورود ناموفق بود"
+		"failed": "ورود ناموفق بود",
+		"createAccount": "ایجاد حساب کاربری",
+		"signUp": "ثبت نام کنید"
 	},
 	"nav": {
 		"about": "در باره",
@@ -189,7 +193,8 @@
 			"deposit": "سپرده",
 			"voucher": "کوپن",
 			"checkout": "وارسی",
-			"payNow": "الان پرداخت کن"
+			"payNow": "الان پرداخت کن",
+			"setup": "خود سرپرستی را تنظیم کنید"
 		},
 		"receive": {
 			"lessThan1BTCWarning": "لطفا مقدار کمتر از 1 بیت کوین را وارد کنید.",
@@ -291,7 +296,9 @@
 		"details": "جزئیات",
 		"noMessages": "شما هنوز هیچ پیامی ارسال یا دریافت نکرده اید",
 		"install": "برنامه را نصب کنید",
-		"moreDetails": "لینک ها و جزئیات"
+		"moreDetails": "لینک ها و جزئیات",
+		"url": "URL عمومی",
+		"nwc": "اتصال کیف پول Nostr"
 	},
 	"payments": {
 		"networkFee": "هزینه شبکه",
@@ -382,7 +389,8 @@
 		"showText": "نمایش متن",
 		"showQr": "نمایش QR",
 		"copyPr": "کپی درخواست پرداخت",
-		"amountPrompt": "همیشه مقدار را درخواست کنید"
+		"amountPrompt": "همیشه مقدار را درخواست کنید",
+		"enterWalletPass": "رمز کیف پول"
 	},
 	"items": {
 		"add": "این مورد را اضافه کنید",
@@ -391,5 +399,28 @@
 		"price": "قیمت",
 		"submit": "ارسال",
 		"image": "تصویر"
+	},
+	"accounts": {
+		"back": "برگشت",
+		"next": "بعدی",
+		"seedPhrase": "عبارت بذر",
+		"save": "ذخیره کنید",
+		"copy": "کپی کنید",
+		"revealMnemonic": "عبارت بذر را آشکار کنید",
+		"regenerate": "بازسازی کنید",
+		"deleteAccount": "حذف اکانت",
+		"addAccount": "اضافه کردن حساب",
+		"create": "ایجاد کنید",
+		"import": "واردات",
+		"accountSetup": "تنظیم حساب",
+		"enterSeed": "یک عبارت بذری وارد کنید",
+		"passwordMismatch": "گذرواژه ها مطابقت ندارند",
+		"generateSeed": "یک عبارت seed جدید در مرورگر خود ایجاد کنید",
+		"accountPassword": "رمز عبور حساب",
+		"importSeed": "عبارت seed موجود را وارد کنید",
+		"passwordWarning": "اگر این رمز عبور را گم کنید، نمی توانید وجوهی را از حساب برداشت کنید یا عبارت اولیه خود را بازیابی کنید. ما نمی توانیم آن را برای شما بازیابی کنیم.",
+		"savings": "پس انداز",
+		"password": "رمز عبور",
+		"confirmPassword": "رمز عبور را تایید کنید"
 	}
 }
diff --git a/src/locales/fr.json b/src/locales/fr.json
index 08eedd0f..43f7ce4d 100644
--- a/src/locales/fr.json
+++ b/src/locales/fr.json
@@ -7,7 +7,8 @@
 		"header": "À Propos",
 		"locations": {
 			"header": "Établissements",
-			"description": "Il y a des entreprises qui acceptent bitcoin utilisant le point de vente coinos. Si vous utilisez notre appli, s'il vous plait <a href=\"mailto:contact@coinos.io\" class=\"underline underline-offset-4\">fais-le-nous savoir!</a>"
+			"description": "Il y a des entreprises qui acceptent bitcoin utilisant le point de vente coinos. Si vous utilisez notre appli, s'il vous plait <a href=\"mailto:contact@coinos.io\" class=\"underline underline-offset-4\">fais-le-nous savoir!</a>",
+			"viewMap": "Voir la carte"
 		},
 		"team": {
 			"header": "L'Équipe",
@@ -61,7 +62,8 @@
 		"support": "Assistance",
 		"jobs": "Jobs",
 		"linktree": "Linktree",
-		"documentation": "Documentation"
+		"documentation": "Documentation",
+		"nostr": "Noster"
 	},
 	"howItWorks": {
 		"header": "Comment cela Fonctionne",
@@ -114,7 +116,9 @@
 		"forgot": "Mot de passe oublié?",
 		"reset": "Reinitialiser le mot de passe",
 		"submit": "Soumettre",
-		"newPassword": "Nouveau mot de passe"
+		"newPassword": "Nouveau mot de passe",
+		"createAccount": "Créer un compte",
+		"signUp": "S'inscrire"
 	},
 	"nav": {
 		"startInSeconds": "Commence en Secondes",
@@ -166,7 +170,8 @@
 			"deposit": "Déposer",
 			"voucher": "Bon",
 			"checkout": "Vérifier",
-			"payNow": "Payez maintenant"
+			"payNow": "Payez maintenant",
+			"setup": "Mettre en place l'auto-garde"
 		},
 		"receive": {
 			"lessThan1BTCWarning": "S'il vous plaît utilisez moins d'un bitcoin.",
@@ -287,7 +292,9 @@
 		"details": "Détails",
 		"noMessages": "Vous n'avez pas encore envoyé ou reçu de messages",
 		"install": "Installer l'application",
-		"moreDetails": "Liens et détails"
+		"moreDetails": "Liens et détails",
+		"url": "URL publique",
+		"nwc": "Connexion au portefeuille Nostr"
 	},
 	"news": {
 		"header": "Nouvelles",
@@ -382,7 +389,8 @@
 		"showText": "Afficher le texte",
 		"showQr": "Afficher le QR",
 		"copyPr": "Copie de la demande de paiement",
-		"amountPrompt": "Toujours demander le montant"
+		"amountPrompt": "Toujours demander le montant",
+		"enterWalletPass": "Mot de passe du portefeuille"
 	},
 	"items": {
 		"add": "Ajouter un item",
@@ -391,5 +399,28 @@
 		"price": "Prix",
 		"submit": "Soumettre",
 		"image": "Image"
+	},
+	"accounts": {
+		"back": "Dos",
+		"next": "Suivant",
+		"seedPhrase": "Phrase de départ",
+		"save": "Sauvegarder",
+		"copy": "Copie",
+		"revealMnemonic": "Révéler la phrase de départ",
+		"regenerate": "Régénérer",
+		"deleteAccount": "Supprimer le compte",
+		"addAccount": "Ajouter un compte",
+		"create": "Créer",
+		"import": "Importer",
+		"accountSetup": "Configuration du compte",
+		"enterSeed": "Entrez une phrase de départ",
+		"passwordMismatch": "Les mots de passe ne correspondent pas",
+		"generateSeed": "Générez une nouvelle phrase de départ dans votre navigateur",
+		"accountPassword": "Mot de passe du compte",
+		"importSeed": "Entrez une phrase de départ existante",
+		"passwordWarning": "Si vous perdez ce mot de passe, vous ne pourrez pas retirer de fonds du compte ni restaurer votre phrase de départ. Nous ne pouvons pas le récupérer pour vous.",
+		"savings": "Économies",
+		"password": "Mot de passe",
+		"confirmPassword": "Confirmez le mot de passe"
 	}
 }
diff --git a/src/locales/ja.json b/src/locales/ja.json
index 3d9f539b..c5a0e275 100644
--- a/src/locales/ja.json
+++ b/src/locales/ja.json
@@ -20,7 +20,8 @@
 		},
 		"locations": {
 			"header": "所在地",
-			"description": "Coinosでビットコインを受け入れている企業をいくつか紹介します。次はあなたのものになることを願っています!"
+			"description": "Coinosでビットコインを受け入れている企業をいくつか紹介します。次はあなたのものになることを願っています!",
+			"viewMap": "地図を見る"
 		}
 	},
 	"error": {
@@ -61,7 +62,8 @@
 		"support": "サポート",
 		"telegram": "電報",
 		"twitter": "ツイッター",
-		"documentation": "ドキュメンテーション"
+		"documentation": "ドキュメンテーション",
+		"nostr": "ノストル"
 	},
 	"howItWorks": {
 		"header": "使い方",
@@ -132,7 +134,9 @@
 		"noAccount": "アカウントをお持ちでない場合は、",
 		"register": "登録する",
 		"signIn": "サインイン",
-		"failed": "ログインに失敗しました"
+		"failed": "ログインに失敗しました",
+		"createAccount": "アカウントを作成する",
+		"signUp": "サインアップ"
 	},
 	"nav": {
 		"about": "について",
@@ -189,7 +193,8 @@
 			"deposit": "デポジット",
 			"voucher": "バウチャー",
 			"checkout": "チェックアウト",
-			"payNow": "今払う"
+			"payNow": "今払う",
+			"setup": "自己管理の設定"
 		},
 		"receive": {
 			"lessThan1BTCWarning": "1 ビットコイン未満の金額を入力してください。",
@@ -291,7 +296,9 @@
 		"details": "詳細",
 		"noMessages": "まだメッセージを送信または受信していません",
 		"install": "アプリをインストールする",
-		"moreDetails": "リンクと詳細"
+		"moreDetails": "リンクと詳細",
+		"url": "公開URL",
+		"nwc": "Nostrウォレットコネクト"
 	},
 	"payments": {
 		"networkFee": "ネットワーク料金",
@@ -382,7 +389,8 @@
 		"showText": "テキストを表示",
 		"showQr": "QRコードを表示",
 		"copyPr": "支払い請求のコピー",
-		"amountPrompt": "常に金額の入力を求める"
+		"amountPrompt": "常に金額の入力を求める",
+		"enterWalletPass": "ウォレットパスワード"
 	},
 	"items": {
 		"add": "アイテムの追加",
@@ -391,5 +399,28 @@
 		"price": "価格",
 		"submit": "提出する",
 		"image": "画像"
+	},
+	"accounts": {
+		"back": "戻る",
+		"next": "次",
+		"seedPhrase": "シードフレーズ",
+		"save": "保存",
+		"copy": "コピー",
+		"revealMnemonic": "シードフレーズを表示",
+		"regenerate": "再生する",
+		"deleteAccount": "アカウントを削除",
+		"addAccount": "アカウントを追加",
+		"create": "作成する",
+		"import": "輸入",
+		"accountSetup": "アカウント設定",
+		"enterSeed": "シードフレーズを入力してください",
+		"passwordMismatch": "パスワードが一致しません",
+		"generateSeed": "ブラウザで新しいシードフレーズを生成する",
+		"accountPassword": "アカウントパスワード",
+		"importSeed": "既存のシードフレーズを入力してください",
+		"passwordWarning": "このパスワードを紛失した場合、アカウントから資金を引き出したり、シードフレーズを復元したりできなくなります。弊社では回復することはできません。",
+		"savings": "貯蓄",
+		"password": "パスワード",
+		"confirmPassword": "パスワードを認証する"
 	}
 }
diff --git a/src/locales/pt.json b/src/locales/pt.json
index 327167c8..9618447b 100644
--- a/src/locales/pt.json
+++ b/src/locales/pt.json
@@ -20,7 +20,8 @@
 		},
 		"locations": {
 			"header": "Locais",
-			"description": "Aqui estão algumas empresas que estão aceitando bitcoin com a Coinos. Esperamos que o seu seja o próximo!"
+			"description": "Aqui estão algumas empresas que estão aceitando bitcoin com a Coinos. Esperamos que o seu seja o próximo!",
+			"viewMap": "Ver mapa"
 		}
 	},
 	"error": {
@@ -77,7 +78,8 @@
 		"support": "Suporte",
 		"telegram": "Telegram",
 		"twitter": "Twitter",
-		"documentation": "Documentação"
+		"documentation": "Documentação",
+		"nostr": "Nostr"
 	},
 	"howItWorks": {
 		"header": "Como funciona",
@@ -148,7 +150,9 @@
 		"noAccount": "Don't have an account?",
 		"register": "Register",
 		"signIn": "Sign In",
-		"failed": "Login failed"
+		"failed": "Login failed",
+		"createAccount": "Criar uma conta",
+		"signUp": "Inscrever-se"
 	},
 	"nav": {
 		"about": "About",
@@ -208,7 +212,8 @@
 			"deposit": "Deposit",
 			"voucher": "Voucher",
 			"checkout": "Confira",
-			"payNow": "Pague agora"
+			"payNow": "Pague agora",
+			"setup": "Configurar autocustódia"
 		},
 		"receive": {
 			"lessThan1BTCWarning": "Favor inserir uma quantidade inferior a 1 bitcoin.",
@@ -312,7 +317,9 @@
 		"details": "Detalhes",
 		"noMessages": "Você ainda não enviou ou recebeu nenhuma mensagem",
 		"install": "Instalar aplicativo",
-		"moreDetails": "Links e detalhes"
+		"moreDetails": "Links e detalhes",
+		"url": "URL pública",
+		"nwc": "Nostr carteira conectar"
 	},
 	"payments": {
 		"amount": "Quantidade",
@@ -404,7 +411,8 @@
 		"showText": "Mostrar texto",
 		"showQr": "Mostrar QR",
 		"copyPr": "Copiar solicitação de pagamento",
-		"amountPrompt": "Sempre solicite o valor"
+		"amountPrompt": "Sempre solicite o valor",
+		"enterWalletPass": "Senha da carteira"
 	},
 	"items": {
 		"add": "Adicionar Item",
@@ -413,5 +421,28 @@
 		"price": "Preço",
 		"submit": "Enviar",
 		"image": "Imagem"
+	},
+	"accounts": {
+		"back": "Voltar",
+		"next": "Próximo",
+		"seedPhrase": "Frase semente",
+		"save": "Salvar",
+		"copy": "Cópia",
+		"revealMnemonic": "Revelar frase semente",
+		"regenerate": "Regenerado",
+		"deleteAccount": "Excluir conta",
+		"addAccount": "Adicionar conta",
+		"create": "Criar",
+		"import": "Importar",
+		"accountSetup": "Configuração da conta",
+		"enterSeed": "Insira uma frase semente",
+		"passwordMismatch": "As senhas não correspondem",
+		"generateSeed": "Gere uma nova frase semente no seu navegador",
+		"accountPassword": "Senha da conta",
+		"importSeed": "Insira uma frase semente existente",
+		"passwordWarning": "Se você perder essa senha, não poderá sacar fundos da conta ou restaurar sua seed phrase. Não podemos recuperá-la para você.",
+		"savings": "Poupança",
+		"password": "Senha",
+		"confirmPassword": "Confirme sua senha"
 	}
 }
diff --git a/src/locales/ru.json b/src/locales/ru.json
index 27a14836..11076733 100644
--- a/src/locales/ru.json
+++ b/src/locales/ru.json
@@ -20,7 +20,8 @@
 		},
 		"locations": {
 			"header": "Локации",
-			"description": "Вот некоторые компании, которые принимают биткойны через Coinos. Надеемся, что ваш будет следующим!"
+			"description": "Вот некоторые компании, которые принимают биткойны через Coinos. Надеемся, что ваш будет следующим!",
+			"viewMap": "Посмотреть карту"
 		}
 	},
 	"error": {
@@ -61,7 +62,8 @@
 		"support": "Поддерживать",
 		"telegram": "Телеграмма",
 		"twitter": "Твиттер",
-		"documentation": "Документация"
+		"documentation": "Документация",
+		"nostr": "Ностр"
 	},
 	"howItWorks": {
 		"header": "Как это работает",
@@ -132,7 +134,9 @@
 		"noAccount": "У вас нет учетной записи?",
 		"register": "регистр",
 		"signIn": "Войти",
-		"failed": "Ошибка входа"
+		"failed": "Ошибка входа",
+		"createAccount": "Зарегистрироваться",
+		"signUp": "Зарегистрироваться"
 	},
 	"nav": {
 		"about": "О",
@@ -189,7 +193,8 @@
 			"deposit": "Депозит",
 			"voucher": "Ваучер",
 			"checkout": "Проверить",
-			"payNow": "Заплатить сейчас"
+			"payNow": "Заплатить сейчас",
+			"setup": "Настройка самостоятельного хранения"
 		},
 		"receive": {
 			"lessThan1BTCWarning": "Пожалуйста, введите сумму менее 1 биткойна.",
@@ -291,7 +296,9 @@
 		"details": "Подробности",
 		"noMessages": "Вы еще не отправляли и не получали сообщений",
 		"install": "Установить приложение",
-		"moreDetails": "Ссылки и подробности"
+		"moreDetails": "Ссылки и подробности",
+		"url": "Публичный URL-адрес",
+		"nwc": "Nostr кошелек подключить"
 	},
 	"payments": {
 		"networkFee": "Сетевая плата",
@@ -382,7 +389,8 @@
 		"showText": "Показать текст",
 		"showQr": "Показать QR-код",
 		"copyPr": "Копировать запрос на оплату",
-		"amountPrompt": "Всегда запрашивать сумму"
+		"amountPrompt": "Всегда запрашивать сумму",
+		"enterWalletPass": "Пароль кошелька"
 	},
 	"items": {
 		"add": "Добавить элемент",
@@ -391,5 +399,28 @@
 		"price": "Цена",
 		"submit": "Представлять на рассмотрение",
 		"image": "Изображение"
+	},
+	"accounts": {
+		"back": "Назад",
+		"next": "Следующий",
+		"seedPhrase": "Исходная фраза",
+		"save": "Сохранять",
+		"copy": "Копировать",
+		"revealMnemonic": "Раскрыть начальную фразу",
+		"regenerate": "Регенерировать",
+		"deleteAccount": "Удалить аккаунт",
+		"addAccount": "Добавить аккаунт",
+		"create": "Создавать",
+		"import": "Импорт",
+		"accountSetup": "Настройка учетной записи",
+		"enterSeed": "Введите начальную фразу",
+		"passwordMismatch": "Пароли не совпадают",
+		"generateSeed": "Создайте новую исходную фразу в вашем браузере",
+		"accountPassword": "Пароль учетной записи",
+		"importSeed": "Введите существующую начальную фразу",
+		"passwordWarning": "Если вы потеряете этот пароль, вы не сможете вывести средства со счета или восстановить вашу seed-фразу. Мы не можем восстановить ее для вас.",
+		"savings": "Экономия",
+		"password": "Пароль",
+		"confirmPassword": "Подтвердите пароль"
 	}
 }
diff --git a/src/locales/zh.json b/src/locales/zh.json
index fbf3dc01..e3ceabba 100644
--- a/src/locales/zh.json
+++ b/src/locales/zh.json
@@ -20,7 +20,8 @@
 		},
 		"locations": {
 			"header": "地点",
-			"description": "以下是一些接受 Coinos 比特币支付平台的企业，希望您的公司可以加入我们！"
+			"description": "以下是一些接受 Coinos 比特币支付平台的企业，希望您的公司可以加入我们！",
+			"viewMap": "查看地图"
 		}
 	},
 	"error": {
@@ -61,7 +62,8 @@
 		"support": "支持",
 		"telegram": "电报",
 		"twitter": "推特",
-		"documentation": "文档"
+		"documentation": "文档",
+		"nostr": "诺斯特"
 	},
 	"howItWorks": {
 		"header": "如何操作",
@@ -132,7 +134,9 @@
 		"noAccount": "没有帐户？",
 		"register": "登记",
 		"signIn": "登入",
-		"failed": "登录失败"
+		"failed": "登录失败",
+		"createAccount": "创建账户",
+		"signUp": "报名"
 	},
 	"nav": {
 		"about": "关于",
@@ -189,7 +193,8 @@
 			"deposit": "订金",
 			"voucher": "代金券",
 			"checkout": "查看",
-			"payNow": "现在付款"
+			"payNow": "现在付款",
+			"setup": "设置自我监护"
 		},
 		"receive": {
 			"lessThan1BTCWarning": "请输入小于 1 比特币的金额。",
@@ -291,7 +296,9 @@
 		"details": "细节",
 		"noMessages": "您尚未发送或接收任何消息",
 		"install": "安装应用程序",
-		"moreDetails": "链接和详细信息"
+		"moreDetails": "链接和详细信息",
+		"url": "公共 URL",
+		"nwc": "Nostr 钱包连接"
 	},
 	"payments": {
 		"networkFee": "网络费",
@@ -382,7 +389,8 @@
 		"showText": "显示文本",
 		"showQr": "显示二维码",
 		"copyPr": "复制付款请求",
-		"amountPrompt": "始终提示金额"
+		"amountPrompt": "始终提示金额",
+		"enterWalletPass": "钱包密码"
 	},
 	"items": {
 		"add": "新增项目",
@@ -391,5 +399,28 @@
 		"price": "价格",
 		"submit": "提交",
 		"image": "图像"
+	},
+	"accounts": {
+		"back": "后退",
+		"next": "下一个",
+		"seedPhrase": "种子短语",
+		"save": "节省",
+		"copy": "复制",
+		"revealMnemonic": "显示种子短语",
+		"regenerate": "再生",
+		"deleteAccount": "删除帐户",
+		"addAccount": "添加帐户",
+		"create": "创造",
+		"import": "进口",
+		"accountSetup": "帐户设置",
+		"enterSeed": "输入种子短语",
+		"passwordMismatch": "密码不匹配",
+		"generateSeed": "在浏览器中生成新的种子短语",
+		"accountPassword": "账户密码",
+		"importSeed": "输入现有的种子短语",
+		"passwordWarning": "如果您丢失了此密码，您将无法从账户中提取资金或恢复您的种子短语。我们无法为您恢复它。",
+		"savings": "储蓄",
+		"password": "密码",
+		"confirmPassword": "确认密码"
 	}
 }
-- 
cgit v1.2.3