From 7fac9264137e0ebd36294614f70d83080816ff1a Mon Sep 17 00:00:00 2001
From: KoalaSat <yv1vtrul@duck.com>
Date: Sun, 11 Sep 2022 19:59:01 +0200
Subject: [PATCH] Move the most recent value in sats of an order calculation to
 the backend (#235)

* Move the most recent value in sats of an order calculation to the backend

* Fix bug 0 premium
---
 frontend/src/components/BookPage.js           |  3 +-
 .../components/Charts/DepthChart/index.tsx    | 39 ++++++++++---------
 frontend/src/models/Order.model.ts            |  1 +
 3 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/frontend/src/components/BookPage.js b/frontend/src/components/BookPage.js
index d7d440e0..83e614c9 100644
--- a/frontend/src/components/BookPage.js
+++ b/frontend/src/components/BookPage.js
@@ -246,9 +246,10 @@ class BookPage extends Component {
               type: 'number',
               width: 140,
               renderCell: (params) => {
+                const currencyCode = this.getCurrencyCode(params.row.currency);
                 return (
                   <div style={{ cursor: 'pointer' }}>
-                    {pn(params.row.price) + ' ' + params.row.currency + '/BTC'}
+                    {pn(params.row.price) + ' ' + currencyCode + '/BTC'}
                   </div>
                 );
               },
diff --git a/frontend/src/components/Charts/DepthChart/index.tsx b/frontend/src/components/Charts/DepthChart/index.tsx
index 8ba52a1b..3f685eb8 100644
--- a/frontend/src/components/Charts/DepthChart/index.tsx
+++ b/frontend/src/components/Charts/DepthChart/index.tsx
@@ -54,10 +54,11 @@ const DepthChart: React.FC<DepthChartProps> = ({
   const theme = useTheme();
   const [enrichedOrders, setEnrichedOrders] = useState<Order[]>([]);
   const [series, setSeries] = useState<Serie[]>([]);
+  const [rangeSteps, setRangeSteps] = useState<number>(8);
   const [xRange, setXRange] = useState<number>(8);
   const [xType, setXType] = useState<string>('premium');
   const [currencyCode, setCurrencyCode] = useState<number>(1);
-  const [center, setCenter] = useState<number>(0);
+  const [center, setCenter] = useState<number>();
 
   useEffect(() => {
     if (Object.keys(limits).length === 0) {
@@ -96,19 +97,22 @@ const DepthChart: React.FC<DepthChartProps> = ({
   useEffect(() => {
     if (xType === 'base_amount') {
       const prices: number[] = enrichedOrders.map((order) => order?.base_amount || 0);
-      setCenter(~~median(prices));
-      setXRange(1500);
-    } else if (lastDayPremium) {
+
+      const medianValue = ~~median(prices);
+      const maxValue = prices.sort((a, b) => b - a).slice(0, 1)[0] || 1500;
+      const maxRange = maxValue - medianValue;
+      const rangeSteps = maxRange / 10;
+
+      setCenter(medianValue);
+      setXRange(maxRange);
+      setRangeSteps(rangeSteps);
+    } else if (lastDayPremium != undefined) {
       setCenter(lastDayPremium);
       setXRange(8);
+      setRangeSteps(0.5);
     }
   }, [enrichedOrders, xType, lastDayPremium, currencyCode]);
 
-  const calculateBtc = (order: Order): number => {
-    const amount = parseInt(order.amount) || order.max_amount;
-    return amount / order.price;
-  };
-
   const generateSeries: () => void = () => {
     const sortedOrders: Order[] =
       xType === 'base_amount'
@@ -123,8 +127,8 @@ const DepthChart: React.FC<DepthChartProps> = ({
     const buySerie: Datum[] = generateSerie(sortedBuyOrders);
     const sellSerie: Datum[] = generateSerie(sortedSellOrders);
 
-    const maxX: number = center + xRange;
-    const minX: number = center - xRange;
+    const maxX: number = (center || 0) + xRange;
+    const minX: number = (center || 0) - xRange;
 
     setSeries([
       {
@@ -139,7 +143,7 @@ const DepthChart: React.FC<DepthChartProps> = ({
   };
 
   const generateSerie = (orders: Order[]): Datum[] => {
-    if (!center) {
+    if (center == undefined) {
       return [];
     }
 
@@ -147,7 +151,7 @@ const DepthChart: React.FC<DepthChartProps> = ({
     let serie: Datum[] = [];
     orders.forEach((order) => {
       const lastSumOrders = sumOrders;
-      sumOrders += calculateBtc(order);
+      sumOrders += (order.satoshis_now || 0) / 100000000;
       const datum: Datum[] = [
         {
           // Vertical Line
@@ -200,11 +204,11 @@ const DepthChart: React.FC<DepthChartProps> = ({
       d={props.lineGenerator([
         {
           y: 0,
-          x: props.xScale(center),
+          x: props.xScale(center || 0),
         },
         {
           y: props.innerHeight,
-          x: props.xScale(center),
+          x: props.xScale(center || 0),
         },
       ])}
       fill='none'
@@ -270,14 +274,11 @@ const DepthChart: React.FC<DepthChartProps> = ({
     return `${value}%`;
   };
   const formatAxisY = (value: number): string => `${value}BTC`;
-
-  const rangeSteps = xType === 'base_amount' ? 200 : 0.5;
-
   const handleOnClick: PointMouseHandler = (point: Point) => {
     history.push('/order/' + point.data?.order?.id);
   };
 
-  return bookLoading || !center || enrichedOrders.length < 1 ? (
+  return bookLoading || center == undefined || enrichedOrders.length < 1 ? (
     <div style={{ display: 'flex', justifyContent: 'center', paddingTop: 200, height: 420 }}>
       <CircularProgress />
     </div>
diff --git a/frontend/src/models/Order.model.ts b/frontend/src/models/Order.model.ts
index afcc0956..e1acff7f 100644
--- a/frontend/src/models/Order.model.ts
+++ b/frontend/src/models/Order.model.ts
@@ -13,6 +13,7 @@ export interface Order {
   is_explicit: false;
   premium: number;
   satoshis: number;
+  satoshis_now: number;
   bondless_taker: boolean;
   maker: number;
   escrow_duration: number;