From 6d7cd2573dbabae0b0ac526a0da87964fae2b352 Mon Sep 17 00:00:00 2001
From: ekzyis <ekzyis@ekzyis.com>
Date: Sun, 26 Nov 2023 22:07:56 +0100
Subject: [PATCH 01/22] Show user invoices

---
 db/invoice.go                       | 27 ++++++++++++++
 db/types.go                         |  1 +
 server/router/handler/invoice.go    | 15 ++++++++
 server/router/router.go             |  3 ++
 vue/package.json                    |  1 +
 vue/src/components/UserHome.vue     | 18 ++++++++++
 vue/src/components/UserInvoices.vue | 56 +++++++++++++++++++++++++++++
 vue/src/main.js                     |  9 ++++-
 vue/src/views/UserView.vue          | 31 ++++++++--------
 vue/yarn.lock                       |  5 +++
 10 files changed, 151 insertions(+), 15 deletions(-)
 create mode 100644 vue/src/components/UserHome.vue
 create mode 100644 vue/src/components/UserInvoices.vue

diff --git a/db/invoice.go b/db/invoice.go
index 82d60db..e2c9bae 100644
--- a/db/invoice.go
+++ b/db/invoice.go
@@ -70,6 +70,33 @@ func (db *DB) FetchInvoices(where *FetchInvoicesWhere, invoices *[]Invoice) erro
 	return nil
 }
 
