Merge pull request #65 from compolabs/fix/community-fixes-3

Add history
compolabs · Feb 20, 2024 · aa1acc3 · aa1acc3
2 parents 0b3693c + 1a46212
commit aa1acc3
Show file tree

Hide file tree

Showing 9 changed files with 137 additions and 98 deletions.
diff --git a/spark-frontend/src/components/TokenInput/TokenInput.tsx b/spark-frontend/src/components/TokenInput/TokenInput.tsx
@@ -103,7 +103,7 @@ const TokenInput: React.FC<IProps> = (props) => {
           autofocus={focused}
           decimals={props.decimals}
           disabled={props.disabled}
-          displayDecimals={2}
+          displayDecimals={props.decimals}
           max={props.max?.toString()}
           placeholder="0.00"
           renderInput={(props, ref) => (

diff --git a/spark-frontend/src/entity/SpotMarketTrade.ts b/spark-frontend/src/entity/SpotMarketTrade.ts
@@ -1,4 +1,7 @@
-import { DEFAULT_DECIMALS } from "@src/constants";
+import dayjs, { Dayjs } from "dayjs";
+import { Nullable } from "tsdef";
+
+import { DEFAULT_DECIMALS, TOKENS_BY_SYMBOL } from "@src/constants";
 import BN from "@src/utils/BN";
 
 import { Token } from "./Token";
@@ -7,33 +10,52 @@ interface SpotMarketTradeParams {
   id: string;
   baseToken: Token;
   matcher: string;
+  seller: string;
+  buyer: string;
   tradeAmount: BN;
   price: BN;
   timestamp: number;
+  userAddress: string;
 }
 
+const getType = (userAddress: string, buyer: string, seller: string) => {
+  const address = userAddress.toLowerCase();
+  return address === seller.toLowerCase() ? "SELL" : address === buyer.toLowerCase() ? "BUY" : null;
+};
+
 export class SpotMarketTrade {
   readonly id: SpotMarketTradeParams["id"];
   readonly baseToken: SpotMarketTradeParams["baseToken"];
   readonly matcher: SpotMarketTradeParams["matcher"];
+  readonly seller: SpotMarketTradeParams["seller"];
+  readonly buyer: SpotMarketTradeParams["buyer"];
   readonly tradeAmount: SpotMarketTradeParams["tradeAmount"];
   readonly price: SpotMarketTradeParams["price"];
-  readonly timestamp: SpotMarketTradeParams["timestamp"];
+  readonly timestamp: Dayjs;
+  readonly quoteToken = TOKENS_BY_SYMBOL.USDC;
+  readonly type: Nullable<"SELL" | "BUY"> = null;
 
   constructor(params: SpotMarketTradeParams) {
     this.id = params.id;
     this.baseToken = params.baseToken;
     this.matcher = params.matcher;
+    this.seller = params.seller;
+    this.buyer = params.buyer;
     this.tradeAmount = params.tradeAmount;
     this.price = params.price;
-    this.timestamp = params.timestamp;
+    this.timestamp = dayjs.unix(params.timestamp);
+    this.type = getType(params.userAddress, this.buyer, this.seller);
   }
 
   get formatPrice() {
-    return BN.formatUnits(this.price, DEFAULT_DECIMALS).toFormat(2);
+    return BN.formatUnits(this.price, DEFAULT_DECIMALS).toSignificant(2);
   }
 
   get formatTradeAmount() {
-    return BN.formatUnits(this.price, this.baseToken.decimals).toFormat(2);
+    return BN.formatUnits(this.tradeAmount, this.baseToken.decimals).toSignificant(2);
+  }
+
+  get marketSymbol() {
+    return `${this.baseToken.symbol}-${this.quoteToken.symbol}`;
   }
 }
diff --git a/...eens/TradeScreen/BottomTables/BottomTablesInterfaceSpot/BottomTablesInterfaceSpotImpl.tsx b/...eens/TradeScreen/BottomTables/BottomTablesInterfaceSpot/BottomTablesInterfaceSpotImpl.tsx
@@ -40,7 +40,7 @@ const MAX_TABLE_HEIGHT = {
 const TABS = [
   { title: "ORDERS", disabled: false },
   { title: "BALANCES", disabled: false },
-  // { title: "HISTORY", disabled: false },
+  { title: "HISTORY", disabled: false },
 ];
 
 const TABLE_SIZES_CONFIG = [
@@ -124,26 +124,26 @@ const BottomTablesInterfaceSpotImpl: React.FC<IProps> = observer(() => {
       ),
     }));
 
-  // const getHistoryData = () =>
-  //   vm.myOrdersHistory.map((order) => ({
-  //     date: order.timestamp.format("DD MMM YY, HH:mm"),
-  //     pair: order.marketSymbol,
-  //     type: (
-  //       <TableText color={order.type === "SELL" ? theme.colors.redLight : theme.colors.greenLight}>
-  //         {order.type}
-  //       </TableText>
-  //     ),
-  //     amount: (
-  //       <SmartFlex center="y" gap="4px">
-  //         <TableText primary>{order.baseSizeUnits.toSignificant(2)}</TableText>
-  //         <TokenBadge>
-  //           <Text>{order.baseToken.symbol}</Text>
-  //         </TokenBadge>
-  //       </SmartFlex>
-  //     ),
-  //     price: toCurrency(order.priceUnits.toSignificant(2)),
-  //     filled: BN.ZERO.toString(),
-  //   }));
+  const getHistoryData = () =>
+    vm.myOrdersHistory.map((order) => ({
+      date: order.timestamp.format("DD MMM YY, HH:mm"),
+      pair: order.marketSymbol,
+      type: (
+        <TableText color={order.type === "SELL" ? theme.colors.redLight : theme.colors.greenLight}>
+          {order.type}
+        </TableText>
+      ),
+      amount: (
+        <SmartFlex center="y" gap="4px">
+          <TableText primary>{order.formatTradeAmount}</TableText>
+          <TokenBadge>
+            <Text>{order.baseToken.symbol}</Text>
+          </TokenBadge>
+        </SmartFlex>
+      ),
+      price: toCurrency(order.formatPrice),
+      filled: order.formatTradeAmount,
+    }));
 
   const getBalanceData = () =>
     Array.from(balanceStore.balances)
@@ -189,10 +189,6 @@ const BottomTablesInterfaceSpotImpl: React.FC<IProps> = observer(() => {
                 {ord.type}
               </TableText>
             </SmartFlex>
-            <SmartFlex center="y">
-              <Text type={TEXT_TYPES.SUPPORTING}>Filled:</Text>
-              <Text color={theme.colors.textPrimary}>-</Text>
-            </SmartFlex>
           </SmartFlex>
         </MobileTableRowColumn>
         <MobileTableRowColumn>
@@ -207,45 +203,50 @@ const BottomTablesInterfaceSpotImpl: React.FC<IProps> = observer(() => {
       </MobileTableOrderRow>
     ));
 
-    // const orderHistoryData = vm.myOrdersHistory.map((ord, i) => (
-    //   <MobileTableOrderRow key={i + "mobile-history-row"}>
-    //     <MobileTableRowColumn>
-    //       <Text color={theme.colors.textPrimary} type={TEXT_TYPES.BUTTON_SECONDARY}>
-    //         {ord.marketSymbol}
-    //       </Text>
-    //       <SmartFlex gap="2px" column>
-    //         <Text type={TEXT_TYPES.SUPPORTING}>Amount</Text>
-    //         <SmartFlex center="y" gap="4px">
-    //           <Text color={theme.colors.textPrimary}>{ord.baseSizeUnits.toSignificant(2)}</Text>
-    //           <TokenBadge>
-    //             <Text>{ord.baseToken.symbol}</Text>
-    //           </TokenBadge>
-    //         </SmartFlex>
-    //       </SmartFlex>
-    //     </MobileTableRowColumn>
-    //     <MobileTableRowColumn>
-    //       <Text color={theme.colors.textPrimary}>Active</Text>
-    //       <SmartFlex gap="2px" column>
-    //         <SmartFlex center="y" gap="4px">
-    //           <Text type={TEXT_TYPES.SUPPORTING}>Side:</Text>
-    //           <TableText color={ord.type === "SELL" ? theme.colors.redLight : theme.colors.greenLight}>
-    //             {ord.type}
-    //           </TableText>
-    //         </SmartFlex>
-    //         <SmartFlex center="y">
-    //           <Text type={TEXT_TYPES.SUPPORTING}>Filled:</Text>
-    //           <Text color={theme.colors.textPrimary}>-</Text>
-    //         </SmartFlex>
-    //       </SmartFlex>
-    //     </MobileTableRowColumn>
-    //     <MobileTableRowColumn>
-    //       <SmartFlex alignItems="flex-end" gap="2px" column>
-    //         <Text type={TEXT_TYPES.SUPPORTING}>Price:</Text>
-    //         <Text color={theme.colors.textPrimary}>{toCurrency(ord.priceUnits.toSignificant(2))}</Text>
-    //       </SmartFlex>
-    //     </MobileTableRowColumn>
-    //   </MobileTableOrderRow>
-    // ));
+    const orderHistoryData = vm.myOrdersHistory.map((ord, i) => (
+      <MobileTableOrderRow key={i + "mobile-history-row"}>
+        <MobileTableRowColumn>
+          <Text color={theme.colors.textPrimary} type={TEXT_TYPES.BUTTON_SECONDARY}>
+            {ord.marketSymbol}
+          </Text>
+          <SmartFlex gap="2px" column>
+            <Text type={TEXT_TYPES.SUPPORTING}>Amount</Text>
+            <SmartFlex center="y" gap="4px">
+              <Text color={theme.colors.textPrimary}>{ord.formatTradeAmount}</Text>
+              <TokenBadge>
+                <Text>{ord.baseToken.symbol}</Text>
+              </TokenBadge>
+            </SmartFlex>
+          </SmartFlex>
+        </MobileTableRowColumn>
+        <MobileTableRowColumn>
+          <Text color={theme.colors.textPrimary}>Complete</Text>
+          <SmartFlex gap="2px" column>
+            <SmartFlex center="y" gap="4px">
+              <Text type={TEXT_TYPES.SUPPORTING}>Side:</Text>
+              <TableText color={ord.type === "SELL" ? theme.colors.redLight : theme.colors.greenLight}>
+                {ord.type}
+              </TableText>
+            </SmartFlex>
+            <SmartFlex center="y" gap="4px">
+              <Text type={TEXT_TYPES.SUPPORTING}>Filled:</Text>
+              <SmartFlex center="y" gap="4px">
+                <Text color={theme.colors.textPrimary}>{ord.formatTradeAmount}</Text>
+                <TokenBadge>
+                  <Text>{ord.baseToken.symbol}</Text>
+                </TokenBadge>
+              </SmartFlex>
+            </SmartFlex>
+          </SmartFlex>
+        </MobileTableRowColumn>
+        <MobileTableRowColumn>
+          <SmartFlex alignItems="flex-end" gap="2px" column>
+            <Text type={TEXT_TYPES.SUPPORTING}>Price:</Text>
+            <Text color={theme.colors.textPrimary}>{toCurrency(ord.formatPrice)}</Text>
+          </SmartFlex>
+        </MobileTableRowColumn>
+      </MobileTableOrderRow>
+    ));
 
     const balanceData = Array.from(balanceStore.balances)
       .filter(([, balance]) => balance && balance.gt(0))
@@ -275,7 +276,7 @@ const BottomTablesInterfaceSpotImpl: React.FC<IProps> = observer(() => {
         );
       });
 
-    const tabToData = [orderData, balanceData];
+    const tabToData = [orderData, balanceData, orderHistoryData];
 
     return (
       <SmartFlex width="100%" column>
@@ -318,7 +319,7 @@ const BottomTablesInterfaceSpotImpl: React.FC<IProps> = observer(() => {
   };
 
   useEffect(() => {
-    const tabToData = [getOrderData, getBalanceData];
+    const tabToData = [getOrderData, getBalanceData, getHistoryData];
     setData(tabToData[tabIndex]());
   }, [tabIndex, vm.myOrders, balanceStore.balances]);
 

diff --git a/...creens/TradeScreen/BottomTables/BottomTablesInterfaceSpot/BottomTablesInterfaceSpotVM.tsx b/...creens/TradeScreen/BottomTables/BottomTablesInterfaceSpot/BottomTablesInterfaceSpotVM.tsx
@@ -3,10 +3,10 @@ import { ethers } from "ethers";
 import { makeAutoObservable, reaction, when } from "mobx";
 
 import { SPOT_MARKET_ABI } from "@src/abi";
-import { CONTRACT_ADDRESSES } from "@src/constants";
-import { SpotMarketOrder } from "@src/entity";
+import { CONTRACT_ADDRESSES, TOKENS_BY_ASSET_ID } from "@src/constants";
+import { SpotMarketOrder, SpotMarketTrade } from "@src/entity";
 import useVM from "@src/hooks/useVM";
-import { fetchOrders } from "@src/services/SpotMarketService";
+import { fetchOrders, fetchTrades } from "@src/services/SpotMarketService";
 import { handleEvmErrors } from "@src/utils/handleEvmErrors";
 import { RootStore, useStores } from "@stores";
 
@@ -22,7 +22,7 @@ export const useBottomTablesInterfaceSpotVM = () => useVM(ctx);
 
 class BottomTablesInterfaceSpotVM {
   myOrders: SpotMarketOrder[] = [];
-  myOrdersHistory: SpotMarketOrder[] = [];
+  myOrdersHistory: SpotMarketTrade[] = [];
   initialized: boolean = false;
 
   isOrderCancelling = false;
@@ -73,30 +73,32 @@ class BottomTablesInterfaceSpotVM {
 
     if (!tradeStore.market || !accountStore.address) return;
 
+    const { market } = tradeStore;
+
     try {
       const orders = await fetchOrders({
-        baseToken: tradeStore.market.baseToken.assetId,
+        baseToken: market.baseToken.assetId,
         limit: 100,
         trader: accountStore.address,
         isActive: true,
       });
       this.setMySpotOrders(orders);
 
-      const ordersHistory = await fetchOrders({
-        baseToken: tradeStore.market.baseToken.assetId,
-        limit: 100,
-        trader: accountStore.address,
-        isActive: false,
-      });
-      this.setMySpotOrdersHistory(ordersHistory);
+      const ordersHistory = await fetchTrades(market.baseToken.assetId, 100, accountStore.address);
+
+      const token = TOKENS_BY_ASSET_ID[market.baseToken.assetId];
+
+      this.setMySpotOrdersHistory(
+        ordersHistory.map((t) => new SpotMarketTrade({ ...t, baseToken: token, userAddress: accountStore.address! })),
+      );
     } catch (error) {
       console.error(error);
     }
   };
 
   private setMySpotOrders = (myOrders: SpotMarketOrder[]) => (this.myOrders = myOrders);
 
-  private setMySpotOrdersHistory = (myOrdersHistory: SpotMarketOrder[]) => (this.myOrdersHistory = myOrdersHistory);
+  private setMySpotOrdersHistory = (myOrdersHistory: SpotMarketTrade[]) => (this.myOrdersHistory = myOrdersHistory);
 
   private setInitialized = (l: boolean) => (this.initialized = l);
 }
diff --git a/...d/src/screens/TradeScreen/OrderbookAndTradesInterface/SpotOrderBook/SpotOrderBookImpl.tsx b/...d/src/screens/TradeScreen/OrderbookAndTradesInterface/SpotOrderBook/SpotOrderBookImpl.tsx
@@ -19,7 +19,7 @@ import { media } from "@src/themes/breakpoints";
 import BN from "@src/utils/BN";
 import hexToRgba from "@src/utils/hexToRgb";
 
-import { ORDER_MODE, useCreateOrderSpotVM } from "../../LeftBlock/CreateOrderSpot/CreateOrderSpotVM";
+import { ORDER_MODE, ORDER_TYPE, useCreateOrderSpotVM } from "../../LeftBlock/CreateOrderSpot/CreateOrderSpotVM";
 
 import { useSpotOrderbookVM } from "./SpotOrderbookVM";
 
@@ -107,6 +107,7 @@ const SpotOrderBookImpl: React.FC<IProps> = observer(() => {
           orderSpotVm.setOrderMode(orderMode);
           orderSpotVm.setInputPrice(o.price);
           orderSpotVm.setInputAmount(new BN(o.baseSize), true);
+          orderSpotVm.setOrderType(ORDER_TYPE.Limit);
         }}
       >
         <VolumeBar type={type} volumePercent={volumePercent(o).times(100).toNumber()} />

diff --git a/spark-frontend/src/screens/TradeScreen/OrderbookAndTradesInterface/SpotTrades/SpotTrades.tsx b/spark-frontend/src/screens/TradeScreen/OrderbookAndTradesInterface/SpotTrades/SpotTrades.tsx
@@ -1,7 +1,6 @@
 import React, { useCallback, useEffect, useState } from "react";
 import { useTheme } from "@emotion/react";
 import styled from "@emotion/styled";
-import dayjs from "dayjs";
 import { observer } from "mobx-react";
 
 import { Column } from "@components/Flex";
@@ -60,7 +59,7 @@ const SpotTradesImpl: React.FC<IProps> = observer(() => {
               {trade.formatTradeAmount}
             </Text>
             <Text color={theme.colors.textPrimary} type={TEXT_TYPES.BODY}>
-              {dayjs.unix(trade.timestamp).format("HH:mm:ss")}
+              {trade.timestamp.format("HH:mm:ss")}
             </Text>
           </Row>
         ))}

diff --git a/...-frontend/src/screens/TradeScreen/OrderbookAndTradesInterface/SpotTrades/SpotTradesVM.tsx b/...-frontend/src/screens/TradeScreen/OrderbookAndTradesInterface/SpotTrades/SpotTradesVM.tsx
@@ -35,7 +35,7 @@ class SpotTradesVM {
   }
 
   updateTrades = async () => {
-    const { tradeStore, initialized } = this.rootStore;
+    const { accountStore, tradeStore, initialized } = this.rootStore;
 
     const market = tradeStore.market;
 
@@ -47,7 +47,9 @@ class SpotTradesVM {
       // todo: to think about TokenStore
       const token = TOKENS_BY_ASSET_ID[market.baseToken.assetId];
 
-      this.trades = data.map((t) => new SpotMarketTrade({ ...t, baseToken: token }));
+      this.trades = data.map(
+        (t) => new SpotMarketTrade({ ...t, baseToken: token, userAddress: accountStore.address! }),
+      );
     } catch (error) {
       console.error("Error with loading trades");
     }