From 64bcead0b2884de91de1547cb543e28d5607d69b Mon Sep 17 00:00:00 2001
From: wireless_purple <dev@haveno.markets>
Date: Fri, 4 Oct 2024 20:25:22 +0000
Subject: [PATCH] show offers on /markets, fixes for pairs without trades

---
 src/lib/formatPrice.js                  |  1 +
 src/routes/+layout.svelte               | 13 +++++----
 src/routes/market/[market]/+page.svelte | 12 ++++----
 src/routes/markets/+page.server.js      |  4 +--
 src/routes/markets/+page.svelte         | 38 ++++++++++++++++++++-----
 5 files changed, 49 insertions(+), 19 deletions(-)

diff --git a/src/lib/formatPrice.js b/src/lib/formatPrice.js
index 6c98ae6..aba4143 100644
--- a/src/lib/formatPrice.js
+++ b/src/lib/formatPrice.js
@@ -37,6 +37,7 @@ const formatPrice = (
 	showSign = false,
 	useQuote = true,
 ) => {
+	if (!price) return Number.NaN;
 	const calculatedPrice = getPrice(price, currency, useQuote);
 	return (
 		(showSign
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 9a6d9ae..9639a03 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -71,7 +71,7 @@ Object.groupBy ||= (values, keyFinder) => {
 		margin-top:auto;
 		text-align:center;
 	}
-	.col{
+	.col {
 		display:flex;
 		flex-direction: column;
 		align-items: center;
@@ -108,12 +108,15 @@ Object.groupBy ||= (values, keyFinder) => {
 				text-align:right;
 				padding:.3em;
 			}
-			th:first-child, td:first-child{
+			th:first-child, td:first-child {
 				text-align:left;
 			}
-			tr:nth-child(2n){
+			tbody tr:nth-child(2n) {
 				background-color: #0002;
 			}
+			tfoot {
+				border-top: #0004 double 4px;
+			}
 		}
 	}
 	
@@ -121,7 +124,7 @@ Object.groupBy ||= (values, keyFinder) => {
 		text-decoration: none;
 		color:#f60;
 	}
-	a:hover{
+	a:hover {
 		text-decoration: underline;
 	}
 	.price {
@@ -159,7 +162,7 @@ Object.groupBy ||= (values, keyFinder) => {
 		justify-content: center;
 		gap:.2em;
 	}
-	@media only screen and (max-width: 600px){
+	@media only screen and (max-width: 600px) {
 		.header > * {
 			width:initial;
 		}
diff --git a/src/routes/market/[market]/+page.svelte b/src/routes/market/[market]/+page.svelte
index e67aeb1..2125983 100644
--- a/src/routes/market/[market]/+page.svelte
+++ b/src/routes/market/[market]/+page.svelte
@@ -72,11 +72,13 @@ const BUY_SELL = isMoneroQuote(market) ? ["SELL", "BUY"] : ["BUY", "SELL"];
 <div class="row">
 	<div class="col card" bind:clientWidth={w}>
 		<h4>{marketPair}</h4>
-		<span class="price">{formatPrice(data.trades?.[0]?.price, market, true, false)}</span>
-		<Chart width={w-20} height={500} container={{class:"row"}} layout={chartLayout} grid={gridLayout}>
-			<CandlestickSeries data={trades} reactive={true} priceFormat={{minMove:10**-precision, precision:precision}}></CandlestickSeries>
-			<TimeScale rightBarStaysOnScroll={true} rightOffset={0}/>
-		</Chart>
+		<span class="price">{formatPrice(data.trades?.[0]?.price, market, true, false) || "-"}</span>
+		{#if data.trades?.length}
+			<Chart width={w-20} height={500} container={{class:"row"}} layout={chartLayout} grid={gridLayout}>
+				<CandlestickSeries data={trades} reactive={true} priceFormat={{minMove:10**-precision, precision:precision}}></CandlestickSeries>
+				<TimeScale rightBarStaysOnScroll={true} rightOffset={0}/>
+			</Chart>
+		{/if}
 	</div>
 </div>
 <div class="row">
diff --git a/src/routes/markets/+page.server.js b/src/routes/markets/+page.server.js
index a86a2b6..84f7fa0 100644
--- a/src/routes/markets/+page.server.js
+++ b/src/routes/markets/+page.server.js
@@ -1,6 +1,6 @@
-import { trades } from "$lib/server/context";
+import { offers, trades } from "$lib/server/context";
 import { get } from "svelte/store";
 
 export function load() {
-	return { trades: get(trades) };
+	return { trades: get(trades), offers: get(offers) };
 }
diff --git a/src/routes/markets/+page.svelte b/src/routes/markets/+page.svelte
index 15f077a..fd52582 100644
--- a/src/routes/markets/+page.svelte
+++ b/src/routes/markets/+page.svelte
@@ -1,6 +1,6 @@
 <svelte:options runes={true} />
 <script>
-import { formatPrice, getAsset } from "$lib/formatPrice";
+import { crypto, fiat, formatPrice, getAsset } from "$lib/formatPrice";
 import {
 	Chart,
 	HistogramSeries,
@@ -10,6 +10,18 @@ import {
 } from "svelte-lightweight-charts";
 
 let { data } = $props();
+
+let groupedTrades = Object.groupBy(data.trades, ({ currency }) => currency);
+let markets = [...$fiat, ...$crypto]
+	.map((e) => {
+		return {
+			...e,
+			trades: groupedTrades[e.code],
+			offers: data.offers[e.code],
+		};
+	})
+	.filter((e) => e.offers || e.trades);
+
 let interval = $state("86400000");
 let [volume, swaps] = $derived(
 	(() => {
@@ -79,7 +91,8 @@ let w = $state();
 				<option value="3600000">Hourly</option>
 				<option value="86400000">Daily</option>
 				<option value="604800000">Weekly</option>
-			</select> Volume</h4>
+			</select> Volume
+		</h4>
 		<Chart width={w-20} height={500} container={{class:"row"}} layout={chartLayout} grid={gridLayout}>
 			<LineSeries data={volume} reactive={true} priceFormat={{precision:2, minMove:.01}}>
 				<PriceScale scaleMargins={{bottom:.4, top:.1}}/>
@@ -99,18 +112,29 @@ let w = $state();
 			<tr>
 				<th>Currency</th>
 				<th>Price</th>
+				<th>Offers</th>
                 <th>Volume (XMR)</th>
 				<th>Trades</th>
 			</tr>
-			{#each Object.values(Object.groupBy(data.trades, ({currency}) => currency)).toSorted((a,b) => b.length - a.length || (b[0].currency < a[0].currency ? 1 : -1)).slice(0, 16) as market}
+			{#each Object.values(markets).toSorted((a,b) => (b.trades?.length||0) - (a.trades?.length||0) || (b.offers?.length||0) - (a.offers?.length||0) || (b.code < a.code ? 1 : -1)) as market}
 			<tr>
-                <td><a href="market/{market[0].currency}">{getAsset(market[0].currency).name} ({market[0].currency})</a></td>
-				<td>{formatPrice(market[0].price, market[0].currency, true, false)}</td>
-                <td>{formatPrice(market.reduce((a,b) => a + b.xmrAmount, 0), "XMR", false, false)}</td>
-				<td>{market.length}</td>
+                <td><a href="market/{market.code}">{getAsset(market.code).name} ({market.code})</a></td>
+				<td>{formatPrice(market.trades?.[0]?.price, market.code, true, false) || "-"}</td>
+				<td>{market.offers?.length || "-"}</td>
+                <td>{formatPrice(market.trades?.reduce((a,b) => a + b.xmrAmount, 0), "XMR", false, false) || "-"}</td>
+				<td>{market.trades?.length || "-"}</td>
 			</tr>
 			{/each}
 		</tbody>
+		<tfoot>
+			<tr>
+				<td></td>
+				<td></td>
+				<td>{Object.values(data.offers).flat().length}</td>
+				<td>{formatPrice(data.trades.reduce((a,b) => a + b.xmrAmount, 0), "XMR", false, false)}</td>
+				<td>{data.trades.length}</td>
+			</tr>
+		</tfoot>
 	</table>
 </div>
 </div>