+func (db *DB) FetchUserInvoices(pubkey string, invoices *[]Invoice) error {
+	var (
+		rows    *sql.Rows
+		invoice Invoice
+		err     error
+	)
+	var (
+		query = "" +
+			"SELECT id, pubkey, msats, preimage, hash, bolt11, created_at, expires_at, confirmed_at, held_since, COALESCE(description, ''), " +
+			"CASE WHEN confirmed_at IS NOT NULL THEN 'PAID' WHEN expires_at < CURRENT_TIMESTAMP THEN 'EXPIRED' ELSE 'WAITING' END AS status " +
+			"FROM invoices " +
+			"WHERE pubkey = $1 " +
+			"ORDER BY created_at DESC"
+	)
+	if rows, err = db.Query(query, pubkey); err != nil {
+		return err
+	}
+	defer rows.Close()
+	for rows.Next() {
+		rows.Scan(
+			&invoice.Id, &invoice.Pubkey, &invoice.Msats, &invoice.Preimage, &invoice.Hash,
+			&invoice.PaymentRequest, &invoice.CreatedAt, &invoice.ExpiresAt, &invoice.ConfirmedAt, &invoice.HeldSince, &invoice.Description, &invoice.Status)
+		*invoices = append(*invoices, invoice)
+	}
+	return nil
+}
+
 func (db *DB) ConfirmInvoice(hash string, confirmedAt time.Time, msatsReceived int) error {
 	if _, err := db.Exec("UPDATE invoices SET confirmed_at = $2, msats_received = $3 WHERE hash = $1", hash, confirmedAt, msatsReceived); err != nil {
 		return err
diff --git a/db/types.go b/db/types.go
index e0d817e..fa8cd81 100644
--- a/db/types.go
+++ b/db/types.go
@@ -47,6 +47,7 @@ type (
 		ConfirmedAt    null.Time
 		HeldSince      null.Time
 		Description    string
+		Status         string
 	}
 	Order struct {
 		Id        UUID
diff --git a/server/router/handler/invoice.go b/server/router/handler/invoice.go
index 45e888d..f9d1073 100644
--- a/server/router/handler/invoice.go
+++ b/server/router/handler/invoice.go
@@ -93,3 +93,18 @@ func HandleInvoice(sc context.ServerContext) echo.HandlerFunc {
 		return sc.Render(c, http.StatusOK, "invoice.html", data)
 	}
 }
+
+func HandleInvoices(sc context.ServerContext) echo.HandlerFunc {
+	return func(c echo.Context) error {
+		var (
+			u        db.User
+			invoices []db.Invoice
+			err      error
+		)
+		u = c.Get("session").(db.User)
+		if err = sc.Db.FetchUserInvoices(u.Pubkey, &invoices); err != nil {
+			return err
+		}
+		return c.JSON(http.StatusOK, invoices)
+	}
+}
diff --git a/server/router/router.go b/server/router/router.go
index 25a3b8b..bbd9569 100644
--- a/server/router/router.go
+++ b/server/router/router.go
@@ -57,6 +57,9 @@ func addBackendRoutes(e *echo.Echo, sc ServerContext) {
 	GET(e, sc, "/api/invoice/:id",
 		handler.HandleInvoiceStatus,
 		middleware.SessionGuard)
+	GET(e, sc, "/api/invoices",
+		handler.HandleInvoices,
+		middleware.SessionGuard)
 }
 
 func GET(e *echo.Echo, sc ServerContext, path string, scF HandlerFunc, scM ...MiddlewareFunc) *echo.Route {
diff --git a/vue/package.json b/vue/package.json
index 43f3368..260bc1c 100644
--- a/vue/package.json
+++ b/vue/package.json
@@ -12,6 +12,7 @@
     "core-js": "^3.8.3",
     "pinia": "^2.1.7",
     "register-service-worker": "^1.7.2",
+    "s-ago": "^2.2.0",
     "vite": "^4.5.0",
     "vue": "^3.2.13",
     "vue-router": "4"
diff --git a/vue/src/components/UserHome.vue b/vue/src/components/UserHome.vue
new file mode 100644
index 0000000..2fe2f69
--- /dev/null
+++ b/vue/src/components/UserHome.vue
@@ -0,0 +1,18 @@
+<template>
+  <div v-if="session.pubkey" class="flex flex-row items-center">
+    <div>authenticated as {{ session.pubkey.slice(0, 8) }}</div>
+    <button class="ms-2 my-3" @click="logout">logout</button>
+  </div>
+</template>
+
+<script setup>
+import { useSession } from '@/stores/session'
+import { useRouter } from 'vue-router'
+const session = useSession()
+const router = useRouter()
+
+const logout = async () => {
+  await session.logout()
+  router.push('/')
+}
+</script>
diff --git a/vue/src/components/UserInvoices.vue b/vue/src/components/UserInvoices.vue
new file mode 100644
index 0000000..11f2d59
--- /dev/null
+++ b/vue/src/components/UserInvoices.vue
@@ -0,0 +1,56 @@
+<template>
+  <div class="text w-auto">
+    <table>
+      <thead>
+        <th>sats</th>
+        <th>created at</th>
+        <th class="hidden-sm">expires at</th>
+        <th>status</th>
+        <th>details</th>
+      </thead>
+      <tbody>
+        <tr v-for="i in  invoices " :key="i.id">
+          <td>{{ i.Msats / 1000 }}</td>
+          <td :title="i.CreatedAt">{{ ago(new Date(i.CreatedAt)) }}</td>
+          <td :title="i.ExpiresAt" class="hidden-sm">{{ ago(new Date(i.ExpiresAt)) }}</td>
+          <td>{{ i.Status }}</td>
+          <td>
+            <router-link :to="/invoice/ + i.Id">open</router-link>
+          </td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+</template>
+
+<script setup>
+import { ref } from 'vue'
+import ago from 's-ago'
+
+const invoices = ref(null)
+
+const url = '/api/invoices'
+await fetch(url)
+  .then(r => r.json())
+  .then(body => {
+    invoices.value = body
+  })
+  .catch(console.error)
+</script>
+
+<style scoped>
+table {
+  width: fit-content;
+  align-items: center;
+}
+
+th {
+  padding: 0 1rem;
+}
+
+@media only screen and (max-width: 600px) {
+  .hidden-sm {
+    display: none
+  }
+}
+</style>
diff --git a/vue/src/main.js b/vue/src/main.js
index 3fa9819..948895e 100644
--- a/vue/src/main.js
+++ b/vue/src/main.js
@@ -10,6 +10,8 @@ import LoginView from '@/views/LoginView'
 import UserView from '@/views/UserView'
 import MarketView from '@/views/MarketView'
 import InvoiceView from '@/views/InvoiceView'
+import UserHome from '@/components/UserHome'
+import UserInvoices from '@/components/UserInvoices'
 
 const routes = [
   {
@@ -19,7 +21,12 @@ const routes = [
     path: '/login', component: LoginView
   },
   {
-    path: '/user', component: UserView
+    path: '/user',
+    component: UserView,
+    children: [
+      { path: '', name: 'user', component: UserHome },
+      { path: 'invoices', name: 'invoices', component: UserInvoices }
+    ]
   },
   {
     path: '/market/:id', component: MarketView
diff --git a/vue/src/views/UserView.vue b/vue/src/views/UserView.vue
index 73201f6..2521a67 100644
--- a/vue/src/views/UserView.vue
+++ b/vue/src/views/UserView.vue
@@ -9,21 +9,24 @@
  \__,_|___/\___|_|   </pre>
   </div>
   <!-- eslint-enable -->
-  <div v-if="session.pubkey">
-    <div>authenticated as {{ session.pubkey.slice(0, 8) }}</div>
-    <button class="my-3" @click="logout">logout</button>
-  </div>
+  <header class="flex flex-row text-center justify-center pt-1">
+    <nav>
+      <router-link to="/user">settings</router-link>
+      <router-link to="/user/invoices">invoices</router-link>
+    </nav>
+  </header>
+  <Suspense>
+    <router-view />
+  </Suspense>
 </template>
 
-<script setup>
-import { useSession } from '@/stores/session'
-import { useRouter } from 'vue-router'
-const session = useSession()
-const router = useRouter()
-
-const logout = async () => {
-  await session.logout()
-  router.push('/')
+<style scoped>
+nav {
+  display: flex;
+  justify-content: center;
 }
 
-</script>
+nav>a {
+  margin: 0 3px;
+}
+</style>
diff --git a/vue/yarn.lock b/vue/yarn.lock
index f20a5cf..bbd5f2a 100644
--- a/vue/yarn.lock
+++ b/vue/yarn.lock
@@ -4012,6 +4012,11 @@ run-parallel@^1.1.9:
   dependencies:
     queue-microtask "^1.2.2"
 
+s-ago@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/s-ago/-/s-ago-2.2.0.tgz#4143a9d0176b3100dcf649c78e8a1ec8a59b1312"
+  integrity sha512-t6Q/aFCCJSBf5UUkR/WH0mDHX8EGm2IBQ7nQLobVLsdxOlkryYMbOlwu2D4Cf7jPUp0v1LhfPgvIZNoi9k8lUA==
+
 safe-array-concat@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.0.1.tgz#91686a63ce3adbea14d61b14c99572a8ff84754c"

From 46c2a4eceba75902d4fdeab4119923d0e764ce6e Mon Sep 17 00:00:00 2001
From: ekzyis <ekzyis@ekzyis.com>
Date: Sun, 26 Nov 2023 22:28:38 +0100
Subject: [PATCH 02/22] Add StyledLink

---
 vue/src/components/StyledLink.vue | 16 ++++++++++++++++
 vue/src/main.js                   |  2 +-
 vue/src/views/UserView.vue        |  8 ++++++--
 3 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 vue/src/components/StyledLink.vue

diff --git a/vue/src/components/StyledLink.vue b/vue/src/components/StyledLink.vue
new file mode 100644
index 0000000..11831cd
--- /dev/null
+++ b/vue/src/components/StyledLink.vue
@@ -0,0 +1,16 @@
+<template>
+  <router-link :to="to" :class="{ selected }">
+    <slot></slot>
+  </router-link>
+</template>
+
+<script setup>
+
+import { computed, defineProps } from 'vue'
+import { useRoute } from 'vue-router'
+
+const route = useRoute()
+const props = defineProps(['to'])
+const selected = computed(() => props.to !== '/' ? route.path.startsWith(props.to) : route.path === props.to, [route.path])
+
+</script>
diff --git a/vue/src/main.js b/vue/src/main.js
index 948895e..0417c64 100644
--- a/vue/src/main.js
+++ b/vue/src/main.js
@@ -24,7 +24,7 @@ const routes = [
     path: '/user',
     component: UserView,
     children: [
-      { path: '', name: 'user', component: UserHome },
+      { path: 'settings', name: 'user', component: UserHome },
       { path: 'invoices', name: 'invoices', component: UserInvoices }
     ]
   },
diff --git a/vue/src/views/UserView.vue b/vue/src/views/UserView.vue
index 2521a67..d38593f 100644
--- a/vue/src/views/UserView.vue
+++ b/vue/src/views/UserView.vue
@@ -11,8 +11,8 @@
   <!-- eslint-enable -->
   <header class="flex flex-row text-center justify-center pt-1">
     <nav>
-      <router-link to="/user">settings</router-link>
-      <router-link to="/user/invoices">invoices</router-link>
+      <StyledLink to="/user/settings">settings</StyledLink>
+      <StyledLink to="/user/invoices">invoices</StyledLink>
     </nav>
   </header>
   <Suspense>
@@ -20,6 +20,10 @@
   </Suspense>
 </template>
 
+<script setup>
+import StyledLink from '@/components/StyledLink'
+</script>
+
 <style scoped>
 nav {
   display: flex;

From 22c9bbdee37bb13b1352f60b2fad209b4b49d09e Mon Sep 17 00:00:00 2001
From: ekzyis <ekzyis@ekzyis.com>
Date: Sun, 26 Nov 2023 22:37:06 +0100
Subject: [PATCH 03/22] Rename to UserSettings

---
 vue/src/components/{UserHome.vue => UserSettings.vue} | 0
 vue/src/main.js                                       | 4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename vue/src/components/{UserHome.vue => UserSettings.vue} (100%)

diff --git a/vue/src/components/UserHome.vue b/vue/src/components/UserSettings.vue
similarity index 100%
rename from vue/src/components/UserHome.vue
rename to vue/src/components/UserSettings.vue
diff --git a/vue/src/main.js b/vue/src/main.js
index 0417c64..9c06add 100644
--- a/vue/src/main.js
+++ b/vue/src/main.js
@@ -10,7 +10,7 @@ import LoginView from '@/views/LoginView'
 import UserView from '@/views/UserView'
 import MarketView from '@/views/MarketView'
 import InvoiceView from '@/views/InvoiceView'
-import UserHome from '@/components/UserHome'
+import UserSettings from '@/components/UserSettings'
 import UserInvoices from '@/components/UserInvoices'
 
 const routes = [
@@ -24,7 +24,7 @@ const routes = [
     path: '/user',
     component: UserView,
     children: [
-      { path: 'settings', name: 'user', component: UserHome },
+      { path: 'settings', name: 'user', component: UserSettings },
       { path: 'invoices', name: 'invoices', component: UserInvoices }
     ]
   },

From 73162155d58b630cf1442fa5bff2a35145b492bb Mon Sep 17 00:00:00 2001
From: ekzyis <ekzyis@ekzyis.com>
Date: Sun, 26 Nov 2023 23:22:33 +0100
Subject: [PATCH 04/22] Fix orphaned invoices with Tx and Context usage

txs are now rolled back on order error
---
 db/invoice.go                   |  5 +++--
 db/market.go                    | 17 +++++++++------
 lnd/invoice.go                  |  9 ++++----
 server/router/handler/market.go | 38 ++++++++++++++++++++++++++++-----
 4 files changed, 51 insertions(+), 18 deletions(-)

diff --git a/db/invoice.go b/db/invoice.go
index e2c9bae..161acc9 100644
--- a/db/invoice.go
+++ b/db/invoice.go
@@ -1,12 +1,13 @@
 package db
 
 import (
+	"context"
 	"database/sql"
 	"time"
 )
 
-func (db *DB) CreateInvoice(invoice *Invoice) error {
-	if err := db.QueryRow(""+
+func (db *DB) CreateInvoice(tx *sql.Tx, ctx context.Context, invoice *Invoice) error {
+	if err := tx.QueryRowContext(ctx, ""+
 		"INSERT INTO invoices(pubkey, msats, preimage, hash, bolt11, created_at, expires_at, description) "+
 		"VALUES($1, $2, $3, $4, $5, $6, $7, $8) "+
 		"RETURNING id",
diff --git a/db/market.go b/db/market.go
index 0ca6ad3..d2ae5e2 100644
--- a/db/market.go
+++ b/db/market.go
@@ -1,6 +1,9 @@
 package db
 
-import "database/sql"
+import (
+	"context"
+	"database/sql"
+)
 
 type FetchOrdersWhere struct {
 	MarketId  int
@@ -8,8 +11,8 @@ type FetchOrdersWhere struct {
 	Confirmed bool
 }
 
-func (db *DB) CreateMarket(market *Market) error {
-	if err := db.QueryRow(""+
+func (db *DB) CreateMarket(tx *sql.Tx, ctx context.Context, market *Market) error {
+	if err := tx.QueryRowContext(ctx, ""+
 		"INSERT INTO markets(description, end_date, invoice_id) "+
 		"VALUES($1, $2, $3) "+
 		"RETURNING id", market.Description, market.EndDate, market.InvoiceId).Scan(&market.Id); err != nil {
@@ -62,8 +65,8 @@ func (db *DB) FetchShares(marketId int, shares *[]Share) error {
 	return nil
 }
 
-func (db *DB) FetchShare(shareId string, share *Share) error {
-	return db.QueryRow("SELECT id, market_id, description FROM shares WHERE id = $1", shareId).Scan(&share.Id, &share.MarketId, &share.Description)
+func (db *DB) FetchShare(tx *sql.Tx, ctx context.Context, shareId string, share *Share) error {
+	return tx.QueryRowContext(ctx, "SELECT id, market_id, description FROM shares WHERE id = $1", shareId).Scan(&share.Id, &share.MarketId, &share.Description)
 }
 
 func (db *DB) FetchOrders(where *FetchOrdersWhere, orders *[]Order) error {
@@ -99,8 +102,8 @@ func (db *DB) FetchOrders(where *FetchOrdersWhere, orders *[]Order) error {
 	return nil
 }
 
-func (db *DB) CreateOrder(order *Order) error {
-	if _, err := db.Exec(""+
+func (db *DB) CreateOrder(tx *sql.Tx, ctx context.Context, order *Order) error {
+	if _, err := tx.ExecContext(ctx, ""+
 		"INSERT INTO orders(share_id, pubkey, side, quantity, price, invoice_id) "+
 		"VALUES ($1, $2, $3, $4, $5, $6)",
 		order.ShareId, order.Pubkey, order.Side, order.Quantity, order.Price, order.InvoiceId); err != nil {
diff --git a/lnd/invoice.go b/lnd/invoice.go
index 337fa8d..84d9163 100644
--- a/lnd/invoice.go
+++ b/lnd/invoice.go
@@ -2,6 +2,7 @@ package lnd
 
 import (
 	"context"
+	"database/sql"
 	"log"
 	"time"
 
@@ -12,7 +13,7 @@ import (
 	"github.com/lightningnetwork/lnd/lnwire"
 )
 
-func (lnd *LNDClient) CreateInvoice(d *db.DB, pubkey string, msats int64, description string) (*db.Invoice, error) {
+func (lnd *LNDClient) CreateInvoice(tx *sql.Tx, ctx context.Context, d *db.DB, pubkey string, msats int64, description string) (*db.Invoice, error) {
 	var (
 		expiry         time.Duration = time.Hour
 		preimage       lntypes.Preimage
@@ -26,14 +27,14 @@ func (lnd *LNDClient) CreateInvoice(d *db.DB, pubkey string, msats int64, descri
 		return nil, err
 	}
 	hash = preimage.Hash()
-	if paymentRequest, err = lnd.Invoices.AddHoldInvoice(context.TODO(), &invoicesrpc.AddInvoiceData{
+	if paymentRequest, err = lnd.Invoices.AddHoldInvoice(ctx, &invoicesrpc.AddInvoiceData{
 		Hash:   &hash,
 		Value:  lnwire.MilliSatoshi(msats),
 		Expiry: int64(expiry / time.Millisecond),
 	}); err != nil {
 		return nil, err
 	}
-	if lnInvoice, err = lnd.Client.LookupInvoice(context.TODO(), hash); err != nil {
+	if lnInvoice, err = lnd.Client.LookupInvoice(ctx, hash); err != nil {
 		return nil, err
 	}
 	dbInvoice = &db.Invoice{
@@ -46,7 +47,7 @@ func (lnd *LNDClient) CreateInvoice(d *db.DB, pubkey string, msats int64, descri
 		ExpiresAt:      lnInvoice.CreationDate.Add(expiry),
 		Description:    description,
 	}
-	if err := d.CreateInvoice(dbInvoice); err != nil {
+	if err := d.CreateInvoice(tx, ctx, dbInvoice); err != nil {
 		return nil, err
 	}
 	return dbInvoice, nil
diff --git a/server/router/handler/market.go b/server/router/handler/market.go
index 3c0b917..2728aee 100644
--- a/server/router/handler/market.go
+++ b/server/router/handler/market.go
@@ -1,11 +1,13 @@
 package handler
 
 import (
+	context_ "context"
 	"database/sql"
 	"fmt"
 	"net/http"
 	"strconv"
 	"strings"
+	"time"
 
 	"git.ekzyis.com/ekzyis/delphi.market/db"
 	"git.ekzyis.com/ekzyis/delphi.market/lib"
@@ -50,6 +52,7 @@ func HandleMarket(sc context.ServerContext) echo.HandlerFunc {
 func HandleCreateMarket(sc context.ServerContext) echo.HandlerFunc {
 	return func(c echo.Context) error {
 		var (
+			tx             *sql.Tx
 			u              db.User
 			m              db.Market
 			invoice        *db.Invoice
@@ -64,11 +67,20 @@ func HandleCreateMarket(sc context.ServerContext) echo.HandlerFunc {
 			return echo.NewHTTPError(http.StatusBadRequest)
 		}
 
+		// transaction start
+		ctx, cancel := context_.WithTimeout(c.Request().Context(), 5*time.Second)
+		defer cancel()
+		if tx, err = sc.Db.BeginTx(ctx, nil); err != nil {
+			tx.Rollback()
+			return err
+		}
+		defer tx.Commit()
+
 		u = c.Get("session").(db.User)
 		msats = 1000
 		// TODO: add [market:<id>] for redirect after payment
 		invDescription = fmt.Sprintf("create market \"%s\" (%s)", m.Description, m.EndDate)
-		if invoice, err = sc.Lnd.CreateInvoice(sc.Db, u.Pubkey, msats, invDescription); err != nil {
+		if invoice, err = sc.Lnd.CreateInvoice(tx, ctx, sc.Db, u.Pubkey, msats, invDescription); err != nil {
 			return err
 		}
 		if qr, err = lib.ToQR(invoice.PaymentRequest); err != nil {
@@ -80,7 +92,7 @@ func HandleCreateMarket(sc context.ServerContext) echo.HandlerFunc {
 		go sc.Lnd.CheckInvoice(sc.Db, hash)
 
 		m.InvoiceId = invoice.Id
-		if err := sc.Db.CreateMarket(&m); err != nil {
+		if err := sc.Db.CreateMarket(tx, ctx, &m); err != nil {
 			return err
 		}
 
@@ -97,6 +109,7 @@ func HandleCreateMarket(sc context.ServerContext) echo.HandlerFunc {
 func HandleOrder(sc context.ServerContext) echo.HandlerFunc {
 	return func(c echo.Context) error {
 		var (
+			tx          *sql.Tx
 			u           db.User
 			o           db.Order
 			s           db.Share
@@ -122,7 +135,18 @@ func HandleOrder(sc context.ServerContext) echo.HandlerFunc {
 		u = c.Get("session").(db.User)
 		o.Pubkey = u.Pubkey
 		msats = o.Quantity * o.Price * 1000
-		if err = sc.Db.FetchShare(o.ShareId, &s); err != nil {
+
+		// transaction start
+		ctx, cancel := context_.WithTimeout(c.Request().Context(), 5*time.Second)
+		defer cancel()
+		if tx, err = sc.Db.BeginTx(ctx, nil); err != nil {
+			tx.Rollback()
+			return err
+		}
+		defer tx.Commit()
+
+		if err = sc.Db.FetchShare(tx, ctx, o.ShareId, &s); err != nil {
+			tx.Rollback()
 			return err
 		}
 		description = fmt.Sprintf("%s %d %s shares @ %d sats [market:%d]", strings.ToUpper(o.Side), o.Quantity, s.Description, o.Price, s.MarketId)
@@ -130,20 +154,24 @@ func HandleOrder(sc context.ServerContext) echo.HandlerFunc {
 		// TODO: if SELL order, check share balance of user
 
 		// Create HODL invoice
-		if invoice, err = sc.Lnd.CreateInvoice(sc.Db, o.Pubkey, msats, description); err != nil {
+		if invoice, err = sc.Lnd.CreateInvoice(tx, ctx, sc.Db, o.Pubkey, msats, description); err != nil {
+			tx.Rollback()
 			return err
 		}
 		// Create QR code to pay HODL invoice
 		if qr, err = lib.ToQR(invoice.PaymentRequest); err != nil {
+			tx.Rollback()
 			return err
 		}
 		if hash, err = lntypes.MakeHashFromStr(invoice.Hash); err != nil {
+			tx.Rollback()
 			return err
 		}
 
 		// Create (unconfirmed) order
 		o.InvoiceId = invoice.Id
-		if err := sc.Db.CreateOrder(&o); err != nil {
+		if err := sc.Db.CreateOrder(tx, ctx, &o); err != nil {
+			tx.Rollback()
 			return err
 		}
 

From 001ac39328beb9f6ecab66b138e36bcd5a5c6d17 Mon Sep 17 00:00:00 2001
From: ekzyis <ekzyis@ekzyis.com>
Date: Sun, 26 Nov 2023 23:28:58 +0100
Subject: [PATCH 05/22] Fix poll leak

---
 vue/src/components/Invoice.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/vue/src/components/Invoice.vue b/vue/src/components/Invoice.vue
index 367a4bf..df650a5 100644
--- a/vue/src/components/Invoice.vue
+++ b/vue/src/components/Invoice.vue
@@ -54,7 +54,7 @@
 </template>
 
 <script setup>
-import { ref } from 'vue'
+import { onUnmounted, ref } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 
 const router = useRouter()
@@ -120,6 +120,9 @@ await (async () => {
   invoice.value = body
   interval = setInterval(poll, INVOICE_POLL)
 })()
+
+onUnmounted(() => { clearInterval(interval) })
+
 </script>
 
 <style scoped>

From da58c1158a47c0b2d04d0cb63a8cc0839cb6f65b Mon Sep 17 00:00:00 2001
From: ekzyis <ekzyis@ekzyis.com>
Date: Sun, 26 Nov 2023 23:32:59 +0100
Subject: [PATCH 06/22] Add link to faucet

---
 vue/src/components/Invoice.vue | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/vue/src/components/Invoice.vue b/vue/src/components/Invoice.vue
index df650a5..c05ade8 100644
--- a/vue/src/components/Invoice.vue
+++ b/vue/src/components/Invoice.vue
@@ -22,6 +22,10 @@
         </figcaption>
       </figure>
       <div class="grid text-muted text-xs">
+        <span v-if="faucet" class="mx-3 my-1">faucet</span>
+        <span v-if="faucet" class="text-ellipsis overflow-hidden font-mono me-3 my-1">
+          <a href="https://faucet.mutinynet.com/" target="_blank">faucet.mutinynet.com</a>
+        </span>
         <span class="mx-3 my-1">payment hash</span><span class="text-ellipsis overflow-hidden font-mono me-3 my-1">
           {{ invoice.Hash }}
         </span>
@@ -123,6 +127,8 @@ await (async () => {
 
 onUnmounted(() => { clearInterval(interval) })
 
+const faucet = window.location.hostname === 'delphi.market' ? 'https://faucet.mutinynet.com' : ''
+
 </script>
 
 <style scoped>

From e5e9ae066704a6b757d0791214441800b87b6118 Mon Sep 17 00:00:00 2001
From: ekzyis <ekzyis@ekzyis.com>
Date: Sun, 26 Nov 2023 23:40:11 +0100
Subject: [PATCH 07/22] Remove market end date from invoice description

---
 server/router/handler/market.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/router/handler/market.go b/server/router/handler/market.go
index 2728aee..12f7fcb 100644
--- a/server/router/handler/market.go
+++ b/server/router/handler/market.go
@@ -79,7 +79,7 @@ func HandleCreateMarket(sc context.ServerContext) echo.HandlerFunc {
 		u = c.Get("session").(db.User)
 		msats = 1000
 		// TODO: add [market:<id>] for redirect after payment
-		invDescription = fmt.Sprintf("create market \"%s\" (%s)", m.Description, m.EndDate)
+		invDescription = fmt.Sprintf("create market \"%s\"", m.Description)
 		if invoice, err = sc.Lnd.CreateInvoice(tx, ctx, sc.Db, u.Pubkey, msats, invDescription); err != nil {
 			return err
 		}

From afba1c2bfb33967ec91ed728482ce66037003f85 Mon Sep 17 00:00:00 2001
From: ekzyis <ekzyis@ekzyis.com>
Date: Sun, 26 Nov 2023 23:45:07 +0100
Subject: [PATCH 08/22] Add error handling in market form

---
 vue/src/components/MarketForm.vue | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/vue/src/components/MarketForm.vue b/vue/src/components/MarketForm.vue
index ee960e7..7551925 100644
--- a/vue/src/components/MarketForm.vue
+++ b/vue/src/components/MarketForm.vue
@@ -10,6 +10,7 @@
       <button type="submit">submit</button>
     </div>
   </form>
+  <div v-if="err" class="red text-center">{{ err }}</div>
 </template>
 
 <script setup>
@@ -22,6 +23,7 @@ const router = useRouter()
 const form = ref(null)
 const description = ref(null)
 const endDate = ref(null)
+const err = ref(null)
 
 const parseEndDate = endDate => {
   const [yyyy, mm, dd] = endDate.split('-')
@@ -33,6 +35,10 @@ const submitForm = async () => {
   const body = JSON.stringify({ description: description.value, endDate: parseEndDate(endDate.value) })
   const res = await fetch(url, { method: 'post', headers: { 'Content-type': 'application/json' }, body })
   const resBody = await res.json()
+  if (res.status !== 402) {
+    err.value = `error: server responded with HTTP ${resBody.status}`
+    return
+  }
   const invoiceId = resBody.id
   router.push('/invoice/' + invoiceId)
 }

From aa6db6a5e1d02c63af678128f7c68709fb07cea4 Mon Sep 17 00:00:00 2001
From: ekzyis <ekzyis@ekzyis.com>
Date: Sun, 26 Nov 2023 23:46:28 +0100
Subject: [PATCH 09/22] Fix foreign key constraint violation during market
 creation

---
 db/market.go                    | 2 +-
 server/router/handler/market.go | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/db/market.go b/db/market.go
index d2ae5e2..7ba4eb0 100644
--- a/db/market.go
+++ b/db/market.go
@@ -19,7 +19,7 @@ func (db *DB) CreateMarket(tx *sql.Tx, ctx context.Context, market *Market) erro
 		return err
 	}
 	// For now, we only support binary markets.
-	if _, err := db.Exec("INSERT INTO shares(market_id, description) VALUES ($1, 'YES'), ($1, 'NO')", market.Id); err != nil {
+	if _, err := tx.Exec("INSERT INTO shares(market_id, description) VALUES ($1, 'YES'), ($1, 'NO')", market.Id); err != nil {
 		return err
 	}
 	return nil
diff --git a/server/router/handler/market.go b/server/router/handler/market.go
index 12f7fcb..c883cdc 100644
--- a/server/router/handler/market.go
+++ b/server/router/handler/market.go
@@ -81,18 +81,22 @@ func HandleCreateMarket(sc context.ServerContext) echo.HandlerFunc {
 		// TODO: add [market:<id>] for redirect after payment
 		invDescription = fmt.Sprintf("create market \"%s\"", m.Description)
 		if invoice, err = sc.Lnd.CreateInvoice(tx, ctx, sc.Db, u.Pubkey, msats, invDescription); err != nil {
+			tx.Rollback()
 			return err
 		}
 		if qr, err = lib.ToQR(invoice.PaymentRequest); err != nil {
+			tx.Rollback()
 			return err
 		}
 		if hash, err = lntypes.MakeHashFromStr(invoice.Hash); err != nil {
+			tx.Rollback()
 			return err
 		}
 		go sc.Lnd.CheckInvoice(sc.Db, hash)
 
 		m.InvoiceId = invoice.Id
 		if err := sc.Db.CreateMarket(tx, ctx, &m); err != nil {
+			tx.Rollback()
 			return err
 		}
 

From fb7fbae6992e0c4e9aa53d8a32edd6dd61328322 Mon Sep 17 00:00:00 2001
From: ekzyis <ekzyis@ekzyis.com>
Date: Sun, 26 Nov 2023 23:53:35 +0100
Subject: [PATCH 10/22] Fix invoice polling finds no rows

---
 server/router/handler/market.go | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/server/router/handler/market.go b/server/router/handler/market.go
index c883cdc..c81531a 100644
--- a/server/router/handler/market.go
+++ b/server/router/handler/market.go
@@ -92,14 +92,16 @@ func HandleCreateMarket(sc context.ServerContext) echo.HandlerFunc {
 			tx.Rollback()
 			return err
 		}
-		go sc.Lnd.CheckInvoice(sc.Db, hash)
-
 		m.InvoiceId = invoice.Id
 		if err := sc.Db.CreateMarket(tx, ctx, &m); err != nil {
 			tx.Rollback()
 			return err
 		}
 
+		// need to commit before starting to poll invoice status
+		tx.Commit()
+		go sc.Lnd.CheckInvoice(sc.Db, hash)
+
 		data = map[string]any{
 			"id":     invoice.Id,
 			"bolt11": invoice.PaymentRequest,
@@ -179,7 +181,8 @@ func HandleOrder(sc context.ServerContext) echo.HandlerFunc {
 			return err
 		}
 
-		// Start goroutine to poll status and update invoice in background
+		// need to commit before startign to poll invoice status
+		tx.Commit()
 		go sc.Lnd.CheckInvoice(sc.Db, hash)
 
 		// TODO: find matching orders

From c96eeb76680306a4840de3ad21cd7a8af9876a4c Mon Sep 17 00:00:00 2001
From: ekzyis <ekzyis@ekzyis.com>
Date: Mon, 27 Nov 2023 00:21:09 +0100
Subject: [PATCH 11/22] Show user orders

---
 db/market.go                        | 21 +++++++++++
 db/types.go                         |  7 ++--
 server/router/handler/market.go     | 15 ++++++++
 server/router/router.go             |  3 ++
 vue/src/components/UserInvoices.vue |  6 ++-
 vue/src/components/UserOrders.vue   | 57 +++++++++++++++++++++++++++++
 vue/src/main.js                     |  4 +-
 vue/src/views/UserView.vue          |  1 +
 8 files changed, 109 insertions(+), 5 deletions(-)
 create mode 100644 vue/src/components/UserOrders.vue

diff --git a/db/market.go b/db/market.go
index 7ba4eb0..39db574 100644
--- a/db/market.go
+++ b/db/market.go
@@ -111,3 +111,24 @@ func (db *DB) CreateOrder(tx *sql.Tx, ctx context.Context, order *Order) error {
 	}
 	return nil
 }
+
+func (db *DB) FetchUserOrders(pubkey string, orders *[]Order) error {
+	query := "" +
+		"SELECT o.id, share_id, o.pubkey, o.side, o.quantity, o.price, o.invoice_id, o.created_at, s.description, s.market_id, i.confirmed_at " +
+		"FROM orders o " +
+		"JOIN invoices i ON o.invoice_id = i.id " +
+		"JOIN shares s ON o.share_id = s.id " +
+		"WHERE o.pubkey = $1 AND i.confirmed_at IS NOT NULL " +
+		"ORDER BY o.created_at DESC"
+	rows, err := db.Query(query, pubkey)
+	if err != nil {
+		return err
+	}
+	defer rows.Close()
+	for rows.Next() {
+		var order Order
+		rows.Scan(&order.Id, &order.ShareId, &order.Pubkey, &order.Side, &order.Quantity, &order.Price, &order.InvoiceId, &order.CreatedAt, &order.ShareDescription, &order.Share.MarketId, &order.Invoice.ConfirmedAt)
+		*orders = append(*orders, order)
+	}
+	return nil
+}
diff --git a/db/types.go b/db/types.go
index fa8cd81..9e64896 100644
--- a/db/types.go
+++ b/db/types.go
@@ -50,9 +50,10 @@ type (
 		Status         string
 	}
 	Order struct {
-		Id        UUID
-		CreatedAt time.Time
-		ShareId   string `json:"sid"`
+		Id               UUID
+		CreatedAt        time.Time
+		ShareId          string `json:"sid"`
+		ShareDescription string
 		Share
 		Pubkey    string
 		Side      string `json:"side"`
diff --git a/server/router/handler/market.go b/server/router/handler/market.go
index c81531a..e170191 100644
--- a/server/router/handler/market.go
+++ b/server/router/handler/market.go
@@ -196,3 +196,18 @@ func HandleOrder(sc context.ServerContext) echo.HandlerFunc {
 		return c.JSON(http.StatusPaymentRequired, data)
 	}
 }
+
+func HandleOrders(sc context.ServerContext) echo.HandlerFunc {
+	return func(c echo.Context) error {
+		var (
+			u      db.User
+			orders []db.Order
+			err    error
+		)
+		u = c.Get("session").(db.User)
+		if err = sc.Db.FetchUserOrders(u.Pubkey, &orders); err != nil {
+			return err
+		}
+		return c.JSON(http.StatusOK, orders)
+	}
+}
diff --git a/server/router/router.go b/server/router/router.go
index bbd9569..dd86dd0 100644
--- a/server/router/router.go
+++ b/server/router/router.go
@@ -50,6 +50,9 @@ func addBackendRoutes(e *echo.Echo, sc ServerContext) {
 		handler.HandleOrder,
 		middleware.SessionGuard,
 		middleware.LNDGuard)
+	GET(e, sc, "/api/orders",
+		handler.HandleOrders,
+		middleware.SessionGuard)
 	GET(e, sc, "/api/login", handler.HandleLogin)
 	GET(e, sc, "/api/login/callback", handler.HandleLoginCallback)
 	POST(e, sc, "/api/logout", handler.HandleLogout)
diff --git a/vue/src/components/UserInvoices.vue b/vue/src/components/UserInvoices.vue
index 11f2d59..5b6659c 100644
--- a/vue/src/components/UserInvoices.vue
+++ b/vue/src/components/UserInvoices.vue
@@ -45,10 +45,14 @@ table {
 }
 
 th {
-  padding: 0 1rem;
+  padding: 0 2rem;
 }
 
 @media only screen and (max-width: 600px) {
+  th {
+    padding: 0 1rem;
+  }
+
   .hidden-sm {
     display: none
   }
diff --git a/vue/src/components/UserOrders.vue b/vue/src/components/UserOrders.vue
new file mode 100644
index 0000000..51670fb
--- /dev/null
+++ b/vue/src/components/UserOrders.vue
@@ -0,0 +1,57 @@
+<template>
+  <div class="text w-auto">
+    <table>
+      <thead>
+        <th>market</th>
+        <th>description</th>
+        <th class="hidden-sm">created at</th>
+        <th>status</th>
+      </thead>
+      <tbody>
+        <tr v-for="o in orders " :key="o.id">
+          <td><router-link :to="/market/ + o.MarketId">{{ o.MarketId }}</router-link></td>
+          <td>{{ o.side }} {{ o.quantity }} {{ o.ShareDescription }} @ {{ o.price }} sats</td>
+          <td class="hidden-sm">{{ ago(new Date(o.CreatedAt)) }}</td>
+          <td></td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+</template>
+
+<script setup>
+import { ref } from 'vue'
+import ago from 's-ago'
+
+const orders = ref(null)
+
+const url = '/api/orders'
+await fetch(url)
+  .then(r => r.json())
+  .then(body => {
+    console.log(body)
+    orders.value = body
+  })
+  .catch(console.error)
+</script>
+
+<style scoped>
+table {
+  width: fit-content;
+  align-items: center;
+}
+
+th {
+  padding: 0 2rem;
+}
+
+@media only screen and (max-width: 600px) {
+  th {
+    padding: 0 1rem;
+  }
+
+  .hidden-sm {
+    display: none
+  }
+}
+</style>
diff --git a/vue/src/main.js b/vue/src/main.js
index 9c06add..ba00761 100644
--- a/vue/src/main.js
+++ b/vue/src/main.js
@@ -12,6 +12,7 @@ import MarketView from '@/views/MarketView'
 import InvoiceView from '@/views/InvoiceView'
 import UserSettings from '@/components/UserSettings'
 import UserInvoices from '@/components/UserInvoices'
+import UserOrders from '@/components/UserOrders'
 
 const routes = [
   {
@@ -25,7 +26,8 @@ const routes = [
     component: UserView,
     children: [
       { path: 'settings', name: 'user', component: UserSettings },
-      { path: 'invoices', name: 'invoices', component: UserInvoices }
+      { path: 'invoices', name: 'invoices', component: UserInvoices },
+      { path: 'orders', name: 'orders', component: UserOrders }
     ]
   },
   {
diff --git a/vue/src/views/UserView.vue b/vue/src/views/UserView.vue
index d38593f..204dc45 100644
--- a/vue/src/views/UserView.vue
+++ b/vue/src/views/UserView.vue
@@ -13,6 +13,7 @@
     <nav>
       <StyledLink to="/user/settings">settings</StyledLink>
       <StyledLink to="/user/invoices">invoices</StyledLink>
+      <StyledLink to="/user/orders">orders</StyledLink>
     </nav>
   </header>
   <Suspense>

From 98faad9129de7e8f2497ef843b30d76be31523d8 Mon Sep 17 00:00:00 2001
From: ekzyis <ekzyis@ekzyis.com>
Date: Mon, 27 Nov 2023 00:44:56 +0100
Subject: [PATCH 12/22] Remove console.log

---
 vue/src/components/UserOrders.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/vue/src/components/UserOrders.vue b/vue/src/components/UserOrders.vue
index 51670fb..9e1f3ff 100644
--- a/vue/src/components/UserOrders.vue
+++ b/vue/src/components/UserOrders.vue
@@ -29,7 +29,6 @@ const url = '/api/orders'
 await fetch(url)
   .then(r => r.json())
   .then(body => {
-    console.log(body)
     orders.value = body
   })
   .catch(console.error)

From 6b9dd419d4bf9bce04bf0c0adfe9997babeced05 Mon Sep 17 00:00:00 2001
From: ekzyis <ekzyis@ekzyis.com>
Date: Mon, 27 Nov 2023 00:58:50 +0100
Subject: [PATCH 13/22] Fix missing title

---
 vue/src/components/UserOrders.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vue/src/components/UserOrders.vue b/vue/src/components/UserOrders.vue
index 9e1f3ff..ccc5f01 100644
--- a/vue/src/components/UserOrders.vue
+++ b/vue/src/components/UserOrders.vue
@@ -11,7 +11,7 @@
         <tr v-for="o in orders " :key="o.id">
           <td><router-link :to="/market/ + o.MarketId">{{ o.MarketId }}</router-link></td>
           <td>{{ o.side }} {{ o.quantity }} {{ o.ShareDescription }} @ {{ o.price }} sats</td>
-          <td class="hidden-sm">{{ ago(new Date(o.CreatedAt)) }}</td>
+          <td :title="o.CreatedAt" class="hidden-sm">{{ ago(new Date(o.CreatedAt)) }}</td>
           <td></td>
         </tr>
       </tbody>

From e84db076a449a62d5e980431a8e5eb86aa9ed482 Mon Sep 17 00:00:00 2001
From: ekzyis <ekzyis@ekzyis.com>
Date: Mon, 27 Nov 2023 00:59:15 +0100
Subject: [PATCH 14/22] Use router-view for markets

---
 db/market.go                        |  20 +++++
 server/router/handler/market.go     |  17 ++++
 server/router/router.go             |   1 +
 vue/src/components/Market.vue       | 122 ++++----------------------
 vue/src/components/MarketOrders.vue |  57 ++++++++++++
 vue/src/components/OrderForm.vue    | 129 ++++++++++++++++++++++++++++
 vue/src/index.css                   |   2 +
 vue/src/main.js                     |   9 +-
 vue/src/views/UserView.vue          |   2 +-
 9 files changed, 252 insertions(+), 107 deletions(-)
 create mode 100644 vue/src/components/MarketOrders.vue
 create mode 100644 vue/src/components/OrderForm.vue

diff --git a/db/market.go b/db/market.go
index 39db574..f1b4bed 100644
--- a/db/market.go
+++ b/db/market.go
@@ -132,3 +132,23 @@ func (db *DB) FetchUserOrders(pubkey string, orders *[]Order) error {
 	}
 	return nil
 }
+
+func (db *DB) FetchMarketOrders(marketId int64, orders *[]Order) error {
+	query := "" +
+		"SELECT o.id, share_id, o.pubkey, o.side, o.quantity, o.price, o.invoice_id, o.created_at, s.description, s.market_id " +
+		"FROM orders o " +
+		"JOIN shares s ON o.share_id = s.id " +
+		"WHERE s.market_id = $1 " +
+		"ORDER BY o.created_at DESC"
+	rows, err := db.Query(query, marketId)
+	if err != nil {
+		return err
+	}
+	defer rows.Close()
+	for rows.Next() {
+		var order Order
+		rows.Scan(&order.Id, &order.ShareId, &order.Pubkey, &order.Side, &order.Quantity, &order.Price, &order.InvoiceId, &order.CreatedAt, &order.ShareDescription, &order.Share.MarketId)
+		*orders = append(*orders, order)
+	}
+	return nil
+}
diff --git a/server/router/handler/market.go b/server/router/handler/market.go
index e170191..8b2babc 100644
--- a/server/router/handler/market.go
+++ b/server/router/handler/market.go
@@ -112,6 +112,23 @@ func HandleCreateMarket(sc context.ServerContext) echo.HandlerFunc {
 	}
 }
 
+func HandleMarketOrders(sc context.ServerContext) echo.HandlerFunc {
+	return func(c echo.Context) error {
+		var (
+			marketId int64
+			orders   []db.Order
+			err      error
+		)
+		if marketId, err = strconv.ParseInt(c.Param("id"), 10, 64); err != nil {
+			return echo.NewHTTPError(http.StatusBadRequest, "Bad Request")
+		}
+		if err = sc.Db.FetchMarketOrders(marketId, &orders); err != nil {
+			return err
+		}
+		return c.JSON(http.StatusOK, orders)
+	}
+}
+
 func HandleOrder(sc context.ServerContext) echo.HandlerFunc {
 	return func(c echo.Context) error {
 		var (
diff --git a/server/router/router.go b/server/router/router.go
index dd86dd0..c1fb901 100644
--- a/server/router/router.go
+++ b/server/router/router.go
@@ -46,6 +46,7 @@ func addBackendRoutes(e *echo.Echo, sc ServerContext) {
 		middleware.SessionGuard,
 		middleware.LNDGuard)
 	GET(e, sc, "/api/market/:id", handler.HandleMarket)
+	GET(e, sc, "/api/market/:id/orders", handler.HandleMarketOrders)
 	POST(e, sc, "/api/order",
 		handler.HandleOrder,
 		middleware.SessionGuard,
diff --git a/vue/src/components/Market.vue b/vue/src/components/Market.vue
index 31cde0b..023ad79 100644
--- a/vue/src/components/Market.vue
+++ b/vue/src/components/Market.vue
@@ -10,62 +10,24 @@
   </div>
   <div class="font-mono">{{ market.Description }}</div>
   <!-- eslint-enable -->
-  <button type="button" :class="yesClass" class="label success font-mono mx-1 my-3"
-    @click.prevent="toggleYes">YES</button>
-  <button type="button" :class="noClass" class="label error font-mono mx-1 my-3" @click.prevent="toggleNo">NO</button>
-  <form v-show="showForm" @submit.prevent="submitForm">
-    <label for="stake">how much?</label>
-    <input name="stake" v-model="stake" type="number" min="0" placeholder="sats" required />
-    <label for="certainty">how sure?</label>
-    <input name="certainty" v-model="certainty" type="number" min="0.01" max="0.99" step="0.01" required />
-    <label>you receive:</label>
-    <label>{{ format(shares) }} {{ selected }} shares @ {{ format(price) }} sats</label>
-    <label>you pay:</label>
-    <label>{{ format(cost) }} sats</label>
-    <label>if you win:</label>
-    <label>{{ format(profit) }} sats</label>
-    <button class="col-span-2" type="submit">submit order</button>
-  </form>
-  <div v-if="err" class="red text-center">{{ err }}</div>
+  <header class="flex flex-row text-center justify-center pt-1">
+    <nav>
+      <StyledLink :to="'/market/' + marketId + '/form'">form</StyledLink>
+      <StyledLink :to="'/market/' + marketId + '/orders'">orders</StyledLink>
+    </nav>
+  </header>
+  <Suspense>
+    <router-view class="m-3" />
+  </Suspense>
 </template>
 
 <script setup>
-import { ref, computed } from 'vue'
-import { useRoute, useRouter } from 'vue-router'
+import { ref } from 'vue'
+import { useRoute } from 'vue-router'
+import StyledLink from '@/components/StyledLink'
 
-const router = useRouter()
 const route = useRoute()
 const marketId = route.params.id
-const selected = ref(null)
-const showForm = computed(() => selected.value !== null)
-const yesClass = computed(() => selected.value === 'YES' ? ['active'] : [])
-const noClass = computed(() => selected.value === 'NO' ? ['active'] : [])
-const err = ref(null)
-
-// how much wants the user bet?
-const stake = ref(null)
-// how sure is the user he will win?
-const certainty = ref(null)
-// price per share: more risk, lower price, higher reward
-const price = computed(() => certainty.value * 100)
-// how many (full) shares can be bought?
-const shares = computed(() => {
-  const val = price.value > 0 ? stake.value / price.value : null
-  // only full shares can be bought
-  return Math.round(val)
-})
-// how much does this order cost?
-const cost = computed(() => {
-  return shares.value * price.value
-})
-// how high is the potential reward?
-const profit = computed(() => {
-  // shares expire at 10 or 0 sats
-  const val = (100 * shares.value) - cost.value
-  return isNaN(val) ? 0 : val
-})
-
-const format = (x, i = 3) => x === null ? null : x >= 1 ? Math.round(x) : x === 0 ? x : x.toFixed(i)
 
 const market = ref(null)
 const url = '/api/market/' + marketId
@@ -75,66 +37,16 @@ await fetch(url)
     market.value = body
   })
   .catch(console.error)
-// Currently, we only support binary markets.
-// (only events which can be answered with YES and NO)
-const yesShareId = computed(() => {
-  return market?.value.Shares.find(s => s.Description === 'YES').Id
-})
-const noShareId = computed(() => {
-  return market?.value.Shares.find(s => s.Description === 'NO').Id
-})
-const shareId = computed(() => {
-  return selected.value === 'YES' ? yesShareId.value : noShareId.value
-})
-
-const toggleYes = () => {
-  selected.value = selected.value === 'YES' ? null : 'YES'
-}
-
-const toggleNo = () => {
-  selected.value = selected.value === 'NO' ? null : 'NO'
-}
-
-const submitForm = async () => {
-  // TODO validate form
-  const url = window.origin + '/api/order'
-  const body = JSON.stringify({
-    sid: shareId.value,
-    quantity: shares.value,
-    price: price.value,
-    // TODO support selling
-    side: 'BUY'
-  })
-  const res = await fetch(url, { method: 'POST', headers: { 'Content-type': 'application/json' }, body })
-  const resBody = await res.json()
-  if (res.status !== 402) {
-    err.value = `error: server responded with HTTP ${resBody.status}`
-    return
-  }
-  const invoiceId = resBody.id
-  router.push('/invoice/' + invoiceId)
-}
 
 </script>
 
 <style scoped>
-.success.active {
-  background-color: #35df8d;
-  color: white;
+nav {
+  display: flex;
+  justify-content: center;
 }
 
-.error.active {
-  background-color: #ff7386;
-  color: white;
-}
-
-form {
-  margin: 0 auto;
-  display: grid;
-  grid-template-columns: auto auto;
-}
-
-form>* {
-  margin: 0.5em 1em;
+nav>a {
+  margin: 0 3px;
 }
 </style>
diff --git a/vue/src/components/MarketOrders.vue b/vue/src/components/MarketOrders.vue
new file mode 100644
index 0000000..07f3671
--- /dev/null
+++ b/vue/src/components/MarketOrders.vue
@@ -0,0 +1,57 @@
+<template>
+  <div class="text w-auto">
+    <table>
+      <thead>
+        <th>description</th>
+        <th class="hidden-sm">created at</th>
+        <th>status</th>
+      </thead>
+      <tbody>
+        <tr v-for="o in orders " :key="o.id" class="success">
+          <td>{{ o.side }} {{ o.quantity }} {{ o.ShareDescription }} @ {{ o.price }} sats</td>
+          <td class="hidden-sm">{{ ago(new Date(o.CreatedAt)) }}</td>
+          <td>PENDING</td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+</template>
+
+<script setup>
+import { ref } from 'vue'
+import { useRoute } from 'vue-router'
+import ago from 's-ago'
+
+const route = useRoute()
+const marketId = route.params.id
+
+const orders = ref([])
+const url = `/api/market/${marketId}/orders`
+await fetch(url)
+  .then(r => r.json())
+  .then(body => {
+    orders.value = body
+  })
+  .catch(console.error)
+</script>
+
+<style scoped>
+table {
+  width: 100%;
+  align-items: center;
+}
+
+th {
+  padding: 0 2rem;
+}
+
+@media only screen and (max-width: 600px) {
+  th {
+    padding: 0 1rem;
+  }
+
+  .hidden-sm {
+    display: none
+  }
+}
+</style>
diff --git a/vue/src/components/OrderForm.vue b/vue/src/components/OrderForm.vue
new file mode 100644
index 0000000..0da5ccc
--- /dev/null
+++ b/vue/src/components/OrderForm.vue
@@ -0,0 +1,129 @@
+<template>
+  <button type="button" :class="yesClass" class="label success font-mono mx-1 my-3"
+    @click.prevent="toggleYes">YES</button>
+  <button type="button" :class="noClass" class="label error font-mono mx-1 my-3" @click.prevent="toggleNo">NO</button>
+  <form v-show="showForm" @submit.prevent="submitForm">
+    <label for="stake">how much?</label>
+    <input name="stake" v-model="stake" type="number" min="0" placeholder="sats" required />
+    <label for="certainty">how sure?</label>
+    <input name="certainty" v-model="certainty" type="number" min="0.01" max="0.99" step="0.01" required />
+    <label>you receive:</label>
+    <label>{{ format(shares) }} {{ selected }} shares @ {{ format(price) }} sats</label>
+    <label>you pay:</label>
+    <label>{{ format(cost) }} sats</label>
+    <label>if you win:</label>
+    <label>{{ format(profit) }} sats</label>
+    <button class="col-span-2" type="submit">submit order</button>
+  </form>
+  <div v-if="err" class="red text-center">{{ err }}</div>
+</template>
+
+<script setup>
+import { ref, computed } from 'vue'
+import { useRoute, useRouter } from 'vue-router'
+
+const router = useRouter()
+const route = useRoute()
+const marketId = route.params.id
+const selected = ref(null)
+const showForm = computed(() => selected.value !== null)
+const yesClass = computed(() => selected.value === 'YES' ? ['active'] : [])
+const noClass = computed(() => selected.value === 'NO' ? ['active'] : [])
+const err = ref(null)
+
+// how much wants the user bet?
+const stake = ref(null)
+// how sure is the user he will win?
+const certainty = ref(null)
+// price per share: more risk, lower price, higher reward
+const price = computed(() => certainty.value * 100)
+// how many (full) shares can be bought?
+const shares = computed(() => {
+  const val = price.value > 0 ? stake.value / price.value : null
+  // only full shares can be bought
+  return Math.round(val)
+})
+// how much does this order cost?
+const cost = computed(() => {
+  return shares.value * price.value
+})
+// how high is the potential reward?
+const profit = computed(() => {
+  // shares expire at 10 or 0 sats
+  const val = (100 * shares.value) - cost.value
+  return isNaN(val) ? 0 : val
+})
+
+const format = (x, i = 3) => x === null ? null : x >= 1 ? Math.round(x) : x === 0 ? x : x.toFixed(i)
+
+const market = ref(null)
+const url = '/api/market/' + marketId
+await fetch(url)
+  .then(r => r.json())
+  .then(body => {
+    market.value = body
+  })
+  .catch(console.error)
+// Currently, we only support binary markets.
+// (only events which can be answered with YES and NO)
+const yesShareId = computed(() => {
+  return market?.value.Shares.find(s => s.Description === 'YES').Id
+})
+const noShareId = computed(() => {
+  return market?.value.Shares.find(s => s.Description === 'NO').Id
+})
+const shareId = computed(() => {
+  return selected.value === 'YES' ? yesShareId.value : noShareId.value
+})
+
+const toggleYes = () => {
+  selected.value = selected.value === 'YES' ? null : 'YES'
+}
+
+const toggleNo = () => {
+  selected.value = selected.value === 'NO' ? null : 'NO'
+}
+
+const submitForm = async () => {
+  // TODO validate form
+  const url = window.origin + '/api/order'
+  const body = JSON.stringify({
+    sid: shareId.value,
+    quantity: shares.value,
+    price: price.value,
+    // TODO support selling
+    side: 'BUY'
+  })
+  const res = await fetch(url, { method: 'POST', headers: { 'Content-type': 'application/json' }, body })
+  const resBody = await res.json()
+  if (res.status !== 402) {
+    err.value = `error: server responded with HTTP ${resBody.status}`
+    return
+  }
+  const invoiceId = resBody.id
+  router.push('/invoice/' + invoiceId)
+}
+
+</script>
+
+<style scoped>
+.success.active {
+  background-color: #35df8d;
+  color: white;
+}
+
+.error.active {
+  background-color: #ff7386;
+  color: white;
+}
+
+form {
+  margin: 0 auto;
+  display: grid;
+  grid-template-columns: auto auto;
+}
+
+form>* {
+  margin: 0.5em 1em;
+}
+</style>
diff --git a/vue/src/index.css b/vue/src/index.css
index e6d2af9..d3d3e38 100644
--- a/vue/src/index.css
+++ b/vue/src/index.css
@@ -50,6 +50,7 @@ a.selected {
 
 .success:hover {
   background-color: #35df8d;
+  color: white;
 }
 
 .red {
@@ -63,6 +64,7 @@ a.selected {
 
 .error:hover {
   background-color: #ff7386;
+  color: white;
 }
 
 .text-muted {
diff --git a/vue/src/main.js b/vue/src/main.js
index ba00761..299b429 100644
--- a/vue/src/main.js
+++ b/vue/src/main.js
@@ -13,6 +13,8 @@ import InvoiceView from '@/views/InvoiceView'
 import UserSettings from '@/components/UserSettings'
 import UserInvoices from '@/components/UserInvoices'
 import UserOrders from '@/components/UserOrders'
+import OrderForm from '@/components/OrderForm'
+import MarketOrders from '@/components/MarketOrders'
 
 const routes = [
   {
@@ -31,7 +33,12 @@ const routes = [
     ]
   },
   {
-    path: '/market/:id', component: MarketView
+    path: '/market/:id',
+    component: MarketView,
+    children: [
+      { path: 'form', name: 'form', component: OrderForm },
+      { path: 'orders', name: 'market-orders', component: MarketOrders }
+    ]
   },
   {
     path: '/invoice/:id', component: InvoiceView
diff --git a/vue/src/views/UserView.vue b/vue/src/views/UserView.vue
index 204dc45..7a04c25 100644
--- a/vue/src/views/UserView.vue
+++ b/vue/src/views/UserView.vue
@@ -17,7 +17,7 @@
     </nav>
   </header>
   <Suspense>
-    <router-view />
+    <router-view class="m-3" />
   </Suspense>
 </template>
 

From b49cdb9b8ba9e4cbe4d6fd6d4866380c8dadb77d Mon Sep 17 00:00:00 2001
From: ekzyis <ekzyis@ekzyis.com>
Date: Mon, 27 Nov 2023 01:03:31 +0100
Subject: [PATCH 15/22] Use font-mono for status

---
 vue/src/components/MarketOrders.vue | 2 +-
 vue/src/components/UserInvoices.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/vue/src/components/MarketOrders.vue b/vue/src/components/MarketOrders.vue
index 07f3671..b0cbcff 100644
--- a/vue/src/components/MarketOrders.vue
+++ b/vue/src/components/MarketOrders.vue
@@ -10,7 +10,7 @@
         <tr v-for="o in orders " :key="o.id" class="success">
           <td>{{ o.side }} {{ o.quantity }} {{ o.ShareDescription }} @ {{ o.price }} sats</td>
           <td class="hidden-sm">{{ ago(new Date(o.CreatedAt)) }}</td>
-          <td>PENDING</td>
+          <td class="font-mono">PENDING</td>
         </tr>
       </tbody>
     </table>
diff --git a/vue/src/components/UserInvoices.vue b/vue/src/components/UserInvoices.vue
index 5b6659c..7554146 100644
--- a/vue/src/components/UserInvoices.vue
+++ b/vue/src/components/UserInvoices.vue
@@ -13,7 +13,7 @@
           <td>{{ i.Msats / 1000 }}</td>
           <td :title="i.CreatedAt">{{ ago(new Date(i.CreatedAt)) }}</td>
           <td :title="i.ExpiresAt" class="hidden-sm">{{ ago(new Date(i.ExpiresAt)) }}</td>
-          <td>{{ i.Status }}</td>
+          <td class="font-mono">{{ i.Status }}</td>
           <td>
             <router-link :to="/invoice/ + i.Id">open</router-link>
           </td>

From 798b28999c016e567a0243fd13f2a730be177cbd Mon Sep 17 00:00:00 2001
From: ekzyis <ekzyis@ekzyis.com>
Date: Mon, 27 Nov 2023 01:12:54 +0100
Subject: [PATCH 16/22] Create OrderRow component

---
 vue/src/components/MarketOrders.vue | 14 +++++++-------
 vue/src/components/OrderRow.vue     | 22 ++++++++++++++++++++++
 vue/src/components/UserOrders.vue   |  9 ++-------
 3 files changed, 31 insertions(+), 14 deletions(-)
 create mode 100644 vue/src/components/OrderRow.vue

diff --git a/vue/src/components/MarketOrders.vue b/vue/src/components/MarketOrders.vue
index b0cbcff..73f2608 100644
--- a/vue/src/components/MarketOrders.vue
+++ b/vue/src/components/MarketOrders.vue
@@ -7,11 +7,7 @@
         <th>status</th>
       </thead>
       <tbody>
-        <tr v-for="o in orders " :key="o.id" class="success">
-          <td>{{ o.side }} {{ o.quantity }} {{ o.ShareDescription }} @ {{ o.price }} sats</td>
-          <td class="hidden-sm">{{ ago(new Date(o.CreatedAt)) }}</td>
-          <td class="font-mono">PENDING</td>
-        </tr>
+        <OrderRow :order="o" v-for="o in orders" :key="o.id" />
       </tbody>
     </table>
   </div>
@@ -20,7 +16,7 @@
 <script setup>
 import { ref } from 'vue'
 import { useRoute } from 'vue-router'
-import ago from 's-ago'
+import OrderRow from './OrderRow.vue'
 
 const route = useRoute()
 const marketId = route.params.id
@@ -30,7 +26,11 @@ const url = `/api/market/${marketId}/orders`
 await fetch(url)
   .then(r => r.json())
   .then(body => {
-    orders.value = body
+    orders.value = body.map(o => {
+      // remove market column
+      delete o.MarketId
+      return o
+    })
   })
   .catch(console.error)
 </script>
diff --git a/vue/src/components/OrderRow.vue b/vue/src/components/OrderRow.vue
new file mode 100644
index 0000000..aae9b2d
--- /dev/null
+++ b/vue/src/components/OrderRow.vue
@@ -0,0 +1,22 @@
+<template>
+  <tr :class="className">
+    <td v-if="order.MarketId"><router-link :to="/market/ + order.MarketId">{{ order.MarketId }}</router-link></td>
+    <td>{{ order.side }} {{ order.quantity }} {{ order.ShareDescription }} @ {{ order.price }} sats</td>
+    <td :title="order.CreatedAt" class="hidden-sm">{{ ago(new Date(order.CreatedAt)) }}</td>
+    <td></td>
+  </tr>
+</template>
+
+<script setup>
+import { ref, defineProps, computed } from 'vue'
+import ago from 's-ago'
+
+const props = defineProps(['order'])
+
+const order = ref(props.order)
+
+const className = computed(() => {
+  return order.value.side === 'BUY' ? 'success' : 'error'
+})
+
+</script>
diff --git a/vue/src/components/UserOrders.vue b/vue/src/components/UserOrders.vue
index ccc5f01..80ee0ec 100644
--- a/vue/src/components/UserOrders.vue
+++ b/vue/src/components/UserOrders.vue
@@ -8,12 +8,7 @@
         <th>status</th>
       </thead>
       <tbody>
-        <tr v-for="o in orders " :key="o.id">
-          <td><router-link :to="/market/ + o.MarketId">{{ o.MarketId }}</router-link></td>
-          <td>{{ o.side }} {{ o.quantity }} {{ o.ShareDescription }} @ {{ o.price }} sats</td>
-          <td :title="o.CreatedAt" class="hidden-sm">{{ ago(new Date(o.CreatedAt)) }}</td>
-          <td></td>
-        </tr>
+        <OrderRow :order="o" v-for="o in orders" :key="o.id" />
       </tbody>
     </table>
   </div>
@@ -21,7 +16,7 @@
 
 <script setup>
 import { ref } from 'vue'
-import ago from 's-ago'
+import OrderRow from './OrderRow.vue'
 
 const orders = ref(null)
 

From 1ab65afdcd30440c4fd4679f26351de7284305b8 Mon Sep 17 00:00:00 2001
From: ekzyis <ekzyis@ekzyis.com>
Date: Mon, 27 Nov 2023 02:45:05 +0100
Subject: [PATCH 17/22] Link to /market/:id/form

---
 vue/src/components/MarketList.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vue/src/components/MarketList.vue b/vue/src/components/MarketList.vue
index d73c379..a3668f6 100644
--- a/vue/src/components/MarketList.vue
+++ b/vue/src/components/MarketList.vue
@@ -1,7 +1,7 @@
 <template>
   <ul>
     <li class="my-3" v-for="market in markets" :key="market.id">
-      <router-link :to="'/market/' + market.id">{{ market.description }}</router-link>
+      <router-link :to="'/market/' + market.id + '/form'">{{ market.description }}</router-link>
     </li>
   </ul>
   <button v-if="!showForm" @click.prevent="toggleForm">+ create market</button>

From b82e5de63c679a3e38bb15ee90d129dca628a548 Mon Sep 17 00:00:00 2001
From: ekzyis <ekzyis@ekzyis.com>
Date: Mon, 27 Nov 2023 02:45:16 +0100
Subject: [PATCH 18/22] Set default values

---
 vue/src/components/OrderForm.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vue/src/components/OrderForm.vue b/vue/src/components/OrderForm.vue
index 0da5ccc..fb1bf80 100644
--- a/vue/src/components/OrderForm.vue
+++ b/vue/src/components/OrderForm.vue
@@ -32,9 +32,9 @@ const noClass = computed(() => selected.value === 'NO' ? ['active'] : [])
 const err = ref(null)
 
 // how much wants the user bet?
-const stake = ref(null)
+const stake = ref(100)
 // how sure is the user he will win?
-const certainty = ref(null)
+const certainty = ref(0.5)
 // price per share: more risk, lower price, higher reward
 const price = computed(() => certainty.value * 100)
 // how many (full) shares can be bought?

From b2d8c089c9fdaa263db6377602b8e8f90d0f40c9 Mon Sep 17 00:00:00 2001
From: ekzyis <ekzyis@ekzyis.com>
Date: Mon, 27 Nov 2023 02:46:48 +0100
Subject: [PATCH 19/22] Only fetch paid orders

---
 db/market.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/db/market.go b/db/market.go
index f1b4bed..efe66f9 100644
--- a/db/market.go
+++ b/db/market.go
@@ -138,7 +138,8 @@ func (db *DB) FetchMarketOrders(marketId int64, orders *[]Order) error {
 		"SELECT o.id, share_id, o.pubkey, o.side, o.quantity, o.price, o.invoice_id, o.created_at, s.description, s.market_id " +
 		"FROM orders o " +
 		"JOIN shares s ON o.share_id = s.id " +
-		"WHERE s.market_id = $1 " +
+		"JOIN invoices i ON i.id = o.invoice_id " +
+		"WHERE s.market_id = $1 AND i.confirmed_at IS NOT NULL " +
 		"ORDER BY o.created_at DESC"
 	rows, err := db.Query(query, marketId)
 	if err != nil {

From e3ffcb9e266138163d32ba430e19fe42d346d81b Mon Sep 17 00:00:00 2001
From: ekzyis <ekzyis@ekzyis.com>
Date: Mon, 27 Nov 2023 16:54:41 +0100
Subject: [PATCH 20/22] Add relative time to invoice details

---
 vue/src/components/Invoice.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/vue/src/components/Invoice.vue b/vue/src/components/Invoice.vue
index c05ade8..4974215 100644
--- a/vue/src/components/Invoice.vue
+++ b/vue/src/components/Invoice.vue
@@ -30,10 +30,10 @@
           {{ invoice.Hash }}
         </span>
         <span class="mx-3 my-1">created at</span><span class="text-ellipsis overflow-hidden font-mono me-3 my-1">
-          {{ invoice.CreatedAt }}
+          {{ invoice.CreatedAt }} ({{ ago(new Date(invoice.CreatedAt)) }})
         </span>
         <span class="mx-3 my-1">expires at</span><span class="text-ellipsis overflow-hidden font-mono me-3 my-1">
-          {{ invoice.ExpiresAt }}
+          {{ invoice.ExpiresAt }} ({{ ago(new Date(invoice.ExpiresAt)) }})
         </span>
         <span class="mx-3 my-1">sats</span><span class="text-ellipsis overflow-hidden font-mono me-3 my-1">
           {{ invoice.Msats / 1000 }}
@@ -60,6 +60,7 @@
 <script setup>
 import { onUnmounted, ref } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
+import ago from 's-ago'
 
 const router = useRouter()
 const route = useRoute()

From 89a861e4f1aba8c8f92bb54c4af8d7d81911a2d6 Mon Sep 17 00:00:00 2001
From: ekzyis <ekzyis@ekzyis.com>
Date: Mon, 27 Nov 2023 17:44:53 +0100
Subject: [PATCH 21/22] Fix market order style

---
 vue/src/components/MarketOrders.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vue/src/components/MarketOrders.vue b/vue/src/components/MarketOrders.vue
index 73f2608..2a728f8 100644
--- a/vue/src/components/MarketOrders.vue
+++ b/vue/src/components/MarketOrders.vue
@@ -35,7 +35,7 @@ await fetch(url)
   .catch(console.error)
 </script>
 
-<style scoped>
+<style>
 table {
   width: 100%;
   align-items: center;

From f91080da27ecb9df30e07949a5aa6a5a11dca29c Mon Sep 17 00:00:00 2001
From: ekzyis <ekzyis@ekzyis.com>
Date: Mon, 27 Nov 2023 17:45:07 +0100
Subject: [PATCH 22/22] Add order status column

---
 db/init.sql                     |  3 ++-
 db/market.go                    | 10 ++++++----
 vue/src/components/OrderRow.vue |  2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/db/init.sql b/db/init.sql
index 157036b..58800ee 100644
--- a/db/init.sql
+++ b/db/init.sql
@@ -47,7 +47,8 @@ CREATE TABLE orders(
     side ORDER_SIDE NOT NULL,
     quantity BIGINT NOT NULL,
     price BIGINT NOT NULL,
-    invoice_id UUID NOT NULL REFERENCES invoices(id)
+    invoice_id UUID NOT NULL REFERENCES invoices(id),
+    order_id UUID REFERENCES orders(id)
 );
 ALTER TABLE orders ADD CONSTRAINT order_price CHECK(price > 0 AND price < 100);
 ALTER TABLE orders ADD CONSTRAINT order_quantity CHECK(quantity > 0);
diff --git a/db/market.go b/db/market.go
index efe66f9..98fd678 100644
--- a/db/market.go
+++ b/db/market.go
@@ -114,7 +114,8 @@ func (db *DB) CreateOrder(tx *sql.Tx, ctx context.Context, order *Order) error {
 
 func (db *DB) FetchUserOrders(pubkey string, orders *[]Order) error {
 	query := "" +
-		"SELECT o.id, share_id, o.pubkey, o.side, o.quantity, o.price, o.invoice_id, o.created_at, s.description, s.market_id, i.confirmed_at " +
+		"SELECT o.id, share_id, o.pubkey, o.side, o.quantity, o.price, o.invoice_id, o.created_at, s.description, s.market_id, i.confirmed_at, " +
+		"CASE WHEN o.order_id IS NOT NULL THEN 'EXECUTED' ELSE 'WAITING' END AS status " +
 		"FROM orders o " +
 		"JOIN invoices i ON o.invoice_id = i.id " +
 		"JOIN shares s ON o.share_id = s.id " +
@@ -127,7 +128,7 @@ func (db *DB) FetchUserOrders(pubkey string, orders *[]Order) error {
 	defer rows.Close()
 	for rows.Next() {
 		var order Order
-		rows.Scan(&order.Id, &order.ShareId, &order.Pubkey, &order.Side, &order.Quantity, &order.Price, &order.InvoiceId, &order.CreatedAt, &order.ShareDescription, &order.Share.MarketId, &order.Invoice.ConfirmedAt)
+		rows.Scan(&order.Id, &order.ShareId, &order.Pubkey, &order.Side, &order.Quantity, &order.Price, &order.InvoiceId, &order.CreatedAt, &order.ShareDescription, &order.Share.MarketId, &order.Invoice.ConfirmedAt, &order.Status)
 		*orders = append(*orders, order)
 	}
 	return nil
@@ -135,7 +136,8 @@ func (db *DB) FetchUserOrders(pubkey string, orders *[]Order) error {
 
 func (db *DB) FetchMarketOrders(marketId int64, orders *[]Order) error {
 	query := "" +
-		"SELECT o.id, share_id, o.pubkey, o.side, o.quantity, o.price, o.invoice_id, o.created_at, s.description, s.market_id " +
+		"SELECT o.id, share_id, o.pubkey, o.side, o.quantity, o.price, o.invoice_id, o.created_at, s.description, s.market_id, " +
+		"CASE WHEN o.order_id IS NOT NULL THEN 'EXECUTED' ELSE 'WAITING' END AS status " +
 		"FROM orders o " +
 		"JOIN shares s ON o.share_id = s.id " +
 		"JOIN invoices i ON i.id = o.invoice_id " +
@@ -148,7 +150,7 @@ func (db *DB) FetchMarketOrders(marketId int64, orders *[]Order) error {
 	defer rows.Close()
 	for rows.Next() {
 		var order Order
-		rows.Scan(&order.Id, &order.ShareId, &order.Pubkey, &order.Side, &order.Quantity, &order.Price, &order.InvoiceId, &order.CreatedAt, &order.ShareDescription, &order.Share.MarketId)
+		rows.Scan(&order.Id, &order.ShareId, &order.Pubkey, &order.Side, &order.Quantity, &order.Price, &order.InvoiceId, &order.CreatedAt, &order.ShareDescription, &order.Share.MarketId, &order.Status)
 		*orders = append(*orders, order)
 	}
 	return nil
diff --git a/vue/src/components/OrderRow.vue b/vue/src/components/OrderRow.vue
index aae9b2d..410b06b 100644
--- a/vue/src/components/OrderRow.vue
+++ b/vue/src/components/OrderRow.vue
@@ -3,7 +3,7 @@
     <td v-if="order.MarketId"><router-link :to="/market/ + order.MarketId">{{ order.MarketId }}</router-link></td>
     <td>{{ order.side }} {{ order.quantity }} {{ order.ShareDescription }} @ {{ order.price }} sats</td>
     <td :title="order.CreatedAt" class="hidden-sm">{{ ago(new Date(order.CreatedAt)) }}</td>
-    <td></td>
+    <td class="font-mono">{{ order.Status }}</td>
   </tr>
 </template>