diff --git a/db/invoice.go b/db/invoice.go index 964e671..fda5f38 100644 --- a/db/invoice.go +++ b/db/invoice.go @@ -80,7 +80,7 @@ func (db *DB) FetchUserInvoices(pubkey string, invoices *[]Invoice) 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 " + + "CASE WHEN confirmed_at IS NOT NULL THEN 'PAID' WHEN expires_at < CURRENT_TIMESTAMP THEN 'EXPIRED' ELSE 'PENDING' END AS status " + "FROM invoices " + "WHERE pubkey = $1 " + "ORDER BY created_at DESC" diff --git a/vue/src/components/UserInvoices.vue b/vue/src/components/UserInvoices.vue index 6ad3d55..cdae48b 100644 --- a/vue/src/components/UserInvoices.vue +++ b/vue/src/components/UserInvoices.vue @@ -9,7 +9,7 @@ details - + {{ i.Msats / 1000 }} {{ ago(new Date(i.CreatedAt)) }} {{ ago(new Date(i.ExpiresAt)) }} @@ -27,7 +27,7 @@ import { ref } from 'vue' import ago from 's-ago' -const classFromStatus = (status) => status === 'PAID' ? 'success' : 'error' +const classFromStatus = (status) => status === 'PAID' ? 'success' : status === 'PENDING' ? 'info' : 'error' const invoices = ref(null)