diff --git a/src/components/Login.svelte b/src/components/Login.svelte index 6d50265..9bab704 100644 --- a/src/components/Login.svelte +++ b/src/components/Login.svelte @@ -53,7 +53,9 @@ goto(`${base}/sellmerits`); }}>Sell Merits - Buy Merits + { + goto(`${base}/buymerits`); + }}>Buy Merits Settings Support diff --git a/src/routes/buymerits/+page.svelte b/src/routes/buymerits/+page.svelte index 3be25f7..2954100 100644 --- a/src/routes/buymerits/+page.svelte +++ b/src/routes/buymerits/+page.svelte @@ -1,17 +1,15 @@ -

Trade your Merits for Sats

+

Sponsor a Contributor

{#if $currentUser} - {#each $myMeritRequests as [rocket, amr]} + {#each $pendingSales as [rocket, amr]} {#if amr.length > 0} -

ROCKET: {rocket.Name()}

+

{console.log(rocket.Event.rawEvent(), rocket.PendingAMRAuctions())}}>ROCKET: {rocket.Name()}

- Selected + Seller AMR - Eligible - Merits - Sats (approx) + Merits + Current Price (sats) + Status + Receiving Address + - {#each amr as a, id (a.ID)} - - { - toggleSelected(a, rocket); - }} - /> - { - goto(`${base}/rockets/merits/${a.ID}`); - }}>{a.ID.substring(0, 6)} - {a.LeadTime == 0} - {a.Merits} - {a.Merits} + {#each amr as p} + + + {p.AMRIDs.length > 1 ? 'multiple' : p.AMRIDs[0].substring(0,12)} + {p.Merits} + {p.Merits} + OPEN + {p.RxAddress} + {/each} + + - {#if selected.size > 0} -
You are selling {getTotal(getAllForRocket(rocket, selected))} Merits
-
- - -
- {/if} {/if} {/each} {:else}{/if} + diff --git a/src/stateupdaters/MeritAuctions.svelte b/src/stateupdaters/MeritAuctions.svelte index 87b4b20..d005b01 100644 --- a/src/stateupdaters/MeritAuctions.svelte +++ b/src/stateupdaters/MeritAuctions.svelte @@ -1,6 +1,7 @@